From e7dd18f93d044365fc88bd9e025ea04975a0b2a0 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Tue, 16 May 2023 18:52:22 -0700 Subject: [PATCH] MOTD: fix Zombie Shield not having cost after Brutus spawned --- scripts/zm/replaced/_zm_ai_brutus.gsc | 31 +++++++++++++++++++ scripts/zm/zm_prison/zm_prison_reimagined.gsc | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/scripts/zm/replaced/_zm_ai_brutus.gsc b/scripts/zm/replaced/_zm_ai_brutus.gsc index 26afa2e1..5cb88025 100644 --- a/scripts/zm/replaced/_zm_ai_brutus.gsc +++ b/scripts/zm/replaced/_zm_ai_brutus.gsc @@ -179,6 +179,37 @@ setup_interaction_matrix() } } +check_craftable_table_valid( player ) +{ + if ( !isdefined( self.stub ) && ( isdefined( self.is_locked ) && self.is_locked ) ) + { + if ( player.score >= self.locked_cost ) + { + player minus_to_player_score( self.locked_cost ); + self.is_locked = 0; + self.locked_cost = undefined; + self.lock_fx delete(); + } + + return false; + } + else if ( isdefined( self.stub ) && ( isdefined( self.stub.is_locked ) && self.stub.is_locked ) ) + { + if ( player.score >= self.stub.locked_cost ) + { + player minus_to_player_score( self.stub.locked_cost ); + self.stub.is_locked = 0; + self.stub.locked_cost = undefined; + self.stub.lock_fx delete(); + self scripts\zm\zm_prison\zm_prison_reimagined::craftabletrigger_update_prompt( player ); + } + + return false; + } + + return true; +} + brutus_round_tracker() { level.next_brutus_round = level.round_number + randomintrange( level.brutus_min_round_fq, level.brutus_max_round_fq ); diff --git a/scripts/zm/zm_prison/zm_prison_reimagined.gsc b/scripts/zm/zm_prison/zm_prison_reimagined.gsc index afdf03dc..980b00f7 100644 --- a/scripts/zm/zm_prison/zm_prison_reimagined.gsc +++ b/scripts/zm/zm_prison/zm_prison_reimagined.gsc @@ -209,7 +209,7 @@ updatecraftables() foreach (stub in level._unitriggers.trigger_stubs) { - if(IsDefined(stub.equipname) && stub.equipname == "open_table") + if(IsDefined(stub.equipname) && (stub.equipname == "open_table" || stub.equipname == "alcatraz_shield_zm" || stub.equipname == "packasplat")) { stub.cost = stub scripts\zm\_zm_reimagined::get_equipment_cost(); stub.trigger_func = ::craftable_place_think;