Add Immortal Disruptor Dispersion

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml

@@ -5448,4 +5448,9 @@
         <Icon value="Assets\Textures\btn-upgrade-terran-magfieldaccelerator.dds"/>
         <AlertIcon value="Assets\Textures\btn-upgrade-terran-magfieldaccelerator.dds"/>
     </CButton>
+    <CButton id="AP_DisruptorDispersion">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-vanguard-aoeradiusincreased.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-protoss-vanguard-aoeradiusincreased.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
 </Catalog>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml

@@ -7935,6 +7935,7 @@
         <SearchFlags index="CallForHelp" value="1"/>
     </CEffectDamage>
     <CEffectEnumArea id="AP_AnnihilatorSplashSearch">
+        <ValidatorArray value="AP_TargetIsGroundUnitFilter"/>
         <ValidatorArray value="AP_HaveVoidImmortalWeaponSplash"/>
         <EditorCategories value=""/>
         <ExcludeArray Value="Target"/>
@@ -7943,10 +7944,15 @@
         <SearchFlags index="CallForHelp" value="1"/>
         <SearchFlags index="SameCliff" value="1"/>
     </CEffectEnumArea>
+    <CEffectEnumArea id="AP_AnnihilatorSplashSearchAir" parent="AP_AnnihilatorSplashSearch">
+        <ValidatorArray index="0" value="AP_TargetIsAirUnitFilter"/>
+        <SearchFilters value="Air;Player,Ally,Neutral,Stasis,Dead,Hidden,Invulnerable"/>
+    </CEffectEnumArea>
     <CEffectSet id="AP_AnnihilatorSplashSet">
         <EditorCategories value=""/>
         <EffectArray value="AP_AnnihilatorParticleDisruptors"/>
         <EffectArray value="AP_AnnihilatorSplashSearch"/>
+        <EffectArray value="AP_AnnihilatorSplashSearchAir"/>
     </CEffectSet>
     <CEffectDamage id="AP_ImmortalMelee">
         <EditorCategories value="Race:Protoss"/>
@@ -8117,6 +8123,7 @@
         <SearchFlags index="CallForHelp" value="1"/>
     </CEffectDamage>
     <CEffectEnumArea id="AP_ImmortalSplashSearch">
+        <ValidatorArray value="AP_TargetIsGroundUnitFilter"/>
         <ValidatorArray value="AP_HaveVoidImmortalWeaponSplash"/>
         <EditorCategories value=""/>
         <ExcludeArray Value="Target"/>
@@ -8125,10 +8132,15 @@
         <SearchFlags index="CallForHelp" value="1"/>
         <SearchFlags index="SameCliff" value="1"/>
     </CEffectEnumArea>
+    <CEffectEnumArea id="AP_ImmortalSplashSearchAir" parent="AP_ImmortalSplashSearch">
+        <ValidatorArray index="0" value="AP_TargetIsAirUnitFilter"/>
+        <SearchFilters value="Air;Player,Ally,Neutral,Stasis,Dead,Hidden,Invulnerable"/>
+    </CEffectEnumArea>
     <CEffectSet id="AP_ImmortalSplashSet">
         <EditorCategories value=""/>
         <EffectArray value="AP_PhaseDisruptors"/>
         <EffectArray value="AP_ImmortalSplashSearch"/>
+        <EffectArray value="AP_ImmortalSplashSearchAir"/>
     </CEffectSet>
     <CEffectDamage id="AP_ImmortalSplashStrafeDamage">
         <EditorCategories value="Race:Protoss"/>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml

@@ -2995,7 +2995,6 @@
         <Count Link="AP_ImmortalRevive" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeVoidImmortalWeaponSplashCompleteOnly">
-        <!-- Looks like the upgrade only exists as commented out in coop -->
         <Count Link="AP_VoidImmortalWeaponSplash" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml

@@ -12346,6 +12346,7 @@
             <LayoutButtons index="5" Face="AP_HardenedShieldStalwart"/>
             <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"/>
         </CardLayouts>
     </CUnit>
     <CUnit id="AP_ImmortalBarrier" parent="AP_Immortal">
