Prefer Thor's ground weapon on targets hitable with both ground and a…

…ir weapons.
Ziktofel · Jun 15, 2024 · 41e6d5b · 41e6d5b
1 parent c599ab3
commit 41e6d5b
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 0 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -1790,6 +1790,7 @@
         <AttributeBonus index="Massive" value="10"/>
         <Amount value="25"/>
         <Death value="Blast"/>
+        <ValidatorArray value="AP_TargetIsNotGroundOrNotInThorGroundRagne"/>
         <SearchFilters value="Air;Self,Player,Ally,Neutral,Missile,Stasis,Dead,Hidden,Invulnerable"/>
         <SearchFlags index="OffsetByUnitRadius" value="0"/>
     </CEffectDamage>
@@ -1830,6 +1831,7 @@
         <AttributeBonus index="Massive" value="10"/>
         <Amount value="40"/>
         <Death value="Blast"/>
+        <ValidatorArray value="AP_TargetIsNotGroundOrNotInThorGroundRagne"/>
         <SearchFilters value="Air;Self,Player,Ally,Neutral,Missile,Stasis,Dead,Hidden,Invulnerable"/>
         <SearchFlags index="OffsetByUnitRadius" value="0"/>
     </CEffectDamage>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -10517,6 +10517,8 @@
         <EffectArray Reference="Weapon,AP_LanceMissileLaunchers,MinScanRange" Value="1"/>
         <EffectArray Reference="Weapon,AP_ThorsHammer,Range" Value="1"/>
         <EffectArray Reference="Weapon,AP_ThorsHammer,MinScanRange" Value="1"/>
+        <EffectArray Reference="Validator,AP_ThorBasicGroundRange,Range" Value="1"/>
+        <EffectArray Reference="Validator,AP_ThorSquadsightGroundRange,Range" Value="1"/>
         <EffectArray Reference="Unit,AP_MercThor,SightBonus[Dusk]" Value="2"/>
         <EffectArray Reference="Unit,AP_MercThor,SightBonus[Dawn]" Value="2"/>
         <EffectArray Reference="Unit,AP_MercThorAP,SightBonus[Dusk]" Value="2"/>
@@ -10766,6 +10768,8 @@
         <!-- Thor -->
         <EffectArray Reference="Weapon,AP_ThorsHammer,Range" Value="1"/>
         <EffectArray Reference="Weapon,AP_ThorsHammer,MinScanRange" Value="1"/>
+        <EffectArray Reference="Validator,AP_ThorBasicGroundRange,Range" Value="1"/>
+        <EffectArray Reference="Validator,AP_ThorSquadsightGroundRange,Range" Value="1"/>
         <EffectArray Reference="Weapon,AP_JavelinMissileLaunchers,Range" Value="1"/>
         <EffectArray Reference="Weapon,AP_JavelinMissileLaunchers,MinScanRange" Value="1"/>
         <EffectArray Reference="Weapon,AP_LanceMissileLaunchers,Range" Value="1"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -5455,4 +5455,39 @@
         <Find value="1"/>
         <Value value="AP_HaveHotSScourgeAmount"/>
     </CValidatorPlayerRequirement>
+    <CValidatorLocationCompareRange id="AP_ThorBasicGroundRange">
+        <WhichLocation Value="TargetUnit"/>
+        <Compare value="LE"/>
+        <Range value="7"/> <!-- Thor's Hammer default range -->
+    </CValidatorLocationCompareRange>
+    <CValidatorLocationCompareRange id="AP_ThorSquadsightGroundRange">
+        <WhichLocation Value="TargetUnit"/>
+        <Compare value="LE"/>
+        <Range value="9"/> <!-- Squadsight gives +2 range -->
+    </CValidatorLocationCompareRange>
+    <CValidatorCombine id="AP_ThorBasicGroundRangeAndNoSquadsight">
+        <Type value="And"/>
+        <CombineArray value="AP_ThorBasicGroundRange"/>
+        <CombineArray value="AP_HasNotHavocSquadSightBehavior"/>
+    </CValidatorCombine>
+    <CValidatorCombine id="AP_ThorSquadsightGroundRangeAndSquadsight">
+        <Type value="And"/>
+        <CombineArray value="AP_ThorSquadsightGroundRange"/>
+        <CombineArray value="AP_HasHavocSquadSightBehavior"/>
+    </CValidatorCombine>
+    <CValidatorCombine id="AP_ThorGroundRange">
+        <CombineArray value="AP_ThorBasicGroundRangeAndNoSquadsight"/>
+        <CombineArray value="AP_ThorSquadsightGroundRangeAndSquadsight"/>
+    </CValidatorCombine>
+    <CValidatorCombine id="AP_NotInThorGroundRange">
+        <Negate value="1"/>
+        <CombineArray value="AP_ThorGroundRange"/>
+    </CValidatorCombine>
+    <CValidatorUnitFilters id="AP_TargetIsNotGround">
+        <Filters value="-;Ground"/>
+    </CValidatorUnitFilters>
+    <CValidatorCombine id="AP_TargetIsNotGroundOrNotInThorGroundRagne">
+        <CombineArray value="AP_TargetIsNotGround"/>
+        <CombineArray value="AP_NotInThorGroundRange"/>
+    </CValidatorCombine>
 </Catalog>