diff --git a/README.md b/README.md index e0399b47..7617633f 100644 --- a/README.md +++ b/README.md @@ -860,15 +860,9 @@ * Players retain perks ### Encounter Pro -* 100 player health -* Added Juggernog and Speed Cola on all maps -* Removed all perks except for Juggernog and Speed Cola -* Removed Pack-a-Punch -* Removed Mystery Box -* Removed powerups -* Removed buildables * Removed unlimited sprint -* Disabled Semtex and Claymore wallbuys +* Removed Mystery Box +* Removed Pack-a-Punch ## Launching New Maps diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index 06b16841..ab00f09d 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -158,15 +158,7 @@ init() level.player_too_many_players_check = 0; level.player_too_many_weapons_monitor_func = scripts\zm\replaced\_zm::player_too_many_weapons_monitor; level.pregame_minplayers = getDvarInt("party_minplayers"); - - if(getDvar("g_gametype") == "zgrief" && is_true(level.scr_zm_ui_gametype_pro)) - { - level.player_starting_health = 100; - } - else - { - level.player_starting_health = 150; - } + level.player_starting_health = 150; setscoreboardcolumns_gametype(); set_lethal_grenade_init(); @@ -2564,12 +2556,6 @@ wallbuy_location_changes() add_wallbuy("bowie_knife_zm"); } } - - if(is_true(level.scr_zm_ui_gametype_pro)) - { - remove_wallbuy("sticky_grenade_zm"); - remove_wallbuy("claymore_zm"); - } } } diff --git a/scripts/zm/locs/zm_prison_loc_docks.gsc b/scripts/zm/locs/zm_prison_loc_docks.gsc index b98d65d3..200162ca 100644 --- a/scripts/zm/locs/zm_prison_loc_docks.gsc +++ b/scripts/zm/locs/zm_prison_loc_docks.gsc @@ -12,11 +12,6 @@ struct_init() scripts\zm\replaced\utility::register_perk_struct( "specialty_armorvest", "zombie_vending_jugg", ( 473.92, 6638.99, 208 ), ( 0, 102, 0 ) ); scripts\zm\replaced\utility::register_perk_struct( "specialty_weapupgrade", "p6_zm_al_vending_pap_on", ( -1769, 5395, -72 ), ( 0, 100, 0 ) ); - if (getDvarInt("ui_gametype_pro")) - { - scripts\zm\replaced\utility::register_perk_struct( "specialty_fastreload", "zombie_vending_sleight", (-629, 6984, 64), ( 0, 100, 0 ) ); - } - ind = 0; respawnpoints = getstructarray( "player_respawn_point", "targetname" ); for(i = 0; i < respawnpoints.size; i++) diff --git a/scripts/zm/replaced/_zm_perks.gsc b/scripts/zm/replaced/_zm_perks.gsc index b381e734..e42574bc 100644 --- a/scripts/zm/replaced/_zm_perks.gsc +++ b/scripts/zm/replaced/_zm_perks.gsc @@ -1009,84 +1009,20 @@ initialize_custom_perk_arrays() struct.scr_zm_map_start_location = "processing"; move_perk_machine("zm_buried", "street", "specialty_fastreload", struct); - if(getDvar("g_gametype") == "zgrief" && getDvarIntDefault("ui_gametype_pro", 0)) + if(getDvar("g_gametype") == "zgrief" && getDvarIntDefault("ui_gametype_pro", 0)) { - add_missing_perk_machines(); - remove_perk_machines(); + remove_pap_machine(); } } -add_missing_perk_machines() -{ - structs = getStructArray("zm_perk_machine", "targetname"); - foreach(struct in structs) - { - if((level.script == "zm_transit" && level.scr_zm_map_start_location == "transit")) - { - if(isDefined(struct.script_noteworthy) && struct.script_noteworthy == "specialty_quickrevive") - { - if(isDefined(struct.script_string) && isSubStr(struct.script_string, "zclassic_perks_transit")) - { - struct.script_noteworthy = "specialty_armorvest"; - struct.script_string += " zgrief_perks_transit"; - } - } - - if(isDefined(struct.script_noteworthy) && struct.script_noteworthy == "specialty_fastreload") - { - if(isDefined(struct.script_string) && isSubStr(struct.script_string, "zclassic_perks_transit")) - { - struct.script_string += " zgrief_perks_transit"; - struct.origin = (-6304, 5363, -57); - struct.angles += (0, 180, 0); - } - } - } - else if((level.script == "zm_transit" && level.scr_zm_map_start_location == "cornfield")) - { - if(isDefined(struct.script_noteworthy) && struct.script_noteworthy == "specialty_armorvest") - { - if(isDefined(struct.script_string) && isSubStr(struct.script_string, "zclassic_perks_transit")) - { - struct.script_string += " zgrief_perks_cornfield"; - struct.origin = (9985, -91, -213); - struct.angles = (0, 30, 0); - } - } - - if(isDefined(struct.script_noteworthy) && struct.script_noteworthy == "specialty_fastreload") - { - if(isDefined(struct.script_string) && isSubStr(struct.script_string, "zclassic_perks_transit")) - { - struct.script_string += " zgrief_perks_cornfield"; - struct.origin = (10257, -1802, -212); - struct.angles = (0, 180, 0); - } - } - } - else if((level.script == "zm_prison" && level.scr_zm_map_start_location == "cellblock")) - { - if(isDefined(struct.script_noteworthy) && struct.script_noteworthy == "specialty_rof") - { - if(isDefined(struct.script_string) && isSubStr(struct.script_string, "zgrief_perks_cellblock")) - { - struct.script_noteworthy = "specialty_armorvest"; - struct.origin = (1411, 9663, 1335); - struct.angles += (0, 180, 0); - } - } - } - } -} - -remove_perk_machines() +remove_pap_machine() { exceptions = array("specialty_armorvest", "specialty_fastreload"); structs = getStructArray("zm_perk_machine", "targetname"); foreach(struct in structs) { - if(isDefined(struct.script_noteworthy) && !isInArray(exceptions, struct.script_noteworthy)) + if(isDefined(struct.script_noteworthy) && struct.script_noteworthy == "specialty_weapupgrade") { struct.script_string = ""; } diff --git a/scripts/zm/replaced/zm_buried_gamemodes.gsc b/scripts/zm/replaced/zm_buried_gamemodes.gsc index a6ca3ac4..9fb574c0 100644 --- a/scripts/zm/replaced/zm_buried_gamemodes.gsc +++ b/scripts/zm/replaced/zm_buried_gamemodes.gsc @@ -51,13 +51,6 @@ buildbuildable( buildable ) piece maps\mp\zombies\_zm_buildables::piece_unspawn(); } - if (is_true(level.scr_zm_ui_gametype_pro)) - { - thread maps\mp\zombies\_zm_unitrigger::unregister_unitrigger( stub ); - - return; - } - stub maps\mp\zombies\_zm_buildables::buildablestub_finish_build( player ); stub.model notsolid(); diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index 2f42cdad..f12dde24 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -379,11 +379,6 @@ set_grief_vars() level.player_starting_points = 10000; } - if(level.scr_zm_ui_gametype_pro) - { - level.zombie_vars["zombie_powerup_drop_max_per_round"] = 0; - } - level.zombie_vars["zombie_powerup_drop_increment"] = level.player_starting_points * 4; if(is_respawn_gamemode()) @@ -3108,11 +3103,6 @@ meat_powerup_drop_think() level.zombie_powerup_ape = "meat_stink"; level.zombie_vars["zombie_drop_item"] = 1; - if (is_true(level.scr_zm_ui_gametype_pro)) - { - level.zombie_vars["zombie_powerup_drop_max_per_round"] = 1; - } - level waittill( "powerup_dropped", powerup ); if (powerup.powerup_name != "meat_stink") @@ -3120,11 +3110,6 @@ meat_powerup_drop_think() continue; } - if (is_true(level.scr_zm_ui_gametype_pro)) - { - level.zombie_vars["zombie_powerup_drop_max_per_round"] = 0; - } - if (!isDefined(level.meat_player)) { players = get_players();