From 2abfbb82c45b711d741cbf00b729e750351c0860 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Mon, 8 Jan 2024 16:36:21 -0800
Subject: [PATCH] Convert fake locations to real locations

---
 ...d3dbsp => so_zencounter_zm_buried.mapents} |  0
 maps/mp/zm_prison.d3dbsp                      |  8 +++
 scripts/zm/locs/zm_buried_loc_maze.gsc        |  9 +--
 scripts/zm/locs/zm_prison_loc_docks.gsc       |  7 +--
 scripts/zm/locs/zm_transit_loc_cornfield.gsc  |  3 -
 scripts/zm/locs/zm_transit_loc_diner.gsc      |  3 -
 scripts/zm/locs/zm_transit_loc_power.gsc      |  3 -
 scripts/zm/locs/zm_transit_loc_tunnel.gsc     |  3 -
 scripts/zm/replaced/zgrief.csc                | 16 ++++++
 scripts/zm/replaced/zm_alcatraz_gamemodes.gsc | 15 +++--
 .../replaced/zm_alcatraz_grief_cellblock.gsc  | 12 +---
 .../zm/replaced/zm_alcatraz_weap_quest.gsc    | 55 ++++++++-----------
 scripts/zm/replaced/zm_buried_gamemodes.gsc   | 15 +++--
 .../zm/replaced/zm_buried_grief_street.gsc    | 12 ----
 scripts/zm/replaced/zm_transit_gamemodes.gsc  |  6 --
 scripts/zm/zgrief/zgrief_reimagined.csc       |  7 +++
 scripts/zm/zgrief/zgrief_reimagined.gsc       | 26 ++++-----
 scripts/zm/zm_buried/zm_buried_reimagined.gsc |  2 +-
 scripts/zm/zm_prison/zm_prison_reimagined.gsc |  2 +-
 ui/t6/mapslist.lua                            |  8 +--
 zone_source/includes/clientscripts.zone       |  4 +-
 21 files changed, 91 insertions(+), 125 deletions(-)
 rename maps/mp/{so_zencounter_zm_buried.d3dbsp => so_zencounter_zm_buried.mapents} (100%)
 create mode 100644 scripts/zm/replaced/zgrief.csc
 create mode 100644 scripts/zm/zgrief/zgrief_reimagined.csc

