From 26a13f61f564a4e75306ebc78e0c6f5a6c73f43c Mon Sep 17 00:00:00 2001 From: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Wed, 8 Jun 2022 21:06:38 -0400 Subject: [PATCH] test --- _maps/deltastation.json | 2 +- _maps/heliostation.json | 2 +- _maps/icebox.json | 2 +- _maps/kilostation.json | 2 +- _maps/metastation.json | 2 +- _maps/multiz_debug.json | 2 +- _maps/pubbystation.json | 2 +- _maps/runtimestation.json | 2 +- _maps/selenestation.json | 2 +- _maps/tramstation.json | 2 +- code/controllers/subsystem/mapping.dm | 4 ++-- code/datums/map_config.dm | 10 +++++----- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/_maps/deltastation.json b/_maps/deltastation.json index d21ee4eac73..05a42069766 100644 --- a/_maps/deltastation.json +++ b/_maps/deltastation.json @@ -1,7 +1,7 @@ { "version": 1, "map_name": "Delta Station", - "map_path": "map_files/Deltastation", + "map_path": "_maps/map_files/Deltastation", "map_file": "DeltaStation2.dmm", "shuttles": { "emergency": "emergency_delta", diff --git a/_maps/heliostation.json b/_maps/heliostation.json index 22796041061..8493236f1c2 100644 --- a/_maps/heliostation.json +++ b/_maps/heliostation.json @@ -1,7 +1,7 @@ { "version": 1, "map_name": "Heliostation", - "map_path": "map_files/Heliostation", + "map_path": "_maps/map_files/Heliostation", "map_file": "Heliostation.dmm", "shuttles": { "cargo": "cargo_helio", diff --git a/_maps/icebox.json b/_maps/icebox.json index 3111fe96232..755542b0068 100644 --- a/_maps/icebox.json +++ b/_maps/icebox.json @@ -1,7 +1,7 @@ { "version": 1, "map_name": "Ice Box Station", - "map_path": "map_files/IceBoxStation", + "map_path": "_maps/map_files/IceBoxStation", "map_file": "IceBoxStation.dmm", "space_ruin_levels": 0, "space_empty_levels": 0, diff --git a/_maps/kilostation.json b/_maps/kilostation.json index 835372f81c0..b542da4b254 100644 --- a/_maps/kilostation.json +++ b/_maps/kilostation.json @@ -1,7 +1,7 @@ { "version": 1, "map_name": "Kilo Station", - "map_path": "map_files/KiloStation", + "map_path": "_maps/map_files/KiloStation", "map_file": "KiloStation.dmm", "shuttles": { "emergency": "emergency_kilo", diff --git a/_maps/metastation.json b/_maps/metastation.json index b532a3a7aab..30d03b2854a 100644 --- a/_maps/metastation.json +++ b/_maps/metastation.json @@ -1,7 +1,7 @@ { "version": 1, "map_name": "MetaStation", - "map_path": "map_files/MetaStation", + "map_path": "_maps/map_files/MetaStation", "map_file": "MetaStation.dmm", "shuttles": { "cargo": "cargo_box", diff --git a/_maps/multiz_debug.json b/_maps/multiz_debug.json index eaa71b7e220..0e4ea634bea 100644 --- a/_maps/multiz_debug.json +++ b/_maps/multiz_debug.json @@ -1,7 +1,7 @@ { "version": 1, "map_name": "MultiZ Debug", - "map_path": "map_files/debug", + "map_path": "_maps/map_files/debug", "map_file": "multiz.dmm", "traits": [ { diff --git a/_maps/pubbystation.json b/_maps/pubbystation.json index dfdac0f6019..dcc378dcebb 100644 --- a/_maps/pubbystation.json +++ b/_maps/pubbystation.json @@ -1,7 +1,7 @@ { "version": 1, "map_name": "Pubby Station", - "map_path": "map_files/PubbyStation", + "map_path": "_maps/map_files/PubbyStation", "map_file": "PubbyStation.dmm", "shuttles": { "emergency": "emergency_pubby", diff --git a/_maps/runtimestation.json b/_maps/runtimestation.json index 6b77a7321f2..3dbf1a203a1 100644 --- a/_maps/runtimestation.json +++ b/_maps/runtimestation.json @@ -1,7 +1,7 @@ { "version": 1, "map_name": "Runtime Station", - "map_path": "map_files/debug", + "map_path": "_maps/map_files/debug", "map_file": "runtimestation.dmm", "space_ruin_levels": 1, "shuttles": { diff --git a/_maps/selenestation.json b/_maps/selenestation.json index 83515da6461..512a7a6156d 100644 --- a/_maps/selenestation.json +++ b/_maps/selenestation.json @@ -1,7 +1,7 @@ { "version": 1, "map_name": "Selene Station", - "map_path": "map_files/SeleneStation", + "map_path": "_maps/map_files/SeleneStation", "map_file": "SeleneStation.dmm", "shuttles": { "cargo": "cargo_selene", diff --git a/_maps/tramstation.json b/_maps/tramstation.json index d580a7b832a..0235e3c44af 100644 --- a/_maps/tramstation.json +++ b/_maps/tramstation.json @@ -1,7 +1,7 @@ { "version": 1, "map_name": "Tramstation", - "map_path": "map_files/tramstation", + "map_path": "_maps/map_files/tramstation", "map_file": "tramstation.dmm", "shuttles": { "cargo": "cargo_box", diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 16dc37b6a19..3e70412b240 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -228,7 +228,7 @@ Used by the AI doomsday and the self-destruct nuke. var/total_z = 0 var/list/parsed_maps = list() for (var/file in files) - var/full_path = "_maps/[path]/[file]" + var/full_path = "[path]/[file]" var/datum/parsed_map/pm = new(file(full_path)) var/bounds = pm?.bounds if (!bounds) @@ -289,7 +289,7 @@ Used by the AI doomsday and the self-destruct nuke. add_new_zlevel("Empty Area [space_levels_so_far]", ZTRAITS_SPACE) if(config.minetype == "lavaland") - LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND) + LoadGroup(FailedZs, "Lavaland", "_maps/map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND) else if (!isnull(config.minetype) && config.minetype != "none") INIT_ANNOUNCE("WARNING: An unknown minetype '[config.minetype]' was set! This is being ignored! Update the maploader code!") #endif diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 745f0fdbba6..231f3399edf 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -15,7 +15,7 @@ // Config actually from the JSON - should default to Meta var/map_name = "Meta Station" - var/map_path = "map_files/MetaStation" + var/map_path = "_maps/map_files/MetaStation" var/map_file = "MetaStation.dmm" var/traits = null @@ -117,13 +117,13 @@ map_file = json["map_file"] // "map_file": "MetaStation.dmm" if (istext(map_file)) - if (!fexists("_maps/[map_path]/[map_file]")) + if (!fexists("[map_path]/[map_file]")) log_world("Map file ([map_path]/[map_file]) does not exist!") return // "map_file": ["Lower.dmm", "Upper.dmm"] else if (islist(map_file)) for (var/file in map_file) - if (!fexists("_maps/[map_path]/[file]")) + if (!fexists("[map_path]/[file]")) log_world("Map file ([map_path]/[file]) does not exist!") return else @@ -194,10 +194,10 @@ /datum/map_config/proc/GetFullMapPaths() if (istext(map_file)) - return list("_maps/[map_path]/[map_file]") + return list("[map_path]/[map_file]") . = list() for (var/file in map_file) - . += "_maps/[map_path]/[file]" + . += "[map_path]/[file]" /datum/map_config/proc/MakeNextMap() return config_filename == PATH_TO_NEXT_MAP_JSON || fcopy(config_filename, PATH_TO_NEXT_MAP_JSON)