From 9b015e28e00dd3943aa69c2e259530726dcb79f1 Mon Sep 17 00:00:00 2001 From: Juubo Date: Thu, 31 Jul 2025 17:20:25 -0400 Subject: [PATCH] pulling in Dungeon randomization, spatial grid sysem, slapcraft componenting and refactoring, and hybrid movement this pulls in several PRs https://github.com/GeneralPantsuIsBadAtCoding/Azure-Peak/pull/3017 https://github.com/GeneralPantsuIsBadAtCoding/Azure-Peak/pull/3077 https://github.com/GeneralPantsuIsBadAtCoding/Azure-Peak/pull/2294 https://github.com/GeneralPantsuIsBadAtCoding/Azure-Peak/pull/3217 this does not pull in the full dungeon, as it has performance issues and may need to be themed to Solaris --- _maps/map_files/dun_world/dun_world.dmm | 6 +++- .../templates/mining/south_mine_01.dmm | 18 +++++++++++ .../templates/mining/south_mine_02.dmm | 19 ++++++++++++ .../templates/mining/south_mine_03.dmm | 19 ++++++++++++ .../templates/mining/south_mine_default.dmm | 17 ++++++++++ _maps/templates/mining.dm | 31 +++++++++++++++++++ roguetown.dme | 1 + 7 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 _maps/map_files/templates/mining/south_mine_01.dmm create mode 100644 _maps/map_files/templates/mining/south_mine_02.dmm create mode 100644 _maps/map_files/templates/mining/south_mine_03.dmm create mode 100644 _maps/map_files/templates/mining/south_mine_default.dmm create mode 100644 _maps/templates/mining.dm diff --git a/_maps/map_files/dun_world/dun_world.dmm b/_maps/map_files/dun_world/dun_world.dmm index 36cf52a08d..fd4e74231b 100644 --- a/_maps/map_files/dun_world/dun_world.dmm +++ b/_maps/map_files/dun_world/dun_world.dmm @@ -34692,6 +34692,10 @@ icon_state = "greenstone" }, /area/provincial/indoors/town/province_keep/wine_cellar) +"lnB" = ( +/obj/effect/landmark/map_load_mark/south_mine_road, +/turf/closed/mineral/random/rogue/high, +/area/provincial/underground/field) "lnC" = ( /obj/structure/chair/wood/rogue/chair3, /obj/effect/decal/cleanable/dirt/cobweb/cobweb2, @@ -240180,7 +240184,7 @@ ojJ nXg nXg nXg -nXg +lnB nXg nXg nXg diff --git a/_maps/map_files/templates/mining/south_mine_01.dmm b/_maps/map_files/templates/mining/south_mine_01.dmm new file mode 100644 index 0000000000..c63cf0e08c --- /dev/null +++ b/_maps/map_files/templates/mining/south_mine_01.dmm @@ -0,0 +1,18 @@ +"a" = (/turf/closed/mineral/random/rogue/high,/area/provincial) +"g" = (/obj/item/rogueweapon/pick,/obj/effect/decal/remains/human,/turf/open/floor/rogue/cobblerock,/area/provincial) +"n" = (/turf/open/floor/rogue/cobblerock,/area/provincial) +"p" = (/turf/closed/mineral/random/rogue/med,/area/provincial) +"A" = (/turf/closed/mineral/random/rogue,/area/provincial) + +(1,1,1) = {" +ppppppAAAA +appppppAAA +aapppppAAA +aappppppAA +naganpppAA +ngaganppAA +aaaaappppA +aaaaaapppp +aaaaaapppp +aaaaaaappp +"} diff --git a/_maps/map_files/templates/mining/south_mine_02.dmm b/_maps/map_files/templates/mining/south_mine_02.dmm new file mode 100644 index 0000000000..d7edb2c0cf --- /dev/null +++ b/_maps/map_files/templates/mining/south_mine_02.dmm @@ -0,0 +1,19 @@ +"a" = (/turf/closed/mineral/random/rogue/high,/area/provincial) +"g" = (/obj/item/rogueweapon/pick,/mob/living/simple_animal/hostile/rogue/skeleton/axe,/turf/open/floor/rogue/cobblerock,/area/provincial) +"n" = (/turf/open/floor/rogue/cobblerock,/area/provincial) +"p" = (/turf/closed/mineral/random/rogue/med,/area/provincial) +"A" = (/turf/closed/mineral/random/rogue,/area/provincial) +"X" = (/mob/living/simple_animal/hostile/rogue/skeleton/axe,/turf/open/floor/rogue/cobblerock,/area/provincial) + +(1,1,1) = {" +ppppppAAAA +appppppAAA +aapppppAAA +aappppppAA +naganpppAA +ngaXanppAA +aaaaappppA +aaaaaapppp +aaaaaapppp +aaaaaaappp +"} diff --git a/_maps/map_files/templates/mining/south_mine_03.dmm b/_maps/map_files/templates/mining/south_mine_03.dmm new file mode 100644 index 0000000000..5e629b5bd4 --- /dev/null +++ b/_maps/map_files/templates/mining/south_mine_03.dmm @@ -0,0 +1,19 @@ +"a" = (/turf/closed/mineral/random/rogue/high,/area/provincial) +"g" = (/obj/item/rogueweapon/pick,/obj/effect/decal/remains/human,/turf/open/floor/rogue/cobblerock,/area/provincial) +"n" = (/turf/open/floor/rogue/cobblerock,/area/provincial) +"p" = (/turf/closed/mineral/random/rogue/med,/area/provincial) +"A" = (/turf/closed/mineral/random/rogue,/area/provincial) +"O" = (/obj/item/rogueweapon/pick,/obj/effect/decal/remains/human,/mob/living/simple_animal/hostile/retaliate/rogue/bigrat,/turf/open/floor/rogue/cobblerock,/area/provincial) + +(1,1,1) = {" +ppppppAAAA +appppppAAA +aapppppAAA +aappppppAA +naOanpppAA +nOaganppAA +aaaaappppA +aaaaaapppp +aaaaaapppp +aaaaaaappp +"} diff --git a/_maps/map_files/templates/mining/south_mine_default.dmm b/_maps/map_files/templates/mining/south_mine_default.dmm new file mode 100644 index 0000000000..adc3bf9fd0 --- /dev/null +++ b/_maps/map_files/templates/mining/south_mine_default.dmm @@ -0,0 +1,17 @@ +"a" = (/turf/closed/mineral/random/rogue/high,/area/provincial) +"n" = (/turf/open/floor/rogue/cobblerock,/area/provincial) +"p" = (/turf/closed/mineral/random/rogue/med,/area/provincial) +"A" = (/turf/closed/mineral/random/rogue,/area/provincial) + +(1,1,1) = {" +ppppppAAAA +appppppAAA +aapppppAAA +aappppppAA +nananpppAA +nnananppAA +aaaaappppA +aaaaaapppp +aaaaaapppp +aaaaaaappp +"} diff --git a/_maps/templates/mining.dm b/_maps/templates/mining.dm new file mode 100644 index 0000000000..0bda92035e --- /dev/null +++ b/_maps/templates/mining.dm @@ -0,0 +1,31 @@ +/obj/effect/spawner/lootdrop/roguetown/miningtunnels + name = "sewer spawner" + loot = list() + lootcount = 0 + +/////////////////////// +/// Southern Road /// +/// Size: X:10 Y:10 /// +/////////////////////// + +/obj/effect/landmark/map_load_mark/south_mine_road + name = "South Mines Road" + templates = list("south_mine_road_1", "south_mine_road_2", "south_mine_road_3") + +/// just corpses +/datum/map_template/south_mine_road_1 + name = "South Mines Road Variant 1" + id = "south_mine_road_1" + mappath = "_maps/map_files/templates/mining/south_mine_01.dmm" + +/// skeletons +/datum/map_template/south_mine_road_2 + name = "South Mines Road Variant 2" + id = "south_mine_road_2" + mappath = "_maps/map_files/templates/mining/south_mine_02.dmm" + +/// big rats +/datum/map_template/south_mine_road_3 + name = "South Mines Road Variant 3" + id = "south_mine_road_3" + mappath = "_maps/map_files/templates/mining/south_mine_03.dmm" diff --git a/roguetown.dme b/roguetown.dme index be13de7313..3871b185b4 100644 --- a/roguetown.dme +++ b/roguetown.dme @@ -10,6 +10,7 @@ #include "_maps\_basemap.dm" #include "_maps\map_files\generic\CentCom.dmm" #include "_maps\templates\bog_shack_small.dm" +#include "_maps\templates\mining.dm" #include "_maps\templates\sewers.dm" #include "code\__byond_version_compat.dm" #include "code\_compile_options.dm"