feat(content): bungalow28 (#4123)

* bungalow28 * Update bungalow28.json
cataclysmbnteam · Jan 18, 2024 · 16229e4 · 16229e4
1 parent 8aad02c
commit 16229e4
Show file tree

Hide file tree

Showing 4 changed files with 176 additions and 0 deletions.
diff --git a/data/json/mapgen/house/bungalow28.json b/data/json/mapgen/house/bungalow28.json
@@ -0,0 +1,162 @@
+[
+  {
+    "type": "mapgen",
+    "om_terrain": "bungalow28_basement",
+    "method": "json",
+    "object": {
+      "palettes": [ "standard_domestic_palette", "standard_domestic_basement_palette", "standard_domestic_lino_bathroom" ],
+      "fill_ter": "t_floor",
+      "rows": [
+        "^^^^^^^^^^^^^^^^^^^^^^^^",
+        "^^^^^^^^^^^^^^^^^^^^^^^^",
+        "^^^^^^^^^^^^^^^^^^^^^^^^",
+        "^^^^^^^^^^^^^^^^^^^^^^^^",
+        "^^^^^^^^^^^^^^^^^^^^^^^^",
+        "^^^^^^^^^^^^^^^^^^^^^^^^",
+        "^^||||||||||||||||||||^^",
+        "^^|tS_+  T0HHH0&|I ¤@|^^",
+        "^^|___|  H00000x|I  @|^^",
+        "^^|_89|  H0lll0x|I   |^^",
+        "^^|+|||  H00000&|   d|^^",
+        "^^|Q|RR  s Es   +   d|^^",
+        "^^|||R         R|Db  |^^",
+        "^^|$+          R|||++|^^",
+        "^^|$+  =|<|b    +z|zz|^^",
+        "^^||||+|||||+|||||||||^^",
+        "^^#qqq,U#U,|,,,,,,%,Z#^^",
+        "^^#,,,,U#,,+,,,,,,,,,#^^",
+        "^^#!,,,g#ww|Y,,,~~~,W#^^",
+        "^^####################^^",
+        "^^^^^^^^^^^^^^^^^^^^^^^^",
+        "^^^^^^^^^^^^^^^^^^^^^^^^",
+        "^^^^^^^^^^^^^^^^^^^^^^^^",
+        "^^^^^^^^^^^^^^^^^^^^^^^^"
+      ],
+      "terrain": {
+        ",": "t_thconc_floor",
+        "W": "t_thconc_floor",
+        "%": "t_thconc_floor",
+        "Z": "t_thconc_floor",
+        "w": "t_thconc_floor",
+        "U": "t_thconc_floor",
+        "g": "t_thconc_floor",
+        "q": "t_thconc_floor",
+        "!": "t_thconc_floor",
+        "Y": "t_thconc_floor",
+        "~": "t_thconc_floor",
+        "_": "t_linoleum_gray",
+        "0": "t_carpet_purple",
+        "&": "t_carpet_purple",
+        "x": "t_carpet_purple",
+        "H": "t_carpet_purple",
+        "T": "t_carpet_purple",
+        "l": "t_carpet_purple"
+      },
+      "furniture": {
+        "!": "f_home_furnace",
+        "$": "f_clothing_rail",
+        "%": "f_sink",
+        "&": "f_speaker_cabinet",
+        "=": "f_floor_lamp",
+        "~": "f_table"
+      },
+      "items": {
+        "$": [ { "item": "dress_shop", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "jackets", "chance": 30, "repeat": [ 1, 2 ] } ]
+      },
+      "place_loot": [ { "item": "stereo", "x": 15, "y": 7 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "om_terrain": "bungalow28",
+    "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_____.",
+        ".................._____.",
+        "..##ooo##........._____.",
+        "..#vrrrP#........._____.",
+        "..#    P#---------_____.",
+        "..###+###---------_____.",
+        ".%#dd bD#-##ooo##%_____.",
+        ".%o     #-*,,,h&#%_____.",
+        ".%o @@  #o#,hff,##_____.",
+        ".%#¤@@¤ + #,,ffh######..",
+        ".%#||||||  ,,,h,621/5o..",
+        ".%#¤    +       ////Oo..",
+        ".%o@@   |RR   yyF4JJ##..",
+        ".%o@@  D|||   ||||||#^..",
+        ".^#    T|>+   RRRTEso%..",
+        ".##+|++||||         ##..",
+        ".#zz|dd|y$$         s#..",
+        ".#||||||      r|x l H#..",
+        ".#B////+ ,,  !r|x l Ho..",
+        ".#BtS88##¶:#y r|x l Ho..",
+        ".###oo##---##oo#y   s#..",
+        "...%%%%-----jjj###oo##..",
+        ".......u................",
+        "........................"
+      ],
+      "terrain": {
+        "#": "t_brick_wall",
+        "~": "t_door_glass_c",
+        "/": "t_linoleum_gray",
+        ",": "t_carpet_green",
+        "f": "t_carpet_green",
+        "h": "t_carpet_green",
+        "&": "t_carpet_green"
+      },
+      "furniture": { "!": "f_chair", "$": "f_table", "&": [ "f_indoor_plant", "f_indoor_plant_y" ] },
+      "items": { "$": { "item": "table_foyer", "chance": 50 } },
+      "place_loot": [ { "item": "laptop", "x": 14, "y": 18 }, { "item": "television", "x": 16, "y": 18 } ],
+      "place_vehicles": [
+        { "vehicle": "suv_electric", "x": 21, "y": 5, "chance": 15, "rotation": 90 },
+        { "vehicle": "swivel_chair", "x": 13, "y": 18, "chance": 100, "rotation": 90 },
+        { "vehicle": "swivel_chair", "x": 5, "y": 4, "chance": 100, "rotation": 45 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "om_terrain": "bungalow28_roof",
+    "method": "json",
+    "object": {
+      "palettes": [ "roof_palette" ],
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "                        ",
+        "  -------               ",
+        "  -.....-               ",
+        "  -.....-               ",
+        "  -.....-               ",
+        "  -.....- -------       ",
+        "  -.....- -.....-       ",
+        "  -.....---.ooo.--      ",
+        "  -.........ooo..-----  ",
+        "  -.........ooo......-  ",
+        "  -.........ooo......-  ",
+        "  -.................--  ",
+        "  -.................5   ",
+        "  5...=.............-   ",
+        " --.................--  ",
+        " -...X...............-  ",
+        " -..............N....-  ",
+        " -...................-  ",
+        " -.....-----.........-  ",
+        " -------   -----.....-  ",
+        "               -------  ",
+        "                        ",
+        "                        "
+      ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
+  }
+]
diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
@@ -347,6 +347,16 @@
       { "point": [ 0, 0, 1 ], "overmap": "bungalow27_roof_north" }
     ]
   },
+  {
+    "type": "city_building",
+    "id": "bungalow28",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, -1 ], "overmap": "bungalow28_basement_north" },
+      { "point": [ 0, 0, 0 ], "overmap": "bungalow28_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "bungalow28_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
@@ -88,6 +88,7 @@
       "bungalow25",
       "bungalow26",
       "bungalow27",
+      "bungalow28",
       "duplex",
       "garden_house_1_floor_1",
       "garden_house_1_floor_2",
@@ -310,6 +311,7 @@
       "bungalow25_roof",
       "bungalow26_roof",
       "bungalow27_roof",
+      "bungalow28_roof",
       "duplex_roof",
       "garden_house_1_roof",
       "house_01_roof",
@@ -426,6 +428,7 @@
       "basement_weed",
       "bungalow26_basement",
       "bungalow27_basement",
+      "bungalow28_basement",
       "garden_house_1_basement",
       "house_04_basement",
       "house_05_basement",

diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
@@ -618,6 +618,7 @@
         "bungalow25": 50,
         "bungalow26": 50,
         "bungalow27": 50,
+        "bungalow28": 50,
         "house_w_1": 50,
         "house_two_story_basement": 50,
         "house_crack1": 5,