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

Tombstone: fix switching out of animation weapon

Browse Source
This commit is contained in:
Jbleezy
2022-01-09 06:10:19 -08:00
parent c14952b608
commit cfc1d3776b
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
scripts/zm/_zm_reimagined.gsc
View File

@ -4310,7 +4310,16 @@ tombstone_give()
return ; return ;
} }
self takeAllWeapons(); // fixes player always having knife_zm primary_weapons = self getWeaponsListPrimaries();
foreach(weapon in primary_weapons)
{
self takeWeapon(weapon);
}
self takeWeapon(self get_player_melee_weapon());
self takeWeapon(self get_player_lethal_grenade());
self takeWeapon(self get_player_tactical_grenade());
self takeWeapon(self get_player_placeable_mine());
primary_weapons_returned = 0; primary_weapons_returned = 0;
i = 0; i = 0;
@ -4424,22 +4433,26 @@ tombstone_give()
} }
} }
primaries = self getweaponslistprimaries(); current_wep = self getCurrentWeapon();
switched = 0; if(!isSubStr(current_wep, "perk_bottle") && !isSubStr(current_wep, "knuckle_crack") && !isSubStr(current_wep, "flourish"))
foreach ( weapon in primaries )
{ {
if ( isDefined( self.tombstone_savedweapon_currentweapon ) && self.tombstone_savedweapon_currentweapon == weapon ) switched = 0;
primaries = self getweaponslistprimaries();
foreach ( weapon in primaries )
{ {
switched = 1; if ( isDefined( self.tombstone_savedweapon_currentweapon ) && self.tombstone_savedweapon_currentweapon == weapon )
self switchtoweapon( weapon ); {
switched = 1;
self switchtoweapon( weapon );
}
} }
}
if(!switched) if(!switched)
{
if ( primaries.size > 0 )
{ {
self switchtoweapon( primaries[ 0 ] ); if ( primaries.size > 0 )
{
self switchtoweapon( primaries[ 0 ] );
}
} }
} }