Merge pull request #255 from MatthewMarinets/mm/war_council_corsair

sc2: Adding Corsair war council upgrade -- network disruption
Ziktofel · Aug 9, 2024 · 8080e3c · 8080e3c
2 parents 89ae32b + 24cec3e
commit 8080e3c
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 3 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -16019,6 +16019,7 @@
     </CActorAction>
     <CActorModel id="AP_CorsairMPDisruptionWebImpact" parent="ModelAnimationStyleContinuous">
         <On Terms="Effect.AP_CorsairMPDisruptionWebCreatePersistent.Start" Send="Create"/>
+        <On Terms="Effect.AP_CorsairMPDisruptionWebCreatePersistent.Start; ValidatePlayer AP_NotHaveCorsairNetworkDisruption" Send="SetScale 0.333333"/>
         <On Terms="Effect.AP_CorsairMPDisruptionWebCreatePersistent.Stop" Send="AnimBracketStop BSD"/>
         <ModelFlags index="AutomateGlobalLoops" value="1"/>
     </CActorModel>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -4834,6 +4834,10 @@
         <Icon value="Assets\Textures\btn-upgrade-protoss-shieldslevel1.dds"/>
         <AlertIcon value="Assets\Textures\btn-upgrade-protoss-shieldslevel1.dds"/>
     </CButton>
+    <CButton id="AP_CorsairNetworkDisruption">
+        <Icon value="Assets\Textures\btn-ability-protoss-disruptionblast.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-protoss-disruptionblast.dds"/>
+    </CButton>
     <CButton id="AP_SkirmisherPeerContempt">
         <Icon value="assets\textures\btn-upgrade-protoss-alarak-combatmastery.dds"/>
         <AlertIcon value="assets\textures\btn-upgrade-protoss-alarak-combatmastery.dds"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -10641,7 +10641,7 @@
     <CEffectEnumArea id="AP_CorsairMPDisruptionWebSearch">
         <EditorCategories value=""/>
         <SearchFilters value="Ground;Player,Ally,Item,Dead,Hidden"/>
-        <AreaArray Radius="3" Effect="AP_CorsairMPDisruptionWebSet"/>
+        <AreaArray Radius="1" Effect="AP_CorsairMPDisruptionWebSet"/>
     </CEffectEnumArea>
     <CEffectSet id="AP_CorsairMPDisruptionWebSet">
         <EditorCategories value="Race:Protoss"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -2867,6 +2867,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeCorsairShieldUpgradeCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveCorsairNetworkDisruption">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeCorsairNetworkDisruptionCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveArbiterReinforcedHullUpgrade">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeArbiterReinforcedHullCompleteOnly"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5260,6 +5260,10 @@
         <Count Link="AP_CorsairShieldUpgrade" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeCorsairNetworkDisruptionCompleteOnly">
+        <Count Link="AP_CorsairNetworkDisruption" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeArbiterReinforcedHullCompleteOnly">
         <Count Link="AP_ArbiterReinforcedHull" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -15482,6 +15482,7 @@
             <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
             <LayoutButtons Face="AP_CorsairMPDisruptionWeb" Type="AbilCmd" AbilCmd="AP_CorsairMPDisruptionWeb,0" Row="2" Column="0"/>
             <LayoutButtons Face="AP_CorsairMPDisruptionWeb" Type="AbilCmd" AbilCmd="AP_CorsairMPDisruptionWebArgusJewel,0" Row="2" Column="0"/>
+            <LayoutButtons Face="AP_CorsairNetworkDisruption" Type="Passive" Requirements="AP_HaveCorsairNetworkDisruption" Row="2" Column="1"/>
             <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
             <LayoutButtons Face="AP_PermanentlyCloakedCorsair" Type="Passive" Requirements="AP_HaveCorsairPermanentCloak" Row="1" Column="0"/>
             <LayoutButtons Face="AP_CorsairArgusJewel" Type="Passive" Requirements="AP_HaveCorsairArgusJewel" Row="1" Column="1"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -11363,6 +11363,10 @@
         <EffectArray Reference="Unit,AP_CorsairMP,ShieldsStart" Value="20"/>
         <AffectedUnitArray value="AP_CorsairMP"/>
     </CUpgrade>
