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

Encounter: fix reviving melee

Browse Source
This commit is contained in:
Jbleezy
2022-09-11 18:32:08 -07:00
parent 5f7f454e37
commit 60405f83a1
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1674,6 +1674,7 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
}
is_melee = false;
is_reviving = false;
if(isDefined(eattacker) && isplayer(eattacker) && eattacker != self && eattacker.team != self.team && (smeansofdeath == "MOD_MELEE" || issubstr(sweapon, "knife_ballistic")))
{
is_melee = true;
@ -1682,6 +1683,8 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
if(self maps/mp/zombies/_zm_laststand::is_reviving_any())
{
is_reviving = true;
if(self getStance() == "crouch")
{
amount /= 1.775; // 50%
@ -1749,7 +1752,7 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
self.stun_fx_ind = (self.stun_fx_ind + 1) % level.stun_fx_amount;
}
self thread do_game_mode_shellshock(is_melee, maps/mp/zombies/_zm_weapons::is_weapon_upgraded(sweapon));
self thread do_game_mode_shellshock(is_melee, is_reviving);
self playsound( "zmb_player_hit_ding" );
score = level.stun_award_points;
@ -1768,7 +1771,7 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
}
}
do_game_mode_shellshock(is_melee, is_upgraded)
do_game_mode_shellshock(is_melee, is_reviving)
{
self notify( "do_game_mode_shellshock" );
self endon( "do_game_mode_shellshock" );
@ -1779,9 +1782,12 @@ do_game_mode_shellshock(is_melee, is_upgraded)
{
time = 0.75;
self setStance("stand");
self allowCrouch(0);
self allowProne(0);
if(!is_reviving)
{
self setStance("stand");
self allowCrouch(0);
self allowProne(0);
}
}
self._being_shellshocked = 1;
@ -1793,7 +1799,7 @@ do_game_mode_shellshock(is_melee, is_upgraded)
self._being_shellshocked = 0;
self._being_pushed = 0;
if(is_melee && is_player_valid(self))
if(is_melee && !is_reviving && is_player_valid(self))
{
self allowCrouch(1);
self allowProne(1);