Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

code/modules/awaymissions/maploader/reader.dm

@@ -96,7 +96,7 @@ var/global/dmm_suite/preloader/_preloader = new
 						if(cropMap)
 							continue
 						else
-							zlevels.increase_max_zlevel_to(zcrd) //create a new z_level if needed
+							space_manager.increase_max_zlevel_to(zcrd) //create a new z_level if needed
 
 				bounds[MAP_MINX] = min(bounds[MAP_MINX], xcrdStart)
 				bounds[MAP_MINZ] = min(bounds[MAP_MINZ], zcrd)
@@ -228,10 +228,12 @@ var/global/dmm_suite/preloader/_preloader = new
 
 			var/full_def = trim_text(copytext(model, old_position, dpos)) //full definition, e.g : /obj/foo/bar{variables=derp}
 			var/variables_start = findtext(full_def, "{")
-			var/atom_def = text2path(trim_text(copytext(full_def, 1, variables_start))) //path definition, e.g /obj/foo/bar
+			var/atom_text = trim_text(copytext(full_def, 1, variables_start))
+			var/atom_def = text2path(atom_text) //path definition, e.g /obj/foo/bar
 			old_position = dpos + 1
 
 			if(!atom_def) // Skip the item if the path does not exist.  Fix your crap, mappers!
+				log_debug("Bad path: [atom_text]")
 				continue
 			members.Add(atom_def)
 
@@ -378,8 +380,15 @@ var/global/dmm_suite/preloader/_preloader = new
 			var/trim_right = trim_text(copytext(text,equal_position+1,position))//the content of the variable
 
 			//Check for string
+			// Make it read to the next delimiter, instead of the quote
 			if(findtext(trim_right,quote,1,2))
-				trim_right = copytext(trim_right,2,findtext(trim_right,quote,3,0))
+				var/endquote = findtext(trim_right,quote,-1)
+				if(!endquote)
+					log_debug("Terminating quote not found!")
+				// Our map writer escapes quotes and curly brackets to avoid
+				// letting our simple parser choke on meanly-crafted names/etc
+				// - so we decode it here so it's back to good ol' legibility
+				trim_right = dmm_decode(copytext(trim_right,2,endquote))
 
 			//Check for number
 			else if(isnum(text2num(trim_right)))
@@ -430,14 +439,27 @@ var/global/dmm_suite/preloader/_preloader = new
 	parent_type = /datum
 	var/list/attributes
 	var/target_path
+	var/json_ready = 0
 
 /dmm_suite/preloader/proc/setup(list/the_attributes, path)
 	if(the_attributes.len)
+		json_ready = 0
+		if("map_json_data" in the_attributes)
+			json_ready = 1
 		use_preloader = TRUE
 		attributes = the_attributes
 		target_path = path
 
 /dmm_suite/preloader/proc/load(atom/what)
+	if(json_ready)
+		var/json_data = attributes["map_json_data"]
+		attributes -= "map_json_data"
+		json_data = dmm_decode(json_data)
+		try
+			what.deserialize(json_decode(json_data))
+		catch(var/exception/e)
+			log_debug("Bad json data: '[json_data]'")
+			throw e
 	for(var/attribute in attributes)
 		var/value = attributes[attribute]
 		if(islist(value))

code/modules/awaymissions/maploader/swapmaps.dm

@@ -326,7 +326,7 @@ swapmap
 		x2+=x1-1
 		y2+=y1-1
 		z2+=z1-1
-		zlevels.increase_max_zlevel_to(z2)	// stretch z if necessary
+		space_manager.increase_max_zlevel_to(z2)	// stretch z if necessary
 		if(!ischunk)
 			swapmaps_loaded[src]=null
 			swapmaps_byname[id]=src
@@ -373,7 +373,7 @@ swapmap
 			mz=max(mz,M.z2)
 		world.maxx=mx
 		world.maxy=my
-		zlevels.cut_levels_downto(mz)
+		space_manager.cut_levels_downto(mz)
 
 	// save and delete
 	proc/Unload()

