Totally refactors and updates the ruins code

2026-08-23 20:16:55 +01:00 · 2016-06-03 21:26:25 +02:00
parent 925d7a4d01
commit a162488f03
39 changed files with 6523 additions and 280 deletions
@@ -9,6 +9,7 @@
 /datum/map_template/New(path = null, map = null, rename = null)
 	if(path)
 		mappath = path
+	if(mappath)
 		preload_size(mappath)
 	if(map)
 		mapfile = map
@@ -16,20 +17,15 @@
 		name = rename

 /datum/map_template/proc/preload_size(path)
-	var/quote = ascii2text(34)
-	var/map_file = file2text(path)
-	var/key_len = length(copytext(map_file,2,findtext(map_file,quote,2,0)))
-	//assuming one map per file since more makes no sense for templates anyway
-	var/mapstart = findtext(map_file,"\n(1,1,") //todo replace with something saner
-	var/content = copytext(map_file,findtext(map_file,quote+"\n",mapstart,0)+2,findtext(map_file,"\n"+quote,mapstart,0)+1)
-	var/line_len = length(copytext(content,1,findtext(content,"\n",2,0)))
+	var/bounds = maploader.load_map(file(path), 1, 1, 1, cropMap=FALSE, measureOnly=TRUE)
+	if(bounds)
+		width = bounds[MAP_MAXX] // Assumes all templates are rectangular, have a single Z level, and begin at 1,1,1
+		height = bounds[MAP_MAXY]
+	return bounds

-	width = line_len/key_len
-	height = length(content)/(line_len+1)
-
-/datum/map_template/proc/load(turf/T, centered = 0)
+/datum/map_template/proc/load(turf/T, centered = FALSE)
 	if(centered)
-		T = locate(T.x - round(width / 2), T.y - round(height / 2), T.z)
+		T = locate(T.x - round(width/2) , T.y - round(height/2) , T.z)
 	if(!T)
 		return
 	if(T.x+width > world.maxx)
@@ -37,21 +33,26 @@
 	if(T.y+height > world.maxy)
 		return

-	maploader.load_map(get_file(), T.x-1, T.y-1, T.z)
-	late_setup_level(
-		block(T, locate(T.x + width - 1, T.y + height - 1, T.z)),
-		block(locate(T.x - 1, T.y - 1, T.z), locate(T.x + width, T.y + height, T.z)))
+	var/list/bounds = maploader.load_map(get_file(), T.x, T.y, T.z, cropMap=TRUE)
+	if(!bounds)
+		return 0
+
+	for(var/L in block(locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]),
+	                   locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ])))

 	log_game("[name] loaded at at [T.x],[T.y],[T.z]")
+	return 1

 /datum/map_template/proc/get_file()
 	if(mapfile)
-		return mapfile
-	if(mappath)
-		mapfile = file(mappath)
-		return mapfile
+		. = mapfile
+	else if(mappath)
+		. = file(mappath)

-/datum/map_template/proc/get_affected_turfs(turf/T, centered = 0)
+	if(!.)
+		log_to_dd("  The file of [src] appears to be empty/non-existent.")
+
+/datum/map_template/proc/get_affected_turfs(turf/T, centered = FALSE)
 	var/turf/placement = T
 	if(centered)
 		var/turf/corner = locate(placement.x - round(width/2), placement.y - round(height/2), placement.z)
@@ -64,4 +65,47 @@
 	var/list/filelist = flist(path)
 	for(var/map in filelist)
 		var/datum/map_template/T = new(path = "[path][map]", rename = "[map]")
