diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index 8ad025ef..231811b3 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -4015,7 +4015,7 @@ tombstone_save() self.tombstone_savedweapon_mine = self get_player_placeable_mine(); self.tombstone_savedweapon_equipment = self get_player_equipment(); self.tombstone_hasriotshield = undefined; - self.tombstone_perks = maps/mp/zombies/_zm_tombstone::tombstone_save_perks(self); + self.tombstone_perks = tombstone_save_perks(self); // can't switch to alt weapon if(is_alt_weapon(self.tombstone_savedweapon_currentweapon)) @@ -4053,6 +4053,40 @@ tombstone_save() } } +tombstone_save_perks( ent ) +{ + perk_array = []; + if ( ent hasperk( "specialty_armorvest" ) ) + { + perk_array[ perk_array.size ] = "specialty_armorvest"; + } + if ( ent hasperk( "specialty_deadshot" ) ) + { + perk_array[ perk_array.size ] = "specialty_deadshot"; + } + if ( ent hasperk( "specialty_fastreload" ) ) + { + perk_array[ perk_array.size ] = "specialty_fastreload"; + } + if ( ent hasperk( "specialty_flakjacket" ) ) + { + perk_array[ perk_array.size ] = "specialty_flakjacket"; + } + if ( ent hasperk( "specialty_movefaster" ) ) + { + perk_array[ perk_array.size ] = "specialty_movefaster"; + } + if ( ent hasperk( "specialty_quickrevive" ) ) + { + perk_array[ perk_array.size ] = "specialty_quickrevive"; + } + if ( ent hasperk( "specialty_rof" ) ) + { + perk_array[ perk_array.size ] = "specialty_rof"; + } + return perk_array; +} + tombstone_give() { if ( !isDefined( self.tombstone_savedweapon_weapons ) ) diff --git a/scripts/zm/replaced/_zm.gsc b/scripts/zm/replaced/_zm.gsc index c7de0021..8bb412d3 100644 --- a/scripts/zm/replaced/_zm.gsc +++ b/scripts/zm/replaced/_zm.gsc @@ -919,7 +919,7 @@ player_laststand( einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, s self addweaponstat( statweapon, "deathsDuringUse", 1 ); if ( is_true( self.hasperkspecialtytombstone ) ) { - self.laststand_perks = maps/mp/zombies/_zm_tombstone::tombstone_save_perks( self ); + self.laststand_perks = scripts/zm/_zm_reimagined::tombstone_save_perks( self ); } if ( isDefined( self.pers_upgrades_awarded[ "perk_lose" ] ) && self.pers_upgrades_awarded[ "perk_lose" ] ) {