+    <CUpgrade id="AP_CorsairNetworkDisruption">
+        <EffectArray Reference="Effect,AP_CorsairMPDisruptionWebSearch,AreaArray[0].Radius" Value="2"/>
+        <AffectedUnitArray value="AP_CorsairMP"/>
+    </CUpgrade>
     <CUpgrade id="AP_SkirmisherPeerContempt">
         <EffectArray Operation="Set" Reference="Weapon,AP_IonCannonsTaldarim,TargetFilters" Value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
         <EffectArray Operation="Set" Reference="Button,AP_PhoenixTaldarim,Tooltip" Value="Button/Tooltip/AP_PhoenixTaldarimAA"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -3173,6 +3173,13 @@
         </AreaArray>
         <SearchFilters value="-;Player,Ally,Neutral"/>
     </CValidatorLocationEnumArea>
+    <CValidatorPlayerRequirement id="AP_HaveCorsairNetworkDisruption">
+        <Find value="1"/>
+        <Value value="AP_HaveCorsairNetworkDisruption"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_NotHaveCorsairNetworkDisruption">
+        <Value value="AP_HaveCorsairNetworkDisruption"/>
+    </CValidatorPlayerRequirement>
     <CValidatorUnitCompareBehaviorCount id="AP_HyperjumpTeleport">
         <Behavior value="AP_HyperjumpTeleport"/>
     </CValidatorUnitCompareBehaviorCount>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -957,6 +957,7 @@ Button/Name/AP_CorruptorPassive=Corruptor
 Button/Name/AP_Corsair=Warp in Corsair
 Button/Name/AP_CorsairArgusJewel=Argus Jewel
 Button/Name/AP_CorsairMPDisruptionWeb=Disruption Web
+Button/Name/AP_CorsairNetworkDisruption=Network Disruption
 Button/Name/AP_CorsairShieldUpgrade=Neutron Shields
 Button/Name/AP_CorsairSustainingDisruption=Sustaining Disruption
 Button/Name/AP_CreepTumorPassive=Creep Generator
@@ -2056,6 +2057,7 @@ Button/Tooltip/AP_CorsairArgusJewel=Corsair can store 2 charges of Disruption We
 Button/Tooltip/AP_CorsairMP=Nerazim Faction<n/>Air superiority starfighter. Can use Disruption Web.<n/><n/><c val="ffff8a">Can attack air units.</c>
 Button/Tooltip/AP_CorsairMPDisruptionWeb=Creates a web of energy on the ground that prevents enemy structures and ground units from attacking for <d time="10"/>.
 Button/Tooltip/AP_CorsairMPDisruptionWebUpgraded=Creates a web of energy on the ground that prevents enemy structures and ground units from attacking for <d time="22.5"/>.
+Button/Tooltip/AP_CorsairNetworkDisruption=Triples the radius of Disruption Web.
 Button/Tooltip/AP_CorsairShieldUpgrade=Increases the <c val="ffff8a">Corsair's</c> shields by 20.
 Button/Tooltip/AP_CorsairSustainingDisruption=Disruption Webs last longer.
 Button/Tooltip/AP_CreepTumor=A burrowed creep generator. Creep feeds nearby Zerg structures. A Creep Tumor can spawn additional Creep Tumors.<n/><n/><c val="#ColorAttackInfo">Bonus: Zerg move faster on creep.</c>
@@ -4719,6 +4721,7 @@ RequirementNode/Tooltip/AP_CountUpgradeAdeptDisruptiveTransferCompleteOnly=Find
 RequirementNode/Tooltip/AP_CountUpgradeAnnihilatorAerialTrackingCompleteOnly=Find Aerial Tracking (Annihilator)
 RequirementNode/Tooltip/AP_CountUpgradeAvengerCloakCompleteOnly=Find Kryhas Cloak (Avenger)
 RequirementNode/Tooltip/AP_CountUpgradeBloodHunterBrutalEfficiencyCompleteOnly=Find Brutal Efficiency (Blood Hunter)
