Merge pull request #74750 from PatrikLundell/nested_chunk

Added roofs to greenhouses
CleverRaven · Jun 24, 2024 · 3a3169f · 3a3169f
2 parents 1b599f0 + 6cc49a3
commit 3a3169f
Showing 1 changed file with 24 additions and 4 deletions.
diff --git a/data/json/mapgen/nested/nested_chunks_roof.json b/data/json/mapgen/nested/nested_chunks_roof.json
@@ -122,7 +122,7 @@
         "xxxxx"
       ],
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
-      "terrain": { "_": "t_floor_primitive", "+": "t_chickenwire_gate_c", "x": "t_chickenwire_fence", "t": "t_dirtfloor" },
+      "terrain": { "_": "t_dirtfloor_no_roof", "+": "t_chickenwire_gate_c", "x": "t_chickenwire_fence", "t": "t_dirtfloor_no_roof" },
       "furniture": { "t": "f_table" },
       "place_loot": [
         { "item": "straw_pile", "x": [ 1, 3 ], "y": 3, "chance": 75, "repeat": [ 1, 3 ] },
@@ -330,6 +330,23 @@
       ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "roof_6x6_greenhouse_roof",
+    "object": {
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "RRRRRR",
+        "RRRRRR",
+        "RRRRRR",
+        "RRRRRR",
+        "RRRRRR",
+        "RRRRRR"
+      ],
+      "terrain": { "R": "t_glass_roof" }
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",
@@ -352,7 +369,8 @@
         "$": "t_wall_glass"
       },
       "furniture": { "S": "f_statue" },
-      "sealed_item": { "1": { "item": { "item": "seed_rose" }, "furniture": "f_planter_mature" } }
+      "sealed_item": { "1": { "item": { "item": "seed_rose" }, "furniture": "f_planter_mature" } },
+      "place_nested": [ { "chunks": [ "roof_6x6_greenhouse_roof" ], "x": 0, "y": 0, "z": 1 } ]
     }
   },
   {
@@ -377,7 +395,8 @@
         "$": "t_wall_glass"
       },
       "sealed_item": { "1": { "item": { "item": "seed_sugar_beet" }, "furniture": "f_planter_mature" } },
-      "furniture": { "S": "f_statue", "b": "f_bench" }
+      "furniture": { "S": "f_statue", "b": "f_bench" },
+      "place_nested": [ { "chunks": [ "roof_6x6_greenhouse_roof" ], "x": 0, "y": 0, "z": 1 } ]
     }
   },
   {
@@ -406,7 +425,8 @@
         { "item": "stepladder", "x": 3, "y": 5, "chance": 75, "repeat": [ 1, 3 ] },
         { "item": "seed_weed", "x": [ 2, 3 ], "y": [ 2, 3 ], "chance": 75, "repeat": [ 1, 3 ] }
       ],
-      "sealed_item": { "1": { "item": { "item": "seed_weed" }, "furniture": "f_planter_harvest" } }
+      "sealed_item": { "1": { "item": { "item": "seed_weed" }, "furniture": "f_planter_harvest" } },
+      "place_nested": [ { "chunks": [ "roof_6x6_greenhouse_roof" ], "x": 0, "y": 0, "z": 1 } ]
     }
   },
   {