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

Grief: restore all player weapon vars on round restart

Browse Source 
Take all weapons before returning saved weapons
This commit is contained in:
Jbleezy
2022-01-03 01:02:08 -08:00
parent 3144f0968a
commit 7fb05624cb
1 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1255,11 +1255,12 @@ grief_laststand_weapon_save( einflictor, attacker, idamage, smeansofdeath, sweap
self.grief_savedweapon_weaponsammo_clip_alt = []; self.grief_savedweapon_weaponsammo_clip_alt = [];
self.grief_savedweapon_weaponsammo_stock_alt = []; self.grief_savedweapon_weaponsammo_stock_alt = [];
self.grief_savedweapon_currentweapon = self getcurrentweapon(); self.grief_savedweapon_currentweapon = self getcurrentweapon();
self.grief_savedweapon_melee = self get_player_melee_weapon();
self.grief_savedweapon_grenades = self get_player_lethal_grenade(); self.grief_savedweapon_grenades = self get_player_lethal_grenade();
self.grief_savedweapon_tactical = self get_player_tactical_grenade(); self.grief_savedweapon_tactical = self get_player_tactical_grenade();
self.grief_savedweapon_mine = self get_player_placeable_mine();
self.grief_savedweapon_equipment = self get_player_equipment();
self.grief_hasriotshield = undefined; self.grief_hasriotshield = undefined;
self.grief_savedweapon_claymore = undefined;
self.grief_savedweapon_equipment = undefined;
// can't switch to alt weapon // can't switch to alt weapon
if(is_alt_weapon(self.grief_savedweapon_currentweapon)) if(is_alt_weapon(self.grief_savedweapon_currentweapon))
@ -1267,6 +1268,15 @@ grief_laststand_weapon_save( einflictor, attacker, idamage, smeansofdeath, sweap
self.grief_savedweapon_currentweapon = maps/mp/zombies/_zm_weapons::get_nonalternate_weapon(self.grief_savedweapon_currentweapon); self.grief_savedweapon_currentweapon = maps/mp/zombies/_zm_weapons::get_nonalternate_weapon(self.grief_savedweapon_currentweapon);
} }
for ( i = 0; i < self.grief_savedweapon_weapons.size; i++ )
{
self.grief_savedweapon_weaponsammo_clip[ i ] = self getweaponammoclip( self.grief_savedweapon_weapons[ i ] );
self.grief_savedweapon_weaponsammo_clip_dualwield[ i ] = self getweaponammoclip(weaponDualWieldWeaponName( self.grief_savedweapon_weapons[ i ] ) );
self.grief_savedweapon_weaponsammo_stock[ i ] = self getweaponammostock( self.grief_savedweapon_weapons[ i ] );
self.grief_savedweapon_weaponsammo_clip_alt[i] = self getweaponammoclip(weaponAltWeaponName(self.grief_savedweapon_weapons[i]));
self.grief_savedweapon_weaponsammo_stock_alt[i] = self getweaponammostock(weaponAltWeaponName(self.grief_savedweapon_weapons[i]));
}
if ( isDefined( self.grief_savedweapon_grenades ) ) if ( isDefined( self.grief_savedweapon_grenades ) )
{ {
self.grief_savedweapon_grenades_clip = self getweaponammoclip( self.grief_savedweapon_grenades ); self.grief_savedweapon_grenades_clip = self getweaponammoclip( self.grief_savedweapon_grenades );
@ -1277,30 +1287,15 @@ grief_laststand_weapon_save( einflictor, attacker, idamage, smeansofdeath, sweap
self.grief_savedweapon_tactical_clip = self getweaponammoclip( self.grief_savedweapon_tactical ); self.grief_savedweapon_tactical_clip = self getweaponammoclip( self.grief_savedweapon_tactical );
} }
for ( i = 0; i < self.grief_savedweapon_weapons.size; i++ ) if ( isDefined( self.grief_savedweapon_mine ) )
{ {
self.grief_savedweapon_weaponsammo_clip[ i ] = self getweaponammoclip( self.grief_savedweapon_weapons[ i ] ); self.grief_savedweapon_mine_clip = self getweaponammoclip( self.grief_savedweapon_mine );
self.grief_savedweapon_weaponsammo_clip_dualwield[ i ] = self getweaponammoclip(weaponDualWieldWeaponName( self.grief_savedweapon_weapons[ i ] ) );
self.grief_savedweapon_weaponsammo_stock[ i ] = self getweaponammostock( self.grief_savedweapon_weapons[ i ] );
self.grief_savedweapon_weaponsammo_clip_alt[i] = self getweaponammoclip(weaponAltWeaponName(self.grief_savedweapon_weapons[i]));
self.grief_savedweapon_weaponsammo_stock_alt[i] = self getweaponammostock(weaponAltWeaponName(self.grief_savedweapon_weapons[i]));
} }
if ( isDefined( self.hasriotshield ) && self.hasriotshield ) if ( isDefined( self.hasriotshield ) && self.hasriotshield )
{ {
self.grief_hasriotshield = 1; self.grief_hasriotshield = 1;
} }
if ( self hasweapon( "claymore_zm" ) )
{
self.grief_savedweapon_claymore = 1;
self.grief_savedweapon_claymore_clip = self getweaponammoclip( "claymore_zm" );
}
if ( isDefined( self.current_equipment ) )
{
self.grief_savedweapon_equipment = self.current_equipment;
}
} }
grief_laststand_weapons_return() grief_laststand_weapons_return()
@ -1315,6 +1310,8 @@ grief_laststand_weapons_return()
return 0; return 0;
} }
self takeAllWeapons(); // fixes player always having knife_zm
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 )
@ -1372,9 +1369,15 @@ grief_laststand_weapons_return()
i++; i++;
} }
if ( isDefined( self.grief_savedweapon_melee ) )
{
self set_player_melee_weapon( self.grief_savedweapon_melee );
}
if ( isDefined( self.grief_savedweapon_grenades ) ) if ( isDefined( self.grief_savedweapon_grenades ) )
{ {
self giveweapon( self.grief_savedweapon_grenades ); self giveweapon( self.grief_savedweapon_grenades );
self set_player_lethal_grenade( self.grief_savedweapon_grenades );
if ( isDefined( self.grief_savedweapon_grenades_clip ) ) if ( isDefined( self.grief_savedweapon_grenades_clip ) )
{ {
@ -1385,6 +1388,7 @@ grief_laststand_weapons_return()
if ( isDefined( self.grief_savedweapon_tactical ) ) if ( isDefined( self.grief_savedweapon_tactical ) )
{ {
self giveweapon( self.grief_savedweapon_tactical ); self giveweapon( self.grief_savedweapon_tactical );
self set_player_tactical_grenade( self.grief_savedweapon_tactical );
if ( isDefined( self.grief_savedweapon_tactical_clip ) ) if ( isDefined( self.grief_savedweapon_tactical_clip ) )
{ {
@ -1392,6 +1396,14 @@ grief_laststand_weapons_return()
} }
} }
if ( isDefined( self.grief_savedweapon_mine ) )
{
self giveweapon( self.grief_savedweapon_mine );
self set_player_placeable_mine( self.grief_savedweapon_mine );
self setactionslot( 4, "weapon", self.grief_savedweapon_mine );
self setweaponammoclip( self.grief_savedweapon_mine, self.grief_savedweapon_mine_clip );
}
if ( isDefined( self.current_equipment ) ) if ( isDefined( self.current_equipment ) )
{ {
self maps/mp/zombies/_zm_equipment::equipment_take( self.current_equipment ); self maps/mp/zombies/_zm_equipment::equipment_take( self.current_equipment );
@ -1412,14 +1424,6 @@ grief_laststand_weapons_return()
} }
} }
if ( isDefined( self.grief_savedweapon_claymore ) && self.grief_savedweapon_claymore )
{
self giveweapon( "claymore_zm" );
self set_player_placeable_mine( "claymore_zm" );
self setactionslot( 4, "weapon", "claymore_zm" );
self setweaponammoclip( "claymore_zm", self.grief_savedweapon_claymore_clip );
}
primaries = self getweaponslistprimaries(); primaries = self getweaponslistprimaries();
foreach ( weapon in primaries ) foreach ( weapon in primaries )
{ {