From 77ca8c2a672ced6775684a32d9924c09c9126d30 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Mon, 10 Apr 2023 01:46:32 -0700 Subject: [PATCH] Who's Who: purchasing no longer destroys clone --- README.md | 5 ++++- scripts/zm/replaced/_zm_chugabud.gsc | 17 ++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0842ecaa..490e944c 100644 --- a/README.md +++ b/README.md @@ -334,9 +334,12 @@ ### Who's Who * Keep weapons when entering Who's Who mode +* Keep any perks obtained in Who's Who mode when exiting Who's Who mode +* Revive twice as fast in Who's Who mode * Invulnerable for 2 seconds after entering and exiting Who's Who mode * Controls are frozen for 0.5 seconds after exiting Who's Who mode -* Revive twice as fast when in Who's Who mode +* Purchasing Who's Who in Who's Who mode no longer destroys the clone +* Downing with Who's Who in Who's Who mode destroys the clone * Changed revive waypoint icon to Who's Who perk icon * Revive waypoint shows offscreen diff --git a/scripts/zm/replaced/_zm_chugabud.gsc b/scripts/zm/replaced/_zm_chugabud.gsc index bd0a4b9f..e5bc508a 100644 --- a/scripts/zm/replaced/_zm_chugabud.gsc +++ b/scripts/zm/replaced/_zm_chugabud.gsc @@ -8,6 +8,13 @@ chugabud_laststand() self endon( "player_suicide" ); self endon( "disconnect" ); self endon( "chugabud_bleedout" ); + + if ( isdefined( self.e_chugabud_corpse ) ) + { + self notify( "chugabud_handle_multiple_instances" ); + return; + } + self maps\mp\zombies\_zm_laststand::increment_downed_stat(); self.ignore_insta_kill = 1; self.health = self.maxhealth; @@ -294,11 +301,19 @@ chugabud_handle_multiple_instances( corpse ) { corpse endon( "death" ); - self waittill( "perk_chugabud_activated" ); + self waittill( "chugabud_handle_multiple_instances" ); + self thread chugabud_laststand_wait( corpse ); self chugabud_corpse_cleanup( corpse, 0 ); } +chugabud_laststand_wait( corpse ) +{ + corpse waittill( "death" ); + + self chugabud_laststand(); +} + chugabud_corpse_cleanup_on_disconnect( player ) { self endon( "death" );