From fbf8fbcdac834981d3dc7e917816d1502c777492 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Wed, 5 Apr 2023 23:59:09 -0700 Subject: [PATCH] Blundergat Upgrade: does knuckle crack anim --- README.md | 4 +++- scripts/zm/replaced/zm_alcatraz_utility.gsc | 14 ++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 23bd6b00..6c74b6bb 100644 --- a/README.md +++ b/README.md @@ -431,7 +431,9 @@ * Fixed an issue where each chop would only damage entities that were touching the damage trigger during the previous chop ### Blundergat Upgrade -* Buildable table trigger requires look at +* Does knuckle crack animation on conversion +* Requires player's current weapon to be the Blundergat to convert +* Requires player to be looking at the table to use ### Maxis Drone * Kills on any round in 1-4 shots (normally does 12000 damage max) diff --git a/scripts/zm/replaced/zm_alcatraz_utility.gsc b/scripts/zm/replaced/zm_alcatraz_utility.gsc index 98ff9133..47f205af 100644 --- a/scripts/zm/replaced/zm_alcatraz_utility.gsc +++ b/scripts/zm/replaced/zm_alcatraz_utility.gsc @@ -42,13 +42,6 @@ blundergat_upgrade_station() continue; } - str_valid_weapon = undefined; - - if ( player hasweapon( "blundergat_zm" ) ) - str_valid_weapon = "blundergat_zm"; - else if ( player hasweapon( "blundergat_upgraded_zm" ) ) - str_valid_weapon = "blundergat_upgraded_zm"; - if (player.score < t_upgrade.cost) { self play_sound_on_ent( "no_purchase" ); @@ -56,12 +49,13 @@ blundergat_upgrade_station() continue; } - if ( isdefined( str_valid_weapon ) ) + str_valid_weapon = player getcurrentweapon(); + if ( str_valid_weapon == "blundergat_zm" || str_valid_weapon == "blundergat_upgraded_zm" ) { player maps\mp\zombies\_zm_score::minus_to_player_score( t_upgrade.cost ); t_upgrade play_sound_on_ent( "purchase" ); - player takeweapon( str_valid_weapon ); + player thread maps\mp\zombies\_zm_perks::do_knuckle_crack(); player.is_pack_splatting = 1; t_upgrade setinvisibletoall(); m_converter.worldgun = spawn_weapon_model( str_valid_weapon, undefined, m_converter.v_weapon_origin, m_converter.v_weapon_angles ); @@ -71,7 +65,7 @@ blundergat_upgrade_station() if ( isdefined( player ) ) { t_upgrade setvisibletoplayer( player ); - t_upgrade thread wait_for_player_to_take( player, str_valid_weapon ); + t_upgrade thread maps\mp\zm_alcatraz_utility::wait_for_player_to_take( player, str_valid_weapon ); } t_upgrade thread wait_for_timeout();