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

Standard house variant distribution, survivor homes, doormats #64678

Merged
merged 4 commits into from
Apr 4, 2023
Merged

Standard house variant distribution, survivor homes, doormats #64678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cad482
doormat
LovamKicsiGazsii Mar 28, 2023
26b2f25
palette update
LovamKicsiGazsii Mar 28, 2023
80424ac
house cleanup
LovamKicsiGazsii Mar 28, 2023
aa6ff3f
comment update
LovamKicsiGazsii Mar 29, 2023
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
13 changes: 13 additions & 0 deletions data/json/items/fluff.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,5 +706,18 @@
"material": [ "plastic" ],
"symbol": "o",
"color": "light_gray"
},
{
"type": "GENERIC",
"id": "doormat",
"name": { "str_sp": "doormat" },
"description": "A non-slip mat with a welcoming message. Once used to keep a house clean and inviting.",
"weight": "2200 g",
"volume": "3 L",
"price": 1000,
"price_postapoc": 10,
"material": [ "cotton" ],
"symbol": "_",
"color": "brown"
}
]
337 changes: 21 additions & 316 deletions data/json/mapgen/house/house21.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_21",
"//": "normal variant",
"type": "mapgen",
"weight": 100,
"object": {
"fill_ter": "t_floor",
"rows": [
Expand All @@ -16,14 +14,14 @@
"...[....%`%...!.........",
".........`..............",
"........%`%..##o#oo##...",
"....%%%%!``~~* ET#...",
"....%%%%!````*÷ ET#...",
"...##ooo###oo#||Y E#...",
"...#x |34527| o...",
"...#x H hfho...",
"...o lH YJJJy hfh#...",
"...o H y#...",
"...# E |1FO 6||+||#...",
"..^#RR yR###o*##B--t#^..",
"...# E |1FO÷6||+||#...",
"..^#RR yR###o*##B''t#^..",
"...#||+||#jjj``#B8SQ#...",
"...#d P#`````######...",
"...o@@ hIo!````.%%.%....",
Expand All @@ -33,22 +31,8 @@
"........................",
"........................"
],
"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",
"j": "t_concrete",
"-": "t_linoleum_white",
"Q": "t_linoleum_white",
"8": "t_linoleum_white",
"B": "t_linoleum_white",
"S": "t_linoleum_white",
"t": "t_linoleum_white",
"~": "t_thconc_floor"
},
"furniture": { "!": "f_region_flower" },
"palettes": [ "domestic_general_and_variant_palette", "standard_domestic_lino_bathroom", "standard_domestic_landscaping_palette" ],
"terrain": { "j": "t_concrete", "'": "t_linoleum_gray", "~": "t_thconc_floor" },
"place_item": [ { "item": "stereo", "x": 4, "y": 11, "chance": 100 } ],
"place_nested": [
{
Expand All @@ -59,285 +43,6 @@
]
}
},
{
"method": "json",
"om_terrain": "house_21",
"//": "hoarder variant",
"type": "mapgen",
"weight": 1,
"object": {
"fill_ter": "t_floor",
"rows": [
"........%`%.............",
".......p.`..............",
".........`.......[......",
"........%`%../..........",
".........`......./..[...",
"...[....%`%.../.........",
".........`..............",
"........%`%..##o#oo##...",
"....%%%%/``,,*~~!~ET#...",
"...##ooo###oo#||Y!!E#...",
"...#x!!!!|34527|!~!!o...",
"...#x!!H~!!~~~!~!hfho...",
"...o!~lH~!YJJJy!~hfh#...",
"...o!!~H!~!!~!~~!!~y#...",
"...#!E!~!|1FO 6||+||#...",
"..^#RR~yR###o*##B__t#^..",
"...#||+||#jjj``#B8SQ#...",
"...#d!~!P#`````######...",
"...o@@!hIo/````.%%.%....",
"...o@@~~Io/.............",
"...#D!!!y#/.............",
"...##ooo##..............",
"........................",
"........................"
],
"palettes": [ "house_hoarder_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",
"j": "t_concrete",
"Q": "t_linoleum_white",
"8": "t_linoleum_white",
"B": "t_linoleum_white",
"S": "t_linoleum_white",
"t": "t_linoleum_white",
",": "t_thconc_floor"
},
"furniture": { "/": "f_region_flower" },
"place_item": [
{ "item": "stereo", "x": 4, "y": 11, "chance": 100 },
{ "item": "feces_dog", "x": [ 4, 8 ], "y": [ 10, 20 ], "chance": 80, "repeat": [ 5, 10 ] }
],
"place_nested": [
{
"chunks": [ [ "null", 25 ], [ "playset_4x4_2", 25 ], [ "firepit_5x5_1", 25 ], [ "firepit_5x5_2", 25 ], [ "playset_4x4_1", 25 ] ],
"x": [ 12, 15 ],
"y": 19
}
],
"place_monster": [
{ "monster": "mon_cat", "x": [ 4, 19 ], "y": [ 10, 14 ], "chance": 66, "repeat": 6 },
{ "monster": "mon_dog", "x": [ 4, 8 ], "y": [ 10, 20 ], "chance": 66, "repeat": 3 }
]
}
},
{
"method": "json",
"om_terrain": "house_21",
"//": "abandoned variant",
"type": "mapgen",
"weight": 20,
"object": {
"fill_ter": "t_floor",
"rows": [
"g........s..........c.gg",
"g..gg.cg.s.P.g.c.....g..",
".gcg..c..sg......g.g.g..",
".g.......s...{D.......g.",
"cg....g..s.........c.g.g",
"gg.g.c...s...c..c.g..g.g",
"g..g..c..scg....g..c...g",
"g...c....s...||0|00||.gg",
".........ssttm______|..g",
".gc||000|||00|##____|.c.",
"gcg|_____#_____#____0.gg",
".g.|________________0.gg",
"gg.0________________|.g.",
"g..0________________|c..",
".cg|_____#_____##d##|..g",
"gg.|_____|||0d||____|.gg",
"g..|##d##|CCCCC|____|cgg",
".g.|_____|CCCCC||||||...",
"ggg0_____0.............g",
"g.c0_____0.cg..g.c.c..gg",
".g.|_____|c......g...g..",
"ggg||000||.g..cgggg.g.gg",
"gg.g..gggc...g...gg.g.cg",
".cgg.ggggg.gggg.g.gggg.g"
],
"terrain": {
"#": "t_wall_half",
".": "t_dirt",
"0": "t_window_frame",
"C": "t_concrete",
"D": "t_dirt",
"P": "t_grass",
"_": "t_floor",
"c": "t_grass",
"d": "t_door_frame",
"g": "t_grass",
"m": "t_mdoor_frame",
"s": "t_sidewalk",
"t": "t_thconc_floor",
"{": "t_dirt",
"|": "t_brick_wall"
},
"furniture": { "D": "f_dumpster", "P": "f_mailbox", "{": "f_dumpster" },
"place_item": [
{ "chance": 30, "item": "glass_sheet", "x": 5, "y": 18 },
{ "chance": 30, "item": "glass_sheet", "x": 6, "y": 18 },
{ "chance": 30, "item": "101_carpentry", "x": 8, "y": 7 },
{ "chance": 30, "item": "glass_sheet", "x": 7, "y": 18 },
{ "chance": 30, "item": "glass_sheet", "x": 5, "y": 19 },
{ "chance": 30, "item": "glass_sheet", "x": 6, "y": 19 },
{ "chance": 30, "item": "glass_sheet", "x": 7, "y": 19 }
],
"place_items": [
{ "chance": 20, "item": "tools_toolbox", "x": 14, "y": 10 },
{ "chance": 30, "item": "collapsed_building_rubble", "x": 4, "y": 10 },
{ "chance": 30, "item": "collapsed_building_rubble", "x": [ 13, 14 ], "y": 4 },
{ "chance": 30, "item": "collapsed_building_rubble", "x": [ 12, 13 ], "y": 3 },
{ "chance": 10, "item": "hardware_plumbing", "x": 16, "y": 15 },
{ "chance": 20, "item": "hardware_plumbing", "x": [ 11, 12 ], "y": 13 },
{ "chance": 10, "item": "tools_construction", "x": 10, "y": 10 },
{ "chance": 20, "item": "tools_construction", "x": 8, "y": 10 },
{ "chance": 10, "item": "tools_construction", "x": 19, "y": 8 },
{ "chance": 35, "item": "floor_trash", "x": 14, "y": 16 },
{ "chance": 35, "item": "floor_trash", "x": 14, "y": 2 },
{ "chance": 10, "item": "manuals", "x": 17, "y": 15 },
{ "chance": 10, "item": "manuals", "x": 10, "y": 13 },
{ "chance": 10, "item": "manuals", "x": 6, "y": 10 },
{ "chance": 10, "item": "manuals", "x": 7, "y": 10 },
{ "chance": 10, "item": "manuals", "x": 18, "y": 9 },
{ "chance": 40, "item": "floor_trash", "x": 15, "y": 2 },
{ "chance": 20, "item": "plumbing_bulk", "x": [ 16, 18 ], "y": 16 },
{ "chance": 20, "item": "plumbing_bulk", "x": [ 10, 11 ], "y": 14 },
{ "chance": 10, "item": "tools_common", "x": 19, "y": 10 },
{ "chance": 20, "item": "tools_common", "x": 11, "y": 10 },
{ "chance": 20, "item": "tools_common", "x": 12, "y": 10 },
{ "chance": 20, "item": "tools_lighting_industrial", "x": 5, "y": 13 },
{ "chance": 30, "item": "magazines", "x": 18, "y": 13 },
{ "chance": 10, "item": "coffee_trash", "x": 15, "y": 4 },
{ "chance": 30, "item": "pizza_trash", "x": 19, "y": 13 },
{ "chance": 30, "item": "clothing_work_gloves", "x": 10, "y": 17 },
{ "chance": 25, "item": "clothing_work_mask", "x": 19, "y": 12 },
{ "chance": 15, "item": "hardware", "x": 14, "y": 14 },
{ "chance": 20, "item": "hardware", "x": 12, "y": 14 },
{ "chance": 10, "item": "trash", "x": 5, "y": 20 },
{ "chance": 10, "item": "trash", "x": 19, "y": 5 },
{ "chance": 15, "item": "trash", "x": 16, "y": 3 },
{ "chance": 20, "item": "hardware_bulk", "x": 12, "y": 18 },
{ "chance": 20, "item": "hardware_bulk", "x": 12, "y": 19 },
{ "chance": 20, "item": "hardware_bulk", "x": 7, "y": 5 },
{ "chance": 20, "item": "hardware_bulk", "x": 7, "y": 6 },
{ "chance": 20, "item": "hardware_bulk", "x": 7, "y": 7 },
{ "chance": 20, "item": "hardware_bulk", "x": 8, "y": 5 },
{ "chance": 20, "item": "hardware_bulk", "x": 8, "y": 6 },
{ "chance": 20, "item": "hardware_bulk", "x": 8, "y": 7 },
{ "chance": 20, "item": "hardware_trash", "x": 19, "y": 15 },
{ "chance": 20, "item": "hardware_trash", "x": 14, "y": 3 },
{ "chance": 20, "item": "hardware_trash", "x": 15, "y": 3 },
{ "chance": 10, "item": "tools_carpentry", "x": 10, "y": 16 },
{ "chance": 10, "item": "tools_carpentry", "x": 19, "y": 9 },
{ "chance": 20, "item": "construction_worker", "x": 4, "y": [ 17, 18 ] },
{ "chance": 10, "item": "construction_worker", "x": 11, "y": 16 },
{ "chance": 20, "item": "construction_worker", "x": 16, "y": 10 }
]
}
},
{
"method": "json",
"om_terrain": "house_21",
"type": "mapgen",
"weight": 40,
"object": {
"fill_ter": "t_floor",
"rows": [
"_._._..._s......._..c.__",
"_____.cP.s.c._.c.{..._..",
"._c_..c..s_......D._._._",
"._._.....s._..c..._..._.",
"c_...._._s_....._..c._._",
"__.___...s..._._c._.__._",
"_.._._c_.sc_...._._c..._",
"_...__._.s._.||w|ww||___",
"._.......sstt+ffffXX|.._",
"._c||www|||ww|##fffX|.c.",
"_c_|fffff#Jf&JJ#ffffw.__",
"._.|XXffffffffffffXfw___",
"___wfXfffffXXXffffXf|._.",
"__.wfXffffffffffffff|c._",
".c_|fffff#aFofa##d##|.._",
"__.|ffffX|||w+||fffT|.__",
"_._|##d##|XCCCC|ff&f|c__",
"._.|Xffff|CCCCC||||||...",
"___wfXfffw........_._.._",
"__cwfffffw_c_.__.c._..__",
"._.|Xffff|c._...._..._._",
"___||www||._..c____._.__",
"__._..___c_.._...__._.__",
".c_____________._.____._"
],
"terrain": {
"+": "t_rdoor_c",
".": "t_dirt",
"C": "t_concrete",
"D": "t_grass",
"P": "t_dirt",
"_": "t_grass",
"c": "t_clay",
"d": "t_door_o",
"f": "t_floor",
"s": "t_sidewalk",
"t": "t_thconc_floor",
"w": "t_window",
"{": "t_dirt",
"|": "t_brick_wall",
"#": "t_wall_w"
},
"furniture": {
"J": "f_counter",
"&": "f_sink",
"D": "f_dumpster",
"F": "f_fridge",
"P": "f_mailbox",
"T": "f_toilet",
"a": "f_cupboard",
"X": "f_crate_c",
"o": [ "f_oven", "f_gas_oven_microwave_combo" ],
"{": "f_dumpster"
},
"place_items": [
{ "chance": 20, "item": "kitchen_nonfood", "x": 13, "y": 10 },
{ "chance": 10, "item": "bags_trip", "x": 17, "y": 10 },
{ "chance": 10, "item": "bags_trip", "x": 8, "y": 10 },
{ "chance": 15, "item": "bags_trip", "x": 4, "y": 20 },
{ "chance": 80, "item": "crate_linens", "x": 5, "y": 18 },
{ "chance": 80, "item": "crate_linens", "x": 19, "y": 13 },
{ "chance": 30, "item": "dining", "x": 5, "y": 13 },
{ "chance": 30, "item": "paint", "x": 7, "y": 20 },
{ "chance": 30, "item": "paint", "x": 8, "y": 20 },
{ "chance": 30, "item": "paint", "x": 4, "y": 15 },
{ "chance": 30, "item": "paint", "x": 5, "y": 15 },
{ "chance": 40, "item": "bath_linens", "x": 18, "y": 13 },
{ "chance": 35, "item": "clothing_work_boots", "x": 17, "y": 2 },
{ "chance": 80, "item": "crate_winter", "x": 19, "y": 9 },
{ "chance": 80, "item": "crate_clothes", "x": 4, "y": 18 },
{ "chance": 80, "item": "crate_clothes", "x": 4, "y": 17 },
{ "chance": 80, "item": "crate_clothes", "x": 19, "y": 8 },
{ "chance": 80, "item": "crate_sports", "x": 17, "y": 12 },
{ "chance": 80, "item": "crate_sports", "x": 5, "y": 12 },
{ "chance": 80, "item": "crate_toys", "x": 19, "y": 12 },
{ "chance": 80, "item": "crate_toys", "x": 6, "y": 11 },
{ "chance": 20, "item": "pantry", "x": 14, "y": 10 },
{ "chance": 30, "item": "tools_home", "x": 18, "y": 8 },
{ "chance": 30, "item": "misc_smoking", "x": 17, "y": 1 },
{ "chance": 20, "item": "kitchen", "x": 10, "y": 10 },
{ "chance": 10, "item": "tools_construction", "x": 15, "y": 1 },
{ "chance": 10, "item": "tools_construction", "x": 15, "y": 2 },
{ "chance": 80, "item": "crate_kitchen", "x": 11, "y": 12 },
{ "chance": 80, "item": "crate_kitchen", "x": 12, "y": 12 },
{ "chance": 80, "item": "crate_cleaning", "x": 6, "y": 12 },
{ "chance": 80, "item": "crate_cleaning", "x": 17, "y": 11 },
{ "chance": 35, "item": "toy_box", "x": 6, "y": 13 }
],
"place_toilets": [ { "x": 19, "y": 15 } ]
}
},
{
"type": "mapgen",
"method": "json",
Expand All @@ -352,21 +57,21 @@
" ",
" ",
" ",
" |2222223 ",
" 22|......3 ",
" |22222222........3 ",
" |............X...3 ",
" |................3 ",
" |................3 ",
" |....=.......&...3 ",
" |................3 ",
" 5.....3-----|....5 ",
" |.....3 |....3 ",
" |.....3 |----3 ",
" |.....3 ",
" |.....3 ",
" |.....3 ",
" |-----3 ",
" -------- ",
" -......- ",
" -----------......- ",
" -............X...- ",
" -................- ",
" -................- ",
" -....=.......&...- ",
" -................- ",
" 5.....-------....5 ",
" -.....- -....- ",
" -.....- ------ ",
" -.....- ",
" -.....- ",
" -.....- ",
" ------- ",
" ",
" "
],
Expand Down
Loading