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

renovate houses 06-10 #36693

Merged
merged 1 commit into from
Jan 4, 2020
Merged

renovate houses 06-10 #36693

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
126 changes: 28 additions & 98 deletions data/json/mapgen/house/house06.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,115 +2,45 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "house" ],
"om_terrain": [ "house_06" ],
"weight": 300,
"object": {
"fill_ter": "t_floor",
"rows": [
"........##.ss.##.P......",
".---vvvv--v;;v---------.",
".| h |Y Y| r r |.",
".v kkk | | r r |.",
".v | | r r |.",
".| | | r r |.",
".|oooo | | |.",
".|------+| |---+---|.",
".| 1|.",
".|??????? hn lC3 5v.",
".v? hnn C2 Ov.",
".v? cc h nn lC4 f|.",
".|? cc h |.",
".| v.",
".|------ v.",
".| + nK D|.",
".| |-----------+--|.",
".|d |t S| |.",
".v@@ + c| |.",
".v@@ |BB S| |.",
".|d |BBB + @@ |.",
".|n |BBB | d@@d |.",
".---------vv------vv---.",
"........................"
"........%%.--.%%.p......",
".###oooo##o**o#########.",
".#T h y|L L| 6 6 #.",
".o rrr | | 6 6 #.",
".o E E | | 6 6 #.",
".# | | 6 6 #.",
".#RRRR | | #^",
".#||||||+| ||||+|||#.",
".# 1#.",
".#HHHHHHH ff AC3 5o.",
".oH hffh 72 Oo.",
".oH lll h ff AC4 F#.",
".#H h C#.",
".#y xxx yo.",
".#|||||| Yo.",
".#yHHT + sE ||#.",
".# |||||||||||| +>#.",
".#d |t S|DyR|+||#.",
".o@@ + 8| TE#.",
".o@@ R|BB S| #.",
".#d I|BBB + @@ #.",
".#v R|BBB b| d@@d #.",
".#########oo######oo###.",
"............^..........."
],
"palettes": [ "standard_domestic_palette" ],
"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_tree_apple", "x": [ 0, 14 ], "y": [ 0, 0 ], "chance": 40, "repeat": [ 1, 2 ] }
],
"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",
"O": "f_oven",
"P": "f_mailbox",
"S": "f_sink",
"l": "f_stool",
"Y": "f_rack_coat",
"c": "f_counter",
"d": "f_dresser",
"f": "f_fridge",
"h": "f_chair",
"k": "f_desk",
"n": "f_table",
"o": "f_bookcase",
"r": "f_rack"
},
"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" }
},
"terrain": { "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ] },
"place_loot": [
{ "group": "bed", "x": [ 2, 3 ], "y": [ 18, 19 ], "chance": 90, "repeat": [ 1, 3 ] },
{ "group": "bed", "x": [ 18, 19 ], "y": [ 20, 21 ], "chance": 90, "repeat": [ 1, 3 ] },
{ "group": "livingroom", "x": [ 1, 10 ], "y": [ 8, 13 ], "chance": 90, "repeat": [ 1, 5 ] },
{ "group": "bedroom", "x": [ 1, 6 ], "y": [ 15, 21 ], "chance": 80, "repeat": [ 1, 4 ] },
{ "group": "consumer_electronics", "x": [ 1, 6 ], "y": [ 15, 21 ], "chance": 50, "repeat": [ 1, 3 ] },
{ "group": "guns_pistol_common", "x": [ 2, 2 ], "y": [ 21, 21 ], "chance": 5, "ammo": 90, "magazine": 100 },
{ "group": "dresser", "x": [ 2, 2 ], "y": [ 20, 20 ], "chance": 80, "repeat": [ 3, 6 ] },
{ "group": "dresser", "x": [ 2, 2 ], "y": [ 17, 17 ], "chance": 80, "repeat": [ 2, 4 ] },
{ "group": "bedroom", "x": [ 15, 21 ], "y": [ 17, 21 ], "chance": 80, "repeat": [ 1, 4 ] },
{ "group": "dresser", "x": [ 20, 20 ], "y": [ 21, 21 ], "chance": 80, "repeat": [ 3, 6 ] },
{ "group": "dresser", "x": [ 17, 17 ], "y": [ 21, 21 ], "chance": 80, "repeat": [ 3, 6 ] },
{ "group": "cleaning", "x": [ 7, 14 ], "y": [ 17, 21 ], "chance": 90, "repeat": [ 1, 2 ] },
{ "group": "softdrugs", "x": [ 7, 14 ], "y": [ 17, 21 ], "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": [ 5, 10 ] },
{ "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_forest", "x": [ 21, 21 ], "y": [ 15, 15 ], "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "homebooks", "x": [ 2, 5 ], "y": [ 6, 6 ], "chance": 70, "repeat": [ 1, 3 ] },
{ "group": "office", "x": [ 4, 6 ], "y": [ 3, 3 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "cannedfood", "x": [ 16, 16 ], "y": [ 2, 5 ], "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "stash_food", "x": [ 16, 16 ], "y": [ 2, 5 ], "chance": 60, "repeat": [ 1, 3 ] },
{ "group": "pasta", "x": [ 20, 20 ], "y": [ 2, 5 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "stash_food", "x": [ 20, 20 ], "y": [ 2, 5 ], "chance": 60, "repeat": [ 1, 3 ] }
{ "group": "guns_pistol_common", "x": [ 2, 2 ], "y": [ 21, 21 ], "chance": 5, "ammo": 90, "magazine": 100 }
],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ]
}
Expand Down
135 changes: 31 additions & 104 deletions data/json/mapgen/house/house07.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,117 +2,44 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "house" ],
"om_terrain": [ "house_07" ],
"weight": 300,
"object": {
"fill_ter": "t_floor",
"rows": [
"...T####ss####T..P......",
".---vvvv;;vvvv---------.",
".|oo Y| rcccc |.",
".| h | r c |.",
".|0 nnh | r l c |.",
".|o hnn | r c |.",
".|o h | |.",
".|o |+------|.",
".| | 1|.",
".| ? o| lc2 5v.",
".vn ? o| c3 Ov.",
".vn ? o| lc4 f|.",
".| ? + c|.",
".| K c | h v.",
".|------ |h v.",
".|t + |nnn D|.",
".| |--+--------+--|.",
".|BB | nndnn |.",
".vBB + |.",
".vBB + |.",
".| S|--+--| @@ |.",
".|rr |G r| d@@d |.",
".-----------------vv---.",
"........................"
],
"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_tree_apple", "x": [ 0, 14 ], "y": [ 0, 0 ], "chance": 40, "repeat": [ 1, 2 ] }
"...$%%%%--%%%%$..p......",
".###oooo**oooo#########.",
".#RR y L| UJJJq #.",
".# h | 6 6 #.",
".#a ffh | 6 A 6 #.",
".#R hff | 6 6 #.",
".#R h | #^",
".#R |+||||||#.",
".# ET| 1#.",
".#y H R| AJ2 5o.",
".os Hr R| J3 Oo.",
".os HrE R| AJ4 F#.",
".# H + 7#.",
".# E l y||| h o.",
".#|||||| +>|h o.",
".#t + |g|rrr Y#.",
".# |||+||||||||+||#.",
".#BB b|y ssdII Ey#.",
".oBB + h #.",
".oBB + #.",
".# S|||+|||R @@ T#.",
".#ww 8|vD D|R d@@d #.",
".#################oo###.",
"............^..........."
],
"palettes": [ "standard_domestic_palette" ],
"set": [ { "point": "terrain", "id": "t_tree_apple", "x": [ 0, 14 ], "y": [ 0, 0 ], "chance": 40, "repeat": [ 1, 2 ] } ],
"terrain": {
"#": "t_shrub",
"+": "t_door_c",
"-": "t_wall",
".": "t_grass",
";": "t_door_locked",
"P": "t_grass",
"T": "t_tree",
"s": "t_sidewalk",
"v": "t_window_domestic",
"|": "t_wall"
},
"furniture": {
"0": "f_fireplace",
"?": "f_sofa",
"@": "f_bed",
"B": "f_bathtub",
"D": "f_trashcan",
"G": "f_gunsafe_ml",
"K": "f_armchair",
"O": "f_oven",
"P": "f_mailbox",
"l": "f_stool",
"Y": "f_rack_coat",
"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",
"h": "f_chair",
"n": "f_table",
"o": "f_bookcase",
"r": "f_rack"
"#": "t_rock_wall",
"%": [ "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" ]
},
"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" }
},
"place_loot": [
{ "group": "bed", "x": [ 18, 19 ], "y": [ 20, 21 ], "chance": 90, "repeat": [ 1, 3 ] },
{ "group": "livingroom", "x": [ 1, 10 ], "y": [ 1, 13 ], "chance": 90, "repeat": [ 1, 5 ] },
{ "group": "fridge", "x": [ 8, 9 ], "y": [ 4, 5 ], "chance": 40, "repeat": [ 1, 2 ] },
{ "group": "consumer_electronics", "x": [ 1, 6 ], "y": [ 7, 21 ], "chance": 50, "repeat": [ 1, 3 ] },
{ "group": "bedroom", "x": [ 15, 21 ], "y": [ 7, 21 ], "chance": 80, "repeat": [ 1, 5 ] },
{ "group": "dresser", "x": [ 20, 20 ], "y": [ 21, 21 ], "chance": 70, "repeat": [ 3, 6 ] },
{ "group": "dresser", "x": [ 17, 17 ], "y": [ 21, 21 ], "chance": 70, "repeat": [ 3, 6 ] },
{ "group": "guns_pistol_common", "x": [ 8, 8 ], "y": [ 21, 21 ], "chance": 5, "ammo": 90, "magazine": 100 },
{ "group": "dresser", "x": [ 12, 12 ], "y": [ 21, 21 ], "chance": 90, "repeat": [ 3, 6 ] },
{ "group": "dresser", "x": [ 13, 13 ], "y": [ 17, 17 ], "chance": 50, "repeat": [ 3, 6 ] },
{ "group": "softdrugs", "x": [ 2, 3 ], "y": [ 21, 21 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "harddrugs", "x": [ 2, 3 ], "y": [ 21, 21 ], "chance": 15, "repeat": [ 1, 2 ] },
{ "group": "kitchen", "x": [ 15, 21 ], "y": [ 2, 16 ], "chance": 70, "repeat": [ 1, 3 ] },
{ "group": "fridge", "x": [ 21, 21 ], "y": [ 11, 11 ], "chance": 90, "repeat": [ 5, 10 ] },
{ "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_forest", "x": [ 21, 21 ], "y": [ 15, 15 ], "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "homebooks", "x": [ 2, 2 ], "y": [ 5, 7 ], "chance": 60, "repeat": [ 1, 3 ] },
{ "group": "homebooks", "x": [ 13, 13 ], "y": [ 8, 10 ], "chance": 60, "repeat": [ 1, 3 ] },
{ "group": "cannedfood", "x": [ 16, 16 ], "y": [ 2, 5 ], "chance": 80, "repeat": [ 1, 2 ] },
{ "group": "cannedfood", "x": [ 16, 20 ], "y": [ 2, 2 ], "chance": 75, "repeat": [ 1, 2 ] },
{ "group": "stash_food", "x": [ 16, 16 ], "y": [ 2, 5 ], "chance": 60, "repeat": [ 1, 3 ] },
{ "group": "pasta", "x": [ 20, 20 ], "y": [ 2, 5 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "stash_food", "x": [ 20, 20 ], "y": [ 2, 5 ], "chance": 60, "repeat": [ 1, 3 ] }
],
"place_loot": [ { "group": "livingroom", "x": [ 1, 10 ], "y": [ 1, 13 ], "chance": 90, "repeat": [ 1, 5 ] } ],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ]
}
}
Expand Down
Loading