Skip to content

Commit

Permalink
Fancy pool house (#71927)
Browse files Browse the repository at this point in the history
* Add base pool house

Adds basis of house, adds to region settings

* Shower area thing

* Finalize house

* Change entrance

* Fix roof

* spawns
  • Loading branch information
Milopetilo authored Feb 24, 2024
1 parent fc26b93 commit ce88e13
Show file tree
Hide file tree
Showing 4 changed files with 105 additions and 1 deletion.
88 changes: 88 additions & 0 deletions data/json/mapgen/house/urban_22_house_pool.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "urban_22_1", "urban_22_2" ] ],
"weight": 250,
"object": {
"fill_ter": "t_floor",
"rows": [
".....................p!---!.....................",
"..........[...........!---!...[.................",
"....%%................!---!...%%%%..............",
"..###oo#######oo####oo##*######oo###o#######..[.",
"..#R VMMVT13 hhhhh y:÷````:yn6J6J +~~~o%...",
"..#R fffff :`````: |8St#....",
"..#R fffff :`````¶ ||||#....",
"..#R hhhhh :`````:7 #....",
"..#R ETE y:`````:1352OF4Y HHHT#....",
"[.#||||+|||#:::::::::¶##`````#:::::::# #.[..",
"..#BBb| RRR#`````````````````````````¶ ll #....",
"..o~~~+ #`````````````````````````: #....",
"..#8St| r:``---------------------``: xxxy#....",
".^#|||| hr:``-,,,,,,,,,,,,,,,,,,,-``#+#####....",
".%#¤ r:₸`-,,,,,,,,,,,,,,,,,,,-````%.^._....",
".%o@@ y#₸`-,,,,,,,,,,,,,,,,,,,-````%..._....",
".%o@@ D#₸`-,,,,,,,,,,,,,,,,,,,-``#+#####....",
"..#¤ D#``-,,,,,,,,,,,,,,,,,,,-``#~~~~Q#....",
"..#####oo###``-,,,,,,,,,,,,,,,,,,,-``o~~~~9#....",
".._%......[.``-,,,,,,,,,,,,,,,,,,,-``#~~~~9#....",
".._..!%..!%.``---------------------``#ZWg~Q#..[.",
".._.%.!X.%..`````````````````````````#######....",
".._.[....!..`````````````````````````_..........",
"..____________________________________.........."
],
"palettes": [ "domestic_general_and_variant_palette", "standard_domestic_lino_bathroom", "standard_domestic_landscaping_palette" ],
"terrain": {
"b": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
"g": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
"Z": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
"W": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
"p": "t_region_groundcover_urban",
"_": "t_region_groundcover_urban",
"₸": "t_concrete",
"÷": "t_concrete",
",": "t_water_pool"
},
"furniture": { "_": "f_hedge_tall" },
"place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 13, "y": 0 } ],
"place_loot": [ { "item": "television", "x": 40, "y": 12, "chance": 100 } ],
"place_monster": [ { "group": "GROUP_MAPGEN_POOL", "x": 20, "y": 13 }, { "group": "GROUP_MAPGEN_POOL", "x": 29, "y": 18 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "urban_22_1_roof", "urban_22_2_roof" ] ],
"object": {
"fill_ter": "t_flat_roof",
"rows": [
" ",
" ",
" ",
" ------------------------------------------ ",
" -....................- -.............- ",
" -....................- -.............- ",
" -....................- -.............- ",
" -....................- -.............- ",
" -....................- -....&........- ",
" -........------------- ---------.....- ",
" -........- -.....- ",
" -........- -.....- ",
" -........- -..NX.- ",
" 5........- ----5-- ",
" -.....A..- ",
" -........- ",
" -........- ------- ",
" -........- -.....- ",
" ---------- -...M.- ",
" -.....- ",
" -.....- ",
" ------- ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
}
]
11 changes: 11 additions & 0 deletions data/json/overmap/multitile_city_buildings.json
Original file line number Diff line number Diff line change
Expand Up @@ -1075,6 +1075,17 @@
{ "point": [ 1, 0, 2 ], "overmap": "urban_20_roof_2_north" }
]
},
{
"type": "city_building",
"id": "urban_22_house_pool",
"locations": [ "land" ],
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "urban_22_1_north" },
{ "point": [ 1, 0, 0 ], "overmap": "urban_22_2_north" },
{ "point": [ 0, 0, 1 ], "overmap": "urban_22_1_roof_north" },
{ "point": [ 1, 0, 1 ], "overmap": "urban_22_2_roof_north" }
]
},
{
"type": "city_building",
"id": "house_08",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,11 @@
"urban_17_1",
"urban_17_2",
"urban_18_3",
"urban_18_4"
"urban_18_4",
"urban_22_1",
"urban_22_2",
"urban_22_1_roof",
"urban_22_2_roof"
],
"copy-from": "generic_city_house",
"see_cost": 10
Expand Down
1 change: 1 addition & 0 deletions data/json/regional_map_settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -1022,6 +1022,7 @@
"urban_17_house_ranch": 50,
"urban_18_victorian": 50,
"urban_20_house": 50,
"urban_22_house_pool": 50,
"emptyresidentiallot": 20,
"house_vacant": 7,
"house_vacant1": 7,
Expand Down

0 comments on commit ce88e13

Please sign in to comment.