Fix Arc Cannon not dealing damage when used by NPCs (#666)

Fixes NPCs using mp_titanweapon_arc_cannon not dealing damage to other entities (cherry picked from commit 18298d2)
R2Northstar · Jul 25, 2023 · 5c087b0 · 5c087b0
1 parent 93a7b2d
commit 5c087b0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/Northstar.Custom/mod/scripts/vscripts/weapons/_arc_cannon.nut b/Northstar.Custom/mod/scripts/vscripts/weapons/_arc_cannon.nut
@@ -552,12 +552,16 @@ function ZapTarget( zapInfo, target, beamStartPos, beamEndPos, chainNum = 1 )
 		int damageNearValue = eWeaponVar.damage_near_value
 		int damageFarValueTitanArmor = eWeaponVar.damage_far_value_titanarmor
 		int damageNearValueTitanArmor = eWeaponVar.damage_near_value_titanarmor
+		int damageFarDistance = eWeaponVar.damage_far_distance
+		int damageNearDistance = eWeaponVar.damage_near_distance
 		if ( zapInfo.player.IsNPC() )
 		{
 			damageFarValue = eWeaponVar.npc_damage_far_value
 			damageNearValue = eWeaponVar.npc_damage_near_value
 			damageFarValueTitanArmor = eWeaponVar.npc_damage_far_value_titanarmor
 			damageNearValueTitanArmor = eWeaponVar.npc_damage_near_value_titanarmor
+			damageFarDistance = eWeaponVar.npc_damage_far_distance
+			damageNearDistance = eWeaponVar.npc_damage_near_distance
 		}
 
 		if ( IsValid( target ) && IsValid( zapInfo.player ) )
@@ -613,8 +617,8 @@ function ZapTarget( zapInfo, target, beamStartPos, beamEndPos, chainNum = 1 )
 			{
 				// use distance for damage if the weapon auto-fires
 				entity weapon = expect entity( zapInfo.weapon )
-				float nearDist = weapon.GetWeaponSettingFloat( eWeaponVar.damage_near_distance )
-				float farDist = weapon.GetWeaponSettingFloat( eWeaponVar.damage_far_distance )
+				float nearDist = weapon.GetWeaponSettingFloat( damageNearDistance )
+				float farDist = weapon.GetWeaponSettingFloat( damageFarDistance )
 
 				float dist = Distance( weapon.GetOrigin(), target.GetOrigin() )
 				damageAmount = GraphCapped( dist, farDist, nearDist, damageMin, damageMax )
@@ -1044,4 +1048,4 @@ function GetWeaponChargeFrac( weapon )
 	if ( weapon.IsChargeWeapon() )
 		return weapon.GetWeaponChargeFraction()
 	return 1.0
-}
+}
diff --git a/Northstar.Custom/mod/scripts/weapons/mp_titanweapon_arc_cannon.txt b/Northstar.Custom/mod/scripts/weapons/mp_titanweapon_arc_cannon.txt
@@ -56,6 +56,12 @@ WeaponData
 	"damage_far_value_titanarmor" 					"100"
 
 	// Damage - When Used by NPCs
+	"npc_damage_near_distance"							"200"
+	"npc_damage_far_distance" 							"2500"
+	"npc_damage_near_value"   							"220"
+	"npc_damage_far_value"								"170"
+	"npc_damage_near_value_titanarmor"					"1800"
+	"npc_damage_far_value_titanarmor" 					"100"
 
 	"critical_hit"									"0"
 	"critical_hit_damage_scale"						"1.5"
@@ -340,4 +346,4 @@ WeaponData
 			}
 		}
 	}
-}
+}