diff --git a/data/json/items/fluff.json b/data/json/items/fluff.json index 82b3fb14487ff..dd21ee732df82 100644 --- a/data/json/items/fluff.json +++ b/data/json/items/fluff.json @@ -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" } ] diff --git a/data/json/mapgen/house/house21.json b/data/json/mapgen/house/house21.json index 6c272cd374d35..0d5e62c822f16 100644 --- a/data/json/mapgen/house/house21.json +++ b/data/json/mapgen/house/house21.json @@ -1,10 +1,8 @@ [ { + "type": "mapgen", "method": "json", "om_terrain": "house_21", - "//": "normal variant", - "type": "mapgen", - "weight": 100, "object": { "fill_ter": "t_floor", "rows": [ @@ -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!````.%%.%....", @@ -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": [ { @@ -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", @@ -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 ", + " -.....- -....- ", + " -.....- ------ ", + " -.....- ", + " -.....- ", + " -.....- ", + " ------- ", " ", " " ], diff --git a/data/json/mapgen/house/house23.json b/data/json/mapgen/house/house23.json index 3ab037d6f06e2..2eb161b773246 100644 --- a/data/json/mapgen/house/house23.json +++ b/data/json/mapgen/house/house23.json @@ -1,55 +1,38 @@ [ { + "type": "mapgen", "method": "json", "om_terrain": "house_23", - "//": "normal variant", - "type": "mapgen", - "weight": 100, "object": { "fill_ter": "t_floor", "rows": [ - "......[.......p.........", + "......[.......p`........", "...........[...`........", "````````````````........", "`%..!!.jj.!!...`........", "`.##oo####oo#$$=$##o##..", "`.#T s #G y#123#..", "`%#H H ###*o#J 4#..", - "`.oH l H E| |J O#..", + "`.oH l H E|÷ |J O#..", "`.oH H s| |J fo..", "`.# E| |J no..", "`.#yxxx 7#..", "`.#|||| hhh Y#..", - "`.#S--+ fff 6#..", - "`.#98t| hhh Ty RR Y6#..", + "`.#S''+ fff 6#..", + "`.#98t|÷hhh Ty RR Y6#..", "`.#####*###|||+||+|||#..", "`......``^#db T| dD#^.", "`````````!o I| o..", ".........!o@@ hI| yo..", ".........!o@@ |@ Eo..", - "..........#s ED|@I T#..", + "..........#¤ ED|@I T#..", "..........##ooo###oo##..", "...........%%%...%.%.%..", "...............[........", "........................" ], - "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", - "#": "t_rock_wall", - "-": "t_linoleum_white", - "Q": "t_linoleum_white", - "8": "t_linoleum_white", - "B": "t_linoleum_white", - "S": "t_linoleum_white", - "t": "t_linoleum_white", - "$": "t_screened_porch_wall", - "=": "t_screen_door_c" - }, - "furniture": { "!": "f_region_flower" }, + "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_lino_bathroom", "standard_domestic_landscaping_palette" ], + "terrain": { "'": "t_linoleum_gray", "$": "t_screened_porch_wall", "=": "t_screen_door_c" }, "place_item": [ { "item": "stereo", "x": 4, "y": 10, "chance": 100 }, { "item": "television", "x": 5, "y": 10, "chance": 100 } ], "place_nested": [ { @@ -72,205 +55,6 @@ ] } }, - { - "method": "json", - "om_terrain": "house_23", - "type": "mapgen", - "weight": 20, - "object": { - "fill_ter": "t_dirt", - "rows": [ - ".............P.s.d......", - ".....d.........s........", - "..d........d...s......d.", - ".......d.......s..d.....", - "..||OO|||OO||tttt||O||..", - "..|_________|tttt|___|..", - "..|_________|||_O|___|d.", - "..O___________#__#___O..", - "..O___________#__#___O..", - ".d|___________#__#___|..", - "..|__________________|..", - "..|####______________|..", - "..|__________________|..", - "..|___#______________|..", - "..||||||_||###_##_###|d.", - "..........|_____#____|..", - "...dd.....O_____#____O..", - "....d.....O_____#____O..", - ".......d..O_____#____O..", - ".d........|_____#____|.d", - "..........||OOO|||OO||..", - "...................d....", - "...d.............d.d..d.", - ".......d................" - ], - "terrain": { - "#": "t_wall_half", - ".": "t_grass", - "_": "t_floor", - "O": "t_window_frame", - "P": "t_grass", - "s": "t_sidewalk", - "d": "t_dirt", - "t": "t_thconc_floor", - "|": "t_rock_wall" - }, - "furniture": { "P": "f_mailbox" }, - "place_item": [ - { "chance": 30, "item": "2x4", "repeat": 1, "x": 11, "y": 15 }, - { "chance": 50, "item": "2x4", "repeat": 1, "x": 12, "y": 15 }, - { "chance": 50, "item": "2x4", "repeat": 1, "x": 11, "y": 16 }, - { "chance": 50, "item": "2x4", "repeat": 1, "x": 12, "y": 16 }, - { "chance": 50, "item": "2x4", "repeat": 1, "x": 17, "y": 17 } - ], - "place_items": [ - { "chance": 20, "item": "hardware_trash", "x": 6, "y": 17 }, - { "chance": 20, "item": "hardware_trash", "x": 7, "y": 13 }, - { "chance": 5, "item": "hardware_bulk", "x": 20, "y": 11 }, - { "chance": 20, "item": "hand_tools", "x": 11, "y": 17 }, - { "chance": 20, "item": "hand_tools", "x": 20, "y": 9 }, - { "chance": 10, "item": "trash", "x": 14, "y": 19 }, - { "chance": 10, "item": "trash", "x": 4, "y": 19 }, - { "chance": 10, "item": "trash", "x": 20, "y": 17 }, - { "chance": 10, "item": "trash", "x": 4, "y": 13 }, - { "chance": 10, "item": "trash", "x": 20, "y": 10 }, - { "chance": 10, "item": "trash", "x": 6, "y": 6 } - ] - } - }, - { - "method": "json", - "om_terrain": "house_23", - "type": "mapgen", - "weight": 40, - "object": { - "fill_ter": "t_floor", - "rows": [ - ".............P.s........", - "...............s..d..d..", - ".dd..d.......d.s........", - "...............s.d......", - "..||ww||||ww|--t-||w||..", - "..|_________|tttt|cJc|..", - "..|_________|||+w|J_{|.d", - "..w___________#__#J_o|..", - "..w___________#__#J_&w..", - "..|___________#__#J_&w..", - ".d|__________________|..", - "..|####______________|..", - "..|&__D______________|..", - "..|__T#______________|..", - "d.||||||a||###D##D###|..", - "..........|_____#____|d.", - ".....d...dw_____#____w..", - "..........w_____#____w..", - "..d.......w_____#____w..", - "....dd....|_____#____|..", - "..........||www|||ww||..", - "..d.....................", - "..d....d.....d.....d....", - "...d..................d." - ], - "terrain": { - "+": "t_door_metal_locked", - "-": "t_fence_h", - ".": "t_grass", - "D": "t_door_o", - "P": "t_grass", - "_": "t_floor", - "a": "t_door_c", - "d": "t_dirt", - "s": "t_sidewalk", - "t": "t_thconc_floor", - "w": "t_window", - "|": "t_rock_wall", - "#": "t_wall_w" - }, - "furniture": { - "J": "f_counter", - "&": "f_sink", - "P": "f_mailbox", - "T": "f_toilet", - "c": "f_cupboard", - "o": [ "f_oven", "f_gas_oven_microwave_combo" ], - "{": "f_fridge" - }, - "place_items": [ - { "chance": 10, "item": "hardware_bulk", "x": 17, "y": 16 }, - { "chance": 10, "item": "hardware_bulk", "x": 17, "y": 17 }, - { "chance": 10, "item": "hardware_bulk", "x": 18, "y": 9 }, - { "chance": 10, "item": "hand_tools", "x": 10, "y": 13 }, - { "chance": 10, "item": "hand_tools", "x": 3, "y": 10 }, - { "chance": 10, "item": "tools_construction", "x": 15, "y": 17 }, - { "chance": 10, "item": "tools_construction", "x": 20, "y": [ 12, 13 ] }, - { "chance": 10, "item": "tools_construction", "x": 4, "y": 10 }, - { "chance": 10, "item": "hardware_clothing", "x": 14, "y": 16 } - ] - } - }, - { - "method": "json", - "om_terrain": "house_23", - "//": "hoarder variant", - "type": "mapgen", - "weight": 1, - "object": { - "fill_ter": "t_floor", - "rows": [ - "......[.......p.........", - "...........[...`........", - "````````````````........", - "`%.....jj......`........", - "`.##oo####oo#$$/$##o##..", - "`.#T!~!~s~!~#G y#123#..", - "`%#H!~!!H!~!###*o#J!4#..", - "`.oH~l~!H!!~!E|~!|J~O#..", - "`.oH!~!~H~!!~s|!~|J~fo..", - "`.#!~!!~~!!!~E|!~|J!no..", - "`.#yxxx!~!!!~~!!~~!~7#..", - "`.#||||!!hh!!~!~!!~~Y#..", - "`.#S__+~fffh~!~!~!~!6#..", - "`.#98t|!h!h!Ty~RR!~Y6#..", - "`.#####*###|||+||+|||#..", - "`.Ŧ=.??``^#db~~T|!~dD#^.", - "``ɤ``````?o~!~!I|!!~~o..", - "..Ŧ.?=..=?o@@~hI|!~!yo..", - "..Ŧ?==.?==o@@!~!|@~~Eo..", - "..Ŧ=??=??=#s!~ED|@I!T#..", - "..ŦŦŦŦŦŦŦŦ##ooo###oo##..", - "...........%%%...%.%.%..", - "...............[........", - "........................" - ], - "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_concrete", - "#": "t_rock_wall", - "Q": "t_linoleum_white", - "8": "t_linoleum_white", - "9": "t_linoleum_white", - "B": "t_linoleum_white", - "S": "t_linoleum_white", - "t": "t_linoleum_white", - "$": "t_screened_porch_wall", - "/": "t_screen_door_c", - "ɤ": "t_concrete" - }, - "place_item": [ - { "item": "stereo", "x": 4, "y": 10, "chance": 100 }, - { "item": "television", "x": 5, "y": 10, "chance": 100 }, - { "item": "feces_dog", "x": [ 3, 21 ], "y": [ 5, 19 ], "chance": 15, "repeat": [ 5, 10 ] }, - { "item": "feces_roach", "x": [ 3, 21 ], "y": [ 5, 19 ], "chance": 20, "repeat": [ 4, 8 ] } - ], - "place_monster": [ - { "monster": "mon_large_cockroach", "x": [ 3, 21 ], "y": [ 5, 19 ], "chance": 100, "repeat": [ 2, 6 ] }, - { "monster": "mon_plague_vector", "x": [ 3, 21 ], "y": [ 5, 19 ], "chance": 20 } - ] - } - }, { "type": "mapgen", "method": "json", @@ -282,23 +66,23 @@ " ", " ", " ", - " |2222222222222222223 ", - " |..................3 ", - " |..................3 ", - " |..&...............3 ", - " |..............=...3 ", - " |..................3 ", - " |..................3 ", - " |..................3 ", - " |..................3 ", - " |..................3 ", - " |-------5..........3 ", - " |..........5 ", - " |..........3 ", - " |..........3 ", - " |..........3 ", - " |..........3 ", - " |----------3 ", + " -------------------- ", + " -..................- ", + " -..................- ", + " -..&...............- ", + " -..............=...- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " -..................- ", + " --------5..........- ", + " -..........5 ", + " -..........- ", + " -..........- ", + " -..........- ", + " -..........- ", + " ------------ ", " ", " ", " " diff --git a/data/json/mapgen/house/house35.json b/data/json/mapgen/house/house35.json index 290a7d4c02b59..f3d712e81f786 100644 --- a/data/json/mapgen/house/house35.json +++ b/data/json/mapgen/house/house35.json @@ -3,43 +3,43 @@ "type": "mapgen", "method": "json", "om_terrain": [ "house_35" ], - "weight": 100, "object": { "fill_ter": "t_floor", "rows": [ "........p`..............", "....%%%%.`.%%%..........", "...##oo##`##o##````````.", - ".###R I|*|rrR#````````.", - ".#D+ @@| + h *````````.", + ".###R ¤|*|rrR#````````.", + ".#D+ @@|÷+ h *````````.", ".#||d | |E T##oo##```.", ".#D|||+|| |||||O152#```.", - ".#+| + II|F___3#```.", - "!# d ||+| J___7#*##.", - "!o |S_|H E ____6|~~#.", - "!#@@ |t_|H hfh |ANo!", - ".#I |BB|H hfh |~N#!", + ".#+| + II|F'''3#```.", + "!# d ||+| J'''7#*##.", + "!o |S'|H E ''''6|~~#.", + "!#@@ |t'|H hfh |ANo!", + ".#¤ |BB|H hfh |~N#!", ".#|||||||sHH +~~o!", "!#tS|D|U|RRR |y Y|qq#.", - "!o__+ |+| ||xx |####.", + "!o''+ |+| ||xx |####.", "!#BB| | + T#^...", ".#|||+| ##oo### lHo!...", - ".#dbd #G::~~* lHo!...", - ".# o~~~~~#sHHI#!...", - ".o @@ *~~~~~##oo##....", - ".# I@@I #~~:~~:$........", + ".#dbd #G::~~*÷ lHo!...", + ".# o~~~~~#sHH¤#!...", + ".o @@ ÷*~~~~~##oo##....", + ".# ¤@@¤ #~~:~~:$........", "^##o##o##$$$=$$$........", "...%%%%%...```.......u..", "........................" ], - "palettes": [ "standard_domestic_palette" ], + "palettes": [ + "domestic_general_and_variant_palette", + "standard_domestic_lino_kitchen", + "standard_domestic_lino_bathroom", + "standard_domestic_landscaping_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_screened_porch_wall", "=": "t_screen_door_c", - "#": "t_adobe_brick_wall", "~": "t_thconc_floor", "A": "t_thconc_floor", "N": "t_thconc_floor", @@ -47,24 +47,9 @@ "G": "t_thconc_floor", ":": "t_thconc_floor", "q": "t_thconc_floor", - "`": "t_concrete", - "_": "t_linoleum_white", - "J": "t_linoleum_white", - "1": "t_linoleum_white", - "2": "t_linoleum_white", - "3": "t_linoleum_white", - "4": "t_linoleum_white", - "5": "t_linoleum_white", - "6": "t_linoleum_white", - "7": "t_linoleum_white", - "8": "t_linoleum_white", - "O": "t_linoleum_white", - "F": "t_linoleum_white", - "B": "t_linoleum_white", - "S": "t_linoleum_white", - "t": "t_linoleum_white" + "'": "t_linoleum_gray" }, - "furniture": { "!": "f_region_flower", ":": [ "f_indoor_plant", "f_indoor_plant_y" ] }, + "furniture": { ":": [ "f_indoor_plant", "f_indoor_plant_y" ] }, "place_loot": [ { "item": "hose", "x": 9, "y": 22 }, { "item": "television", "x": 16, "y": 14 }, @@ -72,82 +57,6 @@ ] } }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "house_35" ], - "//": "hoarder variant", - "weight": 1, - "object": { - "fill_ter": "t_floor", - "rows": [ - "........p`..............", - "....%%%%.`.%%%..........", - "...##oo##`##o##````````.", - ".###R!!I|*|rrR#````````.", - ".#D+~!@@|!+!h!*````````.", - ".#||d!~!|~|E!T##oo##```.", - ".#D|||+||~|||||O152#```.", - ".#+|~+~!~!~II|F___3#```.", - "0#~d~||+|!~!! J___7#*##.", - "0o~!~|S_|H!~E!____6|``#.", - "0#@@!|t_|H~!!~~hfh!|ANo0", - ".#I!!|BB|H!~!!!!fh!|`N#0", - ".#|||||||sHH~~!!h!~+``o0", - "0#tS|D|U|RRR |y~!!Y|qq#.", - "0o__+!|+|~~~!||xx!|####.", - "0#BB|!|~+!!!~~~!~!T#^...", - ".#|||+| ##oo###~!lHo0...", - ".#dbd!~!#G::``*!!lHo0...", - ".#!~!~~!o`````#sHHI#0...", - ".o!~@@!!*`````##oo##....", - ".#!I@@I!#``:``:$........", - "^##o##o##$$$&$$$........", - "...%%%%%...```.......u..", - "........................" - ], - "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" ], - "0": "t_region_groundcover_urban", - "$": "t_screened_porch_wall", - "&": "t_screen_door_c", - "#": "t_adobe_brick_wall", - "A": "t_thconc_floor", - "N": "t_thconc_floor", - "K": "t_thconc_floor", - "G": "t_thconc_floor", - ":": "t_thconc_floor", - "q": "t_thconc_floor", - "`": "t_concrete", - "J": "t_linoleum_white", - "1": "t_linoleum_white", - "2": "t_linoleum_white", - "3": "t_linoleum_white", - "4": "t_linoleum_white", - "5": "t_linoleum_white", - "6": "t_linoleum_white", - "7": "t_linoleum_white", - "8": "t_linoleum_white", - "O": "t_linoleum_white", - "F": "t_linoleum_white", - "B": "t_linoleum_white", - "S": "t_linoleum_white", - "t": "t_linoleum_white" - }, - "furniture": { "0": "f_region_flower", ":": [ "f_indoor_plant", "f_indoor_plant_y" ] }, - "place_loot": [ - { "item": "hose", "x": 9, "y": 22 }, - { "item": "television", "x": 16, "y": 14 }, - { "item": "stereo", "x": 15, "y": 14, "chance": 20 } - ], - "place_monster": [ - { "monster": "mon_devourer", "x": [ 2, 7 ], "y": [ 4, 20 ], "chance": 100 }, - { "monster": "mon_cat", "x": [ 9, 18 ], "y": [ 6, 15 ], "chance": 100, "repeat": 2 } - ] - } - }, { "type": "mapgen", "method": "json", @@ -157,26 +66,26 @@ "rows": [ " ", " ", - " |22222 22223 ", - " |2|....222...3 ", - " |............3 ", - " |............3----3 ", - " |.................3 ", - " |.................3 ", - " |.................3223 ", - " |....................3 ", - " |....................3 ", - " |......&.............3 ", - " |....................3 ", - " |....................3 ", - " |..........N......5--3 ", - " |.................3 ", - " |.......=.........3 ", - " |.................3 ", - " |.................3 ", - " |.............3---3 ", - " |.............3 ", - " 5-------------3 ", + " ------ ----- ", + " ---....---...- ", + " -............- ", + " -............------ ", + " -.................- ", + " -.................- ", + " -.................---- ", + " -....................- ", + " -....................- ", + " -......&.............- ", + " -....................- ", + " -....................- ", + " -..........N......5--- ", + " -.................- ", + " -.......=.........- ", + " -.................- ", + " -.................- ", + " -.............----- ", + " -.............- ", + " 5-------------- ", " ", " " ], diff --git a/data/json/mapgen/house/house38.json b/data/json/mapgen/house/house38.json index 0b49f25405f10..49ee7017d589a 100644 --- a/data/json/mapgen/house/house38.json +++ b/data/json/mapgen/house/house38.json @@ -3,7 +3,6 @@ "type": "mapgen", "method": "json", "om_terrain": [ "house_38" ], - "weight": 100, "object": { "fill_ter": "t_floor", "rows": [ @@ -13,17 +12,17 @@ "...#D d#$;$#$$$#~~~~~~#.", "...#D d#~~~~G::#~~~~~~#.", "..##|+|#*o##oo##~~~~~~#^", - "..#BB_S| L| hhh#~~~~~~##", - "..oBB_t| fff#~~~~~~U#", - "..#BB_8| hhh#~~~~~~~o", + "..#BB'S|÷L| hhh#~~~~~~##", + "..oBB't| fff#~~~~~~U#", + "..#BB'8| hhh#~~~~~~~o", "..#||+|| #q~~~~~No", "..#D| R| | RRy#q~~~~AN#", "..#+| + |||||###*#####", - "..# | rrT |6___1#.", - "..o d| h ____O#.", - "..#b | EsE ____2#.", - "..o @@ |H y|F_453#.", - "..#I@@I|H l x##*#o##.", + "..# | rrT |6'''1#.", + "..o d| h ''''O#.", + "..#b | EsE ''''2#.", + "..o @@ |H y|F'453#.", + "..#¤@@¤|H l x##*#o##.", "..##oo##H l a#~~~~~$.", "....%%^#H E x#~~~::$.", ".......##oo##oo##$;$$$$.", @@ -32,41 +31,27 @@ "........................", "........................" ], - "palettes": [ "standard_domestic_palette" ], + "palettes": [ + "domestic_general_and_variant_palette", + "standard_domestic_lino_kitchen", + "standard_domestic_lino_bathroom", + "standard_domestic_landscaping_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_door_metal_locked", - "&": "t_gates_control_brick", - "#": "t_brick_wall", + "&": "t_gates_control_concrete_lab", "~": "t_thconc_floor", "q": "t_thconc_floor", "U": "t_thconc_floor", "A": "t_thconc_floor", "G": "t_thconc_floor", "N": "t_thconc_floor", - "`": "t_concrete", ":": "t_thconc_floor", - "_": "t_linoleum_white", - "J": "t_linoleum_white", - "1": "t_linoleum_white", - "2": "t_linoleum_white", - "3": "t_linoleum_white", - "4": "t_linoleum_white", - "5": "t_linoleum_white", - "6": "t_linoleum_white", - "7": "t_linoleum_white", - "8": "t_linoleum_white", - "O": "t_linoleum_white", - "F": "t_linoleum_white", - "B": "t_linoleum_white", - "S": "t_linoleum_white", - "t": "t_linoleum_white", + "'": "t_linoleum_gray", "$": "t_screened_porch_wall", ";": "t_screen_door_c" }, - "furniture": { "!": "f_region_flower", ":": [ "f_indoor_plant", "f_indoor_plant_y" ] }, + "furniture": { ":": [ "f_indoor_plant", "f_indoor_plant_y" ] }, "place_loot": [ { "item": "hose", "x": 19, "y": 20, "chance": 35 }, { "item": "lawnmower", "x": 22, "y": 8, "chance": 35 }, @@ -76,90 +61,6 @@ "place_vehicles": [ { "vehicle": "car", "x": 19, "y": 5, "chance": 35, "rotation": 270 } ] } }, - { - "method": "json", - "om_terrain": [ "house_38" ], - "//": "hoarder variant", - "type": "mapgen", - "weight": 1, - "object": { - "fill_ter": "t_floor", - "rows": [ - "........p`/.....&`````%.", - "....%%%./`/..[.##=====#.", - "...##o##/`/....#&,,,,,#.", - "...#D!d#$;$#$$$#,,,,,,#.", - "...#D~d#0000G::#,,,,,,#.", - "..##|+|#*o##oo##,,,,,,#^", - "..#BB_S|~L|!h!!#,,,,,,##", - "..oBB_t|!~~!fff#,,,,,,U#", - "..#BB_8|!!!~!hh#,,,,,,,o", - "..#||+||!!~~!!~#q,,,,,No", - "..#D|~R|!~|!RRy#q,,,,AN#", - "..#+|!~+~!|||||###*#####", - "..#!!~!|~!!~rrT!|6___1#.", - "..o!!~d|!~!!~h~!!____O#.", - "..#b!~!|!~!EsE!~~____2#.", - "..o!@@!|H~~!!~!y|F_453#.", - "..#I@@I|H!~l~~!x##*#o##.", - "..##oo##H!!l!~!a#00000$.", - "....%%^#H!!~E!~x#000::$.", - ".......##oo##oo##$;$$$$.", - ".........%%..%%..```///.", - ".................`````..", - "........................", - "........................" - ], - "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_door_metal_locked", - "&": "t_gates_control_brick", - "#": "t_brick_wall", - ",": "t_thconc_floor", - "0": "t_thconc_floor", - "q": "t_thconc_floor", - "U": "t_thconc_floor", - "A": "t_thconc_floor", - "G": "t_thconc_floor", - "N": "t_thconc_floor", - "`": "t_concrete", - "J": "t_linoleum_white", - "1": "t_linoleum_white", - "2": "t_linoleum_white", - "3": "t_linoleum_white", - "4": "t_linoleum_white", - "5": "t_linoleum_white", - "6": "t_linoleum_white", - "7": "t_linoleum_white", - "8": "t_linoleum_white", - "O": "t_linoleum_white", - "F": "t_linoleum_white", - "B": "t_linoleum_white", - "S": "t_linoleum_white", - "t": "t_linoleum_white", - "$": "t_screened_porch_wall", - ";": "t_screen_door_c" - }, - "furniture": { - ",": [ [ "f_cardboard_box", 35 ], [ "f_crate_o", 10 ], [ "f_wardrobe", 20 ], [ "f_bookcase", 15 ], [ "f_null", 20 ] ], - "/": "f_region_flower" - }, - "items": { ",": { "item": "hoarder", "chance": 90, "repeat": [ 2, 4 ] } }, - "place_loot": [ - { "item": "hose", "x": 19, "y": 20, "chance": 35 }, - { "item": "lawnmower", "x": 22, "y": 8, "chance": 35 }, - { "item": "television", "x": 15, "y": 16 }, - { "item": "stereo", "x": 15, "y": 18, "chance": 35 } - ], - "place_monster": [ - { "monster": "mon_large_cockroach", "x": [ 3, 21 ], "y": [ 6, 15 ], "chance": 100, "repeat": [ 2, 6 ] }, - { "monster": "mon_plague_vector", "x": [ 3, 21 ], "y": [ 6, 15 ], "chance": 20 } - ] - } - }, { "type": "mapgen", "method": "json", @@ -168,25 +69,25 @@ "fill_ter": "t_shingle_flat_roof", "rows": [ " ", - " |2222223 ", - " |2222 |......3 ", - " |...32222222|......3 ", - " |..................3 ", - " ||..................3 ", - " |...................53", - " |....................3", - " |....................3", - " |......X.......N.....3", - " |....................3", - " |...................33", - " |...................3 ", - " |.......=.&.........3 ", - " |...................3 ", - " |...................3 ", - " |...................3 ", - " |----5..............3 ", - " |..............3 ", - " |--------------3 ", + " -------- ", + " ----- -......- ", + " -...---------......- ", + " -..................- ", + " --..................- ", + " -...................5-", + " -....................-", + " -....................-", + " -......X.......N.....-", + " -....................-", + " -...................--", + " -...................- ", + " -.......=.&.........- ", + " -...................- ", + " -...................- ", + " -...................- ", + " -----5..............- ", + " -..............- ", + " ---------------- ", " ", " ", " ", diff --git a/data/json/mapgen/house/house40.json b/data/json/mapgen/house/house40.json index 8250e97745593..b094e11da8752 100644 --- a/data/json/mapgen/house/house40.json +++ b/data/json/mapgen/house/house40.json @@ -3,142 +3,48 @@ "type": "mapgen", "method": "json", "om_terrain": [ "house_40" ], - "weight": 100, "object": { "fill_ter": "t_floor_waxed", "rows": [ "...........```p.........", "...........```.##:#:#:##", - ".$$$$$$$$$$$;$$#BB|y I#", - ".$%!!!!!!!%```.#_t| @@#", - ".$%.[...X..```.#_S| @@#", - ".$^%%%%!!!%```.#+||b I#", + ".ŦŦŦŦŦŦŦŦŦŦŦɤŦŦ#BB|y ¤#", + ".Ŧ%!!!!!!!%```.#'t| @@#", + ".Ŧ%.[...X..```.#'S| @@#", + ".Ŧ^%%%%!!!%```.#+||b ¤#", "######%%%%%```.# :", - "#t__9##:###:*:##+||||Dd#", - ":8__||Q__Z|y I| |dD|||#", - "#BB_S|U__W|L r| + I#", + "#t''9##:###:*:##+||||Dd#", + ":8''||Q''Z|y÷I| |dD|||#", + "#BB'S|U''W|L r| + ¤#", "#||+|||+|||& &| | @@:", "#R + |s @@:", ": ||+|+||||||| |E b#", - "# |S_| 6|1234| ||||||#", - ": |t_| 6|O__AJ RRT#", - "#d |||||||4__AJ hh :", - "#d @@I|DD|5____ ff r :", - ": @@ |n__AJ ff rh :", - ": |7__JJ hh r y#", + "# |S'|'6|1234| ||||||#", + ": |t'|'6|O''AJ RRT#", + "#d |||||||4''AJ hh :", + "#d @@¤|DD|5'''' ff r :", + ": @@ |n''AJ ff rh :", + ": |7'''J hh r y#", ": ##::## #::#", "#yHHHy|DD#````: E E :...", - "##:::#####````/ lll :...", + "##:::#####````¶÷lll :...", "......^...````: HHH :...", "..........````#:::::#..." ], - "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_window_stained_blue", - "#": "t_rock_wall", - "A": "t_linoleum_gray", - "/": "t_door_glass_c", - "`": "t_concrete", - "_": "t_linoleum_gray", - "U": "t_linoleum_gray", - "Z": "t_linoleum_gray", - "W": "t_linoleum_gray", - "Q": "t_linoleum_gray", - "J": "t_linoleum_gray", - "1": "t_linoleum_gray", - "2": "t_linoleum_gray", - "3": "t_linoleum_gray", - "n": "t_linoleum_gray", - "4": "t_linoleum_gray", - "5": "t_linoleum_gray", - "7": "t_linoleum_gray", - "8": "t_linoleum_gray", - "9": "t_linoleum_gray", - "O": "t_linoleum_gray", - "F": "t_linoleum_gray", - "B": "t_linoleum_gray", - "S": "t_linoleum_gray", - "t": "t_linoleum_gray", - "$": "t_drystone_wall", - ";": "t_chaingate_l" - }, - "furniture": { "!": "f_region_flower" } - } - }, - { - "type": "mapgen", - "method": "json", - "//": "hoarder variant", - "weight": 1, - "om_terrain": [ "house_40" ], - "object": { - "fill_ter": "t_floor_waxed", - "rows": [ - "...........```p.........", - "...........```.##o#o#o##", - ".$$$$$$$$$$$;$$#BB|y~!I#", - ".$%0000?=?%```=#_t|!!@@#", - ".$%?[===X??```=#_S|b~@@#", - ".$^%%%?00?=```?#+||~~!I#", - "######%??=?```?#!~~!!~!o", - "#t__9##o###o*o##+||||Dd#", - "o8__||Q__Z|y~I|!~|dD|||#", - "#BB_S|U__W|L~r|!~+~~!!I#", - "#||+|||+|||&~&|~!|!!~@@o", - "#R~!+~~!~~~~!~~!!|s!~@@o", - "o~!||+|+|||||||~!|E~!!b#", - "#!~|S_|~6|1234|!~||||||#", - "o!~|t_|~6|O__AJ~!!!!RRT#", - "#d~|||||||4__AJ~!h~!!~!o", - "#d~@@I|DD|5____!ff!~r!!o", - "o~!@@~!!!|n__AJ!ff!~rh!o", - "o!!~~!~!!|7__JJ~hh~!r!y#", - "o!~!!!!!!##oo##!!!~!#oo#", - "#yHHHy|DD#````o!E~E!o...", - "##ooo#####````/~lll!o...", - "......^...````o!!HH!o...", - "..........````#ooooo#..." + "palettes": [ + "domestic_general_and_variant_palette", + "standard_domestic_lino_kitchen", + "standard_domestic_lino_bathroom", + "standard_domestic_landscaping_palette" ], - "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" ], - "0": "t_region_groundcover_urban", "&": "t_window_stained_blue", - "#": "t_rock_wall", + "'": "t_linoleum_gray", "A": "t_linoleum_gray", - "/": "t_door_glass_c", - "`": "t_concrete", - "_": "t_linoleum_gray", "U": "t_linoleum_gray", "Z": "t_linoleum_gray", - "W": "t_linoleum_gray", - "Q": "t_linoleum_gray", - "J": "t_linoleum_gray", - "1": "t_linoleum_gray", - "2": "t_linoleum_gray", - "3": "t_linoleum_gray", - "n": "t_linoleum_gray", - "4": "t_linoleum_gray", - "5": "t_linoleum_gray", - "7": "t_linoleum_gray", - "8": "t_linoleum_gray", - "9": "t_linoleum_gray", - "O": "t_linoleum_gray", - "F": "t_linoleum_gray", - "B": "t_linoleum_gray", - "S": "t_linoleum_gray", - "t": "t_linoleum_gray", - "$": "t_drystone_wall", - ";": "t_chaingate_l", - "!": "t_floor_waxed" - }, - "furniture": { "0": "f_region_flower" }, - "place_item": [ { "item": "feces_dog", "x": [ 2, 22 ], "y": [ 3, 18 ], "chance": 80, "repeat": [ 8, 12 ] } ], - "place_monster": [ { "monster": "mon_zombie_dog", "x": [ 2, 22 ], "y": [ 3, 18 ], "chance": 80, "repeat": [ 6, 10 ] } ] + "W": "t_linoleum_gray" + } } }, { @@ -149,29 +55,29 @@ "fill_ter": "t_shingle_flat_roof", "rows": [ " ", - " |22222223", - " |.......3", - " |.......3", - " |.......3", - " |.......3", - "|25222 |.......3", - "|....3222222222|.......3", - "|......................3", - "|......................3", - "|......................3", - "|......................3", - "|.................&....3", - "|......................3", - "|........N........=....3", - "|......................3", - "|......................3", - "|......................3", - "|......................3", - "|........3----|.....|--3", - "|........3 |.....3 ", - "|-----5--3 |.....3 ", - " |.....3 ", - " |-----3 " + " ---------", + " -.......-", + " -.......-", + " -.......-", + " -.......-", + "--5--- -.......-", + "-....-----------.......-", + "-......................-", + "-......................-", + "-......................-", + "-......................-", + "-.................&....-", + "-......................-", + "-........N........=....-", + "-......................-", + "-......................-", + "-......................-", + "-......................-", + "-........------.....----", + "-........- -.....- ", + "------5--- -.....- ", + " -.....- ", + " ------- " ], "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } diff --git a/data/json/mapgen/house/house42.json b/data/json/mapgen/house/house42.json index b1bfc0f59a67e..46262e79b04c5 100644 --- a/data/json/mapgen/house/house42.json +++ b/data/json/mapgen/house/house42.json @@ -3,7 +3,6 @@ "type": "mapgen", "method": "json", "om_terrain": [ "house_42" ], - "weight": 100, "object": { "fill_ter": "t_floor", "rows": [ @@ -13,60 +12,43 @@ "..#REII| d#.``..%%%%%%^.", "..oy h + D#!``!##oooo##.", "..# |||##o*##x Es #.", - "..# @@ |y L|x Ho.", - "..#I@@ + llH#.", + "..# @@ |y ÷L|x Ho.", + "..#¤@@ + llH#.", "..#||||| hfh HHHs#.", "..o8tS| hfh o.", - "..#9;;+ T| yRRR#.", - "..#||||;;;###&## ||||#.", - "..#F;JJ;AJ#jj~~# + dD#.", - "..o5;;;;AJ#j~~~#|+| o.", - "..#1;;;;;J#j~~~#S;| I#.", - "..#23O47;Y#~~~~ot;| @@o.", - "..##o##|;|#$$/$#BB|b I#.", - ".....^#W;6#````#####o##.", - "......#Z;6#.............", + "..#9''+ ÷T| yRRR#.", + "..#||||'''###¶## ||||#.", + "..#F'JJ'AJ#jj~~# + dD#.", + "..o5''''AJ#j~~~#|+| o.", + "..#1'''''J#j~~~#S'| ¤#.", + "..#23O47'Y#~~~~ot'| @@o.", + "..##o##|'|#$$/$#BB|b ¤#.", + ".....^#W'6#````#####o##.", + "......#Z'6#.............", "......##*##.............", "...[...............[....", "........................", ".............[.....[....", "........................" ], - "palettes": [ "standard_domestic_palette" ], + "palettes": [ + "domestic_general_and_variant_palette", + "standard_domestic_lino_kitchen", + "standard_domestic_lino_bathroom", + "standard_domestic_landscaping_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_brick_wall", - "&": "t_door_glass_c", "~": "t_thconc_floor", "j": "t_thconc_floor", - "`": "t_concrete", - "_": "t_pavement", - ";": "t_linoleum_white", - "J": "t_linoleum_white", - "1": "t_linoleum_white", - "2": "t_linoleum_white", - "3": "t_linoleum_white", - "4": "t_linoleum_white", - "5": "t_linoleum_white", - "7": "t_linoleum_white", - "8": "t_linoleum_white", - "O": "t_linoleum_white", - "F": "t_linoleum_white", - "B": "t_linoleum_white", - "S": "t_linoleum_white", - "t": "t_linoleum_white", - "A": "t_linoleum_white", - "6": "t_linoleum_white", - "Z": "t_linoleum_white", - "W": "t_linoleum_white", - "9": "t_linoleum_white", - "Y": "t_linoleum_white", + "'": "t_linoleum_gray", + "A": "t_linoleum_gray", + "Y": "t_linoleum_gray", + "W": "t_linoleum_gray", + "Z": "t_linoleum_gray", "$": "t_screened_porch_wall", "/": "t_screen_door_c" }, - "furniture": { "!": "f_region_flower", ":": [ "f_indoor_plant", "f_indoor_plant_y" ] }, + "furniture": { ":": [ "f_indoor_plant", "f_indoor_plant_y" ] }, "place_loot": [ { "item": "hose", "x": 19, "y": 18, "chance": 35 }, { "item": "television", "x": 16, "y": 5, "chance": 35 }, @@ -75,86 +57,6 @@ "place_vehicles": [ { "vehicle": "tricycle", "x": 13, "y": 14, "chance": 35, "rotation": 270 } ] } }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "house_42" ], - "//": "hoarder variant", - "weight": 1, - "object": { - "fill_ter": "t_floor", - "rows": [ - "............``p.........", - "............``....[.....", - "..##oo##o##.``..........", - "..#REII|!d#.``..%%%%%%^.", - "..oy~h!+~D#0``0##oooo##.", - "..#!!~!|||##o*##x~!Es!#.", - "..#!@@~|y!!!!~L|x!!~!!o.", - "..#I@@!+~!~!!~!~~!~llH#.", - "..#|||||!hf!!!~!!~HHHs#.", - "..o8tS|!~!fh!~~!~!!!!~o.", - "..#9;;+~!!~~~!T|!~yRRR#.", - "..#||||___###&##!~||||#.", - "..#F_JJ_AJ#jj=?#!~+~dD#.", - "..o5____AJ#j?=?#|+|!~!o.", - "..#1_____J#?=?=#S;|!~I#.", - "..#23O47_Y#===?ot;|!@@o.", - "..##o##|_|#$$/$#BB|b!I#.", - ".....^#W_6#````#####o##.", - "......#Z_6#.............", - "......##*##.............", - "...[...............[....", - "........................", - ".............[.....[....", - "........................" - ], - "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" ], - "0": "t_region_groundcover_urban", - "#": "t_brick_wall", - "&": "t_door_glass_c", - "=": "t_thconc_floor", - "?": "t_thconc_floor", - "j": "t_thconc_floor", - "`": "t_concrete", - ";": "t_linoleum_white", - "J": "t_linoleum_white", - "1": "t_linoleum_white", - "2": "t_linoleum_white", - "3": "t_linoleum_white", - "4": "t_linoleum_white", - "5": "t_linoleum_white", - "7": "t_linoleum_white", - "8": "t_linoleum_white", - "O": "t_linoleum_white", - "F": "t_linoleum_white", - "B": "t_linoleum_white", - "S": "t_linoleum_white", - "t": "t_linoleum_white", - "A": "t_linoleum_white", - "6": "t_linoleum_white", - "Z": "t_linoleum_white", - "W": "t_linoleum_white", - "9": "t_linoleum_white", - "Y": "t_linoleum_white", - "$": "t_screened_porch_wall", - "/": "t_screen_door_c" - }, - "furniture": { "0": "f_region_flower", ":": [ "f_indoor_plant", "f_indoor_plant_y" ] }, - "place_loot": [ - { "item": "hose", "x": 19, "y": 18, "chance": 35 }, - { "item": "television", "x": 16, "y": 5, "chance": 35 }, - { "item": "stereo", "x": 16, "y": 6, "chance": 35 } - ], - "place_monster": [ - { "monster": "mon_large_cockroach", "x": [ 3, 21 ], "y": [ 6, 15 ], "chance": 100, "repeat": [ 2, 6 ] }, - { "monster": "mon_plague_vector", "x": [ 3, 21 ], "y": [ 6, 15 ], "chance": 20 } - ] - } - }, { "type": "mapgen", "method": "json", @@ -164,24 +66,24 @@ "rows": [ " ", " ", - " |22222223 ", - " |.......3 ", - " |.......3 |2222253 ", - " |.......32222|......3 ", - " |..............X....3 ", - " |...................3 ", - " |...................3 ", - " |...................3 ", - " |...........N.......3 ", - " |...................3 ", - " |.....=.........&...3 ", - " |...................3 ", - " |...................3 ", - " |...................3 ", - " |---5...3----|......3 ", - " |...3 |------3 ", - " |...3 ", - " |---3 ", + " --------- ", + " -.......- ", + " -.......- ------5- ", + " -.......------......- ", + " -..............X....- ", + " -...................- ", + " -...................- ", + " -...................- ", + " -...........N.......- ", + " -...................- ", + " -.....=.........&...- ", + " -...................- ", + " -...................- ", + " -...................- ", + " ----5...------......- ", + " -...- -------- ", + " -...- ", + " ----- ", " ", " ", " ", diff --git a/data/json/mapgen_palettes/house_general_abandoned.json b/data/json/mapgen_palettes/house_general_abandoned.json index b4b46c794d034..4506b90fbc238 100644 --- a/data/json/mapgen_palettes/house_general_abandoned.json +++ b/data/json/mapgen_palettes/house_general_abandoned.json @@ -2,7 +2,8 @@ { "type": "palette", "id": "standard_domestic_palette_abandoned", - "//": "Intended as a palette for abandoned non-nested houses. Symbols still open for use: 0 ! $ % & _ = ~ ? / , ` and some symbols that conflict with json (like brackets).", + "//": "Intended as a palette for non-nested abandoned houses. Removes most furniture and item spawns, breaks doors and windows, applies bash damage to glass and furniture.", + "2//": "Symbols still open for use: 0 ! $ % & _ = ~ ? / , ` and some symbols that conflict with json (like brackets).", "parameters": { "interior_wall_type": { "type": "ter_str_id", @@ -127,12 +128,14 @@ "8": "f_cupboard", "9": "f_shower", "@": "f_bed", + "¤": "f_null", "₸": "f_null", "∞": "f_null", "≠": "f_null", "Ø": "f_null", "Æ": "f_null", - "ʭ": "f_ladder" + "ʭ": "f_ladder", + "é": "f_null" }, "terrain": { "Ŧ": { "param": "house_fence_type", "fallback": "t_fence" }, @@ -143,7 +146,7 @@ "t_chainfence": "t_chaingate_c", "t_fence": "t_fencegate_c", "t_privacy_fence": "t_privacy_fencegate_c", - "t_drystone_wall_half": "t_region_groundcover_urban" + "t_drystone_wall_half": "t_chaingate_l" } }, "a": "t_thconc_floor", @@ -202,6 +205,8 @@ }, "+": { "chunks": [ [ "destroyed_door_nested", 50 ], [ "null", 50 ] ] }, "*": { "chunks": [ [ "destroyed_door_nested", 50 ], [ "null", 50 ] ] }, + "¶": { "chunks": [ [ "1x1_bash", 10 ], [ "null", 90 ] ] }, + ":": { "chunks": [ [ "1x1_bash", 10 ], [ "null", 90 ] ] }, "Ŧ": { "chunks": [ [ "1x1_bash", 10 ], [ "null", 90 ] ] }, "^": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, "H": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, @@ -216,7 +221,9 @@ "O": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, "X": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, "ɤ": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, - "¶": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] } - } + "!": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, + "%": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] } + }, + "mapping": { "÷": { "item": { "item": "doormat", "chance": 10 } } } } ] diff --git a/data/json/mapgen_palettes/house_general_palette.json b/data/json/mapgen_palettes/house_general_palette.json index c82aa3c4dbcc1..d5219788e6dda 100644 --- a/data/json/mapgen_palettes/house_general_palette.json +++ b/data/json/mapgen_palettes/house_general_palette.json @@ -1,8 +1,25 @@ [ + { + "type": "palette", + "id": "domestic_general_and_variant_palette", + "//": "Standard variant distribution for homes: General: 95%, Abandoned: 2.80%, Survivor: 1.80%, Hoarder: 0.40%", + "//2": "Please don't forget to apply your changes to each house palette.", + "palettes": [ + { + "distribution": [ + [ "standard_domestic_palette", 9500 ], + [ "standard_domestic_palette_abandoned", 280 ], + [ "house_hoarder_palette", 40 ], + [ "house_survivor_palette", 180 ] + ] + } + ] + }, { "type": "palette", "id": "standard_domestic_palette", - "//": "Intended as a palette for non-nested houses. Symbols still open for use: 0 ! $ % & _ = ~ ? / , ` and some symbols that conflict with json (like brackets).", + "//": "Intended as a palette for non-nested houses. The default option for domestic buildings.", + "2//": "Symbols still open for use: 0 ! $ % & _ = ~ ? / , ` and some symbols that conflict with json (like brackets).", "parameters": { "interior_wall_type": { "type": "ter_str_id", @@ -115,7 +132,7 @@ "t_chainfence": "t_chaingate_c", "t_fence": "t_fencegate_c", "t_privacy_fence": "t_privacy_fencegate_c", - "t_drystone_wall_half": "t_region_groundcover_urban" + "t_drystone_wall_half": "t_chaingate_l" } }, "a": "t_thconc_floor", @@ -258,7 +275,8 @@ { "item": "games", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "allsporting", "chance": 5 } ] - } + }, + "mapping": { "÷": { "item": { "item": "doormat", "chance": 55 } } } }, { "type": "palette", @@ -324,7 +342,11 @@ "type": "palette", "id": "standard_domestic_party_palette", "//": "Intended to be used in conjunction with standard_domestic_palette. Load the domestic palette first, then this one to use open symbols for house party decorations.", - "terrain": { "?": "t_grass", "!": "t_grass", "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ] }, + "terrain": { + "?": "t_region_groundcover_urban", + "!": "t_region_groundcover_urban", + "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ] + }, "furniture": { "?": "f_chair", "!": "f_table" } } ] diff --git a/data/json/mapgen_palettes/house_survivor_palette.json b/data/json/mapgen_palettes/house_survivor_palette.json new file mode 100644 index 0000000000000..83668e4f88180 --- /dev/null +++ b/data/json/mapgen_palettes/house_survivor_palette.json @@ -0,0 +1,294 @@ +[ + { + "type": "palette", + "id": "house_survivor_palette", + "//": "Intended as a palette for non-nested survivor houses. Barricades doors and windows, replaces glass walls with sandbags, adds traps to doormat tiles, changes item groups to survivor variants, clutters floor with empty cans.", + "2//": "Symbols still open for use: 0 ! $ % & _ = ~ ? / , ` and some symbols that conflict with json (like brackets).", + "parameters": { + "interior_wall_type": { + "type": "ter_str_id", + "default": { + "distribution": [ + [ "t_wall_b", 1 ], + [ "t_wall_g", 1 ], + [ "t_wall_p", 1 ], + [ "t_wall_P", 1 ], + [ "t_wall_r", 1 ], + [ "t_wall_w", 6 ], + [ "t_wall_y", 1 ] + ] + } + }, + "exterior_wall_type": { + "type": "ter_str_id", + "default": { "distribution": [ [ "t_brick_wall", 6 ], [ "t_rock_wall", 3 ], [ "t_wall_wood", 3 ], [ "t_concrete_wall", 4 ] ] } + }, + "house_fence_type": { + "type": "ter_str_id", + "default": { + "distribution": [ + [ "t_splitrail_fence", 3 ], + [ "t_chainfence", 2 ], + [ "t_fence", 2 ], + [ "t_privacy_fence", 1 ], + [ "t_drystone_wall_half", 1 ] + ] + } + } + }, + "toilets": { "t": { } }, + "furniture": { + "a": "f_fireplace", + "b": "f_bigmirror", + "c": "f_statue", + "d": "f_dresser", + "e": "f_pool_table", + "f": "f_table", + "g": "f_water_heater", + "h": "f_chair", + "i": "f_bench", + "j": "f_bench", + "k": "f_woodstove", + "l": "f_coffee_table", + "m": "f_glass_fridge", + "n": "f_dishwasher", + "p": "f_mailbox", + "q": "f_rack", + "r": "f_desk", + "s": "f_table", + "u": "f_rotary_clothesline", + "v": [ "f_gun_safe_el", "f_safe_l" ], + "w": "f_rack_wood", + "x": "f_entertainment_center", + "y": [ "f_indoor_plant", "f_indoor_plant_y" ], + "z": "f_cardboard_box", + "A": "f_stool", + "B": "f_bathtub", + "C": "f_cupboard", + "D": "f_wardrobe", + "E": "f_armchair", + "F": "f_fridge", + "G": "f_camp_chair", + "H": "f_sofa", + "I": "f_desk", + "J": "f_counter", + "K": "f_tourist_table", + "L": "f_rack_coat", + "M": "f_displaycase", + "N": "f_workbench", + "O": [ "f_oven", "f_gas_oven_microwave_combo" ], + "P": "f_filing_cabinet", + "Q": "f_rack_wood", + "R": "f_bookcase", + "S": "f_sink", + "T": "f_floor_lamp", + "U": "f_utility_shelf", + "V": "f_glass_cabinet", + "W": "f_washer", + "X": "f_birdbath", + "Y": "f_trashcan", + "Z": "f_dryer", + "1": "f_cupboard", + "2": "f_cupboard", + "3": "f_cupboard", + "4": "f_cupboard", + "5": "f_sink", + "6": "f_rack_wood", + "7": "f_cupboard", + "8": "f_counter", + "9": "f_shower", + "@": "f_bed", + "¤": "f_table", + "₸": "f_deckchair", + "∞": "f_foot_locker", + "≠": "f_chest", + "Ø": "f_pinball_machine", + "Æ": "f_arcade_machine", + "ʭ": "f_ladder", + "é": "f_freezer", + ":": "f_sandbag_wall", + "¶": "f_sandbag_wall" + }, + "terrain": { + "Ŧ": { "param": "house_fence_type", "fallback": "t_fence" }, + "ɤ": { + "switch": { "param": "house_fence_type", "fallback": "t_fence" }, + "cases": { + "t_splitrail_fence": "t_splitrail_fencegate_c", + "t_chainfence": "t_chaingate_c", + "t_fence": "t_fencegate_c", + "t_privacy_fence": "t_privacy_fencegate_c", + "t_drystone_wall_half": "t_chaingate_l" + } + }, + "a": "t_thconc_floor", + "j": "t_region_groundcover_urban", + "p": "t_region_groundcover_urban", + "u": "t_region_groundcover_urban", + "X": "t_region_groundcover_urban", + ".": "t_region_groundcover_urban", + "+": [ [ "t_door_c", 3 ], [ "t_door_o", 3 ], [ "t_door_b", 1 ], [ "t_door_frame", 1 ], "t_door_boarded" ], + "*": [ [ "t_door_boarded", 5 ], [ "t_rdoor_boarded", 2 ], "t_rdoor_b", "t_door_b", "t_door_frame" ], + "^": "t_gutter_downspout", + "|": { "param": "interior_wall_type", "fallback": "t_wall_w" }, + "#": { "param": "exterior_wall_type", "fallback": "t_brick_wall" }, + "-": "t_sidewalk", + "o": [ + [ "t_window_boarded", 7 ], + [ "t_window_boarded_noglass", 5 ], + [ "t_window_reinforced", 3 ], + [ "t_window_reinforced_noglass", 2 ], + "t_window_frame", + "t_window_empty" + ], + "<": "t_wood_stairs_up", + ">": "t_wood_stairs_down" + }, + "liquids": { "g": { "liquid": "water_clean", "amount": [ 0, 100 ] } }, + "items": { + "a": { "item": "fireplace_fill", "chance": 30, "repeat": [ 2, 5 ] }, + "d": [ + { "item": "SUS_dresser_mens", "chance": 50, "repeat": [ 1, 2 ] }, + { "item": "SUS_dresser_womens", "chance": 50, "repeat": [ 1, 2 ] } + ], + "e": { "item": "pool_table", "chance": 30, "repeat": [ 1, 2 ] }, + "f": [ + { "item": "groce_condiment", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "dining", "chance": 10 }, + { "item": "cannedfood", "chance": 20, "repeat": [ 1, 2 ] } + ], + "k": { "item": "stash_wood", "chance": 30, "repeat": [ 2, 5 ] }, + "l": [ + { "item": "elecsto_persele", "chance": 10, "repeat": [ 1, 3 ] }, + { "item": "livingroom", "chance": 10, "repeat": [ 1, 3 ] } + ], + "s": [ + { "item": "consumer_electronics", "chance": 10, "repeat": [ 1, 3 ] }, + { "item": "livingroom", "chance": 10, "repeat": [ 1, 3 ] } + ], + "m": { "item": "SUS_fridge_survivor", "chance": 48 }, + "n": { "item": "SUS_dishwasher", "chance": 70 }, + "p": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }, + "q": [ + { "item": "tools_home", "chance": 40 }, + { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "mechanics", "chance": 1, "repeat": [ 1, 2 ] }, + { "item": "camping", "chance": 10 }, + { "item": "tools_survival", "chance": 5, "repeat": [ 1, 2 ] } + ], + "r": [ { "item": "office_paper", "chance": 5 }, { "item": "office", "chance": 25 } ], + "t": { "item": "SUS_toilet", "chance": 10, "repeat": [ 1, 3 ] }, + "v": [ + { "item": "art", "chance": 5 }, + { "item": "home_display_case", "chance": 30 }, + { "item": "harddrugs", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "maps", "chance": 2 }, + { "item": "guns_pistol_common", "chance": 50, "ammo": 90, "magazine": 100 }, + { "item": "gemstones", "chance": 30, "repeat": [ 1, 2 ] } + ], + "w": [ + { "item": "shower", "chance": 20 }, + { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "bed", "chance": 30, "repeat": [ 1, 2 ] } + ], + "x": { "item": "consumer_electronics", "chance": 10, "repeat": [ 1, 3 ] }, + "B": { "item": "shower", "chance": 10, "repeat": [ 1, 2 ] }, + "D": [ + { "item": "SUS_wardrobe_mens", "chance": 50, "repeat": [ 1, 2 ] }, + { "item": "SUS_wardrobe_womens", "chance": 50, "repeat": [ 1, 2 ] } + ], + "F": { "item": "SUS_fridge_survivor", "chance": 60 }, + "I": [ { "item": "SUS_desks_bedroom_unisex", "chance": 5 }, { "item": "office", "chance": 25 } ], + "J": [ { "item": "kitchen_counters", "chance": 5 }, { "item": "cannedfood", "chance": 50, "repeat": [ 1, 2 ] } ], + "L": { "item": "unisex_coat_rack", "chance": 30, "repeat": [ 1, 4 ] }, + "M": { "item": "home_display_case", "chance": 70 }, + "N": [ + { "item": "tools_common", "chance": 20, "repeat": [ 1, 2 ] }, + { "item": "hardware", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "cleaning", "chance": 10, "repeat": [ 1, 2 ] } + ], + "O": { "item": "SUS_oven", "chance": 100 }, + "P": { "item": "office_paper", "chance": 100 }, + "Q": [ + { "item": "shower", "chance": 20 }, + { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "bed", "chance": 30, "repeat": [ 1, 2 ] } + ], + "R": [ { "item": "homebooks", "chance": 40, "repeat": [ 1, 4 ] }, { "item": "games", "chance": 20, "repeat": [ 1, 2 ] } ], + "S": [ { "item": "SUS_bathroom_sink", "chance": 80 }, { "item": "SUS_bathroom_medicine", "chance": 60 } ], + "U": [ + { "item": "home_hw", "chance": 20, "repeat": [ 1, 2 ] }, + { "item": "cleaning", "chance": 40, "repeat": [ 1, 2 ] }, + { "item": "camping", "chance": 5, "repeat": [ 1, 2 ] } + ], + "V": { "item": "home_display_case", "chance": 50 }, + "Y": { "item": "trash", "chance": 30, "repeat": [ 1, 4 ] }, + "1": [ { "item": "SUS_dishes", "chance": 100 }, { "item": "SUS_silverware", "chance": 100 } ], + "2": { "item": "SUS_cookware", "chance": 100 }, + "3": [ { "item": "SUS_utensils", "chance": 50 }, { "item": "SUS_knife_drawer", "chance": 50 } ], + "4": { "item": "SUS_junk_drawer", "chance": 100 }, + "5": { "item": "SUS_kitchen_sink", "chance": 100 }, + "6": [ { "item": "SUS_pantry", "chance": 12 }, { "item": "cannedfood", "chance": 10, "repeat": [ 1, 2 ] } ], + "7": [ + { "item": "SUS_breakfast_cupboard", "chance": 30 }, + { "item": "SUS_coffee_cupboard", "chance": 50 }, + { "item": "SUS_spice_collection", "chance": 100 } + ], + "8": [ + { "item": "SUS_hair_drawer", "chance": 30 }, + { "item": "SUS_bathroom_cabinet", "chance": 30 }, + { "item": "SUS_bathroom_medicine", "chance": 40 }, + { "item": "harddrugs", "chance": 2 } + ], + "9": { "item": "shower", "chance": 30, "repeat": [ 1, 2 ] }, + "@": { "item": "bed", "chance": 50 }, + "¤": { "item": "nightstand", "chance": 30 }, + "Z": { "item": "laundry", "chance": 100 }, + "W": { "item": "laundry", "chance": 50 }, + "z": [ + { "item": "allsporting", "chance": 40, "repeat": [ 1, 2 ] }, + { "item": "chem_home", "chance": 50, "repeat": [ 1, 2 ] }, + { "item": "child_items", "chance": 30, "repeat": [ 1, 2 ] }, + { "item": "stash_drugs", "chance": 1 }, + { "item": "maps", "chance": 4 } + ], + "≠": [ + { "item": "toy_box", "chance": 80, "repeat": [ 1, 2 ] }, + { "item": "toy_store", "chance": 60, "repeat": [ 1, 2 ] }, + { "item": "games", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "allsporting", "chance": 5 } + ] + }, + "nested": { + "¶": { "chunks": [ [ "destroyed_glass_door_wall", 50 ], [ "null", 50 ] ] }, + ":": { "chunks": [ [ "destroyed_glass_door_wall", 50 ], [ "null", 50 ] ] } + }, + "mapping": { + "÷": { + "item": { "item": "doormat", "chance": 55 }, + "traps": [ + [ "tr_nailboard", 3 ], + [ "tr_tripwire", 3 ], + [ "tr_bubblewrap", 2 ], + [ "tr_beartrap", 2 ], + [ "tr_shotgun_2", 1 ], + [ "tr_shotgun_2_1", 1 ], + [ "tr_shotgun_1", 1 ], + [ "tr_null", 4 ] + ] + }, + " ": { + "item": [ + { "item": "can_food", "chance": 4 }, + { "item": "can_medium", "chance": 1 }, + { "item": "can_food_big", "chance": 1 }, + { "item": "jar_glass_sealed", "chance": 1 }, + { "item": "jar_3l_glass_sealed", "chance": 1 }, + { "item": "can_drink", "chance": 1 }, + { "item": "bottle_glass", "chance": 1 }, + { "item": "bottle_plastic", "chance": 1 } + ] + } + } + } +] diff --git a/data/json/mapgen_palettes/house_variant_palette.json b/data/json/mapgen_palettes/house_variant_palette.json index 7451fd09685b7..228d75c281aae 100644 --- a/data/json/mapgen_palettes/house_variant_palette.json +++ b/data/json/mapgen_palettes/house_variant_palette.json @@ -2,7 +2,8 @@ { "type": "palette", "id": "house_hoarder_palette", - "//": "Based on the standard_domestic_palette. Changes furniture and item spawns to give a choatic and cluttered interior. ! is used for placing random indoor storage furniture and associated random item spawns, ~ for indoor floor spawns. ? is used for outdoor storage furniture, = for outdoor floor spawns. Symbols still open for use: 0 $ % & / , ` and some symbols that conflict with json (like brackets).", + "//": "Intended as a palette for non-nested hoarder houses. Changes furniture and item spawns to give a choatic and cluttered interior, adds roach spawns.", + "2//": "Symbols still open for use: 0 ! $ % & _ = ~ ? / , ` and some symbols that conflict with json (like brackets).", "parameters": { "interior_wall_type": { "type": "ter_str_id", @@ -85,17 +86,19 @@ "8": "f_counter", "9": "f_shower", "@": "f_bed", + "¤": "f_table", "₸": "f_deckchair", "∞": "f_foot_locker", "≠": "f_chest", "Ø": "f_pinball_machine", "Æ": "f_arcade_machine", "ʭ": "f_ladder", - "!": [ + "é": "f_freezer", + " ": [ [ "f_chest", 2 ], [ "f_crate_c", 5 ], [ "f_crate_o", 5 ], - [ "f_cardboard_box", 80 ], + [ "f_cardboard_box", 100 ], [ "f_dresser", 20 ], [ "f_rack", 10 ], [ "f_bookcase", 45 ], @@ -103,10 +106,9 @@ [ "f_rack_coat", 5 ], [ "f_safe_l", 1 ], [ "f_wardrobe", 20 ], - [ "f_mannequin", 5 ] - ], - "?": [ [ "f_crate_c", 2 ], [ "f_crate_o", 10 ], [ "f_rack", 2 ], [ "f_gas_tank_smashed", 1 ], [ "f_dumpster", 5 ] ], - "_": [ [ "f_cardboard_box", 20 ], [ "f_crate_o", 5 ], [ "f_wardrobe", 4 ], [ "f_bookcase", 4 ], [ "f_null", 67 ] ] + [ "f_mannequin", 5 ], + [ "f_null", 650 ] + ] }, "terrain": { "Ŧ": "t_privacy_fence", @@ -127,15 +129,9 @@ "-": "t_sidewalk", "o": [ [ "t_window_boarded", 10 ], [ "t_curtains", 90 ] ], "<": "t_wood_stairs_up", - ">": "t_wood_stairs_down", - "?": "t_region_groundcover_urban", - "=": "t_region_groundcover_urban", - "_": "t_linoleum_white" - }, - "liquids": { - "g": { "liquid": "water_clean", "amount": [ 0, 100 ] }, - "~": [ { "liquid": "coffee", "chance": 30 }, { "liquid": "cola", "chance": 30 }, { "liquid": "oj", "chance": 30 } ] + ">": "t_wood_stairs_down" }, + "liquids": { "g": { "liquid": "water_clean", "amount": [ 0, 100 ] } }, "items": { "a": [ { "item": "fireplace_fill", "chance": 30, "repeat": [ 2, 5 ] }, @@ -284,6 +280,7 @@ ], "9": [ { "item": "shower", "chance": 30, "repeat": [ 1, 2 ] }, { "item": "hoarder", "chance": 80, "repeat": [ 2, 4 ] } ], "@": [ { "item": "bed", "chance": 50 }, { "item": "hoarder", "chance": 80, "repeat": [ 2, 4 ] } ], + "¤": { "item": "nightstand", "chance": 30 }, "Z": [ { "item": "laundry", "chance": 100 }, { "item": "hoarder", "chance": 80, "repeat": [ 2, 4 ] } ], "W": [ { "item": "laundry", "chance": 50 }, { "item": "hoarder", "chance": 80, "repeat": [ 2, 4 ] } ], "z": [ @@ -304,11 +301,10 @@ "h": { "item": "hoarder", "chance": 80, "repeat": [ 2, 3 ] }, "E": { "item": "hoarder", "chance": 80, "repeat": [ 2, 3 ] }, "H": { "item": "hoarder", "chance": 80, "repeat": [ 2, 3 ] }, - "!": { "item": "hoarder", "chance": 80, "repeat": [ 5, 8 ] }, - "~": { "item": "hoarder", "chance": 80, "repeat": [ 4, 6 ] }, - "?": { "item": "hoarder", "chance": 80, "repeat": [ 5, 10 ] }, - "=": { "item": "hoarder", "chance": 80, "repeat": [ 4, 8 ] }, - "_": { "item": "hoarder", "chance": 90, "repeat": [ 2, 4 ] } - } + " ": { "item": "hoarder", "chance": 50, "repeat": [ 5, 8 ] }, + "'": { "item": "hoarder", "chance": 33, "repeat": [ 2, 3 ] } + }, + "mapping": { "÷": { "item": { "item": "doormat", "chance": 55, "repeat": [ 1, 3 ] } } }, + "monster": { " ": { "group": "GROUP_ROACH", "chance": 5 }, "'": { "group": "GROUP_ROACH", "chance": 7 } } } ]