1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-14 17:18:02 -05:00

Grief: no stun cooldown only on melee

This commit is contained in:
Jbleezy
2021-12-07 01:32:43 -08:00
parent 1c8460f345
commit 653a7a97d4
2 changed files with 10 additions and 3 deletions

View File

@ -235,7 +235,7 @@
* 2 lethal grenades and mines awarded each round * 2 lethal grenades and mines awarded each round
* Unlimited barrier rebuild points * Unlimited barrier rebuild points
* Decreased stun time by enemy players from 0.75 seconds to 0.5 seconds * Decreased stun time by enemy players from 0.75 seconds to 0.5 seconds
* Players can be stunned by enemy players while already stunned * Players can be stunned from melee by enemy players while already stunned
* Points awarded for stunning enemy players that are damaged * Points awarded for stunning enemy players that are damaged
* Points awarded for downing enemy players * Points awarded for downing enemy players
* Landing on top of an enemy player downs them * Landing on top of an enemy player downs them

View File

@ -599,9 +599,16 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
} }
} }
if ( isDefined( level._game_module_player_damage_grief_callback ) ) shellshock_override = false;
if ( isDefined( eattacker ) && isplayer( eattacker ) && eattacker != self && eattacker.team != self.team && smeansofdeath == "MOD_MELEE" )
{ {
self [[ level._game_module_player_damage_grief_callback ]]( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime ); shellshock_override = true;
self applyknockback( idamage, vdir );
}
if ( is_true( self._being_shellshocked ) && !shellshock_override )
{
return;
} }
if ( isDefined( level._effect[ "butterflies" ] ) ) if ( isDefined( level._effect[ "butterflies" ] ) )