Merge pull request #74751 from PatrikLundell/house_nested

Added roofs to garden greenhouses and shed
CleverRaven · Jun 24, 2024 · d10245b · d10245b
2 parents 75a831d + 3a7a5ab
commit d10245b
Showing 1 changed file with 46 additions and 5 deletions.
diff --git a/data/json/mapgen/nested/house_nested.json b/data/json/mapgen/nested/house_nested.json
@@ -2247,6 +2247,24 @@
       "items": { "E": [ { "item": "bed", "chance": 30 } ], "L": [ { "item": "bedroom", "chance": 30 } ] }
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "//": "a nested map for lawns",
+    "nested_mapgen_id": "greenhouse_5x5_roof",
+    "object": {
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "      ",
+        "RRRRR ",
+        "RRRRR ",
+        "RRRRR ",
+        "RRRRR ",
+        "RRRRR "
+      ],
+      "terrain": { "R": "t_glass_roof" }
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",
@@ -2270,7 +2288,8 @@
         { "item": "farming_tools", "x": 2, "y": [ 2, 4 ], "chance": 25, "repeat": [ 1, 3 ] },
         { "item": "farming_seeds", "x": 2, "y": [ 2, 4 ], "chance": 25, "repeat": [ 1, 3 ] },
         { "item": "flower_pots", "x": 5, "y": [ 2, 4 ], "chance": 55, "repeat": [ 1, 4 ] }
-      ]
+      ],
+      "place_nested": [ { "chunks": [ "greenhouse_5x5_roof" ], "x": 0, "y": 0, "z": 1 } ]
     }
   },
   {
@@ -2296,7 +2315,26 @@
         { "item": "farming_tools", "x": 2, "y": [ 2, 4 ], "chance": 25, "repeat": [ 1, 3 ] },
         { "item": "farming_seeds", "x": 2, "y": [ 2, 4 ], "chance": 25, "repeat": [ 1, 3 ] },
         { "item": "flower_pots", "x": 5, "y": [ 2, 4 ], "chance": 55, "repeat": [ 1, 4 ] }
-      ]
+      ],
+      "place_nested": [ { "chunks": [ "greenhouse_5x5_roof" ], "x": 0, "y": 0, "z": 1 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "//": "a nested map for lawns",
+    "nested_mapgen_id": "shed_6x6_roof",
+    "object": {
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "------",
+        "-....-",
+        "-....-",
+        "-....-",
+        "-....-",
+        "------"
+      ],
+      "palettes": [ "roof_palette" ]
     }
   },
   {
@@ -2331,7 +2369,8 @@
         { "item": "allclothes", "x": 1, "y": 1, "chance": 25, "repeat": [ 1, 3 ] },
         { "item": "livingroom", "x": 1, "y": [ 2, 3 ], "chance": 55, "repeat": [ 1, 4 ] },
         { "item": "bedroom", "x": 2, "y": [ 3, 4 ], "chance": 55, "repeat": [ 1, 4 ] }
-      ]
+      ],
+      "place_nested": [ { "chunks": [ "shed_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
     }
   },
   {
@@ -2376,7 +2415,8 @@
       "place_items": [
         { "item": "home_hw", "x": [ 1, 3 ], "y": 4, "chance": 50, "repeat": [ 1, 3 ] },
         { "item": "wood_workshop", "x": 1, "y": [ 1, 4 ], "chance": 70, "repeat": [ 1, 3 ] }
-      ]
+      ],
+      "place_nested": [ { "chunks": [ "shed_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
     }
   },
   {
@@ -2405,7 +2445,8 @@
       },
       "furniture": { "T": "f_trashcan", "S": "f_utility_shelf", "B": "f_workbench" },
       "place_vehicles": [ { "vehicle": "bikeshop", "x": 1, "y": 2, "rotation": 270, "chance": 50 } ],
-      "place_items": [ { "item": "bikeshop_tools", "x": 4, "y": [ 2, 4 ], "chance": 10, "repeat": [ 1, 3 ] } ]
+      "place_items": [ { "item": "bikeshop_tools", "x": 4, "y": [ 2, 4 ], "chance": 10, "repeat": [ 1, 3 ] } ],
+      "place_nested": [ { "chunks": [ "shed_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
     }
   },
   {