1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-10 07:08:06 -05:00

One Inch Punch: remove melee actionslot when player has Maxis Drone

This commit is contained in:
Jbleezy
2023-12-23 21:57:10 -08:00
parent b04fd5292e
commit 4564ad51ca
2 changed files with 6 additions and 2 deletions

View File

@ -43,7 +43,11 @@ one_inch_punch_melee_attack()
self giveweapon( punch_weapon );
self set_player_melee_weapon( punch_weapon );
self giveweapon( "held_" + punch_weapon );
self setactionslot( 2, "weapon", "held_" + punch_weapon );
if (!self hasweapon("equip_dieseldrone_zm"))
{
self setactionslot(2, "weapon", "held_" + punch_weapon);
}
if (result != "player_downed")
{

View File

@ -238,7 +238,7 @@ quadrotor_control_thread()
if (self hasweapon("equip_dieseldrone_zm"))
{
self takeweapon("equip_dieseldrone_zm");
self setactionslot(2, "");
self setactionslot(2, "weapon", "held_" + self get_player_melee_weapon());
}
str_vehicle = "heli_quadrotor_zm";