From f0ebf4b3fe3230b78c8937a3acd38849f2a92385 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Fri, 14 Jun 2024 23:46:14 -0700 Subject: [PATCH] One Inch Punch: fix being able to switch weapons during flourish anim --- .../zm/replaced/_zm_weap_one_inch_punch.gsc | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/zm/replaced/_zm_weap_one_inch_punch.gsc b/scripts/zm/replaced/_zm_weap_one_inch_punch.gsc index 77a3c47f..7f0f392b 100644 --- a/scripts/zm/replaced/_zm_weap_one_inch_punch.gsc +++ b/scripts/zm/replaced/_zm_weap_one_inch_punch.gsc @@ -32,6 +32,7 @@ one_inch_punch_melee_attack() current_melee_weapon = self get_player_melee_weapon(); str_weapon = self getcurrentweapon(); + self increment_is_drinking(); self disable_player_move_states(1); self giveweapon(flourish_weapon); self switchtoweapon(flourish_weapon); @@ -51,19 +52,23 @@ one_inch_punch_melee_attack() if (result != "player_downed") { - self waittill_any("player_downed", "weapon_change_complete"); + result = self waittill_any_return("player_downed", "weapon_change_complete"); } - if (is_melee_weapon(str_weapon)) + if (result != "player_downed") { - self switchtoweapon("held_" + punch_weapon); - } - else - { - self switchtoweapon(str_weapon); + if (is_melee_weapon(str_weapon)) + { + self switchtoweapon("held_" + punch_weapon); + } + else + { + self switchtoweapon(str_weapon); + } } self takeweapon(flourish_weapon); + self decrement_is_drinking(); self enable_player_move_states(); if (!isdefined(self.b_punch_upgraded) || !self.b_punch_upgraded)