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

Encounter: melee already stunned player change

Browse Source
This commit is contained in:
Jbleezy
2022-08-12 00:47:32 -07:00
parent 4de3bb7410
commit a907ad7dcb
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/zm/zgrief/zgrief_reimagined.gsc
View File

@ -1664,6 +1664,11 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
}
}
if ( is_true( self._being_pushed ) )
{
return;
}
is_melee = false;
if(isDefined(eattacker) && isplayer(eattacker) && eattacker != self && eattacker.team != self.team && (smeansofdeath == "MOD_MELEE" || issubstr(sweapon, "knife_ballistic")))
{
@ -1700,7 +1705,7 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
self store_player_damage_info(eattacker, sweapon, smeansofdeath);
}
if ( is_true( self._being_shellshocked ) )
if ( is_true( self._being_shellshocked ) && !is_melee )
{
return;
}
@ -1774,9 +1779,11 @@ do_game_mode_shellshock(is_melee, is_upgraded)
}
self._being_shellshocked = 1;
self._being_pushed = is_melee;
self shellshock( "grief_stab_zm", time );
wait 0.75;
self._being_shellshocked = 0;
self._being_pushed = 0;
}
stun_score_steal(attacker, score)