Add roofs to market stalls (#74760)

* Add roofs to market stalls * Added recommended flag
CleverRaven · Jun 25, 2024 · 9281795 · 9281795
1 parent 7da20bc
commit 9281795
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 14 deletions.
diff --git a/data/json/mapgen/cs_market_small.json b/data/json/mapgen/cs_market_small.json
@@ -53,6 +53,7 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": "cs_market_small_roof",
+    "//": "Obsolete 2024-06-24. Remains to generate in older saves",
     "object": {
       "fill_ter": "t_open_air",
       "rows": [

diff --git a/data/json/mapgen/nested/market_stalls_nested.json b/data/json/mapgen/nested/market_stalls_nested.json
@@ -1,4 +1,21 @@
 [
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "market_6x6_roof",
+    "object": {
+      "mapgensize": [ 6, 6 ],
+      "rows": [
+        "RRRRRR",
+        "RRRRRR",
+        "RRRRRR",
+        "RRRRRR",
+        "RRRRRR",
+        "RRRRRR"
+      ],
+      "terrain": { "R": "t_canvas_roof" }
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",
@@ -21,7 +38,8 @@
         "f": { "item": "butcher_raw_meat", "chance": 25, "repeat": [ 1, 2 ] },
         "H": { "item": "butcher_raw_meat", "chance": 25, "repeat": [ 1, 2 ] }
       },
-      "palettes": [ "open_air_stall_palette" ]
+      "palettes": [ "open_air_stall_palette" ],
+      "place_nested": [ { "chunks": [ "market_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
     }
   },
   {
@@ -44,7 +62,8 @@
         "T": { "item": "fresh_produce", "chance": 30, "repeat": [ 1, 2 ] },
         "d": { "item": "produce", "chance": 30, "repeat": [ 1, 3 ] }
       },
-      "palettes": [ "open_air_stall_palette" ]
+      "palettes": [ "open_air_stall_palette" ],
+      "place_nested": [ { "chunks": [ "market_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
     }
   },
   {
@@ -68,7 +87,8 @@
         "d": { "item": "fresh_fish", "chance": 50, "repeat": [ 1, 2 ] },
         "r": { "item": "fish_market_stall", "chance": 30, "repeat": [ 1, 3 ] }
       },
-      "palettes": [ "open_air_stall_palette" ]
+      "palettes": [ "open_air_stall_palette" ],
+      "place_nested": [ { "chunks": [ "market_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
     }
   },
   {
@@ -91,7 +111,23 @@
         "r": { "item": "candy_chocolate", "chance": 65, "repeat": [ 1, 2 ] },
         "d": { "item": "candy_shop", "chance": 40, "repeat": [ 1, 3 ] }
       },
-      "palettes": [ "open_air_stall_palette" ]
+      "palettes": [ "open_air_stall_palette" ],
+      "place_nested": [ { "chunks": [ "market_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "market_4x4_roof",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "RRRR",
+        "RRRR",
+        "RRRR",
+        "RRRR"
+      ],
+      "terrain": { "R": "t_canvas_roof" }
     }
   },
   {
@@ -113,7 +149,8 @@
         "T": { "item": "honey_market_stall", "chance": 75, "repeat": [ 1, 2 ] }
       },
       "palettes": [ "open_air_stall_palette" ],
-      "//": "Give small chance to spawn mutated/normal bees?"
+      "//": "Give small chance to spawn mutated/normal bees?",
+      "place_nested": [ { "chunks": [ "market_4x4_roof" ], "x": 0, "y": 0, "z": 1 } ]
     }
   },
   {
@@ -152,7 +189,24 @@
         "I": { "item": "underwear_womens", "chance": 65 },
         "T": [ { "item": "gloves_unisex", "chance": 65 }, { "item": "scarfs_unisex", "chance": 40 } ]
       },
-      "palettes": [ "open_air_stall_palette" ]
+      "palettes": [ "open_air_stall_palette" ],
+      "place_nested": [ { "chunks": [ "market_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "market_5x5_roof",
+    "object": {
+      "mapgensize": [ 5, 5 ],
+      "rows": [
+        "RRRRR",
+        "RRRRR",
+        "RRRRR",
+        "RRRRR",
+        "RRRRR"
+      ],
+      "terrain": { "R": "t_canvas_roof" }
     }
   },
   {
@@ -171,7 +225,26 @@
       "set": [ { "square": "terrain", "id": "t_sidewalk_roof_canvas", "x": 0, "y": 0, "x2": 4, "y2": 4 } ],
       "furniture": { "p": [ "f_indoor_plant", "f_indoor_plant_y", [ "f_null", 3 ] ] },
       "items": { "t": { "item": "cash_register_random", "chance": 100 } },
-      "palettes": [ "open_air_stall_palette" ]
+      "palettes": [ "open_air_stall_palette" ],
+      "place_nested": [ { "chunks": [ "market_5x5_roof" ], "x": 0, "y": 0, "z": 1 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "market_7x7_roof",
+    "object": {
+      "mapgensize": [ 7, 7 ],
+      "rows": [
+        "RRRRRRR",
+        "RRRRRRR",
+        "RRRRRRR",
+        "RRRRRRR",
+        "RRRRRRR",
+        "RRRRRRR",
+        "RRRRRRR"
+      ],
+      "terrain": { "R": "t_canvas_roof" }
     }
   },
   {
@@ -196,7 +269,8 @@
         { "chance": 50, "repeat": [ 3, 6 ], "item": "office_mess", "x": [ 1, 5 ], "y": [ 3, 3 ] },
         { "chance": 35, "repeat": [ 1, 3 ], "item": "tools_home", "x": [ 1, 5 ], "y": [ 5, 5 ] }
       ],
-      "palettes": [ "open_air_stall_palette" ]
+      "palettes": [ "open_air_stall_palette" ],
+      "place_nested": [ { "chunks": [ "market_7x7_roof" ], "x": 0, "y": 0, "z": 1 } ]
     }
   },
   {
@@ -218,7 +292,8 @@
         "t": { "item": "cash_register_random", "chance": 100 },
         "T": [ { "item": "homebooks", "chance": 40, "repeat": [ 1, 2 ] } ]
       },
-      "palettes": [ "open_air_stall_palette" ]
+      "palettes": [ "open_air_stall_palette" ],
+      "place_nested": [ { "chunks": [ "market_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
     }
   }
 ]
diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
@@ -1410,10 +1410,7 @@
     "type": "city_building",
     "id": "cs_market_small",
     "locations": [ "land" ],
-    "overmaps": [
-      { "point": [ 0, 0, 0 ], "overmap": "cs_market_small_north" },
-      { "point": [ 0, 0, 1 ], "overmap": "cs_market_small_roof_north" }
-    ]
+    "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cs_market_small_north" } ]
   },
   {
     "type": "city_building",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json
@@ -1510,11 +1510,13 @@
   },
   {
     "type": "overmap_terrain",
+    "//": "Obsolete 2024-06-24. Remains to work in existing saves",
     "id": "cs_market_small_roof",
     "name": "small market roof",
     "copy-from": "generic_city_building",
     "sym": "m",
-    "color": "i_light_gray"
+    "color": "i_light_gray",
+    "flags": [ "SHOULD_NOT_SPAWN" ]
   },
   {
     "type": "overmap_terrain",