-		map_templates[T.name] = T
+		map_templates[T.name] = T
+
+	preloadRuinTemplates()
+	//preloadShuttleTemplates()
+
+/proc/preloadRuinTemplates()
+	// Still supporting bans by filename
+	var/list/banned = generateMapList("config/spaceRuinBlacklist.txt")
+	//banned += generateMapList("config/lavaRuinBlacklist.txt")
+
+	for(var/item in subtypesof(/datum/map_template/ruin))
+		var/datum/map_template/ruin/ruin_type = item
+		// screen out the abstract subtypes
+		if(!initial(ruin_type.id))
+			continue
+		var/datum/map_template/ruin/R = new ruin_type()
+
+		if(banned)
+			if(banned.Find(R.mappath))
+				continue
+
+		map_templates[R.name] = R
+		ruins_templates[R.name] = R
+
+		/*
+		if(istype(R, /datum/map_template/ruin/lavaland))
+			lava_ruins_templates[R.name] = R
+		*/
+		if(istype(R, /datum/map_template/ruin/space))
+			space_ruins_templates[R.name] = R
+
+
+/*
+/proc/preloadShuttleTemplates()
+	for(var/item in subtypesof(/datum/map_template/shuttle))
+		var/datum/map_template/shuttle/shuttle_type = item
+		if(!(initial(shuttle_type.suffix)))
+			continue
+
+		var/datum/map_template/shuttle/S = new shuttle_type()
+
+		shuttle_templates[S.shuttle_id] = S
+		map_templates[S.shuttle_id] = S
+*/
@@ -0,0 +1,20 @@
+/datum/map_template/ruin
+	//name = "A Chest of Doubloons"
+	name = null
+	var/id = null // For blacklisting purposes, all ruins need an id
+	var/description = "In the middle of a clearing in the rockface, there's a \
+		chest filled with gold coins with Spanish engravings. How is there a \
+		wooden container filled with 18th century coinage in the middle of a \
+		lavawracked hellscape? It is clearly a mystery."
+
+	var/allow_duplicates = TRUE
+
+	var/prefix = null
+	var/suffix = null
+
+/datum/map_template/ruin/New()
+	if(!name && id)
+		name = id
+
+	mappath = prefix + suffix
+	..(path = mappath)
@@ -0,0 +1,156 @@
+/datum/map_template/ruin/space
+	prefix = "_maps/RandomRuins/SpaceRuins/"
+
+/datum/map_template/ruin/space/zoo
+	id = "zoo"
+	suffix = "abandonedzoo.dmm"
+	name = "Biological Storage Facility"
+	description = "In case society crumbles, we will be able to restore our \
+		zoos to working order with the breeding stock kept in these 100% \
+		secure and unbreachable storage facilities. At no point has anything \
+		escaped. That's our story, and we're sticking to it."
+
+/datum/map_template/ruin/space/asteroid1
+	id = "asteroid1"
+	suffix = "asteroid1.dmm"
+	name = "Asteroid 1"
+	description = "I-spy with my little eye, something beginning with R."
+
+/datum/map_template/ruin/space/asteroid2
+	id = "asteroid2"
+	suffix = "asteroid2.dmm"
+	name = "Asteroid 2"
+	description = "Oh my god, a giant rock!"
+
+/datum/map_template/ruin/space/asteroid3
+	id = "asteroid3"
+	suffix = "asteroid3.dmm"
+	name = "Asteroid 3"
+	description = "This asteroid floating in space has no official \
+		designation, because the scientist that discovered it deemed it \
+		'super dull'."
+
+/datum/map_template/ruin/space/asteroid4
+	id = "asteroid4"
+	suffix = "asteroid4.dmm"
+	name = "Asteroid 4"
+	description = "Nanotrasen Escape Pods have a 100%* success rate, and a \
+		99%* customer satisfaction rate. *Please note that these statistics, \
+		are taken from pods that have successfully docked with a recovery \
+		vessel."
+
+/datum/map_template/ruin/space/asteroid5
+	id = "asteroid5"
+	suffix = "asteroid5.dmm"
+	name = "Asteroid 5"
+	description = "Oh my god, another giant rock!"
+
+/datum/map_template/ruin/space/deep_storage
+	id = "deep-storage"
+	suffix = "deepstorage.dmm"
+	name = "Survivalist Bunker"
+	description = "Assume the best, prepare for the worst. Generally, you \
+		should do so by digging a three man heavily fortified bunker into \
+		a giant unused asteroid. Then make it self sufficient, mask any \
+		evidence of construction, hook it covertly into the \
+		telecommunications network and hope for the best."
+
+/datum/map_template/ruin/space/derelict1
+	id = "derelict1"
+	suffix = "derelict1.dmm"
+	name = "Derelict 1"
+	description = "Nothing to see here citizen, move along, certainly no \
+		xeno outbreaks on this piece of station debris. That purple stuff? \
+		It's uh... station nectar. It's a top secret research installation."
+
+/datum/map_template/ruin/space/derelict2
+	id = "derelict2"
+	suffix = "derelict2.dmm"
+	name = "Dinner for Two"
+	description = "Oh this is the night\n\
+		It's a beautiful night\n\
+		And we call it bella notte"
+
+/datum/map_template/ruin/space/derelict3
+	id = "derelict3"
+	suffix = "derelict3.dmm"
+	name = "Derelict 3"
+	description = "These hulks were once part of a larger structure, where \
+		the three great \[REDACTED\] were forged."
+
+/datum/map_template/ruin/space/derelict4
+	id = "derelict4"
+	suffix = "derelict4.dmm"
+	name = "Derelict 4"
+	description = "Centcom ferries have never crashed, will never crash, \
+		there is no current investigation into a crashed ferry, and we \
+		will not let Internal Affairs trample over high security information \
+		in the name of this baseless witchhunt."
+
+/datum/map_template/ruin/space/derelict5
+	id = "derelict5"
+	suffix = "derelict5.dmm"
+	name = "Derelict 5"
+	description = "The plan is, we put a whole bunch of crates full of \
+		treasure in this disused warehouse, launch it into space, and then \
+		ignore it. Forever."
+
+/datum/map_template/ruin/space/empty_shell
+	id = "empty-shell"
+	suffix = "emptyshell.dmm"
+	name = "Empty Shell"
+	description = "Cosy, rural property availible for young professional \
+		couple. Only twelve parsecs from the nearest hyperspace lane!"
+
+/datum/map_template/ruin/space/gas_the_lizards
+	id = "gas-the-lizards"
+	suffix = "gasthelizards.dmm"
+	name = "Disposal Facility 17"
+	description = "Gas efficiency at 95.6%, fluid elimination at 96.2%. \
+		Will require renewed supplies of 'carpet' before the end of the \
+		quarter."
+
+/datum/map_template/ruin/space/intact_empty_ship
+	id = "intact-empty-ship"
+	suffix = "intactemptyship.dmm"
+	name = "Authorship"
+	description = "Just somewhere quiet, where I can focus on my work with \
+		no interruptions."
+
+/datum/map_template/ruin/space/mech_transport
+	id = "mech-transport"
+	suffix = "mechtransport.dmm"
+	name = "CF Corsair"
+	description = "Well, when is it getting here? I have bills to pay; very \
+		well-armed clients who want their shipments as soon as possible! I \
+		don't care, just find it!"
+
+/datum/map_template/ruin/space/onehalf
+	id = "onehalf"
+	suffix = "onehalf.dmm"
+	name = "DK Excavator 453"
+	description = "Based on the trace elements we've detected on the \
+		gutted asteroids, we suspect that a mining ship using a restricted \
+		engine is somewhere in the area. We'd like to request a patrol vessel \
+		to investigate."
+
+/datum/map_template/ruin/space/spacebar
+	id = "spacebar"
+	suffix = "spacebar.dmm"
+	name = "The Rampant Golem and Yellow Hound"
+	description = "No questions asked. No shoes/foot protection, no service. \
+		No tabs. No violence in the inside areas. That's it. Welcome to the \
+		Rampant Golem and Yellow Hound. Can I take your order?"
+
+/datum/map_template/ruin/space/turreted_outpost
+	id = "turreted-outpost"
+	suffix = "turretedoutpost.dmm"
+	name = "Unnamed Turreted Outpost"
+	description = "We'd ask them to stop blaring that ruskiepop music, but \
+		none of us are brave enough to go near those death turrets they have."
+
+/datum/map_template/ruin/space/way_home
+	id = "way-home"
+	suffix = "way_home.dmm"
+	name = "Salvation"
+	description = "In the darkest times, we will find our way home."