feat(content): House Nested Chunk Addition, Cleanup: bungalow 28, 29,…

… house_coop1 (cataclysmbnteam#4870) * feat(content): House Nested Chunk Addition, Cleanup: bungalow 28, 29, house_coop1 Adding nested chunk spawns for houses, including front yard, backyard, roof solar, roof item; remove furniture entries and replace with palette symbols where appropriate; clean up house spawn errors, and generally clean up the file * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Relgar · Jun 24, 2024 · 3930cb4 · 3930cb4
1 parent a304f0b
commit 3930cb4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/data/json/mapgen/house/bungalow28.json b/data/json/mapgen/house/bungalow28.json
@@ -86,7 +86,7 @@
         "..#    P#---------_____.",
         "..###+###---------_____.",
         ".%#dd bD#-##ooo##%_____.",
-        ".%o     #-*,,,h&#%_____.",
+        ".%o    ɸ#-*,,,h&#%_____.",
         ".%o @@  #o#,hff,##_____.",
         ".%#¤@@¤ + #,,ffh######..",
         ".%#||||||  ,,,h,621/5o..",
@@ -156,7 +156,11 @@
         "                        ",
         "                        "
       ],
-      "terrain": { ".": "t_shingle_flat_roof" }
+      "terrain": { ".": "t_shingle_flat_roof" },
+      "place_nested": [
+        { "chunks": [ "NC_res_roof_solar_4X4" ], "x": 15, "y": 13 },
+        { "chunks": [ "NC_res_roof_chunk_3X3" ], "x": 2, "y": [ 3, 8 ] }
+      ]
     }
   }
 ]
diff --git a/data/json/mapgen/house/bungalow29.json b/data/json/mapgen/house/bungalow29.json
@@ -161,7 +161,7 @@
         "_____!#?L| |ɸ+  ¤#&&.~..",
         "..----#++| ||||+|#-.....",
         "...---*    hffh00*-.....",
-        "....--o$   00000Y#^.....",
+        "....--oƏ   00000Y#^.....",
         ".....!#H  R|0000F#......",
         ".....!oH  x|60005o......",
         ".....!#H  y|32JOJ#...[..",
@@ -182,12 +182,11 @@
         "f": "t_linoleum_gray",
         "0": "t_linoleum_gray"
       },
-      "furniture": { "?": "f_rack", "$": "f_table" },
+      "furniture": { "?": "f_rack" },
       "items": {
         "&": { "item": "hydro", "chance": 45 },
         "~": { "item": "tools_earthworking", "chance": 30 },
-        "?": { "item": "clothing_outdoor_shoes", "chance": 60, "repeat": [ 1, 3 ] },
-        "$": { "item": "table_foyer", "chance": 50 }
+        "?": { "item": "clothing_outdoor_shoes", "chance": 60, "repeat": [ 1, 3 ] }
       },
       "place_loot": [ { "item": "television", "x": 10, "y": 15 }, { "item": "tarp", "x": 12, "y": 18 } ],
       "place_vehicles": [

diff --git a/data/json/mapgen/house/house_coop01.json b/data/json/mapgen/house/house_coop01.json
@@ -111,23 +111,23 @@
       "fill_ter": "t_floor",
       "rows": [
         "........p!----!.........",
-        ".[.......!----!.....X...",
-        ".........!----!.......[.",
-        "......jjj------jjj......",
+        ".[.......!----!.........",
+        ".........!----!.........",
+        "......jjj------.........",
         "..##oo####o*o#####oo##..",
-        "..#@@¤ D|L  l H|  yz #..",
-        "..o@@   |$  l H|@   do..",
+        "..#@@¤ D|L  l H|  yɸ #..",
+        "..o@@   |Ə  l H|@   do..",
         "..o     |V    H|@   do..",
         "..#ddy  |y HHHs|¤   D#..",
         "..#||||+|| ||||||+|||#..",
-        ".^#>+        $$ __Y66#^.",
+        ".^#>+        ƏƏ __Y66#^.",
         "..#|||+|R       _____#..",
         "..#888_|R   h   3____#..",
         "..#____|R   ff  2___Oo..",
         "..#tSBB|y  hffh 1F5JJ#..",
         "..##o#####*#oo####oo##..",
         ".........---............",
-        "......u..---............",
+        ".........---............",
         "..............{{{{{)))).",
         "............../````)?,).",
         "..[...........{````~,,).",
@@ -148,13 +148,12 @@
         "Y": "t_linoleum_gray",
         "!": "t_dirtmound"
       },
-      "furniture": { "$": "f_table" },
-      "items": { "$": { "item": "table_foyer", "chance": 100 } },
       "monster": { "?": { "monster": "mon_chicken" } },
       "place_loot": [
         { "item": "straw_pile", "x": [ 20, 21 ], "y": [ 19, 21 ], "chance": 75, "repeat": [ 3, 5 ] },
         { "item": "birdfood", "x": [ 15, 18 ], "y": [ 19, 21 ], "chance": 50, "repeat": [ 2, 3 ] }
-      ]
+      ],
+      "place_nested": [ { "chunks": [ "NC_res_frontlawn_3X3" ], "x": 19, "y": 1 }, { "chunks": [ "NC_res_backyard_3X3" ], "x": 5, "y": 17 } ]
     }
   },
   {
@@ -191,7 +190,11 @@
         "                   .... ",
         "                        "
       ],
-      "terrain": { ".": "t_shingle_flat_roof" }
+      "terrain": { ".": "t_shingle_flat_roof" },
+      "place_nested": [
+        { "chunks": [ "NC_res_roof_solar_4X4" ], "x": 16, "y": 7 },
+        { "chunks": [ "NC_res_roof_chunk_3X3" ], "x": [ 3, 12 ], "y": [ 5, 8 ] }
+      ]
     }
   }
 ]