From 196bbd28e9893d1bdb83e033a1156e0c85c31f7c Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Sun, 9 Mar 2025 13:06:25 -0500 Subject: [PATCH] Refactor hardcoded lateloaded map define zs (#17290) * Refactor hardcoded lateloaded map define zs to use a GLOB list instead * Refactor groundbase wilds loading * new to init docking codes * fix space whales excessive deleting * update comment * Forgot some aliases * How is this now a missing turf Remove duplicate turf --- code/controllers/subsystems/mapping.dm | 53 +++- code/controllers/subsystems/planets.dm | 4 +- code/game/objects/items/devices/e_beacon.dm | 12 +- code/modules/holomap/generate_holomap.dm | 4 +- code/modules/maps/tg/map_template.dm | 4 +- code/modules/maps/tg/map_template_vr.dm | 12 +- .../mob/living/simple_mob/overmap_mob_vr.dm | 6 +- code/modules/overmap/sectors.dm | 23 +- code/modules/random_map/random_map.dm | 6 + maps/common/common_defines.dm | 141 +++++++---- maps/expedition_vr/beach/_beach.dm | 6 +- maps/groundbase/groundbase_defines.dm | 233 ++++++++++-------- maps/groundbase/groundbase_things.dm | 2 +- maps/offmap_vr/common_offmaps.dm | 126 +++++----- maps/offmap_vr/talon/talon_v2.dm | 6 +- maps/om_adventure/grasscave.dm | 2 +- .../stellar_delight_defines.dm | 152 ++++++------ .../stellar_delight_shuttles.dm | 4 +- maps/submaps/space_rocks/space_rocks.dm | 2 +- .../surface_submaps/plains/plains_turfs.dm | 2 +- maps/tether/submaps/_tether_submaps.dm | 57 +++-- maps/tether/tether_defines.dm | 173 ++++++------- maps/tether/tether_things.dm | 12 +- maps/~map_system/maps_vr.dm | 76 +----- 24 files changed, 626 insertions(+), 492 deletions(-) diff --git a/code/controllers/subsystems/mapping.dm b/code/controllers/subsystems/mapping.dm index 4b0beb2485..580bd0e948 100644 --- a/code/controllers/subsystems/mapping.dm +++ b/code/controllers/subsystems/mapping.dm @@ -18,10 +18,6 @@ SUBSYSTEM_DEF(mapping) world.max_z_changed() // This is to set up the player z-level list, maxz hasn't actually changed (probably) load_map_templates() - if(CONFIG_GET(flag/generate_map)) - // Map-gen is still very specific to the map, however putting it here should ensure it loads in the correct order. - using_map.perform_map_generation() - loadEngine() preloadShelterTemplates() // VOREStation EDIT: Re-enable Shelter Capsules // Mining generation probably should be here too @@ -29,6 +25,10 @@ SUBSYSTEM_DEF(mapping) // Lateload Code related to Expedition areas. if(using_map) // VOREStation Edit: Re-enable this. loadLateMaps() + + if(CONFIG_GET(flag/generate_map)) // VOREStation Edit: Re-order this. + // Map-gen is still very specific to the map, however putting it here should ensure it loads in the correct order. + using_map.perform_map_generation() return SS_INIT_SUCCESS /datum/controller/subsystem/mapping/proc/load_map_templates() @@ -157,6 +157,51 @@ SUBSYSTEM_DEF(mapping) admin_notice("Redgate: [MT]", R_DEBUG) MT.load_new_z(centered = FALSE) + // Convert ai_shell_allowed_levels to actual Zs + for(var/i in 1 to length(using_map.ai_shell_allowed_levels)) + var/current = using_map.ai_shell_allowed_levels[i] + if(isnum(current)) + continue + using_map.ai_shell_allowed_levels[i] = GLOB.map_templates_loaded[current] + + // Convert overmap_z to actual Z + if(using_map.use_overmap && !isnum(using_map.overmap_z)) + using_map.overmap_z = GLOB.map_templates_loaded[using_map.overmap_z] + + // Convert belter_belt_z to actual Z + for(var/i in 1 to length(using_map.belter_belt_z)) + var/current = using_map.belter_belt_z[i] + if(isnum(current)) + continue + using_map.belter_belt_z[i] = GLOB.map_templates_loaded[current] + + // Convert belter_transit_z to actual Z + for(var/i in 1 to length(using_map.belter_transit_z)) + var/current = using_map.belter_transit_z[i] + if(isnum(current)) + continue + using_map.belter_transit_z[i] = GLOB.map_templates_loaded[current] + + // Convert belter_docked_z to actual Z (Unnecessary atm) + /*for(var/i in 1 to length(using_map.belter_docked_z)) + var/current = using_map.belter_docked_z[i] + if(isnum(current)) + continue + using_map.belter_docked_z[i] = GLOB.map_templates_loaded[current]*/ + + // Convert mining_station_z to actual Z (Unnecessary atm) + /*for(var/i in 1 to length(using_map.mining_station_z)) + var/current = using_map.mining_station_z[i] + if(isnum(current)) + continue + using_map.mining_station_z[i] = GLOB.map_templates_loaded[current]*/ + + // Convert mining_outpost_z to actual Z (Unnecessary atm) + /*for(var/i in 1 to length(using_map.mining_outpost_z)) + var/current = using_map.mining_outpost_z[i] + if(isnum(current)) + continue + using_map.mining_outpost_z[i] = GLOB.map_templates_loaded[current]*/ /datum/controller/subsystem/mapping/proc/preloadShelterTemplates() for(var/datum/map_template/shelter/shelter_type as anything in subtypesof(/datum/map_template/shelter)) diff --git a/code/controllers/subsystems/planets.dm b/code/controllers/subsystems/planets.dm index b77c39cbf4..0dd04f6f92 100644 --- a/code/controllers/subsystems/planets.dm +++ b/code/controllers/subsystems/planets.dm @@ -25,7 +25,9 @@ SUBSYSTEM_DEF(planets) var/datum/planet/NP = new P() planets.Add(NP) for(var/Z in NP.expected_z_levels) - if(Z > z_to_planet.len) + if(!isnum(Z)) + Z = GLOB.map_templates_loaded[Z] + if(Z > length(z_to_planet)) z_to_planet.len = Z if(z_to_planet[Z]) admin_notice(span_danger("Z[Z] is shared by more than one planet!"), R_DEBUG) diff --git a/code/game/objects/items/devices/e_beacon.dm b/code/game/objects/items/devices/e_beacon.dm index 54fc2ed305..2f3a82ac8b 100644 --- a/code/game/objects/items/devices/e_beacon.dm +++ b/code/game/objects/items/devices/e_beacon.dm @@ -9,8 +9,16 @@ pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' -/obj/item/emergency_beacon/New() +/obj/item/emergency_beacon/Initialize(mapload) gps = new/obj/item/gps/emergency_beacon(src) + for(var/i in 1 to length(levels_for_distress)) + var/current = levels_for_distress[i] + if(isnum(current)) + continue + levels_for_distress[i] = GLOB.map_templates_loaded[current] + if(!levels_for_distress) + levels_for_distress = list(1) + return ..() /obj/item/gps/emergency_beacon gps_tag = "EMERGENCY BEACON" @@ -41,8 +49,6 @@ Per the Interplanetary Convention on Space SAR, those receiving this message must attempt rescue, \ or relay the message to those who can." - if(!levels_for_distress) - levels_for_distress = list(1) for(var/zlevel in levels_for_distress) priority_announcement.Announce(message, new_title = "Automated Personal Distress Signal", new_sound = 'sound/AI/sos.ogg', zlevel = zlevel) else diff --git a/code/modules/holomap/generate_holomap.dm b/code/modules/holomap/generate_holomap.dm index 9238ff9c79..7d9c575bd6 100644 --- a/code/modules/holomap/generate_holomap.dm +++ b/code/modules/holomap/generate_holomap.dm @@ -121,11 +121,13 @@ extraMiniMaps["[HOLOMAP_EXTRA_STATIONMAPSMALL]_[zLevel]"] = actual_small_map // For tiny multi-z maps like the tether, we want to smoosh em together into a nice big one! -/datum/controller/subsystem/holomaps/proc/smooshTetherHolomaps(var/list/zlevels) +/datum/controller/subsystem/holomaps/proc/smooshTetherHolomaps(list/zlevels) var/icon/big_map = icon(HOLOMAP_ICON, "stationmap") var/icon/small_map = icon(HOLOMAP_ICON, "blank") // For each zlevel in turn, overlay them on top of each other for(var/zLevel in zlevels) + if(!isnum(zLevel)) + zLevel = GLOB.map_templates_loaded[zLevel] var/offset_x = HOLOMAP_PIXEL_OFFSET_X(zLevel) || 1 var/offset_y = HOLOMAP_PIXEL_OFFSET_Y(zLevel) || 1 diff --git a/code/modules/maps/tg/map_template.dm b/code/modules/maps/tg/map_template.dm index e2a83621e4..80f0096b06 100644 --- a/code/modules/maps/tg/map_template.dm +++ b/code/modules/maps/tg/map_template.dm @@ -1,6 +1,7 @@ /datum/map_template var/name = "Default Template Name" var/desc = "Some text should go here. Maybe." + var/name_alias // Override to what this map gets registered as in map_templates_loaded var/template_group = null // If this is set, no more than one template in the same group will be spawned, per submap seeding. var/width = 0 var/height = 0 @@ -45,7 +46,7 @@ var/list/obj/structure/cable/cables = list() var/list/obj/machinery/atmospherics/atmos_machines = list() var/list/turf/turfs = block(locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]), - locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ])) + locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ])) for(var/turf/B as anything in turfs) areas |= B.loc for(var/A in B) @@ -84,6 +85,7 @@ x = round((world.maxx - width)/2) y = round((world.maxy - height)/2) + on_map_preload(world.maxz + 1) //VOREStation Edit var/datum/bapi_parsed_map/map = load_map_bapi(mappath, x, y, no_changeturf = TRUE) var/list/bounds = map.bounds if(!bounds) diff --git a/code/modules/maps/tg/map_template_vr.dm b/code/modules/maps/tg/map_template_vr.dm index 77424f5ec2..67bcd852b6 100644 --- a/code/modules/maps/tg/map_template_vr.dm +++ b/code/modules/maps/tg/map_template_vr.dm @@ -1,3 +1,13 @@ +/// An asslist of name=z for map_templates that have been loaded +GLOBAL_LIST_EMPTY(map_templates_loaded) + +/// Registers the map into GLOB.map_templates_loaded +/datum/map_template/proc/on_map_preload(z) + if(name_alias) + GLOB.map_templates_loaded[name_alias] = z + else + GLOB.map_templates_loaded[name] = z + /datum/map_template/proc/on_map_loaded(z) //We missed air init! if(SSair.subsystem_initialized) @@ -9,4 +19,4 @@ var/turf/T = Trf //faster than implicit istype with typed for loop T.lighting_build_overlay() - return \ No newline at end of file + return diff --git a/code/modules/mob/living/simple_mob/overmap_mob_vr.dm b/code/modules/mob/living/simple_mob/overmap_mob_vr.dm index b5daa89dc3..32b3cfa37c 100644 --- a/code/modules/mob/living/simple_mob/overmap_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/overmap_mob_vr.dm @@ -58,7 +58,8 @@ /obj/effect/overmap/visitable/simplemob/Destroy() UnregisterSignal(parent, COMSIG_MOVABLE_MOVED) - qdel_null(parent) + if(!QDELETED(parent)) + qdel_null(parent) return ..() /obj/effect/overmap/visitable/simplemob/get_scan_data(mob/user) @@ -154,7 +155,8 @@ child_om_marker = C /mob/living/simple_mob/vore/overmap/Destroy() - qdel_null(child_om_marker) + if(!QDELETED(child_om_marker)) + qdel_null(child_om_marker) return ..() //SHIP diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm index f71ca3beb4..867bbc1222 100644 --- a/code/modules/overmap/sectors.dm +++ b/code/modules/overmap/sectors.dm @@ -91,6 +91,14 @@ //at the moment only used for the OM location renamer. Initializing here in case we want shuttles incl as well in future. Also proc definition convenience. visitable_overmap_object_instances |= src + for(var/i in 1 to length(levels_for_distress)) + var/current = levels_for_distress[i] + if(isnum(current)) + continue + levels_for_distress[i] = GLOB.map_templates_loaded[current] + if(!levels_for_distress) + levels_for_distress = list(1) + //To be used by GMs and calling through var edits for the overmap object //It causes the overmap object to "reinitialize" its real_appearance for known = FALSE objects //Includes an argument that allows GMs/Admins to set a previously known sector to unknown. Set to any value except 0/False/Null to activate @@ -124,8 +132,17 @@ /obj/effect/overmap/visitable/proc/find_z_levels() if(!LAZYLEN(map_z)) // If map_z is already populated use it as-is, otherwise start with connected z-levels. map_z = GetConnectedZlevels(z) - if(LAZYLEN(extra_z_levels)) - map_z |= extra_z_levels + + // extra_z_levels may need to be resolved + for(var/extra_z in extra_z_levels) + if(isnum(extra_z)) + map_z |= extra_z + continue + var/resolved_z = GLOB.map_templates_loaded[extra_z] + if(resolved_z) + map_z |= resolved_z + else + admin_notice(span_danger("[src] could not find z_level [extra_z]!"), R_DEBUG) /obj/effect/overmap/visitable/proc/register_z_levels() for(var/zlevel in map_z) @@ -248,8 +265,6 @@ Per the Interplanetary Convention on Space SAR, those receiving this message must attempt rescue, \ or relay the message to those who can. This message will repeat one time in 5 minutes. Thank you for your urgent assistance." - if(!levels_for_distress) - levels_for_distress = list(1) for(var/zlevel in levels_for_distress) priority_announcement.Announce(message, new_title = "Automated Distress Signal", new_sound = 'sound/AI/sos.ogg', zlevel = zlevel) diff --git a/code/modules/random_map/random_map.dm b/code/modules/random_map/random_map.dm index 67bc78cd0c..d7e26d90d8 100644 --- a/code/modules/random_map/random_map.dm +++ b/code/modules/random_map/random_map.dm @@ -35,6 +35,12 @@ var/global/list/map_count = list() var/priority_process /datum/random_map/New(var/seed, var/tx, var/ty, var/tz, var/tlx, var/tly, var/do_not_apply, var/do_not_announce) + if(!isnum(tz)) + var/old_tz = tz + tz = GLOB.map_templates_loaded[tz] + if(!tz) + admin_notice(span_danger("[src] could not be created on an unknown z ([old_tz])!"), R_DEBUG) + return // Store this for debugging. if(!map_count[descriptor]) diff --git a/maps/common/common_defines.dm b/maps/common/common_defines.dm index 42ee973306..4193fd7df4 100644 --- a/maps/common/common_defines.dm +++ b/maps/common/common_defines.dm @@ -1,46 +1,109 @@ +// Z_LEVEL are just hard coded z-levels +// Z_NAME are late loaded z-level maps that can be looked up in GLOB.map_templates_loaded +// GLOB.map_templates_loaded is populated as /datum/map_template/proc/on_map_preload(z) is called +// Some Z_NAME ultimately will be indexed under an alias however e.g. Z_NAME_ALIAS_GATEWAY + // Tether -#define Z_LEVEL_SURFACE_LOW 1 -#define Z_LEVEL_SURFACE_MID 2 -#define Z_LEVEL_SURFACE_HIGH 3 -#define Z_LEVEL_TRANSIT 4 -#define Z_LEVEL_SPACE_LOW 5 -#define Z_LEVEL_SURFACE_MINE 6 -#define Z_LEVEL_SOLARS 7 -#define Z_LEVEL_UNDERDARK 21 -#define Z_LEVEL_PLAINS 22 -#define Z_LEVEL_ROGUEMINE_1 23 -#define Z_LEVEL_ROGUEMINE_2 24 +#define Z_LEVEL_TETHER_SURFACE_LOW 1 +#define Z_LEVEL_TETHER_SURFACE_MID 2 +#define Z_LEVEL_TETHER_SURFACE_HIGH 3 +#define Z_LEVEL_TETHER_TRANSIT 4 +#define Z_LEVEL_TETHER_SPACE_LOW 5 +#define Z_LEVEL_TETHER_SURFACE_MINE 6 +#define Z_LEVEL_TETHER_SOLARS 7 + +#define Z_NAME_TETHER_CENTCOM "Tether - Centcom" // Aliased to Z_NAME_ALIAS_CENTCOM +#define Z_NAME_TETHER_MISC "Tether - Misc" // Aliased to Z_NAME_ALIAS_MISC +#define Z_NAME_TETHER_UNDERDARK "Tether - Underdark" +#define Z_NAME_TETHER_PLAINS "Tether - Plains" +#define Z_NAME_TETHER_ROGUEMINE_1 "Asteroid Belt 1" +#define Z_NAME_TETHER_ROGUEMINE_2 "Asteroid Belt 2" // Stellar Delight #define Z_LEVEL_SHIP_LOW 1 #define Z_LEVEL_SHIP_MID 2 #define Z_LEVEL_SHIP_HIGH 3 -#define Z_LEVEL_OVERMAP 4 -#define Z_LEVEL_SPACE_ROCKS 5 + +#define Z_NAME_SHIP_CENTCOM "Ship - Central Command" // Aliased to Z_NAME_ALIAS_CENTCOM +#define Z_NAME_SHIP_MISC "Ship - Misc" // Aliased to Z_NAME_ALIAS_MISC +#define Z_NAME_SPACE_ROCKS "V3b Asteroid Field" +#define Z_NAME_OVERMAP "Overmap" // Groundbase -#define Z_LEVEL_GB_BOTTOM 1 -#define Z_LEVEL_GB_MIDDLE 2 -#define Z_LEVEL_GB_TOP 3 -#define Z_LEVEL_GB_WILD_N 4 -#define Z_LEVEL_GB_WILD_S 5 -#define Z_LEVEL_GB_WILD_E 6 -#define Z_LEVEL_GB_WILD_W 7 +#define Z_LEVEL_GB_BOTTOM 1 +#define Z_LEVEL_GB_MIDDLE 2 +#define Z_LEVEL_GB_TOP 3 + +#define Z_NAME_GB_WILDS_N1 "Northern Wilds 1" +#define Z_NAME_GB_WILDS_N2 "Northern Wilds 2" +#define Z_NAME_GB_WILDS_S1 "Southern Wilds 1" +#define Z_NAME_GB_WILDS_S2 "Southern Wilds 2" +#define Z_NAME_GB_WILDS_S3 "Southern Wilds 3" +#define Z_NAME_GB_WILDS_E1 "Eastern Wilds 1" +#define Z_NAME_GB_WILDS_E2 "Eastern Wilds 2" +#define Z_NAME_GB_WILDS_W1 "Western Wilds 1" +#define Z_NAME_GB_WILDS_W2 "Western Wilds 2" + +#define Z_NAME_GB_CENTCOM "Groundbase - Central Command" // Aliased to Z_NAME_ALIAS_CENTCOM +#define Z_NAME_GB_MISC "Groundbase - Misc" // Aliased to Z_NAME_ALIAS_MISC +#define Z_NAME_GB_MINING "V3c Underground" + +#define Z_NAME_ALIAS_GB_WILDS_N "GB WILDS NORTH" +#define Z_NAME_ALIAS_GB_WILDS_S "GB WILDS SOUTH" +#define Z_NAME_ALIAS_GB_WILDS_E "GB WILDS EAST" +#define Z_NAME_ALIAS_GB_WILDS_W "GB WILDS WEST" // Common -#define Z_LEVEL_CENTCOM 8 -#define Z_LEVEL_MISC 9 -#define Z_LEVEL_OFFMAP1 10 -#define Z_LEVEL_AEROSTAT 11 -#define Z_LEVEL_AEROSTAT_SURFACE 12 -#define Z_LEVEL_DEBRISFIELD 13 -#define Z_LEVEL_FUELDEPOT 14 -#define Z_LEVEL_GATEWAY 15 -#define Z_LEVEL_OM_ADVENTURE 16 -#define Z_LEVEL_REDGATE 17 -#define Z_LEVEL_BEACH 18 -#define Z_LEVEL_BEACH_CAVE 19 -#define Z_LEVEL_MINING 20 +#define Z_NAME_OFFMAP1 "Offmap Ship - Talon V2" +#define Z_NAME_AEROSTAT "Remmi Aerostat - Z1 Aerostat" +#define Z_NAME_AEROSTAT_SURFACE "Remmi Aerostat - Z2 Surface" +#define Z_NAME_DEBRISFIELD "Debris Field - Z1 Space" +#define Z_NAME_FUELDEPOT "Fuel Depot - Z1 Space" +#define Z_NAME_BEACH "Desert Planet - Z1 Beach" +#define Z_NAME_BEACH_CAVE "Desert Planet - Z2 Cave" + +#define Z_NAME_ALIAS_GATEWAY "GATEWAY" +#define Z_NAME_ALIAS_OM_ADVENTURE "OVERMAP ADVENTURE" +#define Z_NAME_ALIAS_REDGATE "REDGATE" +#define Z_NAME_ALIAS_CENTCOM "CENTRAL COMMAND" +#define Z_NAME_ALIAS_MISC "MISC" + +// Gateways (Aliased to Z_NAME_ALIAS_GATEWAY) +#define Z_NAME_GATEWAY_CARP_FARM "Gateway - Carp Farm" +#define Z_NAME_GATEWAY_SNOW_FIELD "Gateway - Snow Field" +#define Z_NAME_GATEWAY_LISTENING_POST "Gateway - Listening Post" +#define Z_NAME_GATEWAY_HONLETH_A "Gateway - Honleth Highlands A" +#define Z_NAME_GATEWAY_HONLETH_B "Gateway - Honleth Highlands B" +#define Z_NAME_GATEWAY_ARYNTHI_CAVE_A "Gateway - Arynthi Lake Underground A" +#define Z_NAME_GATEWAY_ARYNTHI_A "Gateway - Arynthi Lake A" +#define Z_NAME_GATEWAY_ARYNTHI_CAVE_B "Gateway - Arynthi Lake Underground B" +#define Z_NAME_GATEWAY_ARYNTHI_B "Gateway - Arynthi Lake B" +#define Z_NAME_GATEWAY_WILD_WEST "Gateway - Wild West" + +// Overmap Adventures (Aliased to Z_NAME_ALIAS_OM_ADVENTURE) +#define Z_NAME_OM_GRASS_CAVE "Grass Cave" + +// Redgates (Aliased to Z_NAME_ALIAS_REDGATE) +#define Z_NAME_REDGATE_TEPPI_RANCH "Redgate - Teppi Ranch" +#define Z_NAME_REDGATE_INNLAND "Redgate - Innland" +#define Z_NAME_REDGATE_ABANDONED_ISLAND "Redgate - Abandoned Island" // Commented out currently +#define Z_NAME_REDGATE_DARK_ADVENTURE "Redgate - Dark Adventure" +#define Z_NAME_REDGATE_EGGNOG_CAVE "Redgate - Eggnog Town Underground" +#define Z_NAME_REDGATE_EGGNOG_TOWN "Redgate - Eggnog Town" +#define Z_NAME_REDGATE_STAR_DOG "Redgate - Star Dog" +#define Z_NAME_REDGATE_HOTSPRINGS "Redgate - Hotsprings" +#define Z_NAME_REDGATE_RAIN_CITY "Redgate - Rain City" +#define Z_NAME_REDGATE_ISLANDS_UNDERWATER "Redgate - Islands Underwater" +#define Z_NAME_REDGATE_ISLANDS "Redgate - Islands" +#define Z_NAME_REDGATE_MOVING_TRAIN "Redgate - Moving Train" +#define Z_NAME_REDGATE_MOVING_TRAIN_UPPER "Redgate - Moving Train Upper Level" +#define Z_NAME_REDGATE_FANTASY_DUNGEON "Redgate - Fantasy Dungeon" +#define Z_NAME_REDGATE_FANTASY_TOWN "Redgate - Fantasy Town" +#define Z_NAME_REDGATE_LASERDOME "Redgate - Laserdome" +#define Z_NAME_REDGATE_CASCADING_FALLS "Redgate - Cascading Falls" +#define Z_NAME_REDGATE_JUNGLE_CAVE "Redgate - Jungle Underground" +#define Z_NAME_REDGATE_JUNGLE "Redgate - Jungle" +#define Z_NAME_REDGATE_FACILITY "Redgate - Facility" //Camera networks #define NETWORK_TETHER "Tether" @@ -92,14 +155,6 @@ initial_generic_waypoints = list("groundbase", "gb_excursion_pad","omship_axolotl") initial_restricted_waypoints = list() - extra_z_levels = list( - Z_LEVEL_MINING, - Z_LEVEL_GB_WILD_N, - Z_LEVEL_GB_WILD_S, - Z_LEVEL_GB_WILD_E, - Z_LEVEL_GB_WILD_W - ) - /obj/effect/overmap/visitable/ship/stellar_delight name = "NRV Stellar Delight" icon = 'icons/obj/overmap_vr.dmi' @@ -113,7 +168,7 @@ vessel_size = SHIP_SIZE_LARGE initial_generic_waypoints = list("starboard_shuttlepad","port_shuttlepad","sd-1-23-54","sd-1-67-15","sd-1-70-130","sd-1-115-85","sd-2-25-98","sd-2-117-98","sd-3-22-78","sd-3-36-33","sd-3-104-33","sd-3-120-78") initial_restricted_waypoints = list("Exploration Shuttle" = list("sd_explo"), "Mining Shuttle" = list("sd_mining")) - levels_for_distress = list(Z_LEVEL_OFFMAP1, Z_LEVEL_BEACH, Z_LEVEL_AEROSTAT, Z_LEVEL_DEBRISFIELD, Z_LEVEL_FUELDEPOT) + levels_for_distress = list(Z_NAME_OFFMAP1, Z_NAME_BEACH, Z_NAME_AEROSTAT, Z_NAME_DEBRISFIELD, Z_NAME_FUELDEPOT) unowned_areas = list(/area/shuttle/sdboat) known = TRUE start_x = 2 @@ -143,4 +198,4 @@ skybox_pixel_x = 0 skybox_pixel_y = 0 - extra_z_levels = list(Z_LEVEL_AEROSTAT_SURFACE) + extra_z_levels = list(Z_NAME_AEROSTAT_SURFACE) diff --git a/maps/expedition_vr/beach/_beach.dm b/maps/expedition_vr/beach/_beach.dm index 9c82900ed8..7282047c6f 100644 --- a/maps/expedition_vr/beach/_beach.dm +++ b/maps/expedition_vr/beach/_beach.dm @@ -10,7 +10,7 @@ icon_state = "globe" in_space = 0 initial_generic_waypoints = list("beach_e", "beach_c", "beach_nw") - extra_z_levels = list(Z_LEVEL_BEACH_CAVE) + extra_z_levels = list(Z_NAME_BEACH_CAVE) known = TRUE icon_state = "desert" @@ -67,8 +67,8 @@ seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/deep, /datum/map_template/surface/mountains/deep) // Now for the tunnels. - new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_BEACH_CAVE, world.maxx, world.maxy) - new /datum/random_map/noise/ore/beachmine(null, 1, 1, Z_LEVEL_BEACH_CAVE, 64, 64)*/ + new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_NAME_BEACH_CAVE, world.maxx, world.maxy) + new /datum/random_map/noise/ore/beachmine(null, 1, 1, Z_NAME_BEACH_CAVE, 64, 64)*/ flags |= ATOM_INITIALIZED return INITIALIZE_HINT_QDEL diff --git a/maps/groundbase/groundbase_defines.dm b/maps/groundbase/groundbase_defines.dm index 6c4e7ef26f..1c4474653f 100644 --- a/maps/groundbase/groundbase_defines.dm +++ b/maps/groundbase/groundbase_defines.dm @@ -16,7 +16,7 @@ path = "groundbase" use_overmap = TRUE - overmap_z = Z_LEVEL_MISC + overmap_z = Z_NAME_ALIAS_MISC overmap_size = 62 overmap_event_areas = 100 usable_email_tlds = list("virgo.nt") @@ -31,7 +31,8 @@ holomap_smoosh = list(list( Z_LEVEL_GB_BOTTOM, Z_LEVEL_GB_MIDDLE, - Z_LEVEL_GB_TOP)) + Z_LEVEL_GB_TOP, + )) station_name = "NSB Rascal's Pass" station_short = "Rascal's Pass" @@ -69,7 +70,7 @@ NETWORK_ROBOTS, NETWORK_SECURITY, NETWORK_TELECOM, - NETWORK_HALLS + NETWORK_HALLS, ) secondary_networks = list( NETWORK_ERT, @@ -80,7 +81,7 @@ NETWORK_ALARM_POWER, NETWORK_ALARM_FIRE, NETWORK_TALON_HELMETS, - NETWORK_TALON_SHIP + NETWORK_TALON_SHIP, ) bot_patrolling = FALSE @@ -94,7 +95,7 @@ meteor_strike_areas = list( /area/groundbase/level3, /area/groundbase/level2, - /area/groundbase/level1 + /area/groundbase/level1, ) @@ -149,7 +150,7 @@ /area/groundbase/unexplored/outdoors, /area/groundbase/unexplored/rock, /area/groundbase/engineering/solarshed, - /area/groundbase/engineering/solarfield + /area/groundbase/engineering/solarfield, ) unit_test_exempt_from_atmos = list() @@ -157,68 +158,68 @@ unit_test_z_levels = list( Z_LEVEL_GB_BOTTOM, Z_LEVEL_GB_MIDDLE, - Z_LEVEL_GB_TOP - ) + Z_LEVEL_GB_TOP, + ) lateload_z_levels = list( - list("Groundbase - Central Command"), - list("Groundbase - Misc"), //Shuttle transit zones, holodeck templates, OM - list("V3c Underground"), - list("Desert Planet - Z1 Beach","Desert Planet - Z2 Cave"), - list("Remmi Aerostat - Z1 Aerostat","Remmi Aerostat - Z2 Surface"), - list("Debris Field - Z1 Space"), - list("Fuel Depot - Z1 Space"), - list("Offmap Ship - Talon V2") + list(Z_NAME_GB_CENTCOM), + list(Z_NAME_GB_MISC), //Shuttle transit zones, holodeck templates, OM + list(Z_NAME_GB_MINING), + list(Z_NAME_BEACH, Z_NAME_BEACH_CAVE), + list(Z_NAME_AEROSTAT, Z_NAME_AEROSTAT_SURFACE), + list(Z_NAME_DEBRISFIELD), + list(Z_NAME_FUELDEPOT), + list(Z_NAME_OFFMAP1), ) lateload_gateway = list( - list("Gateway - Carp Farm"), - list("Gateway - Snow Field"), - list("Gateway - Listening Post"), - list(list("Gateway - Honleth Highlands A", "Gateway - Honleth Highlands B")), - list("Gateway - Arynthi Lake Underground A","Gateway - Arynthi Lake A"), - list("Gateway - Arynthi Lake Underground B","Gateway - Arynthi Lake B"), - list("Gateway - Wild West") + list(Z_NAME_GATEWAY_CARP_FARM), + list(Z_NAME_GATEWAY_SNOW_FIELD), + list(Z_NAME_GATEWAY_LISTENING_POST), + list(list(Z_NAME_GATEWAY_HONLETH_A, Z_NAME_GATEWAY_HONLETH_B)), + list(Z_NAME_GATEWAY_ARYNTHI_CAVE_A, Z_NAME_GATEWAY_ARYNTHI_A), + list(Z_NAME_GATEWAY_ARYNTHI_CAVE_B, Z_NAME_GATEWAY_ARYNTHI_B), + list(Z_NAME_GATEWAY_WILD_WEST), ) lateload_overmap = list( - list("Grass Cave") + list(Z_NAME_OM_GRASS_CAVE), ) lateload_redgate = list( - list("Redgate - Teppi Ranch"), - list("Redgate - Innland"), -// list("Redgate - Abandoned Island"), //This will come back later - list("Redgate - Dark Adventure"), - list("Redgate - Eggnog Town Underground","Redgate - Eggnog Town"), - list("Redgate - Star Dog"), - list("Redgate - Hotsprings"), - list("Redgate - Rain City"), - list("Redgate - Islands Underwater","Redgate - Islands"), - list("Redgate - Moving Train", "Redgate - Moving Train Upper Level"), - list("Redgate - Fantasy Dungeon", "Redgate - Fantasy Town"), - list("Redgate - Laserdome"), - list("Redgate - Cascading Falls"), - list("Redgate - Jungle Underground", "Redgate - Jungle"), - list("Redgate - Facility") + list(Z_NAME_REDGATE_TEPPI_RANCH), + list(Z_NAME_REDGATE_INNLAND), +// list(Z_NAME_REDGATE_ABANDONED_ISLAND), //This will come back later + list(Z_NAME_REDGATE_DARK_ADVENTURE), + list(Z_NAME_REDGATE_EGGNOG_CAVE,Z_NAME_REDGATE_EGGNOG_TOWN), + list(Z_NAME_REDGATE_STAR_DOG), + list(Z_NAME_REDGATE_HOTSPRINGS), + list(Z_NAME_REDGATE_RAIN_CITY), + list(Z_NAME_REDGATE_ISLANDS_UNDERWATER,Z_NAME_REDGATE_ISLANDS), + list(Z_NAME_REDGATE_MOVING_TRAIN, Z_NAME_REDGATE_MOVING_TRAIN_UPPER), + list(Z_NAME_REDGATE_FANTASY_DUNGEON, Z_NAME_REDGATE_FANTASY_TOWN), + list(Z_NAME_REDGATE_LASERDOME), + list(Z_NAME_REDGATE_CASCADING_FALLS), + list(Z_NAME_REDGATE_JUNGLE_CAVE, Z_NAME_REDGATE_JUNGLE), + list(Z_NAME_REDGATE_FACILITY), ) lateload_gb_north = list( - list("Northern Wilds 1"), - list("Northern Wilds 2") + list(Z_NAME_GB_WILDS_N1), + list(Z_NAME_GB_WILDS_N2), ) lateload_gb_south = list( - list("Southern Wilds 1"), - list("Southern Wilds 2"), - list("Southern Wilds 3") + list(Z_NAME_GB_WILDS_S1), + list(Z_NAME_GB_WILDS_S2), + list(Z_NAME_GB_WILDS_S3), ) lateload_gb_east = list( - list("Eastern Wilds 1"), - list("Eastern Wilds 2") + list(Z_NAME_GB_WILDS_E1), + list(Z_NAME_GB_WILDS_E2), ) lateload_gb_west = list( - list("Western Wilds 1"), - list("Western Wilds 2") + list(Z_NAME_GB_WILDS_W1), + list(Z_NAME_GB_WILDS_W2), ) ai_shell_restricted = TRUE @@ -226,15 +227,16 @@ Z_LEVEL_GB_BOTTOM, Z_LEVEL_GB_MIDDLE, Z_LEVEL_GB_TOP, - Z_LEVEL_MISC, - Z_LEVEL_BEACH, - Z_LEVEL_AEROSTAT + Z_NAME_ALIAS_MISC, + Z_NAME_BEACH, + Z_NAME_AEROSTAT, ) planet_datums_to_make = list( /datum/planet/virgo3b, /datum/planet/virgo3c, - /datum/planet/virgo4) + /datum/planet/virgo4, + ) /datum/map/groundbase/get_map_info() . = list() @@ -245,8 +247,8 @@ seed_submaps(list(Z_LEVEL_GB_BOTTOM,Z_LEVEL_GB_MIDDLE,Z_LEVEL_GB_TOP), 100, /area/groundbase/unexplored/outdoors, /datum/map_template/groundbase/outdoor) //Outdoor POIs seed_submaps(list(Z_LEVEL_GB_BOTTOM,Z_LEVEL_GB_MIDDLE), 200, /area/groundbase/unexplored/rock, /datum/map_template/groundbase/maintcaves) //Cave POIs - new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_MINING, world.maxx, world.maxy) // Create the mining Z-level. - new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_MINING, 64, 64) // Create the mining ore distribution map. + new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_NAME_GB_MINING, world.maxx, world.maxy) // Create the mining Z-level. + new /datum/random_map/noise/ore(null, 1, 1, Z_NAME_GB_MINING, 64, 64) // Create the mining ore distribution map. return 1 /datum/skybox_settings/groundbase @@ -258,18 +260,18 @@ Z_LEVEL_GB_BOTTOM, Z_LEVEL_GB_MIDDLE, Z_LEVEL_GB_TOP, - Z_LEVEL_GB_WILD_N, - Z_LEVEL_GB_WILD_S, - Z_LEVEL_GB_WILD_E, - Z_LEVEL_GB_WILD_W + Z_NAME_ALIAS_GB_WILDS_N, + Z_NAME_ALIAS_GB_WILDS_S, + Z_NAME_ALIAS_GB_WILDS_E, + Z_NAME_ALIAS_GB_WILDS_W ) /datum/planet/virgo3b expected_z_levels = list( - Z_LEVEL_CENTCOM + Z_NAME_ALIAS_CENTCOM ) /datum/planet/virgo4 expected_z_levels = list( - Z_LEVEL_BEACH + Z_NAME_BEACH ) /obj/effect/overmap/visitable/sector/virgo3b @@ -289,7 +291,14 @@ extra_z_levels = list() - +/obj/effect/overmap/visitable/sector/virgo3c + extra_z_levels = list( + Z_NAME_GB_MINING, + Z_NAME_ALIAS_GB_WILDS_N, + Z_NAME_ALIAS_GB_WILDS_S, + Z_NAME_ALIAS_GB_WILDS_E, + Z_NAME_ALIAS_GB_WILDS_W + ) // For making the 6-in-1 holomap, we calculate some offsets #define SHIP_MAP_SIZE 140 // Width and height of compiled in tether z levels. @@ -339,16 +348,22 @@ return new associated_map_datum(using_map, z) + return ..() + +/datum/map_z_level/gb_lateload/New(datum/map/map, mapZ) + z = mapZ + return ..(map) /datum/map_template/gb_lateload/gb_centcom - name = "Groundbase - Central Command" + name = Z_NAME_GB_CENTCOM desc = "Central Command lives here!" mappath = "maps/groundbase/gb-centcomm.dmm" + name_alias = Z_NAME_ALIAS_CENTCOM associated_map_datum = /datum/map_z_level/gb_lateload/gb_centcom /datum/map_z_level/gb_lateload/gb_centcom - z = Z_LEVEL_CENTCOM + //z = Z_NAME_ALIAS_CENTCOM name = "Centcom" flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT base_turf = /turf/simulated/floor/outdoors/rocks @@ -357,20 +372,21 @@ base_turf = /turf/simulated/floor/outdoors/rocks /datum/map_template/gb_lateload/gb_misc - name = "Groundbase - Misc" + name = Z_NAME_GB_MISC desc = "Misc areas, like some transit areas, holodecks, merc area." mappath = "maps/groundbase/gb-misc.dmm" + name_alias = Z_NAME_ALIAS_MISC associated_map_datum = /datum/map_z_level/gb_lateload/misc /datum/map_z_level/gb_lateload/misc - z = Z_LEVEL_MISC + //z = Z_NAME_ALIAS_MISC name = "Misc" flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT #include "groundbase_mining.dm" /datum/map_template/gb_lateload/mining - name = "V3c Underground" + name = Z_NAME_GB_MINING desc = "The caves underneath the survace of Virgo 3C" mappath = "maps/groundbase/gb-mining.dmm" @@ -378,19 +394,19 @@ /datum/map_template/gb_lateload/mining/on_map_loaded(z) . = ..() -// seed_submaps(list(Z_LEVEL_MINING), 60, /area/gb_mine/unexplored, /datum/map_template/space_rocks) //POI seeding - new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_MINING, world.maxx - 4, world.maxy - 4) - new /datum/random_map/noise/ore/gb_mining(null, 1, 1, Z_LEVEL_MINING, 64, 64) +// seed_submaps(list(z), 60, /area/gb_mine/unexplored, /datum/map_template/space_rocks) //POI seeding + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx - 4, world.maxy - 4) + new /datum/random_map/noise/ore/gb_mining(null, 1, 1, z, 64, 64) /datum/map_z_level/gb_lateload/mining - z = Z_LEVEL_MINING - name = "V3c Underground" + //z = Z_NAME_GB_MINING + name = Z_NAME_GB_MINING base_turf = /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c flags = MAP_LEVEL_PLAYER|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES #include "../expedition_vr/aerostat/_aerostat.dm" /datum/map_template/common_lateload/away_aerostat - name = "Remmi Aerostat - Z1 Aerostat" + name = Z_NAME_AEROSTAT desc = "The Virgo 2 Aerostat away mission." mappath = "maps/expedition_vr/aerostat/aerostat.dmm" associated_map_datum = /datum/map_z_level/common_lateload/away_aerostat @@ -405,96 +421,119 @@ /datum/map_z_level/gb_lateload/gb_north_wilds name = "GB North Wilderness" - z = Z_LEVEL_GB_WILD_N + //z = Z_NAME_ALIAS_GB_WILDS_N flags = MAP_LEVEL_PLAYER|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES /datum/map_z_level/gb_lateload/gb_south_wilds name = "GB South Wilderness" - z = Z_LEVEL_GB_WILD_S + //z = Z_NAME_ALIAS_GB_WILDS_S flags = MAP_LEVEL_PLAYER|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES /datum/map_z_level/gb_lateload/gb_east_wilds name = "GB East Wilderness" - z = Z_LEVEL_GB_WILD_E + //z = Z_NAME_ALIAS_GB_WILDS_E flags = MAP_LEVEL_PLAYER|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES /datum/map_z_level/gb_lateload/gb_west_wilds name = "GB West Wilderness" - z = Z_LEVEL_GB_WILD_W + //z = Z_NAME_ALIAS_GB_WILDS_W flags = MAP_LEVEL_PLAYER|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES /datum/map_template/gb_lateload/wilds/north/on_map_loaded(z) . = ..() - new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_GB_WILD_N, world.maxx, world.maxy) - new /datum/random_map/noise/ore/mining(null, 1, 1, Z_LEVEL_GB_WILD_N, 64, 64) + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx, world.maxy) + new /datum/random_map/noise/ore/mining(null, 1, 1, z, 64, 64) /datum/map_template/gb_lateload/wilds/south/on_map_loaded(z) . = ..() - new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_GB_WILD_S, world.maxx, world.maxy) - new /datum/random_map/noise/ore/mining(null, 1, 1, Z_LEVEL_GB_WILD_N, 64, 64) + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx, world.maxy) + new /datum/random_map/noise/ore/mining(null, 1, 1, z, 64, 64) /datum/map_template/gb_lateload/wilds/east/on_map_loaded(z) . = ..() - new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_GB_WILD_E, world.maxx, world.maxy) - new /datum/random_map/noise/ore/mining(null, 1, 1, Z_LEVEL_GB_WILD_N, 64, 64) + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx, world.maxy) + new /datum/random_map/noise/ore/mining(null, 1, 1, z, 64, 64) /datum/map_template/gb_lateload/wilds/west/on_map_loaded(z) . = ..() - new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_GB_WILD_W, world.maxx, world.maxy) - new /datum/random_map/noise/ore/mining(null, 1, 1, Z_LEVEL_GB_WILD_N, 64, 64) + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx, world.maxy) + new /datum/random_map/noise/ore/mining(null, 1, 1, z, 64, 64) +// North Wilds +/datum/map_template/gb_lateload/wilds/north + name_alias = Z_NAME_ALIAS_GB_WILDS_N /datum/map_template/gb_lateload/wilds/north/type1 - name = "Northern Wilds 1" + name = Z_NAME_GB_WILDS_N1 desc = "Wilderness" mappath = "maps/groundbase/northwilds/northwilds1.dmm" associated_map_datum = /datum/map_z_level/gb_lateload/gb_north_wilds + /datum/map_template/gb_lateload/wilds/north/type2 - name = "Northern Wilds 2" + name = Z_NAME_GB_WILDS_N2 desc = "Wilderness" mappath = "maps/groundbase/northwilds/northwilds2.dmm" associated_map_datum = /datum/map_z_level/gb_lateload/gb_north_wilds +// South Wilds +/datum/map_template/gb_lateload/wilds/south + name_alias = Z_NAME_ALIAS_GB_WILDS_S + /datum/map_template/gb_lateload/wilds/south/type1 - name = "Southern Wilds 1" + name = Z_NAME_GB_WILDS_S1 desc = "Wilderness" mappath = "maps/groundbase/southwilds/southwilds1.dmm" associated_map_datum = /datum/map_z_level/gb_lateload/gb_south_wilds + /datum/map_template/gb_lateload/wilds/south/type2 - name = "Southern Wilds 2" + name = Z_NAME_GB_WILDS_S2 desc = "Wilderness" mappath = "maps/groundbase/southwilds/southwilds2.dmm" associated_map_datum = /datum/map_z_level/gb_lateload/gb_south_wilds + /datum/map_template/gb_lateload/wilds/south/type3 - name = "Southern Wilds 3" + name = Z_NAME_GB_WILDS_S3 desc = "Wilderness" mappath = "maps/groundbase/southwilds/southwilds3.dmm" associated_map_datum = /datum/map_z_level/gb_lateload/gb_south_wilds + +/* /datum/map_template/gb_lateload/wilds/south/type3/on_map_loaded(z) . = ..() - // Using landmarks for this now. - //seed_submaps(list(Z_LEVEL_GB_WILD_S), 6, /area/submap/groundbase/poi/wildvillage/plot/square, /datum/map_template/groundbase/wildvillage/square) //POI seeding - //seed_submaps(list(Z_LEVEL_GB_WILD_S), 2, /area/submap/groundbase/poi/wildvillage/plot/wide, /datum/map_template/groundbase/wildvillage/wide) - //seed_submaps(list(Z_LEVEL_GB_WILD_S), 1, /area/submap/groundbase/poi/wildvillage/plot/long, /datum/map_template/groundbase/wildvillage/long) + Using landmarks for this now. + seed_submaps(list(z), 6, /area/submap/groundbase/poi/wildvillage/plot/square, /datum/map_template/groundbase/wildvillage/square) //POI seeding + seed_submaps(list(z), 2, /area/submap/groundbase/poi/wildvillage/plot/wide, /datum/map_template/groundbase/wildvillage/wide) + seed_submaps(list(z), 1, /area/submap/groundbase/poi/wildvillage/plot/long, /datum/map_template/groundbase/wildvillage/long) +*/ + +// East Wilds +/datum/map_template/gb_lateload/wilds/east + name_alias = Z_NAME_ALIAS_GB_WILDS_E /datum/map_template/gb_lateload/wilds/east/type1 - name = "Eastern Wilds 1" + name = Z_NAME_GB_WILDS_E1 desc = "Wilderness" mappath = "maps/groundbase/eastwilds/eastwilds1.dmm" associated_map_datum = /datum/map_z_level/gb_lateload/gb_east_wilds + /datum/map_template/gb_lateload/wilds/east/type2 - name = "Eastern Wilds 2" + name = Z_NAME_GB_WILDS_E2 desc = "Wilderness" mappath = "maps/groundbase/eastwilds/eastwilds2.dmm" associated_map_datum = /datum/map_z_level/gb_lateload/gb_east_wilds +// West Wilds +/datum/map_template/gb_lateload/wilds/west + name_alias = Z_NAME_ALIAS_GB_WILDS_W + /datum/map_template/gb_lateload/wilds/west/type1 - name = "Western Wilds 1" + name = Z_NAME_GB_WILDS_W1 desc = "Wilderness" mappath = "maps/groundbase/westwilds/westwilds1.dmm" associated_map_datum = /datum/map_z_level/gb_lateload/gb_west_wilds + /datum/map_template/gb_lateload/wilds/west/type2 - name = "Western Wilds 2" + name = Z_NAME_GB_WILDS_W2 desc = "Wilderness" mappath = "maps/groundbase/westwilds/westwilds2.dmm" associated_map_datum = /datum/map_z_level/gb_lateload/gb_west_wilds diff --git a/maps/groundbase/groundbase_things.dm b/maps/groundbase/groundbase_things.dm index 6255422861..4e9ea6e156 100644 --- a/maps/groundbase/groundbase_things.dm +++ b/maps/groundbase/groundbase_things.dm @@ -2,7 +2,7 @@ . = ..() teleport_x = x teleport_y = y ++ - teleport_z = Z_LEVEL_MINING + teleport_z = GLOB.map_templates_loaded[Z_NAME_GB_MINING] /obj/effect/step_trigger/teleporter/from_mining/Initialize(mapload) . = ..() diff --git a/maps/offmap_vr/common_offmaps.dm b/maps/offmap_vr/common_offmaps.dm index 1e16999953..d06ab37f42 100644 --- a/maps/offmap_vr/common_offmaps.dm +++ b/maps/offmap_vr/common_offmaps.dm @@ -11,34 +11,34 @@ #include "../expedition_vr/beach/_beach.dm" /datum/map_template/common_lateload/away_beach - name = "Desert Planet - Z1 Beach" + name = Z_NAME_BEACH desc = "The beach away mission." mappath = "maps/expedition_vr/beach/beach.dmm" associated_map_datum = /datum/map_z_level/common_lateload/away_beach /datum/map_z_level/common_lateload/away_beach name = "Away Mission - Desert Beach" - z = Z_LEVEL_BEACH + //z = Z_NAME_BEACH base_turf = /turf/simulated/floor/outdoors/rocks/caves /datum/map_template/common_lateload/away_beach_cave - name = "Desert Planet - Z2 Cave" + name = Z_NAME_BEACH_CAVE desc = "The beach away mission's cave." mappath = "maps/expedition_vr/beach/cave.dmm" associated_map_datum = /datum/map_z_level/common_lateload/away_beach_cave /datum/map_template/common_lateload/away_beach_cave/on_map_loaded(z) . = ..() - seed_submaps(list(Z_LEVEL_BEACH_CAVE), 120, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/normal) - //seed_submaps(list(Z_LEVEL_BEACH_CAVE), 70, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/deep) + seed_submaps(list(z), 120, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/normal) + //seed_submaps(list(z), 70, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/deep) // Now for the tunnels. - new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_BEACH_CAVE, world.maxx - 4, world.maxy - 4) - new /datum/random_map/noise/ore/beachmine(null, 1, 1, Z_LEVEL_BEACH_CAVE, 64, 64) + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx - 4, world.maxy - 4) + new /datum/random_map/noise/ore/beachmine(null, 1, 1, z, 64, 64) /datum/map_z_level/common_lateload/away_beach_cave name = "Away Mission - Desert Cave" - z = Z_LEVEL_BEACH_CAVE + //z = Z_NAME_BEACH_CAVE base_turf = /turf/simulated/floor/outdoors/rocks/caves /obj/effect/step_trigger/zlevel_fall/beach @@ -57,11 +57,11 @@ /datum/map_z_level/common_lateload/away_aerostat name = "Away Mission - Aerostat" - z = Z_LEVEL_AEROSTAT + //z = Z_NAME_AEROSTAT base_turf = /turf/unsimulated/floor/sky/virgo2_sky /datum/map_template/common_lateload/away_aerostat_surface - name = "Remmi Aerostat - Z2 Surface" + name = Z_NAME_AEROSTAT_SURFACE desc = "The surface from the Virgo 2 Aerostat." mappath = "maps/expedition_vr/aerostat/surface.dmm" associated_map_datum = /datum/map_z_level/common_lateload/away_aerostat_surface @@ -78,13 +78,13 @@ /datum/map_template/common_lateload/away_aerostat_surface/on_map_loaded(z) . = ..() - seed_submaps(list(Z_LEVEL_AEROSTAT_SURFACE), 120, /area/offmap/aerostat/surface/unexplored, /datum/map_template/virgo2) - new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_AEROSTAT_SURFACE, world.maxx - 4, world.maxy - 4) - new /datum/random_map/noise/ore/virgo2(null, 1, 1, Z_LEVEL_AEROSTAT_SURFACE, 64, 64) + seed_submaps(list(z), 120, /area/offmap/aerostat/surface/unexplored, /datum/map_template/virgo2) + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx - 4, world.maxy - 4) + new /datum/random_map/noise/ore/virgo2(null, 1, 1, z, 64, 64) /datum/map_z_level/common_lateload/away_aerostat_surface name = "Away Mission - Aerostat Surface" - z = Z_LEVEL_AEROSTAT_SURFACE + //z = Z_NAME_AEROSTAT_SURFACE base_turf = /turf/simulated/mineral/floor/ignore_mapgen/virgo2 @@ -93,7 +93,7 @@ #include "../submaps/pois_vr/debris_field/_templates.dm" #include "../submaps/pois_vr/debris_field/debrisfield_things.dm" /datum/map_template/common_lateload/away_debrisfield - name = "Debris Field - Z1 Space" + name = Z_NAME_DEBRISFIELD desc = "The Virgo 3 Debris Field away mission." mappath = "maps/expedition_vr/space/debrisfield.dmm" associated_map_datum = /datum/map_z_level/common_lateload/away_debrisfield @@ -101,21 +101,21 @@ /datum/map_template/common_lateload/away_debrisfield/on_map_loaded(z) . = ..() //Commented out until we actually get POIs - seed_submaps(list(Z_LEVEL_DEBRISFIELD), 400, /area/space, /datum/map_template/debrisfield) + seed_submaps(list(z), 400, /area/space, /datum/map_template/debrisfield) /datum/map_z_level/common_lateload/away_debrisfield name = "Away Mission - Debris Field" - z = Z_LEVEL_DEBRISFIELD + //z = Z_NAME_DEBRISFIELD /datum/map_template/common_lateload/away_fueldepot - name = "Fuel Depot - Z1 Space" + name = Z_NAME_FUELDEPOT desc = "An unmanned fuel depot floating in space." mappath = "maps/expedition_vr/space/fueldepot.dmm" associated_map_datum = /datum/map_z_level/common_lateload/away_fueldepot /datum/map_z_level/common_lateload/away_fueldepot name = "Away Mission - Fuel Depot" - z = Z_LEVEL_FUELDEPOT + //z = Z_NAME_FUELDEPOT ////////////////////////////////////////////////////////////////////////////////////// // Gateway submaps go here @@ -131,10 +131,11 @@ desc = "Please do not use this." mappath = null associated_map_datum = /datum/map_z_level/common_lateload/gateway_destination + name_alias = Z_NAME_ALIAS_GATEWAY /datum/map_z_level/common_lateload/gateway_destination name = "Gateway Destination" - z = Z_LEVEL_GATEWAY + //z = Z_NAME_ALIAS_GATEWAY /* // Removed due to heavy merc presence #include "../gateway_vr/snow_outpost.dm" /datum/map_template/common_lateload/gateway/snow_outpost @@ -151,58 +152,58 @@ #include "../gateway_vr/carpfarm.dm" /datum/map_template/common_lateload/gateway/carpfarm - name = "Gateway - Carp Farm" + name = Z_NAME_GATEWAY_CARP_FARM desc = "Asteroid base surrounded by carp" mappath = "maps/gateway_vr/carpfarm.dmm" #include "../gateway_vr/snowfield.dm" /datum/map_template/common_lateload/gateway/snowfield - name = "Gateway - Snow Field" + name = Z_NAME_GATEWAY_SNOW_FIELD desc = "An old base in middle of snowy wasteland" mappath = "maps/gateway_vr/snowfield.dmm" #include "../gateway_vr/listeningpost.dm" /datum/map_template/common_lateload/gateway/listeningpost - name = "Gateway - Listening Post" + name = Z_NAME_GATEWAY_LISTENING_POST desc = "Asteroid-bound mercenary listening post" mappath = "maps/gateway_vr/listeningpost.dmm" #include "../gateway_vr/variable/honlethhighlands.dm" /datum/map_template/common_lateload/gateway/honlethhighlands_a - name = "Gateway - Honleth Highlands A" + name = Z_NAME_GATEWAY_HONLETH_A desc = "The cold surface of some planet." mappath = "maps/gateway_vr/variable/honlethhighlands_a.dmm" /datum/map_template/common_lateload/gateway/honlethhighlands_b - name = "Gateway - Honleth Highlands B" + name = Z_NAME_GATEWAY_HONLETH_B desc = "The cold surface of some planet." mappath = "maps/gateway_vr/variable/honlethhighlands_b.dmm" #include "../gateway_vr/variable/arynthilake.dm" /datum/map_template/common_lateload/gateway/arynthilake - name = "Gateway - Arynthi Lake A" + name = Z_NAME_GATEWAY_ARYNTHI_A desc = "A grassy surface with some abandoned structures." mappath = "maps/gateway_vr/variable/arynthilake_a.dmm" /datum/map_template/common_lateload/gateway/arynthilakeunderground - name = "Gateway - Arynthi Lake Underground A" + name = Z_NAME_GATEWAY_ARYNTHI_CAVE_A desc = "A grassy surface with some abandoned structures." mappath = "maps/gateway_vr/variable/arynthilakeunderground_a.dmm" /datum/map_template/common_lateload/gateway/arynthilake_b - name = "Gateway - Arynthi Lake B" + name = Z_NAME_GATEWAY_ARYNTHI_B desc = "A grassy surface with some abandoned structures." mappath = "maps/gateway_vr/variable/arynthilake_b.dmm" /datum/map_template/common_lateload/gateway/arynthilakeunderground_b - name = "Gateway - Arynthi Lake Underground B" + name = Z_NAME_GATEWAY_ARYNTHI_CAVE_B desc = "A grassy surface with some abandoned structures." mappath = "maps/gateway_vr/variable/arynthilakeunderground_b.dmm" #include "../gateway_vr/wildwest.dm" /datum/map_template/common_lateload/gateway/wildwest - name = "Gateway - Wild West" + name = Z_NAME_GATEWAY_WILD_WEST desc = "A classic." mappath = "maps/gateway_vr/wildwest.dmm" @@ -215,14 +216,15 @@ desc = "Please do not use this." mappath = null associated_map_datum = null + name_alias = Z_NAME_ALIAS_OM_ADVENTURE /datum/map_z_level/common_lateload/om_adventure_destination name = "OM Adventure Destination" - z = Z_LEVEL_OM_ADVENTURE + //z = Z_NAME_ALIAS_OM_ADVENTURE #include "../om_adventure/grasscave.dm" /datum/map_template/common_lateload/om_adventure/grasscave - name = "Grass Cave" + name = Z_NAME_OM_GRASS_CAVE desc = "Looks like a cave with some grass in it." mappath = "maps/om_adventure/grasscave.dmm" associated_map_datum = /datum/map_z_level/common_lateload/om_adventure_destination @@ -264,71 +266,72 @@ desc = "Please do not use this." mappath = null associated_map_datum = /datum/map_z_level/common_lateload/redgate_destination + name_alias = Z_NAME_ALIAS_REDGATE /datum/map_z_level/common_lateload/redgate_destination name = "Redgate Destination" - z = Z_LEVEL_REDGATE + //z = Z_NAME_ALIAS_REDGATE flags = MAP_LEVEL_PLAYER|MAP_LEVEL_SEALED base_turf = /turf/simulated/floor/outdoors/rocks/caves /datum/map_template/common_lateload/redgate/on_map_loaded(z) . = ..() - new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_REDGATE, world.maxx, world.maxy) - new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_REDGATE, 64, 64) + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx, world.maxy) + new /datum/random_map/noise/ore(null, 1, 1, z, 64, 64) /datum/map_template/common_lateload/redgate/teppi_ranch - name = "Redgate - Teppi Ranch" + name = Z_NAME_REDGATE_TEPPI_RANCH desc = "An abandoned teppi ranch!" mappath = "maps/redgate/teppiranch.dmm" /datum/map_template/common_lateload/redgate/innland - name = "Redgate - Innland" + name = Z_NAME_REDGATE_INNLAND desc = "Caves and grass and a tavern, woah!" mappath = "maps/redgate/innland.dmm" /datum/map_template/common_lateload/redgate/abandonedisland - name = "Redgate - Abandoned Island" + name = Z_NAME_REDGATE_ABANDONED_ISLAND desc = "It seems like it used to be people here!" mappath = "maps/redgate/abandonedisland.dmm" /datum/map_template/common_lateload/redgate/darkadventure - name = "Redgate - Dark Adventure" + name = Z_NAME_REDGATE_DARK_ADVENTURE desc = "This place seems broken!" mappath = "maps/redgate/darkadventure.dmm" /datum/map_template/common_lateload/redgate/stardog - name = "Redgate - Star Dog" + name = Z_NAME_REDGATE_STAR_DOG desc = "That's a big dog!" mappath = "maps/redgate/stardog.dmm" #include "../redgate/eggnogtown.dm" /datum/map_template/common_lateload/redgate/eggnogtown - name = "Redgate - Eggnog Town" + name = Z_NAME_REDGATE_EGGNOG_TOWN desc = "A comfortable snowy town." mappath = "maps/redgate/eggnogtown.dmm" /datum/map_template/common_lateload/redgate/eggnogtownunderground - name = "Redgate - Eggnog Town Underground" + name = Z_NAME_REDGATE_EGGNOG_CAVE desc = "A comfortable snowy town." mappath = "maps/redgate/eggnogtownunderground.dmm" /datum/map_template/common_lateload/redgate/hotsprings - name = "Redgate - Hotsprings" + name = Z_NAME_REDGATE_HOTSPRINGS desc = "This place is rather cosy for somewhere so abandoned!" mappath = "maps/redgate/hotsprings.dmm" /datum/map_template/common_lateload/redgate/cybercity - name = "Redgate - Rain City" + name = Z_NAME_REDGATE_RAIN_CITY desc = "A strange city on lockdown." mappath = "maps/redgate/cybercity.dmm" /datum/map_template/common_lateload/redgate/islands - name = "Redgate - Islands" + name = Z_NAME_REDGATE_ISLANDS desc = "A series of islands out in the ocean." mappath = "maps/redgate/islands.dmm" /datum/map_template/common_lateload/redgate/islands_underwater - name = "Redgate - Islands Underwater" + name = Z_NAME_REDGATE_ISLANDS_UNDERWATER desc = "A series of islands out in the ocean." mappath = "maps/redgate/islands_underwater.dmm" @@ -336,12 +339,12 @@ height = 2 /datum/map_template/common_lateload/redgate/train - name = "Redgate - Moving Train" + name = Z_NAME_REDGATE_MOVING_TRAIN desc = "A long train travelling to who-knows-where." mappath = "maps/redgate/train.dmm" /datum/map_template/common_lateload/redgate/train_upper - name = "Redgate - Moving Train Upper Level" + name = Z_NAME_REDGATE_MOVING_TRAIN_UPPER desc = "A long train travelling to who-knows-where." mappath = "maps/redgate/train_upper.dmm" @@ -349,12 +352,12 @@ height = 2 /datum/map_template/common_lateload/redgate/fantasy - name = "Redgate - Fantasy Town" + name = Z_NAME_REDGATE_FANTASY_TOWN desc = "A fantasy town full of low tech stuff." mappath = "maps/redgate/fantasy.dmm" /datum/map_template/common_lateload/redgate/fantasy_dungeon - name = "Redgate - Fantasy Dungeon" + name = Z_NAME_REDGATE_FANTASY_DUNGEON desc = "A fantasy dungeon with lots of monsters and loot." mappath = "maps/redgate/fantasy_dungeon.dmm" @@ -362,22 +365,22 @@ height = 2 /datum/map_template/common_lateload/redgate/laserdome - name = "Redgate - Laserdome" + name = Z_NAME_REDGATE_LASERDOME desc = "A large orbital station with recreational facilities, namely a pair of laser tag arenas." mappath = "maps/redgate/laserdome.dmm" /datum/map_template/common_lateload/redgate/falls - name = "Redgate - Cascading Falls" + name = Z_NAME_REDGATE_CASCADING_FALLS desc = "A world made up almost entirely of water, sprinkled with obscure marble structures." mappath = "maps/redgate/falls/falls.dmm" /datum/map_template/common_lateload/redgate/jungle - name = "Redgate - Jungle" + name = Z_NAME_REDGATE_JUNGLE desc = "A fantasy town full of low tech stuff." mappath = "maps/redgate/jungle.dmm" /datum/map_template/common_lateload/redgate/jungle_underground - name = "Redgate - Jungle Underground" + name = Z_NAME_REDGATE_JUNGLE_CAVE desc = "A fantasy dungeon with lots of monsters and loot." mappath = "maps/redgate/jungle_underground.dmm" @@ -385,7 +388,7 @@ height = 2 /datum/map_template/common_lateload/redgate/facility - name = "Redgate - Facility" + name = Z_NAME_REDGATE_FACILITY desc = "A facility full of unusual experiments." mappath = "maps/redgate/facility.dmm" @@ -418,13 +421,10 @@ return new associated_map_datum(using_map, z) + return ..() -/datum/map_z_level/common_lateload - z = 0 - -/datum/map_z_level/common_lateload/New(var/datum/map/map, mapZ) - if(mapZ && !z) - z = mapZ +/datum/map_z_level/common_lateload/New(datum/map/map, mapZ) + z = mapZ return ..(map) /obj/effect/step_trigger/zlevel_fall //Don't ever use this, only use subtypes.Define a new var/static/target_z on each @@ -654,7 +654,7 @@ #endif /datum/map_template/common_lateload/offmap/talon_v2 - name = "Offmap Ship - Talon V2" + name = Z_NAME_OFFMAP1 desc = "Offmap spawn ship, the Talon." mappath = "maps/offmap_vr/talon/talon_v2.dmm" associated_map_datum = /datum/map_z_level/common_lateload/talon_v2 @@ -663,4 +663,4 @@ name = "Talon" flags = MAP_LEVEL_PLAYER|MAP_LEVEL_PERSIST|MAP_LEVEL_MAPPABLE base_turf = /turf/space - z = Z_LEVEL_OFFMAP1 + //z = Z_NAME_OFFMAP1 diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm index 2cb7ff110e..5220f914c2 100644 --- a/maps/offmap_vr/talon/talon_v2.dm +++ b/maps/offmap_vr/talon/talon_v2.dm @@ -54,7 +54,7 @@ var/global/list/latejoin_talon = list() skybox_pixel_x = 270 skybox_pixel_y = 60 - levels_for_distress = list(1, Z_LEVEL_BEACH, Z_LEVEL_AEROSTAT, Z_LEVEL_DEBRISFIELD, Z_LEVEL_FUELDEPOT) + levels_for_distress = list(1, Z_NAME_BEACH, Z_NAME_AEROSTAT, Z_NAME_DEBRISFIELD, Z_NAME_FUELDEPOT) unowned_areas = list(/area/shuttle/talonboat,/area/shuttle/talonpod) // The shuttle's 'shuttle' computer @@ -70,7 +70,7 @@ var/global/list/latejoin_talon = list() vessel_size = SHIP_SIZE_TINY shuttle = "Talon's Shuttle" - levels_for_distress = list(1, Z_LEVEL_BEACH, Z_LEVEL_AEROSTAT, Z_LEVEL_DEBRISFIELD, Z_LEVEL_FUELDEPOT) + levels_for_distress = list(1, Z_NAME_BEACH, Z_NAME_AEROSTAT, Z_NAME_DEBRISFIELD, Z_NAME_FUELDEPOT) // A shuttle lateloader landmark /obj/effect/shuttle_landmark/shuttle_initializer/talonboat @@ -113,7 +113,7 @@ var/global/list/latejoin_talon = list() vessel_size = SHIP_SIZE_TINY shuttle = "Talon's Escape Pod" - levels_for_distress = list(1, Z_LEVEL_BEACH, Z_LEVEL_AEROSTAT, Z_LEVEL_DEBRISFIELD, Z_LEVEL_FUELDEPOT) + levels_for_distress = list(1, Z_NAME_BEACH, Z_NAME_AEROSTAT, Z_NAME_DEBRISFIELD, Z_NAME_FUELDEPOT) // A shuttle lateloader landmark /obj/effect/shuttle_landmark/shuttle_initializer/talonpod diff --git a/maps/om_adventure/grasscave.dm b/maps/om_adventure/grasscave.dm index 43ebe3f49e..5a50f5d4e7 100644 --- a/maps/om_adventure/grasscave.dm +++ b/maps/om_adventure/grasscave.dm @@ -39,7 +39,7 @@ /area/om_adventure/grasscave - name = "Grass Cave" + name = Z_NAME_OM_GRASS_CAVE icon = 'icons/turf/areas_vr.dmi' icon_state = "bluwhicir" requires_power = TRUE diff --git a/maps/stellar_delight/stellar_delight_defines.dm b/maps/stellar_delight/stellar_delight_defines.dm index b817147f04..7e77e4e5f5 100644 --- a/maps/stellar_delight/stellar_delight_defines.dm +++ b/maps/stellar_delight/stellar_delight_defines.dm @@ -6,7 +6,7 @@ "gateway" = 5, "youcanttaketheskyfromme" = 200, "intothedark" = 200, - "above3b" = 200 + "above3b" = 200, )) if(choice) lobby_screens = list(choice) @@ -17,7 +17,7 @@ path = "stellardelight" use_overmap = TRUE - overmap_z = Z_LEVEL_OVERMAP + overmap_z = Z_NAME_OVERMAP overmap_size = 99 overmap_event_areas = 200 usable_email_tlds = list("virgo.nt") @@ -32,7 +32,8 @@ holomap_smoosh = list(list( Z_LEVEL_SHIP_LOW, Z_LEVEL_SHIP_MID, - Z_LEVEL_SHIP_HIGH)) + Z_LEVEL_SHIP_HIGH, + )) station_name = "NRV Stellar Delight" station_short = "Stellar Delight" @@ -70,7 +71,7 @@ NETWORK_ROBOTS, NETWORK_SECURITY, NETWORK_TELECOM, - NETWORK_HALLS + NETWORK_HALLS, ) secondary_networks = list( NETWORK_ERT, @@ -81,7 +82,7 @@ NETWORK_ALARM_POWER, NETWORK_ALARM_FIRE, NETWORK_TALON_HELMETS, - NETWORK_TALON_SHIP + NETWORK_TALON_SHIP, ) bot_patrolling = FALSE @@ -108,7 +109,7 @@ /area/medical/cryo, /area/holodeck_control, - /area/tcommsat/chamber + /area/tcommsat/chamber, ) unit_test_exempt_from_atmos = list() //it maint @@ -116,51 +117,51 @@ unit_test_z_levels = list( Z_LEVEL_SHIP_LOW, Z_LEVEL_SHIP_MID, - Z_LEVEL_SHIP_HIGH - ) + Z_LEVEL_SHIP_HIGH, + ) lateload_z_levels = list( - list("Ship - Central Command"), - list("Ship - Misc"), //Shuttle transit zones, holodeck templates, etc - list("V3b Asteroid Field"), - list("Desert Planet - Z1 Beach","Desert Planet - Z2 Cave"), - list("Remmi Aerostat - Z1 Aerostat","Remmi Aerostat - Z2 Surface"), - list("Debris Field - Z1 Space"), - list("Fuel Depot - Z1 Space"), - list("Overmap"), - list("Offmap Ship - Talon V2") + list(Z_NAME_SHIP_CENTCOM), // Aliased to Z_NAME_ALIAS_CENTCOM + list(Z_NAME_SHIP_MISC), //Aliased to Z_NAME_ALIAS_MISC: Shuttle transit zones, holodeck templates, etc + list(Z_NAME_SPACE_ROCKS), + list(Z_NAME_BEACH, Z_NAME_BEACH_CAVE), + list(Z_NAME_AEROSTAT, Z_NAME_AEROSTAT_SURFACE), + list(Z_NAME_DEBRISFIELD), + list(Z_NAME_FUELDEPOT), + list(Z_NAME_OVERMAP), + list(Z_NAME_OFFMAP1), ) lateload_gateway = list( - list("Gateway - Carp Farm"), - list("Gateway - Snow Field"), - list("Gateway - Listening Post"), - list(list("Gateway - Honleth Highlands A", "Gateway - Honleth Highlands B")), - list("Gateway - Arynthi Lake Underground A","Gateway - Arynthi Lake A"), - list("Gateway - Arynthi Lake Underground B","Gateway - Arynthi Lake B"), - list("Gateway - Wild West") + list(Z_NAME_GATEWAY_CARP_FARM), + list(Z_NAME_GATEWAY_SNOW_FIELD), + list(Z_NAME_GATEWAY_LISTENING_POST), + list(list(Z_NAME_GATEWAY_HONLETH_A, Z_NAME_GATEWAY_HONLETH_B)), + list(Z_NAME_GATEWAY_ARYNTHI_CAVE_A,Z_NAME_GATEWAY_ARYNTHI_A), + list(Z_NAME_GATEWAY_ARYNTHI_CAVE_B,Z_NAME_GATEWAY_ARYNTHI_B), + list(Z_NAME_GATEWAY_WILD_WEST), ) lateload_overmap = list( - list("Grass Cave") + list(Z_NAME_OM_GRASS_CAVE), ) lateload_redgate = list( - list("Redgate - Teppi Ranch"), - list("Redgate - Innland"), -// list("Redgate - Abandoned Island"), //This will come back later - list("Redgate - Dark Adventure"), - list("Redgate - Eggnog Town Underground","Redgate - Eggnog Town"), - list("Redgate - Star Dog"), - list("Redgate - Hotsprings"), - list("Redgate - Rain City"), - list("Redgate - Islands Underwater","Redgate - Islands"), - list("Redgate - Moving Train", "Redgate - Moving Train Upper Level"), - list("Redgate - Fantasy Dungeon", "Redgate - Fantasy Town"), - list("Redgate - Laserdome"), - list("Redgate - Cascading Falls"), - list("Redgate - Jungle Underground", "Redgate - Jungle"), - list("Redgate - Facility") + list(Z_NAME_REDGATE_TEPPI_RANCH), + list(Z_NAME_REDGATE_INNLAND), +// list(Z_NAME_REDGATE_ABANDONED_ISLAND), //This will come back later + list(Z_NAME_REDGATE_DARK_ADVENTURE), + list(Z_NAME_REDGATE_EGGNOG_CAVE, Z_NAME_REDGATE_EGGNOG_TOWN), + list(Z_NAME_REDGATE_STAR_DOG), + list(Z_NAME_REDGATE_HOTSPRINGS), + list(Z_NAME_REDGATE_RAIN_CITY), + list(Z_NAME_REDGATE_ISLANDS_UNDERWATER, Z_NAME_REDGATE_ISLANDS), + list(Z_NAME_REDGATE_MOVING_TRAIN, Z_NAME_REDGATE_MOVING_TRAIN_UPPER), + list(Z_NAME_REDGATE_FANTASY_DUNGEON, Z_NAME_REDGATE_FANTASY_TOWN), + list(Z_NAME_REDGATE_LASERDOME), + list(Z_NAME_REDGATE_CASCADING_FALLS), + list(Z_NAME_REDGATE_JUNGLE_CAVE, Z_NAME_REDGATE_JUNGLE), + list(Z_NAME_REDGATE_FACILITY), ) ai_shell_restricted = TRUE @@ -168,22 +169,24 @@ Z_LEVEL_SHIP_LOW, Z_LEVEL_SHIP_MID, Z_LEVEL_SHIP_HIGH, - Z_LEVEL_MISC, - Z_LEVEL_BEACH, - Z_LEVEL_AEROSTAT + Z_NAME_ALIAS_MISC, + Z_NAME_BEACH, + Z_NAME_AEROSTAT, ) /* - belter_docked_z = list(Z_LEVEL_SPACE_LOW) - belter_transit_z = list(Z_LEVEL_MISC) - belter_belt_z = list(Z_LEVEL_ROGUEMINE_1, - Z_LEVEL_ROGUEMINE_2) + belter_docked_z = list(Z_LEVEL_TETHER_SPACE_LOW) + belter_transit_z = list(Z_NAME_ALIAS_MISC) + belter_belt_z = list(Z_NAME_TETHER_ROGUEMINE_1, + Z_NAME_TETHER_ROGUEMINE_2) - mining_station_z = list(Z_LEVEL_SPACE_LOW) - mining_outpost_z = list(Z_LEVEL_SURFACE_MINE) + mining_station_z = list(Z_LEVEL_TETHER_SPACE_LOW) + mining_outpost_z = list(Z_LEVEL_TETHER_SURFACE_MINE) */ - planet_datums_to_make = list(/datum/planet/virgo3b, - /datum/planet/virgo4) + planet_datums_to_make = list( + /datum/planet/virgo3b, + /datum/planet/virgo4, + ) /datum/map/stellar_delight/get_map_info() . = list() @@ -196,8 +199,8 @@ /datum/map/stellar_delight/perform_map_generation() - new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SPACE_ROCKS, world.maxx, world.maxy) // Create the mining Z-level. - new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SPACE_ROCKS, 64, 64) // Create the mining ore distribution map. + new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_NAME_SPACE_ROCKS, world.maxx, world.maxy) // Create the mining Z-level. + new /datum/random_map/noise/ore(null, 1, 1, Z_NAME_SPACE_ROCKS, 64, 64) // Create the mining ore distribution map. return 1 @@ -206,10 +209,10 @@ use_stars = FALSE /datum/planet/virgo3b - expected_z_levels = list(Z_LEVEL_CENTCOM) + expected_z_levels = list(Z_NAME_ALIAS_CENTCOM) /datum/planet/virgo4 expected_z_levels = list( - Z_LEVEL_BEACH + Z_NAME_BEACH ) /obj/effect/overmap/visitable/ship/stellar_delight/build_skybox_representation() @@ -266,16 +269,22 @@ return new associated_map_datum(using_map, z) + return ..() + +/datum/map_z_level/ship_lateload/New(datum/map/map, mapZ) + z = mapZ + return ..(map) /datum/map_template/ship_lateload/ship_centcom - name = "Ship - Central Command" + name = Z_NAME_SHIP_CENTCOM desc = "Central Command lives here!" mappath = "maps/stellar_delight/ship_centcom.dmm" + name_alias = Z_NAME_ALIAS_CENTCOM associated_map_datum = /datum/map_z_level/ship_lateload/ship_centcom /datum/map_z_level/ship_lateload/ship_centcom - z = Z_LEVEL_CENTCOM + //z = Z_NAME_ALIAS_CENTCOM name = "Centcom" flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT base_turf = /turf/simulated/floor/outdoors/rocks @@ -284,20 +293,21 @@ base_turf = /turf/simulated/floor/outdoors/rocks /datum/map_template/ship_lateload/ship_misc - name = "Ship - Misc" + name = Z_NAME_SHIP_MISC desc = "Misc areas, like some transit areas, holodecks, merc area." mappath = "maps/stellar_delight/ship_misc.dmm" + name_alias = Z_NAME_ALIAS_MISC associated_map_datum = /datum/map_z_level/ship_lateload/misc /datum/map_z_level/ship_lateload/misc - z = Z_LEVEL_MISC + //z = Z_NAME_ALIAS_MISC name = "Misc" flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT #include "../submaps/space_rocks/space_rocks.dm" /datum/map_template/ship_lateload/space_rocks - name = "V3b Asteroid Field" + name = Z_NAME_SPACE_ROCKS desc = "Space debris is common in V3b's orbit due to the proximity of Virgo 3" mappath = "maps/submaps/space_rocks/space_rocks.dmm" @@ -305,31 +315,31 @@ /datum/map_template/ship_lateload/space_rocks/on_map_loaded(z) . = ..() - seed_submaps(list(Z_LEVEL_SPACE_ROCKS), 60, /area/sdmine/unexplored, /datum/map_template/space_rocks) - new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_SPACE_ROCKS, world.maxx - 4, world.maxy - 4) - new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SPACE_ROCKS, 64, 64) + seed_submaps(list(z), 60, /area/sdmine/unexplored, /datum/map_template/space_rocks) + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx - 4, world.maxy - 4) + new /datum/random_map/noise/ore(null, 1, 1, z, 64, 64) /datum/map_z_level/ship_lateload/space_rocks - z = Z_LEVEL_SPACE_ROCKS - name = "V3b Asteroid Field" + //z = Z_NAME_SPACE_ROCKS + name = Z_NAME_SPACE_ROCKS base_turf = /turf/space flags = MAP_LEVEL_PLAYER|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES /datum/map_template/ship_lateload/overmap - name = "Overmap" + name = Z_NAME_OVERMAP desc = "Overmap lives here :3" mappath = "maps/stellar_delight/overmap.dmm" associated_map_datum = /datum/map_z_level/ship_lateload/overmap /datum/map_z_level/ship_lateload/overmap - z = Z_LEVEL_OVERMAP - name = "Overmap" + //z = Z_NAME_OVERMAP + name = Z_NAME_OVERMAP flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT #include "../expedition_vr/aerostat/_aerostat_science_outpost.dm" /datum/map_template/common_lateload/away_aerostat - name = "Remmi Aerostat - Z1 Aerostat" + name = Z_NAME_AEROSTAT desc = "The Virgo 2 Aerostat away mission." mappath = "maps/expedition_vr/aerostat/aerostat_science_outpost.dmm" associated_map_datum = /datum/map_z_level/common_lateload/away_aerostat @@ -342,7 +352,7 @@ initial_generic_waypoints = list("sr-c","sr-n","sr-s") initial_restricted_waypoints = list("Central Command Shuttlepad" = list("cc_shuttlepad")) - extra_z_levels = list(Z_LEVEL_SPACE_ROCKS) + extra_z_levels = list(Z_NAME_SPACE_ROCKS) /////SD Starts at V3b to pick up crew refuel and repair (And to make sure it doesn't spawn on hazards) /obj/effect/overmap/visitable/sector/virgo3b/Initialize(mapload) @@ -378,4 +388,4 @@ atc.msg(message) /obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels() - return list(Z_LEVEL_SPACE_ROCKS) + return list(Z_NAME_SPACE_ROCKS) diff --git a/maps/stellar_delight/stellar_delight_shuttles.dm b/maps/stellar_delight/stellar_delight_shuttles.dm index d2f40b3308..db95a8c73d 100644 --- a/maps/stellar_delight/stellar_delight_shuttles.dm +++ b/maps/stellar_delight/stellar_delight_shuttles.dm @@ -63,6 +63,6 @@ shuttle_type = /datum/shuttle/autodock/overmap/sdboat ..() -/obj/item/paper/dockingcodes/sd/New(newloc, text, title) - ..() +/obj/item/paper/dockingcodes/sd/Initialize(mapload, ...) codes_from_z = Z_LEVEL_SHIP_LOW + return ..() diff --git a/maps/submaps/space_rocks/space_rocks.dm b/maps/submaps/space_rocks/space_rocks.dm index e08b992631..5fb5f9c641 100644 --- a/maps/submaps/space_rocks/space_rocks.dm +++ b/maps/submaps/space_rocks/space_rocks.dm @@ -37,5 +37,5 @@ /obj/effect/overmap/visitable/sector/virgo3b/generate_skybox(zlevel) var/static/image/smallone = image(icon = 'icons/skybox/virgo3b.dmi', icon_state = "small") - if(zlevel == Z_LEVEL_SPACE_ROCKS) + if(zlevel == GLOB.map_templates_loaded[Z_NAME_SPACE_ROCKS]) return smallone diff --git a/maps/submaps/surface_submaps/plains/plains_turfs.dm b/maps/submaps/surface_submaps/plains/plains_turfs.dm index 0949581b0e..7d87331408 100644 --- a/maps/submaps/surface_submaps/plains/plains_turfs.dm +++ b/maps/submaps/surface_submaps/plains/plains_turfs.dm @@ -4,7 +4,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/floor/water) VIRGO3B_TURF_CREATE(/turf/simulated/floor/water/contaminated) VIRGO3B_TURF_CREATE(/turf/simulated/floor/water/deep) VIRGO3B_TURF_CREATE(/turf/simulated/floor/wood) -VIRGO3B_TURF_CREATE(/turf/simulated/floor/plating/external) +VIRGO3B_TURF_CREATE(/turf/simulated/floor/wood/sif) VIRGO3B_TURF_CREATE(/turf/simulated/floor/tiled/external) VIRGO3B_TURF_CREATE(/turf/simulated/shuttle/floor) VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/grass/sif/forest) diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm index abfc98b43c..e996a14476 100644 --- a/maps/tether/submaps/_tether_submaps.dm +++ b/maps/tether/submaps/_tether_submaps.dm @@ -5,34 +5,36 @@ /// Static Load /datum/map_template/tether_lateload/tether_centcom - name = "Tether - Centcom" + name = Z_NAME_TETHER_CENTCOM desc = "Central Command lives here!" mappath = "maps/tether/submaps/tether_centcom.dmm" + name_alias = Z_NAME_ALIAS_CENTCOM associated_map_datum = /datum/map_z_level/tether_lateload/centcom /datum/map_z_level/tether_lateload/centcom - z = Z_LEVEL_CENTCOM + //z = Z_NAME_ALIAS_CENTCOM name = "Centcom" flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT base_turf = /turf/simulated/floor/outdoors/rocks /datum/map_template/tether_lateload/tether_misc - name = "Tether - Misc" + name = Z_NAME_TETHER_MISC desc = "Misc areas, like some transit areas, holodecks, merc area." mappath = "maps/tether/submaps/tether_misc.dmm" + name_alias = Z_NAME_ALIAS_MISC associated_map_datum = /datum/map_z_level/tether_lateload/misc /datum/map_z_level/tether_lateload/misc - z = Z_LEVEL_MISC + //z = Z_NAME_ALIAS_MISC name = "Misc" flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT #include "underdark_pois/_templates.dm" #include "underdark_pois/underdark_things.dm" /datum/map_template/tether_lateload/tether_underdark - name = "Tether - Underdark" + name = Z_NAME_TETHER_UNDERDARK desc = "Mining, but harder." mappath = "maps/tether/submaps/tether_underdark.dmm" @@ -42,19 +44,19 @@ name = "Underdark" flags = MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_SEALED base_turf = /turf/simulated/mineral/floor/virgo3b - z = Z_LEVEL_UNDERDARK + //z = Z_NAME_TETHER_UNDERDARK /datum/map_template/tether_lateload/tether_underdark/on_map_loaded(z) . = ..() - seed_submaps(list(Z_LEVEL_UNDERDARK), 100, /area/mine/unexplored/underdark, /datum/map_template/underdark) - new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_UNDERDARK, world.maxx - 4, world.maxy - 4) // Create the mining Z-level. - new /datum/random_map/noise/ore/underdark(null, 1, 1, Z_LEVEL_UNDERDARK, 64, 64) // Create the mining ore distribution map. + seed_submaps(list(z), 100, /area/mine/unexplored/underdark, /datum/map_template/underdark) + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx - 4, world.maxy - 4) // Create the mining Z-level. + new /datum/random_map/noise/ore/underdark(null, 1, 1, z, 64, 64) // Create the mining ore distribution map. #include "../../submaps/surface_submaps/plains/plains_vr.dm" #include "../../submaps/surface_submaps/plains/plains_areas.dm" #include "../../submaps/surface_submaps/plains/plains_turfs.dm" /datum/map_template/tether_lateload/tether_plains - name = "Tether - Plains" + name = Z_NAME_TETHER_PLAINS desc = "The Virgo 3B away mission." mappath = "maps/tether/submaps/tether_plains.dmm" associated_map_datum = /datum/map_z_level/tether_lateload/tether_plains @@ -63,11 +65,11 @@ name = "Away Mission - Plains" flags = MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_SEALED base_turf = /turf/simulated/mineral/floor/virgo3b - z = Z_LEVEL_PLAINS + //z = Z_NAME_TETHER_PLAINS /datum/map_template/tether_lateload/tether_plains/on_map_loaded(z) . = ..() - seed_submaps(list(Z_LEVEL_PLAINS), 120, /area/tether/outpost/exploration_plains, /datum/map_template/surface/plains) + seed_submaps(list(z), 120, /area/tether/outpost/exploration_plains, /datum/map_template/surface/plains) ////////////////////////////////////////////////////////////////////////////// //Antag/Event/ERT Areas @@ -120,7 +122,7 @@ //Rogue Mines Stuff /datum/map_template/tether_lateload/tether_roguemines1 - name = "Asteroid Belt 1" + name = Z_NAME_TETHER_ROGUEMINE_1 desc = "Mining, but rogue. Zone 1" mappath = "maps/submaps/rogue_mines_vr/rogue_mine1.dmm" @@ -129,10 +131,10 @@ /datum/map_z_level/tether_lateload/roguemines1 name = "Belt 1" flags = MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER - z = Z_LEVEL_ROGUEMINE_1 + //z = Z_NAME_TETHER_ROGUEMINE_1 /datum/map_template/tether_lateload/tether_roguemines2 - name = "Asteroid Belt 2" + name = Z_NAME_TETHER_ROGUEMINE_2 desc = "Mining, but rogue. Zone 2" mappath = "maps/submaps/rogue_mines_vr/rogue_mine2.dmm" @@ -141,7 +143,7 @@ /datum/map_z_level/tether_lateload/roguemines2 name = "Belt 2" flags = MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER - z = Z_LEVEL_ROGUEMINE_2 + //z = Z_NAME_TETHER_ROGUEMINE_2 ////////////////////////////////////////////////////////////////////////////////////// // Code Shenanigans for Tether lateload maps @@ -155,13 +157,10 @@ return new associated_map_datum(using_map, z) + return ..() -/datum/map_z_level/tether_lateload - z = 0 - -/datum/map_z_level/tether_lateload/New(var/datum/map/map, mapZ) - if(mapZ && !z) - z = mapZ +/datum/map_z_level/tether_lateload/New(datum/map/map, mapZ) + z = mapZ return ..(map) /obj/effect/step_trigger/zlevel_fall //Don't ever use this, only use subtypes.Define a new var/static/target_z on each @@ -204,29 +203,29 @@ #include "../../expedition_vr/aerostat/_aerostat.dm" /datum/map_template/tether_lateload/away_aerostat - name = "Remmi Aerostat - Z1 Aerostat" + name = Z_NAME_AEROSTAT desc = "The Virgo 2 Aerostat away mission." mappath = "maps/expedition_vr/aerostat/aerostat.dmm" associated_map_datum = /datum/map_z_level/tether_lateload/away_aerostat /datum/map_z_level/tether_lateload/away_aerostat name = "Away Mission - Aerostat" - z = Z_LEVEL_AEROSTAT + //z = Z_NAME_AEROSTAT base_turf = /turf/unsimulated/floor/sky/virgo2_sky /datum/map_template/tether_lateload/away_aerostat_surface - name = "Remmi Aerostat - Z2 Surface" + name = Z_NAME_AEROSTAT_SURFACE desc = "The surface from the Virgo 2 Aerostat." mappath = "maps/expedition_vr/aerostat/surface.dmm" associated_map_datum = /datum/map_z_level/tether_lateload/away_aerostat_surface /datum/map_template/tether_lateload/away_aerostat_surface/on_map_loaded(z) . = ..() - seed_submaps(list(Z_LEVEL_AEROSTAT_SURFACE), 120, /area/offmap/aerostat/surface/unexplored, /datum/map_template/virgo2) - new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_AEROSTAT_SURFACE, world.maxx - 4, world.maxy - 4) - new /datum/random_map/noise/ore/virgo2(null, 1, 1, Z_LEVEL_AEROSTAT_SURFACE, 64, 64) + seed_submaps(list(z), 120, /area/offmap/aerostat/surface/unexplored, /datum/map_template/virgo2) + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx - 4, world.maxy - 4) + new /datum/random_map/noise/ore/virgo2(null, 1, 1, z, 64, 64) /datum/map_z_level/tether_lateload/away_aerostat_surface name = "Away Mission - Aerostat Surface" - z = Z_LEVEL_AEROSTAT_SURFACE + //z = Z_NAME_AEROSTAT_SURFACE base_turf = /turf/simulated/mineral/floor/ignore_mapgen/virgo2 diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index 1222164edf..ca86717cf4 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -21,7 +21,7 @@ path = "tether" use_overmap = TRUE - overmap_z = Z_LEVEL_MISC + overmap_z = Z_NAME_ALIAS_MISC overmap_size = 50 overmap_event_areas = 44 usable_email_tlds = list("virgo.nt") @@ -33,10 +33,11 @@ id_hud_icons = 'icons/mob/hud_jobs_vr.dmi' holomap_smoosh = list(list( - Z_LEVEL_SURFACE_LOW, - Z_LEVEL_SURFACE_MID, - Z_LEVEL_SURFACE_HIGH, - Z_LEVEL_SPACE_LOW)) + Z_LEVEL_TETHER_SURFACE_LOW, + Z_LEVEL_TETHER_SURFACE_MID, + Z_LEVEL_TETHER_SURFACE_HIGH, + Z_LEVEL_TETHER_SPACE_LOW, + )) station_name = "NSB Adephagia" station_short = "Tether" @@ -76,7 +77,7 @@ NETWORK_ROBOTS, NETWORK_SECURITY, NETWORK_TELECOM, - NETWORK_TETHER + NETWORK_TETHER, ) secondary_networks = list( NETWORK_ERT, @@ -87,7 +88,7 @@ NETWORK_ALARM_POWER, NETWORK_ALARM_FIRE, NETWORK_TALON_HELMETS, - NETWORK_TALON_SHIP + NETWORK_TALON_SHIP, ) bot_patrolling = FALSE @@ -135,78 +136,80 @@ ) unit_test_z_levels = list( - Z_LEVEL_SURFACE_LOW, - Z_LEVEL_SURFACE_MID, - Z_LEVEL_SURFACE_HIGH, - Z_LEVEL_TRANSIT, - Z_LEVEL_SPACE_LOW + Z_LEVEL_TETHER_SURFACE_LOW, + Z_LEVEL_TETHER_SURFACE_MID, + Z_LEVEL_TETHER_SURFACE_HIGH, + Z_LEVEL_TETHER_TRANSIT, + Z_LEVEL_TETHER_SPACE_LOW, ) lateload_z_levels = list( - list("Tether - Centcom","Tether - Misc","Tether - Underdark","Tether - Plains"), //Stock Tether lateload maps - list("Offmap Ship - Talon V2"), - list("Asteroid Belt 1","Asteroid Belt 2"), - list("Desert Planet - Z1 Beach","Desert Planet - Z2 Cave"), - list("Remmi Aerostat - Z1 Aerostat","Remmi Aerostat - Z2 Surface"), - list("Debris Field - Z1 Space"), - list("Fuel Depot - Z1 Space") + list(Z_NAME_TETHER_CENTCOM, Z_NAME_TETHER_MISC, Z_NAME_TETHER_UNDERDARK, Z_NAME_TETHER_PLAINS), //Stock Tether lateload maps + list(Z_NAME_OFFMAP1), + list(Z_NAME_TETHER_ROGUEMINE_1, Z_NAME_TETHER_ROGUEMINE_2), + list(Z_NAME_BEACH, Z_NAME_BEACH_CAVE), + list(Z_NAME_AEROSTAT, Z_NAME_AEROSTAT_SURFACE), + list(Z_NAME_DEBRISFIELD), + list(Z_NAME_FUELDEPOT), ) lateload_gateway = list( - list("Gateway - Carp Farm"), - list("Gateway - Snow Field"), - list("Gateway - Listening Post"), - list(list("Gateway - Honleth Highlands A", "Gateway - Honleth Highlands B")), - list("Gateway - Arynthi Lake Underground A","Gateway - Arynthi Lake A"), - list("Gateway - Arynthi Lake Underground B","Gateway - Arynthi Lake B"), - list("Gateway - Wild West") + list(Z_NAME_GATEWAY_CARP_FARM), + list(Z_NAME_GATEWAY_SNOW_FIELD), + list(Z_NAME_GATEWAY_LISTENING_POST), + list(list(Z_NAME_GATEWAY_HONLETH_A, Z_NAME_GATEWAY_HONLETH_B)), + list(Z_NAME_GATEWAY_ARYNTHI_CAVE_A,Z_NAME_GATEWAY_ARYNTHI_A), + list(Z_NAME_GATEWAY_ARYNTHI_CAVE_B,Z_NAME_GATEWAY_ARYNTHI_B), + list(Z_NAME_GATEWAY_WILD_WEST), ) lateload_overmap = list( - list("Grass Cave") + list(Z_NAME_OM_GRASS_CAVE), ) lateload_redgate = list( - list("Redgate - Teppi Ranch"), - list("Redgate - Innland"), -// list("Redgate - Abandoned Island"), //This will come back later - list("Redgate - Dark Adventure"), - list("Redgate - Eggnog Town Underground","Redgate - Eggnog Town"), - list("Redgate - Star Dog"), - list("Redgate - Hotsprings"), - list("Redgate - Rain City"), - list("Redgate - Islands Underwater","Redgate - Islands"), - list("Redgate - Moving Train", "Redgate - Moving Train Upper Level"), - list("Redgate - Fantasy Dungeon", "Redgate - Fantasy Town"), - list("Redgate - Laserdome"), - list("Redgate - Cascading Falls"), - list("Redgate - Jungle Underground", "Redgate - Jungle"), - list("Redgate - Facility") + list(Z_NAME_REDGATE_TEPPI_RANCH), + list(Z_NAME_REDGATE_INNLAND), +// list(Z_NAME_REDGATE_ABANDONED_ISLAND), //This will come back later + list(Z_NAME_REDGATE_DARK_ADVENTURE), + list(Z_NAME_REDGATE_EGGNOG_CAVE,Z_NAME_REDGATE_EGGNOG_TOWN), + list(Z_NAME_REDGATE_STAR_DOG), + list(Z_NAME_REDGATE_HOTSPRINGS), + list(Z_NAME_REDGATE_RAIN_CITY), + list(Z_NAME_REDGATE_ISLANDS_UNDERWATER,Z_NAME_REDGATE_ISLANDS), + list(Z_NAME_REDGATE_MOVING_TRAIN, Z_NAME_REDGATE_MOVING_TRAIN_UPPER), + list(Z_NAME_REDGATE_FANTASY_DUNGEON, Z_NAME_REDGATE_FANTASY_TOWN), + list(Z_NAME_REDGATE_LASERDOME), + list(Z_NAME_REDGATE_CASCADING_FALLS), + list(Z_NAME_REDGATE_JUNGLE_CAVE, Z_NAME_REDGATE_JUNGLE), + list(Z_NAME_REDGATE_FACILITY), ) ai_shell_restricted = TRUE ai_shell_allowed_levels = list( - Z_LEVEL_SURFACE_LOW, - Z_LEVEL_SURFACE_MID, - Z_LEVEL_SURFACE_HIGH, - Z_LEVEL_TRANSIT, - Z_LEVEL_SPACE_LOW, - Z_LEVEL_SURFACE_MINE, - Z_LEVEL_SOLARS, - Z_LEVEL_MISC, - Z_LEVEL_BEACH + Z_LEVEL_TETHER_SURFACE_LOW, + Z_LEVEL_TETHER_SURFACE_MID, + Z_LEVEL_TETHER_SURFACE_HIGH, + Z_LEVEL_TETHER_TRANSIT, + Z_LEVEL_TETHER_SPACE_LOW, + Z_LEVEL_TETHER_SURFACE_MINE, + Z_LEVEL_TETHER_SOLARS, + Z_NAME_ALIAS_MISC, + Z_NAME_BEACH, ) - belter_docked_z = list(Z_LEVEL_SPACE_LOW) - belter_transit_z = list(Z_LEVEL_MISC) - belter_belt_z = list(Z_LEVEL_ROGUEMINE_1, - Z_LEVEL_ROGUEMINE_2) + belter_docked_z = list(Z_LEVEL_TETHER_SPACE_LOW) + belter_transit_z = list(Z_NAME_ALIAS_MISC) + belter_belt_z = list(Z_NAME_TETHER_ROGUEMINE_1, + Z_NAME_TETHER_ROGUEMINE_2) - mining_station_z = list(Z_LEVEL_SPACE_LOW) - mining_outpost_z = list(Z_LEVEL_SURFACE_MINE) + mining_station_z = list(Z_LEVEL_TETHER_SPACE_LOW) + mining_outpost_z = list(Z_LEVEL_TETHER_SURFACE_MINE) - planet_datums_to_make = list(/datum/planet/virgo3b, - /datum/planet/virgo4) + planet_datums_to_make = list( + /datum/planet/virgo3b, + /datum/planet/virgo4, + ) /datum/map/tether/get_map_info() . = list() @@ -218,11 +221,11 @@ /datum/map/tether/perform_map_generation() - new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SURFACE_MINE, world.maxx, world.maxy) // Create the mining Z-level. - new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SURFACE_MINE, 64, 64) // Create the mining ore distribution map. + new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_TETHER_SURFACE_MINE, world.maxx, world.maxy) // Create the mining Z-level. + new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_TETHER_SURFACE_MINE, 64, 64) // Create the mining ore distribution map. - new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SOLARS, world.maxx, world.maxy) // Create the mining Z-level. - new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SOLARS, 64, 64) // Create the mining ore distribution map. + new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_TETHER_SOLARS, world.maxx, world.maxy) // Create the mining Z-level. + new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_TETHER_SOLARS, 64, 64) // Create the mining ore distribution map. return 1 @@ -232,17 +235,17 @@ /datum/planet/virgo3b expected_z_levels = list( - Z_LEVEL_SURFACE_LOW, - Z_LEVEL_SURFACE_MID, - Z_LEVEL_SURFACE_HIGH, - Z_LEVEL_SURFACE_MINE, - Z_LEVEL_SOLARS, - Z_LEVEL_PLAINS, - Z_LEVEL_CENTCOM + Z_LEVEL_TETHER_SURFACE_LOW, + Z_LEVEL_TETHER_SURFACE_MID, + Z_LEVEL_TETHER_SURFACE_HIGH, + Z_LEVEL_TETHER_SURFACE_MINE, + Z_LEVEL_TETHER_SOLARS, + Z_NAME_TETHER_PLAINS, + Z_NAME_ALIAS_CENTCOM ) /datum/planet/virgo4 expected_z_levels = list( - Z_LEVEL_BEACH + Z_NAME_BEACH ) // Overmap represetation of tether @@ -267,13 +270,13 @@ initial_restricted_waypoints = list("Central Command Shuttlepad" = list("cc_shuttlepad")) //Despite not being in the multi-z complex, these levels are part of the overmap sector extra_z_levels = list( - Z_LEVEL_SURFACE_MINE, - Z_LEVEL_SOLARS, - Z_LEVEL_PLAINS, - Z_LEVEL_UNDERDARK + Z_LEVEL_TETHER_SURFACE_MINE, + Z_LEVEL_TETHER_SOLARS, + Z_NAME_TETHER_PLAINS, + Z_NAME_TETHER_UNDERDARK ) - levels_for_distress = list(Z_LEVEL_OFFMAP1, Z_LEVEL_BEACH, Z_LEVEL_AEROSTAT, Z_LEVEL_DEBRISFIELD, Z_LEVEL_FUELDEPOT) + levels_for_distress = list(Z_NAME_OFFMAP1, Z_NAME_BEACH, Z_NAME_AEROSTAT, Z_NAME_DEBRISFIELD, Z_NAME_FUELDEPOT) /obj/effect/overmap/visitable/sector/virgo3b/Crossed(var/atom/movable/AM) . = ..() @@ -284,7 +287,7 @@ announce_atc(AM,going = TRUE) /obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels() - return list(Z_LEVEL_SPACE_LOW) + return list(Z_LEVEL_TETHER_SPACE_LOW) /obj/effect/overmap/visitable/sector/virgo3b/proc/announce_atc(var/atom/movable/AM, var/going = FALSE) if(istype(AM, /obj/effect/overmap/visitable/ship/simplemob)) @@ -308,7 +311,7 @@ var/static/image/bigone = image(icon = 'icons/skybox/virgo3b.dmi', icon_state = "large") var/static/image/smallone = image(icon = 'icons/skybox/virgo3b.dmi', icon_state = "small") - if(zlevel == Z_LEVEL_TRANSIT) + if(zlevel == Z_LEVEL_TETHER_TRANSIT) return bigone else return smallone @@ -326,7 +329,7 @@ holomap_legend_y = 160 /datum/map_z_level/tether/station/surface_low - z = Z_LEVEL_SURFACE_LOW + z = Z_LEVEL_TETHER_SURFACE_LOW name = "Surface 1" flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_SEALED|MAP_LEVEL_XENOARCH_EXEMPT|MAP_LEVEL_PERSIST base_turf = /turf/simulated/floor/outdoors/rocks/virgo3b @@ -334,7 +337,7 @@ holomap_offset_y = TETHER_HOLOMAP_MARGIN_Y /datum/map_z_level/tether/station/surface_mid - z = Z_LEVEL_SURFACE_MID + z = Z_LEVEL_TETHER_SURFACE_MID name = "Surface 2" flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_SEALED|MAP_LEVEL_XENOARCH_EXEMPT|MAP_LEVEL_PERSIST base_turf = /turf/simulated/open @@ -342,7 +345,7 @@ holomap_offset_y = TETHER_HOLOMAP_MARGIN_Y + TETHER_MAP_SIZE /datum/map_z_level/tether/station/surface_high - z = Z_LEVEL_SURFACE_HIGH + z = Z_LEVEL_TETHER_SURFACE_HIGH name = "Surface 3" flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_SEALED|MAP_LEVEL_XENOARCH_EXEMPT|MAP_LEVEL_PERSIST base_turf = /turf/simulated/open @@ -350,13 +353,13 @@ holomap_offset_y = TETHER_HOLOMAP_MARGIN_Y /datum/map_z_level/tether/transit - z = Z_LEVEL_TRANSIT + z = Z_LEVEL_TETHER_TRANSIT name = "Transit" flags = MAP_LEVEL_STATION|MAP_LEVEL_SEALED|MAP_LEVEL_PLAYER|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT base_turf = /turf/space/v3b_midpoint // Special type that spawns fall triggers /datum/map_z_level/tether/station/space_low - z = Z_LEVEL_SPACE_LOW + z = Z_LEVEL_TETHER_SPACE_LOW name = "Asteroid 1" base_turf = /turf/space transit_chance = 33 @@ -365,13 +368,13 @@ holomap_offset_y = TETHER_HOLOMAP_MARGIN_Y + TETHER_MAP_SIZE /datum/map_z_level/tether/mine - z = Z_LEVEL_SURFACE_MINE + z = Z_LEVEL_TETHER_SURFACE_MINE name = "Mining Outpost" flags = MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_SEALED|MAP_LEVEL_PERSIST base_turf = /turf/simulated/floor/outdoors/rocks/virgo3b /datum/map_z_level/tether/solars - z = Z_LEVEL_SOLARS + z = Z_LEVEL_TETHER_SOLARS name = "Solar Field" flags = MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_SEALED|MAP_LEVEL_PERSIST base_turf = /turf/simulated/floor/outdoors/rocks/virgo3b diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index 97a14e4698..6e6404f50f 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -2,25 +2,25 @@ . = ..() teleport_x = src.x teleport_y = 2 - teleport_z = Z_LEVEL_SURFACE_MINE + teleport_z = Z_LEVEL_TETHER_SURFACE_MINE /obj/effect/step_trigger/teleporter/from_mining/Initialize(mapload) . = ..() teleport_x = src.x teleport_y = world.maxy - 1 - teleport_z = Z_LEVEL_SURFACE_LOW + teleport_z = Z_LEVEL_TETHER_SURFACE_LOW /obj/effect/step_trigger/teleporter/to_solars/Initialize(mapload) . = ..() teleport_x = world.maxx - 1 teleport_y = src.y - teleport_z = Z_LEVEL_SOLARS + teleport_z = Z_LEVEL_TETHER_SOLARS /obj/effect/step_trigger/teleporter/from_solars/Initialize(mapload) . = ..() teleport_x = 2 teleport_y = src.y - teleport_z = Z_LEVEL_SURFACE_LOW + teleport_z = Z_LEVEL_TETHER_SURFACE_LOW /obj/effect/step_trigger/teleporter/wild/Initialize(mapload) . = ..() @@ -62,13 +62,13 @@ . = ..() teleport_x = src.x teleport_y = world.maxy - 1 - teleport_z = Z_LEVEL_PLAINS + teleport_z = GLOB.map_templates_loaded[Z_NAME_TETHER_PLAINS] /obj/effect/step_trigger/teleporter/from_plains/Initialize(mapload) . = ..() teleport_x = src.x teleport_y = 2 - teleport_z = Z_LEVEL_SURFACE_LOW + teleport_z = Z_LEVEL_TETHER_SURFACE_LOW /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/find_planet() planet = planet_virgo3b diff --git a/maps/~map_system/maps_vr.dm b/maps/~map_system/maps_vr.dm index 6baee739a6..8b9742915c 100644 --- a/maps/~map_system/maps_vr.dm +++ b/maps/~map_system/maps_vr.dm @@ -5,35 +5,14 @@ var/list/lateload_gb_west = list() /datum/controller/subsystem/mapping/loadLateMaps() - if(using_map.name == "RascalsPass") - var/list/gbn_load = using_map.lateload_gb_north - var/list/gbs_load = using_map.lateload_gb_south - var/list/gbe_load = using_map.lateload_gb_east - var/list/gbw_load = using_map.lateload_gb_west + if(using_map.type != /datum/map/groundbase) + return ..() + var/list/workload = list(using_map.lateload_gb_north, using_map.lateload_gb_south, using_map.lateload_gb_east, using_map.lateload_gb_west) - if(LAZYLEN(gbn_load)) //Just copied from gateway picking, this is so we can have a kind of OM map version of the same concept. - var/picklist = pick(gbn_load) - if(!picklist) //No lateload maps at all - return - - if(!islist(picklist)) //So you can have a 'chain' of z-levels that make up one away mission - error("Randompick Z level [picklist] is not a list! Must be in a list!") - return - - for(var/map in picklist) - if(islist(map)) - // TRIPLE NEST. In this situation we pick one at random from the choices in the list. - //This allows a sort of a1,a2,a3,b1,b2,b3,c1,c2,c3 setup where it picks one 'a', one 'b', one 'c' - map = pick(map) - var/datum/map_template/MT = map_templates[map] - if(!istype(MT)) - error("Randompick Z level \"[map]\" is not a valid map!") - else - MT.load_new_z(centered = FALSE) - if(LAZYLEN(gbs_load)) //Just copied from gateway picking, this is so we can have a kind of OM map version of the same concept. - var/picklist = pick(gbs_load) - + for(var/list/current_sector in workload) + if(LAZYLEN(current_sector)) //Just copied from gateway picking, this is so we can have a kind of OM map version of the same concept. + var/picklist = pick(current_sector) if(!picklist) //No lateload maps at all return @@ -52,45 +31,4 @@ else MT.load_new_z(centered = FALSE) - if(LAZYLEN(gbe_load)) //Just copied from gateway picking, this is so we can have a kind of OM map version of the same concept. - var/picklist = pick(gbe_load) - - if(!picklist) //No lateload maps at all - return - - if(!islist(picklist)) //So you can have a 'chain' of z-levels that make up one away mission - error("Randompick Z level [picklist] is not a list! Must be in a list!") - return - - for(var/map in picklist) - if(islist(map)) - // TRIPLE NEST. In this situation we pick one at random from the choices in the list. - //This allows a sort of a1,a2,a3,b1,b2,b3,c1,c2,c3 setup where it picks one 'a', one 'b', one 'c' - map = pick(map) - var/datum/map_template/MT = map_templates[map] - if(!istype(MT)) - error("Randompick Z level \"[map]\" is not a valid map!") - else - MT.load_new_z(centered = FALSE) - - if(LAZYLEN(gbw_load)) //Just copied from gateway picking, this is so we can have a kind of OM map version of the same concept. - var/picklist = pick(gbw_load) - - if(!picklist) //No lateload maps at all - return - - if(!islist(picklist)) //So you can have a 'chain' of z-levels that make up one away mission - error("Randompick Z level [picklist] is not a list! Must be in a list!") - return - - for(var/map in picklist) - if(islist(map)) - // TRIPLE NEST. In this situation we pick one at random from the choices in the list. - //This allows a sort of a1,a2,a3,b1,b2,b3,c1,c2,c3 setup where it picks one 'a', one 'b', one 'c' - map = pick(map) - var/datum/map_template/MT = map_templates[map] - if(!istype(MT)) - error("Randompick Z level \"[map]\" is not a valid map!") - else - MT.load_new_z(centered = FALSE) - . = ..() \ No newline at end of file + return ..()