INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-07 21:59:49 -05:00
Code Issues Releases Wiki Activity

One Inch Punch: fix being able to switch weapons during flourish anim

Browse Source
This commit is contained in:
Jbleezy 2024-06-14 23:46:14 -07:00
parent 464c71731f
commit f0ebf4b3fe
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/zm/replaced/_zm_weap_one_inch_punch.gsc
View File

@ -32,6 +32,7 @@ one_inch_punch_melee_attack()
current_melee_weapon = self get_player_melee_weapon(); current_melee_weapon = self get_player_melee_weapon();
str_weapon = self getcurrentweapon(); str_weapon = self getcurrentweapon();
self increment_is_drinking();
self disable_player_move_states(1); self disable_player_move_states(1);
self giveweapon(flourish_weapon); self giveweapon(flourish_weapon);
self switchtoweapon(flourish_weapon); self switchtoweapon(flourish_weapon);
@ -51,19 +52,23 @@ one_inch_punch_melee_attack()
if (result != "player_downed") 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); if (is_melee_weapon(str_weapon))
} {
else self switchtoweapon("held_" + punch_weapon);
{ }
self switchtoweapon(str_weapon); else
{
self switchtoweapon(str_weapon);
}
} }
self takeweapon(flourish_weapon); self takeweapon(flourish_weapon);
self decrement_is_drinking();
self enable_player_move_states(); self enable_player_move_states();
if (!isdefined(self.b_punch_upgraded) || !self.b_punch_upgraded) if (!isdefined(self.b_punch_upgraded) || !self.b_punch_upgraded)