Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update 5 more houses #36727

Merged
merged 1 commit into from
Jan 5, 2020
Merged

update 5 more houses #36727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house04.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" |222222222222222222223.",
" |222222222222222222223 ",
" |....................3 ",
" |......=........X....3 ",
" |...................~3 ",
Expand Down
123 changes: 29 additions & 94 deletions data/json/mapgen/house/house05.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,106 +2,41 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "house" ],
"om_terrain": [ "house_05" ],
"weight": 300,
"object": {
"fill_ter": "t_floor",
"rows": [
".DDD....P...............",
".|---------vv----;;----.",
".| K |S | rrY|.",
".| o|t B|o |.",
".| K o| B|o |.",
".v o| |o ll |.",
".v |-+--| cc34|.",
".| | | 2|.",
".| | + nn 1|.",
".| L + o| nn 5v.",
".| kk | o| LL Ov.",
".|-------- o|l f|.",
".|c????? o|---+---|.",
".v? |.",
".v? v.",
".|? K K |.",
".|----+----------+----|.",
".|d | l|.",
".|@@ |@@ |.",
".|@@ |@@ |.",
".| | |.",
".| | d|.",
".----vv---------vv-----.",
"........................"
"..............p.----....",
".##########oo####**####.",
".# Es T |S Q| LYy#.",
".#x R|t B|R #.",
".#x E R|8 B|R A A#.",
".o R|8 Y|R JJ37#^",
".o ||+||| 4#.",
".# A | y| hh 2#.",
".# NNN + + ff 1#.",
".#|||||||| R|A hh 5o.",
".#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#.",
".#d |||||||| R#.",
".#@@ AI|@@ #.",
".#@@ I|@@ D#.",
".#y D|s b d #.",
".####oo#########oo#####.",
"...........^............"
],
"set": [
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 23, 23 ], "repeat": [ 5, 8 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 14 ], "y": [ 0, 0 ], "repeat": [ 5, 8 ] }
],
"terrain": {
"+": "t_door_c",
"-": "t_wall",
".": "t_grass",
";": "t_door_locked",
"D": "t_dirt",
"P": "t_grass",
"v": "t_window_domestic",
"|": "t_wall"
},
"furniture": {
"?": "f_sofa",
"Y": "f_rack_coat",
"l": "f_stool",
"L": "f_chair",
"@": "f_bed",
"B": "f_bathtub",
"D": "f_trashcan",
"K": "f_armchair",
"O": "f_oven",
"P": "f_mailbox",
"S": "f_sink",
"c": "f_counter",
"1": "f_cupboard",
"2": "f_cupboard",
"3": "f_cupboard",
"4": "f_cupboard",
"5": "f_sink",
"d": "f_dresser",
"f": "f_fridge",
"k": "f_desk",
"n": "f_table",
"o": "f_bookcase"
},
"toilets": { "t": { } },
"items": {
"Y": { "item": "coat_rack", "chance": 30, "repeat": [ 1, 4 ] },
"P": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] },
"1": [ { "item": "SUS_dishes" }, { "item": "SUS_silverware" } ],
"2": { "item": "SUS_cookware" },
"3": [ { "item": "SUS_utensils" }, { "item": "SUS_knife_drawer" } ],
"4": { "item": "SUS_junk_drawer" },
"5": { "item": "SUS_kitchen_sink" }
},
"palettes": [ "standard_domestic_palette" ],
"place_loot": [
{ "group": "bed", "x": [ 2, 3 ], "y": [ 18, 19 ], "chance": 90, "repeat": [ 1, 3 ] },
{ "group": "bed", "x": [ 12, 13 ], "y": [ 18, 19 ], "chance": 90, "repeat": [ 1, 3 ] },
{ "group": "livingroom", "x": [ 1, 8 ], "y": [ 2, 10 ], "chance": 90, "repeat": [ 1, 4 ] },
{ "group": "livingroom", "x": [ 1, 21 ], "y": [ 12, 15 ], "chance": 90, "repeat": [ 1, 4 ] },
{ "group": "bedroom", "x": [ 1, 10 ], "y": [ 17, 21 ], "chance": 80, "repeat": [ 1, 4 ] },
{ "group": "dresser", "x": [ 2, 2 ], "y": [ 17, 17 ], "chance": 85, "repeat": [ 1, 3 ] },
{ "group": "bedroom", "x": [ 12, 21 ], "y": [ 17, 21 ], "chance": 80, "repeat": [ 1, 4 ] },
{ "group": "consumer_electronics", "x": [ 12, 21 ], "y": [ 17, 21 ], "chance": 50, "repeat": [ 1, 3 ] },
{ "group": "guns_pistol_common", "x": [ 2, 2 ], "y": [ 17, 17 ], "chance": 5, "ammo": 90, "magazine": 100 },
{ "group": "dresser", "x": [ 21, 21 ], "y": [ 21, 21 ], "chance": 85, "repeat": [ 1, 3 ] },
{ "group": "novels", "x": [ 8, 8 ], "y": [ 3, 5 ], "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "novels", "x": [ 13, 13 ], "y": [ 10, 12 ], "chance": 80, "repeat": [ 1, 4 ] },
{ "group": "cleaning", "x": [ 10, 13 ], "y": [ 3, 5 ], "chance": 90, "repeat": [ 1, 2 ] },
{ "group": "softdrugs", "x": [ 10, 13 ], "y": [ 3, 5 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "kitchen", "x": [ 15, 21 ], "y": [ 2, 11 ], "chance": 70, "repeat": [ 1, 3 ] },
{ "group": "fridge", "x": [ 21, 21 ], "y": [ 11, 11 ], "chance": 90, "repeat": [ 1, 5 ] },
{ "group": "oven", "x": [ 21, 21 ], "y": [ 10, 10 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "kitchen", "x": [ 21, 21 ], "y": [ 9, 9 ], "chance": 80, "repeat": [ 1, 2 ] },
{ "group": "trash", "x": [ 1, 3 ], "y": [ 0, 0 ], "chance": 90, "repeat": [ 1, 3 ] }
{ "group": "guns_pistol_common", "x": 2, "y": 13, "chance": 5, "ammo": 90, "magazine": 100 },
{ "item": "television", "x": 2, "y": 3, "chance": 85 },
{ "item": "laptop", "x": 21, "y": [ 13, 15 ], "chance": 5 }
],
"place_monsters": [
{ "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 },
Expand Down
83 changes: 44 additions & 39 deletions data/json/mapgen/house/house05_ab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,60 +2,65 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "house" ],
"weight": 300,
"om_terrain": [ "house_05ab" ],
"weight": 100,
"object": {
"fill_ter": "t_floor",
"rows": [
".DDD...P................",
".|---------vv----;;----.",
".| |S | |.",
".| |t B| |.",
".| | B| |.",
".v | | |.",
".v |-+--| |.",
".| | | |.",
".| | + O|.",
".| + | Sv.",
".| | | v.",
".|-------- | |.",
".| |---+---|.",
".v |.",
".v v.",
".| |.",
".|----+----------+----|.",
".| | |.",
".| | |.",
".| | |.",
".| | |.",
".| | |.",
".----vv---------vv-----.",
"........................"
".##########oo####**####.",
".# |S | #.",
".# |t B| #.",
".# | B| #.",
".o | | #.",
".o ||+||| #^",
".# | | #.",
".# | + O#.",
".# + | So.",
".# | | o.",
".#|||||||| | #.",
".# ||||+|||#.",
".o #.",
".o o.",
".# #.",
".#||||+|||| |||||+||||#.",
".# |> | #.",
".# ||||| #.",
".# | #.",
".# | #.",
".# | #.",
".####oo#########oo#####.",
"............^............"
],
"set": [
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 23, 23 ], "repeat": [ 5, 8 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 14 ], "y": [ 0, 0 ], "repeat": [ 5, 8 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 2, 14 ], "y": [ 17, 21 ], "repeat": [ 1, 3 ] },
{ "point": "terrain", "id": "t_grass", "x": [ 2, 14 ], "y": [ 17, 21 ], "repeat": [ 1, 3 ] }
],
"terrain": {
"+": "t_door_c",
"-": "t_wall",
".": "t_grass",
";": "t_door_locked",
"B": "t_floor",
"D": "t_dirt",
"O": "t_floor",
"P": "t_grass",
"S": "t_floor",
"v": "t_window_domestic",
"|": "t_wall"
"+": [ [ "t_door_c", 10 ], [ "t_door_o", 5 ], [ "t_door_locked_interior", 3 ] ],
"#": "t_brick_wall",
">": "t_stairs_down",
"^": "t_gutter_downspout",
".": "t_region_groundcover_urban",
"*": [ [ "t_door_locked_peep", 2 ], "t_door_locked_alarm", [ "t_door_locked", 10 ], "t_door_c" ],
"D": "t_region_groundcover_urban",
"P": "t_region_groundcover_urban",
"o": [
[ "t_window_domestic", 10 ],
"t_window_no_curtains",
"t_window_open",
"t_window_frame",
"t_window_empty",
"t_window_no_curtains_open",
[ "t_curtains", 5 ]
],
"|": "t_wall_w"
},
"furniture": { "B": "f_bathtub", "D": "f_trashcan", "O": "f_oven", "P": "f_mailbox", "S": "f_sink" },
"toilets": { "t": { } },
"items": { "A": { "item": "mail", "chance": 10, "repeat": [ 0, 3 ] } },
"items": { "P": { "item": "mail", "chance": 10, "repeat": [ 0, 3 ] } },
"place_loot": [
{ "group": "trash", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 75, "repeat": [ 2, 5 ] },
{ "group": "stash_drugs", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 10 }
Expand Down
128 changes: 31 additions & 97 deletions data/json/mapgen/house/house_quiverfull.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,109 +14,43 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "house" ],
"om_terrain": [ "house_quiverfull" ],
"weight": 300,
"object": {
"fill_ter": "t_floor",
"rows": [
"........P...........DDD.",
".|---;;----vv----------.",
".|nK ?|S | hnnh C|.",
".|K ?|t B| hnnh C|.",
".| ?| B| hnnh C|.",
".vn ?| | hnnh C|.",
".vn |-+--| hnnh f|.",
".vn K| | h f|.",
".| | + O|.",
".| + | Sv.",
".|???n???| | cv.",
".|-------| |U ccc|.",
".v |---+---|.",
".v + d|.",
".|-+--------+-| @@v.",
".|d d@d@d@ |k @@v.",
".|@@ @ @ @ |kh d|.",
".|d |kkoo |.",
".|@@ @@|-----+-|.",
".|d d|U |.",
".|@@ h h @@|t |.",
".| kkkk d|S BB|.",
".----vv---------vv-----.",
"........................"
"....----p...........YYY.",
".####**####oo##########.",
".#sEL H|S Q| hffh 6#.",
".#E H|t B| hffh 6#.",
"%# H|y B| hffh 6#.",
"%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#.",
".#q+ ||||+|||#.",
".#>+ + d#.",
".#||+|||||||+||D @@o.",
".#d d@d@d@ T|I @@o.",
".#@@ @ @ @ |Ih d#.",
".#d |IrRR #.",
".#@@ @@||||||+|#.",
".#d d|BB8Q Q#.",
".#@@ h h @@|t #.",
".# IIII d|S 8BB#.",
".####oo#########oo#####.",
"...%%%%%.....^.........."
],
"palettes": [ "standard_domestic_palette" ],
"terrain": {
"+": "t_door_c",
"-": "t_wall",
".": "t_grass",
";": "t_door_locked",
"?": "t_floor",
"@": "t_floor",
"B": "t_floor",
"C": "t_floor",
"D": "t_dirt",
"K": "t_floor",
"O": "t_floor",
"P": "t_grass",
"S": "t_floor",
"U": "t_floor",
"c": "t_floor",
"d": "t_floor",
"f": "t_floor",
"h": "t_floor",
"k": "t_floor",
"n": "t_floor",
"o": "t_floor",
"v": "t_window_domestic",
"|": "t_wall"
"Y": "t_region_groundcover_urban",
"%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
"#": "t_rock_wall"
},
"furniture": {
"?": "f_sofa",
"@": "f_bed",
"B": "f_bathtub",
"C": "f_cupboard",
"D": "f_trashcan",
"K": "f_armchair",
"O": "f_oven",
"P": "f_mailbox",
"S": "f_sink",
"U": "f_trashcan",
"c": "f_counter",
"d": "f_dresser",
"f": "f_fridge",
"h": "f_chair",
"k": "f_desk",
"n": "f_table",
"o": "f_bookcase"
},
"toilets": { "t": { } },
"items": { "P": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] } },
"place_loot": [
{ "group": "livingroom", "x": [ 3, 8 ], "y": [ 2, 10 ], "chance": 90, "repeat": [ 1, 5 ] },
{ "group": "kitchen", "x": [ 15, 20 ], "y": [ 2, 11 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "fridge", "x": [ 21, 21 ], "y": [ 6, 7 ], "chance": 90, "repeat": [ 1, 7 ] },
{ "group": "kitchen", "x": [ 21, 21 ], "y": [ 2, 5 ], "chance": 85, "repeat": [ 1, 2 ] },
{ "group": "cleaning", "x": [ 15, 21 ], "y": [ 19, 21 ], "chance": 85, "repeat": [ 1, 2 ] },
{ "group": "softdrugs", "x": [ 15, 21 ], "y": [ 19, 21 ], "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 2, 2 ], "y": [ 15, 15 ], "chance": 50, "repeat": [ 1, 2 ] },
{ "group": "bed", "x": [ 2, 3 ], "y": [ 16, 16 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 2, 2 ], "y": [ 17, 17 ], "chance": 50, "repeat": [ 1, 2 ] },
{ "group": "bed", "x": [ 2, 3 ], "y": [ 18, 18 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 2, 2 ], "y": [ 19, 19 ], "chance": 50, "repeat": [ 1, 2 ] },
{ "group": "bed", "x": [ 2, 3 ], "y": [ 20, 20 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 6, 6 ], "y": [ 15, 15 ], "chance": 50, "repeat": [ 1, 2 ] },
{ "group": "bed", "x": [ 7, 7 ], "y": [ 15, 16 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 8, 8 ], "y": [ 15, 15 ], "chance": 50, "repeat": [ 1, 2 ] },
{ "group": "bed", "x": [ 9, 9 ], "y": [ 15, 16 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 10, 10 ], "y": [ 15, 15 ], "chance": 50, "repeat": [ 1, 2 ] },
{ "group": "bed", "x": [ 11, 11 ], "y": [ 15, 16 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 12, 12 ], "y": [ 21, 21 ], "chance": 50, "repeat": [ 1, 2 ] },
{ "group": "bed", "x": [ 12, 13 ], "y": [ 18, 18 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 12, 12 ], "y": [ 19, 19 ], "chance": 50, "repeat": [ 1, 2 ] },
{ "group": "bed", "x": [ 12, 13 ], "y": [ 20, 20 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 21, 21 ], "y": [ 13, 13 ], "chance": 85, "repeat": [ 1, 3 ] },
{ "group": "dresser", "x": [ 21, 21 ], "y": [ 16, 16 ], "chance": 80, "repeat": [ 1, 2 ] },
{ "group": "bed", "x": [ 20, 21 ], "y": [ 14, 15 ], "chance": 90, "repeat": [ 1, 3 ] },
{ "group": "bedroom", "x": [ 15, 21 ], "y": [ 13, 17 ], "chance": 80, "repeat": [ 1, 3 ] },
{ "item": "american_flag", "x": [ 2, 2 ], "y": [ 5, 5 ], "chance": 100 },
{ "group": "book_house_quiverfull_bible", "x": [ 2, 2 ], "y": [ 6, 6 ], "chance": 100 },
{ "item": "quiver_large", "x": [ 2, 2 ], "y": [ 7, 7 ], "chance": 100 }
Expand All @@ -126,8 +60,8 @@
{ "monster": "GROUP_QUIVERFULL", "x": [ 2, 14 ], "y": [ 15, 21 ], "chance": 1 }
],
"place_vehicles": [
{ "vehicle": "tricycle", "x": 10, "y": 8, "chance": 1, "status": 0 },
{ "vehicle": "tricycle", "x": 4, "y": 21, "chance": 5, "status": 0 }
{ "vehicle": "tricycle", "x": 10, "y": 8, "chance": 50, "status": 0 },
{ "vehicle": "tricycle", "x": 4, "y": 21, "chance": 50, "status": 0 }
]
}
}
Expand Down
Loading