From 262e0858f75d2727baa23757c15d2ac9ca9cf019 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Wed, 22 May 2024 11:23:51 +0200
Subject: [PATCH] Explicit roof on storehouse 1

---
 .../modular_storehouse_construction.json      | 450 +++++++++++++++++-
 .../modular_storehouse_palettes.json          |  40 +-
 2 files changed, 471 insertions(+), 19 deletions(-)

diff --git a/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_construction.json b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_construction.json
index ede85ac46f01c..9d5c923f05c6e 100644
--- a/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_construction.json
+++ b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_construction.json
@@ -35,11 +35,51 @@
       "palettes": [ { "param": "fbms_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_room0_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_concrete_palette",
+              "fbms_log_palette",
+              "fbms_metal_palette",
+              "fbms_migo_resin_palette",
+              "fbms_rammed_earth_palette",
+              "fbms_rock_palette",
+              "fbms_wad_palette",
+              "fbms_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "  rrrr",
+        "  rrrr",
+        "  rrrr",
+        "  rrrr",
+        "  rrrr",
+        "  rrrr"
+      ],
+      "palettes": [ { "param": "fbms_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_room0_construction_east",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_room0_construction" ], "x": 15, "y": 9 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_room0_construction" ], "x": 15, "y": 9, "z": 0 },
+        { "chunks": [ "fbms_room0_roof_construction" ], "x": 15, "y": 9, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -77,11 +117,51 @@
       "palettes": [ { "param": "fbms_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_room1_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_concrete_palette",
+              "fbms_log_palette",
+              "fbms_metal_palette",
+              "fbms_migo_resin_palette",
+              "fbms_rammed_earth_palette",
+              "fbms_rock_palette",
+              "fbms_wad_palette",
+              "fbms_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "rrrr  ",
+        "rrrr  ",
+        "rrrr  ",
+        "rrrr  ",
+        "rrrr  ",
+        "rrrr  "
+      ],
+      "palettes": [ { "param": "fbms_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_room1_construction_west",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_room1_construction" ], "x": 3, "y": 9 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_room1_construction" ], "x": 3, "y": 9, "z": 0 },
+        { "chunks": [ "fbms_room1_roof_construction" ], "x": 3, "y": 9, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -119,11 +199,51 @@
       "palettes": [ { "param": "fbms_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_room2_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_concrete_palette",
+              "fbms_log_palette",
+              "fbms_metal_palette",
+              "fbms_migo_resin_palette",
+              "fbms_rammed_earth_palette",
+              "fbms_rock_palette",
+              "fbms_wad_palette",
+              "fbms_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "      ",
+        "      ",
+        "      ",
+        "   rrr",
+        "   rrr",
+        "   rrr"
+      ],
+      "palettes": [ { "param": "fbms_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_room2_construction_northwest",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_room2_construction" ], "x": 3, "y": 3 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_room2_construction" ], "x": 3, "y": 3, "z": 0 },
+        { "chunks": [ "fbms_room2_roof_construction" ], "x": 3, "y": 3, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -161,11 +281,51 @@
       "palettes": [ { "param": "fbms_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_room3_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_concrete_palette",
+              "fbms_log_palette",
+              "fbms_metal_palette",
+              "fbms_migo_resin_palette",
+              "fbms_rammed_earth_palette",
+              "fbms_rock_palette",
+              "fbms_wad_palette",
+              "fbms_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "   rrr",
+        "   rrr",
+        "   rrr",
+        "      ",
+        "      ",
+        "      "
+      ],
+      "palettes": [ { "param": "fbms_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_room3_construction_southwest",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_room3_construction" ], "x": 3, "y": 15 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_room3_construction" ], "x": 3, "y": 15, "z": 0 },
+        { "chunks": [ "fbms_room3_roof_construction" ], "x": 3, "y": 15, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -203,11 +363,51 @@
       "palettes": [ { "param": "fbms_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_room4_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_concrete_palette",
+              "fbms_log_palette",
+              "fbms_metal_palette",
+              "fbms_migo_resin_palette",
+              "fbms_rammed_earth_palette",
+              "fbms_rock_palette",
+              "fbms_wad_palette",
+              "fbms_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "      ",
+        "      ",
+        "      ",
+        "rrr   ",
+        "rrr   ",
+        "rrr   "
+      ],
+      "palettes": [ { "param": "fbms_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_room4_construction_northeast",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_room4_construction" ], "x": 15, "y": 3 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_room4_construction" ], "x": 15, "y": 3, "z": 0 },
+        { "chunks": [ "fbms_room4_roof_construction" ], "x": 15, "y": 3, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -245,11 +445,51 @@
       "palettes": [ { "param": "fbms_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_room5_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_concrete_palette",
+              "fbms_log_palette",
+              "fbms_metal_palette",
+              "fbms_migo_resin_palette",
+              "fbms_rammed_earth_palette",
+              "fbms_rock_palette",
+              "fbms_wad_palette",
+              "fbms_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "rrr   ",
+        "rrr   ",
+        "rrr   ",
+        "      ",
+        "      ",
+        "      "
+      ],
+      "palettes": [ { "param": "fbms_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_room5_construction_southeast",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_room5_construction" ], "x": 15, "y": 15 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_room5_construction" ], "x": 15, "y": 15, "z": 0 },
+        { "chunks": [ "fbms_room5_roof_construction" ], "x": 15, "y": 15, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -287,11 +527,51 @@
       "palettes": [ { "param": "fbms_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_room6_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_concrete_palette",
+              "fbms_log_palette",
+              "fbms_metal_palette",
+              "fbms_migo_resin_palette",
+              "fbms_rammed_earth_palette",
+              "fbms_rock_palette",
+              "fbms_wad_palette",
+              "fbms_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        " rrrr ",
+        " rrrr ",
+        "rrrrrr"
+      ],
+      "palettes": [ { "param": "fbms_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_room6_construction_south",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_room6_construction" ], "x": 9, "y": 15 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_room6_construction" ], "x": 9, "y": 15, "z": 0 },
+        { "chunks": [ "fbms_room6_roof_construction" ], "x": 9, "y": 15, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -329,11 +609,51 @@
       "palettes": [ { "param": "fbms_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_room7_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_concrete_palette",
+              "fbms_log_palette",
+              "fbms_metal_palette",
+              "fbms_migo_resin_palette",
+              "fbms_rammed_earth_palette",
+              "fbms_rock_palette",
+              "fbms_wad_palette",
+              "fbms_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "rrrrrr",
+        " rrrr ",
+        " rrrr ",
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr"
+      ],
+      "palettes": [ { "param": "fbms_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_room7_construction_north",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_room7_construction" ], "x": 9, "y": 3 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_room7_construction" ], "x": 9, "y": 3, "z": 0 },
+        { "chunks": [ "fbms_room7_roof_construction" ], "x": 9, "y": 3, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -371,6 +691,41 @@
       "palettes": [ { "param": "fbms_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_room8_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_concrete_palette",
+              "fbms_log_palette",
+              "fbms_metal_palette",
+              "fbms_migo_resin_palette",
+              "fbms_rammed_earth_palette",
+              "fbms_rock_palette",
+              "fbms_wad_palette",
+              "fbms_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr"
+      ],
+      "palettes": [ { "param": "fbms_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",
@@ -407,6 +762,41 @@
       "palettes": [ { "param": "fbms_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_room9_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_concrete_palette",
+              "fbms_log_palette",
+              "fbms_metal_palette",
+              "fbms_migo_resin_palette",
+              "fbms_rammed_earth_palette",
+              "fbms_rock_palette",
+              "fbms_wad_palette",
+              "fbms_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "    rr",
+        "    rr",
+        "    rr",
+        "    rr",
+        "    rr",
+        "    rr"
+      ],
+      "palettes": [ { "param": "fbms_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",
@@ -443,15 +833,53 @@
       "palettes": [ { "param": "fbms_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_room10_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_concrete_palette",
+              "fbms_log_palette",
+              "fbms_metal_palette",
+              "fbms_migo_resin_palette",
+              "fbms_rammed_earth_palette",
+              "fbms_rock_palette",
+              "fbms_wad_palette",
+              "fbms_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "rr    ",
+        "rr    ",
+        "rr    ",
+        "rr    ",
+        "rr    ",
+        "rr    "
+      ],
+      "palettes": [ { "param": "fbms_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_room8_construction_center",
     "method": "json",
     "object": {
       "place_nested": [
-        { "chunks": [ "fbms_room9_construction" ], "x": 3, "y": 9 },
-        { "chunks": [ "fbms_room10_construction" ], "x": 15, "y": 9 },
-        { "chunks": [ "fbms_room8_construction" ], "x": 9, "y": 9 }
+        { "chunks": [ "fbms_room8_construction" ], "x": 9, "y": 9, "z": 0 },
+        { "chunks": [ "fbms_room8_roof_construction" ], "x": 9, "y": 9, "z": 1 },
+        { "chunks": [ "fbms_room9_construction" ], "x": 3, "y": 9, "z": 0 },
+        { "chunks": [ "fbms_room9_roof_construction" ], "x": 3, "y": 9, "z": 1 },
+        { "chunks": [ "fbms_room10_construction" ], "x": 15, "y": 9, "z": 0 },
+        { "chunks": [ "fbms_room10_roof_construction" ], "x": 15, "y": 9, "z": 1 }
       ]
     }
   }
diff --git a/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_palettes.json b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_palettes.json
index 9db486df66b91..b99b872dc47c0 100644
--- a/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_palettes.json
+++ b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_palettes.json
@@ -8,49 +8,73 @@
   {
     "type": "palette",
     "id": "fbms_concrete_palette",
-    "terrain": { ".": "t_thconc_floor", "d": "t_door_metal_c", "o": "t_window_no_curtains", "w": "t_sconc_wall" },
+    "terrain": {
+      ".": "t_thconc_floor",
+      "d": "t_door_metal_c",
+      "o": "t_window_no_curtains",
+      "r": "t_concrete_roof",
+      "w": "t_sconc_wall"
+    },
     "furniture": { ".": "f_clear", "d": "f_clear", "o": "f_clear", "w": "f_clear" }
   },
   {
     "type": "palette",
     "id": "fbms_log_palette",
-    "terrain": { ".": "t_floor", "d": "t_door_c", "o": "t_window_no_curtains", "w": "t_wall_log" },
+    "terrain": { ".": "t_floor", "d": "t_door_c", "o": "t_window_no_curtains", "r": "t_wood_treated_roof", "w": "t_wall_log" },
     "furniture": { ".": "f_clear", "d": "f_clear", "o": "f_clear", "w": "f_clear" }
   },
   {
     "type": "palette",
     "id": "fbms_metal_palette",
-    "terrain": { ".": "t_scrap_floor", "d": "t_door_metal_c", "o": "t_window_no_curtains", "w": "t_scrap_wall" },
+    "terrain": {
+      ".": "t_scrap_floor",
+      "d": "t_door_metal_c",
+      "o": "t_window_no_curtains",
+      "r": "t_metal_flat_roof",
+      "w": "t_scrap_wall"
+    },
     "furniture": { ".": "f_clear", "d": "f_clear", "o": "f_clear", "w": "f_clear" }
   },
   {
     "type": "palette",
     "id": "fbms_migo_resin_palette",
-    "terrain": { ".": "t_floor_resin", "d": "t_resin_hole_c", "o": "t_wall_resin_cage", "w": "t_wall_resin" },
+    "terrain": { ".": "t_floor_resin", "d": "t_resin_hole_c", "o": "t_wall_resin_cage", "r": "t_resin_roof", "w": "t_wall_resin" },
     "furniture": { ".": "f_clear", "d": "f_clear", "o": "f_clear", "w": "f_clear" }
   },
   {
     "type": "palette",
     "id": "fbms_rammed_earth_palette",
-    "terrain": { ".": "t_floor_primitive", "d": "t_door_makeshift_c", "o": "t_window_empty", "w": "t_wall_rammed_earth" },
+    "terrain": {
+      ".": "t_floor_primitive",
+      "d": "t_door_makeshift_c",
+      "o": "t_window_empty",
+      "r": "t_log_sod_roof",
+      "w": "t_wall_rammed_earth"
+    },
     "furniture": { ".": "f_clear", "d": "f_clear", "o": "f_clear", "w": "f_clear" }
   },
   {
     "type": "palette",
     "id": "fbms_rock_palette",
-    "terrain": { ".": "t_floor", "d": "t_door_c", "o": "t_window_no_curtains", "w": "t_rock_wall" },
+    "terrain": { ".": "t_floor", "d": "t_door_c", "o": "t_window_no_curtains", "r": "t_wood_treated_roof", "w": "t_rock_wall" },
     "furniture": { ".": "f_clear", "d": "f_clear", "o": "f_clear", "w": "f_clear" }
   },
   {
     "type": "palette",
     "id": "fbms_wad_palette",
-    "terrain": { ".": "t_floor_primitive", "d": "t_door_makeshift_c", "o": "t_wall_wattle_half", "w": "t_wall_wattle" },
+    "terrain": {
+      ".": "t_floor_primitive",
+      "d": "t_door_makeshift_c",
+      "o": "t_wall_wattle_half",
+      "r": "t_log_sod_roof",
+      "w": "t_wall_wattle"
+    },
     "furniture": { ".": "f_clear", "d": "f_clear", "o": "f_clear", "w": "f_clear" }
   },
   {
     "type": "palette",
     "id": "fbms_wood_palette",
-    "terrain": { ".": "t_floor", "d": "t_door_c", "o": "t_window_no_curtains", "w": "t_wall_wood" },
+    "terrain": { ".": "t_floor", "d": "t_door_c", "o": "t_window_no_curtains", "r": "t_wood_treated_roof", "w": "t_wall_wood" },
     "furniture": { ".": "f_clear", "d": "f_clear", "o": "f_clear", "w": "f_clear" }
   }
 ]