INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-10 15:17:57 -05:00
Code Issues Releases Wiki Activity

Storm PSR: remove scripted damage

Browse Source 
Storm PSR: add infinite penetration from weapon file
Storm PSR: add back MMS
Storm PSR: adjust tracerType
This commit is contained in:
Jbleezy
2024-05-12 08:57:09 -07:00
parent c7531c2128
commit 5842d0a099
12 changed files with 32 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
scripts/zm/_zm_reimagined.gsc
View File

@ -380,7 +380,6 @@ on_player_connect()
player thread on_player_revived();
player thread on_player_fake_revive();
player thread weapon_fire_watcher();
player thread grenade_fire_watcher();
player thread player_hide_turrets_from_other_players();
player thread sndmeleewpnsound();
@ -1912,22 +1911,6 @@ wallbuy_cost_changes()
}
}
weapon_fire_watcher()
{
level endon("end_game");
self endon("disconnect");
while (1)
{
self waittill("weapon_fired", weapname);
if (issubstr(weapname, "metalstorm"))
{
self thread metalstorm_fired(weapname);
}
}
}
grenade_fire_watcher()
{
level endon("end_game");
@ -1949,80 +1932,6 @@ grenade_fire_watcher()
}
}
metalstorm_fired(weapname)
{
forward_angles = self getweaponforwarddir();
fire_origin = self getweaponmuzzlepoint();
end_origin = fire_origin + (forward_angles * 10000);
body_dist_2d_squared = 12 * 12;
head_dist_squared = 8 * 8;
targets = getaispeciesarray(level.zombie_team, "all");
targets = arraycombine(targets, get_players(), 1, 0);
foreach (target in targets)
{
if (isdefined(self.team) && isdefined(target.team) && self.team == target.team)
{
continue;
}
if (target damageconetrace(fire_origin, self) == 0)
{
continue;
}
body_origin = target getcentroid();
normal = vectornormalize(body_origin - fire_origin);
dot = vectordot(forward_angles, normal);
if (dot < 0)
{
continue;
}
loc = "none";
head_origin = target gettagorigin("j_head");
head_radial_origin = pointonsegmentnearesttopoint(fire_origin, end_origin, head_origin);
if (distancesquared(head_origin, head_radial_origin) <= head_dist_squared)
{
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 (loc == "none")
{
continue;
}
damage = self metalstorm_get_damage(weapname);
target dodamage(damage, target.origin, self, self, loc, "MOD_RIFLE_BULLET", 0, weapname);
}
}
metalstorm_get_damage(weapname)
{
base_damage = 1000;
if (issubstr(weapname, "upgraded"))
{
base_damage = 2000;
}
return base_damage * self.chargeshotlevel;
}
temp_disable_offhand_weapons()
{
self endon("disconnect");

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

@ -1576,10 +1576,32 @@ actor_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
{
if (issubstr(weapon, "upgraded"))
{
// do same damage through penetration
if (isdefined(attacker.chargeshotlevel))
{
final_damage = 2000 * attacker.chargeshotlevel;
if (is_headshot(weapon, shitloc, meansofdeath))
{
final_damage = int(final_damage * 1.5);
}
}
final_damage = scale_damage(final_damage, 10000);
}
else
{
// do same damage through penetration
if (isdefined(attacker.chargeshotlevel))
{
final_damage = 1000 * attacker.chargeshotlevel;
if (is_headshot(weapon, shitloc, meansofdeath))
{
final_damage = int(final_damage * 1.5);
}
}
final_damage = scale_damage(final_damage, 5000);
}
}