Merge pull request #78705 from Procyonae/RemoveManholeStairMagic

Remove manhole stair magic
CleverRaven · Dec 24, 2024 · e384df8 · e384df8
2 parents bc462a8 + 33cc353
commit e384df8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 29 deletions.
diff --git a/data/json/mapgen/nested/road_nested.json b/data/json/mapgen/nested/road_nested.json
@@ -286,17 +286,6 @@
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
     }
   },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "nested_mapgen_id": "1x1_manhole",
-    "object": {
-      "mapgensize": [ 1, 1 ],
-      "rows": [ "O" ],
-      "palettes": [ "road_palette" ],
-      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
-    }
-  },
   {
     "type": "mapgen",
     "method": "json",

diff --git a/data/json/mapgen/road.json b/data/json/mapgen/road.json
@@ -738,7 +738,7 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": "road_four_way",
+    "om_terrain": [ "road_four_way", "road_nesw_manhole" ],
     "weight": { "global_val": "vanilla_road_weight", "default": 1000 },
     "object": {
       "fallback_predecessor_mapgen": "field",
@@ -1056,20 +1056,6 @@
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
     }
   },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": "road_nesw_manhole",
-    "//": "Need to fix magical teleportation with actual aligned manhole placement",
-    "object": {
-      "fill_ter": "t_region_grass",
-      "place_nested": [
-        { "chunks": [ "24x24_road_four_way_crossroad" ], "x": 0, "y": 0 },
-        { "chunks": [ "1x1_manhole" ], "x": [ 5, 18 ], "y": [ 5, 18 ] }
-      ],
-      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
-    }
-  },
   {
     "type": "mapgen",
     "method": "json",

diff --git a/data/json/mapgen/sewer.json b/data/json/mapgen/sewer.json
@@ -1,13 +1,30 @@
 [
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "manhole_1x1",
+    "object": { "mapgensize": [ 1, 1 ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "terrain": { " ": "t_manhole_cover" } }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "manhole_open_1x1",
+    "object": {
+      "mapgensize": [ 1, 1 ],
+      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
+      "terrain": { " ": "t_manhole" },
+      "item": { " ": { "item": "manhole_cover" } }
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",
     "nested_mapgen_id": "ladder_1x1",
     "object": {
       "mapgensize": [ 1, 1 ],
-      "rows": [ "^" ],
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
-      "terrain": { "^": "t_ladder_up" }
+      "terrain": { " ": "t_ladder_up" },
+      "place_nested": [ { "chunks": [ [ "manhole_1x1", 11 ], [ "manhole_open_1x1", 1 ] ], "x": 0, "y": 0, "z": 1 } ]
     }
   },
   {

diff --git a/data/json/mapgen_palettes/road.json b/data/json/mapgen_palettes/road.json
@@ -13,7 +13,6 @@
       "b": "t_concrete",
       "x": "t_concrete",
       "n": "t_concrete",
-      "O": "t_manhole_cover",
       "g": "t_region_grass",
       "f": "t_region_grass",
       "#": "t_sconc_wall_halfway",