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

Encounter: fix Mule Kick weapon not being restored properly on respawn

Browse Source
This commit is contained in:
Jbleezy
2023-03-25 01:43:04 -07:00
parent 4a07462e41
commit 1ef0a18056
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/zm/replaced/_zm_gametype.gsc
View File

@ -149,11 +149,12 @@ onplayerspawned()
{ {
self [[ level.givecustomcharacters ]](); self [[ level.givecustomcharacters ]]();
} }
weapons_restored = 0;
if ( isDefined( level.onplayerspawned_restore_previous_weapons ) ) if ( isDefined( level.onplayerspawned_restore_previous_weapons ) )
{ {
weapons_restored = self [[ level.onplayerspawned_restore_previous_weapons ]](); weapons_restored = self [[ level.onplayerspawned_restore_previous_weapons ]]();
} }
if ( isDefined( weapons_restored ) && !weapons_restored || !isDefined( weapons_restored ) ) if ( !is_true( weapons_restored ) )
{ {
self giveweapon( "knife_zm" ); self giveweapon( "knife_zm" );
self give_start_weapon( 1 ); self give_start_weapon( 1 );

26
scripts/zm/zgrief/zgrief_reimagined.gsc
View File

@ -2188,6 +2188,18 @@ grief_laststand_weapons_return()
return 0; return 0;
} }
if(is_true(self._retain_perks))
{
if(isDefined(self.grief_savedperks))
{
self.perks_active = [];
foreach(perk in self.grief_savedperks)
{
self maps\mp\zombies\_zm_perks::give_perk(perk);
}
}
}
primary_weapons_returned = 0; primary_weapons_returned = 0;
i = 0; i = 0;
while ( i < self.grief_savedweapon_weapons.size ) while ( i < self.grief_savedweapon_weapons.size )
@ -2200,7 +2212,7 @@ grief_laststand_weapons_return()
if ( isweaponprimary( self.grief_savedweapon_weapons[ i ] ) ) if ( isweaponprimary( self.grief_savedweapon_weapons[ i ] ) )
{ {
if ( primary_weapons_returned >= 2 ) if ( primary_weapons_returned >= get_player_weapon_limit( self ) )
{ {
i++; i++;
continue; continue;
@ -2282,18 +2294,6 @@ grief_laststand_weapons_return()
self thread grief_laststand_items_return(); self thread grief_laststand_items_return();
if(is_true(self._retain_perks))
{
if(isDefined(self.grief_savedperks))
{
self.perks_active = [];
foreach(perk in self.grief_savedperks)
{
self maps\mp\zombies\_zm_perks::give_perk(perk);
}
}
}
self.grief_savedweapon_weapons = undefined; self.grief_savedweapon_weapons = undefined;
primaries = self getweaponslistprimaries(); primaries = self getweaponslistprimaries();