From 81bfa76e95f5ee3504e9d6ff92f6c408a681459d Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Sat, 25 Mar 2023 10:59:03 -0700 Subject: [PATCH] MOTD: fix afterlife weapon not being switched back to after afterlife revive dropped --- scripts/zm/replaced/_zm_laststand.gsc | 10 ++++++++-- scripts/zm/zgrief/zgrief_reimagined.gsc | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/zm/replaced/_zm_laststand.gsc b/scripts/zm/replaced/_zm_laststand.gsc index 94bd63f2..b612de9f 100644 --- a/scripts/zm/replaced/_zm_laststand.gsc +++ b/scripts/zm/replaced/_zm_laststand.gsc @@ -174,16 +174,22 @@ laststand_clean_up_reviving_any( playerbeingrevived ) //checked changed to match revive_give_back_weapons( gun ) { + revive_tool = level.revive_tool; + if ( is_true( self.afterlife ) ) + { + revive_tool = level.afterlife_revive_tool; + } + cur_wep = self getCurrentWeapon(); - self takeweapon( level.revive_tool ); + self takeweapon( revive_tool ); if ( self maps\mp\zombies\_zm_laststand::player_is_in_laststand() ) { return; } - if (cur_wep != level.revive_tool) + if (cur_wep != revive_tool) { return; } diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index 92ec8378..84a8c4d8 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -2631,7 +2631,7 @@ race_check_for_kills() self waittill("zom_kill", zombie); amount = 1; - if (zombie.animname == "brutus_zombie") + if (is_true(zombie.is_brutus)) { amount = 10; }