code/modules/awaymissions/maploader/writer.dm

@@ -4,10 +4,10 @@
 #define DMM_IGNORE_NPCS 8
 #define DMM_IGNORE_PLAYERS 16
 #define DMM_IGNORE_MOBS 24
-dmm_suite{
-	var{
-		quote = "\""
-		list/letter_digits = list(
+#define DMM_USE_JSON 32
+/dmm_suite
+	var/quote = "\""
+	var/list/letter_digits = list(
 			"a","b","c","d","e",
 			"f","g","h","i","j",
 			"k","l","m","n","o",
@@ -21,154 +21,202 @@ dmm_suite{
 			"U","V","W","X","Y",
 			"Z"
 			)
-		}
-	save_map(var/turf/t1 as turf, var/turf/t2 as turf, var/map_name as text, var/flags as num){
-		//Check for illegal characters in file name... in a cheap way.
-		if(!((ckeyEx(map_name)==map_name) && ckeyEx(map_name))){
-			CRASH("Invalid text supplied to proc save_map, invalid characters or empty string.")
-			}
-		//Check for valid turfs.
-		if(!isturf(t1) || !isturf(t2)){
-			CRASH("Invalid arguments supplied to proc save_map, arguments were not turfs.")
-			}
-		var/file_text = write_map(t1,t2,flags)
-		if(fexists("[map_name].dmm")){
-			fdel("[map_name].dmm")
-			}
-		var/saved_map = file("[map_name].dmm")
-		saved_map << file_text
-		return saved_map
-		}
-	write_map(var/turf/t1 as turf, var/turf/t2 as turf, var/flags as num){
-		//Check for valid turfs.
-		if(!isturf(t1) || !isturf(t2)){
-			CRASH("Invalid arguments supplied to proc write_map, arguments were not turfs.")
-			}
-		var/turf/nw = locate(min(t1.x,t2.x),max(t1.y,t2.y),min(t1.z,t2.z))
-		var/turf/se = locate(max(t1.x,t2.x),min(t1.y,t2.y),max(t1.z,t2.z))
-		var/list/templates[0]
-		var/template_buffer = {""}
-		var/dmm_text = {""}
-		for(var/pos_z in nw.z to se.z){
-			for(var/pos_y in nw.y to se.y){
-				for(var/pos_x in nw.x to se.x){
-					var/turf/test_turf = locate(pos_x,pos_y,pos_z)
-					var/test_template = make_template(test_turf, flags)
-					var/template_number = templates.Find(test_template)
-					if(!template_number){
-						templates.Add(test_template)
-						template_number = templates.len
-						}
-					template_buffer += "[template_number],"
-					}
-				template_buffer += ";"
-				}
-			template_buffer += "."
-			}
-		var/key_length = round/*floor*/(log(letter_digits.len,templates.len-1)+1)
-		var/list/keys[templates.len]
-		for(var/key_pos in 1 to templates.len){
-			keys[key_pos] = get_model_key(key_pos,key_length)
-			dmm_text += {""[keys[key_pos]]" = ([templates[key_pos]])\n"}
-			}
-		var/z_level = 0
-		for(var/z_pos=1;TRUE;z_pos=findtext(template_buffer,".",z_pos)+1){
-			if(z_pos>=length(template_buffer)){break}
-			if(z_level){dmm_text+={"\n"}}
-			dmm_text += {"\n(1,1,[++z_level]) = {"\n"}
-			var/z_block = copytext(template_buffer,z_pos,findtext(template_buffer,".",z_pos))
-			for(var/y_pos=1;TRUE;y_pos=findtext(z_block,";",y_pos)+1){
-				if(y_pos>=length(z_block)){break}
-				var/y_block = copytext(z_block,y_pos,findtext(z_block,";",y_pos))
-				for(var/x_pos=1;TRUE;x_pos=findtext(y_block,",",x_pos)+1){
-					if(x_pos>=length(y_block)){break}
-					var/x_block = copytext(y_block,x_pos,findtext(y_block,",",x_pos))
-					var/key_number = text2num(x_block)
-					var/temp_key = keys[key_number]
-					dmm_text += temp_key
-					sleep(-1)
-					}
-				dmm_text += {"\n"}
-				sleep(-1)
-				}
-			dmm_text += {"\"}"}
-			sleep(-1)
-			}
-		return dmm_text
-		}
-	proc{
-		make_template(var/turf/model as turf, var/flags as num){
-			var/template = ""
-			var/obj_template = ""
-			var/mob_template = ""
-			var/turf_template = ""
-			if(!(flags & DMM_IGNORE_TURFS)){
-				turf_template = "[model.type][check_attributes(model)],"
-				} else{ turf_template = "[world.turf],"}
-			var/area_template = ""
-			if(!(flags & DMM_IGNORE_OBJS)){
-				for(var/obj/O in model.contents){
-					obj_template += "[O.type][check_attributes(O)],"
-					}
-				}
-			for(var/mob/M in model.contents){
-				if(M.client){
-					if(!(flags & DMM_IGNORE_PLAYERS)){
-						mob_template += "[M.type][check_attributes(M)],"
-						}
-					}
-				else{
-					if(!(flags & DMM_IGNORE_NPCS)){
-						mob_template += "[M.type][check_attributes(M)],"
-						}
-					}
-				}
-			if(!(flags & DMM_IGNORE_AREAS)){
-				var/area/m_area = model.loc
-				area_template = "[m_area.type][check_attributes(m_area)]"
-				} else{ area_template = "[world.area]"}
-			template = "[obj_template][mob_template][turf_template][area_template]"
-			return template
-			}
-		check_attributes(var/atom/A){
-			var/attributes_text = {"{"}
-			for(var/V in A.vars){
-				sleep(-1)
-				if((!issaved(A.vars[V])) || (A.vars[V]==initial(A.vars[V]))){continue}
-				if(istext(A.vars[V])){
-					attributes_text += {"[V] = "[A.vars[V]]""}
-					}
-				else if(isnum(A.vars[V])||ispath(A.vars[V])){
-					attributes_text += {"[V] = [A.vars[V]]"}
-					}
-				else if(isicon(A.vars[V])||isfile(A.vars[V])){
-					attributes_text += {"[V] = '[A.vars[V]]'"}
-					}
-				else{
-					continue
-					}
-				if(attributes_text != {"{"}){
-					attributes_text+={"; "}
-					}
-				}
-			if(attributes_text=={"{"}){
-				return
-				}
-			if(copytext(attributes_text, length(attributes_text)-1, 0) == {"; "}){
-				attributes_text = copytext(attributes_text, 1, length(attributes_text)-1)
-				}
-			attributes_text += {"}"}
-			return attributes_text
-			}
-		get_model_key(var/which as num, var/key_length as num){
-			var/key = ""
-			var/working_digit = which-1
-			for(var/digit_pos in key_length to 1 step -1){
-				var/place_value = round/*floor*/(working_digit/(letter_digits.len**(digit_pos-1)))
-				working_digit-=place_value*(letter_digits.len**(digit_pos-1))
-				key = "[key][letter_digits[place_value+1]]"
-				}
-			return key
-			}
-		}
-	}
+
+/dmm_suite/save_map(var/turf/t1 as turf, var/turf/t2 as turf, var/map_name as text, var/flags as num)
+	//Check for illegal characters in file name... in a cheap way.
+	if(!((ckeyEx(map_name)==map_name) && ckeyEx(map_name)))
+		CRASH("Invalid text supplied to proc save_map, invalid characters or empty string.")
+	//Check for valid turfs.
+	if(!isturf(t1) || !isturf(t2))
+		CRASH("Invalid arguments supplied to proc save_map, arguments were not turfs.")
+
+	var/map_prefix = "_maps/quicksave/"
+	var/map_path = "[map_prefix][map_name].dmm"
+	if(fexists(map_path))
+		fdel(map_path)
+	var/saved_map = file(map_path)
+	var/map_text = write_map(t1,t2,flags,saved_map)
+	saved_map << map_text
+	return saved_map
+
+/dmm_suite/write_map(var/turf/t1 as turf, var/turf/t2 as turf, var/flags as num)
+	//Check for valid turfs.
+	if(!isturf(t1) || !isturf(t2))
+		CRASH("Invalid arguments supplied to proc write_map, arguments were not turfs.")
+
+	var/turf/ne = locate(max(t1.x,t2.x),max(t1.y,t2.y),max(t1.z,t2.z)) // Outer corner
+	var/turf/sw = locate(min(t1.x,t2.x),min(t1.y,t2.y),min(t1.z,t2.z)) // Inner corner
+	var/list/templates[0]
+	var/list/template_buffer = list()
+	var/template_buffer_text
+	var/dmm_text = ""
+
+	var/total_timer = start_watch()
+	var/timer = start_watch()
+	log_debug("Reading turfs...")
+	// Read the contents of all the turfs we were given
+	for(var/pos_z in sw.z to ne.z)
+		for(var/pos_y in ne.y to sw.y step -1) // We're reversing this because the map format is silly
+			for(var/pos_x in sw.x to ne.x)
+				var/turf/test_turf = locate(pos_x,pos_y,pos_z)
+				var/test_template = make_template(test_turf, flags)
+				var/template_number = templates.Find(test_template)
+				if(!template_number)
+					templates.Add(test_template)
+					template_number = templates.len
+				template_buffer += "[template_number],"
+				CHECK_TICK
+
+			template_buffer += ";"
+
+		template_buffer += "."
+	template_buffer_text = jointext(template_buffer,"")
+	log_debug("Reading turfs took [stop_watch(timer)]s.")
+
+	if(templates.len == 0)
+		CRASH("No templates found!")
+	var/key_length = round/*floor*/(log(letter_digits.len,templates.len-1)+1)
+	var/list/keys[templates.len]
+	// Write the list of key/model pairs to the file
+	timer = start_watch()
+	log_debug("Writing out key/model pairs to file header...")
+	var/list/key_models = list()
+	for(var/key_pos in 1 to templates.len)
+		keys[key_pos] = get_model_key(key_pos,key_length)
+		key_models += "\"[keys[key_pos]]\" = ([templates[key_pos]])\n"
+		CHECK_TICK
+	dmm_text += jointext(key_models,"")
+	log_debug("Writing key/model pairs complete, took [stop_watch(timer)]s.")
+
+	var/z_level = 0
+	// Loop over all z in our zone
+	timer = start_watch()
+	log_debug("Writing out key map...")
+	var/list/key_map = list()
+	for(var/z_pos=1;TRUE;z_pos=findtext(template_buffer_text,".",z_pos)+1)
+		if(z_pos>=length(template_buffer_text))	break
+		if(z_level)	key_map += "\n"
+		key_map += "\n(1,1,[++z_level]) = {\"\n"
+		var/z_block = copytext(template_buffer_text,z_pos,findtext(template_buffer_text,".",z_pos))
+		for(var/y_pos=1;TRUE;y_pos=findtext(z_block,";",y_pos)+1)
+			if(y_pos>=length(z_block))	break
+			var/y_block = copytext(z_block,y_pos,findtext(z_block,";",y_pos))
+			// A row of keys
+			for(var/x_pos=1;TRUE;x_pos=findtext(y_block,",",x_pos)+1)
+				if(x_pos>=length(y_block))	break
+				var/x_block = copytext(y_block,x_pos,findtext(y_block,",",x_pos))
+				var/key_number = text2num(x_block)
+				var/temp_key = keys[key_number]
+				key_map += temp_key
+				CHECK_TICK
+			key_map += "\n"
+		key_map += "\"}"
+	dmm_text += jointext(key_map,"")
+	log_debug("Writing key map complete, took [stop_watch(timer)]s.")
+	log_debug("TOTAL TIME: [stop_watch(total_timer)]s.")
+	return dmm_text
+
+/dmm_suite/proc/make_template(var/turf/model as turf, var/flags as num)
+	var/use_json = 0
+	if(flags & DMM_USE_JSON)
+		use_json = 1
+	var/template = ""
+	var/turf_template = ""
+	var/list/obj_template = list()
+	var/list/mob_template = list()
+	var/area_template = ""
+
+
+
+	// Turf
+	if(!(flags & DMM_IGNORE_TURFS))
+		turf_template = "[model.type][check_attributes(model,use_json=use_json)],"
+	else	turf_template = "[world.turf],"
+
+	// Objects loop
+	if(!(flags & DMM_IGNORE_OBJS))
+		for(var/obj/O in model.contents)
+			if(O.dont_save || !isnull(O.gcDestroyed))
+				continue
+			obj_template += "[O.type][check_attributes(O,use_json=use_json)],"
+
+	// Mobs Loop
+	for(var/mob/M in model.contents)
+		if(M.dont_save || !isnull(M.gcDestroyed))
+			continue
+		if(M.client)
+			if(!(flags & DMM_IGNORE_PLAYERS))
+				mob_template += "[M.type][check_attributes(M,use_json=use_json)],"
+		else
+			if(!(flags & DMM_IGNORE_NPCS))
+				mob_template += "[M.type][check_attributes(M,use_json=use_json)],"
+
+	// Area
+	if(!(flags & DMM_IGNORE_AREAS))
+		var/area/m_area = model.loc
+		area_template = "[m_area.type][check_attributes(m_area,use_json=use_json)]"
+	else	area_template = "[world.area]"
+
+	template = "[jointext(obj_template,"")][jointext(mob_template,"")][turf_template][area_template]"
+	return template
+
+/dmm_suite/proc/check_attributes(var/atom/A,use_json=0)
+	var/attributes_text = "{"
+	var/list/attributes = list()
+	if(!use_json)
+		for(var/V in A.vars)
+			CHECK_TICK
+			if((!issaved(A.vars[V])) || (A.vars[V]==initial(A.vars[V])))	continue
+
+			attributes += var_to_dmm(A.vars[V], V)
+	else
+		var/list/yeah = A.serialize()
+		// We'll want to write out vars that are important to the editor
+		// So that the map is legible as before
+		for(var/thing in A.map_important_vars())
+			// Save vars that are important for the map editor, so that
+			// json-encoded maps are legible for standard editors
+			if(A.vars[thing] != initial(A.vars[thing]))
+				yeah -= thing
+				attributes += var_to_dmm(A.vars[thing],thing)
+
+		// Remove useless info
+		yeah -= "type"
+		if(yeah.len)
+			var/json_stuff = json_encode(yeah)
+			attributes += var_to_dmm(json_stuff, "map_json_data")
+	if(attributes.len == 0)
+		return
+
+	// Trim a trailing semicolon - `var_to_dmm` always appends a semicolon,
+	// so the last one will be trailing.
+	if(copytext(attributes_text, length(attributes_text)-1, 0) == "; ")
+		attributes_text = copytext(attributes_text, 1, length(attributes_text)-1)
+	attributes_text = "{[jointext(attributes,"; ")]}"
+	return attributes_text
+
+
+/dmm_suite/proc/get_model_key(var/which as num, var/key_length as num)
+	var/list/key = list()
+	var/working_digit = which-1
+	for(var/digit_pos in key_length to 1 step -1)
+		var/place_value = round/*floor*/(working_digit/(letter_digits.len**(digit_pos-1)))
+		working_digit-=place_value*(letter_digits.len**(digit_pos-1))
+		key += letter_digits[place_value+1]
+	return jointext(key,"")
+
+
+/dmm_suite/proc/var_to_dmm(attr, name)
+	if(istext(attr))
+		// dmm_encode will strip out characters that would be capable of disrupting
+		// parsing - namely, quotes and curly braces
+		return "[name] = \"[dmm_encode(attr)]\""
+	else if(isnum(attr)||ispath(attr))
+		return "[name] = [attr]"
+	else if(isicon(attr)||isfile(attr))
+		if(length("[attr]") == 0)
+			// The DM map reader is unable to read files that have a '' file/icon entry
+			return
+		return "[name] = '[attr]'"
+	else
+		return ""

code/modules/awaymissions/mission_code/spacehotel.dm

@@ -92,7 +92,6 @@
 	icon = 'icons/obj/doors/Doorsand.dmi'
 	icon_state = "door_closed"
 	autoclose = 1
-	atom_say_verb = "beeps"
 	var/doorOpen = 'sound/machines/airlock.ogg'
 	var/doorClose = 'sound/machines/airlock.ogg'
 	var/doorDeni = 'sound/machines/DeniedBeep.ogg'

code/modules/awaymissions/mission_code/wildwest.dm

@@ -119,7 +119,7 @@
 				to_chat(user, "<B>Your wish is granted, but at a terrible cost...</B>")
 				to_chat(user, "The Wish Granter punishes you for your wickedness, claiming your soul and warping your body to match the darkness in your heart.")
 				ticker.mode.traitors += user.mind
-				user.mind.special_role = "traitor"
+				user.mind.special_role = SPECIAL_ROLE_TRAITOR
 				var/datum/objective/hijack/hijack = new
 				hijack.owner = user.mind
 				user.mind.objectives += hijack

code/modules/awaymissions/zlevel.dm

@@ -59,15 +59,13 @@ var/global/list/potentialRandomZlevels = generateMapList(filename = "config/away
 		var/map = pick(potentialRandomZlevels)
 		var/file = file(map)
 		if(isfile(file))
-			var/zlev = zlevels.add_new_zlevel()
-			zlevels.add_dirt(zlev)
+			var/zlev = space_manager.add_new_zlevel(AWAY_MISSION, linkage = UNAFFECTED, traits = list(AWAY_LEVEL,BLOCK_TELEPORT))
+			space_manager.add_dirt(zlev)
 			maploader.load_map(file, z_offset = zlev)
 			late_setup_level(block(locate(1, 1, zlev), locate(world.maxx, world.maxy, zlev)))
-			zlevels.remove_dirt(zlev)
+			space_manager.remove_dirt(zlev)
 			log_to_dd("  Away mission loaded: [map]")
 
-		//map_transition_config.Add(AWAY_MISSION_LIST)
-
 		for(var/obj/effect/landmark/L in landmarks_list)
 			if(L.name != "awaystart")
 				continue
@@ -91,11 +89,11 @@ var/global/list/potentialRandomZlevels = generateMapList(filename = "config/away
 			var/file = file(map)
 			if(isfile(file))
 				log_startup_progress("Loading away mission: [map]")
-				var/zlev = zlevels.add_new_zlevel()
-				zlevels.add_dirt(zlev)
+				var/zlev = space_manager.add_new_zlevel()
+				space_manager.add_dirt(zlev)
 				maploader.load_map(file, z_offset = zlev)
 				late_setup_level(block(locate(1, 1, zlev), locate(world.maxx, world.maxy, zlev)))
-				zlevels.remove_dirt(zlev)
+				space_manager.remove_dirt(zlev)
 				log_to_dd("  Away mission loaded: [map]")
 
 			//map_transition_config.Add(AWAY_MISSION_LIST)
@@ -151,8 +149,6 @@ var/global/list/potentialRandomZlevels = generateMapList(filename = "config/away
 	var/initialbudget = budget
 	var/watch = start_watch()
 
-	log_startup_progress("Loading ruins...")
-
 	while(budget > 0 && overall_sanity > 0)
 		// Pick a ruin
 		var/datum/map_template/ruin/ruin = ruins[pick(ruins)]
@@ -187,7 +183,6 @@ var/global/list/potentialRandomZlevels = generateMapList(filename = "config/away
 				ruins -= ruin.name
 			break
 
-	to_chat(world, "<span class='danger'>  Loaded ruins. Or not.</span>") //So the players don't know if we loaded ruins, but we do have a message
 
 	if(initialbudget == budget) //Kill me
 		log_to_dd("  No ruins loaded.")