diff --git a/README.md b/README.md index 24296f8c..7576a251 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ * Increased mantle speed * Increased ladder climb speed * Start with Semtex on maps that have Semtex +* Barriers can no longer be rebuilt while sprinting or thowing a grenade * Entering and exiting last stand no longer refills last stand weapon clip automatically * Upgraded weapon camo is applied in last stand * Decreased friendly player name fade out time from 1.5 seconds to 0.25 seconds diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index 54322605..cac77006 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -11,6 +11,7 @@ #include scripts\zm\replaced\_zm_utility; #include scripts\zm\replaced\_zm_score; #include scripts\zm\replaced\_zm_laststand; +#include scripts\zm\replaced\_zm_blockers; #include scripts\zm\replaced\_zm_weapons; #include scripts\zm\replaced\_zm_magicbox; #include scripts\zm\replaced\_zm_perks; @@ -61,6 +62,7 @@ main() replaceFunc(maps\mp\zombies\_zm_laststand::revive_give_back_weapons, scripts\zm\replaced\_zm_laststand::revive_give_back_weapons); replaceFunc(maps\mp\zombies\_zm_laststand::revive_hud_think, scripts\zm\replaced\_zm_laststand::revive_hud_think); replaceFunc(maps\mp\zombies\_zm_laststand::auto_revive, scripts\zm\replaced\_zm_laststand::auto_revive); + replaceFunc(maps\mp\zombies\_zm_blockers::player_fails_blocker_repair_trigger_preamble, scripts\zm\replaced\_zm_blockers::player_fails_blocker_repair_trigger_preamble); replaceFunc(maps\mp\zombies\_zm_weapons::init_weapon_upgrade, scripts\zm\replaced\_zm_weapons::init_weapon_upgrade); replaceFunc(maps\mp\zombies\_zm_weapons::add_dynamic_wallbuy, scripts\zm\replaced\_zm_weapons::add_dynamic_wallbuy); replaceFunc(maps\mp\zombies\_zm_weapons::weapon_give, scripts\zm\replaced\_zm_weapons::weapon_give); diff --git a/scripts/zm/replaced/_zm_blockers.gsc b/scripts/zm/replaced/_zm_blockers.gsc index 3bedf9da..79451b94 100644 --- a/scripts/zm/replaced/_zm_blockers.gsc +++ b/scripts/zm/replaced/_zm_blockers.gsc @@ -20,4 +20,30 @@ handle_post_board_repair_rewards( cost, zbarrier ) { self.board_repair += 1; } +} + +player_fails_blocker_repair_trigger_preamble( player, players, trigger, hold_required ) +{ + if ( !isdefined( trigger ) ) + return true; + + if ( !is_player_valid( player ) ) + return true; + + if ( players.size == 1 && isdefined( players[0].intermission ) && players[0].intermission == 1 ) + return true; + + if ( hold_required && !player usebuttonpressed() ) + return true; + + if ( !hold_required && !player use_button_held() ) + return true; + + if ( player in_revive_trigger() ) + return true; + + if ( player issprinting() || player isthrowinggrenade() ) + return true; + + return false; } \ No newline at end of file