@@ -12412,6 +12413,7 @@
             <LayoutButtons Face="AP_HaveBarrier" Type="Passive" Row="2" Column="1"/>
             <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"/>
         </CardLayouts>
         <Radius value="0.75"/>
         <SeparationRadius value="0.625"/>
@@ -12499,6 +12501,7 @@
             <LayoutButtons Face="AP_ImmortalShakurasShadowCannon" Type="AbilCmd" AbilCmd="AP_ImmortalShakurasShadowCannon,0" 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"/>
         </CardLayouts>
         <Radius value="0.75"/>
         <SeparationRadius value="0.625"/>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml

@@ -12613,4 +12613,5 @@
         <EditorCategories value="Race:Terran,UpgradeType:SpellResearch"/>
         <AffectedUnitArray value="AP_Liberator"/>
     </CUpgrade>
+    <CUpgrade id="AP_VoidImmortalWeaponSplash"/>
 </Catalog>

Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml

@@ -5466,4 +5466,10 @@
         <CombineArray value="AP_TargetIsNotGround"/>
         <CombineArray value="AP_NotInThorGroundRange"/>
     </CValidatorCombine>
+    <CValidatorUnitFilters id="AP_TargetIsGroundUnitFilter">
+        <Filters value="Ground;-"/>
+    </CValidatorUnitFilters>
+    <CValidatorUnitFilters id="AP_TargetIsAirUnitFilter">
+        <Filters value="Air;-"/>
+    </CValidatorUnitFilters>
 </Catalog>

Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt

@@ -1738,6 +1738,7 @@ Button/Name/AP_OracleEnergyUpgrade=Bosonic Core
 Button/Name/AP_DevastatorTurretPunisherGrenades=Anti-Armor Munitions
 Button/Name/AP_FleetwideJump=Tactical Jump
 Button/Name/AP_LiberatorCompressedRocketFuel=Compressed Rocket Fuel
+Button/Name/AP_DisruptorDispersion=Disruptor Dispersion
 Button/Tooltip/AP_250mmStrikeCannons=Stuns target unit. Deals <d ref="Effect,AP_250mmStrikeCannonsCreatePersistent,PeriodCount * Effect,AP_250mmStrikeCannonsDamage,Amount"/> damage over <d ref="Effect,AP_250mmStrikeCannonsCreatePersistent,PeriodCount * Effect,AP_250mmStrikeCannonsCreatePersistent,PeriodicPeriodArray[0]"/> seconds.
 Button/Tooltip/AP_330mmBarrageCannons=Stuns all enemies in a small area. Deals <d ref="Effect,AP_330mmBarrageCannonsPersistent,PeriodCount * Effect,AP_330mmBarrageCannonsDamage,Amount"/> damage over <d ref="Effect,AP_330mmBarrageCannonsPersistent,PeriodCount * Effect,AP_330mmBarrageCannonsPersistent,PeriodicPeriodArray[0]"/> seconds in a larger area.
 Button/Tooltip/AP_AWrp=Sacrifices 2 Templar to create an Archon.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
@@ -2136,7 +2137,7 @@ Button/Tooltip/AP_Hyperfluxor=Increases Diamondback attack speed by 20%.
 Button/Tooltip/AP_Hyperjump=After <d time="6"/>, warps to the target location. Battlecruiser is invulnerable while warping.<n/><n/><c val="#ColorAttackInfo">Does not require vision.</c>
 Button/Tooltip/AP_HyperjumpHercules=Warps to the target location. Hercules is invulnerable while warping.
 Button/Tooltip/AP_Immortal=Assault strider. Can use Barrier to absorb damage.<n/><n/><c val="ffff8a">Can attack ground units.</c>
-Button/Tooltip/AP_ImmortalAdvancedTargetingMechanics=Immortals and Annihilators can attack air units.
+Button/Tooltip/AP_ImmortalAdvancedTargetingMechanics=Immortals, Annihilators, and Stalwarts can attack air units.
 Button/Tooltip/AP_ImmortalAiur=Aiur Faction<n/>Assault strider. Can use Barrier to absorb damage.<n/><n/><c val="FFFF8A">Can attack ground units.</c>
 Button/Tooltip/AP_ImmortalPurifier=Purifier Faction<n/>Assault strider. Has shields that deflect high-damage attacks.<n/><n/><c val="FFFF8A">Can attack ground units.</c>
 Button/Tooltip/AP_ImmortalBarrier=Assault strider. Can use Barrier to absorb damage.<n/><n/><c val="ffff8a">Can attack ground units.</c>
