From 7dfb5367909012fa25aa55312f26ee3536382cf9 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Fri, 17 Mar 2023 11:01:15 -0700 Subject: [PATCH] Encounter: fix Docks map rotation --- scripts/zm/zgrief/zgrief_reimagined_server.gsc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/zm/zgrief/zgrief_reimagined_server.gsc b/scripts/zm/zgrief/zgrief_reimagined_server.gsc index 8e4e04b2..367bfcb1 100644 --- a/scripts/zm/zgrief/zgrief_reimagined_server.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined_server.gsc @@ -181,14 +181,20 @@ map_vote() rotation_array = rotation_string_to_array(rotation_string); rotation_array = array_randomize(rotation_array); + location = level.scr_zm_map_start_location; + if (level.scr_zm_map_start_location == "cellblock" && getDvar("ui_zm_mapstartlocation_fake") == "docks") + { + location = getDvar("ui_zm_mapstartlocation_fake"); + } + for (i = 0; i < 3; i++) { maps[i] = []; } - maps[1]["rotation_string"] = "exec zm_grief_" + level.scr_zm_map_start_location + ".cfg map " + level.script; + maps[1]["rotation_string"] = "exec zm_grief_" + location + ".cfg map " + level.script; maps[1]["map_name"] = level.script; - maps[1]["loc_name"] = level.scr_zm_map_start_location; + maps[1]["loc_name"] = location; maps[1]["gametype_name"] = level.scr_zm_ui_gametype_obj; exclude_locs[exclude_locs.size] = maps[1]["loc_name"]; @@ -550,6 +556,10 @@ get_name_for_loc(locname) { return &"ZMUI_CELLBLOCK"; } + else if (locname == "docks") + { + return "Docks"; + } else if (locname == "street") { return &"ZMUI_STREET_LOC";