+RequirementNode/Tooltip/AP_CountUpgradeCorsairNetworkDisruptionCompleteOnly=Find Network Disruption (Corsair)
 RequirementNode/Tooltip/AP_CountUpgradeDarkArchonIndomitableWillCompleteOnly=Find Indomitable Will (Dark Archon)
 RequirementNode/Tooltip/AP_CountUpgradeDarkTemplarShadowFuryGreaterCompleteOnly=Find Greater Shadow Fury (Dark Templar)
 RequirementNode/Tooltip/AP_CountUpgradeDarkTemplarShadowFuryLesserCompleteOnly=Find Lesser Shadow Fury (Dark Templar)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1583,7 +1583,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil2 (int lp_player, int lp_
         lp_player,
         lp_bitArrayValue,
         libABFE498B_gf_AP_Triggers_Protoss_unlockPhoenixDoubleGravitonBeam, // 0
-        ap_triggers_PlayerConsumer_sig, // 1
+        libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairNetworkDisruption, // 1
         libABFE498B_gf_AP_Triggers_Protoss_unlockMirageGravitonBeam, // 2
         libABFE498B_gf_AP_Triggers_Protoss_unlockSkirmisherPeerContempt, // 3
         ap_triggers_PlayerConsumer_sig, // 4
@@ -7123,6 +7123,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairNeutronShields (int lp_play
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CorsairShieldUpgrade", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairNetworkDisruption (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CorsairNetworkDisruption", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Protoss_unlockOracleStealthDrive (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
@@ -722,6 +722,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairStealthDrive (int lp_player
 void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairArgusJewel (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairSustainingDisruption (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairNeutronShields (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairNetworkDisruption (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockOracleStealthDrive (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockOracleStasisCalibration (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockOracleTemporalAccelerationBeam (int lp_player);

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -4617,7 +4617,7 @@
                     lp_player,
                     lp_bitArrayValue,
                     libABFE498B_gf_AP_Triggers_Protoss_unlockPhoenixDoubleGravitonBeam, // 0
-                    ap_triggers_PlayerConsumer_sig, // 1
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairNetworkDisruption, // 1
                     libABFE498B_gf_AP_Triggers_Protoss_unlockMirageGravitonBeam, // 2
                     libABFE498B_gf_AP_Triggers_Protoss_unlockSkirmisherPeerContempt, // 3
                     ap_triggers_PlayerConsumer_sig, // 4
@@ -59348,6 +59348,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="F7478EB8"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="C41608AC"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="64BCFCC4"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="3E6E7E95"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="9C290257"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="2FDFD4B9"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="993D0137"/>
@@ -60583,6 +60584,43 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="3E6E7E95">
+            <Identifier>AP_Triggers_Protoss_unlockCorsairNetworkDisruption</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="9D72F60F"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="B8AA3D64"/>
+        </Element>
+        <Element Type="ParamDef" Id="9D72F60F">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="34CEC197"/>
+        </Element>
+        <Element Type="Param" Id="34CEC197">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="B8AA3D64">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="4A56F59D"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="5AF3E834"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="37527133"/>
+        </Element>
+        <Element Type="Param" Id="4A56F59D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="9D72F60F"/>
+        </Element>
+        <Element Type="Param" Id="5AF3E834">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_CorsairNetworkDisruption</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="37527133">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="FunctionDef" Id="9C290257">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="7F75137D"/>

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -277,6 +277,7 @@ FunctionDef/Name/lib_ABFE498B_3D9164AE=AP_Triggers_Terran_unlockMarineProgressiv
 FunctionDef/Name/lib_ABFE498B_3E5FE33C=AP_Triggers_Zerg_UltraliskResourceEfficiency
 FunctionDef/Name/lib_ABFE498B_3E64398E=AP_Triggers_Terran_unlockMedivacScatterVeil
 FunctionDef/Name/lib_ABFE498B_3E695C38=AP_Triggers_Zerg_unlockScourge
+FunctionDef/Name/lib_ABFE498B_3E6E7E95=AP_Triggers_Protoss_unlockCorsairNetworkDisruption
 FunctionDef/Name/lib_ABFE498B_3EBD86A4=AP_Triggers_Protoss_unlockZealotWhirlwind
 FunctionDef/Name/lib_ABFE498B_3ECDB091=AP_Triggers_Protoss_unlockAscendantPowerChaoticAttunement
 FunctionDef/Name/lib_ABFE498B_3EE41709=AP_Triggers_Zerg_RoachCorpser
@@ -1357,6 +1358,7 @@ ParamDef/Name/lib_ABFE498B_9BD1EB64=player
 ParamDef/Name/lib_ABFE498B_9C22FD60=player
 ParamDef/Name/lib_ABFE498B_9CC96E37=player
 ParamDef/Name/lib_ABFE498B_9CCD3E05=player
+ParamDef/Name/lib_ABFE498B_9D72F60F=player
 ParamDef/Name/lib_ABFE498B_9DCAB020=player
 ParamDef/Name/lib_ABFE498B_9E166274=player
 ParamDef/Name/lib_ABFE498B_9EC8A002=player