Add bungalow 01 and 02 (cataclysmbnteam#2111)

* [CDDA PORT] adding house_34 adding house_34 * add bungalow 01 and 02 * Update multitile_city_buildings.json * Update overmap_terrain_residential.json * Update regional_map_settings.json * Delete house34.json * Update overmap_terrain_residential.json
leoCottret · Nov 1, 2022 · 5953e9b · 5953e9b
1 parent 3209780
commit 5953e9b
Show file tree

Hide file tree

Showing 5 changed files with 225 additions and 0 deletions.
diff --git a/data/json/mapgen/house/bungalow01.json b/data/json/mapgen/house/bungalow01.json
@@ -0,0 +1,95 @@
+[
+  {
+    "type": "mapgen",
+    "om_terrain": "bungalow01_1",
+    "weight": 250,
+    "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...............",
+        "..------.....[..........",
+        "...------...............",
+        ".[..--------{{{{{{{{{{..",
+        ".....-------,,qqq,,,,{..",
+        ".%%%%%------,,,,,,,,G{..",
+        ".##oo###oo##,,,,,,,,K{..",
+        ".#d  ¤@@¤ d#,,,,,,,,G{..",
+        ".#d   @@  d#o*###oo###..",
+        ".#y        |L RH     #%.",
+        ".#|+|||+|| |  RH l  x#%.",
+        ".#w D|v D| |  RH l  x#%.",
+        ".#||||||||+|  RH     #%.",
+        ".ot______+ |   s E  y#%.",
+        ".#BB8S|ZW|          To%.",
+        ".#||||||||  AA       o%.",
+        ".#zz|D |Q+ |12Y_|T   #%.",
+        ".#|+||+|||+|n___|   h#%.",
+        ".#¤    dd  |F_J_|  ff#^.",
+        ".#@@       |5_J_| hff#%.",
+        ".#@@     h |O___|   h#%.",
+        ".#¤  yPPrrr|7436|y   #%.",
+        ".####o###o####o##oo*##%.",
+        "..................---..."
+      ],
+      "terrain": {
+        "#": "t_wall_p",
+        "_": "t_linoleum_gray",
+        "{": "t_railing_v",
+        ",": "t_floor_noroof",
+        "Y": "t_linoleum_gray",
+        "W": "t_linoleum_gray",
+        "Z": "t_linoleum_gray",
+        "Q": "t_null",
+        "K": "t_floor_noroof",
+        "G": "t_floor_noroof",
+        "w": "t_null",
+        "q": "t_floor_noroof"
+      },
+      "place_loot": [ { "item": "television", "x": 20, "y": 10 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "om_terrain": "bungalow01_roof",
+    "weight": 250,
+    "method": "json",
+    "object": {
+      "palettes": [ "roof_palette" ],
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "````````````````````````",
+        "````````````````````````",
+        "````````````````````````",
+        "````````````````````````",
+        "````````````````````````",
+        "````````````````````````",
+        "`-----------````````````",
+        "`3.........-````````````",
+        "`3.........-----------``",
+        "`3...................|``",
+        "`3...................|``",
+        "`3...................|``",
+        "`3...................|``",
+        "`3...................|``",
+        "`3................X..|``",
+        "`3...................|``",
+        "`3...................|``",
+        "`3.....N.............|``",
+        "`3...................5``",
+        "`3...................|``",
+        "`3...................|``",
+        "`3...................|``",
+        "`222222222222222222222``",
+        "````````````````````````"
+      ],
+      "terrain": { ".": "t_shingle_flat_roof", "`": "t_open_air" }
+    }
+  }
+]
diff --git a/data/json/mapgen/house/bungalow02.json b/data/json/mapgen/house/bungalow02.json
@@ -0,0 +1,106 @@
+[
+  {
+    "type": "mapgen",
+    "om_terrain": "bungalow02_1",
+    "weight": 250,
+    "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..............",
+        "--,------%%%%%...%%%%...",
+        "--#}}}}}}##o######oo##..",
+        "--#======|S88B|D|b   #..",
+        "--#=====U|t__B| +   C#..",
+        "--#=====U|||+||v|  @@o..",
+        "--#=====N|Z+ y|||  @@o..",
+        "--o=====q|W+   +     #..",
+        "--#======|||   |RR dd#..",
+        "--#?zz===+     ||||||#..",
+        "--####o###|||  |dd  T#..",
+        "--//!~jjj#721  +   @@o..",
+        "--//!~~~~#6_J  |   @@o..",
+        "--//!~~~~o4_5  |&   C#..",
+        "----~~~~G#F__  ||||||#..",
+        "----~~~~K#3JO  b|yaay#..",
+        "..//!~~GK#|||  y|T   #..",
+        "..//!~~~G#L$y       h#..",
+        "...%!~~~~o  (((    ffo..",
+        ".u.%!~~~~*  (x(s| hffo..",
+        "...%!!!!!o  (((y|   h#..",
+        "...%%%%%%#slHHHl|RR  #..",
+        "........^####oo#######..",
+        "........................"
+      ],
+      "terrain": {
+        "#": "t_wall_b",
+        "_": "t_linoleum_gray",
+        "~": "t_floor_noroof",
+        "!": "t_railing_v",
+        "}": "t_door_metal_locked",
+        ",": "t_gates_mech_control",
+        "=": "t_concrete",
+        "(": "t_carpet_red",
+        "j": "t_floor_noroof",
+        "?": "t_concrete",
+        "x": "t_carpet_red",
+        "K": "t_floor_noroof",
+        "G": "t_floor_noroof",
+        "q": "t_concrete",
+        "N": "t_concrete",
+        "U": "t_concrete",
+        "W": "t_linoleum_gray",
+        "Z": "t_linoleum_gray",
+        "z": "t_concrete",
+        "/": "t_dirtmound"
+      },
+      "furniture": { "$": "f_rack", "&": "f_treadmill", "?": "f_exercise", "/": "f_region_flower", "¤": "f_table" },
+      "items": { "$": { "item": "clothing_outdoor_shoes", "chance": 50 }, "¤": { "item": "nightstand", "chance": 30 } },
+      "place_loot": [ { "item": "television", "x": 13, "y": 19 } ],
+      "place_vehicles": [ { "vehicle": "car", "x": 5, "y": 6, "chance": 20, "rotation": 90 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "om_terrain": "bungalow02_roof",
+    "weight": 250,
+    "method": "json",
+    "object": {
+      "palettes": [ "roof_palette" ],
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "                        ",
+        "  --------------------  ",
+        "  3..................|  ",
+        "  3..................|  ",
+        "  3..................|  ",
+        "  3..........=.......|  ",
+        "  3..................|  ",
+        "  3..................|  ",
+        "  3..................|  ",
+        "  33333333...........|  ",
+        "         3...........|  ",
+        "         3........X..|  ",
+        "         3...........|  ",
+        "         3...........|  ",
+        "         3........~~.|  ",
+        "         3...........|  ",
+        "         3...........|  ",
+        "         3...........|  ",
+        "         3...........|  ",
+        "         3...........|  ",
+        "         3...........|  ",
+        "         5222222222222  ",
+        "                        "
+      ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
+  }
+]
diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
@@ -47,6 +47,24 @@
       { "point": [ 1, 0, 2 ], "overmap": "2StoryModern04_roof_2_north" }
     ]
   },
+  {
+    "type": "city_building",
+    "id": "bungalow01",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "bungalow01_1_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "bungalow01_roof_north" }
+    ]
+  },
+  {
+    "type": "city_building",
+    "id": "bungalow02",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "bungalow02_1_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "bungalow02_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
@@ -50,6 +50,8 @@
       "2StoryModern04_1_2",
       "2StoryModern04_2_1",
       "2StoryModern04_2_2",
+      "bungalow01_1",
+      "bungalow02_1",
       "duplex",
       "garden_house_1_floor_1",
       "garden_house_1_floor_2",
@@ -226,6 +228,8 @@
       "2StoryModern03_roof",
       "2StoryModern04_roof_1",
       "2StoryModern04_roof_2",
+      "bungalow01_roof",
+      "bungalow02_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
@@ -581,6 +581,8 @@
         "2storyModern02": 50,
         "2StoryModern03": 50,
         "2StoryModern04": 50,
+        "bungalow01": 50,
+        "bungalow02": 50,
         "house_w_1": 50,
         "house_two_story_basement": 50,
         "house_crack1": 5,