@@ -2145,7 +2146,7 @@ Button/Tooltip/AP_ImmortalHallucination=These hallucinated copies function like
 Button/Tooltip/AP_ImmortalOverload=Absorbs up to <d ref="Behavior,AP_ImmortalOverload,DamageResponse.ModifyLimit"/> damage. Lasts for <d ref="Behavior,AP_ImmortalOverload,Duration"/> seconds.
 Button/Tooltip/AP_ImmortalShakuras=Nerazim Faction<n/>Assault Strider. Can use Shadow Cannon to damage air and ground units.<n/><n/><c val="FFFF8A">Can attack ground units.</c>
 Button/Tooltip/AP_ImmortalShakurasShadowCannon=Deal <d ref="Effect,AP_ImmortalShakurasShadowCannonDamage,Amount*Effect,AP_ImmortalShakurasShadowCannonCP,PeriodCount"/> damage to target unit or structure. <n/><n/><c val="#ColorAttackInfo">Can target ground and air units.</c>
-Button/Tooltip/AP_ImmortalSingularityCharge=Increases Immortal and Annihilator attack range by 2.
+Button/Tooltip/AP_ImmortalSingularityCharge=Increases Immortal, Annihilator, and Stalwart attack range by 2.
 Button/Tooltip/AP_ImmortalTaldarim=Tal'darim Faction<n/>Assault Strider. Attacks deal damage in an area around target enemy unit.<n/><n/><c val="ffff8a">Can attack ground units.</c>
 Button/Tooltip/AP_ImmortalTaldarimScatterCannon=Attacks deal damage to target enemy ground unit and other enemy ground units near it.<n/><n/><c val="ffff8a">Damages enemy ground units only.</c>
 Button/Tooltip/AP_ImmortalityProtocol=Allows a destroyed Thor to be rebuilt in the field.
@@ -2838,6 +2839,7 @@ Button/Tooltip/AP_OracleEnergyUpgrade=Increases starting energy by 150 and maxim
 Button/Tooltip/AP_DevastatorTurretPunisherGrenades=Increases damage to armored targets by 10.
 Button/Tooltip/AP_FleetwideJump=Warps to the target location. Aircraft is invulnerable while warping.
 Button/Tooltip/AP_LiberatorCompressedRocketFuel=Increases Lexington Rockets range by 4.
+Button/Tooltip/AP_DisruptorDispersion=Immortals, Annihilators, and Stalwarts deal <d ref="Effect,AP_ImmortalSplashDamage,Amount"/> (<d ref="(Effect,AP_ImmortalSplashDamage,Amount + Effect,AP_ImmortalSplashDamage,AttributeBonus[Armored])"/> to armored) splash damage.
 Effect/Name/AP_250mmStrikeCannonsApplyBehavior=250mm Strike Cannons (Apply Behavior)
 Effect/Name/AP_250mmStrikeCannonsCreatePersistent=250mm Strike Cannons (Create Persistent)
 Effect/Name/AP_250mmStrikeCannonsDamage=250mm Strike Cannons (Damage)

Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy

@@ -1487,7 +1487,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossForge3 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Protoss_unlockZealotFamilyShieldCapacity, // 17
         libABFE498B_gf_AP_Triggers_Protoss_unlockOracleBosonicCore, // 18
         libABFE498B_gf_AP_Triggers_Protoss_unlockScoutResourceEfficency, // 19
-        ap_triggers_PlayerConsumer_sig, // 20
+        libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalFamilyDisruptorDispersion, // 20
         ap_triggers_PlayerConsumer_sig, // 21
         ap_triggers_PlayerConsumer_sig, //22
         ap_triggers_PlayerConsumer_sig, //23
