From 90e0b56e0dae9e4db96b6f5fa461c33c7152d8c4 Mon Sep 17 00:00:00 2001
From: Lil Shining Man <56778776+LilShiningMan@users.noreply.github.com>
Date: Sun, 29 Oct 2023 20:02:54 -0700
Subject: [PATCH] bungalow 24 (#3514)

add bungalow 24
---
 data/json/mapgen/house/bungalow24.json        | 102 ++++++++++++++++++
 .../overmap/multitile_city_buildings.json     |   9 ++
 .../overmap_terrain_residential.json          |   2 +
 data/json/regional_map_settings.json          |   1 +
 4 files changed, 114 insertions(+)
 create mode 100644 data/json/mapgen/house/bungalow24.json

diff --git a/data/json/mapgen/house/bungalow24.json b/data/json/mapgen/house/bungalow24.json
new file mode 100644
index 000000000000..4121a857ece8
--- /dev/null
+++ b/data/json/mapgen/house/bungalow24.json
@@ -0,0 +1,102 @@
+[
+  {
+    "type": "mapgen",
+    "om_terrain": "bungalow24",
+    "method": "json",
+    "object": {
+      "palettes": [
+        "standard_domestic_palette",
+        "standard_domestic_lino_kitchen",
+        "standard_domestic_lino_bathroom",
+        "standard_domestic_landscaping_palette"
+      ],
+      "fill_ter": "t_floor",
+      "rows": [
+        "....---------p..........",
+        "..###oo###---%.[.....[..",
+        "..# ¤@@¤y#---%..........",
+        "..o  @@  #o*#^%%%%##o##.",
+        "..o      |L ##ooo##NNq#.",
+        ".%#   T  |$ ,sHHHs| h #.",
+        ".%#Ddd||+|  ,,,,,,|   o.",
+        ".##||||R    ,,lll,| qq#.",
+        ".#88ZW|R    ,,,,,,|+||#.",
+        ".oS___+     ,,xxx,,  R#.",
+        ".#t_BB|  VV |||||||  R#.",
+        ".##||||+||| 662FJJ|``r#.",
+        ".%# Ddy |U+ _____O|`!ro.",
+        ".%o@    |z+ Y13754|``ro.",
+        ".%o@   I|||    A  y  P#.",
+        "..#¤  hI|y  h        P#.",
+        "..######|  hff ||+|||##.",
+        "....-==¶    ffh|y dd #^.",
+        "....-==: y  h y|    ¤#%.",
+        "....-==###oooo##   @@o%.",
+        ".u..-=====     *   @@o%.",
+        "....-===== iiii#Db  ¤#%.",
+        ".[..-=₸=₸=&????###o###%.",
+        "........................"
+      ],
+      "terrain": {
+        "#": "t_wall_g",
+        "~": "t_door_glass_c",
+        "_": "t_linoleum_gray",
+        "?": "t_railing_v",
+        "=": "t_floor_noroof",
+        ",": "t_carpet_red",
+        "`": "t_carpet_purple",
+        "!": "t_carpet_purple",
+        "Y": "t_linoleum_gray",
+        "r": "t_carpet_purple",
+        "₸": "t_floor_noroof",
+        "&": "t_column",
+        "W": "t_linoleum_gray",
+        "Z": "t_linoleum_gray",
+        "l": "t_carpet_red",
+        "x": "t_carpet_red",
+        "H": "t_carpet_red",
+        "s": "t_carpet_red"
+      },
+      "furniture": { "!": "f_chair", "$": "f_table" },
+      "items": { "$": { "item": "table_foyer", "chance": 50, "repeat": [ 1, 2 ] } },
+      "place_loot": [ { "item": "television", "x": 15, "y": 9 }, { "item": "laptop", "x": 21, "y": 12 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "om_terrain": "bungalow24_roof",
+    "method": "json",
+    "object": {
+      "palettes": [ "roof_palette" ],
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "  --------              ",
+        "  -......-              ",
+        "  -......----     ----- ",
+        "  -.........-5-----...- ",
+        "  -...................- ",
+        "  -...................- ",
+        " --...................- ",
+        " -....................- ",
+        " -..............YYY...- ",
+        " -..............YYY...- ",
+        " --.....X.......YYY...- ",
+        "  -.............YYY...- ",
+        "  -...................- ",
+        "  -...................- ",
+        "  -...................- ",
+        "  ------........=....-- ",
+        "       -.............5  ",
+        "       -.............-  ",
+        "       ----..........-  ",
+        "          -..........-  ",
+        "          -..........-  ",
+        "          ------------  ",
+        "                        "
+      ],
+      "terrain": { ".": "t_shingle_flat_roof" },
+      "furniture": { "Y": "f_solar_unit" }
+    }
+  }
+]
diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
index c336a939d116..579cb788c440 100644
--- a/data/json/overmap/multitile_city_buildings.json
+++ b/data/json/overmap/multitile_city_buildings.json
@@ -254,6 +254,15 @@
       { "point": [ 0, 0, 1 ], "overmap": "bungalow23_roof_north" }
     ]
   },
+  {
+    "type": "city_building",
+    "id": "bungalow24",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "bungalow24_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "bungalow24_roof_north" }
+    ]
+  },
   {
     "type": "city_building",
     "id": "urban_1_house",
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
index b2caf997fd11..0b04d9e8ece5 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
@@ -73,6 +73,7 @@
       "bungalow21",
       "bungalow22",
       "bungalow23",
+      "bungalow24",
       "duplex",
       "garden_house_1_floor_1",
       "garden_house_1_floor_2",
@@ -272,6 +273,7 @@
       "bungalow21_roof",
       "bungalow22_roof",
       "bungalow23_roof",
+      "bungalow24_roof",
       "duplex_roof",
       "garden_house_1_roof",
       "house_01_roof",
diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
index 5c00b9392f4d..9499c2b97abc 100644
--- a/data/json/regional_map_settings.json
+++ b/data/json/regional_map_settings.json
@@ -605,6 +605,7 @@
         "bungalow21": 50,
         "bungalow22": 50,
         "bungalow23": 50,
+        "bungalow24": 50,
         "house_w_1": 50,
         "house_two_story_basement": 50,
         "house_crack1": 5,