Merge pull request #239 from MatthewMarinets/mm/war_council_stalwart

sc2: stalwart war council upgrade
Ziktofel · Aug 3, 2024 · 94dd020 · 94dd020
2 parents a9537a7 + 433e7cc
commit 94dd020
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 41 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -2139,6 +2139,11 @@
         <AlertIcon value="Assets\Textures\btn-progression-protoss-fenix-12-immortalandscoutchampions-research.dds"/>
         <EditorCategories value="Race:Protoss"/>
     </CButton>
+    <CButton id="AP_StalwartDualityCharge">
+        <Icon value="assets\textures\btn-upgrade-protoss-fenix-disruptorpurificationecho.dds"/>
+        <AlertIcon value="assets\textures\btn-upgrade-protoss-fenix-disruptorpurificationecho.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
     <CButton id="AP_ImmortalTaldarimScatterCannon">
         <Icon value="Assets\Textures\BTN-Ability-Protoss-ScatterCannon.dds"/>
         <AlertIcon value="Assets\Textures\BTN-Ability-Protoss-ScatterCannon.dds"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -2997,6 +2997,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_NotCountUpgradeAnnihilatorAerialTrackingCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveStalwartDualityCharge">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeStalwartDualityChargeCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveDragoonEnchancedStriderServos">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeDragoonEnchancedStriderServosCompleteOnly"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5380,6 +5380,10 @@
     <CRequirementNot id="AP_NotCountUpgradeAnnihilatorAerialTrackingCompleteOnly">
         <OperandArray index="0" value="AP_CountUpgradeAnnihilatorAerialTrackingCompleteOnly"/>
     </CRequirementNot>
+    <CRequirementCountUpgrade id="AP_CountUpgradeStalwartDualityChargeCompleteOnly">
+        <Count Link="AP_StalwartDualityCharge" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeDragoonEnchancedStriderServosCompleteOnly">
         <Count Link="AP_DragoonEnhancedStriderServos" 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
@@ -12882,11 +12882,13 @@
     <CUnit id="AP_ImmortalPurifier" parent="AP_Immortal">
         <Name value="Unit/Name/AP_ImmortalPurifier"/>
         <Description value="Button/Tooltip/AP_ImmortalPurifier"/>
+        <WeaponArray index="0" Link="AP_StalwartWeapon" Turret="AP_Immortal"/>
         <CardLayouts index="0">
             <LayoutButtons index="5" Face="AP_HardenedShieldStalwart" Type="Passive" Row="2" Column="0"/>
             <LayoutButtons Face="AP_ImmortalSingularityCharge" Type="Passive" Requirements="AP_HaveImmortalIncreasedRange" Row="1" Column="0"/>
             <LayoutButtons Face="AP_ImmortalAdvancedTargetingMechanics" Type="Passive" Requirements="AP_HaveImmortalAirAttack" Row="1" Column="1"/>
             <LayoutButtons Face="AP_DisruptorDispersion" Type="Passive" Requirements="AP_HaveVoidImmortalWeaponSplash" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_StalwartDualityCharge" Type="Passive" Requirements="AP_HaveStalwartDualityCharge" Row="2" Column="1"/>
         </CardLayouts>
     </CUnit>
     <CUnit id="AP_ImmortalBarrier" parent="AP_Immortal">

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -744,7 +744,9 @@
         <EffectArray Reference="Weapon,AP_PhaseDisruptors,Level" Value="1"/>
         <EffectArray Reference="Effect,AP_PhaseDisruptors,Amount" Value="2"/>
         <EffectArray Reference="Effect,AP_PhaseDisruptors,AttributeBonus[Armored]" Value="3"/>
-        <EffectArray Reference="Weapon,AP_PhaseDisruptersAir,Level" Value="1"/>
+        <EffectArray Reference="Weapon,AP_StalwartWeapon,Level" Value="1"/>
+        <EffectArray Reference="Effect,AP_StalwartWeapon,Amount" Value="2"/>
+        <EffectArray Reference="Effect,AP_StalwartWeapon,AttributeBonus[Armored]" Value="3"/>
         <EffectArray Reference="Effect,AP_ImmortalTaldarimWeaponDamage,Amount" Value="1"/>
         <EffectArray Reference="Effect,AP_ImmortalTaldarimWeaponDamage,AttributeBonus[Armored]" Value="1.000000"/>
         <EffectArray Reference="Weapon,AP_ImmortalTaldarim,Level" Value="1"/>
