Merge pull request #159 from MatthewMarinets/mm/war_council_dragoon

Mm/war council dragoon
Ziktofel · Jul 4, 2024 · dfe1f9a · dfe1f9a
2 parents c29b919 + 28bd634
commit dfe1f9a
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 7 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -4616,6 +4616,10 @@
         <Icon value="Assets\Textures\BTN-Upgrade-Artanis-SingularityCharge.dds"/>
         <EditorCategories value="Race:Protoss"/>
     </CButton>
+    <CButton id="AP_DragoonPhalanxSuit">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-fenix-zealotsuit-armorplate.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
     <CButton id="AP_PredatorFury">
         <Icon value="Assets\Textures\BTN-Ability-Protoss-ShadowFury.dds"/>
         <EditorCategories value="Race:Protoss"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -2768,6 +2768,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeDragoonRangeCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveDragoonPhalanxSuit">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeDragoonPhalanxSuitCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HavePredatorFury">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradePredatorFuryCompleteOnly"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5163,6 +5163,10 @@
         <Count Link="AP_DragoonRange" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeDragoonPhalanxSuitCompleteOnly">
+        <Count Link="AP_DragoonPhalanxSuit" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradePredatorFuryCompleteOnly">
         <Count Link="AP_PredatorFury" 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
@@ -8508,7 +8508,7 @@
         <ShieldRegenDelay value="10"/>
         <ShieldRegenRate value="2"/>
         <ShieldArmorName value="Unit/ShieldArmorName/ProtossPlasmaShields"/>
-        <Speed value="2.25"/>
+        <Speed value="2"/>
         <Acceleration value="1000"/>
         <Sight value="10"/>
         <Food value="-2"/>
@@ -8540,8 +8540,9 @@
             <LayoutButtons Face="AP_TrillicCompressionSystems" Type="Passive" Requirements="AP_HaveDragoonHealth" Row="1" Column="1"/>
             <LayoutButtons Face="AP_SingularityCharge" Type="Passive" Requirements="AP_HaveDragoonRange" Row="1" Column="2"/>
             <LayoutButtons Face="AP_DragoonEnhancedStriderServos" Type="Passive" Requirements="AP_HaveDragoonEnchancedStriderServos" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_DragoonPhalanxSuit" Type="Passive" Requirements="AP_HaveDragoonPhalanxSuit" Row="1" Column="4"/>
         </CardLayouts>
-        <Radius value="0.625"/>
+        <Radius value="0.8"/>
         <SeparationRadius value="0.625"/>
         <InnerRadius value="0.5"/>
         <CargoSize value="4"/>
@@ -13020,7 +13021,7 @@
         </CardLayouts>
         <Radius value="1"/>
         <SeparationRadius value="0.75"/>
-        <InnerRadius value="0.75"/>
+        <InnerRadius value="0.5625"/>
         <CargoSize value="4"/>
         <ScoreKill value="450"/>
         <ScoreResult value="BuildOrder"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -11070,7 +11070,18 @@
         <EffectArray Reference="Weapon,AP_Dragoon,Range" Value="2"/>
         <EffectArray Reference="Weapon,AP_Dragoon,MinScanRange" Value="2"/>
         <EditorCategories value="Race:Protoss,UpgradeType:SpellResearch"/>
-        <AffectedUnitArray value="Dragoon"/>
+        <AffectedUnitArray value="AP_Dragoon"/>
+    </CUpgrade>
+    <CUpgrade id="AP_DragoonPhalanxSuit">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-fenix-zealotsuit-armorplate.dds"/>
+        <Alert value="ResearchComplete"/>
+        <Race value="Prot"/>
+        <EffectArray Reference="Weapon,AP_Dragoon,Range" Value="2"/>
+        <EffectArray Reference="Weapon,AP_Dragoon,MinScanRange" Value="2"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_Dragoon,Radius" Value="0.175"/>
+        <EffectArray Reference="Unit,AP_Dragoon,MoveSpeed" Value="0.25"/>
+        <EditorCategories value="Race:Protoss,UpgradeType:SpellResearch"/>
+        <AffectedUnitArray value="AP_Dragoon"/>
     </CUpgrade>
     <CUpgrade id="AP_PredatorFury"/>
     <CUpgrade id="AP_ScoutWeaponRange">

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
@@ -2788,7 +2788,7 @@
         <Icon value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel0.dds"/>
         <DisplayEffect value="AP_DragoonDamage"/>
         <TargetFilters value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
-        <Range value="7"/>
+        <Range value="5"/>
         <Period value="2"/>
         <Effect value="AP_DragoonLM"/>
     </CWeaponLegacy>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -966,6 +966,7 @@ Button/Name/AP_DisruptorHallucination=Summon Disruptor Hallucination
 Button/Name/AP_DistortionBlasters=Distortion Blasters
 Button/Name/AP_Dragoon=Warp In Dragoon
 Button/Name/AP_DragoonEnhancedStriderServos=Enhanced Strider Servos
+Button/Name/AP_DragoonPhalanxSuit=Phalanx Suit
 Button/Name/AP_DrillClaws=Drilling Claws
 Button/Name/AP_Drone=Morph to Drone
 Button/Name/AP_DualFusionRepair=Dual-Fusion Repair
@@ -1987,6 +1988,7 @@ Button/Tooltip/AP_DisruptorPhased=Robotic disruption unit. Can use Purification
 Button/Tooltip/AP_DistortionBlasters=Increases Banshee damage by 25% while cloaked.
 Button/Tooltip/AP_Dragoon=Aiur Faction<n/>Ranged assault strider. Has enhanced life and attack damage.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
 Button/Tooltip/AP_DragoonEnhancedStriderServos=Increases Dragoon movement speed.
