Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Jul 25, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96f0b3f
Add KVs for arc cannon npc damage
ASpoonPlaysGames Jul 22, 2023
301ec0a
Use NPC values for near and far distance
ASpoonPlaysGames Jul 22, 2023
fa8012c
swap order of variable declaration to match similar lines
ASpoonPlaysGames Jul 22, 2023
4b907df
Merge branch 'main' into arc-cannon-npc
uniboi Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Northstar.Custom/mod/scripts/vscripts/weapons/_arc_cannon.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) )
Expand Down Expand Up @@ -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 )
Expand Down Expand Up @@ -1044,4 +1048,4 @@ function GetWeaponChargeFrac( weapon )
if ( weapon.IsChargeWeapon() )
return weapon.GetWeaponChargeFraction()
return 1.0
}
}
8 changes: 7 additions & 1 deletion Northstar.Custom/mod/scripts/weapons/mp_titanweapon_arc_cannon.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -340,4 +346,4 @@ WeaponData
}
}
}
}
}
Loading