From f54ac4899b1885b87e08863f4e1372ad4ef69bcf Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 13 Dec 2024 20:44:44 -0800 Subject: [PATCH 1/7] sc2: Adding Supplicant Zenith Pitch upgrade --- .../Base.SC2Data/GameData/ButtonData.xml | 5 +++++ .../Base.SC2Data/GameData/RequirementData.xml | 4 ++++ .../Base.SC2Data/GameData/RequirementNodeData.xml | 4 ++++ .../Base.SC2Data/GameData/UnitData.xml | 7 +++---- .../Base.SC2Data/GameData/UpgradeData.xml | 8 ++++++++ .../enUS.SC2Data/LocalizedData/GameStrings.txt | 3 +++ 6 files changed, 27 insertions(+), 4 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml index 76e374394..fb15eec28 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml @@ -5361,6 +5361,11 @@ + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml index 8b93aac91..d4f67bb7c 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml @@ -3264,6 +3264,10 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index 92510a8cf..4d6b49df6 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -5642,6 +5642,10 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index c3721e83f..2fdc319f3 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -21557,12 +21557,11 @@ - - - - + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index 91faec764..c6c6dddbd 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -9518,6 +9518,14 @@ + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt index 6a951baa7..6ae900c26 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -1877,6 +1877,7 @@ Button/Name/AP_SuperStimpackSmall=Super Stimpack Button/Name/AP_SuperiorWarpGates=Superior Warp Gates Button/Name/AP_SupplicantSacrificeCDRLocked=Wrath of the Highlord Button/Name/AP_SupplicantShieldRegeneration=Shield Regeneration +Button/Name/AP_SupplicantZenithPitch=Zenith Pitch Button/Name/AP_SupplyDepot=Build Supply Depot Button/Name/AP_SupplyDepotDrop=Calldown: Supply Depot Button/Name/AP_SupplyDrop=Calldown: Extra Supplies @@ -3358,6 +3359,7 @@ Button/Tooltip/AP_SuperStimpackNova=Increases Nova's attack speed and movement s Button/Tooltip/AP_SuperStimpackSmall=Increases the unit's attack and movement speeds for seconds. Heals the unit for life. Button/Tooltip/AP_SuperiorWarpGates=Warp Gates can hold up to 3 charges.Passive Ability. Button/Tooltip/AP_SupplicantShieldRegeneration=Increases Shield regeneration. +Button/Tooltip/AP_SupplicantZenithPitch=Allows Supplicants to target air units. Button/Tooltip/AP_SupplyDepot=Provides supply.Supply allows you to create more units.Supply Depots can be lowered to allow units to walk over them. Button/Tooltip/AP_SupplyDepotDrop=Improved Supply Depot. Can be instantly deployed from orbit. Eliminates the time required for an SCV to assemble a standard Supply Depot. Button/Tooltip/AP_SupplyDepotLowered=Provides supply.Supply allows you to create more units.Supply Depots can be lowered to allow units to walk over them. @@ -3564,6 +3566,7 @@ Button/Tooltip/AP_WarpInReplicant=Mimic unit. Can turn into a copy of an allied Button/Tooltip/AP_WarpInRoboticsWarpFacility=Enables warp in of Protoss robotic units. Button/Tooltip/AP_WarpInStarWarpGate=Enables warp in of Protoss air units. Button/Tooltip/AP_WarpInSupplicant=Tal'darim FactionShort range warrior. Supplicants are warped in two at a time.Can attack ground units. +Button/Tooltip/AP_WarpInSupplicantAA=Tal'darim FactionShort range warrior. Supplicants are warped in two at a time.Can attack ground and air units. Button/Tooltip/AP_WarpInWarpGate=Enables warp in of Protoss ground units. Button/Tooltip/AP_WarpPrism=Flying transport. Can load and unload units. Can also deploy to create a power field. Button/Tooltip/AP_WarpPrismHallucination=These hallucinated copies function like the original unit, but they cannot use active abilities, deal damage, warp in structures, or gather resources, and they die more easily. Hallucinations last before they disappear. From 7169dd8b0fb21a7767eb2ec95180a2a943cfa6cf Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 13 Dec 2024 22:48:39 -0800 Subject: [PATCH 2/7] sc2: Added mothership war council upgrade -- integrated power --- .../Base.SC2Data/GameData/BehaviorData.xml | 18 ++++++++++++++++++ .../Base.SC2Data/GameData/ButtonData.xml | 5 +++++ .../Base.SC2Data/GameData/RequirementData.xml | 8 ++++++++ .../GameData/RequirementNodeData.xml | 7 +++++++ .../Base.SC2Data/GameData/UnitData.xml | 3 +++ .../Base.SC2Data/GameData/UpgradeData.xml | 1 + .../Base.SC2Data/GameData/ValidatorData.xml | 7 +++++++ .../enUS.SC2Data/LocalizedData/GameStrings.txt | 5 +++++ 8 files changed, 54 insertions(+) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml index 01c44d17f..54d3c495f 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml @@ -4688,6 +4688,24 @@ --> + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml index fb15eec28..0026b6bd4 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml @@ -5366,6 +5366,11 @@ + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml index d4f67bb7c..4c0d56586 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml @@ -3268,6 +3268,14 @@ + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index 4d6b49df6..df64d6c12 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -5646,6 +5646,13 @@ + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index 2fdc319f3..b96396797 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -21343,6 +21343,8 @@ + + @@ -21351,6 +21353,7 @@ + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index c6c6dddbd..3b8370e11 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -9526,6 +9526,7 @@ + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml index fe0d86f1d..91b6ffca8 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml @@ -4702,6 +4702,10 @@ + + + + @@ -5600,6 +5604,9 @@ + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt index 6ae900c26..005319f72 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -555,6 +555,7 @@ Behavior/Name/AP_MercGroundDropDelay=Merc Ground Drop Delay Behavior/Name/AP_MercTorrasqueTimerBehavior=Reincarnation Suppressed Behavior/Name/AP_MindControl=Mind Control Behavior/Name/AP_MineDroneCountdown=Widow Mine Detonating +Behavior/Name/AP_MothershipTaldarimMovementNerfOutsidePower=Pylon Power Loss Behavior/Name/AP_NPSwarm=Parasitic Domination Behavior/Name/AP_NeuralParasite=Neural Parasite Behavior/Name/AP_NexusInvulnerability=Nexus Invulnerability @@ -785,6 +786,7 @@ Behavior/Tooltip/AP_MarauderMengskShrapnelSlow=Movement slowed. Behavior/Tooltip/AP_MatrixOverloadTarget=This unit's movement and attack speed has been increased. Behavior/Tooltip/AP_MedicSCBWOpticFlare=Sight range reduced to melee range. Passive detection disabled. Behavior/Tooltip/AP_MercTorrasqueTimerBehavior=Cannot revive at this time. +Behavior/Tooltip/AP_MothershipTaldarimMovementNerfOutsidePower=The Mothership travels % slower outside Pylon power fields. Behavior/Tooltip/AP_NPSwarm=This unit is being controlled by the Swarm. Behavior/Tooltip/AP_NeuralParasite=This unit is being controlled by an Infestor. Behavior/Tooltip/AP_NovaApolloCloak=This unit is cloaked and will only be revealed by detectors or effects. @@ -1487,6 +1489,7 @@ Button/Name/AP_MorphtoSplitterling=Morph to Baneling Button/Name/AP_Mothership=Warp In Mothership Button/Name/AP_MothershipCore=Warp In Mothership Core Button/Name/AP_MothershipTaldarim=Warp in Mothership +Button/Name/AP_MothershipTaldarimIntegratedPower=Integrated Power Button/Name/AP_MoveChampions=Move Button/Name/AP_MultiLockTargetingSystem=Multi-Lock Weapons System Button/Name/AP_MuscularAugments=Muscular Augments @@ -2918,6 +2921,7 @@ Button/Tooltip/AP_MorphtoSplitterling=Splitter StrainSuicide unit. Deals Button/Tooltip/AP_Mothership=Ultimate Protoss vessel. Can use Photon Overcharge, Mass Recall, and Time Warp abilities. Cloaks nearby friendly units and structures.Can attack ground and air units. Button/Tooltip/AP_MothershipCore=Mobile flying caster. Can use Photon Overcharge, Mass Recall, and Time Warp abilities. Can upgrade into the Mothership.Can attack ground units. Button/Tooltip/AP_MothershipTaldarim=Tal'darim FactionUltimate Protoss vessel. Can use Black Hole, Blink, and Thermal Lance.Can attack ground and air units. +Button/Tooltip/AP_MothershipTaldarimIntegratedPower=The mothership regains full movement speed outside Pylon power fields. Button/Tooltip/AP_MoveChampions=Orders selected units to move to the target area or follow the target unit. Moving units will not engage enemies. Button/Tooltip/AP_MultiLockTargetingSystem=The Goliath can target ground and air units simultaneously. Button/Tooltip/AP_MuscularAugments=Increases Hydralisk movement speed. @@ -5386,6 +5390,7 @@ RequirementNode/Tooltip/AP_CountUpgradeHavocEnduringSightCompleteOnly=Find Endur RequirementNode/Tooltip/AP_CountUpgradeHighTemplarPlasmaSurgeCompleteOnly=Find Plasma Surge (High Templar) RequirementNode/Tooltip/AP_CountUpgradeImmortalImprovedBarrierCompleteOnly=Find Improved Barrier (Immortal) RequirementNode/Tooltip/AP_CountUpgradeMirageGravitonBeamCompleteOnly=Find Graviton Beam (Mirage) +RequirementNode/Tooltip/AP_CountUpgradeMothershipTaldarimIntegratedPowerCompleteOnly=Find Integrated Power (Mothership) RequirementNode/Tooltip/AP_CountUpgradeObserverScopophobiaCompleteOnly=Find Induce Scopophobia (Observer) RequirementNode/Tooltip/AP_CountUpgradeReaverKhalaiReplicatorsCompleteOnly=Find Khalai Replicators (Reaver) RequirementNode/Tooltip/AP_CountUpgradeSignifierFeedbackCompleteOnly=Find Feedback (Signifier) From a4d7224a41c6274454e0d6ce575a2e6019bece5f Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 13 Dec 2024 22:57:45 -0800 Subject: [PATCH 3/7] sc2: Added unlock triggers for zenith pitch and mothership integrated power --- .../Base.SC2Data/LibABFE498B.galaxy | 16 +++- .../Base.SC2Data/LibABFE498B_h.galaxy | 2 + Mods/ArchipelagoTriggers.SC2Mod/Triggers | 80 ++++++++++++++++++- .../LocalizedData/TriggerStrings.txt | 4 + 4 files changed, 98 insertions(+), 4 deletions(-) diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy index c30cf3d77..2296c1d9b 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy @@ -1665,7 +1665,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossForge4 (int lp_player, int lp_bitAr libABFE498B_gf_AP_Triggers_Protoss_unlockArchonSiphon, // 2 libABFE498B_gf_AP_Triggers_Protoss_unlockArchonSuicide, // 3 libABFE498B_gf_AP_Triggers_Protoss_unlockArchonWeaponUpgrade, // 4 - ap_triggers_PlayerConsumer_sig, // 5 + libABFE498B_gf_AP_Triggers_Protoss_unlockSupplicantZenithPitch, // 5 ap_triggers_PlayerConsumer_sig, // 6 ap_triggers_PlayerConsumer_sig, // 7 ap_triggers_PlayerConsumer_sig, // 8 @@ -1755,7 +1755,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil2 (int lp_player, int lp_ ap_triggers_PlayerConsumer_sig, // 12 libABFE498B_gf_AP_Triggers_Protoss_unlockArbiterAbilityEfficiency, // 13 ap_triggers_PlayerConsumer_sig, // 14 - ap_triggers_PlayerConsumer_sig, // 15 + libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipTaldarimIntegratedPower, // 15 ap_triggers_PlayerConsumer_sig, // 16 ap_triggers_PlayerConsumer_sig, // 17 ap_triggers_PlayerConsumer_sig, // 18 @@ -7727,6 +7727,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockSupplicantShieldRegeneration (int libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusSupplicantBoosted100Stack", TechTreeUpgradeCount(lp_player, "AP_ShieldRegenBonus100Stack", c_techCountCompleteOnly)); } +void libABFE498B_gf_AP_Triggers_Protoss_unlockSupplicantZenithPitch (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_SupplicantZenithPitch", 1); +} + void libABFE498B_gf_AP_Triggers_Protoss_unlockAdeptShockwave (int lp_player) { // Automatic Variable Declarations // Implementation @@ -8582,6 +8588,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters (in libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DisruptorRestructuredThrusters", 1); } +void libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipTaldarimIntegratedPower (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_MothershipTaldarimIntegratedPower", 1); +} + void libABFE498B_gf_AP_Triggers_Protoss_unlockChronoSurge (int lp_player) { // Automatic Variable Declarations // Implementation diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy index 1b344410d..af9d19c51 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy @@ -779,6 +779,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockShieldBattery (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockSupplicantBloodShields (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockSupplicantSoulAugmentation (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockSupplicantShieldRegeneration (int lp_player); +void libABFE498B_gf_AP_Triggers_Protoss_unlockSupplicantZenithPitch (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockAdeptShockwave (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockAdeptResonatingGlaives (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockAdeptPhaseBulwark (int lp_player); @@ -913,6 +914,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPermanentCloak (int lp_pl void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPerfectedPower (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestrainedDestruction (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters (int lp_player); +void libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipTaldarimIntegratedPower (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockChronoSurge (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockProgressiveProxyPylon (int lp_player, int lp_level); void libABFE498B_gf_AP_Triggers_Protoss_unlockPylonOvercharge (int lp_player); diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers index 5e6d55c62..9bdcf6735 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers +++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers @@ -4896,7 +4896,7 @@ libABFE498B_gf_AP_Triggers_Protoss_unlockArchonSiphon, // 2 libABFE498B_gf_AP_Triggers_Protoss_unlockArchonSuicide, // 3 libABFE498B_gf_AP_Triggers_Protoss_unlockArchonWeaponUpgrade, // 4 - ap_triggers_PlayerConsumer_sig, // 5 + libABFE498B_gf_AP_Triggers_Protoss_unlockSupplicantZenithPitch, // 5 ap_triggers_PlayerConsumer_sig, // 6 ap_triggers_PlayerConsumer_sig, // 7 ap_triggers_PlayerConsumer_sig, // 8 @@ -5040,7 +5040,7 @@ ap_triggers_PlayerConsumer_sig, // 12 libABFE498B_gf_AP_Triggers_Protoss_unlockArbiterAbilityEfficiency, // 13 ap_triggers_PlayerConsumer_sig, // 14 - ap_triggers_PlayerConsumer_sig, // 15 + libABFE498B_gf_AP_Triggers_Protoss_unlockMothershipTaldarimIntegratedPower, // 15 ap_triggers_PlayerConsumer_sig, // 16 ap_triggers_PlayerConsumer_sig, // 17 ap_triggers_PlayerConsumer_sig, // 18 @@ -66089,6 +66089,7 @@ + @@ -66223,6 +66224,7 @@ + @@ -66414,6 +66416,43 @@ + + AP_Triggers_Protoss_unlockSupplicantZenithPitch + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + AP_SupplicantZenithPitch + + + + + + 1 + + @@ -71904,6 +71943,43 @@ 1 + + AP_Triggers_Protoss_unlockMothershipTaldarimIntegratedPower + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + AP_MothershipTaldarimIntegratedPower + + + + + + 1 + + diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index b930ca345..945c52996 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -278,6 +278,7 @@ FunctionDef/Name/lib_ABFE498B_33FA4DC1=AP_Triggers_Protoss_unlockInstigator FunctionDef/Name/lib_ABFE498B_34000216=AP_Triggers_Zerg_unlockImpaler FunctionDef/Name/lib_ABFE498B_341415B4=AP_Triggers_Zerg_Cloud_Dispersal FunctionDef/Name/lib_ABFE498B_34A84A24=AP_Triggers_Protoss_unlockDarkArchonArgusTalisman +FunctionDef/Name/lib_ABFE498B_35D6AB7C=AP_Triggers_Protoss_unlockSupplicantZenithPitch FunctionDef/Name/lib_ABFE498B_35D7C893=AP_Triggers_Protoss_unlockPurifierBeam FunctionDef/Name/lib_ABFE498B_36861D67=AP_Triggers_Terran_unlockScienceVesselTacticalJump FunctionDef/Name/lib_ABFE498B_36CD01E9=AP_Triggers_Protoss_unlockDarkTemplarFamilyResourceEfficiency @@ -824,6 +825,7 @@ FunctionDef/Name/lib_ABFE498B_D4C59830=AP_Triggers_Terran_unlockSiegeTankShapedH FunctionDef/Name/lib_ABFE498B_D4C5B753=AP_Triggers_Terran_unlockMarauder FunctionDef/Name/lib_ABFE498B_D5BC1EC6=AP_Triggers_Zerg_BanelingRupture FunctionDef/Name/lib_ABFE498B_D6264068=AP_Triggers_Zerg_EchidnaWormOuroborosStrain +FunctionDef/Name/lib_ABFE498B_D661BFB5=AP_Triggers_Protoss_unlockMothershipTaldarimIntegratedPower FunctionDef/Name/lib_ABFE498B_D6714F21=AP_Triggers_Zerg_RoachOrganicCarapace FunctionDef/Name/lib_ABFE498B_D6DF8DC2=AP_Triggers_Zerg_NydusWormFamilyResourceEfficiency FunctionDef/Name/lib_ABFE498B_D722AC62=AP_Triggers_Terran_unlockNovaWeaponMonomolecularBlade @@ -1354,6 +1356,7 @@ ParamDef/Name/lib_ABFE498B_65188698=player ParamDef/Name/lib_ABFE498B_6551A323=player ParamDef/Name/lib_ABFE498B_655BE29F=player ParamDef/Name/lib_ABFE498B_6650A065=bitArrayValue +ParamDef/Name/lib_ABFE498B_66B29439=player ParamDef/Name/lib_ABFE498B_67549B31=player ParamDef/Name/lib_ABFE498B_67BDBEBF=player ParamDef/Name/lib_ABFE498B_67CD19A4=player @@ -1741,6 +1744,7 @@ ParamDef/Name/lib_ABFE498B_D5D0AF9A=player ParamDef/Name/lib_ABFE498B_D5E64D13=player ParamDef/Name/lib_ABFE498B_D61453DA=player ParamDef/Name/lib_ABFE498B_D634E41B=level +ParamDef/Name/lib_ABFE498B_D66BFDBF=player ParamDef/Name/lib_ABFE498B_D66EC570=player ParamDef/Name/lib_ABFE498B_D683DA33=player ParamDef/Name/lib_ABFE498B_D6BF6D50=player From 419e71d0217ee2119736843629692bec48fd2fb5 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sat, 14 Dec 2024 14:13:00 -0800 Subject: [PATCH 4/7] sc2: Removing the negative flag from mothership pylon nerf --- .../Base.SC2Data/GameData/BehaviorData.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml index 54d3c495f..c9672dd06 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml @@ -4689,7 +4689,6 @@ --> - @@ -4701,7 +4700,6 @@ - From 03e79cb4a1ee167e973b57a06e7fc5baa59285f5 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sat, 14 Dec 2024 18:52:04 -0800 Subject: [PATCH 5/7] sc2: Got mothership Pylon field visualization to go away when getting integrated power --- .../Base.SC2Data/GameData/AbilData.xml | 11 +++++++++++ .../Base.SC2Data/GameData/ActorData.xml | 1 + .../Base.SC2Data/GameData/BehaviorData.xml | 10 +++++----- .../Base.SC2Data/GameData/UnitData.xml | 7 ++++++- .../enUS.SC2Data/LocalizedData/GameStrings.txt | 2 +- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml index 4f02edd25..d7d81b108 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml @@ -7189,6 +7189,17 @@ + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml index ba6831c50..a4565c535 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml @@ -23611,6 +23611,7 @@ + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml index c9672dd06..c4fe613c2 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml @@ -4696,14 +4696,14 @@ - + - - - + - + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index b96396797..6b4b00991 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -21341,10 +21341,11 @@ + + - @@ -21376,6 +21377,10 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt index 005319f72..c42ee0534 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -37,8 +37,8 @@ Abil/Name/AP_BlinkShieldRestore=Blink Shield Restore Abil/Name/AP_BroodLordHangar=Brood Lord Hangar Abil/Name/AP_BroodLordQueue2=Brood Lord Queue2 Abil/Name/AP_BuildAutoTurret=Place Auto Turret -Abil/Name/AP_BuildNydusWorm=Build Nydus Worm Abil/Name/AP_BuildEchidnaWorm=Build Echidna Worm +Abil/Name/AP_BuildNydusWorm=Build Nydus Worm Abil/Name/AP_BuildRailGunTurret=Place Railgun Turret Abil/Name/AP_BuildinProgressNonCancellable=Build in Progress Non Cancellable Abil/Name/AP_BunkerStop=Stop From ae4bb5e4ec97918bfae92e422971e2b76070c2c8 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sat, 14 Dec 2024 18:57:07 -0800 Subject: [PATCH 6/7] sc2: Fixing only 1 mothership requirement to build mothership --- .../Base.SC2Data/GameData/RequirementNodeData.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index df64d6c12..7a9e9bcd3 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -4694,14 +4694,23 @@ - + + + + + + + + + + From a36e7ff1898eeaf3cbc84df9c23c0c004b1c8833 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 15 Dec 2024 11:40:23 -0800 Subject: [PATCH 7/7] sc2: Adding alt tal'darim mothership to upgrades --- .../Base.SC2Data/GameData/UpgradeData.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index 3b8370e11..b2bbc824d 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -1615,6 +1615,8 @@ + + @@ -1786,6 +1788,8 @@ + + @@ -17062,6 +17066,7 @@ + @@ -17192,6 +17197,7 @@ +