diff --git a/maps/mp/so_zencounter_zm_buried.d3dbsp b/maps/mp/so_zencounter_zm_buried.mapents
similarity index 100%
rename from maps/mp/so_zencounter_zm_buried.d3dbsp
rename to maps/mp/so_zencounter_zm_buried.mapents
diff --git a/maps/mp/zm_prison.d3dbsp b/maps/mp/zm_prison.d3dbsp
index 56228a6f..31e892e5 100644
--- a/maps/mp/zm_prison.d3dbsp
+++ b/maps/mp/zm_prison.d3dbsp
@@ -15953,12 +15953,20 @@
 "guid" "4966C5A8"
 }
 {
+"script_string" "cellblock"
 "classname" "script_struct"
 "targetname" "wolf_puke_powerup_origin"
 "origin" "880 9680 1312"
 "guid" "E985C3B5"
 }
 {
+"script_string" "docks"
+"classname" "script_struct"
+"targetname" "wolf_puke_powerup_origin"
+"origin" "41 6096 -103"
+"guid" "E985C3B5"
+}
+{
 "model" "*136"
 "origin" "19 6252 129"
 "classname" "trigger_hurt"
diff --git a/scripts/zm/locs/zm_buried_loc_maze.gsc b/scripts/zm/locs/zm_buried_loc_maze.gsc
index 5b0e366a..509ae98e 100644
--- a/scripts/zm/locs/zm_buried_loc_maze.gsc
+++ b/scripts/zm/locs/zm_buried_loc_maze.gsc
@@ -12,7 +12,6 @@
 #include common_scripts\utility;
 #include maps\mp\_utility;
 #include maps\mp\zombies\_zm_zonemgr;
-#include scripts\zm\locs\loc_common;
 
 struct_init()
 {
@@ -88,8 +87,6 @@ struct_init()
 	{
 		if (isDefined(initial_spawn.script_string) && isSubStr(initial_spawn.script_string, "zgrief_maze"))
 		{
-			initial_spawn.script_string = "zgrief_street";
-
 			initial_spawns[initial_spawns.size] = initial_spawn;
 		}
 	}
@@ -141,15 +138,15 @@ struct_init()
 	intermission_cam.origin = (3694, 569, 253);
 	intermission_cam.angles = (30, 0, 0);
 	intermission_cam.targetname = "intermission";
-	intermission_cam.script_string = "street";
+	intermission_cam.script_string = "maze";
 	intermission_cam.speed = 30;
-	intermission_cam.target = "intermission_street_end";
+	intermission_cam.target = "intermission_maze_end";
 	scripts\zm\replaced\utility::add_struct(intermission_cam);
 
 	intermission_cam_end = spawnStruct();
 	intermission_cam_end.origin = (5856, 569, 253);
 	intermission_cam_end.angles = (30, 0, 0);
-	intermission_cam_end.targetname = "intermission_street_end";
+	intermission_cam_end.targetname = "intermission_maze_end";
 	scripts\zm\replaced\utility::add_struct(intermission_cam_end);
 }
 
diff --git a/scripts/zm/locs/zm_prison_loc_docks.gsc b/scripts/zm/locs/zm_prison_loc_docks.gsc
index 7c06d39f..307c91e9 100644
--- a/scripts/zm/locs/zm_prison_loc_docks.gsc
+++ b/scripts/zm/locs/zm_prison_loc_docks.gsc
@@ -3,7 +3,6 @@
 #include maps\mp\_utility;
 #include maps\mp\zm_prison;
 #include maps\mp\zombies\_zm_zonemgr;
-#include scripts\zm\locs\loc_common;
 
 struct_init()
 {
@@ -69,15 +68,15 @@ struct_init()
 	intermission_cam.origin = (402, 6197, 142);
 	intermission_cam.angles = (0, 190, 0);
 	intermission_cam.targetname = "intermission";
-	intermission_cam.script_string = "cellblock";
+	intermission_cam.script_string = "docks";
 	intermission_cam.speed = 30;
-	intermission_cam.target = "intermission_cellblock_end";
+	intermission_cam.target = "intermission_docks_end";
 	scripts\zm\replaced\utility::add_struct(intermission_cam);
 
 	intermission_cam_end = spawnStruct();
 	intermission_cam_end.origin = (-1043, 5931, -47);
 	intermission_cam_end.angles = (0, 190, 0);
-	intermission_cam_end.targetname = "intermission_cellblock_end";
+	intermission_cam_end.targetname = "intermission_docks_end";
 	scripts\zm\replaced\utility::add_struct(intermission_cam_end);
 }
 
diff --git a/scripts/zm/locs/zm_transit_loc_cornfield.gsc b/scripts/zm/locs/zm_transit_loc_cornfield.gsc
index b0c067dc..a0e18648 100644
--- a/scripts/zm/locs/zm_transit_loc_cornfield.gsc
+++ b/scripts/zm/locs/zm_transit_loc_cornfield.gsc
@@ -5,9 +5,6 @@
 #include maps\mp\zombies\_zm;
 #include maps\mp\zombies\_zm_zonemgr;
 
-#include scripts\zm\replaced\utility;
-#include scripts\zm\locs\loc_common;
-
 struct_init()
 {
 	scripts\zm\replaced\utility::register_perk_struct("", "", (0, 0, 0), (0, 0, 0)); // need this for pap to work
diff --git a/scripts/zm/locs/zm_transit_loc_diner.gsc b/scripts/zm/locs/zm_transit_loc_diner.gsc
index 7370580d..5832636b 100644
--- a/scripts/zm/locs/zm_transit_loc_diner.gsc
+++ b/scripts/zm/locs/zm_transit_loc_diner.gsc
@@ -4,9 +4,6 @@
 #include maps\mp\_utility;
 #include maps\mp\zombies\_zm;
 
-#include scripts\zm\replaced\utility;
-#include scripts\zm\locs\loc_common;
-
 struct_init()
 {
 	scripts\zm\replaced\utility::register_perk_struct("specialty_armorvest", "zombie_vending_jugg", (-3563, -7196, -59), (0, 0, 0));
diff --git a/scripts/zm/locs/zm_transit_loc_power.gsc b/scripts/zm/locs/zm_transit_loc_power.gsc
index feac5060..9daff275 100644
--- a/scripts/zm/locs/zm_transit_loc_power.gsc
+++ b/scripts/zm/locs/zm_transit_loc_power.gsc
@@ -5,9 +5,6 @@
 #include maps\mp\zombies\_zm;
 #include maps\mp\zombies\_zm_zonemgr;
 
-#include scripts\zm\replaced\utility;
-#include scripts\zm\locs\loc_common;
-
 struct_init()
 {
 	scripts\zm\replaced\utility::register_perk_struct("specialty_armorvest", "zombie_vending_jugg", (10952, 8055, -565), (0, 270, 0));
diff --git a/scripts/zm/locs/zm_transit_loc_tunnel.gsc b/scripts/zm/locs/zm_transit_loc_tunnel.gsc
index 0ff189cd..f214e623 100644
--- a/scripts/zm/locs/zm_transit_loc_tunnel.gsc
+++ b/scripts/zm/locs/zm_transit_loc_tunnel.gsc
@@ -5,9 +5,6 @@
 #include maps\mp\zombies\_zm;
 #include maps\mp\zombies\_zm_zonemgr;
 
-#include scripts\zm\replaced\utility;
-#include scripts\zm\locs\loc_common;
-
 struct_init()
 {
 	scripts\zm\replaced\utility::register_perk_struct("specialty_armorvest", "zombie_vending_jugg", (-11541, -2630, 194), (0, -180, 0));
diff --git a/scripts/zm/replaced/zgrief.csc b/scripts/zm/replaced/zgrief.csc
new file mode 100644
index 00000000..37623889
--- /dev/null
+++ b/scripts/zm/replaced/zgrief.csc
@@ -0,0 +1,16 @@
+onprecachegametype()
+{
+	if (getdvar("mapname") == "zm_prison")
+	{
+		setteamreviveicon("allies", "waypoint_revive_guards");
+		setteamreviveicon("axis", "waypoint_revive_inmates");
+	}
+	else
+	{
+		setteamreviveicon("allies", "waypoint_revive_cdc_zm");
+		setteamreviveicon("axis", "waypoint_revive_cia_zm");
+	}
+
+	level._effect["meat_stink_camera"] = loadfx("maps/zombie/fx_zmb_meat_stink_camera");
+	level._effect["meat_stink_torso"] = loadfx("maps/zombie/fx_zmb_meat_stink_torso");
+}
\ No newline at end of file
diff --git a/scripts/zm/replaced/zm_alcatraz_gamemodes.gsc b/scripts/zm/replaced/zm_alcatraz_gamemodes.gsc
index a2451cb2..871469f6 100644
--- a/scripts/zm/replaced/zm_alcatraz_gamemodes.gsc
+++ b/scripts/zm/replaced/zm_alcatraz_gamemodes.gsc
@@ -8,9 +8,6 @@
 #include maps\mp\zm_alcatraz_grief_cellblock;
 #include maps\mp\zm_alcatraz_classic;
 
-#include scripts\zm\replaced\zm_alcatraz_grief_cellblock;
-#include scripts\zm\locs\zm_prison_loc_docks;
-
 init()
 {
 	level.custom_vending_precaching = maps\mp\zm_prison::custom_vending_precaching;
@@ -20,10 +17,12 @@ init()
 
 	add_map_location_gamemode("zclassic", "prison", maps\mp\zm_alcatraz_classic::precache, maps\mp\zm_alcatraz_classic::main);
 
-	add_map_location_gamemode("zgrief", "cellblock", scripts\zm\replaced\zm_alcatraz_grief_cellblock::precache, scripts\zm\replaced\zm_alcatraz_grief_cellblock::main);
+	add_map_location_gamemode("zstandard", "cellblock", scripts\zm\replaced\zm_alcatraz_grief_cellblock::precache, scripts\zm\replaced\zm_alcatraz_grief_cellblock::main);
+	add_map_location_gamemode("zstandard", "docks", scripts\zm\locs\zm_prison_loc_docks::precache, scripts\zm\locs\zm_prison_loc_docks::main);
 
-	if (getDvar("ui_zm_mapstartlocation_fake") == "docks")
-	{
-		scripts\zm\replaced\utility::add_struct_location_gamemode_func("zgrief", "cellblock", scripts\zm\locs\zm_prison_loc_docks::struct_init);
-	}
+	add_map_location_gamemode("zgrief", "cellblock", scripts\zm\replaced\zm_alcatraz_grief_cellblock::precache, scripts\zm\replaced\zm_alcatraz_grief_cellblock::main);
+	add_map_location_gamemode("zgrief", "docks", scripts\zm\locs\zm_prison_loc_docks::precache, scripts\zm\locs\zm_prison_loc_docks::main);
+
+	scripts\zm\replaced\utility::add_struct_location_gamemode_func("zstandard", "docks", scripts\zm\locs\zm_prison_loc_docks::struct_init);
+	scripts\zm\replaced\utility::add_struct_location_gamemode_func("zgrief", "docks", scripts\zm\locs\zm_prison_loc_docks::struct_init);
 }
\ No newline at end of file
diff --git a/scripts/zm/replaced/zm_alcatraz_grief_cellblock.gsc b/scripts/zm/replaced/zm_alcatraz_grief_cellblock.gsc
index 968f0051..f9816b66 100644
--- a/scripts/zm/replaced/zm_alcatraz_grief_cellblock.gsc
+++ b/scripts/zm/replaced/zm_alcatraz_grief_cellblock.gsc
@@ -14,11 +14,7 @@
 
 precache()
 {
-	if (getDvar("ui_zm_mapstartlocation_fake") == "docks")
-	{
-		scripts\zm\locs\zm_prison_loc_docks::precache();
-		return;
-	}
+
 }
 
 zgrief_preinit()
@@ -108,12 +104,6 @@ grief_treasure_chest_init()
 
 main()
 {
-	if (getDvar("ui_zm_mapstartlocation_fake") == "docks")
-	{
-		scripts\zm\locs\zm_prison_loc_docks::main();
-		return;
-	}
-
 	maps\mp\gametypes_zm\_zm_gametype::setup_standard_objects("cellblock");
 	grief_treasure_chest_init();
 	precacheshader("zm_al_wth_zombie");
diff --git a/scripts/zm/replaced/zm_alcatraz_weap_quest.gsc b/scripts/zm/replaced/zm_alcatraz_weap_quest.gsc
index 35d96058..e4b18737 100644
--- a/scripts/zm/replaced/zm_alcatraz_weap_quest.gsc
+++ b/scripts/zm/replaced/zm_alcatraz_weap_quest.gsc
@@ -57,49 +57,38 @@ wolf_spit_out_powerup()
 	if (!(isdefined(level.enable_magic) && level.enable_magic))
 		return;
 
-	power_origin_struct = getstruct("wolf_puke_powerup_origin", "targetname");
+	power_origin_structs = getstructarray("wolf_puke_powerup_origin", "targetname");
+	power_origin_struct = undefined;
 
-	if (level.scr_zm_ui_gametype_obj != "zmeat" && randomint(100) < 20)
+	foreach (struct in power_origin_structs)
 	{
-		for (i = 0; i < level.zombie_powerup_array.size; i++)
+		if (isdefined(struct.script_string) && struct.script_string == level.scr_zm_map_start_location)
 		{
-			if (level.zombie_powerup_array[i] == "meat_stink")
-			{
-				level.zombie_powerup_index = i;
-				found = 1;
-				break;
-			}
-		}
-	}
-	else
-	{
-		while (true)
-		{
-			level.zombie_powerup_index = randomint(level.zombie_powerup_array.size);
-
-			if (level.zombie_powerup_array[level.zombie_powerup_index] == "nuke")
-			{
-				wait 0.05;
-				continue;
-			}
-
-			if (level.scr_zm_ui_gametype_obj == "zmeat" && level.zombie_powerup_array[level.zombie_powerup_index] == "meat_stink")
-			{
-				wait 0.05;
-				continue;
-			}
-
+			power_origin_struct = struct;
 			break;
 		}
 	}
 
-	if (getDvar("ui_zm_mapstartlocation_fake") == "docks")
+	if (!isdefined(power_origin_struct))
 	{
-		power_origin_struct = spawnStruct();
-		power_origin_struct.origin = (41.4695, 6096.17, -102.9326);
+		return;
 	}
 
-	spawn_infinite_powerup_drop(power_origin_struct.origin, level.zombie_powerup_array[level.zombie_powerup_index]);
+	powerup_array = array_randomize(level.zombie_powerup_array);
+	wolf_powerup = undefined;
+
+	foreach (powerup in powerup_array)
+	{
+		if (powerup == "meat_stink" && level.scr_zm_ui_gametype_obj != "zmeat")
+		{
+			continue;
+		}
+
+		wolf_powerup = powerup;
+		break;
+	}
+
+	spawn_infinite_powerup_drop(power_origin_struct.origin, wolf_powerup);
 	power_ups = get_array_of_closest(power_origin_struct.origin, level.active_powerups, undefined, undefined, 100);
 
 	if (isdefined(power_ups[0]))
diff --git a/scripts/zm/replaced/zm_buried_gamemodes.gsc b/scripts/zm/replaced/zm_buried_gamemodes.gsc
index 9dc70718..d906ae8d 100644
--- a/scripts/zm/replaced/zm_buried_gamemodes.gsc
+++ b/scripts/zm/replaced/zm_buried_gamemodes.gsc
@@ -13,9 +13,6 @@
 #include maps\mp\zombies\_zm_weapons;
 #include maps\mp\zombies\_zm_unitrigger;
 
-#include scripts\zm\replaced\zm_buried_grief_street;
-#include scripts\zm\locs\zm_buried_loc_maze;
-
 init()
 {
 	add_map_gamemode("zclassic", maps\mp\zm_buried::zclassic_preinit, undefined, undefined);
@@ -26,12 +23,14 @@ init()
 
 	add_map_location_gamemode("zcleansed", "street", maps\mp\zm_buried_turned_street::precache, maps\mp\zm_buried_turned_street::main);
 
-	add_map_location_gamemode("zgrief", "street", scripts\zm\replaced\zm_buried_grief_street::precache, scripts\zm\replaced\zm_buried_grief_street::main);
+	add_map_location_gamemode("zstandard", "street", scripts\zm\replaced\zm_buried_grief_street::precache, scripts\zm\replaced\zm_buried_grief_street::main);
+	add_map_location_gamemode("zstandard", "maze", scripts\zm\locs\zm_buried_loc_maze::precache, scripts\zm\locs\zm_buried_loc_maze::main);
 
-	if (getDvar("ui_zm_mapstartlocation_fake") == "maze")
-	{
-		scripts\zm\replaced\utility::add_struct_location_gamemode_func("zgrief", "street", scripts\zm\locs\zm_buried_loc_maze::struct_init);
-	}
+	add_map_location_gamemode("zgrief", "street", scripts\zm\replaced\zm_buried_grief_street::precache, scripts\zm\replaced\zm_buried_grief_street::main);
+	add_map_location_gamemode("zgrief", "maze", scripts\zm\locs\zm_buried_loc_maze::precache, scripts\zm\locs\zm_buried_loc_maze::main);
+
+	scripts\zm\replaced\utility::add_struct_location_gamemode_func("zstandard", "maze", scripts\zm\locs\zm_buried_loc_maze::struct_init);
+	scripts\zm\replaced\utility::add_struct_location_gamemode_func("zgrief", "maze", scripts\zm\locs\zm_buried_loc_maze::struct_init);
 }
 
 buildbuildable(buildable)
diff --git a/scripts/zm/replaced/zm_buried_grief_street.gsc b/scripts/zm/replaced/zm_buried_grief_street.gsc
index ca788d7e..cd77365e 100644
--- a/scripts/zm/replaced/zm_buried_grief_street.gsc
+++ b/scripts/zm/replaced/zm_buried_grief_street.gsc
@@ -14,12 +14,6 @@
 
 precache()
 {
-	if (getDvar("ui_zm_mapstartlocation_fake") == "maze")
-	{
-		scripts\zm\locs\zm_buried_loc_maze::precache();
-		return;
-	}
-
 	precachemodel("collision_wall_128x128x10_standard");
 	precachemodel("collision_wall_256x256x10_standard");
 	precachemodel("collision_wall_512x512x10_standard");
@@ -51,12 +45,6 @@ precache()
 
 main()
 {
-	if (getDvar("ui_zm_mapstartlocation_fake") == "maze")
-	{
-		scripts\zm\locs\zm_buried_loc_maze::main();
-		return;
-	}
-
 	level.buildables_built["pap"] = 1;
 	level.equipment_team_pick_up = 1;
 	level.zones["zone_mansion"].is_enabled = 0;
diff --git a/scripts/zm/replaced/zm_transit_gamemodes.gsc b/scripts/zm/replaced/zm_transit_gamemodes.gsc
index d7004dd1..7c557d63 100644
--- a/scripts/zm/replaced/zm_transit_gamemodes.gsc
+++ b/scripts/zm/replaced/zm_transit_gamemodes.gsc
@@ -14,12 +14,6 @@
 #include maps\mp\_utility;
 #include common_scripts\utility;
 
-#include scripts\zm\replaced\zm_transit_standard_station;
-#include scripts\zm\replaced\zm_transit_grief_station;
-#include scripts\zm\locs\zm_transit_loc_diner;
-#include scripts\zm\locs\zm_transit_loc_power;
-#include scripts\zm\locs\zm_transit_loc_tunnel;
-
 init()
 {
 	add_map_gamemode("zclassic", maps\mp\zm_transit::zclassic_preinit, undefined, undefined);
diff --git a/scripts/zm/zgrief/zgrief_reimagined.csc b/scripts/zm/zgrief/zgrief_reimagined.csc
new file mode 100644
index 00000000..afc0d8db
--- /dev/null
+++ b/scripts/zm/zgrief/zgrief_reimagined.csc
@@ -0,0 +1,7 @@
+#include clientscripts\mp\_utility;
+#include clientscripts\mp\zombies\_zm_utility;
+
+main()
+{
+	replaceFunc(clientscripts\mp\gametypes\zgrief::onprecachegametype, scripts\zm\replaced\zgrief::onprecachegametype);
+}
\ No newline at end of file
diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc
index bedabb94..c07f0d3a 100644
--- a/scripts/zm/zgrief/zgrief_reimagined.gsc
+++ b/scripts/zm/zgrief/zgrief_reimagined.gsc
@@ -2941,28 +2941,22 @@ containment_get_zones()
 	{
 		if (level.scr_zm_map_start_location == "cellblock")
 		{
-			if (getDvar("ui_zm_mapstartlocation_fake") == "docks")
-			{
-				containment_zones = array("zone_dock", "zone_dock_gondola", "zone_studio", "zone_citadel_basement_building");
-			}
-			else
-			{
-				containment_zones = array("zone_cellblock_west", "zone_cellblock_west_gondola", "zone_cellblock_west_barber", "zone_cellblock_east", "zone_start", "zone_library", "zone_cafeteria", "zone_warden_office");
-			}
+			containment_zones = array("zone_cellblock_west", "zone_cellblock_west_gondola", "zone_cellblock_west_barber", "zone_cellblock_east", "zone_start", "zone_library", "zone_cafeteria", "zone_warden_office");
+		}
+		else if (level.scr_zm_map_start_location == "docks")
+		{
+			containment_zones = array("zone_dock", "zone_dock_gondola", "zone_studio", "zone_citadel_basement_building");
 		}
 	}
 	else if (level.script == "zm_buried")
 	{
 		if (level.scr_zm_map_start_location == "street")
 		{
-			if (getDvar("ui_zm_mapstartlocation_fake") == "maze")
-			{
-				containment_zones = array("zone_maze", "zone_mansion_backyard", "zone_maze_staircase");
-			}
-			else
-			{
-				containment_zones = array("zone_street_lightwest", "zone_street_darkwest", "zone_street_darkeast", "zone_stables", "zone_general_store", "zone_gun_store", "zone_underground_bar", "zone_underground_courthouse", "zone_toy_store", "zone_candy_store", "zone_street_fountain", "zone_church_main", "zone_mansion_lawn");
-			}
+			containment_zones = array("zone_street_lightwest", "zone_street_darkwest", "zone_street_darkeast", "zone_stables", "zone_general_store", "zone_gun_store", "zone_underground_bar", "zone_underground_courthouse", "zone_toy_store", "zone_candy_store", "zone_street_fountain", "zone_church_main", "zone_mansion_lawn");
+		}
+		else if (level.scr_zm_map_start_location == "maze")
+		{
+			containment_zones = array("zone_maze", "zone_mansion_backyard", "zone_maze_staircase");
 		}
 	}
 
diff --git a/scripts/zm/zm_buried/zm_buried_reimagined.gsc b/scripts/zm/zm_buried/zm_buried_reimagined.gsc
index f4df59a9..444435c2 100644
--- a/scripts/zm/zm_buried/zm_buried_reimagined.gsc
+++ b/scripts/zm/zm_buried/zm_buried_reimagined.gsc
@@ -117,7 +117,7 @@ player_initial_spawn_override()
 {
 	initial_spawns = getstructarray("initial_spawn", "script_noteworthy");
 
-	if (level.scr_zm_map_start_location == "street" && getDvar("ui_zm_mapstartlocation_fake") != "maze")
+	if (level.scr_zm_map_start_location == "street")
 	{
 		// remove existing initial spawns
 		level.struct_class_names["script_noteworthy"]["initial_spawn"] = [];
diff --git a/scripts/zm/zm_prison/zm_prison_reimagined.gsc b/scripts/zm/zm_prison/zm_prison_reimagined.gsc
index 43537541..6cd4e3c1 100644
--- a/scripts/zm/zm_prison/zm_prison_reimagined.gsc
+++ b/scripts/zm/zm_prison/zm_prison_reimagined.gsc
@@ -191,7 +191,7 @@ player_initial_spawn_override()
 	initial_spawns = getstructarray("initial_spawn", "script_noteworthy");
 	remove_initial_spawns = [];
 
-	if (level.scr_zm_map_start_location == "cellblock" && getDvar("ui_zm_mapstartlocation_fake") != "docks")
+	if (level.scr_zm_map_start_location == "cellblock")
 	{
 		foreach (initial_spawn in initial_spawns)
 		{
diff --git a/ui/t6/mapslist.lua b/ui/t6/mapslist.lua
index a7bacfd4..fd41301e 100644
--- a/ui/t6/mapslist.lua
+++ b/ui/t6/mapslist.lua
@@ -260,19 +260,15 @@ local function locationListSelectionClickedEventHandler( self, event )
 	elseif location == "ZMUI_CELLBLOCK_CAPS" then
 		Engine.SetDvar("ui_mapname", "zm_prison")
 		Engine.SetDvar("ui_zm_mapstartlocation", "cellblock")
-		Engine.SetDvar("ui_zm_mapstartlocation_fake", "")
 	elseif location == "ZMUI_DOCKS_CAPS" then
 		Engine.SetDvar("ui_mapname", "zm_prison")
-		Engine.SetDvar("ui_zm_mapstartlocation", "cellblock")
-		Engine.SetDvar("ui_zm_mapstartlocation_fake", "docks")
+		Engine.SetDvar("ui_zm_mapstartlocation", "docks")
 	elseif location == "ZMUI_STREET_LOC_CAPS" then
 		Engine.SetDvar("ui_mapname", "zm_buried")
 		Engine.SetDvar("ui_zm_mapstartlocation", "street")
-		Engine.SetDvar("ui_zm_mapstartlocation_fake", "")
 	elseif location == "ZMUI_MAZE_CAPS" then
 		Engine.SetDvar("ui_mapname", "zm_buried")
-		Engine.SetDvar("ui_zm_mapstartlocation", "street")
-		Engine.SetDvar("ui_zm_mapstartlocation_fake", "maze")
+		Engine.SetDvar("ui_zm_mapstartlocation", "maze")
 	elseif location == "ZMUI_TRENCHES_CAPS" then
 		-- TODO: set dvars when location is added
 	elseif location == "ZMUI_EXCAVATION_SITE_CAPS" then
diff --git a/zone_source/includes/clientscripts.zone b/zone_source/includes/clientscripts.zone
index bb2e3462..0b759176 100644
--- a/zone_source/includes/clientscripts.zone
+++ b/zone_source/includes/clientscripts.zone
@@ -1,4 +1,6 @@
 script,scripts/zm/_zm_reimagined.csc
 script,scripts/zm/zm_buried/zm_buried_reimagined.csc
+script,scripts/zm/zgrief/zgrief_reimagined.csc
 script,scripts/zm/replaced/_zm.csc
-script,scripts/zm/replaced/_zm_weapons.csc
\ No newline at end of file
+script,scripts/zm/replaced/_zm_weapons.csc
+script,scripts/zm/replaced/zgrief.csc
\ No newline at end of file