Merge pull request CleverRaven#73957 from PatrikLundell/garage2

Explicit roof on garage version 2
Procyonae · May 21, 2024 · e8905f8 · e8905f8
2 parents d272059 + 0949420
commit e8905f8
Show file tree

Hide file tree

Showing 3 changed files with 306 additions and 37 deletions.
diff --git a/data/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_common.json b/data/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_common.json
@@ -74,16 +74,37 @@
       "palettes": [ "fbmg_2_common_palette" ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmg_2_3_roof",
+    "object": {
+      "mapgensize": [ 8, 8 ],
+      "rows": [
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "        ",
+        "        "
+      ],
+      "palettes": [ "fbmg_2_common_palette" ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbmg_2_3",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmg_2_3" ], "x": 6, "y": 16 } ] }
+    "object": {
+      "place_nested": [ { "chunks": [ "fbmg_2_3" ], "x": 6, "y": 16, "z": 0 }, { "chunks": [ "fbmg_2_3_roof" ], "x": 6, "y": 16, "z": 1 } ]
+    }
   },
   {
     "type": "mapgen",
     "method": "json",
-    "nested_mapgen_id": "fbmg_2_6",
+    "nested_mapgen_id": "fbmg_2_6_9",
     "object": {
       "mapgensize": [ 8, 8 ],
       "rows": [
@@ -100,11 +121,35 @@
       "palettes": [ "fbmg_2_common_palette" ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmg_2_6_9_roof",
+    "object": {
+      "mapgensize": [ 8, 8 ],
+      "rows": [
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "        ",
+        "        ",
+        "        "
+      ],
+      "palettes": [ "fbmg_2_common_palette" ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbmg_2_6",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmg_2_6" ], "x": 6, "y": 11 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmg_2_6_9" ], "x": 6, "y": 11, "z": 0 },
+        { "chunks": [ "fbmg_2_6_9_roof" ], "x": 6, "y": 11, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -122,30 +167,12 @@
   },
   {
     "type": "mapgen",
+    "update_mapgen_id": "fbmg_2_9",
     "method": "json",
-    "nested_mapgen_id": "fbmg_2_9",
     "object": {
-      "mapgensize": [ 8, 8 ],
-      "rows": [
-        ",,,,,,,,",
-        ",,,,,,,,",
-        ",,,,,,,,",
-        ",,,,,,,,",
-        ",,,,,,,,",
-        "        ",
-        "        ",
-        "        "
-      ],
-      "flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
-      "palettes": [ "fbmg_2_common_palette" ]
+      "place_nested": [ { "chunks": [ "fbmg_2_6_9" ], "x": 6, "y": 6, "z": 0 }, { "chunks": [ "fbmg_2_6_9_roof" ], "x": 6, "y": 6, "z": 1 } ]
     }
   },
-  {
-    "type": "mapgen",
-    "update_mapgen_id": "fbmg_2_9",
-    "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmg_2_9" ], "x": 6, "y": 6 } ] }
-  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbmg_2_gate_3",
@@ -180,11 +207,32 @@
       "palettes": [ "fbmg_2_common_palette" ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmg_2_12_roof",
+    "object": {
+      "mapgensize": [ 8, 8 ],
+      "rows": [
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "        ",
+        "        ",
+        "        ",
+        "        "
+      ],
+      "palettes": [ "fbmg_2_common_palette" ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbmg_2_12",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmg_2_12" ], "x": 6, "y": 2 } ] }
+    "object": {
+      "place_nested": [ { "chunks": [ "fbmg_2_12" ], "x": 6, "y": 2, "z": 0 }, { "chunks": [ "fbmg_2_12_roof" ], "x": 6, "y": 2, "z": 1 } ]
+    }
   },
   {
     "type": "mapgen",