INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-08 22:31:36 -05:00
Code Issues Releases Wiki Activity

Storm PSR: add scripted headshot damage

Browse Source 
Storm PSR: remove damage being increased from Double Tap and Deadshot
Storm PSR: add better height distance check
This commit is contained in:
Jbleezy 2024-04-20 17:15:27 -07:00
parent 493912ae06
commit 189bdcf1a9
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
scripts/zm/_zm_reimagined.gsc
View File

@ -1954,8 +1954,8 @@ metalstorm_fired(weapname)
forward_angles = self getweaponforwarddir(); forward_angles = self getweaponforwarddir();
fire_origin = self getweaponmuzzlepoint(); fire_origin = self getweaponmuzzlepoint();
end_origin = fire_origin + (forward_angles * 10000); end_origin = fire_origin + (forward_angles * 10000);
cylinder_dist_squared = 12 * 12; body_dist_2d_squared = 12 * 12;
height_dist = 36; head_dist_squared = 8 * 8;
targets = getaispeciesarray(level.zombie_team, "all"); targets = getaispeciesarray(level.zombie_team, "all");
targets = arraycombine(targets, get_players(), 1, 0); targets = arraycombine(targets, get_players(), 1, 0);
@ -1971,8 +1971,8 @@ metalstorm_fired(weapname)
continue; continue;
} }
test_origin = target getcentroid(); body_origin = target getcentroid();
normal = vectornormalize(test_origin - fire_origin); normal = vectornormalize(body_origin - fire_origin);
dot = vectordot(forward_angles, normal); dot = vectordot(forward_angles, normal);
if (dot < 0) if (dot < 0)
@ -1980,21 +1980,34 @@ metalstorm_fired(weapname)
continue; continue;
} }
radial_origin = pointonsegmentnearesttopoint(fire_origin, end_origin, test_origin); loc = "none";
head_origin = target gettagorigin("j_head");
head_radial_origin = pointonsegmentnearesttopoint(fire_origin, end_origin, head_origin);
if (distance2dsquared(test_origin, radial_origin) > cylinder_dist_squared) if (distancesquared(head_origin, head_radial_origin) <= head_dist_squared)
{ {
continue; loc = "head";
}
else
{
body_radial_origin = pointonsegmentnearesttopoint(fire_origin, end_origin, body_origin);
if (distance2dsquared(body_origin, body_radial_origin) <= body_dist_2d_squared)
{
if (body_radial_origin[2] >= target.origin[2] && body_radial_origin[2] < head_origin[2])
{
loc = "torso_lower";
}
}
} }
if (abs(test_origin[2] - radial_origin[2]) > height_dist) if (loc == "none")
{ {
continue; continue;
} }
damage = self metalstorm_get_damage(weapname); damage = self metalstorm_get_damage(weapname);
target dodamage(damage, target.origin, self, self, loc, "MOD_RIFLE_BULLET", 0, weapname);
target dodamage(damage, target.origin, self, self, "none", "MOD_RIFLE_BULLET", 0, weapname);
} }
} }

10
scripts/zm/replaced/_zm.gsc
View File

@ -1616,7 +1616,10 @@ actor_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
{ {
if (meansofdeath == "MOD_PISTOL_BULLET" || meansofdeath == "MOD_RIFLE_BULLET") if (meansofdeath == "MOD_PISTOL_BULLET" || meansofdeath == "MOD_RIFLE_BULLET")
{ {
final_damage *= 1.5; if (!issubstr(weapon, "metalstorm"))
{
final_damage *= 1.5;
}
} }
} }
@ -1628,7 +1631,10 @@ actor_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
{ {
if (!isSubStr(weaponClass(weapon), "spread") || maps\mp\zombies\_zm_weapons::get_base_weapon_name(weapon, 1) == "ksg_zm") if (!isSubStr(weaponClass(weapon), "spread") || maps\mp\zombies\_zm_weapons::get_base_weapon_name(weapon, 1) == "ksg_zm")
{ {
final_damage *= 2; if (!issubstr(weapon, "metalstorm"))
{
final_damage *= 2;
}
} }
} }
} }