Skip to content

Commit 15c7de8

Browse files
author
Qustinnus
authored
Refactor the procedural generation of lavaland and turf/closed/mineral (#54915)
This replaces lavaland's old diagonal tunnel gen which was really horrendously jammed into asteroid floor code (?????) with Cellular Automata which runs in rust (PR for that here: tgstation/rust-g#57 ). The new code is a bit cleaner, but also looks better. VID: https://streamable.com/a45ke2 Things to do: - Make an icemoon version - Fix the roundstart atmos adjacency issues I asked AnturK if this was an acceptable PR for this month; he said it was okay as long as I didn't add new areas, which I don't plan to do. But if anyone thinks this PR breaks the spirit of the month I'll open it again in december.
1 parent 1abde77 commit 15c7de8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+181839
-182090
lines changed

‎_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
22
"a" = (
3-
/turf/closed/mineral/random/more_caves,
3+
/turf/closed/mineral/random,
44
/area/icemoon/surface/outdoors/unexplored)
55
"b" = (
6-
/turf/closed/mineral/random/snow/more_caves,
6+
/turf/closed/mineral/random/snow,
77
/area/icemoon/surface/outdoors/unexplored)
88
"c" = (
99
/turf/closed/wall/mineral/bronze,

‎_maps/RandomRuins/IceRuins/icemoon_surface_hotsprings.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/turf/open/floor/plating/asteroid/snow/icemoon,
44
/area/icemoon/surface/outdoors)
55
"b" = (
6-
/turf/closed/mineral/random/snow/more_caves,
6+
/turf/closed/mineral/random/snow,
77
/area/icemoon/surface/outdoors/unexplored)
88
"c" = (
99
/turf/open/water/cursed_spring,

‎_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
22
"a" = (
3-
/turf/closed/mineral/random/snow/more_caves,
3+
/turf/closed/mineral/random/snow,
44
/area/icemoon/surface/outdoors/unexplored)
55
"b" = (
66
/obj/structure/sign/poster/contraband/lusty_xenomorph,

‎_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
22
"a" = (
3-
/turf/closed/mineral/random/snow/no_caves,
3+
/turf/closed/mineral/random/snow,
44
/area/icemoon/surface/outdoors)
55
"b" = (
66
/turf/closed/wall/mineral/wood/nonmetal,
@@ -38,7 +38,7 @@
3838
/area/ruin/unpowered)
3939
"h" = (
4040
/obj/structure/flora/rock/icy,
41-
/turf/closed/mineral/random/snow/no_caves,
41+
/turf/closed/mineral/random/snow,
4242
/area/icemoon/surface/outdoors)
4343
"i" = (
4444
/turf/template_noop,

‎_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
/turf/open/floor/plating/asteroid/snow/icemoon,
227227
/area/icemoon/underground/explored)
228228
"tN" = (
229-
/turf/closed/mineral/random/snow/more_caves,
229+
/turf/closed/mineral/random/snow,
230230
/area/icemoon/underground/unexplored)
231231
"tX" = (
232232
/obj/structure/table/wood,

‎_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
22
"a" = (
3-
/turf/closed/mineral/random/volcanic/more_caves,
3+
/turf/closed/mineral/random/volcanic,
44
/area/icemoon/underground/unexplored)
55
"b" = (
6-
/turf/closed/mineral/random/snow/no_caves,
6+
/turf/closed/mineral/random/snow,
77
/area/icemoon/underground/unexplored)
88
"d" = (
99
/obj/item/grown/bananapeel,

‎_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/turf/closed/wall/mineral/wood,
1313
/area/ruin/unpowered/buried_library)
1414
"ad" = (
15-
/turf/closed/mineral/random/snow/no_caves,
15+
/turf/closed/mineral/random/snow,
1616
/area/icemoon/underground/unexplored)
1717
"ae" = (
1818
/turf/open/floor/wood{
@@ -48,7 +48,7 @@
4848
/turf/open/floor/plating/asteroid/snow/icemoon,
4949
/area/ruin/unpowered/buried_library)
5050
"ak" = (
51-
/turf/closed/mineral/random/snow/no_caves,
51+
/turf/closed/mineral/random/snow,
5252
/area/ruin/unpowered/buried_library)
5353
"al" = (
5454
/turf/closed/wall/mineral/iron,
@@ -96,7 +96,7 @@
9696
/area/ruin/unpowered/buried_library)
9797
"av" = (
9898
/obj/structure/bookcase/random,
99-
/turf/closed/mineral/random/snow/no_caves,
99+
/turf/closed/mineral/random/snow,
100100
/area/ruin/unpowered/buried_library)
101101
"aw" = (
102102
/turf/open/floor/plating/icemoon,
@@ -191,7 +191,7 @@
191191
/area/ruin/unpowered/buried_library)
192192
"aP" = (
193193
/obj/item/keycard/library,
194-
/turf/closed/mineral/random/snow/no_caves,
194+
/turf/closed/mineral/random/snow,
195195
/area/ruin/unpowered/buried_library)
196196
"aQ" = (
197197
/obj/effect/decal/cleanable/dirt/dust,
@@ -319,7 +319,7 @@
319319
/area/ruin/unpowered/buried_library)
320320
"bj" = (
321321
/obj/item/book/manual/random,
322-
/turf/closed/mineral/random/snow/no_caves,
322+
/turf/closed/mineral/random/snow,
323323
/area/ruin/unpowered/buried_library)
324324
"bk" = (
325325
/obj/structure/fluff/paper/stack,
@@ -330,11 +330,11 @@
330330
/area/ruin/unpowered/buried_library)
331331
"bl" = (
332332
/obj/item/storage/box/fountainpens,
333-
/turf/closed/mineral/random/snow/no_caves,
333+
/turf/closed/mineral/random/snow,
334334
/area/ruin/unpowered/buried_library)
335335
"bm" = (
336336
/obj/structure/fluff/paper/stack,
337-
/turf/closed/mineral/random/snow/no_caves,
337+
/turf/closed/mineral/random/snow,
338338
/area/ruin/unpowered/buried_library)
339339
"bn" = (
340340
/obj/item/book/manual/random,
@@ -343,7 +343,7 @@
343343
/area/ruin/unpowered/buried_library)
344344
"bo" = (
345345
/obj/item/stack/sheet/mineral/wood,
346-
/turf/closed/mineral/random/snow/no_caves,
346+
/turf/closed/mineral/random/snow,
347347
/area/ruin/unpowered/buried_library)
348348
"bq" = (
349349
/obj/structure/mineral_door/wood,
@@ -354,7 +354,7 @@
354354
/area/ruin/unpowered/buried_library)
355355
"br" = (
356356
/obj/structure/girder,
357-
/turf/closed/mineral/random/snow/no_caves,
357+
/turf/closed/mineral/random/snow,
358358
/area/ruin/unpowered/buried_library)
359359
"bs" = (
360360
/obj/structure/girder,
@@ -366,7 +366,7 @@
366366
/area/template_noop)
367367
"bu" = (
368368
/obj/item/stack/sheet/mineral/wood,
369-
/turf/closed/mineral/random/snow/no_caves,
369+
/turf/closed/mineral/random/snow,
370370
/area/icemoon/underground/unexplored)
371371
"bv" = (
372372
/obj/effect/decal/cleanable/dirt/dust,

‎_maps/RandomRuins/IceRuins/icemoon_underground_wrath.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/turf/open/floor/plating/asteroid/snow/icemoon,
44
/area/icemoon/underground/explored)
55
"b" = (
6-
/turf/closed/mineral/random/snow/no_caves,
6+
/turf/closed/mineral/random/snow,
77
/area/icemoon/underground/unexplored)
88
"e" = (
99
/obj/structure/spawner/nether,

‎_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/turf/open/floor/plating,
1818
/area/ruin/space/has_grav/abandonedzoo)
1919
"ah" = (
20-
/turf/closed/mineral/random/no_caves,
20+
/turf/closed/mineral/random,
2121
/area/ruin/space/has_grav/abandonedzoo)
2222
"ai" = (
2323
/turf/open/floor/plating/asteroid,

‎_maps/RandomRuins/SpaceRuins/asteroid2.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/turf/open/floor/plating/asteroid/airless,
77
/area/ruin/unpowered/no_grav)
88
"c" = (
9-
/turf/closed/mineral/random/no_caves,
9+
/turf/closed/mineral/random,
1010
/area/ruin/unpowered/no_grav)
1111
"d" = (
1212
/turf/closed/mineral/random/high_chance,

‎_maps/RandomRuins/SpaceRuins/asteroid3.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/turf/open/floor/plating/asteroid/airless,
77
/area/ruin/unpowered/no_grav)
88
"c" = (
9-
/turf/closed/mineral/random/no_caves,
9+
/turf/closed/mineral/random,
1010
/area/ruin/unpowered/no_grav)
1111
"d" = (
1212
/turf/closed/mineral/random/high_chance,

‎_maps/RandomRuins/SpaceRuins/asteroid4.dmm

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
/turf/template_noop,
44
/area/template_noop)
55
"b" = (
6-
/turf/closed/mineral/random/no_caves,
6+
/turf/closed/mineral/random,
77
/area/ruin/unpowered/no_grav)
88
"c" = (
99
/turf/closed/mineral/random/high_chance,
1010
/area/ruin/unpowered/no_grav)
1111
"d" = (
12-
/turf/closed/mineral/random/no_caves,
12+
/turf/closed/mineral/random,
1313
/area/ruin/unpowered)
1414
"e" = (
1515
/turf/open/floor/plating/asteroid/airless,

‎_maps/RandomRuins/SpaceRuins/asteroid5.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/turf/template_noop,
44
/area/template_noop)
55
"b" = (
6-
/turf/closed/mineral/random/no_caves,
6+
/turf/closed/mineral/random,
77
/area/ruin/unpowered)
88
"c" = (
99
/turf/closed/mineral/random/high_chance,

‎_maps/RandomRuins/SpaceRuins/bigderelict1.dmm

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
/turf/open/floor/plating,
147147
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
148148
"aC" = (
149-
/turf/closed/mineral/random/no_caves,
149+
/turf/closed/mineral/random,
150150
/area/ruin/unpowered/no_grav)
151151
"aD" = (
152152
/obj/machinery/door/poddoor{
@@ -1153,7 +1153,7 @@
11531153
/turf/open/floor/plating,
11541154
/area/ruin/space/has_grav/derelictoutpost)
11551155
"ds" = (
1156-
/turf/closed/mineral/random/no_caves,
1156+
/turf/closed/mineral/random,
11571157
/area/ruin/space/has_grav/derelictoutpost)
11581158
"dt" = (
11591159
/obj/structure/alien/weeds/creature,

‎_maps/RandomRuins/SpaceRuins/clericden.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/turf/template_noop,
44
/area/template_noop)
55
"b" = (
6-
/turf/closed/mineral/random/no_caves,
6+
/turf/closed/mineral/random,
77
/area/ruin/unpowered/no_grav)
88
"c" = (
99
/turf/open/floor/plating/asteroid/airless,

‎_maps/RandomRuins/SpaceRuins/crashedship.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1895,7 +1895,7 @@
18951895
/turf/closed/wall/mineral/titanium/nodiagonal,
18961896
/area/awaymission/bmpship/fore)
18971897
"xA" = (
1898-
/turf/closed/mineral/random/no_caves,
1898+
/turf/closed/mineral/random,
18991899
/area/awaymission/bmpship)
19001900
"ya" = (
19011901
/obj/machinery/door/poddoor/shutters{

‎_maps/RandomRuins/SpaceRuins/derelict4.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/turf/template_noop,
44
/area/template_noop)
55
"b" = (
6-
/turf/closed/mineral/random/no_caves,
6+
/turf/closed/mineral/random,
77
/area/ruin/unpowered)
88
"c" = (
99
/turf/open/floor/plating/asteroid/airless,

‎_maps/RandomRuins/SpaceRuins/derelict5.dmm

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
/turf/template_noop,
44
/area/template_noop)
55
"b" = (
6-
/turf/closed/mineral/random/no_caves,
6+
/turf/closed/mineral/random,
77
/area/ruin/unpowered/no_grav)
88
"c" = (
99
/turf/open/floor/plating/asteroid/airless,
1010
/area/ruin/unpowered/no_grav)
1111
"d" = (
12-
/turf/closed/mineral/random/no_caves,
12+
/turf/closed/mineral/random,
1313
/area/ruin/unpowered)
1414
"e" = (
1515
/turf/closed/wall,

‎_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/turf/template_noop,
44
/area/template_noop)
55
"b" = (
6-
/turf/closed/mineral/random/no_caves,
6+
/turf/closed/mineral/random,
77
/area/ruin/space/has_grav)
88
"c" = (
99
/turf/open/floor/plating/asteroid/airless,

‎_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
/turf/open/floor/plasteel/grimy,
220220
/area/ruin/space/has_grav/hilbertresearchfacility)
221221
"J" = (
222-
/turf/closed/mineral/random/no_caves,
222+
/turf/closed/mineral/random,
223223
/area/ruin/unpowered/no_grav)
224224
"K" = (
225225
/turf/open/floor/plasteel/stairs/right{

‎_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/turf/template_noop,
44
/area/template_noop)
55
"ab" = (
6-
/turf/closed/mineral/random/no_caves,
6+
/turf/closed/mineral/random,
77
/area/ruin/unpowered/no_grav)
88
"ac" = (
99
/turf/open/floor/plating/asteroid/airless,

‎_maps/RandomRuins/SpaceRuins/oldstation.dmm

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/turf/template_noop,
88
/area/template_noop)
99
"ac" = (
10-
/turf/closed/mineral/random/no_caves,
10+
/turf/closed/mineral/random,
1111
/area/ruin/unpowered)
1212
"ad" = (
1313
/turf/closed/wall/r_wall,
@@ -5095,7 +5095,7 @@
50955095
/area/ruin/space/has_grav/ancientstation)
50965096
"md" = (
50975097
/obj/structure/girder,
5098-
/turf/closed/mineral/random/no_caves,
5098+
/turf/closed/mineral/random,
50995099
/area/ruin/space/has_grav/ancientstation/betacorridor)
51005100
"me" = (
51015101
/turf/open/floor/plating/airless,
@@ -5106,7 +5106,7 @@
51065106
/area/ruin/space/has_grav/ancientstation/betastorage)
51075107
"mg" = (
51085108
/obj/effect/decal/cleanable/dirt,
5109-
/turf/closed/mineral/random/no_caves,
5109+
/turf/closed/mineral/random,
51105110
/area/ruin/unpowered)
51115111
"mh" = (
51125112
/obj/effect/decal/cleanable/dirt,
@@ -5593,7 +5593,7 @@
55935593
/area/ruin/space/has_grav/ancientstation/betacorridor)
55945594
"ni" = (
55955595
/obj/structure/lattice,
5596-
/turf/closed/mineral/random/no_caves,
5596+
/turf/closed/mineral/random,
55975597
/area/ruin/unpowered)
55985598
"nj" = (
55995599
/obj/structure/lattice,
@@ -7015,7 +7015,7 @@
70157015
/turf/open/floor/plasteel/airless,
70167016
/area/ruin/space/has_grav/ancientstation/atmo)
70177017
"FV" = (
7018-
/turf/closed/mineral/random/no_caves,
7018+
/turf/closed/mineral/random,
70197019
/area/ruin/space/has_grav/ancientstation/betacorridor)
70207020
"GG" = (
70217021
/obj/structure/closet,
@@ -7597,7 +7597,7 @@
75977597
/turf/open/floor/plating/airless,
75987598
/area/ruin/space/has_grav/ancientstation/betacorridor)
75997599
"WI" = (
7600-
/turf/closed/mineral/random/no_caves,
7600+
/turf/closed/mineral/random,
76017601
/area/ruin/space/has_grav/ancientstation/atmo)
76027602
"WT" = (
76037603
/obj/structure/window/reinforced{

‎_maps/RandomZLevels/moonoutpost19.dmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1731,7 +1731,7 @@
17311731
},
17321732
/area/awaymission/moonoutpost19/main)
17331733
"dA" = (
1734-
/turf/closed/mineral/random/no_caves,
1734+
/turf/closed/mineral/random,
17351735
/area/awaymission/moonoutpost19/main)
17361736
"dB" = (
17371737
/obj/structure/sign/warning/vacuum{

0 commit comments

Comments
 (0)