@@ -6925,6 +6925,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalFamilyAdvancedTargetingMec
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ImmortalAirAttack", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalFamilyDisruptorDispersion (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_VoidImmortalWeaponSplash", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Protoss_unlockColossusPacificationProtocols (int lp_player) {
     // Automatic Variable Declarations
     // Implementation

Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy

@@ -707,6 +707,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockVanguardAgonyLaunchers (int lp_pla
 void libABFE498B_gf_AP_Triggers_Protoss_unlockVanguardMatterDispersion (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalFamilySingularityCharge (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalFamilyAdvancedTargetingMechanics (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalFamilyDisruptorDispersion (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockColossusPacificationProtocols (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockWrathwalkerRapidPowerCycling (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockWrathwalkerEyeOfWrath (int lp_player);

Mods/ArchipelagoTriggers.SC2Mod/Triggers

@@ -4433,7 +4433,7 @@
                     libABFE498B_gf_AP_Triggers_Protoss_unlockZealotFamilyShieldCapacity, // 17
                     libABFE498B_gf_AP_Triggers_Protoss_unlockOracleBosonicCore, // 18
                     libABFE498B_gf_AP_Triggers_Protoss_unlockScoutResourceEfficency, // 19
-                    ap_triggers_PlayerConsumer_sig, // 20
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalFamilyDisruptorDispersion, // 20
                     ap_triggers_PlayerConsumer_sig, // 21
                     ap_triggers_PlayerConsumer_sig, //22
                     ap_triggers_PlayerConsumer_sig, //23
@@ -57227,6 +57227,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="F3C18F49"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="389ADFCA"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="9BABFDA0"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="08AE426A"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="3B23A0D3"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="D9E68DBA"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="C01D4135"/>
@@ -59132,6 +59133,42 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="08AE426A">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="8E86BB32"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="16F20E53"/>
+        </Element>
+        <Element Type="ParamDef" Id="8E86BB32">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="817ED737"/>
+        </Element>
+        <Element Type="Param" Id="817ED737">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="16F20E53">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="1B6503A2"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="69B29C40"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="74F0E62B"/>
+        </Element>
+        <Element Type="Param" Id="1B6503A2">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="8E86BB32"/>
+        </Element>
+        <Element Type="Param" Id="69B29C40">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="74F0E62B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_VoidImmortalWeaponSplash</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="FunctionDef" Id="3B23A0D3">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="1B2B127B"/>

Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt

@@ -120,6 +120,7 @@ FunctionDef/Name/lib_ABFE498B_064973BA=AP_Triggers_Zerg_CorruptorCorruption
 FunctionDef/Name/lib_ABFE498B_06BB6721=AP_Triggers_Terran_unlockThorProgressiveImmortalityProtocol
 FunctionDef/Name/lib_ABFE498B_06C27655=AP_Triggers_setKerriganPrimal
 FunctionDef/Name/lib_ABFE498B_07D98912=AP_Triggers_Protoss_unlockEnergizer
+FunctionDef/Name/lib_ABFE498B_08AE426A=AP_Triggers_Protoss_unlockImmortalFamilyDisruptorDispersion
 FunctionDef/Name/lib_ABFE498B_08EBA472=AP_Triggers_Terran_unlockRavenResourceEfficiency
 FunctionDef/Name/lib_ABFE498B_08FFB858=AP_Triggers_Zerg_SwarmHostEnduringLocusts
 FunctionDef/Name/lib_ABFE498B_0918D723=AP_Triggers_Terran_unlockLiberatorCloak
@@ -1217,6 +1218,7 @@ ParamDef/Name/lib_ABFE498B_8CDFA65D=player
 ParamDef/Name/lib_ABFE498B_8D327E85=newUpgrade
 ParamDef/Name/lib_ABFE498B_8DDC17F6=player
 ParamDef/Name/lib_ABFE498B_8E0F5BE2=onCasual
+ParamDef/Name/lib_ABFE498B_8E86BB32=player
 ParamDef/Name/lib_ABFE498B_8F1069F3=player
 ParamDef/Name/lib_ABFE498B_8F40B939=player
 ParamDef/Name/lib_ABFE498B_8F71D318=onHard