From 3d9c55526be27525f94ffd7fffb02482dfe266c5 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Thu, 23 May 2024 11:18:46 +0200
Subject: [PATCH] Explicit roofs on workshop version 2 expansion

---
 .../version_2/modular_workshop_common.json    |  53 ++---
 .../modular_workshop_construction.json        | 220 +++++++++++++++++-
 .../version_2/modular_workshop_palettes.json  |  79 ++++++-
 3 files changed, 305 insertions(+), 47 deletions(-)

diff --git a/data/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_common.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_common.json
index 0e6af01a11217..da9087d3064ad 100644
--- a/data/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_common.json
+++ b/data/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_common.json
@@ -1,26 +1,4 @@
 [
-  {
-    "type": "palette",
-    "id": "fbmw_2_common_palette",
-    "terrain": { ";": "t_dirt" },
-    "furniture": {
-      "t": "f_table",
-      "L": "f_dresser",
-      "x": "f_kiln_empty",
-      "f": "f_forge_rock",
-      "c": "f_workbench",
-      "h": "f_stool",
-      "A": "f_anvil",
-      "r": "f_rack_wood",
-      "Q": "f_bellows",
-      "b": "f_bench",
-      "z": "f_55gal_firebarrel",
-      "k": "f_clay_kiln",
-      "M": "f_armchair",
-      "B": "f_bookcase",
-      ";": "f_clear"
-    }
-  },
   {
     "type": "mapgen",
     "method": "json",
@@ -69,10 +47,11 @@
     "method": "json",
     "object": {
       "set": [
-        { "point": "furniture", "id": "f_fireplace", "x": 14, "y": 17 },
-        { "point": "furniture", "id": "f_forge_rock", "x": 16, "y": 17 },
-        { "point": "furniture", "id": "f_table", "x": 17, "y": 17 },
-        { "point": "furniture", "id": "f_dresser", "x": 18, "y": 17 }
+        { "point": "furniture", "id": "f_fireplace", "x": 14, "y": 17, "z": 0 },
+        { "point": "furniture", "id": "f_chimney", "x": 14, "y": 17, "z": 1 },
+        { "point": "furniture", "id": "f_forge_rock", "x": 16, "y": 17, "z": 0 },
+        { "point": "furniture", "id": "f_table", "x": 17, "y": 17, "z": 0 },
+        { "point": "furniture", "id": "f_dresser", "x": 18, "y": 17, "z": 0 }
       ],
       "place_loot": [ { "item": "makeshift_hammer", "x": 17, "y": 17, "chance": 100 } ]
     }
@@ -83,8 +62,8 @@
     "method": "json",
     "object": {
       "set": [
-        { "point": "furniture", "id": "f_kiln_empty", "x": 17, "y": 14 },
-        { "point": "furniture", "id": "f_kiln_empty", "x": 18, "y": 14 }
+        { "point": "furniture", "id": "f_kiln_empty", "x": 17, "y": 14, "z": 0 },
+        { "point": "furniture", "id": "f_kiln_empty", "x": 18, "y": 14, "z": 0 }
       ],
       "place_loot": [ { "item": "crucible", "x": 17, "y": 17, "chance": 100 } ]
     }
@@ -154,7 +133,10 @@
     "type": "mapgen",
     "update_mapgen_id": "fbmw_2_common_pottery",
     "method": "json",
-    "object": { "set": [ { "point": "furniture", "id": "f_clay_kiln", "x": 1, "y": 18 } ] }
+    "object": { "set": [
+    { "point": "furniture", "id": "f_clay_kiln", "x": 1, "y": 18, "z": 0 },
+    { "point": "furniture", "id": "f_chimney", "x": 1, "y": 18, "z": 1 }
+    ] }
   },
   {
     "type": "mapgen",
@@ -184,12 +166,13 @@
     "method": "json",
     "object": {
       "set": [
-        { "point": "furniture", "id": "f_bookcase", "x": 1, "y": 8 },
-        { "point": "furniture", "id": "f_forge_rock", "x": 3, "y": 8 },
-        { "point": "furniture", "id": "f_bookcase", "x": 1, "y": 9 },
-        { "point": "furniture", "id": "f_bookcase", "x": 1, "y": 10 },
-        { "point": "furniture", "id": "f_armchair", "x": 2, "y": 10 },
-        { "point": "furniture", "id": "f_workbench", "x": 3, "y": 10 }
+        { "point": "furniture", "id": "f_bookcase", "x": 1, "y": 8, "z": 0 },
+        { "point": "furniture", "id": "f_forge_rock", "x": 3, "y": 8, "z": 0 },
+        { "point": "furniture", "id": "f_chimney", "x": 3, "y": 8, "z": 1 },
+        { "point": "furniture", "id": "f_bookcase", "x": 1, "y": 9, "z": 0 },
+        { "point": "furniture", "id": "f_bookcase", "x": 1, "y": 10, "z": 0 },
+        { "point": "furniture", "id": "f_armchair", "x": 2, "y": 10, "z": 0 },
+        { "point": "furniture", "id": "f_workbench", "x": 3, "y": 10, "z": 0 }
       ],
       "place_loot": [
         { "item": "tongs", "x": 3, "y": 10, "chance": 100 },
diff --git a/data/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_construction.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_construction.json
index 6c3d38d440911..b69a938405401 100644
--- a/data/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_construction.json
+++ b/data/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_construction.json
@@ -35,11 +35,51 @@
       "palettes": [ { "param": "fbmw_2_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmw_2_smithy_1_roof_construction",
+    "object": {
+      "parameters": {
+        "fbmw_2_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbmw_2_concrete_palette",
+              "fbmw_2_log_palette",
+              "fbmw_2_metal_palette",
+              "fbmw_2_migo_resin_palette",
+              "fbmw_2_rammed_earth_palette",
+              "fbmw_2_rock_palette",
+              "fbmw_2_wad_palette",
+              "fbmw_2_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr"
+      ],
+      "palettes": [ { "param": "fbmw_2_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbmw_2_smithy_1_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmw_2_smithy_1_construction" ], "x": 14, "y": 17 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmw_2_smithy_1_construction" ], "x": 14, "y": 17, "z": 0 },
+        { "chunks": [ "fbmw_2_smithy_1_roof_construction" ], "x": 14, "y": 17, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -77,11 +117,51 @@
       "palettes": [ { "param": "fbmw_2_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmw_2_smithy_2_roof_construction",
+    "object": {
+      "parameters": {
+        "fbmw_2_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbmw_2_concrete_palette",
+              "fbmw_2_log_palette",
+              "fbmw_2_metal_palette",
+              "fbmw_2_migo_resin_palette",
+              "fbmw_2_rammed_earth_palette",
+              "fbmw_2_rock_palette",
+              "fbmw_2_wad_palette",
+              "fbmw_2_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "  rrrr",
+        "  rrrr",
+        "rrrrrr",
+        "      ",
+        "      ",
+        "      "
+      ],
+      "palettes": [ { "param": "fbmw_2_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbmw_2_smithy_2_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmw_2_smithy_2_construction" ], "x": 14, "y": 14 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmw_2_smithy_2_construction" ], "x": 14, "y": 14, "z": 0 },
+        { "chunks": [ "fbmw_2_smithy_2_roof_construction" ], "x": 14, "y": 14, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -121,11 +201,53 @@
       "palettes": [ { "param": "fbmw_2_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmw_2_pottery_roof_construction",
+    "object": {
+      "parameters": {
+        "fbmw_2_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbmw_2_concrete_palette",
+              "fbmw_2_log_palette",
+              "fbmw_2_metal_palette",
+              "fbmw_2_migo_resin_palette",
+              "fbmw_2_rammed_earth_palette",
+              "fbmw_2_rock_palette",
+              "fbmw_2_wad_palette",
+              "fbmw_2_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 8, 8 ],
+      "rows": [
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "rrrrrrrr",
+        "        "
+      ],
+      "palettes": [ { "param": "fbmw_2_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbmw_2_pottery_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmw_2_pottery_construction" ], "x": 0, "y": 16 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmw_2_pottery_construction" ], "x": 0, "y": 16, "z": 0 },
+        { "chunks": [ "fbmw_2_pottery_roof_construction" ], "x": 0, "y": 16, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -164,11 +286,52 @@
       "palettes": [ { "param": "fbmw_2_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmw_2_smithy_3_roof_construction",
+    "object": {
+      "parameters": {
+        "fbmw_2_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbmw_2_concrete_palette",
+              "fbmw_2_log_palette",
+              "fbmw_2_metal_palette",
+              "fbmw_2_migo_resin_palette",
+              "fbmw_2_rammed_earth_palette",
+              "fbmw_2_rock_palette",
+              "fbmw_2_wad_palette",
+              "fbmw_2_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 7, 7 ],
+      "rows": [
+        "rrrrrr ",
+        "rrrrrr ",
+        "rrrrrr ",
+        "rrrrrr ",
+        "rrrrrr ",
+        "rrrrrr ",
+        "rrrrrr "
+      ],
+      "palettes": [ { "param": "fbmw_2_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbmw_2_smithy_3_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmw_2_smithy_3_construction" ], "x": 8, "y": 16 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmw_2_smithy_3_construction" ], "x": 8, "y": 16, "z": 0 },
+        { "chunks": [ "fbmw_2_smithy_3_roof_construction" ], "x": 8, "y": 16, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -206,11 +369,51 @@
       "palettes": [ { "param": "fbmw_2_construction_palette" } ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "fbmw_2_6x5_roof_construction",
+    "object": {
+      "parameters": {
+        "fbmw_2_construction_palette": {
+          "type": "palette_id",
+          "scope": "omt",
+          "default": {
+            "distribution": [
+              "fbmw_2_concrete_palette",
+              "fbmw_2_log_palette",
+              "fbmw_2_metal_palette",
+              "fbmw_2_migo_resin_palette",
+              "fbmw_2_rammed_earth_palette",
+              "fbmw_2_rock_palette",
+              "fbmw_2_wad_palette",
+              "fbmw_2_wood_palette"
+            ]
+          }
+        }
+      },
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "rrrrrr",
+        "      "
+      ],
+      "palettes": [ { "param": "fbmw_2_construction_palette" } ]
+    }
+  },
   {
     "type": "mapgen",
     "update_mapgen_id": "fbmw_2_glassblower_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmw_2_glassblower_construction" ], "x": 0, "y": 7 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmw_2_glassblower_construction" ], "x": 0, "y": 7, "z": 0 },
+        { "chunks": [ "fbmw_2_6x5_roof_construction" ], "x": 0, "y": 7, "z": 1 }
+      ]
+    }
   },
   {
     "type": "mapgen",
@@ -252,6 +455,11 @@
     "type": "mapgen",
     "update_mapgen_id": "fbmw_2_tanner_construction",
     "method": "json",
-    "object": { "place_nested": [ { "chunks": [ "fbmw_2_tanner_construction" ], "x": 14, "y": 0 } ] }
+    "object": {
+      "place_nested": [
+        { "chunks": [ "fbmw_2_tanner_construction" ], "x": 14, "y": 0, "z": 0 },
+        { "chunks": [ "fbmw_2_6x5_roof_construction" ], "x": 14, "y": 0, "z": 1 }
+      ]
+    }
   }
 ]
diff --git a/data/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_palettes.json b/data/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_palettes.json
index a1269f7eb4e80..593d2ed5fdbf9 100644
--- a/data/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_palettes.json
+++ b/data/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_palettes.json
@@ -1,26 +1,77 @@
 [
+  {
+    "type": "palette",
+    "id": "fbmw_2_common_palette",
+    "terrain": { ";": "t_dirt" },
+    "furniture": {
+      ";": "f_clear",
+      "A": "f_anvil",
+      "b": "f_bench",
+      "B": "f_bookcase",
+      "c": "f_workbench",
+      "C": "f_chimney",
+      "f": "f_forge_rock",
+      "h": "f_stool",
+      "k": "f_clay_kiln",
+      "L": "f_dresser",
+      "M": "f_armchair",
+      "Q": "f_bellows",
+      "r": "f_rack_wood",
+      "t": "f_table",
+      "x": "f_kiln_empty",
+      "z": "f_55gal_firebarrel"
+    }
+  },
   {
     "type": "palette",
     "id": "fbmw_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": "fbmw_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": "fbmw_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": "fbmw_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": {  }
   },
   {
@@ -30,6 +81,7 @@
       ",": "t_dirtfloor",
       ".": "t_floor_primitive",
       "+": "t_door_makeshift_c",
+      "r": "t_log_sod_roof",
       "v": "t_window_empty",
       "w": "t_wall_rammed_earth"
     },
@@ -38,7 +90,14 @@
   {
     "type": "palette",
     "id": "fbmw_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": {  }
   },
   {
@@ -48,6 +107,7 @@
       ",": "t_dirtfloor",
       ".": "t_floor_primitive",
       "+": "t_door_makeshift_c",
+      "r": "t_log_sod_roof",
       "v": "t_wall_wattle_half",
       "w": "t_wall_wattle"
     },
@@ -56,7 +116,14 @@
   {
     "type": "palette",
     "id": "fbmw_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": {  }
   }
 ]