+------+
"
+ for(var/x = 1, x <= limit_x, x++)
+ for(var/y = 1, y <= limit_y, y++)
var/current_cell = get_map_cell(x,y)
if(within_bounds(current_cell))
- if(map[current_cell] == 2)
- line += "#"
- else
- line += "."
- user << line
-
-/datum/random_map/New(var/seed, var/tx, var/ty, var/tz, var/tlx, var/tly)
-
- // Store this for debugging.
- random_maps |= src
-
- // Initialize map.
- set_map_size()
-
- // Get origins for applying the map later.
- if(tx) origin_x = tx
- if(ty) origin_y = ty
- if(tz) origin_z = tz
- if(tlx) limit_x = tlx
- if(tly) limit_y = tly
-
- // testing needed to see how reliable this is (asynchronous calls, called during worldgen), DM ref is not optimistic
- if(seed) rand_seed(seed)
-
- var/start_time = world.timeofday
- admin_notice("Generating [descriptor].", R_DEBUG)
- for(var/i = 0;i[capitalize(descriptor)] generation completed in [round(0.1*(world.timeofday-start_time),0.1)] seconds.", R_DEBUG)
- return
- admin_notice("[capitalize(descriptor)] generation failed in [round(0.1*(world.timeofday-start_time),0.1)] seconds: could not produce sane map.", R_DEBUG)
+ dat += get_map_char(map[current_cell])
+ dat += "
"
+ user << "[dat]+------+ "
/datum/random_map/proc/within_bounds(var/val)
- return (val>0) && (val<=raw_map_size)
+ if(!islist(map))
+ set_map_size()
+ return (val>0) && (val<=map.len)
-/datum/random_map/proc/set_map_size(var/raw_size)
- if(!raw_size)
- raw_size = real_size * real_size
- raw_map_size = raw_size
- map.len = raw_map_size
+/datum/random_map/proc/set_map_size()
+ map = list()
+ map.len = limit_x * limit_y
/datum/random_map/proc/seed_map()
- for(var/x = 1, x <= real_size, x++)
- for(var/y = 1, y <= real_size, y++)
+ for(var/x = 1, x <= limit_x, x++)
+ for(var/y = 1, y <= limit_y, y++)
var/current_cell = get_map_cell(x,y)
- if(prob(55))
- map[current_cell] = 2
+ if(prob(initial_wall_cell))
+ map[current_cell] = WALL_CHAR
else
- map[current_cell] = 1
+ map[current_cell] = FLOOR_CHAR
/datum/random_map/proc/clear_map()
- for(var/x = 1, x <= real_size, x++)
- for(var/y = 1, y <= real_size, y++)
+ for(var/x = 1, x <= limit_x, x++)
+ for(var/y = 1, y <= limit_y, y++)
map[get_map_cell(x,y)] = 0
/datum/random_map/proc/generate()
seed_map()
- for(var/i=1;i<=iterations;i++)
- iterate(i)
+ generate_map()
if(check_map_sanity())
cleanup()
- apply_to_map()
+ if(auto_apply)
+ apply_to_map()
return 1
return 0
-/datum/random_map/proc/iterate(var/iteration)
- var/list/next_map[raw_map_size]
- for(var/x = 1, x <= real_size, x++)
- for(var/y = 1, y <= real_size, y++)
- var/current_cell = get_map_cell(x,y)
- // Sanity check.
- if(!within_bounds(current_cell))
- continue
- // Copy over original value.
- next_map[current_cell] = map[current_cell]
- // Check all neighbors.
- var/count = 0
- for(var/cell in list(current_cell,get_map_cell(x+1,y+1),get_map_cell(x-1,y-1),get_map_cell(x+1,y-1),get_map_cell(x-1,y+1),get_map_cell(x-1,y),get_map_cell(x,y-1),get_map_cell(x+1,y),get_map_cell(x,y+1)))
- if(within_bounds(cell) && map[cell] == 2)
- count++
- if(count>=5)
- next_map[current_cell] = 2 // becomes a wall
- else
- next_map[current_cell] = 1 // becomes a floor
- map = next_map
+// Unused for basic map.
+/datum/random_map/proc/generate_map()
+ return 1
/datum/random_map/proc/check_map_sanity()
return 1
-/datum/random_map/proc/apply_to_map()
- for(var/x = 0, x < real_size, x++)
- if((origin_x + x) > limit_x) continue
- for(var/y = 0, y < real_size, y++)
- if((origin_y + y) > limit_y) continue
- sleep(-1)
- apply_to_turf(origin_x+x,origin_y+y)
+/datum/random_map/proc/apply_to_map(var/tx, var/ty, var/tz)
+ if(!tx) tx = isnull(origin_x) ? 1 : origin_x
+ if(!ty) ty = isnull(origin_y) ? 1 : origin_y
+ if(!tz) tz = isnull(origin_z) ? 1 : origin_z
-/datum/random_map/proc/apply_to_turf(var/x,var/y)
+ for(var/x = 1, x <= limit_x, x++)
+ for(var/y = 1, y <= limit_y, y++)
+ if(!priority_process) sleep(-1)
+ apply_to_turf((tx-1)+x,(ty-1)+y,tz)
+
+/datum/random_map/proc/apply_to_turf(var/x,var/y,var/z)
var/current_cell = get_map_cell(x,y)
if(!within_bounds(current_cell))
- return
- var/turf/T = locate(x,y,origin_z)
- if(!T || !istype(T,/turf/unsimulated/mask))
- return
- switch(map[current_cell])
- if(1)
- T.ChangeTurf(/turf/simulated/floor/plating/airless/asteroid)
- if(2)
- T.ChangeTurf(/turf/simulated/mineral)
- if(3)
- T.ChangeTurf(/turf/simulated/mineral/random)
- if(4)
- T.ChangeTurf(/turf/simulated/mineral/random/high_chance)
+ return 0
+ var/turf/T = locate(x,y,z)
+ if(!T || (target_turf_type && !istype(T,target_turf_type)))
+ return 0
+ var/newpath = get_appropriate_path(map[current_cell])
+ if(newpath)
+ T.ChangeTurf(newpath)
+ get_additional_spawns(map[current_cell],T)
+ return T
+
+/datum/random_map/proc/get_appropriate_path(var/value)
+ switch(value)
+ if(FLOOR_CHAR)
+ return floor_type
+ if(WALL_CHAR)
+ return wall_type
+
+/datum/random_map/proc/get_additional_spawns(var/value, var/turf/T)
+ if(value == DOOR_CHAR)
+ new /obj/machinery/door/airlock(T)
/datum/random_map/proc/cleanup()
+ return
- sleep(-1)
- // Create ore.
- var/ore_count = ORE_COUNT
- while(ore_count)
- var/check_cell = get_map_cell(rand(1,real_size),rand(1,real_size))
- if(!(within_bounds(check_cell)) || map[check_cell] != 2)
- continue
- if(prob(25))
- map[check_cell] = 4
- else
- map[check_cell] = 3
- ore_count--
+/datum/random_map/proc/overlay_with(var/datum/random_map/target_map, var/tx, var/ty)
+ if(!map.len || !istype(target_map))
+ return
+ tx-- // Update origin so that x/y index
+ ty-- // doesn't push it off-kilter by one.
+ for(var/x = 1, x <= limit_x, x++)
+ for(var/y = 1, y <= limit_y, y++)
+ var/current_cell = get_map_cell(x,y)
+ if(!within_bounds(current_cell))
+ continue
+ if(tx+x > target_map.limit_x)
+ continue
+ if(ty+y > target_map.limit_y)
+ continue
+ target_map.map[target_map.get_map_cell(tx+x,ty+y)] = map[current_cell]
+ handle_post_overlay_on(target_map,tx,ty)
- sleep(-1)
-
- // Place random asteroid rooms.
- var/rooms_placed = 0
- for(var/i = 0, i < max_secret_rooms, i++)
- if(make_mining_asteroid_secret())
- rooms_placed++
- admin_notice("Placed [rooms_placed] secrets.", R_DEBUG)
- return 1
\ No newline at end of file
+/datum/random_map/proc/handle_post_overlay_on(var/datum/random_map/target_map, var/tx, var/ty)
+ return
\ No newline at end of file
diff --git a/code/modules/random_map/random_map_verbs.dm b/code/modules/random_map/random_map_verbs.dm
new file mode 100644
index 0000000000..6ab98e20b7
--- /dev/null
+++ b/code/modules/random_map/random_map_verbs.dm
@@ -0,0 +1,107 @@
+/client/proc/print_random_map()
+ set category = "Debug"
+ set name = "Display Random Map"
+ set desc = "Show the contents of a random map."
+
+ if(!holder) return
+
+ var/choice = input("Choose a map to display.") as null|anything in random_maps
+ if(!choice)
+ return
+ var/datum/random_map/M = random_maps[choice]
+ if(istype(M))
+ M.display_map(usr)
+
+/client/proc/delete_random_map()
+ set category = "Debug"
+ set name = "Delete Random Map"
+ set desc = "Delete a random map."
+
+ if(!holder) return
+
+ var/choice = input("Choose a map to delete.") as null|anything in random_maps
+ if(!choice)
+ return
+ var/datum/random_map/M = random_maps[choice]
+ random_maps[choice] = null
+ if(istype(M))
+ message_admins("[key_name_admin(usr)] has deleted [M.name].")
+ log_admin("[key_name(usr)] has deleted [M.name].")
+ qdel(M)
+
+/client/proc/create_random_map()
+ set category = "Debug"
+ set name = "Create Random Map"
+ set desc = "Create a random map."
+
+ if(!holder) return
+
+ var/map_datum = input("Choose a map to create.") as null|anything in typesof(/datum/random_map)-/datum/random_map
+ if(!map_datum)
+ return
+
+ var/datum/random_map/M
+ if(alert("Do you wish to customise the map?",,"Yes","No") == "Yes")
+ var/seed = input("Seed? (blank for none)") as text|null
+ var/lx = input("X-size? (blank for default)") as num|null
+ var/ly = input("Y-size? (blank for default)") as num|null
+ M = new map_datum(seed,null,null,null,lx,ly,1)
+ else
+ M = new map_datum(null,null,null,null,null,null,1)
+
+ if(M)
+ message_admins("[key_name_admin(usr)] has created [M.name].")
+ log_admin("[key_name(usr)] has created [M.name].")
+
+/client/proc/apply_random_map()
+ set category = "Debug"
+ set name = "Apply Random Map"
+ set desc = "Apply a map to the game world."
+
+ if(!holder) return
+
+ var/choice = input("Choose a map to apply.") as null|anything in random_maps
+ if(!choice)
+ return
+ var/datum/random_map/M = random_maps[choice]
+ if(istype(M))
+ var/tx = input("X? (default to current turf)") as num|null
+ var/ty = input("Y? (default to current turf)") as num|null
+ var/tz = input("Z? (default to current turf)") as num|null
+ if(isnull(tx) || isnull(ty) || isnull(tz))
+ var/turf/T = get_turf(usr)
+ tx = !isnull(tx) ? tx : T.x
+ ty = !isnull(ty) ? ty : T.y
+ tz = !isnull(tz) ? tz : T.z
+ message_admins("[key_name_admin(usr)] has applied [M.name] at x[tx],y[ty],z[tz].")
+ log_admin("[key_name(usr)] has applied [M.name] at x[tx],y[ty],z[tz].")
+ M.apply_to_map(tx,ty,tz)
+
+/client/proc/overlay_random_map()
+ set category = "Debug"
+ set name = "Overlay Random Map"
+ set desc = "Apply a map to another map."
+
+ if(!holder) return
+
+ var/choice = input("Choose a map as base.") as null|anything in random_maps
+ if(!choice)
+ return
+ var/datum/random_map/base_map = random_maps[choice]
+
+ choice = null
+ choice = input("Choose a map to overlay.") as null|anything in random_maps
+ if(!choice)
+ return
+
+ var/datum/random_map/overlay_map = random_maps[choice]
+
+ if(istype(base_map) && istype(overlay_map))
+ var/tx = input("X? (default to 1)") as num|null
+ var/ty = input("Y? (default to 1)") as num|null
+ if(!tx) tx = 1
+ if(!ty) ty = 1
+ message_admins("[key_name_admin(usr)] has applied [overlay_map.name] to [base_map.name] at x[tx],y[ty].")
+ log_admin("[key_name(usr)] has applied [overlay_map.name] to [base_map.name] at x[tx],y[ty].")
+ overlay_map.overlay_with(base_map,tx,ty)
+ base_map.display_map(usr)
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index aa1e1a52e4..7e3ec70149 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -108,6 +108,34 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1)
rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth)
+ var/authmsg = "[message]