@@ -6346,17 +6348,6 @@
         <EditorCategories value="Race:Protoss,UpgradeType:SpellResearch"/>
         <AffectedUnitArray value="AP_Immortal"/>
     </CUpgrade>
-    <CUpgrade id="AP_IncreasedRange">
-        <Flags index="UpgradeCheat" value="0"/>
-        <Icon value="Assets\Textures\aoe_splatterran1c.dds"/>
-        <Alert value="ResearchComplete"/>
-        <Race value="Prot"/>
-        <ScoreAmount value="400"/>
-        <ScoreResult value="BuildOrder"/>
-        <EffectArray Reference="Weapon,AP_PhaseDisruptors,Range" Value="2"/>
-        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
-        <AffectedUnitArray value="AP_Immortal"/>
-    </CUpgrade>
     <CUpgrade id="AP_TemplarArchonDisabledTooltipUpgrade">
         <Flags index="UpgradeCheat" value="0"/>
         <EffectArray Operation="Set" Reference="Unit,AP_HighTemplar,Description" Value="Button/Tooltip/HighTemplar"/>
@@ -8197,11 +8188,11 @@
         <EffectArray Operation="Set" Reference="Weapon,AP_DisruptionBeam,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ParticleDisruptors,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_PhaseDisruptors,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel1.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_StalwartWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_WarpBlades,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_PsionicShockwave,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ThermalLances,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ThermalLanceAir,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel1.dds"/>
-        <EffectArray Operation="Set" Reference="Weapon,AP_PhaseDisruptersAir,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_Adept,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ColossusPurifierThermalLances,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel1.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ColossusTaldarimChargedBeam,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel1.dds"/>
@@ -8230,11 +8221,11 @@
         <EffectArray Operation="Set" Reference="Weapon,AP_DisruptionBeam,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ParticleDisruptors,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_PhaseDisruptors,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel2.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_StalwartWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_WarpBlades,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_PsionicShockwave,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ThermalLances,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ThermalLanceAir,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel2.dds"/>
-        <EffectArray Operation="Set" Reference="Weapon,AP_PhaseDisruptersAir,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_Adept,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ColossusPurifierThermalLances,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel2.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ColossusTaldarimChargedBeam,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel2.dds"/>
@@ -8263,11 +8254,11 @@
         <EffectArray Operation="Set" Reference="Weapon,AP_DisruptionBeam,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ParticleDisruptors,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_PhaseDisruptors,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel3.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_StalwartWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_WarpBlades,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_PsionicShockwave,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ThermalLances,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ThermalLanceAir,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel3.dds"/>
-        <EffectArray Operation="Set" Reference="Weapon,AP_PhaseDisruptersAir,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_Adept,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ColossusPurifierThermalLances,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel3.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ColossusTaldarimChargedBeam,Icon" Value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel3.dds"/>
@@ -8295,11 +8286,11 @@
         <EffectArray Operation="Set" Reference="Weapon,AP_DisruptionBeam,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ParticleDisruptors,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_PhaseDisruptors,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel4.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_StalwartWeapon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_WarpBlades,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_PsionicShockwave,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ThermalLances,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ThermalLanceAir,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel4.dds"/>
-        <EffectArray Operation="Set" Reference="Weapon,AP_PhaseDisruptersAir,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_Adept,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ColossusPurifierThermalLances,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel4.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ColossusTaldarimChargedBeam,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel4.dds"/>
@@ -8327,11 +8318,11 @@
         <EffectArray Operation="Set" Reference="Weapon,AP_DisruptionBeam,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ParticleDisruptors,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_PhaseDisruptors,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel5.dds"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_StalwartWeapon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_WarpBlades,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_PsionicShockwave,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ThermalLances,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ThermalLanceAir,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel5.dds"/>
