1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-07-09 13:28:15 -05:00

Smoke Grenade: kills zombies

Smoke Grenade: add reticle from MP
Smoke Grenade: remove cluster explosion
This commit is contained in:
Jbleezy
2023-12-28 03:18:45 -08:00
parent cfcd71d2fd
commit 80119c9a56
9 changed files with 36 additions and 34 deletions

View File

@ -1348,13 +1348,7 @@ actor_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
if (weapon == "zombie_bullet_crouch_zm" && meansofdeath == "MOD_RIFLE_BULLET")
{
damage_scalar = damage / 600;
min_damage = int(damage_scalar * level.zombie_health) + 1;
if (damage < min_damage)
{
damage = min_damage;
}
final_damage = scale_damage(final_damage, 600);
}
if (weapon == "quadrotorturret_zm" && meansofdeath == "MOD_PISTOL_BULLET")
@ -1365,6 +1359,14 @@ actor_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
}
}
if (weapon == "willy_pete_zm")
{
if (!is_true(self.is_brutus))
{
damage = level.zombie_health;
}
}
if (weapon == "tower_trap_zm")
{
if (!is_true(self.is_brutus))
@ -2115,6 +2117,11 @@ player_damage_override(einflictor, eattacker, idamage, idflags, smeansofdeath, s
return 0;
}
if (sweapon == "willy_pete_zm")
{
return 0;
}
if (self.health > 75 && !is_true(self.is_zombie))
{
return 75;

View File

@ -582,6 +582,11 @@ afterlife_player_damage_callback(einflictor, eattacker, idamage, idflags, smeans
if (self hasperk("specialty_flakjacket"))
return 0;
if (sweapon == "willy_pete_zm")
{
return 0;
}
if (self.health > 75 && !(isdefined(self.is_zombie) && self.is_zombie))
idamage = 75;
}

View File

@ -656,6 +656,11 @@ brutus_damage_override(inflictor, attacker, damage, flags, meansofdeath, weapon,
return 0;
}
if (weapon == "willy_pete_zm")
{
return 0;
}
if (is_explosive_damage(meansofdeath) && weapon != "raygun_mark2_zm" && weapon != "raygun_mark2_upgraded_zm")
{
self.explosive_dmg_taken += damage;