From 27492e891f25bf28489ad6cb730d53d9cacf4faa Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Fri, 27 Oct 2017 18:34:39 -0400
Subject: [PATCH 1/2] Map config cleanup (#32132)

* Map config cleanup

* Fix
---
 _maps/boxstation.json     |  5 +----
 _maps/deltastation.json   |  5 +----
 _maps/metastation.json    |  5 +----
 _maps/omegastation.json   |  5 +----
 _maps/pubbystation.json   |  5 +----
 _maps/runtimestation.json |  5 +----
 code/datums/map_config.dm | 22 +++++++++-------------
 7 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/_maps/boxstation.json b/_maps/boxstation.json
index 65689d946c..edf5f993d3 100644
--- a/_maps/boxstation.json
+++ b/_maps/boxstation.json
@@ -1,8 +1,5 @@
 {
     "map_name": "Box Station",
     "map_path": "map_files/BoxStation",
-    "map_file": "BoxStation.dmm",
-    "minetype": "lavaland",
-    "transition_config": "default",
-    "allow_custom_shuttles": "yes"
+    "map_file": "BoxStation.dmm"
 }
diff --git a/_maps/deltastation.json b/_maps/deltastation.json
index 3cfd2d5290..dde878a26b 100644
--- a/_maps/deltastation.json
+++ b/_maps/deltastation.json
@@ -1,8 +1,5 @@
 {
     "map_name": "Delta Station",
     "map_path": "map_files/Deltastation",
-    "map_file": "DeltaStation2.dmm",
-    "minetype": "lavaland",
-    "transition_config": "default",
-    "allow_custom_shuttles": "yes"
+    "map_file": "DeltaStation2.dmm"
 }
diff --git a/_maps/metastation.json b/_maps/metastation.json
index eae307ea3c..6b023ba02d 100644
--- a/_maps/metastation.json
+++ b/_maps/metastation.json
@@ -1,8 +1,5 @@
 {
     "map_name": "MetaStation",
     "map_path": "map_files/MetaStation",
-    "map_file": "MetaStation.dmm",
-    "minetype": "lavaland",
-    "transition_config": "default",
-    "allow_custom_shuttles": "yes"
+    "map_file": "MetaStation.dmm"
 }
diff --git a/_maps/omegastation.json b/_maps/omegastation.json
index 0040eac01e..0f3732c36c 100644
--- a/_maps/omegastation.json
+++ b/_maps/omegastation.json
@@ -1,8 +1,5 @@
 {
     "map_name": "OmegaStation",
     "map_path": "map_files/OmegaStation",
-    "map_file": "OmegaStation.dmm",
-    "minetype": "lavaland",
-    "transition_config": "default",
-    "allow_custom_shuttles": "yes"
+    "map_file": "OmegaStation.dmm"
 }
\ No newline at end of file
diff --git a/_maps/pubbystation.json b/_maps/pubbystation.json
index ddfe706280..b63f196b6c 100644
--- a/_maps/pubbystation.json
+++ b/_maps/pubbystation.json
@@ -1,8 +1,5 @@
 {
     "map_name": "PubbyStation",
     "map_path": "map_files/PubbyStation",
-    "map_file": "PubbyStation.dmm",
-    "minetype": "lavaland",
-    "transition_config": "default",
-    "allow_custom_shuttles": "yes"
+    "map_file": "PubbyStation.dmm"
 }
\ No newline at end of file
diff --git a/_maps/runtimestation.json b/_maps/runtimestation.json
index 7462ee5b73..c363b67a05 100644
--- a/_maps/runtimestation.json
+++ b/_maps/runtimestation.json
@@ -1,8 +1,5 @@
 {
     "map_name": "Runtime Station",
     "map_path": "map_files/debug",
-    "map_file": "runtimestation.dmm",
-    "minetype": "lavaland",
-    "transition_config": "default",
-    "allow_custom_shuttles": "no"
+    "map_file": "runtimestation.dmm"
 }
diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm
index 2fb74abfb9..d8b5210bc5 100644
--- a/code/datums/map_config.dm
+++ b/code/datums/map_config.dm
@@ -69,12 +69,11 @@
 	map_path = json["map_path"]
 	map_file = json["map_file"]
 
-	minetype = json["minetype"]
-	allow_custom_shuttles = json["allow_custom_shuttles"]
+	minetype = json["minetype"] || minetype
+	allow_custom_shuttles = json["allow_custom_shuttles"] == TRUE
 
-	var/list/jtcl = json["transition_config"]
-
-	if(jtcl != "default")
+	var/jtcl = json["transition_config"]
+	if(jtcl && jtcl != "default")
 		transition_config.Cut()
 
 		for(var/I in jtcl)
@@ -87,25 +86,22 @@
 	CHECK_EXISTS("map_name")
 	CHECK_EXISTS("map_path")
 	CHECK_EXISTS("map_file")
-	CHECK_EXISTS("minetype")
-	CHECK_EXISTS("transition_config")
-	CHECK_EXISTS("allow_custom_shuttles")
 
 	var/path = GetFullMapPath(json["map_path"], json["map_file"])
 	if(!fexists(path))
 		log_world("Map file ([path]) does not exist!")
 		return
 
-	if(json["transition_config"] != "default")
-		if(!islist(json["transition_config"]))
+	var/tc = json["transition_config"]
+	if(tc != "default")
+		if(!islist(tc))
 			log_world("transition_config is not a list!")
 			return
 
-		var/list/jtcl = json["transition_config"]
-		for(var/I in jtcl)
+		for(var/I in tc)
 			if(isnull(TransitionStringToEnum(I)))
 				log_world("Invalid transition_config option: [I]!")
-			if(isnull(TransitionStringToEnum(jtcl[I])))
+			if(isnull(TransitionStringToEnum(tc[I])))
 				log_world("Invalid transition_config option: [I]!")
 
 	return TRUE