Unhide odin technical range back to unitdef

- in weapondef customparams.fake_range_override
- assorted cleanup

Author: SteelBlueZK

scripts/bomberassault.lua

@@ -29,18 +29,18 @@ local manualTarget_p1 = false
 local manualTarget_p2 = false
 local manualTarget_p3 = false
 local rangeChanged = false
-local THERMITE_BOMB_ID
-local FAKE_WEAPON_ID
+local THERMITE_NUM, FAKE_GUN_NUM, THERMITE_TRUERANGE, THERMITE_RANGE_OVERRIDE
 for i = 1, #UnitDefs[unitDefID].weapons do
-	local weaponName = WeaponDefs[UnitDefs[unitDefID].weapons[i].weaponDef].name
-	if weaponName == "bomberassault_thermite_bomb" then
-		THERMITE_BOMB_ID = i
+	local weapondef = WeaponDefs[UnitDefs[unitDefID].weapons[i].weaponDef]
+	if weapondef == WeaponDefNames["bomberassault_thermite_bomb"] then
+		THERMITE_NUM = i
+		THERMITE_TRUERANGE = weapondef.customParams.truerange
+		THERMITE_RANGE_OVERRIDE = weapondef.customParams.fake_range_override
 	end
-	if weaponName == "bomberassault_zeppelin_bomb" then
-		FAKE_WEAPON_ID = i
+	if weapondef == WeaponDefNames["bomberassault_zeppelin_bomb"] then
+		FAKE_GUN_NUM = i
 	end
 end
-local THERMITE_BOMB_RANGE = Spring.GetUnitWeaponState(unitID, FAKE_WEAPON_ID, "range")
 
 function ReammoComplete()
 	Show(bomb)
@@ -142,22 +142,23 @@ function script.FireWeapon(num)
 end
 
 function script.BlockShot(num, targetID)
-	if num == 1 or
+	if num == FAKE_GUN_NUM or
 		(num == manualfireWeapon and not IsManualFireTargetValid()) or
-		(GetUnitValue(COB.CRASHING) == 1) or RearmBlockShot() then
+		(GetUnitValue(COB.CRASHING) == 1) or
+		RearmBlockShot() then
 		return true
 	end
-	if num == THERMITE_BOMB_ID then
+	if num == THERMITE_NUM then
 		rangeChanged = true
-		Spring.SetUnitWeaponState(unitID, THERMITE_BOMB_ID, "range", 9001) -- large so noExplode doesn't remove projectile due to vertical drop distance
+		Spring.SetUnitWeaponState(unitID, THERMITE_NUM, "range", THERMITE_RANGE_OVERRIDE)
 	end
 	return false
 end
 
 function script.EndBurst()
 	if rangeChanged then
 		rangeChanged = false
-		Spring.SetUnitWeaponState(unitID, THERMITE_BOMB_ID, "range", THERMITE_BOMB_RANGE)
+		Spring.SetUnitWeaponState(unitID, THERMITE_NUM, "range", THERMITE_TRUERANGE)
 	end
 end
 

units/bomberassault.lua

@@ -124,6 +124,7 @@ return { bomberassault = {
         stats_hide_damage     = 1,
         damage_vs_feature     = 20, -- Doesn't ramp for technical reasons, so this is here to deal some reasonable damage.
         truerange             = 180,
+        fake_range_override   = 9001, -- range extention to not disappear past trueraange (noExplode interaction)
 
         thermite_frames       = 900,
         thermite_dps_start    = 0,
@@ -152,7 +153,7 @@ return { bomberassault = {
       myGravity               = 0.08,
       noExplode               = true,
       noSelfDamage            = true,
-      range                   = 180, -- dynamically updated in LUS so noExplode doesn't remove projectile due to vertical drop distance
+      range                   = 180, -- overridden by customparams.truerange
       reloadtime              = 2,
       size                    = 0.01,
       soundStart              = [[explosion/ex_large9]],