Skip to content

Commit

Permalink
update houses 16-19 (#36709)
Browse files Browse the repository at this point in the history
  • Loading branch information
@curstwist @I-am-Erk
curstwist authored and I-am-Erk committed Jan 5, 2020
1 parent cac8083 commit 745411a
Show file tree
Hide file tree
Showing 8 changed files with 381 additions and 442 deletions.
168 changes: 62 additions & 106 deletions data/json/mapgen/house/house16.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,119 +2,75 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "house" ],
"om_terrain": [ "house_16" ],
"weight": 200,
"object": {
"fill_ter": "t_floor",
"rows": [
"...............ss.......",
"...............ssp......",
"...............ss.......",
"...............ss.......",
"...............ss.......",
"..|--vv----vv--;;----|..",
"..|P + ????|..",
"..| | PP ? ?v..",
"..v@@ o|-+--- ? ?v..",
"..v@@ o|t |f ? ?v..",
"..|d |S |c v..",
"..|----++|-|$|c K|..",
"..|d d|dd|$|-|S o|..",
"..|+++---| S|O |..",
"..| kk + t|D hh v..",
"..v h |----| nn v..",
"..v |CCYW|P nn v..",
"..| @@ | hh v..",
"..|Pd@@ + |..",
"..|--vv--------;;----|..",
"........................",
"........................",
"........................",
"...............--.......",
"...............--p......",
"...............--.......",
"...............--.......",
".....%%....%%..--.......",
"..###oo####oo##*######..",
"..#y PII + HHHHH#^.",
"..# A | Ly H l Ho%.",
"..o@@ R||+||| H l Ho%.",
"..o@@ R|t |F H l Ho%.",
"..#d |8S |1 o%.",
"..#||||++|||9|2 E#..",
"..#D D|DD|9|||5 R#..",
"..#|+||||| S8|O #..",
"..#y TII + t|73 hh o%.",
"..o h ||||||4 ff o%.",
"..o |66ZW|y ff o%.",
"..# @@ + hh o%.",
"..#yd@@ E|Q #..",
"..###oo#######|+||####..",
".....%%...---#> zq#^....",
"..........-X-##*###.....",
"..u...-------------.....",
"........................"
],
"set": [
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 1 ], "y": [ 0, 23 ], "repeat": [ 8, 14 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 2, 14 ], "y": [ 0, 4 ], "repeat": [ 8, 14 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 2, 23 ], "y": [ 20, 23 ], "repeat": [ 8, 14 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 17, 23 ], "y": [ 0, 4 ], "repeat": [ 8, 13 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 22, 23 ], "y": [ 5, 19 ], "repeat": [ 7, 11 ] }
],
"terrain": {
"$": "t_floor",
"+": "t_door_c",
"-": "t_wall",
".": "t_grass",
"p": "t_grass",
";": "t_door_locked",
"s": "t_sidewalk",
"v": "t_window_domestic",
"|": "t_wall"
},
"furniture": {
"$": "f_shower",
"?": "f_sofa",
"@": "f_bed",
"p": "f_mailbox",
"C": "f_cupboard",
"1": "f_cupboard",
"2": "f_cupboard",
"3": "f_cupboard",
"4": "f_cupboard",
"5": "f_sink",
"D": "f_trashcan",
"K": "f_armchair",
"O": "f_oven",
"P": "f_indoor_plant",
"S": "f_sink",
"W": "f_washer",
"Y": "f_dryer",
"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 ] },
"W": { "item": "laundry", "chance": 50, "repeat": [ 1, 10 ] },
"Y": { "item": "laundry", "chance": 50, "repeat": [ 1, 10 ] },
"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" }
},
"place_loot": [
{ "group": "dining", "x": [ 18, 19 ], "y": [ 15, 16 ], "chance": 75, "repeat": [ 1, 4 ] },
{ "group": "oven", "x": [ 14, 14 ], "y": [ 13, 13 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "fridge", "x": [ 14, 14 ], "y": [ 9, 9 ], "chance": 90, "repeat": [ 5, 10 ] },
{ "group": "kitchen", "x": [ 14, 16 ], "y": [ 10, 12 ], "chance": 85, "repeat": [ 1, 3 ] },
{ "group": "trash", "x": [ 14, 14 ], "y": [ 14, 14 ], "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "softdrugs", "x": [ 10, 11 ], "y": [ 13, 14 ], "chance": 75, "repeat": [ 1, 2 ] },
{ "group": "softdrugs", "x": [ 11, 12 ], "y": [ 9, 10 ], "chance": 75, "repeat": [ 1, 2 ] },
{ "group": "bedroom", "x": [ 4, 7 ], "y": [ 6, 10 ], "chance": 80, "repeat": [ 1, 4 ] },
{ "group": "bedroom", "x": [ 3, 8 ], "y": [ 15, 17 ], "chance": 80, "repeat": [ 1, 4 ] },
{ "group": "livingroom", "x": [ 17, 20 ], "y": [ 6, 11 ], "chance": 90, "repeat": [ 1, 5 ] },
{ "group": "fridgesnacks", "x": [ 14, 14 ], "y": [ 9, 9 ], "chance": 75, "repeat": [ 1, 2 ] },
{ "group": "cleaning", "x": [ 10, 11 ], "y": [ 16, 16 ], "chance": 90, "repeat": [ 1, 2 ] },
{ "group": "homebooks", "x": [ 20, 20 ], "y": [ 12, 12 ], "chance": 75, "repeat": [ 1, 2 ] },
{ "group": "homebooks", "x": [ 8, 8 ], "y": [ 8, 9 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 4, 4 ], "y": [ 18, 18 ], "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "dresser", "x": [ 7, 8 ], "y": [ 12, 12 ], "chance": 90, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 5, 5 ], "y": [ 12, 12 ], "chance": 90, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 3, 3 ], "y": [ 12, 12 ], "chance": 80, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 3, 3 ], "y": [ 10, 10 ], "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "bed", "x": [ 5, 6 ], "y": [ 17, 18 ], "chance": 90, "repeat": [ 1, 3 ] },
{ "group": "bed", "x": [ 3, 4 ], "y": [ 8, 9 ], "chance": 90, "repeat": [ 1, 3 ] },
{ "group": "homeguns", "x": [ 4, 4 ], "y": [ 12, 12 ], "chance": 3 },
{ "group": "magazines", "x": [ 7, 7 ], "y": [ 14, 14 ], "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "harddrugs", "x": [ 12, 12 ], "y": [ 13, 13 ], "chance": 15, "repeat": [ 1, 2 ] },
{ "group": "cannedfood", "x": [ 10, 10 ], "y": [ 16, 16 ], "chance": 70, "repeat": [ 1, 4 ] }
],
"palettes": [ "standard_domestic_palette" ],
"terrain": { "%": "t_region_shrub_decorative", "#": "t_rock_wall" },
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 5 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_16_roof",
"object": {
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" |2222222222222222223 ",
" |..................5 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |.........=........3 ",
" |..................3 ",
" |..................3 ",
" |............&.....3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |..................3 ",
" |----------|....5--3 ",
" |....3 ",
" |----3 ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
}
]
170 changes: 62 additions & 108 deletions data/json/mapgen/house/house17.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,121 +2,75 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "house" ],
"om_terrain": [ "house_17" ],
"weight": 200,
"object": {
"fill_ter": "t_floor",
"rows": [
"......p..#ss#...........",
".........#ss#...........",
".........#ss#...........",
".........#ss#...........",
".........#ss#...........",
".........#ss#...........",
".|-v-v-|.#ss#.|-v-v-|...",
".| @@d |.#ss#.| d@@ |...",
".v @@ v.#ss#.v @@ v...",
".| v.#ss#.v |...",
".v v.#ss#.v v...",
".| |.#ss#.| |...",
".|+|K |-v;;v-| K|+|...",
".|d|K P|P P|P K|d|...",
".|-|-+-|o o|-+-|-|...",
"...|D |.....",
"...|1 ????? v.....",
"...vO Ccl ? ? |.....",
"...v2 5cl ? n ? |-v-|.",
"...|3f4Ccl + |.",
"...|--vv---+++--v-|S Bv.",
"..........|LYW|...|t B|.",
"..........|---|...|-v-|.",
"......p..%--%...........",
".........%--%...........",
".........%--%...........",
".........%--%...........",
".........%--%...........",
".........%--%...........",
".##o#o##.%--%.##o#o##...",
".# @@d #.%--%.# d@@ #^..",
".o @@ o.%--%.o @@ o...",
".# o.%--%.o #...",
".o o.%--%.o o...",
".# #.%--%.# #...",
".#+|I ##o**o## I|+#...",
".#D|I y|y y|y I|D#...",
".###|+||R R||+|||#...",
"..^#6 6Y |>#...",
"...#1 HHHHH + #...",
"...oO CJA sH H |q#...",
"...o2 5JA sH l H ||#o#.",
"...#3F47JA + 8#.",
"...###oo###+++##o##S Bo.",
"..........#UZW#...#t B#.",
"..........#####...##o##.",
"........................"
],
"set": [
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 8 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 1, 8 ], "y": [ 0, 5 ], "repeat": [ 8, 14 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 1, 2 ], "y": [ 15, 23 ], "repeat": [ 4, 6 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 3, 9 ], "y": [ 21, 23 ], "repeat": [ 5, 7 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 8, 8 ], "y": [ 6, 11 ], "repeat": [ 0, 1 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 10, 23 ], "y": [ 23, 23 ], "repeat": [ 3, 4 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 13, 13 ], "y": [ 0, 11 ], "repeat": [ 2, 3 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 14, 23 ], "y": [ 0, 5 ], "repeat": [ 8, 14 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 15, 17 ], "y": [ 21, 22 ], "repeat": [ 0, 1 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 19, 23 ], "y": [ 15, 17 ], "repeat": [ 3, 5 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 21, 23 ], "y": [ 6, 14 ], "repeat": [ 6, 9 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 18, 22 ], "repeat": [ 0, 1 ] }
],
"terrain": {
"#": "t_shrub",
"+": "t_door_c",
"-": "t_wall",
".": "t_grass",
";": "t_door_locked",
"p": "t_grass",
"s": "t_sidewalk",
"v": "t_window_domestic",
"|": "t_wall"
},
"furniture": {
"?": "f_sofa",
"@": "f_bed",
"B": "f_bathtub",
"C": "f_cupboard",
"1": "f_cupboard",
"2": "f_cupboard",
"3": "f_cupboard",
"4": "f_cupboard",
"5": "f_sink",
"D": "f_trashcan",
"K": "f_armchair",
"L": "f_locker",
"O": "f_oven",
"P": "f_indoor_plant",
"S": "f_sink",
"W": "f_washer",
"Y": "f_dryer",
"c": "f_counter",
"d": "f_dresser",
"f": "f_fridge",
"l": "f_stool",
"n": "f_table",
"o": "f_bookcase",
"p": "f_mailbox"
},
"toilets": { "t": { } },
"items": {
"Y": { "item": "laundry", "chance": 50, "repeat": [ 1, 10 ] },
"W": { "item": "laundry", "chance": 50, "repeat": [ 1, 10 ] },
"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" }
},
"place_loot": [
{ "group": "livingroom", "x": [ 10, 17 ], "y": [ 15, 19 ], "chance": 90, "repeat": [ 1, 6 ] },
{ "group": "kitchen", "x": [ 4, 7 ], "y": [ 16, 19 ], "chance": 85, "repeat": [ 1, 3 ] },
{ "group": "fridge", "x": [ 5, 5 ], "y": [ 19, 19 ], "chance": 90, "repeat": [ 5, 10 ] },
{ "group": "oven", "x": [ 4, 4 ], "y": [ 17, 17 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "trash", "x": [ 4, 4 ], "y": [ 15, 15 ], "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "dining", "x": [ 7, 8 ], "y": [ 17, 19 ], "chance": 75, "repeat": [ 1, 4 ] },
{ "group": "homebooks", "x": [ 13, 13 ], "y": [ 14, 14 ], "chance": 60, "repeat": [ 1, 2 ] },
{ "group": "homebooks", "x": [ 8, 8 ], "y": [ 14, 14 ], "chance": 75, "repeat": [ 1, 2 ] },
{ "group": "home_hw", "x": [ 11, 11 ], "y": [ 21, 21 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "softdrugs", "x": [ 19, 21 ], "y": [ 19, 21 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "cleaning", "x": [ 19, 21 ], "y": [ 19, 21 ], "chance": 90, "repeat": [ 1, 2 ] },
{ "group": "bedroom", "x": [ 15, 19 ], "y": [ 7, 11 ], "chance": 80, "repeat": [ 1, 5 ] },
{ "group": "bedroom", "x": [ 2, 6 ], "y": [ 7, 11 ], "chance": 80, "repeat": [ 1, 4 ] },
{ "group": "bed", "x": [ 17, 18 ], "y": [ 7, 8 ], "chance": 90, "repeat": [ 1, 3 ] },
{ "group": "bed", "x": [ 3, 4 ], "y": [ 7, 8 ], "chance": 90, "repeat": [ 1, 3 ] },
{ "group": "dresser", "x": [ 19, 19 ], "y": [ 13, 13 ], "chance": 90, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 16, 16 ], "y": [ 7, 7 ], "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "dresser", "x": [ 2, 2 ], "y": [ 13, 13 ], "chance": 90, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 5, 5 ], "y": [ 7, 7 ], "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "magazines", "x": [ 14, 14 ], "y": [ 18, 18 ], "chance": 80, "repeat": [ 1, 3 ] }
],
"palettes": [ "standard_domestic_palette" ],
"terrain": { "%": "t_region_shrub_decorative", "#": "t_adobe_brick_wall" },
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 6 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_17_roof",
"object": {
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" |222223 |222223 ",
" |.....3 |.....5 ",
" |..:..3 |.....3 ",
" |.....3 |.....3 ",
" |.....3 |..X..3 ",
" |.....3 |.....3 ",
" |.....3222222|.....3 ",
" |..................3 ",
" |-5................3 ",
" |................3 ",
" |................3 ",
" |....&.=.........3 ",
" |................323 ",
" |..................3 ",
" |------|...3---|...3 ",
" |...3 |...3 ",
" |---3 |---3 ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
}
]
Loading

0 comments on commit 745411a

Please sign in to comment.