From d43a3bb9a8c8d9c8601534273b9f061b8d703156 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Mon, 24 Apr 2023 14:56:16 -0700 Subject: [PATCH] Who's Who: fix status icons --- scripts/zm/_zm_reimagined.gsc | 26 ++++++++------------------ scripts/zm/replaced/_zm_chugabud.gsc | 10 ++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index 2eb37657..de754e5c 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -184,7 +184,6 @@ on_player_connect() player thread on_player_downed(); player thread on_player_revived(); player thread on_player_fake_revive(); - player thread on_player_chugabud_effects_cleanup(); player thread weapon_inspect_watcher(); } @@ -285,7 +284,14 @@ on_player_revived() { self waittill( "player_revived", reviver ); - self.statusicon = ""; + if ( isDefined( self.e_chugabud_corpse ) ) + { + self.statusicon = "specialty_chugabud_zombies"; + } + else + { + self.statusicon = ""; + } } } @@ -309,22 +315,6 @@ on_player_fake_revive() } } -on_player_chugabud_effects_cleanup() -{ - level endon("end_game"); - self endon( "disconnect" ); - - while(1) - { - self waittill( "chugabud_effects_cleanup" ); - - if ( is_player_valid( self ) ) - { - self.statusicon = ""; - } - } -} - post_all_players_spawned() { flag_wait( "start_zombie_round_logic" ); diff --git a/scripts/zm/replaced/_zm_chugabud.gsc b/scripts/zm/replaced/_zm_chugabud.gsc index 8177c275..52565353 100644 --- a/scripts/zm/replaced/_zm_chugabud.gsc +++ b/scripts/zm/replaced/_zm_chugabud.gsc @@ -60,6 +60,11 @@ chugabud_laststand() if ( create_corpse == 0 ) { + if ( is_player_valid( self ) ) + { + self.statusicon = ""; + } + self notify( "chugabud_effects_cleanup" ); return; } @@ -345,6 +350,11 @@ chugabud_corpse_cleanup( corpse, was_revived ) wait 0.1; corpse delete(); self.e_chugabud_corpse = undefined; + + if ( is_player_valid( self ) ) + { + self.statusicon = ""; + } } chugabud_handle_multiple_instances( corpse )