+Button/Tooltip/AP_DragoonPhalanxSuit=War Council Upgrade. Dragoons gain increased movement speed, +<d ref="Upgrade,AP_DragoonPhalanxSuit,EffectArray[0].Value"/> range, and can bunch closer with other units.
 Button/Tooltip/AP_DrillClaws=This unit burrows faster.
 Button/Tooltip/AP_Drone=Basic worker unit. Can harvest minerals and vespene gas. Can mutate into structures.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_DualFusionRepair=Restores life to mechanical units and structures at twice the speed of traditional repair.
@@ -5096,6 +5098,7 @@ Upgrade/Name/AP_DestroyerImprovedOverlords=Improved Overlords
 Upgrade/Name/AP_DistortionBlasters=Distortion Blasters
 Upgrade/Name/AP_DistortionSensors=Distortion Sensors
 Upgrade/Name/AP_DistortionThrusters=Distortion Thrusters
+Upgrade/Name/AP_DragoonPhalanxSuit=Phalanx Suit
 Upgrade/Name/AP_DrillClaws=Drilling Claws
 Upgrade/Name/AP_DualFusionWelders=Dual-Fusion Welders
 Upgrade/Name/AP_DurableMaterials=Durable Materials

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1511,7 +1511,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil (int lp_player, int lp_b
         libABFE498B_gf_AP_Triggers_Protoss_unlockCenturionResourceEfficiency, // 1
         libABFE498B_gf_AP_Triggers_Protoss_unlockSentinelResourceEfficiency, // 2
         libABFE498B_gf_AP_Triggers_Protoss_unlockStalkerPhaseReactor, // 3
-        ap_triggers_PlayerConsumer_sig, // 4
+        libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonPhalanxSuit, // 4
         ap_triggers_PlayerConsumer_sig, // 5
         ap_triggers_PlayerConsumer_sig, // 6
         ap_triggers_PlayerConsumer_sig, // 7
@@ -6697,6 +6697,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonEnhancedStriderServos (int
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DragoonEnhancedStriderServos", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonPhalanxSuit (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DragoonPhalanxSuit", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Protoss_unlockScoutCombatSensorArray (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
@@ -669,6 +669,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonHighImpactPhaseDisruptors (
 void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonTrillicCompressionSystems (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonSingularityCharge (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonEnhancedStriderServos (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonPhalanxSuit (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockScoutCombatSensorArray (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockScoutApialSensors (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockScoutGraviticThrusters (int lp_player);

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -4484,7 +4484,7 @@
                     libABFE498B_gf_AP_Triggers_Protoss_unlockCenturionResourceEfficiency, // 1
                     libABFE498B_gf_AP_Triggers_Protoss_unlockSentinelResourceEfficiency, // 2
                     libABFE498B_gf_AP_Triggers_Protoss_unlockStalkerPhaseReactor, // 3
-                    ap_triggers_PlayerConsumer_sig, // 4
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonPhalanxSuit, // 4
                     ap_triggers_PlayerConsumer_sig, // 5
                     ap_triggers_PlayerConsumer_sig, // 6
                     ap_triggers_PlayerConsumer_sig, // 7
@@ -57318,6 +57318,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="56A57BC2"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="D9676346"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="00D3CBC0"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="32B84044"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="9949B6A3"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="E049E260"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="4DF3B624"/>
@@ -57824,6 +57825,43 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="32B84044">
+            <Identifier>AP_Triggers_Protoss_unlockDragoonPhalanxSuit</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="DB11BE11"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="865B6649"/>
+        </Element>
+        <Element Type="ParamDef" Id="DB11BE11">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="FF55ED45"/>
+        </Element>
+        <Element Type="Param" Id="FF55ED45">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="865B6649">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="4A578863"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="A88A2DDB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="F2FC5FCB"/>
+        </Element>
+        <Element Type="Param" Id="4A578863">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="DB11BE11"/>
+        </Element>
+        <Element Type="Param" Id="A88A2DDB">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_DragoonPhalanxSuit</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="F2FC5FCB">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="FunctionDef" Id="9949B6A3">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="BE227290"/>

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -223,6 +223,7 @@ FunctionDef/Name/lib_ABFE498B_311283F0=AP_Triggers_Terran_unlockSiegeTankMaelstr
 FunctionDef/Name/lib_ABFE498B_31214144=AP_Triggers_Terran_unlockBrynhild
 FunctionDef/Name/lib_ABFE498B_318E1F67=AP_Triggers_Terran_unlockNovaProgressiveCloak
 FunctionDef/Name/lib_ABFE498B_31BE9583=AP_Triggers_Terran_unlockSiegeTankResourceEfficiency
+FunctionDef/Name/lib_ABFE498B_32B84044=AP_Triggers_Protoss_unlockDragoonPhalanxSuit
 FunctionDef/Name/lib_ABFE498B_333819B7=AP_Triggers_Terran_unlockShipArmor
 FunctionDef/Name/lib_ABFE498B_33FA4DC1=AP_Triggers_Protoss_unlockInstigator
 FunctionDef/Name/lib_ABFE498B_34000216=AP_Triggers_Zerg_unlockImpaler
@@ -1426,6 +1427,7 @@ ParamDef/Name/lib_ABFE498B_DA02CC06=player
 ParamDef/Name/lib_ABFE498B_DA2F7B4C=player
 ParamDef/Name/lib_ABFE498B_DA58C200=player
 ParamDef/Name/lib_ABFE498B_DAE6A57B=bitArrayValue
+ParamDef/Name/lib_ABFE498B_DB11BE11=player
 ParamDef/Name/lib_ABFE498B_DB1B76C3=player
 ParamDef/Name/lib_ABFE498B_DB2038C9=player
 ParamDef/Name/lib_ABFE498B_DB50A707=player