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

Tombstone gives back Quick Revive in solo

This commit is contained in:
Jbleezy
2020-03-12 15:11:11 -07:00
parent c207159ad7
commit 9fdd2bdb25
2 changed files with 12 additions and 21 deletions

View File

@ -102,7 +102,7 @@
### Tombstone Soda ### Tombstone Soda
* Added in solo * Added in solo
* Players keep all other perks when revived (except Quick Revive in solo) * Players keep all other perks when revived
* Tombstone powerup no longer spawns until the player bleeds out * Tombstone powerup no longer spawns until the player bleeds out
* Unlimited time to pick up Tombstone powerup * Unlimited time to pick up Tombstone powerup
* Disabled suicide option when player is down * Disabled suicide option when player is down

View File

@ -3116,7 +3116,6 @@ tombstone_restore_perks()
self waittill( "player_revived" ); self waittill( "player_revived" );
player_has_mule_kick = 0; player_has_mule_kick = 0;
discard_quickrevive = 0;
discard_tombstone = 0; discard_tombstone = 0;
if ( isDefined( self.a_saved_perks ) && self.a_saved_perks.size >= 2 ) if ( isDefined( self.a_saved_perks ) && self.a_saved_perks.size >= 2 )
{ {
@ -3124,11 +3123,7 @@ tombstone_restore_perks()
while ( i < self.a_saved_perks.size ) while ( i < self.a_saved_perks.size )
{ {
perk = self.a_saved_perks[ i ]; perk = self.a_saved_perks[ i ];
if ( perk == "specialty_quickrevive" && flag("solo_game") ) if ( perk == "specialty_scavenger" )
{
discard_quickrevive = 1;
}
else if ( perk == "specialty_scavenger" )
{ {
discard_tombstone = 1; discard_tombstone = 1;
} }
@ -3141,33 +3136,29 @@ tombstone_restore_perks()
while ( i < size ) while ( i < size )
{ {
perk = self.a_saved_perks[ i ]; perk = self.a_saved_perks[ i ];
if ( discard_quickrevive == 1 && perk == "specialty_quickrevive" )
if ( perk == "specialty_scavenger" && discard_tombstone == 1 )
{ {
i++; i++;
continue; continue;
} }
else if ( discard_tombstone == 1 && perk == "specialty_scavenger" )
if ( perk == "specialty_additionalprimaryweapon" )
{ {
i++; player_has_mule_kick = 1;
continue;
} }
else
if ( !(perk == "specialty_quickrevive" && flag("solo_game")) )
{ {
if ( perk == "specialty_additionalprimaryweapon" )
{
player_has_mule_kick = 1;
}
if ( self hasperk( perk ) ) if ( self hasperk( perk ) )
{ {
i++; i++;
continue; continue;
} }
else
{
self maps/mp/zombies/_zm_perks::give_perk( perk );
wait_network_frame();
}
} }
self maps/mp/zombies/_zm_perks::give_perk( perk );
wait_network_frame();
i++; i++;
} }
self.a_restoring_perks = undefined; self.a_restoring_perks = undefined;