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: powerup gets destroyed by EMP Grenades

Browse Source 
Fix powerup being hidden while being revived
This commit is contained in:
Jbleezy
2022-01-05 02:52:59 -08:00
parent 2f21253f00
commit 215551d9f4
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -149,9 +149,10 @@
### Tombstone Soda ### Tombstone Soda
* Added in solo * Added in solo
* Tombstone powerup no longer removed when revived * Powerup no longer removed when revived
* Unlimited time to pick up Tombstone powerup * Unlimited time to pick up powerup
* Changed Tombstone powerup fx color to blue * Changed powerup fx color to blue
* Powerup gets destroyed by EMP Grenades
* Disabled suicide option when player is down * Disabled suicide option when player is down
* Flipped perk icon * Flipped perk icon
@ -288,7 +289,6 @@
* Der Wunderfizz: increased cost from 1500 to 2500 * Der Wunderfizz: increased cost from 1500 to 2500
* Der Wunderfizz: all perks have an equal chance of being obtained * Der Wunderfizz: all perks have an equal chance of being obtained
* Rituals of the Ancients: spend points challenge reward changed from Double Tap perk to a random perk that the player does not have (perk does not change if reward is reopened) * Rituals of the Ancients: spend points challenge reward changed from Double Tap perk to a random perk that the player does not have (perk does not change if reward is reopened)
* Rituals of the Ancients: spend points challenge reward gives a permament perk slot
* Soul boxes: decreased kill requirement from 30 to 20 * Soul boxes: decreased kill requirement from 30 to 20
* Perk bottle dig spots: give random perk * Perk bottle dig spots: give random perk
* Perk bottle dig spots: visible and diggable without Zombie Blood * Perk bottle dig spots: visible and diggable without Zombie Blood

33
scripts/zm/_zm_reimagined.gsc
View File

@ -4115,7 +4115,7 @@ tombstone_spawn()
{ {
if(isDefined(self.tombstone_powerup)) if(isDefined(self.tombstone_powerup))
{ {
self.tombstone_powerup tombstone_remove(); self.tombstone_powerup tombstone_delete();
} }
dc = spawn( "script_model", self.origin + vectorScale( ( 0, 0, 1 ), 40 ) ); dc = spawn( "script_model", self.origin + vectorScale( ( 0, 0, 1 ), 40 ) );
@ -4132,13 +4132,13 @@ tombstone_spawn()
self thread maps/mp/zombies/_zm_tombstone::tombstone_clear(); self thread maps/mp/zombies/_zm_tombstone::tombstone_clear();
dc thread tombstone_wobble(); dc thread tombstone_wobble();
dc thread maps/mp/zombies/_zm_tombstone::tombstone_revived( self ); dc thread tombstone_emp();
result = self waittill_any_return( "player_revived", "spawned_player", "disconnect" ); result = self waittill_any_return( "player_revived", "spawned_player", "disconnect" );
if (result == "disconnect") if (result == "disconnect")
{ {
dc tombstone_remove(); dc tombstone_delete();
return; return;
} }
else if(result == "player_revived") else if(result == "player_revived")
@ -4146,7 +4146,7 @@ tombstone_spawn()
tombstone = level.tombstones[self.tombstone_index]; tombstone = level.tombstones[self.tombstone_index];
if(tombstone.perk.size == 1) if(tombstone.perk.size == 1)
{ {
dc tombstone_remove(); dc tombstone_delete();
return; return;
} }
@ -4176,6 +4176,27 @@ tombstone_wobble()
} }
} }
tombstone_emp()
{
self endon( "tombstone_timedout" );
self endon( "tombstone_grabbed" );
if ( !should_watch_for_emp() )
{
return;
}
while ( 1 )
{
level waittill( "emp_detonate", origin, radius );
if ( distancesquared( origin, self.origin ) < ( radius * radius ) )
{
playfx( level._effect[ "powerup_off" ], self.origin );
self thread tombstone_delete();
}
}
}
tombstone_timeout() tombstone_timeout()
{ {
self endon( "tombstone_grabbed" ); self endon( "tombstone_grabbed" );
@ -4184,7 +4205,7 @@ tombstone_timeout()
self waittill("bled_out"); self waittill("bled_out");
self tombstone_remove(); self tombstone_delete();
} }
tombstone_grab() tombstone_grab()
@ -4240,7 +4261,7 @@ tombstone_perks_only()
self.zombie_cymbal_monkey_count = undefined; self.zombie_cymbal_monkey_count = undefined;
} }
tombstone_remove() tombstone_delete()
{ {
self notify( "tombstone_timedout" ); self notify( "tombstone_timedout" );
self.icon unlink(); self.icon unlink();