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

EMP Grenade: enable perks on bleed out

Browse Source
This commit is contained in:
Jbleezy
2022-01-31 11:01:17 -08:00
parent c2bb516dba
commit 29a6e6e611
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/zm/replaced/_zm_weap_emp_bomb.gsc
View File

@ -88,7 +88,7 @@ player_perk_pause_and_unpause_all_perks(time)
self player_perk_pause_all_perks(); self player_perk_pause_all_perks();
self thread player_perk_pause_all_perks_acquired(time); self thread player_perk_pause_all_perks_acquired(time);
wait time; self waittill_any_or_timeout(time, "bled_out", "player_suicide");
self player_perk_unpause_all_perks(); self player_perk_unpause_all_perks();
} }
@ -99,8 +99,6 @@ player_perk_pause_all_perks_acquired(time)
self endon("player_perk_pause_and_unpause_all_perks"); self endon("player_perk_pause_and_unpause_all_perks");
self endon("disconnect"); self endon("disconnect");
self thread player_perk_pause_all_perks_acquired_timeout(time);
while(1) while(1)
{ {
self waittill("perk_acquired"); self waittill("perk_acquired");
@ -111,16 +109,6 @@ player_perk_pause_all_perks_acquired(time)
} }
} }
player_perk_pause_all_perks_acquired_timeout(time)
{
self endon("player_perk_pause_and_unpause_all_perks");
self endon("disconnect");
wait 30;
self notify("player_perk_pause_all_perks_acquired_timeout");
}
player_perk_pause_all_perks() player_perk_pause_all_perks()
{ {
vending_triggers = getentarray( "zombie_vending", "targetname" ); vending_triggers = getentarray( "zombie_vending", "targetname" );
@ -132,6 +120,8 @@ player_perk_pause_all_perks()
player_perk_unpause_all_perks() player_perk_unpause_all_perks()
{ {
self notify("player_perk_pause_all_perks_acquired_timeout");
vending_triggers = getentarray( "zombie_vending", "targetname" ); vending_triggers = getentarray( "zombie_vending", "targetname" );
foreach ( trigger in vending_triggers ) foreach ( trigger in vending_triggers )
{ {

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

@ -1999,15 +1999,14 @@ unlimited_powerups()
player_suicide() player_suicide()
{ {
self notify( "player_suicide" );
if(level.scr_zm_ui_gametype_obj != "zgrief") if(level.scr_zm_ui_gametype_obj != "zgrief")
{ {
self maps/mp/zombies/_zm::spectator_respawn();
self.revives--;
return; return;
} }
self.playersuicided = 1; self.playersuicided = 1;
self notify( "player_suicide" );
wait_network_frame(); wait_network_frame();