Skip to content

Commit

Permalink
add bungalows 21 and 22 (CleverRaven#64214)
Browse files Browse the repository at this point in the history 
* add bungalows 21 and 22

* Update data/json/mapgen/house/bungalow21.json

Co-authored-by: Bence <[email protected]>

* Update data/json/mapgen/house/bungalow21.json

Co-authored-by: Bence <[email protected]>

* Update data/json/mapgen/house/bungalow21.json

Co-authored-by: Bence <[email protected]>

* window

* re-added mechanical control

* Update data/json/mapgen/house/bungalow21.json

Co-authored-by: Bence <[email protected]>

---------

Co-authored-by: Bence <[email protected]>
  • Loading branch information
@LilShiningMan @LovamKicsiGazsii
LilShiningMan and LovamKicsiGazsii authored Mar 16, 2023
1 parent 53f9146 commit a7dbd93
Show file tree
Hide file tree
Showing 5 changed files with 235 additions and 0 deletions.
98 changes: 98 additions & 0 deletions data/json/mapgen/house/bungalow21.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
[
{
"type": "mapgen",
"om_terrain": "bungalow21",
"weight": 250,
"method": "json",
"object": {
"palettes": [ "standard_domestic_palette", "standard_domestic_lino_bathroom", "standard_domestic_landscaping_palette" ],
"fill_ter": "t_floor",
"rows": [
".[...........p._______..",
".........??.---_______..",
"......[..??.---_______/.",
"............--#]]]]]]]#.",
"...%###oo###o*#,,,,,,,#.",
"...%#@@ dd|L |,,,,,,,#.",
"...%o≠ |$ |,,,,,,,#.",
"....o + +,,,,,,,o.",
".[..#@@ dd| |U,,,,,,#.",
"....#||||||| |q,,,,,,#.",
"....#@@ b| |N,,,,zz#.",
"....o@@ + |||||||##.",
"...%#¤ dd| +00000B#^.",
".u.%#|+||||| |88St0Bo%.",
"...%#D |Z W| |||||||#%.",
".---##|||+|| 431JO5F#%.",
".-===#y T o..",
".-===* o..",
".`===o lll |6 h #..",
".`==G# E R|6 ff #%.",
".`==K#sHHHsy R|y hffh#%.",
".`==G#####oo#####oo###%.",
".`````^..%%%%...%%%%....",
"........................"
],
"terrain": {
"0": "t_linoleum_gray",
"=": "t_floor_noroof",
"?": "t_shrub_lilac",
"`": "t_railing_v",
"]": "t_door_metal_locked",
"/": "t_gates_mech_control_lab",
",": "t_thconc_floor",
"K": "t_floor_noroof",
"G": "t_floor_noroof",
"z": "t_thconc_floor",
"N": "t_thconc_floor",
"q": "t_thconc_floor",
"U": "t_thconc_floor"
},
"furniture": { "$": "f_table" },
"items": { "$": { "item": "table_foyer", "chance": 50, "repeat": [ 2, 3 ] } },
"place_loot": [
{ "group": "toy_store", "x": [ 5, 10 ], "y": [ 6, 7 ], "chance": 50, "repeat": [ 4, 6 ] },
{ "item": "backpack", "x": 7, "y": 5, "chance": 60 },
{ "item": "talking_doll", "x": 5, "y": 8, "chance": 60 }
],
"place_vehicles": [ { "vehicle": "car", "x": 19, "y": 7, "chance": 30, "rotation": 90 } ]
}
},
{
"type": "mapgen",
"om_terrain": "bungalow21_roof",
"weight": 250,
"method": "json",
"object": {
"palettes": [ "roof_palette" ],
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" ",
" ",
" --------- ",
" -----------.......- ",
" -.................- ",
" -.................- ",
" -.................- ",
" -.................- ",
" -.................- ",
" -.................- ",
" -................-- ",
" -................5 ",
" -................- ",
" -................- ",
" --..N............- ",
" -...............- ",
" -...............- ",
" -...............- ",
" -...............- ",
" -...............- ",
" -5--------------- ",
" ",
" "
],
"terrain": { ".": "t_shingle_flat_roof" }
}
}
]
113 changes: 113 additions & 0 deletions data/json/mapgen/house/bungalow22.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
[
{
"type": "mapgen",
"om_terrain": "bungalow22",
"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": [
"...............!```.....",
"....#oo#oo##...!```.....",
"...%#yHHHHs#!!!!```.....",
"...%oy so```````.....",
"...%#x ll H#```````%%%..",
".%%%#x ll H#o*o####o###.",
".)))#x H#L i#@@/rrr#.",
".)~~o E T#( i#¤///&/#.",
".)~~# V##+##//////o.",
".)~₸#a V#? +////dd#.",
".)~~# A ########.",
".)~₸o 0 RRR +//II/d#.",
".)~~######## #//////#.",
".)~₸#U+ zz #D//@@/o.",
".)~~#q+ b #d//@@¤#.",
".)~~###,,####,,########^",
".)~~~#=,,,423,,66#B,88#.",
".)~~N#=,h,,,,,,,,#B,,So.",
".`~~No,,ffh,JJJ,,+,,,t#.",
".`~~~*,hff,,,,,,,###+##.",
".))))#=,h,,F5JOJ,1#Z,W#.",
"....^###o###o###o######.",
"..u.....................",
"........................"
],
"terrain": {
"/": "t_carpet_purple",
"@": "t_carpet_purple",
"r": "t_carpet_purple",
"&": "t_carpet_purple",
"¤": "t_carpet_purple",
"d": "t_carpet_purple",
"D": "t_carpet_purple",
"I": "t_carpet_purple",
",": "t_linoleum_gray",
"W": "t_linoleum_gray",
"Z": "t_linoleum_gray",
"h": "t_linoleum_gray",
"f": "t_linoleum_gray",
"~": "t_floor_noroof",
")": "t_railing",
"₸": "t_floor_noroof",
"N": "t_floor_noroof",
"=": "t_linoleum_gray"
},
"furniture": { "=": [ "f_indoor_plant", "f_indoor_plant_y" ], "0": "f_piano", "(": "f_rack", "?": "f_table" },
"items": {
"(": { "item": "clothing_outdoor_shoes", "chance": 50, "repeat": [ 1, 2 ] },
"?": { "item": "table_foyer", "chance": 60 }
},
"vehicles": { "&": { "vehicle": "swivel_chair", "chance": 100, "status": 1 } },
"place_loot": [
{ "item": "2x4", "x": 5, "y": 10, "chance": 80, "repeat": [ 2, 3 ] },
{ "item": "hatchet", "x": 4, "y": 18, "chance": 40 },
{ "item": "log", "x": 4, "y": 16, "chance": 60, "repeat": [ 1, 2 ] },
{ "item": "television", "x": 5, "y": 5, "chance": 100 },
{ "item": "laptop", "x": 20, "y": 6, "chance": 50 }
]
}
},
{
"type": "mapgen",
"om_terrain": "bungalow22_roof",
"weight": 250,
"method": "json",
"object": {
"palettes": [ "roof_palette" ],
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" -------- ",
" -......- ",
" -......- ",
" -......- ",
" -......------------ ",
" -.................- ",
" -.................- ",
" -.................- ",
" -~................- ",
" -.................- ",
" -.................- ",
" -.................- ",
" -......N..........- ",
" -.................- ",
" --................5 ",
" -................- ",
" -................- ",
" -................- ",
" -................- ",
" -................- ",
" 5----------------- ",
" ",
" "
],
"terrain": { ".": "t_shingle_flat_roof" }
}
}
]
18 changes: 18 additions & 0 deletions data/json/overmap/multitile_city_buildings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,24 @@
{ "point": [ 0, 0, 1 ], "overmap": "bungalow20_roof_north" }
]
},
{
"type": "city_building",
"id": "bungalow21",
"locations": [ "land" ],
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "bungalow21_north" },
{ "point": [ 0, 0, 1 ], "overmap": "bungalow21_roof_north" }
]
},
{
"type": "city_building",
"id": "bungalow22",
"locations": [ "land" ],
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "bungalow22_north" },
{ "point": [ 0, 0, 1 ], "overmap": "bungalow22_roof_north" }
]
},
{
"type": "city_building",
"id": "urban_1_house",
Expand Down
4 changes: 4 additions & 0 deletions data/json/overmap/overmap_terrain/overmap_terrain_residential.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@
"bungalow18",
"bungalow19",
"bungalow20",
"bungalow21",
"bungalow22",
"duplex",
"garden_house_1_floor_1",
"garden_house_1_floor_2",
Expand Down Expand Up @@ -364,6 +366,8 @@
"bungalow18_roof",
"bungalow19_roof",
"bungalow20_roof",
"bungalow21_roof",
"bungalow22_roof",
"duplex_roof",
"garden_house_1_roof",
"house_01_roof",
Expand Down
2 changes: 2 additions & 0 deletions data/json/regional_map_settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,8 @@
"bungalow18": 50,
"bungalow19": 50,
"bungalow20": 50,
"bungalow21": 50,
"bungalow22": 50,
"house_w_1": 50,
"house_two_story_basement": 50,
"multi_unit_two_story_basement": 40,
Expand Down

0 comments on commit a7dbd93

Please sign in to comment.