Skip to content

Commit

Permalink
Merge pull request #37164 from curstwist/house-update-20
Browse files Browse the repository at this point in the history 
update final houses
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg authored Jan 18, 2020
2 parents d54d577 + d62480f commit 311d00e
Show file tree
Hide file tree
Showing 6 changed files with 422 additions and 425 deletions.
163 changes: 163 additions & 0 deletions data/json/mapgen/house/house25.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
[
{
"method": "json",
"om_terrain": "house_25",
"type": "mapgen",
"weight": 100,
"object": {
"fill_ter": "t_floor",
"rows": [
"````````````````````````",
"````````````````````````",
".........p.``...........",
"..##__#__##``##__#__##..",
"..# RR r #``#hfffffy#..",
".._H ~~~ E#/_# h h h_..",
".._H ~~~ T# # hh_..",
".._H ~~~ + + h_..",
"..#s ,a, y# #y T#..",
"..######### #########..",
"..# @ #I@T# #tYS#66y#..",
".._d@ # @ # + 8# O_..",
".._D # # ##### n_..",
"..# #d b# #1234 5_..",
"..##+###+## 7_..",
".^# #Y JJJ F#..",
"..######+## #########..",
"..# %# #QY8B#..",
".._@@ ##+## + B#..",
"..#@@EddDD#U q# #t8S8#..",
"..##__#__######=######..",
"...........```````.^....",
"...........```````......",
"........................"
],
"palettes": [ "standard_domestic_palette" ],
"terrain": {
"%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
"[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
"!": "t_region_groundcover_urban",
"`": "t_concrete",
"~": "t_carpet_yellow",
"_": "t_window_boarded",
"=": "t_door_metal_c_peep",
"/": "t_door_boarded_peep",
",": "t_thconc_floor",
"#": "t_wall_log"
},
"furniture": { "%": "f_safe_o", "!": "f_region_flower" },
"place_items": [
{ "chance": 10, "item": "ammo_rifle_common", "x": 9, "y": 17 },
{ "chance": 20, "item": "camping", "x": 13, "y": 19 },
{ "chance": 40, "item": "tools_home", "x": 13, "y": 19 },
{ "chance": 25, "item": "book_gunref", "x": 5, "y": 4 },
{ "chance": 35, "repeat": 2, "item": "book_school", "x": 6, "y": 4 },
{ "chance": 50, "item": "stash_water", "x": 11, "y": 19 },
{ "chance": 75, "item": "supplies_metal_precious", "x": 9, "y": 17 },
{ "chance": 35, "item": "child_items", "x": 5, "y": 13 },
{ "chance": 35, "item": "child_items", "x": 8, "y": 11 },
{ "chance": 55, "item": "survivor_knife", "x": 4, "y": 18 },
{ "chance": 10, "item": "gear_survival", "x": 6, "y": 17 }
]
}
},
{
"method": "json",
"om_terrain": "house_25",
"type": "mapgen",
"weight": 20,
"object": {
"fill_ter": "t_floor",
"rows": [
"````````````````````````",
"````````````````````````",
".........p.``...........",
"..##__#__##``##__#__##..",
"..# sHHHs #``#R y#..",
".._E ~~~ E#=_#R hffh _..",
".._T ~~~ R# # hffh _..",
".._ ~~~ + + hffh _..",
"..#M ,a, M# #y T#..",
"..######### #########..",
"..#@@y#T@@# #tYS#66y#..",
".._E #I # + 8# O_..",
".._ #Ih # ##### n_..",
"..#T d#d b# #1234 5_..",
"..##+###+## 7_..",
".^# #Y JJJ F#..",
"..######+## #########..",
"..#@@ d# #QY8B#..",
".._@@ R##+## + B#..",
"..#s D#U q# #t8S8#..",
"..##__#__######/######..",
"...........```````.^....",
"...........```````......",
"........................"
],
"palettes": [ "standard_domestic_palette" ],
"terrain": {
"[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
"!": "t_region_groundcover_urban",
"`": "t_concrete",
"~": "t_carpet_yellow",
"_": "t_window_domestic_taped",
"=": "t_door_b_peep",
"/": "t_door_boarded_damaged_peep",
",": "t_thconc_floor",
"#": "t_wall_log"
},
"furniture": { "!": "f_region_flower" },
"place_items": [
{ "chance": 20, "item": "stash_wood", "x": 5, "y": 8 },
{ "chance": 20, "item": "camping", "x": 13, "y": 19 },
{ "chance": 30, "item": "tools_home", "x": 11, "y": 19 },
{ "chance": 35, "repeat": 2, "item": "book_school", "x": 14, "y": 4 },
{ "chance": 90, "item": "corpse_female", "x": 3, "y": 18 },
{ "chance": 90, "item": "corpse_female", "x": 3, "y": 10 },
{ "chance": 99, "item": "guns_rifle_milspec", "x": 3, "y": 8 },
{ "chance": 50, "item": "book_martial", "x": 14, "y": 5 },
{ "chance": 90, "item": "clothing_soldier_set", "x": 9, "y": 8 },
{ "chance": 90, "item": "corpse_male", "x": 3, "y": 17 },
{ "chance": 90, "item": "corpse_male", "x": 9, "y": 10 },
{ "chance": 55, "item": "toy_box", "x": 9, "y": 11 },
{ "chance": 25, "item": "clutter_bedroom", "x": 19, "y": 17 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_25_roof",
"object": {
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" ",
" ",
" |22222223 |22222223 ",
" |.......3 |.......3 ",
" |.......322|.......3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |.....=.........&..3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" 5..................3 ",
" |..................3 ",
" |....N.............3 ",
" |..................3 ",
" |..................3 ",
" |----------------5-3 ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
}
]
175 changes: 111 additions & 64 deletions data/json/mapgen/house/house_2story.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,50 @@
"object": {
"fill_ter": "t_floor",
"rows": [
",,,,,,,WW,,,,,,,,,,,,,,,",
",,,,,,,WWP,,,,,,,,,,,,,,",
",,,,,,WWWW,,,,,,,,,,,,,,",
",,===w=++=w=======w===,,",
",,=b........Y.b-l..~~=,,",
",,w............+.....w,,",
",,w..--------..-ss..&=,,",
",,=..-d....b-..------=,,",
",,=<<-..BB..-....AAAb=,,",
",,=---..Bb..-........=,,",
",,=dd-......-a.......=,,",
",,w..+......+.......A=,,",
",,=---..TT..-.......A=,,",
",,=L.-.cTTc.->>.....A=,,",
",,=-+----------......=,,",
",,=U..R-p............g,,",
",,=o...CE...TTTTTTc..g,,",
",,=s...CE...TTTTTT...*,,",
",,=C........c........g,,",
",,=CCCC-p............=,,",
",,=========gggggg*gg==,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,"
".......``...............",
".......``p..............",
"......````..............",
"..###o#**#o#######o###..",
"..#L Ey|QQ|t#..",
"..o yiiis |++|-o..",
"..o |||||||| +----#..",
"..# |F457O2| |8S8b#..",
"..#<>|3 | |||||#..",
"..#|||n y| #..",
"..#66|1 hfh y#..",
"..o + hfh ro..",
"..#UU|Y | hfh ro..",
"..#|||||JJJJ| hfh y#..",
"..#vRRP|AA A #..",
".^# P| ee ]..",
"..#r | HHHHs ee ]..",
"..orh + Hl ee )..",
"..#r |R H y]..",
"..#T yE|R EsE R#..",
"..##oo#####]]]]]])]]##..",
"........................",
"........................",
"........................"
],
"palettes": [ "multistory_house" ],
"items": {
"P": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] },
"Y": { "item": "coat_rack", "chance": 30, "repeat": [ 1, 4 ] }
"palettes": [ "standard_domestic_palette" ],
"terrain": {
"%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
"[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
"!": "t_region_groundcover_urban",
"`": "t_concrete",
"#": "t_adobe_brick_wall",
"t": "t_linoleum_gray",
"S": "t_linoleum_gray",
"b": "t_linoleum_gray",
"Q": "t_linoleum_gray",
"8": "t_linoleum_gray",
"9": "t_linoleum_gray",
"-": "t_linoleum_gray",
"]": "t_wall_glass",
")": "t_door_glass_c"
},
"mapping": {
"B": { "items": { "item": "bed", "chance": 90, "repeat": [ 1, 3 ] } },
"R": { "items": { "item": "fridge", "chance": 90, "repeat": [ 1, 5 ] } },
"U": { "items": { "item": "kitchen", "chance": 75, "repeat": [ 1, 3 ] } },
"b": { "items": { "item": "homebooks", "chance": 75, "repeat": [ 1, 2 ] } },
"d": { "items": { "item": "dresser", "chance": 85, "repeat": [ 1, 4 ] } },
"o": { "items": { "item": "oven", "chance": 75, "repeat": [ 1, 3 ] } }
},
"toilets": { "&": { } }
"furniture": { "!": "f_region_flower" },
"place_loot": [ { "item": "stereo", "x": 12, "y": 19 } ]
}
},
{
Expand All @@ -57,38 +62,80 @@
"________________________",
"________________________",
"________________________",
"__==w=w=w=w=w===wwww==__",
"__=p................p=__",
"__=..................=__",
"__w..--+--------+--..=__",
"__w..-s..-d.d-....-..w__",
"__=>>-..s--+--T..B-..=__",
"__=---...-..b-...B-..w__",
"__=dd-S.&-B..-....-..=__",
"__=++-----B..---+--..=__",
"__=.....b-...-d..d-..w__",
"__w.BB...--+-------..=__",
"__w.BB...+...........w__",
"__=p.....-...........=__",
"__==www=====w===w==++=__",
"__FrrrrrrrrrrrrrrrrrrF__",
"__FrrrcrcrrrrrrrrrrrrF__",
"__FrcrrrrcrrrrrrrrrrrF__",
"__ffffffffffffffffffff__",
"__##o###o#o#o####ooo##__",
"__#S8-B|@@ +D|R @@#__",
"__o8--B|s d|||R @@#__",
"__#t---| hI|D+ h #__",
"__#||+|| T I|||y II o__",
"__o> |+|||||c||+|||#__",
"__#y |Dv#__",
"__#||+||||||| ||||+|#__",
"__#d b|t89| |II #__",
"__o@@ +--S| + @@o__",
"__o@@ E||||| |E @@#__",
"__oI +D| |b so__",
"__#y yy +D|y |d T#__",
"_^##]])]]####])##]])##__",
"__$G $__",
"__$ G G GK y$__",
"__$ G yKy y$__",
"__$$$$$$$$$$$$$$$$$$$$__",
"________________________",
"________________________",
"________________________"
],
"palettes": [ "multistory_house" ],
"mapping": {
"B": { "items": { "item": "bed", "chance": 90, "repeat": [ 1, 3 ] } },
"R": { "items": { "item": "fridge", "chance": 90, "repeat": [ 1, 5 ] } },
"U": { "items": { "item": "kitchen", "chance": 75, "repeat": [ 1, 3 ] } },
"b": { "items": { "item": "homebooks", "chance": 75, "repeat": [ 1, 2 ] } },
"d": { "items": { "item": "dresser", "chance": 85, "repeat": [ 1, 4 ] } },
"o": { "items": { "item": "oven", "chance": 75, "repeat": [ 1, 3 ] } }
"palettes": [ "standard_domestic_palette" ],
"terrain": {
"_": "t_open_air",
"#": "t_adobe_brick_wall",
"t": "t_linoleum_gray",
"S": "t_linoleum_gray",
"Q": "t_linoleum_gray",
"8": "t_linoleum_gray",
"B": "t_linoleum_gray",
"9": "t_linoleum_gray",
"-": "t_linoleum_gray",
"]": "t_wall_glass",
")": "t_door_glass_c",
"$": "t_screened_porch_wall"
},
"toilets": { "&": { } }
"place_loot": [ { "item": "stereo", "x": 12, "y": 19 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_2story_roof",
"object": {
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" ",
" ",
" |2222222222222222223 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |......:...........3 ",
" |..................3 ",
" |..................3 ",
" |.......=..........3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" 5...............&..3 ",
" |......N...........3 ",
" |..................3 ",
" |..................3 ",
" |------------------3 ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
}
]
Loading

0 comments on commit 311d00e

Please sign in to comment.