Skip to content

Commit

Permalink
(done) House basements 1 (house04, 05, 06, 07, quiverfull, and librar…
Browse files Browse the repository at this point in the history 
…y) (#36707)

* Start adding basement 04

* fill basement room with more chunks

* house04 basement

* expand coverage of new basements

* complete the basement additions on all the 22x22 maps

* remove no_rotate from basement

I'm not sure why it would be there in the first place

* Add _north suffix now that basements can rotate

* Update overmap_terrain_residential.json

* tweak rotation settings for procgen terrain

* adjustments to reduce monster spawn rate

* lint
  • Loading branch information
@I-am-Erk @ZhilkinSerg
I-am-Erk authored and ZhilkinSerg committed Jan 10, 2020
1 parent 900cc9b commit 57ca262
Show file tree
Hide file tree
Showing 12 changed files with 527 additions and 62 deletions.
184 changes: 184 additions & 0 deletions data/json/mapgen/basement/basements.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_04_basement",
"//": "basic basement with a utility room, 2-3 bedrooms, possibly an office, and a large tv/rec room.",
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
"^^^^^^^^^^^^^^^^^^^^^^^^",
"^######################^",
"^#||||||||||||||||||||#^",
"^#|9..|.?..CCCNNNUUUU|#^",
"^#|???+.....?.......U|#^",
"^#|tCS|........?....U|#^",
"^#||||||...CCCCCCUUUU|#^",
"^#| ||+|####|||||||#^",
"^#| | << !! |#^",
"^#| ! + |#^",
"^#| | ! |#^",
"^#|||||| |#^",
"^#| | |#^",
"^#| + |#^",
"^#| ! | ! |#^",
"^#| | |#^",
"^#|||||| |#^",
"^#| | !! |#^",
"^#| ! + !! |#^",
"^#| | |#^",
"^#| | !! |#^",
"^#||||||||||||||||||||#^",
"^######################^",
"^^^^^^^^^^^^^^^^^^^^^^^^"
],
"palettes": [ "standard_domestic_palette", "standard_domestic_basement_palette" ],
"place_nested": [
{ "chunks": [ [ "utility_3x3_N", 10 ], [ "utility_3x3_S", 5 ] ], "x": 7, "y": 3 },
{
"chunks": [
[ "bedroom_4x4_adult_1_W", 5 ],
[ "bedroom_4x4_adult_3_S", 5 ],
[ "home_office_4x4_N", 10 ],
[ "home_office_4x4_S", 10 ]
],
"x": 3,
"y": 7
},
{
"chunks": [
[ "bedroom_4x4_adult_1_N", 5 ],
[ "bedroom_4x4_adult_1_W", 10 ],
[ "bedroom_4x4_adult_1_S", 5 ],
[ "bedroom_4x4_adult_3_S", 10 ],
[ "bedroom_4x4_adult_3_N", 10 ]
],
"x": 3,
"y": 12
},
{
"chunks": [
[ "bedroom_4x4_adult_1_N", 5 ],
[ "bedroom_4x4_adult_1_W", 10 ],
[ "bedroom_4x4_adult_1_S", 5 ],
[ "bedroom_4x4_adult_3_S", 10 ],
[ "bedroom_4x4_adult_3_N", 10 ]
],
"x": 3,
"y": 17
},
{ "chunks": [ [ "recroom_12x12", 5 ], [ "tvroom_12x12", 15 ], [ "workoutroom_12x12", 5 ] ], "x": 9, "y": 9 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_05_basement",
"//": "basic basement with a utility room, 2-3 bedrooms, possibly an office, and a large tv/rec room.",
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
"^^^^^^^^^^^^^^^^^^^^^^^^",
"^######################^",
"^#||||||||||||||||||||#^",
"^#|9..|....CCCNNNUUUU|#^",
"^#|???+...?...?.....U|#^",
"^#|tCS|....?...?....U|#^",
"^#||||||...CCCCCCUUUU|#^",
"^#| ||+|####|||||||#^",
"^#| | |#^",
"^#| + |#^",
"^#| |< |#^",
"^#|||||| !!!!! |#^",
"^#| | !!!!! |#^",
"^#| + !!!!! |#^",
"^#| ! | !!!!! |#^",
"^#| | !!!!! |#^",
"^#|||||| |#^",
"^#| | |#^",
"^#| + |#^",
"^#| | |#^",
"^#| | |#^",
"^#||||||||||||||||||||#^",
"^######################^",
"^^^^^^^^^^^^^^^^^^^^^^^^"
],
"palettes": [ "standard_domestic_palette", "standard_domestic_basement_palette" ],
"place_nested": [
{ "chunks": [ [ "utility_3x3_N", 10 ], [ "utility_3x3_S", 5 ] ], "x": 7, "y": 3 },
{
"chunks": [
[ "bedroom_4x4_adult_1_W", 5 ],
[ "bedroom_4x4_adult_3_S", 5 ],
[ "home_office_4x4_N", 10 ],
[ "home_office_4x4_S", 10 ]
],
"x": 3,
"y": 7
},
{
"chunks": [
[ "bedroom_4x4_adult_1_N", 5 ],
[ "bedroom_4x4_adult_1_W", 10 ],
[ "bedroom_4x4_adult_1_S", 5 ],
[ "bedroom_4x4_adult_3_S", 10 ],
[ "bedroom_4x4_adult_3_N", 10 ]
],
"x": 3,
"y": 12
},
{
"chunks": [
[ "bedroom_4x4_adult_1_N", 5 ],
[ "bedroom_4x4_adult_1_W", 10 ],
[ "bedroom_4x4_adult_1_S", 5 ],
[ "bedroom_4x4_adult_3_S", 10 ],
[ "bedroom_4x4_adult_3_N", 10 ]
],
"x": 3,
"y": 17
},
{ "chunks": [ [ "recroom_12x12", 5 ], [ "tvroom_12x12", 15 ], [ "workoutroom_12x12", 5 ] ], "x": 9, "y": 9 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_05ab_basement",
"//": "mostly empty basement.",
"object": {
"fill_ter": "t_thconc_floor",
"rows": [
"^^^^^^^^^^^^^^^^^^^^^^^^",
"^######################^",
"^#||||||||||||||||||||#^",
"^#|9..|..............|#^",
"^#|...+..............|#^",
"^#|tCS|..............|#^",
"^#||||||.............|#^",
"^#| ||+|####|||||||#^",
"^#| | |#^",
"^#| + |#^",
"^#| |< |#^",
"^#|||||| ! |#^",
"^#| | |#^",
"^#| + |#^",
"^#| | ! |#^",
"^#| | |#^",
"^#|||||| ! |#^",
"^#| | |#^",
"^#| + |#^",
"^#| | |#^",
"^#| | !!!!!! |#^",
"^#||||||||||||||||||||#^",
"^######################^",
"^^^^^^^^^^^^^^^^^^^^^^^^"
],
"palettes": [ "standard_domestic_palette", "standard_domestic_basement_palette" ],
"items": { " ": { "item": "trash", "chance": 2 } },
"place_nested": [ { "chunks": [ [ "null", 15 ], [ "utility_3x3_N", 10 ], [ "utility_3x3_S", 5 ] ], "x": 7, "y": 3 } ]
}
}
]
1 change: 1 addition & 0 deletions data/json/mapgen/house/house04.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"type": "mapgen",
"method": "json",
"om_terrain": "house_04_roof",
"//": "roof for house 04, 06, 07",
"object": {
"fill_ter": "t_shingle_flat_roof",
"rows": [
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/house/house05.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
".# A | y| hh 2#.",
".# NNN + + ff 1#.",
".#|||||||| R|A hh 5o.",
".#HHHHHH | R|6 Oo.",
".#HHHHHH>| R|6 Oo.",
".#H ll R|6 F#.",
".#H l sE R||||+|||#.",
".os E s#.",
".oT so.",
".#y y yT s#.",
".#||||+||||+|||+|+||||#.",
".# b|> q|vU| ET#.",
".# b|q q|vU| ET#.",
".#d |||||||| R#.",
".#@@ AI|@@ #.",
".#@@ I|@@ D#.",
Expand Down
16 changes: 8 additions & 8 deletions data/json/mapgen/house/house06.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
".# | | 6 6 #.",
".#RRRR | | #^",
".#||||||+| ||||+|||#.",
".# 1#.",
".#HHHHHHH ff AC3 5o.",
".oH hffh 72 Oo.",
".oH lll h ff AC4 F#.",
".#H h C#.",
".#y xxx yo.",
".# >> 1#.",
".#HHHHHHH AC3 5o.",
".oH ff 72 Oo.",
".oH lll hffh AC4 F#.",
".#H h ff C#.",
".#y xxx h yo.",
".#|||||| Yo.",
".#yHHT + sE ||#.",
".# |||||||||||| +>#.",
".#yHHT + sE #.",
".# |||||||||||| R#.",
".#d |t S|DyR|+||#.",
".o@@ + 8| TE#.",
".o@@ R|BB S| #.",
Expand Down
16 changes: 8 additions & 8 deletions data/json/mapgen/house/house07.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
".#a ffh | 6 A 6 #.",
".#R hff | 6 6 #.",
".#R h | #^",
".#R |+||||||#.",
".# ET| 1#.",
".#y H R| AJ2 5o.",
".os Hr R| J3 Oo.",
".os HrE R| AJ4 F#.",
".#R |||+||||||#.",
".# >>| 1#.",
".#y H | AJ2 5o.",
".os Hr T| J3 Oo.",
".os HrE E| AJ4 F#.",
".# H + 7#.",
".# E l y||| h o.",
".#|||||| +>|h o.",
".#t + |g|rrr Y#.",
".# E l E| h o.",
".#|||||| T|h o.",
".#t + RR|rrr Y#.",
".# |||+||||||||+||#.",
".#BB b|y ssdII Ey#.",
".oBB + h #.",
Expand Down
20 changes: 10 additions & 10 deletions data/json/mapgen/house/house_library.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
"rows": [
"......---......p........",
".##oo##*##oo###########.",
".#y h L y|RRRRRvyR#.",
".# |R Ho.",
".#r ff |R Ho.",
".#rh ffh | EE r#.",
".#r hff a|a ssT r#^",
".o ffh | EE r#.",
".oc h |R Ho.",
".#||||||| |||R Ho.",
".#y666 |>|RRRR R#.",
".#7 | |||||+|||#.",
".#y h L y|RRRRvyR#.",
".# |R Ho.",
".#r ff |R Ho.",
".#rh ffh | EE r#.",
".#r hff a|a ssT r#^",
".o ffh | EE r#.",
".oc h |>>|R Ho.",
".#||||||| ||||R Ho.",
".#y666 |RRR RRR#.",
".#7 ||||+|||#.",
".#4 JA T#.",
".#O J A HHHHHs E#.",
".o1 JA H ll so.",
Expand Down
10 changes: 5 additions & 5 deletions data/json/mapgen/house/house_quiverfull.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"%or H|8 8| hffh 7#.",
"%or ||+||| hffh F#^",
"%or E|R y| h F#.",
"%# |R + O#.",
".# + |J 5o.",
".#HHHsHHH| R|n 4o.",
".#|||||||| R|JJ 123#.",
"%# + + O#.",
".# |||R R|J 5o.",
".#HHsHH|< R|n 4o.",
".#|||||| |R R|JJ 123#.",
".#q+ ||||+|||#.",
".#>+ + d#.",
".#q+ + d#.",
".#||+|||||||+||D @@o.",
".#d d@d@d@ T|I @@o.",
".#@@ @ @ @ |Ih d#.",
Expand Down
Loading

0 comments on commit 57ca262

Please sign in to comment.