From 9f59ef344d73d34fe6a3e366c9cacbdc89388486 Mon Sep 17 00:00:00 2001
From: Ziktofel <ziktofel@gmail.com>
Date: Tue, 8 Oct 2024 20:32:42 +0200
Subject: [PATCH] Fix a bug that prevents Hellions from hiting their target at
 max range if they have range buffs

---
 .../Base.SC2Data/GameData/ActorData.xml       |  5 +++--
 .../Base.SC2Data/GameData/EffectData.xml      | 22 ++++++++++++++++++-
 .../Base.SC2Data/GameData/UpgradeData.xml     |  1 +
 .../Base.SC2Data/GameData/WeaponData.xml      |  2 +-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 8c54e54ea..9e908a260 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -2981,7 +2981,7 @@
     </CActorPortrait>
     <CActorAction id="AP_HellionAttack" parent="GenericAttackBase">
         <On Terms="Effect.AP_InfernalFlameThrower.Start; At Caster; FromEffectTreeDescendant" Send="ActionDamage"/>
-        <On Terms="Effect.AP_InfernalFlameThrowerCP.Start; At Caster; !ValidatePlayer AP_HasHellionInfernalPreIgniter" Send="Create"/>
+        <On Terms="Effect.AP_InfernalFlameThrowerSet.Start; At Caster; !ValidatePlayer AP_HasHellionInfernalPreIgniter" Send="Create"/>
         <LaunchAssets Model="" Sound="Hellion_AttackLaunch"/>
         <BeamScope value="Caster"/>
         <Missile value="HellionAttackBaseMissile"/>
@@ -3002,6 +3002,7 @@
         <On Terms="ActorOrphan" Send="Destroy"/>
         <On Terms="ActorCreation; ValidateUnit AP_HasHellionInfernalPreIgniter" Send="ModelSwap HellionUpgradeAttackBeam"/>
         <On Terms="ActorCreation; ValidateUnit AP_HasTwinLinkedFlameThrowers" Send="SetScale 1.800000,1.000000,1.000000"/>
+        <On Terms="ActorCreation" Send="SetScaleFromWeaponRange 0.000000,1.000000,0.000000"/>
         <Model value="HellionAttackBeam"/>
     </CActorBeamSimple>
     <CActorSite id="AP_HellionAttackBeamImpactSite">
@@ -3028,7 +3029,7 @@
     </CActorRegionCircle>
     <CActorAction id="AP_HellionUpgradedAttack" parent="GenericAttackBase">
         <On Terms="Effect.AP_InfernalFlameThrower.Start; At Caster; FromEffectTreeDescendant" Send="ActionDamage"/>
-        <On Terms="Effect.AP_InfernalFlameThrowerCP.Start; At Caster; ValidatePlayer AP_HasHellionInfernalPreIgniter" Send="Create"/>
+        <On Terms="Effect.AP_InfernalFlameThrowerSet.Start; At Caster; ValidatePlayer AP_HasHellionInfernalPreIgniter" Send="Create"/>
         <LaunchAssets Model="" Sound="Hellion_AttackLaunch"/>
         <Beam value="AP_HellionAttackBeam"/>
         <BeamScope value="Caster"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index b961a4f43..79f800631 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -569,6 +569,25 @@
         <Amount value="10"/>
         <Death value="Fire"/>
     </CEffectDamage>
+    <CEffectSet id="AP_InfernalFlameThrowerWrapper">
+        <EffectArray value="AP_InfernalFlameThrower"/>
+        <ValidatorArray value="AP_TargetInWeaponRange"/>
+    </CEffectSet>
+    <CEffectEnumArea id="AP_InfernalFlameThrowerSearch">
+        <EditorCategories value="Race:Terran"/>
+        <ImpactLocation Value="TargetPoint"/>
+        <ExcludeArray Value="Target"/>
+        <SearchFilters value="Ground;Player,Ally,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray RectangleWidth="0.15" RectangleHeight="20" Effect="AP_InfernalFlameThrowerWrapper"/>
+    </CEffectEnumArea>
+    <CEffectCreatePersistent id="AP_InfernalFlameThrowerCPFailsafe">
+        <EditorCategories value="Race:Terran"/>
+        <WhichLocation Value="SourcePoint"/>
+        <PeriodCount value="1"/>
+        <PeriodicEffectArray value="AP_InfernalFlameThrowerSearch"/>
+        <PeriodicOffsetArray value="0,-10,0"/>
+        <PeriodicPeriodArray value="0"/>
+    </CEffectCreatePersistent>
     <CEffectCreatePersistent id="AP_InfernalFlameThrowerCP">
         <EditorCategories value="Race:Terran"/>
         <WhichLocation Value="SourcePoint"/>
@@ -611,8 +630,9 @@
     </CEffectEnumArea>
     <CEffectSet id="AP_InfernalFlameThrowerSet">
         <EditorCategories value="Race:Terran"/>
-        <EffectArray value="AP_InfernalFlameThrower"/>
         <EffectArray value="AP_InfernalFlameThrowerCP"/>
+        <EffectArray value="AP_InfernalFlameThrower"/>
+        <EffectArray value="AP_InfernalFlameThrowerCPFailsafe"/>
     </CEffectSet>
     <CEffectCreateUnit id="AP_HellbatLeap">
         <EditorCategories value="Race:Zerg"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index d234adc98..5075baf9d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -2650,6 +2650,7 @@
     <CUpgrade id="AP_TwinLinkedFlameThrowers">
         <Flags index="UpgradeCheat" value="0"/>
         <EffectArray Operation="Set" Reference="Effect,AP_InfernalFlameThrowerE,AreaArray[0].Radius" Value="0.5"/>
+        <EffectArray Operation="Set" Reference="Effect,AP_InfernalFlameThrowerSearch,AreaArray[0].RectangleWidth" Value="0.5"/>
         <EffectArray Reference="Effect,AP_HellionTankSearch,AreaArray[0].Radius" Value="1"/>
         <EffectArray Operation="Set" Reference="Effect,AP_HellionTankSearch,AreaArray[0].Arc" Value="67.500000"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
index 89ef15e70..ee713db7b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
@@ -146,7 +146,7 @@
         <Period value="2.5"/>
         <DamagePoint value="0.25"/>
         <Backswing value="0.75"/>
-        <Effect value="AP_InfernalFlameThrowerCP"/>
+        <Effect value="AP_InfernalFlameThrowerSet"/>
         <LegacyOptions index="LockTurretWhileFiring" value="1"/>
     </CWeaponLegacy>
     <CWeaponLegacy id="AP_Vulture">