From 3da0278b4da725346afd05ff797af5492a7f758b Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Tue, 21 May 2024 11:59:42 +0200
Subject: [PATCH] Added explicit roofs to storehouse 2

---
 .../modular_storehouse_construction.json      | 298 +++++++++++++++++-
 .../modular_storehouse_palettes.json          |  56 +++-
 2 files changed, 336 insertions(+), 18 deletions(-)

diff --git a/data/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_construction.json b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_construction.json
index 28f1abe4980a7..941a621ccd34f 100644
--- a/data/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_construction.json
+++ b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_construction.json
@@ -36,11 +36,52 @@
       "palettes": [ { "param": "fbms_2_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_2_7x7_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_2_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_2_concrete_palette",
+              "fbms_2_log_palette",
+              "fbms_2_metal_palette",
+              "fbms_2_migo_resin_palette",
+              "fbms_2_rammed_earth_palette",
+              "fbms_2_rock_palette",
+              "fbms_2_wad_palette",
+              "fbms_2_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 7, 7 ],
+      "rows": [
+        "rrrrrrr",
+        "rrrrrrr",
+        "rrrrrrr",
+        "rrrrrrr",
+        "rrrrrrr",
+        "rrrrrrr",
+        "rrrrrrr"
+      ],
+      "palettes": [ { "param": "fbms_2_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_2_1_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_2_1_construction" ], "x": 0, "y": 16 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_2_1_construction" ], "x": 0, "y": 16, "z": 0 },
+        { "chunks": [ "fbms_2_7x7_roof_construction" ], "x": 0, "y": 16, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -79,11 +120,52 @@
       "palettes": [ { "param": "fbms_2_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_2_6x7_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_2_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_2_concrete_palette",
+              "fbms_2_log_palette",
+              "fbms_2_metal_palette",
+              "fbms_2_migo_resin_palette",
+              "fbms_2_rammed_earth_palette",
+              "fbms_2_rock_palette",
+              "fbms_2_wad_palette",
+              "fbms_2_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 7, 7 ],
+      "rows": [
+        "rrrrrr ",
+        "rrrrrr ",
+        "rrrrrr ",
+        "rrrrrr ",
+        "rrrrrr ",
+        "rrrrrr ",
+        "rrrrrr "
+      ],
+      "palettes": [ { "param": "fbms_2_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_2_2_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_2_2_construction" ], "x": 7, "y": 16 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_2_2_construction" ], "x": 7, "y": 16, "z": 0 },
+        { "chunks": [ "fbms_2_6x7_roof_construction" ], "x": 7, "y": 16, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -126,7 +208,12 @@
     "type": "mapgen",
     "update_mapgen_id": "fbms_2_3_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_2_3_construction" ], "x": 13, "y": 16 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_2_3_construction" ], "x": 13, "y": 16, "z": 0 },
+        { "chunks": [ "fbms_2_7x7_roof_construction" ], "x": 13, "y": 16, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -165,11 +252,52 @@
       "palettes": [ { "param": "fbms_2_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_2_7x5_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_2_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_2_concrete_palette",
+              "fbms_2_log_palette",
+              "fbms_2_metal_palette",
+              "fbms_2_migo_resin_palette",
+              "fbms_2_rammed_earth_palette",
+              "fbms_2_rock_palette",
+              "fbms_2_wad_palette",
+              "fbms_2_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 7, 7 ],
+      "rows": [
+        "rrrrrrr",
+        "rrrrrrr",
+        "rrrrrrr",
+        "rrrrrrr",
+        "rrrrrrr",
+        "       ",
+        "       "
+      ],
+      "palettes": [ { "param": "fbms_2_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_2_4_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_2_4_construction" ], "x": 0, "y": 11 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_2_4_construction" ], "x": 0, "y": 11, "z": 0 },
+        { "chunks": [ "fbms_2_7x5_roof_construction" ], "x": 0, "y": 11, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -207,11 +335,51 @@
       "palettes": [ { "param": "fbms_2_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_2_6x5_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_2_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_2_concrete_palette",
+              "fbms_2_log_palette",
+              "fbms_2_metal_palette",
+              "fbms_2_migo_resin_palette",
+              "fbms_2_rammed_earth_palette",
+              "fbms_2_rock_palette",
+              "fbms_2_wad_palette",
+              "fbms_2_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "      "
+      ],
+      "palettes": [ { "param": "fbms_2_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_2_5_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_2_5_construction" ], "x": 7, "y": 11 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_2_5_construction" ], "x": 7, "y": 11, "z": 0 },
+        { "chunks": [ "fbms_2_6x5_roof_construction" ], "x": 7, "y": 11, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -254,7 +422,12 @@
     "type": "mapgen",
     "update_mapgen_id": "fbms_2_6_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_2_6_construction" ], "x": 13, "y": 11 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_2_6_construction" ], "x": 13, "y": 11, "z": 0 },
+        { "chunks": [ "fbms_2_7x5_roof_construction" ], "x": 13, "y": 11, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -293,11 +466,52 @@
       "palettes": [ { "param": "fbms_2_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_2_7x6_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_2_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_2_concrete_palette",
+              "fbms_2_log_palette",
+              "fbms_2_metal_palette",
+              "fbms_2_migo_resin_palette",
+              "fbms_2_rammed_earth_palette",
+              "fbms_2_rock_palette",
+              "fbms_2_wad_palette",
+              "fbms_2_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 7, 7 ],
+      "rows": [
+        "rrrrrrr",
+        "rrrrrrr",
+        "rrrrrrr",
+        "rrrrrrr",
+        "rrrrrrr",
+        "rrrrrrr",
+        "       "
+      ],
+      "palettes": [ { "param": "fbms_2_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_2_7_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_2_7_construction" ], "x": 0, "y": 5 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_2_7_construction" ], "x": 0, "y": 5, "z": 0 },
+        { "chunks": [ "fbms_2_7x6_roof_construction" ], "x": 0, "y": 5, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -335,11 +549,51 @@
       "palettes": [ { "param": "fbms_2_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbms_2_6x6_roof_construction",
+    "object": {
+      "parameters": {
+        "fbms_2_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbms_2_concrete_palette",
+              "fbms_2_log_palette",
+              "fbms_2_metal_palette",
+              "fbms_2_migo_resin_palette",
+              "fbms_2_rammed_earth_palette",
+              "fbms_2_rock_palette",
+              "fbms_2_wad_palette",
+              "fbms_2_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr"
+      ],
+      "palettes": [ { "param": "fbms_2_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbms_2_8_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_2_8_construction" ], "x": 7, "y": 5 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_2_8_construction" ], "x": 7, "y": 5, "z": 0 },
+        { "chunks": [ "fbms_2_6x6_roof_construction" ], "x": 7, "y": 5, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -382,7 +636,12 @@
     "type": "mapgen",
     "update_mapgen_id": "fbms_2_9_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_2_9_construction" ], "x": 13, "y": 5 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_2_9_construction" ], "x": 13, "y": 5, "z": 0 },
+        { "chunks": [ "fbms_2_7x6_roof_construction" ], "x": 13, "y": 5, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -425,7 +684,12 @@
     "type": "mapgen",
     "update_mapgen_id": "fbms_2_10_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_2_10_construction" ], "x": 0, "y": 0 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_2_10_construction" ], "x": 0, "y": 0, "z": 0 },
+        { "chunks": [ "fbms_2_7x5_roof_construction" ], "x": 0, "y": 0, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -467,7 +731,12 @@
     "type": "mapgen",
     "update_mapgen_id": "fbms_2_11_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_2_11_construction" ], "x": 7, "y": 0 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_2_11_construction" ], "x": 7, "y": 0, "z": 0 },
+        { "chunks": [ "fbms_2_6x5_roof_construction" ], "x": 7, "y": 0, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -510,6 +779,11 @@
     "type": "mapgen",
     "update_mapgen_id": "fbms_2_12_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbms_2_12_construction" ], "x": 13, "y": 0 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbms_2_12_construction" ], "x": 13, "y": 0, "z": 0 },
+        { "chunks": [ "fbms_2_7x5_roof_construction" ], "x": 13, "y": 0, "z": 1 }
+      ]
+    }
   }
 ]
diff --git a/data/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_palettes.json b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_palettes.json
index 5cfe4fe323ad7..c325119e5be37 100644
--- a/data/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_palettes.json
+++ b/data/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_palettes.json
@@ -44,25 +44,53 @@
   {
     "type": "palette",
     "id": "fbms_2_concrete_palette",
-    "terrain": { ",": "t_dirtfloor", ".": "t_thconc_floor", "+": "t_door_metal_c", "v": "t_window_no_curtains", "w": "t_sconc_wall" },
+    "terrain": {
+      ",": "t_dirtfloor",
+      ".": "t_thconc_floor",
+      "+": "t_door_metal_c",
+      "r": "t_concrete_roof",
+      "v": "t_window_no_curtains",
+      "w": "t_sconc_wall"
+    },
     "furniture": {  }
   },
   {
     "type": "palette",
     "id": "fbms_2_log_palette",
-    "terrain": { ",": "t_dirtfloor", ".": "t_floor", "+": "t_door_c", "v": "t_window_no_curtains", "w": "t_wall_log" },
+    "terrain": {
+      ",": "t_dirtfloor",
+      ".": "t_floor",
+      "+": "t_door_c",
+      "r": "t_wood_treated_roof",
+      "v": "t_window_no_curtains",
+      "w": "t_wall_log"
+    },
     "furniture": {  }
   },
   {
     "type": "palette",
     "id": "fbms_2_metal_palette",
-    "terrain": { ",": "t_dirtfloor", ".": "t_scrap_floor", "+": "t_door_metal_c", "v": "t_window_no_curtains", "w": "t_scrap_wall" },
+    "terrain": {
+      ",": "t_dirtfloor",
+      ".": "t_scrap_floor",
+      "+": "t_door_metal_c",
+      "r": "t_metal_flat_roof",
+      "v": "t_window_no_curtains",
+      "w": "t_scrap_wall"
+    },
     "furniture": {  }
   },
   {
     "type": "palette",
     "id": "fbms_2_migo_resin_palette",
-    "terrain": { ",": "t_dirtfloor", ".": "t_floor_resin", "+": "t_resin_hole_c", "v": "t_wall_resin_cage", "w": "t_wall_resin" },
+    "terrain": {
+      ",": "t_dirtfloor",
+      ".": "t_floor_resin",
+      "+": "t_resin_hole_c",
+      "r": "t_resin_roof",
+      "v": "t_wall_resin_cage",
+      "w": "t_wall_resin"
+    },
     "furniture": {  }
   },
   {
@@ -72,6 +100,7 @@
       ",": "t_dirtfloor",
       ".": "t_floor_primitive",
       "+": "t_door_makeshift_c",
+      "r": "t_log_sod_roof",
       "v": "t_window_empty",
       "w": "t_wall_rammed_earth"
     },
@@ -80,7 +109,14 @@
   {
     "type": "palette",
     "id": "fbms_2_rock_palette",
-    "terrain": { ",": "t_dirtfloor", ".": "t_floor", "+": "t_door_c", "v": "t_window_no_curtains", "w": "t_rock_wall" },
+    "terrain": {
+      ",": "t_dirtfloor",
+      ".": "t_floor",
+      "+": "t_door_c",
+      "r": "t_wood_treated_roof",
+      "v": "t_window_no_curtains",
+      "w": "t_rock_wall"
+    },
     "furniture": {  }
   },
   {
@@ -90,6 +126,7 @@
       ",": "t_dirtfloor",
       ".": "t_floor_primitive",
       "+": "t_door_makeshift_c",
+      "r": "t_log_sod_roof",
       "v": "t_wall_wattle_half",
       "w": "t_wall_wattle"
     },
@@ -98,7 +135,14 @@
   {
     "type": "palette",
     "id": "fbms_2_wood_palette",
-    "terrain": { ",": "t_dirtfloor", ".": "t_floor", "+": "t_door_c", "v": "t_window_no_curtains", "w": "t_wall_wood" },
+    "terrain": {
+      ",": "t_dirtfloor",
+      ".": "t_floor",
+      "+": "t_door_c",
+      "r": "t_wood_treated_roof",
+      "v": "t_window_no_curtains",
+      "w": "t_wall_wood"
+    },
     "furniture": {  }
   }
 ]