diff --git a/code/game/objects/items/poi_items.dm b/code/game/objects/items/poi_items.dm
index 394212e4c4..af1b6c9c7a 100644
--- a/code/game/objects/items/poi_items.dm
+++ b/code/game/objects/items/poi_items.dm
@@ -54,7 +54,7 @@
name = "SCP"
/obj/structure/largecrate/animal/crashedshuttle/initialize()
- starts_with = pick(/mob/living/simple_animal/hostile/statue, /obj/item/cursed_marble, /obj/item/weapon/deadringer)
+ starts_with = list(pick(/mob/living/simple_animal/hostile/statue, /obj/item/cursed_marble, /obj/item/weapon/deadringer)) // Starts_with has to be a list
name = pick("Spicy Crust Pizzeria", "Soap and Care Products", "Sally's Computer Parts", "Steve's Chocolate Pastries", "Smith & Christian's Plastics","Standard Containers & Packaging Co.", "Sanitary Chemical Purgation (LTD)")
name += " delivery crate"
return ..()
diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm
index 165ffb8796..d0504e0223 100644
--- a/code/modules/admin/verbs/map_template_loadverb.dm
+++ b/code/modules/admin/verbs/map_template_loadverb.dm
@@ -20,7 +20,7 @@
var/list/preview = list()
template.preload_size(template.mappath, orientation)
- for(var/S in template.get_affected_turfs(T,centered = TRUE, orientation))
+ for(var/S in template.get_affected_turfs(T,centered = TRUE, orientation=orientation))
preview += image('icons/misc/debug_group.dmi',S ,"red")
usr.client.images += preview
if(alert(usr,"Confirm location.", "Template Confirm","No","Yes") == "Yes")
@@ -29,7 +29,7 @@
usr.client.images -= preview
return
- if(template.load(T, centered = TRUE, orientation))
+ if(template.load(T, centered = TRUE, orientation=orientation))
message_admins("[key_name_admin(usr)] has placed a map template ([template.name]).")
else
to_chat(usr, "Failed to place map")
diff --git a/code/modules/maps/tg/map_template.dm b/code/modules/maps/tg/map_template.dm
index d71a0d1c56..a7d48f8d76 100644
--- a/code/modules/maps/tg/map_template.dm
+++ b/code/modules/maps/tg/map_template.dm
@@ -102,9 +102,11 @@ var/list/global/map_templates = list()
return TRUE
/datum/map_template/proc/load(turf/T, centered = FALSE, orientation = SOUTH)
+ world << "/datum/map_template/proc/load()\tPlacing at ([T.x], [T.y], [T.z])"
var/old_T = T
if(centered)
- T = locate(T.x - round(width/2) , T.y - round(height/2) , T.z)
+ T = locate(T.x - round(((orientation & NORTH|SOUTH) ? width : height)/2) , T.y - round(((orientation & NORTH|SOUTH) ? height : width)/2) , T.z)
+ world << "\t\t\t\t\tCentered placement to ([T.x], [T.y], [T.z])"
if(!T)
return
if(T.x+width > world.maxx)
@@ -113,7 +115,7 @@ var/list/global/map_templates = list()
return
if(annihilate)
- annihilate_bounds(old_T, centered)
+ annihilate_bounds(old_T, centered, orientation)
var/list/bounds = maploader.load_map(file(mappath), T.x, T.y, T.z, cropMap=TRUE, orientation = orientation)
if(!bounds)
@@ -137,10 +139,10 @@ var/list/global/map_templates = list()
placement = corner
return block(placement, locate(placement.x+((orientation & NORTH|SOUTH) ? width : height)-1, placement.y+((orientation & NORTH|SOUTH) ? height : width)-1, placement.z))
-/datum/map_template/proc/annihilate_bounds(turf/origin, centered = FALSE)
+/datum/map_template/proc/annihilate_bounds(turf/origin, centered = FALSE, orientation = SOUTH)
var/deleted_atoms = 0
admin_notice("Annihilating objects in submap loading locatation.", R_DEBUG)
- var/list/turfs_to_clean = get_affected_turfs(origin, centered)
+ var/list/turfs_to_clean = get_affected_turfs(origin, centered, orientation)
if(turfs_to_clean.len)
for(var/turf/T in turfs_to_clean)
for(var/atom/movable/AM in T)
@@ -225,17 +227,21 @@ var/list/global/map_templates = list()
var/specific_sanity = 100 // A hundred chances to place the chosen submap.
while(specific_sanity > 0)
specific_sanity--
- var/width_border = TRANSITIONEDGE + SUBMAP_MAP_EDGE_PAD + round(chosen_template.width / 2)
- var/height_border = TRANSITIONEDGE + SUBMAP_MAP_EDGE_PAD + round(chosen_template.height / 2)
+ var/orientation = pick(cardinal)
+ chosen_template.preload_size(chosen_template.mappath, orientation)
+ var/width_border = TRANSITIONEDGE + SUBMAP_MAP_EDGE_PAD + round(((orientation & NORTH|SOUTH) ? chosen_template.width : chosen_template.height) / 2)
+ var/height_border = TRANSITIONEDGE + SUBMAP_MAP_EDGE_PAD + round(((orientation & NORTH|SOUTH) ? chosen_template.height : chosen_template.width) / 2)
var/z_level = pick(z_levels)
var/turf/T = locate(rand(width_border, world.maxx - width_border), rand(height_border, world.maxy - height_border), z_level)
var/valid = TRUE
- for(var/turf/check in chosen_template.get_affected_turfs(T,1))
+ world << "Attempting to place [chosen_template.name] at ([T.x], [T.y], [T.z])"
+ for(var/turf/check in chosen_template.get_affected_turfs(T,TRUE,orientation))
var/area/new_area = get_area(check)
+ // world << "Checking ([check.x], [check.y], [check.z])\t area = [new_area.type]"
if(!(istype(new_area, whitelist)))
valid = FALSE // Probably overlapping something important.
- // world << "Invalid due to overlapping with area [new_area.type], when wanting area [whitelist]."
+ // world << "Invalid due to overlapping with area [new_area.type] at ([check.x], [check.y], [check.z]), when attempting to place at ([T.x], [T.y], [T.z])."
break
CHECK_TICK
@@ -244,10 +250,10 @@ var/list/global/map_templates = list()
if(!valid)
continue
- admin_notice("Submap \"[chosen_template.name]\" placed at ([T.x], [T.y], [T.z])", R_DEBUG)
+ admin_notice("Submap \"[chosen_template.name]\" placed at ([T.x], [T.y], [T.z])\n", R_DEBUG)
// Do loading here.
- chosen_template.load(T, centered = TRUE, pick(cardinal)) // This is run before the main map's initialization routine, so that can initilize our submaps for us instead.
+ chosen_template.load(T, centered = TRUE, orientation=orientation) // This is run before the main map's initialization routine, so that can initilize our submaps for us instead.
CHECK_TICK
diff --git a/code/modules/maps/tg/reader.dm b/code/modules/maps/tg/reader.dm
index a4f4d4d0b1..f898e20c88 100644
--- a/code/modules/maps/tg/reader.dm
+++ b/code/modules/maps/tg/reader.dm
@@ -39,6 +39,7 @@ var/global/use_preloader = FALSE
//How I wish for RAII
if(!measureOnly)
Master.StartLoadingMap()
+ world << "/dmm_suite/load_map()\t\tPlacing at ([x_offset], [y_offset], [z_offset])"
space_key = null
#ifdef TESTING
turfsSkipped = 0
@@ -99,11 +100,6 @@ var/global/use_preloader = FALSE
var/ycrd = text2num(dmmRegex.group[4]) + y_offset - 1
var/zcrd = text2num(dmmRegex.group[5]) + z_offset - 1
- if(orientation & (EAST | WEST))
- xcrd = ycrd // temp variable
- ycrd = xcrdStart
- xcrdStart = xcrd
-
var/zexpansion = zcrd > world.maxz
if(zexpansion && !measureOnly)
if(cropMap)
@@ -156,8 +152,6 @@ var/global/use_preloader = FALSE
if(xcrd >= 1)
var/model_key = copytext(line, tpos, tpos + key_len)
- if(!grid_models[model_key])
- throw EXCEPTION("Undefined model key in DMM: [dmm_file], [model_key].")
line_keys[++line_keys.len] = model_key
#ifdef TESTING
else
@@ -175,28 +169,28 @@ var/global/use_preloader = FALSE
// If it's rotated 180 degrees, the dimensions are the same
if(orientation == NORTH)
new_key_list.len = num_rows
- for(var/i in 1 to new_key_list.len)
+ for(var/i = 1 to new_key_list.len)
new_key_list[i] = list()
new_key_list[i].len = num_cols
// Else, the dimensions are swapped
else
new_key_list.len = num_cols
- for(var/i in 1 to new_key_list.len)
+ for(var/i = 1 to new_key_list.len)
new_key_list[i] = list()
new_key_list[i].len = num_rows
num_rows++ // Buffering against the base index of 1
num_cols++
// Populate the new list
- for(var/i in 1 to key_list.len)
- for(var/j in 1 to key_list[i].len)
+ for(var/i = 1 to new_key_list.len)
+ for(var/j = 1 to new_key_list[i].len)
switch(orientation)
if(NORTH)
new_key_list[i][j] = key_list[num_rows - i][num_cols - j]
if(EAST)
- new_key_list[i][j] = key_list[num_cols - i][j]
+ new_key_list[i][j] = key_list[num_rows - j][i]
if(WEST)
- new_key_list[i][j] = key_list[j][num_rows - i]
+ new_key_list[i][j] = key_list[j][num_cols - i]
key_list = new_key_list
@@ -204,10 +198,10 @@ var/global/use_preloader = FALSE
for(var/list/line in key_list)
maxx = max(maxx, line.len)
else
- for(var/i in 1 to key_list.len)
+ for(var/i = 1 to key_list.len)
if(ycrd <= world.maxy && ycrd >= 1)
xcrd = xcrdStart
- for(var/j = 1 to key_list.len)
+ for(var/j = 1 to key_list[1].len)
if(xcrd > world.maxx)
if(cropMap)
break
@@ -218,7 +212,7 @@ var/global/use_preloader = FALSE
var/no_afterchange = no_changeturf || zexpansion
if(!no_afterchange || (key_list[i][j] != space_key))
if(!grid_models[key_list[i][j]])
- throw EXCEPTION("Undefined model key in DMM.")
+ throw EXCEPTION("Undefined model key in DMM: [dmm_file], [key_list[i][j]]")
parse_grid(grid_models[key_list[i][j]], key_list[i][j], xcrd, ycrd, zcrd, no_afterchange, orientation)
#ifdef TESTING
else
@@ -303,7 +297,6 @@ var/global/use_preloader = FALSE
//transform the variables in text format into a list (e.g {var1="derp"; var2; var3=7} => list(var1="derp", var2, var3=7))
var/list/fields = list()
- var/dir_found = FALSE // If dir isn't mapped, then we'll need to add an attribute entry to rotate it according to orientation
if(variables_start)//if there's any variable
full_def = copytext(full_def,variables_start+1,length(full_def))//removing the last '}'
@@ -316,15 +309,11 @@ var/global/use_preloader = FALSE
if(istext(value))
fields[I] = apply_text_macros(value)
- // Rotate dir if orientation isn't south (default)
- if(orientation != SOUTH && findtext(splittext(fields[I], "="), " dir ")) // Spaces are necessary, or we might catch other vars
- var/list/L = splittext(fields[I], " ")
- L[L.len] = turn(text2num(L.len), dir2angle(orientation) + 180) // South is 0 here, dir2angle assumes north is 0
- fields[I] = jointext(L, " ")
- dir_found = TRUE
-
- if(!dir_found)
- fields[++fields.len] = "dir = [num2text(orientation)]"
+ // Rotate dir if orientation isn't south (default)
+ if(fields["dir"])
+ fields["dir"] = turn(fields["dir"], dir2angle(orientation) + 180)
+ else
+ fields["dir"] = turn(SOUTH, dir2angle(orientation) + 180)
//then fill the members_attributes list with the corresponding variables
members_attributes.len++