Skip to content

Commit

Permalink
add more basement variety (#39528)
Browse files Browse the repository at this point in the history
  • Loading branch information
@curstwist
curstwist authored Apr 14, 2020
1 parent a95b583 commit de43441
Show file tree
Hide file tree
Showing 5 changed files with 2,148 additions and 26 deletions.
18 changes: 15 additions & 3 deletions data/json/mapgen/house/house_detatched7.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@
" ",
" |||| ",
" |||||||||Fg||||||| ",
" |...........WJJZU| ",
" |1..........WJJZU| ",
" |................| ",
" |.......<........| ",
" |................| ",
" |................| ",
" |................| ",
" ||||......|||||||| ",
" ||||2.....|||||||| ",
" |......| ",
" |......| ",
" |......| ",
Expand All @@ -140,7 +140,19 @@
" ",
" "
],
"palettes": [ "basement_empty" ]
"palettes": [ "basement_empty" ],
"nested": {
"1": {
"chunks": [
[ "null", 70 ],
[ "room_6x6_guns_E", 10 ],
[ "room_6x6_office_E", 40 ],
[ "room_6x6_brewer_E", 20 ],
[ "room_6x6_junk_E", 50 ]
]
},
"2": { "chunks": [ [ "null", 80 ], [ "home_office_4x4_N", 20 ], [ "home_office_4x4_S", 20 ] ] }
}
}
}
]
58 changes: 51 additions & 7 deletions data/json/mapgen/house/house_garage6.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,19 +127,19 @@
" ",
" ",
" |||||||| ||||||||| ",
" |2.....| |3......| ",
" |......| |.......| ",
" |......| |.......| ",
" |......| |.......| ",
" |......| |.......| ",
" |......| |.......| ",
" |......| |.......| ",
" |.....Z| |F......| ",
" |.....J| |.......| ",
" |.....W| |g......| ",
" |..A...| |.......| ",
" |.....Z| |.......| ",
" |F....J| |.......| ",
" |.....W| |.......| ",
" |..A..g| |.......| ",
" |......|||||.......| ",
" |..................| ",
" |......%.<.%.......| ",
" |1.....%.<.%.4.....| ",
" |......%%%%%.......| ",
" |.......zz.z.......| ",
" |..........z.......| ",
Expand All @@ -149,7 +149,51 @@
" ",
" "
],
"palettes": [ "basement_empty" ]
"palettes": [ "basement_empty" ],
"nested": {
"1": {
"chunks": [
[ "null", 70 ],
[ "room_6x6_guns_N", 10 ],
[ "room_6x6_guns_E", 10 ],
[ "room_6x6_office_E", 40 ],
[ "room_6x6_brewer_E", 20 ],
[ "room_6x6_brewer_N", 20 ],
[ "room_6x6_junk", 50 ]
]
},
"2": {
"chunks": [
[ "null", 70 ],
[ "room_6x6_woodworker", 10 ],
[ "room_6x6_guns_S", 5 ],
[ "room_6x6_brewer_S", 10 ],
[ "room_6x6_bike", 20 ]
]
},
"3": { "chunks": [ [ "null", 95 ], [ "7x7_tent_indoors", 5 ], [ "room_7x7_recroom_S", 20 ] ] },
"4": {
"chunks": [
[ "null", 80 ],
[ "5x5_holdout_N", 2 ],
[ "5x5_holdout_W", 2 ],
[ "5x5_gym_N", 20 ],
[ "5x5_gym_S", 20 ],
[ "5x5_gym_E", 20 ],
[ "5x5_gym_W", 20 ],
[ "livingroom_5x5_S_1", 30 ],
[ "livingroom_5x5_E_1", 30 ],
[ "livingroom_5x5_N_1", 30 ],
[ "livingroom_5x5_W_1", 30 ],
[ "livingroom_5x5_S_2", 30 ],
[ "livingroom_5x5_E_2", 30 ],
[ "livingroom_5x5_N_2", 30 ],
[ "livingroom_5x5_W_2", 30 ],
[ "home_office_4x4_N", 20 ],
[ "home_office_4x4_S", 20 ]
]
}
}
}
}
]
40 changes: 31 additions & 9 deletions data/json/mapgen/house/house_gardener.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,17 @@
" ",
" ",
" ||||||| ",
" |.....| ",
" |2....| ",
" |.....||||||||||||||| ",
" |................F.g| ",
" |.......g..1........| ",
" |...................| ",
" |Z..................| ",
" |J..................| ",
" |JW.JJJ.............| ",
" |...................| ",
" |...................| ",
" |ZW.JJJ.............| ",
" |%%+%%%.............| ",
" |t....%<............| ",
" |9.88S%.z...........| ",
" |||||||zzz..........| ",
" |9....%<............| ",
" |t.88S%.z...........| ",
" |||||||Fzz..........| ",
" ||||||||||||||| ",
" ",
" ",
Expand All @@ -123,7 +123,29 @@
" ",
" "
],
"palettes": [ "basement_empty" ]
"palettes": [ "basement_empty" ],
"nested": {
"1": { "chunks": [ [ "null", 80 ], [ "room_9x9_recroom_W", 40 ], [ "room_9x9_cellar_W", 20 ], [ "room_9x9_weed_W", 5 ] ] },
"2": {
"chunks": [
[ "null", 90 ],
[ "5x5_holdout_S", 2 ],
[ "5x5_sauna_S", 10 ],
[ "5x5_gym_S", 20 ],
[ "5x5_gym_W", 20 ],
[ "livingroom_5x5_S_1", 30 ],
[ "livingroom_5x5_E_1", 30 ],
[ "livingroom_5x5_N_1", 30 ],
[ "livingroom_5x5_W_1", 30 ],
[ "livingroom_5x5_S_2", 30 ],
[ "livingroom_5x5_E_2", 30 ],
[ "livingroom_5x5_N_2", 30 ],
[ "livingroom_5x5_W_2", 30 ],
[ "home_office_4x4_N", 20 ],
[ "home_office_4x4_S", 20 ]
]
}
}
}
}
]
34 changes: 27 additions & 7 deletions data/json/mapgen/house/house_rural.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,24 +182,44 @@
" |<..zz| ",
" |....z| ",
" |....z| ",
" |2....| ",
" |.....| ",
" |..z..| ",
" |.....| ",
" |.....| ",
" |.....| ",
" |.....|||| ",
" |.....JJJ| ",
" |.....z.W| ",
" |.......Z| ",
" |g....|||| ",
" ||..1....| ",
" |W.......| ",
" |Z.......| ",
" |........| ",
" |...F..gz| ",
" |FJJ.....| ",
" |||||||||| ",
" ",
" ",
" ",
" "
],
"palettes": [ "basement_empty" ]
"palettes": [ "basement_empty" ],
"nested": {
"1": { "chunks": [ [ "null", 70 ], [ "5x5_holdout_W", 10 ], [ "5x5_sauna_W", 20 ] ] },
"2": {
"chunks": [
[ "null", 80 ],
[ "5x5_gym_N", 20 ],
[ "5x5_gym_S", 20 ],
[ "5x5_gym_E", 20 ],
[ "5x5_gym_W", 20 ],
[ "livingroom_5x5_S_1", 30 ],
[ "livingroom_5x5_E_1", 30 ],
[ "livingroom_5x5_N_1", 30 ],
[ "livingroom_5x5_W_1", 30 ],
[ "livingroom_5x5_S_2", 30 ],
[ "livingroom_5x5_E_2", 30 ],
[ "livingroom_5x5_N_2", 30 ],
[ "livingroom_5x5_W_2", 30 ]
]
}
}
}
}
]
Loading

0 comments on commit de43441

Please sign in to comment.