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

Turret equipment: fix damaging players

Browse Source
This commit is contained in:
Jbleezy
2022-01-22 10:43:57 -08:00
parent b027a5fc46
commit 2a5f65984a
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/zm/_zm_reimagined.gsc
View File

@ -1903,7 +1903,7 @@ melee_weapon_disable_weapon_trading()
player_damage_override( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime )
{
if (smeansofdeath == "MOD_FALLING")
if(smeansofdeath == "MOD_FALLING")
{
// remove fall damage being based off max health
ratio = self.maxhealth / 100;
@ -1911,12 +1911,12 @@ player_damage_override( einflictor, eattacker, idamage, idflags, smeansofdeath,
// increase fall damage beyond 110
max_damage = 110;
if (idamage >= max_damage)
if(idamage >= max_damage)
{
velocity = abs(self.fall_velocity);
min_velocity = getDvarInt("bg_fallDamageMinHeight") * 3.25;
max_velocity = getDvarInt("bg_fallDamageMaxHeight") * 2.5;
if (self.divetoprone)
if(self.divetoprone)
{
min_velocity = getDvarInt("dtp_fall_damage_min_height") * 4.5;
max_velocity = getDvarInt("dtp_fall_damage_max_height") * 2.75;
@ -1931,6 +1931,12 @@ player_damage_override( einflictor, eattacker, idamage, idflags, smeansofdeath,
}
}
// fix turrets damaging players
if(sweapon == "zombie_bullet_crouch_zm" && smeansofdeath == "MOD_RIFLE_BULLET")
{
idamage = 0;
}
return idamage;
}