diff --git a/maps/mp/zm_alcatraz_grief_cellblock.gsc b/maps/mp/zm_alcatraz_grief_cellblock.gsc index 88fe99fa..b4f12220 100644 --- a/maps/mp/zm_alcatraz_grief_cellblock.gsc +++ b/maps/mp/zm_alcatraz_grief_cellblock.gsc @@ -27,71 +27,15 @@ zgrief_preinit() zgrief_init() { encounter_init(); - flag_wait( "start_zombie_round_logic" ); - if ( level.round_number < 4 && level.gamedifficulty != 0 ) - { - level.zombie_move_speed = 35; - } } encounter_init() { - level._game_module_player_laststand_callback = ::alcatraz_grief_laststand_weapon_save; level.precachecustomcharacters = ::precache_team_characters; level.givecustomcharacters = ::give_team_characters; level.gamemode_post_spawn_logic = ::give_player_shiv; } -alcatraz_grief_laststand_weapon_save( einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, shitloc, psoffsettime, deathanimduration ) //checked changed to match cerberus output -{ - if ( self hasperk( "specialty_additionalprimaryweapon" ) ) - { - primary_weapons_that_can_be_taken = []; - primaryweapons = self getweaponslistprimaries(); - for ( i = 0; i < primaryweapons.size; i++ ) - { - if ( maps/mp/zombies/_zm_weapons::is_weapon_included( primaryweapons[ i ] ) || maps/mp/zombies/_zm_weapons::is_weapon_upgraded( primaryweapons[ i ] ) ) - { - primary_weapons_that_can_be_taken[ primary_weapons_that_can_be_taken.size ] = primaryweapons[ i ]; - } - } - if ( primary_weapons_that_can_be_taken.size >= 3 ) - { - weapon_to_take = primary_weapons_that_can_be_taken[ primary_weapons_that_can_be_taken.size - 1 ]; - self takeweapon( weapon_to_take ); - self.weapon_taken_by_losing_specialty_additionalprimaryweapon = weapon_to_take; - } - } - self.grief_savedweapon_weapons = self getweaponslist(); - self.grief_savedweapon_weaponsammo_stock = []; - self.grief_savedweapon_weaponsammo_clip = []; - self.grief_savedweapon_currentweapon = self getcurrentweapon(); - self.grief_savedweapon_grenades = self get_player_lethal_grenade(); - if ( isDefined( self.grief_savedweapon_grenades ) ) - { - self.grief_savedweapon_grenades_clip = self getweaponammoclip( self.grief_savedweapon_grenades ); - } - self.grief_savedweapon_tactical = self get_player_tactical_grenade(); - if ( isDefined( 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++ ) - { - self.grief_savedweapon_weaponsammo_clip[ i ] = self getweaponammoclip( self.grief_savedweapon_weapons[ i ] ); - self.grief_savedweapon_weaponsammo_stock[ i ] = self getweaponammostock( self.grief_savedweapon_weapons[ i ] ); - } - if ( isDefined( self.hasriotshield ) && self.hasriotshield ) - { - self.grief_hasriotshield = 1; - } - if ( self hasweapon( "claymore_zm" ) ) - { - self.grief_savedweapon_claymore = 1; - self.grief_savedweapon_claymore_clip = self getweaponammoclip( "claymore_zm" ); - } -} - precache_team_characters() { precachemodel( "c_zom_player_grief_guard_fb" ); diff --git a/scripts/zm/main/_zm_reimagined_zgrief.gsc b/scripts/zm/main/_zm_reimagined_zgrief.gsc index a920c7ff..b80bd643 100644 --- a/scripts/zm/main/_zm_reimagined_zgrief.gsc +++ b/scripts/zm/main/_zm_reimagined_zgrief.gsc @@ -153,7 +153,7 @@ grief_score_hud() set_grief_vars() { level.noroundnumber = 1; - level.player_starting_points = 10000; + level.zombie_move_speed = 100; level.zombie_vars["zombie_health_start"] = 2000; level.zombie_vars["zombie_health_increase"] = 0; level.zombie_vars["zombie_health_increase_multiplier"] = 0; @@ -162,6 +162,7 @@ set_grief_vars() level.zombie_powerups["meat_stink"].func_should_drop_with_regular_powerups = ::func_should_drop_meat; level.brutus_health = 20000; level.brutus_expl_dmg_req = 12000; + level.player_starting_points = 10000; level.global_damage_func = ::zombie_damage; level.custom_end_screen = ::custom_end_screen; level.game_module_onplayerconnect = ::grief_onplayerconnect; @@ -176,10 +177,6 @@ set_grief_vars() level.grief_score["B"] = 0; level.game_mode_griefed_time = 2.5; level.crash_delay = 20; - - flag_wait( "start_zombie_round_logic" ); // needs a wait - - level.zombie_move_speed = 100; } grief_onplayerconnect()