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 houses 11-15 #36698

Merged
merged 1 commit into from
Jan 4, 2020
Merged

update houses 11-15 #36698

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
164 changes: 72 additions & 92 deletions data/json/mapgen/house/house11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,112 +2,92 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "house" ],
"om_terrain": [ "house_11" ],
"weight": 300,
"object": {
"fill_ter": "t_floor",
"rows": [
"QQQQQQQQQQQssQQ______QQQ",
"q..........ss.p______..q",
"q..........ss..______..q",
"q.|-v-v-|..ss..______..q",
"q.| |..ss..______..q",
"q.|@@ d|..ssss______..q",
"q.|@@ d|..ss|-======|.q",
"q.| d|..ss|e |.q",
"q.|d |..ss|n |.q",
"q.|-+|+-|v-;;-| |.q",
"q.|r | ??? P| |.q",
"q.|--| o| |.q",
"q.|S | o| |.q",
"q.|c + | |.q",
"q.|t | hh + |.q",
"q.|BB| cc nn | |.q",
"q.|--| -| nn |rrrrrr|.q",
"q.|1 | hh |------|.q",
"q.v5 l| ;ssssss..q",
"q.v3 |-VVV-|ssssss..q",
"q.|C4O2f|......sHNHss..q",
"q.|--vv-|......ssssss..q",
"q......................q",
"QQQQQQQQQQQQQQQQQQQQQQQQ"
"$$$$$$$$$$$--$$______$$$",
"$..........--.p______..$",
"$...%%%....--..______..$",
"$.##o#o##..--..______..$",
"$.#T y#%.--..______..$",
"$.#@@ I#%.----______..$",
"$.#@@ AI#%.--##======#.$",
"$.# d#%.--#&~~~~~~#.$",
"$.#d #^.--#q~~~~~~#.$",
"$.#|+|+|#o#**##~~~~~~#.$",
"$.#Dz| HHH y|~~~~~~#.$",
"$.#||| R|~~~~~~#.$",
"$.#S | R|~~~~~~#.$",
"$.#8 + |~~~~~~#.$",
"$.#t | hh +~~~~~~#.$",
"$.#BB| xx ff |+|~~~~#.$",
"$.#||| || ff |>|qqqq#.$",
"$.#1 6| hh ########.$",
"$.o5 A| *------..$",
"$.o3 ##!!!##------..$",
"$.#74O2F#^.....-GKG--..$",
"$.###oo##......------..$",
"$......................$",
"$$$$$$$$$$$$$$$$$$$$$$$$"
],
"palettes": [ "standard_domestic_palette" ],
"terrain": {
"+": "t_door_c",
"-": "t_wall",
".": "t_grass",
"p": "t_grass",
";": "t_door_locked",
"%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
"=": "t_door_metal_locked",
"H": "t_sidewalk",
"N": "t_sidewalk",
"Q": "t_fence_h",
"V": "t_wall_glass",
"!": "t_wall_glass",
"_": "t_pavement",
"e": "t_gates_mech_control",
"q": "t_fence_v",
"s": "t_sidewalk",
"v": "t_window_domestic",
"|": "t_wall"
},
"furniture": {
"?": "f_sofa",
"@": "f_bed",
"B": "f_bathtub",
"H": "f_chair",
"N": "f_table",
"p": "f_mailbox",
"l": "f_stool",
"O": "f_oven",
"P": "f_indoor_plant",
"S": "f_sink",
"c": "f_counter",
"C": "f_cupboard",
"1": "f_cupboard",
"2": "f_cupboard",
"3": "f_cupboard",
"4": "f_cupboard",
"5": "f_sink",
"d": "f_dresser",
"f": "f_fridge",
"h": "f_chair",
"n": "f_table",
"o": "f_bookcase",
"r": "f_rack"
},
"toilets": { "t": { } },
"items": {
"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" }
"&": "t_gates_control_brick",
"$": "t_fence",
"G": "t_sidewalk",
"K": "t_sidewalk",
"~": "t_thconc_floor",
"q": "t_thconc_floor"
},
"furniture": { "?": "f_rack" },
"place_loot": [
{ "group": "homebooks", "x": [ 13, 13 ], "y": [ 11, 12 ], "chance": 70, "repeat": [ 1, 3 ] },
{ "group": "home_hw", "x": [ 14, 19 ], "y": [ 7, 15 ], "chance": 60, "repeat": [ 1, 3 ] },
{ "group": "mischw", "x": [ 14, 19 ], "y": [ 16, 16 ], "chance": 75, "repeat": [ 1, 2 ] },
{ "group": "mischw", "x": [ 13, 13 ], "y": [ 8, 8 ], "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "consumer_electronics", "x": [ 13, 13 ], "y": [ 8, 8 ], "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "dining", "x": [ 10, 11 ], "y": [ 15, 16 ], "chance": 85, "repeat": [ 1, 3 ] },
{ "group": "dresser", "x": [ 3, 3 ], "y": [ 8, 8 ], "chance": 75, "repeat": [ 1, 4 ] },
{ "group": "dresser", "x": [ 7, 7 ], "y": [ 5, 7 ], "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "dresser", "x": [ 3, 3 ], "y": [ 10, 10 ], "chance": 85, "repeat": [ 1, 2 ] },
{ "group": "jackets", "x": [ 3, 3 ], "y": [ 10, 10 ], "chance": 60, "repeat": [ 1, 2 ] },
{ "group": "softdrugs", "x": [ 3, 4 ], "y": [ 12, 15 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "cleaning", "x": [ 3, 4 ], "y": [ 12, 15 ], "chance": 90, "repeat": [ 1, 2 ] },
{ "group": "harddrugs", "x": [ 3, 4 ], "y": [ 12, 15 ], "chance": 15, "repeat": [ 1, 2 ] },
{ "group": "fridge", "x": [ 7, 7 ], "y": [ 20, 20 ], "chance": 90, "repeat": [ 3, 10 ] },
{ "group": "kitchen", "x": [ 3, 7 ], "y": [ 17, 20 ], "chance": 80, "repeat": [ 1, 4 ] },
{ "group": "oven", "x": [ 5, 5 ], "y": [ 20, 20 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "livingroom", "x": [ 6, 12 ], "y": [ 10, 15 ], "chance": 90, "repeat": [ 1, 4 ] },
{ "group": "bedroom", "x": [ 3, 7 ], "y": [ 4, 8 ], "chance": 80, "repeat": [ 1, 5 ] },
{ "group": "guns_pistol_common", "x": [ 3, 3 ], "y": [ 8, 8 ], "chance": 5, "ammo": 90, "magazine": 100 },
{ "group": "bed", "x": [ 3, 4 ], "y": [ 5, 6 ], "chance": 90, "repeat": [ 1, 3 ] }
{ "group": "guns_pistol_common", "x": [ 3, 3 ], "y": [ 8, 8 ], "chance": 5, "ammo": 90, "magazine": 100 }
],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ],
"place_vehicles": [ { "vehicle": "suburban_home", "x": 17, "y": 10, "chance": 15, "rotation": 270 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_11_roof",
"object": {
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" ",
" ",
" |222223 ",
" |.....3 ",
" |.....3 ",
" |.....3 |22222223 ",
" |.....3 |.......3 ",
" |.....3 |.......3 ",
" |.....52222|.......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/house12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,122 +2,76 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "house" ],
"om_terrain": [ "house_12" ],
"weight": 200,
"object": {
"fill_ter": "t_floor",
"rows": [
"......ss................",
"......ssp...............",
"......ss................",
"......ss................",
"......ss................",
"......ss....|----v--|...",
"......ss....|o| d|...",
"......ss....| + @@|...",
"..QQQQssQQQQ| + @@|...",
"..q..#ss#...|d| v...",
"..q..#ss#.|-|-| v...",
"..q###ss##|C| + K|...",
"..|--v;;v--+| | kk|...",
"..|oo + |--+--|...",
"..| 134| W|d d|....",
"..vKK f| Y|-+-|....",
"..v ? hh 2| || B|....",
"..vnn ? nn O| + B%....",
"..| ? nn 5|+|cSt |....",
"..|???? hh D|d|-%--|....",
"..|-vv--vv----|.........",
"........................",
"......--................",
"......--p...............",
"......--.........X......",
"......--................",
"......--................",
"......--....#####o###...",
"......--....#z|ET s#...",
"......--....#D+ @@#...",
"..$$$$--$$$$#D+ @@#...",
"..$..%--%...#v| so...",
"..$..%--%.###|| o...",
"..$%%%--%%#6| + E#...",
"..###o**o##+| |y II#...",
"..#RR + |||+|##...",
"..# 134| W|d d#^...",
"..oEE F| Z||+|#....",
"..o H hh 2| ||Q B#....",
"..oll H ff O| + Bo....",
"..# H ff 5|+|8Sty#....",
".^#HHHH hh Y|>##o###....",
"..##oo##oo#####.........",
".................u......",
"........................",
"........................"
],
"set": [
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 1 ], "y": [ 0, 23 ], "repeat": [ 8, 14 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 2, 5 ], "y": [ 0, 7 ], "repeat": [ 8, 11 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 2, 23 ], "y": [ 21, 23 ], "repeat": [ 8, 14 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 3, 4 ], "y": [ 9, 10 ], "repeat": [ 0, 1 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 8, 11 ], "y": [ 0, 7 ], "repeat": [ 8, 11 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 9, 9 ], "y": [ 9, 10 ], "repeat": [ 0, 1 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 10, 11 ], "y": [ 9, 9 ], "repeat": [ 0, 1 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 12, 23 ], "y": [ 0, 4 ], "repeat": [ 8, 14 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 15, 23 ], "y": [ 20, 20 ], "repeat": [ 1, 2 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 20, 23 ], "y": [ 14, 19 ], "repeat": [ 5, 8 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 21, 23 ], "y": [ 5, 13 ], "repeat": [ 6, 9 ] }
],
"terrain": {
"#": "t_shrub",
"%": "t_curtains",
"+": "t_door_c",
"-": "t_wall",
"p": "t_grass",
".": "t_grass",
";": "t_door_locked_peep",
"Q": "t_fence_h",
"q": "t_fence_v",
"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",
"O": "f_oven",
"S": "f_sink",
"p": "f_mailbox",
"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 ] },
"Y": { "item": "laundry", "chance": 50, "repeat": [ 1, 10 ] },
"W": { "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": "dresser", "x": [ 19, 19 ], "y": [ 6, 6 ], "chance": 75, "repeat": [ 1, 4 ] },
{ "group": "dresser", "x": [ 13, 13 ], "y": [ 9, 9 ], "chance": 85, "repeat": [ 1, 2 ] },
{ "group": "homebooks", "x": [ 13, 13 ], "y": [ 6, 6 ], "chance": 70, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 13, 13 ], "y": [ 19, 19 ], "chance": 85, "repeat": [ 1, 2 ] },
{ "group": "office", "x": [ 18, 19 ], "y": [ 12, 12 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "dresser", "x": [ 18, 18 ], "y": [ 14, 14 ], "chance": 85, "repeat": [ 1, 3 ] },
{ "group": "dresser", "x": [ 16, 16 ], "y": [ 14, 14 ], "chance": 85, "repeat": [ 1, 2 ] },
{ "group": "softdrugs", "x": [ 16, 18 ], "y": [ 16, 17 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "fridge", "x": [ 11, 11 ], "y": [ 15, 15 ], "chance": 90, "repeat": [ 5, 10 ] },
{ "group": "oven", "x": [ 11, 11 ], "y": [ 17, 17 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "kitchen", "x": [ 11, 11 ], "y": [ 11, 11 ], "chance": 85, "repeat": [ 1, 2 ] },
{ "group": "trash", "x": [ 11, 11 ], "y": [ 19, 19 ], "chance": 90, "repeat": [ 1, 3 ] },
{ "group": "magazines", "x": [ 3, 4 ], "y": [ 17, 17 ], "chance": 80, "repeat": [ 1, 4 ] },
{ "group": "homebooks", "x": [ 3, 4 ], "y": [ 13, 13 ], "chance": 70, "repeat": [ 1, 3 ] },
{ "group": "bed", "x": [ 18, 19 ], "y": [ 7, 8 ], "chance": 90, "repeat": [ 1, 3 ] },
{ "group": "kitchen", "x": [ 11, 11 ], "y": [ 15, 18 ], "chance": 75, "repeat": [ 1, 2 ] },
{ "group": "bedroom", "x": [ 15, 19 ], "y": [ 6, 12 ], "chance": 80, "repeat": [ 1, 5 ] },
{ "group": "livingroom", "x": [ 3, 7 ], "y": [ 13, 19 ], "chance": 90, "repeat": [ 1, 4 ] },
{ "group": "cleaning", "x": [ 15, 16 ], "y": [ 17, 18 ], "chance": 90, "repeat": [ 1, 2 ] },
{ "group": "kitchen", "x": [ 8, 10 ], "y": [ 13, 19 ], "chance": 80, "repeat": [ 1, 3 ] }
],
"palettes": [ "standard_domestic_palette" ],
"terrain": { "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ], "$": "t_fence" },
"place_loot": [ { "group": "livingroom", "x": [ 3, 7 ], "y": [ 13, 19 ], "chance": 90, "repeat": [ 1, 4 ] } ],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 10 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_12_roof",
"object": {
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" ",
" |22222223 ",
" |.......3 ",
" |.......3 ",
" |...&...3 ",
" |.......3 ",
" 222.......3 ",
" |.........3 ",
" |22222222.........3 ",
" |................53 ",
" |................3 ",
" |................3 ",
" |................3 ",
" |.............=..3 ",
" |................3 ",
" 5...........3----3 ",
" |-----------3 ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
}
]
Loading