-        <EffectArray Operation="Set" Reference="Weapon,AP_PhaseDisruptersAir,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_Adept,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ColossusPurifierThermalLances,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel5.dds"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_ColossusTaldarimChargedBeam,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-groundweaponslevel5.dds"/>
@@ -11552,11 +11543,13 @@
     </CUpgrade>
     <CUpgrade id="AP_ImmortalAirAttack">
         <EffectArray Operation="Set" Reference="Weapon,AP_PhaseDisruptors,TargetFilters" Value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_StalwartWeapon,TargetFilters" Value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_AnnihilatorParticleDisruptors,TargetFilters" Value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
     </CUpgrade>
     <CUpgrade id="AP_ImmortalIncreasedRange">
         <Icon value="Assets\Textures\aoe_splatterran1c.dds"/>
         <EffectArray Reference="Weapon,AP_PhaseDisruptors,Range" Value="2"/>
+        <EffectArray Reference="Weapon,AP_StalwartWeapon,Range" Value="2"/>
         <EffectArray Reference="Weapon,AP_AnnihilatorParticleDisruptors,Range" Value="2"/>
         <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
     </CUpgrade>
@@ -11570,6 +11563,10 @@
         <EffectArray Operation="Set" Reference="Unit,AP_ImmortalShakuras,Description" Value="Button/Tooltip/AP_ImmortalShakurasAA"/>
         <EditorCategories value="Race:Protoss"/>
     </CUpgrade>
+    <CUpgrade id="AP_StalwartDualityCharge">
+        <EffectArray Reference="Weapon,AP_StalwartWeapon,Range" Value="4"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CUpgrade>
     <CUpgrade id="AP_DragoonEnhancedStriderServos">
         <EffectArray Reference="Unit,AP_Dragoon,Speed" Value="0.375"/>
     </CUpgrade>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
@@ -1840,16 +1840,6 @@
         <Period value="6"/>
         <Effect value="AP_ImmortalTaldarimWeaponRandomLarge"/>
     </CWeaponLegacy>
-    <CWeaponLegacy id="AP_PhaseDisruptersAir">
-        <EditorCategories value="Race:Protoss"/>
-        <Options index="Disabled" value="1"/>
-        <Icon value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel0.dds"/>
-        <DisplayEffect value="AP_PhaseDisruptors"/>
-        <TargetFilters value="Air,Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
-        <Range value="6"/>
-        <Period value="1.45"/>
-        <Effect value="AP_PhaseDisruptors"/>
-    </CWeaponLegacy>
     <CWeaponLegacy id="AP_PhaseDisruptors">
         <EditorCategories value="Race:Protoss"/>
         <Icon value="Assets\Textures\btn-upgrade-protoss-groundweaponslevel0.dds"/>
@@ -1858,6 +1848,9 @@
         <Period value="1.45"/>
         <Effect value="AP_ImmortalSplashSet"/>
     </CWeaponLegacy>
+    <CWeaponLegacy id="AP_StalwartWeapon" parent="AP_PhaseDisruptors">
+        <Range value="2"/>
+    </CWeaponLegacy>
     <CWeaponLegacy id="AP_PhaseDisruptorsStrafe">
         <EditorCategories value="Race:Protoss"/>
         <Options index="OnlyFireWhileInAttackOrder" value="0"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt b/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
@@ -38832,10 +38832,6 @@ id=AP_ImmortalRevive
 asset=Assets\Textures\btn-techupgrade-terran-immortalityprotocol.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=ResearchComplete
-id=AP_IncreasedRange
-asset=Assets\Textures\aoe_splatterran1c.dds
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Alert=ResearchComplete
 id=AP_TemplarArchonDisabledTooltipUpgrade
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Alert=UpgradeComplete
@@ -41484,10 +41480,6 @@ id=AP_TyrannozorMissileLaunchers
 asset=Assets\Textures\btn-upgrade-zerg-missileattacks-level0.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Effect=##id##Damage,##id##Persistent
-id=AP_PhaseDisruptersAir
-asset=Assets\Textures\btn-upgrade-protoss-groundweaponslevel0.dds
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Effect=AP_PhaseDisruptors
 id=AP_VoidRaySwarm
 asset=Assets\Textures\btn-upgrade-protoss-airweaponslevel0.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr