From 3a76551967cbb20214436a096e17e6beb0f369eb Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sat, 30 Nov 2019 20:01:53 -0500 Subject: [PATCH] add cabin roofs --- data/json/mapgen/cabin.json | 925 +++++++++--------- data/json/mapgen_palettes/cabin.json | 30 +- data/json/mapgen_palettes/roof_palette.json | 1 + .../overmap/overmap_special/specials.json | 75 +- .../overmap_terrain/overmap_terrain.json | 158 +++ 5 files changed, 717 insertions(+), 472 deletions(-) diff --git a/data/json/mapgen/cabin.json b/data/json/mapgen/cabin.json index cbfcc8d578e93..a61a9698d927d 100644 --- a/data/json/mapgen/cabin.json +++ b/data/json/mapgen/cabin.json @@ -12,7 +12,7 @@ "-...#######...*********-", "-...#LCCCL#........****-", "-...W W...###....**-", - "-...# #...#.#.***.*-", + "-...# #...#L#.***.*-", "-...###+###...#=#..****-", "-......~~~....~~~~..***-", "-........~~~~~~.......*-", @@ -26,7 +26,7 @@ "-..#dOOO cttc #..-", "-..##### 3#.*-", "-..w = u#.*-", - "-..wBBD# 152u#.*-", + "-..wBBD# 152u#%*-", "-..#####ww##+###ww###.*-", "-********..~~P.......**-", "-********..~~..********-", @@ -39,14 +39,50 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "cabin" ], + "om_terrain": "cabin_roof", + "object": { + "fill_ter": "t_tar_flat_roof", + "rows": [ + " ", + " ", + " ....... ", + " ....... ", + " ....... ... ", + " ....... ... ", + " ....... ... ", + " ", + " ", + " |22222222222222223 ", + " |................3 ", + " |..~.............3 ", + " |................3 ", + " |................3 ", + " |................3 ", + " |................3 ", + " |................3 ", + " |................3 ", + " |................3 ", + " |................5 ", + " |----------------3 ", + " ", + " ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_tar_flat_roof" } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cabin_1" ], "weight": 500, "object": { "fill_ter": "t_floor", "rows": [ "........................", "........................", - "........................", + "...%....................", "..######w##++#########..", "..#R d#sT# #A DBBD #..", "..#R c# # #A BB w..", @@ -91,7 +127,43 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "cabin" ], + "om_terrain": "cabin_roof_1", + "object": { + "fill_ter": "t_tar_flat_roof", + "rows": [ + " ", + " ", + " ", + " |5222222222222222223 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |..................3 ", + " |................~.3 ", + " |..................3 ", + " |------------------3 ", + " .................... ", + " .................... ", + " .................... ", + " .................... ", + " ", + " ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_tar_flat_roof" } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "cabin_2" ], "weight": 333, "object": { "fill_ter": "t_floor", @@ -117,7 +189,7 @@ ".#BB cd#BB #s +~", ".#BB A#BB AA# hh#.", ".###ww#ww#####ww#######.", - ".*********************..", + ".********************%..", "************************", "************************" ], @@ -128,57 +200,64 @@ } }, { + "type": "mapgen", "method": "json", + "om_terrain": "cabin_roof_2", "object": { - "furniture": { - "#": "f_bed", - "&": "f_trashcan", - "+": "f_null", - ".": "f_null", - "C": "f_counter", - "O": "f_standing_tank", - "S": "f_sink", - "T": "f_toilet", - "W": "f_woodstove", - "_": "f_null", - "Q": "f_fridge", - "b": "f_bench", - "c": "f_chair", - "f": "f_null", - "Y": "f_rack_coat", - "s": "f_sink", - "t": "f_table", - "w": "f_null", - "|": "f_null" - }, - "items": { - "#": { "item": "bed", "chance": 20 }, - "t": { "item": "dining", "chance": 15 }, - "Y": { "item": "coat_rack", "chance": 30 } - }, - "place_items": [ - { "chance": 20, "item": "kitchen", "x": 11, "y": 10 }, - { "chance": 20, "item": "kitchen", "x": 11, "y": 8 }, - { "chance": 35, "item": "trash", "x": 11, "y": 6 }, - { "chance": 35, "item": "fridge", "x": 11, "y": 7 } + "fill_ter": "t_tar_flat_roof", + "rows": [ + " ", + " ", + " ", + " ", + " ...................... ", + " ...................... ", + " ...................... ", + " |222222222222222222223 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |.~..................3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |....................3 ", + " |-------------------53 ", + " ", + " ", + " " ], - "place_toilets": [ { "x": 11, "y": 13 } ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_tar_flat_roof" } + } + }, + { + "method": "json", + "om_terrain": "cabin_3", + "type": "mapgen", + "weight": 350, + "object": { + "fill_ter": "t_floor", "rows": [ "........................", "........................", "........._____________..", "........_______________.", "........_______________.", - "........__||ww|+|ww||__.", - "........__|&ffffffff|__.", - "........__wQffffff##w__.", - "........__wCfffccfffw__.", - "........__|Wfffttf##|__.", - "........__|Csffttfff|__.", - "........__||||fccf##w__.", - "........_O|Sf+ffff##w__.", - "........__|Tf|Yfffff|__.", - "........__|||||+|ww||__.", + "........__##ww#+#ww##__.", + "........__#14& OOO#__.", + "........__wF Ow__.", + "........__w2 cc Ow__.", + "........__#S tt A#__.", + "........__#35 cc A#__.", + "........__#### w__.", + "........_0#s + B BBw__.", + "........_%#T #Y BDBB#__.", + "........__#####+#ww##__.", "........___bbb_________.", "........_______________.", "........._____________..", @@ -189,105 +268,86 @@ "........................", "........................" ], + "palettes": [ "cabin_palette" ], "terrain": { - "#": "t_floor", - "&": "t_floor", - "+": "t_door_c", ".": [ - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", + [ "t_grass", 6 ], "t_dirt", - "t_tree_pine", - "t_tree_pine", "t_tree_dead", "t_tree_maple", - "t_tree", "t_tree_young", - "t_underbrush", - "t_underbrush", - "t_underbrush" + "t_tree", + [ "t_tree_pine", 2 ], + [ "t_underbrush", 3 ] ], - "C": "t_floor", - "O": "t_grass", - "S": "t_floor", - "Q": "t_floor", - "T": "t_floor", - "Y": "t_floor", - "W": "t_floor", - "_": [ "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass" ], - "b": "t_grass", - "c": "t_floor", - "f": "t_floor", - "s": "t_door_c", - "t": "t_floor", - "w": "t_window_domestic", - "|": "t_wall_log" + "0": "t_grass", + "_": [ "t_dirt", [ "t_grass", 6 ] ], + "b": "t_grass" } - }, - "om_terrain": "cabin", - "type": "mapgen", - "weight": 350 + } }, { + "type": "mapgen", "method": "json", + "om_terrain": "cabin_roof_3", "object": { - "furniture": { - "#": "f_bed", - "&": "f_sink", - "+": "f_null", - ".": "f_null", - "C": "f_chair", - "F": "f_fridge", - "H": "f_armchair", - "T": "f_trashcan", - "^": "f_indoor_plant", - "_": "f_null", - "a": "f_toilet", - "b": "f_brazier", - "c": "f_counter", - "f": "f_null", - "o": "f_oven", - "Y": "f_rack_coat", - "t": "f_table", - "w": "f_null", - "{": "f_bookcase", - "|": "f_null" - }, - "items": { - "#": { "item": "bed", "chance": 20 }, - "Y": { "item": "coat_rack", "chance": 30 }, - "{": { "item": "homebooks", "chance": 40 }, - "t": { "item": "dining", "chance": 10 } - }, - "place_items": [ - { "chance": 35, "item": "trash", "x": 5, "y": 6 }, - { "chance": 30, "item": "fridge", "x": 4, "y": 9 }, - { "chance": 30, "item": "oven", "x": 4, "y": 8 } + "fill_ter": "t_tar_flat_roof", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " |2222222223 ", + " |.........3 ", + " |.........3 ", + " |.........3 ", + " |~........3 ", + " |.........3 ", + " |.........3 ", + " |.........3 ", + " 5.........3 ", + " |---------3 ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " ], - "place_toilets": [ { "x": 4, "y": 15 } ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_tar_flat_roof" } + } + }, + { + "method": "json", + "om_terrain": "cabin_4", + "type": "mapgen", + "weight": 350, + "object": { + "fill_ter": "t_floor", "rows": [ "........................", "........................", "........................", ".._________________.....", ".._________________.....", - ".._|||ww|+|w||ww||_.....", - ".._|cTcfffYff^HtH|_.....", - ".._w&fcffffffffffw_.....", - ".._wofcffCttffff{|_.....", - ".._|FfcffCttffff{|_.....", - ".._|ffffffCCf|ww||_.....", - ".._wfffffffff+_____.....", - ".._|^ffff|||f|_____.....", - ".._|||+|fffff|b___......", - ".._|fff|##f##|____......", - ".._|af&|##f##|____......", - ".._||||||w|w||___.......", - ".._______________.......", + ".._###ww#+#w##ww##_.....", + ".._#F&C Y yata#_.....", + ".._w5 Cl w_.....", + ".._wS Cl ctc O A#_.....", + ".._#1 Cl ctc O A#_.....", + ".._#2 #ww##_.....", + ".._w3 RRR +_____.....", + ".._#4R y ### #_____.....", + ".._###+# #z___......", + ".._# #BB BB#____......", + "..0#T&s#BBDBB#____......", + ".._######w#w##___.......", + "..__%____________.......", "........................", "........................", "........................", @@ -295,222 +355,169 @@ "........................", "........................" ], + "palettes": [ "cabin_palette" ], "terrain": { - "#": "t_floor", - "&": "t_floor", - "+": "t_door_c", ".": [ - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", + [ "t_grass", 6 ], "t_dirt", - "t_tree_pine", - "t_tree_pine", "t_tree_dead", "t_tree_maple", - "t_tree", "t_tree_young", - "t_underbrush", - "t_underbrush", - "t_underbrush" + "t_tree", + [ "t_tree_pine", 2 ], + [ "t_underbrush", 3 ] ], - "C": "t_floor", - "F": "t_floor", - "H": "t_floor", - "Y": "t_floor", - "T": "t_floor", - "^": "t_floor", - "_": [ "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass" ], - "a": "t_floor", - "b": "t_dirt", - "c": "t_floor", - "f": "t_floor", - "o": "t_floor", - "t": "t_floor", - "w": "t_window_domestic", - "{": "t_floor", - "|": "t_wall_log" + "0": "t_grass", + "z": "t_grass", + "_": [ "t_dirt", [ "t_grass", 6 ] ] } - }, - "om_terrain": "cabin", - "type": "mapgen", - "weight": 350 + } }, { + "type": "mapgen", "method": "json", + "om_terrain": "cabin_roof_4", "object": { - "furniture": { - "#": "f_bed", - "&": "f_trashcan", - "+": "f_null", - ".": "f_null", - "C": "f_counter", - "F": "f_fridge", - "H": "f_sofa", - "T": "f_toilet", - "W": "f_woodstove", - "_": "f_null", - "a": "f_cupboard", - "c": "f_chair", - "f": "f_null", - "s": "f_sink", - "Y": "f_rack_coat", - "t": "f_table", - "w": "f_null", - "{": "f_bookcase", - "|": "f_null" - }, - "items": { - "#": { "item": "bed", "chance": 20 }, - "Y": { "item": "coat_rack", "chance": 30 }, - "{": { "item": "homebooks", "chance": 40 }, - "t": { "item": "dining", "chance": 15 } - }, - "place_items": [ - { "chance": 25, "item": "kitchen", "x": 17, "y": 10 }, - { "chance": 25, "item": "kitchen", "x": 16, "y": 10 }, - { "chance": 35, "item": "trash", "x": 13, "y": 12 }, - { "chance": 35, "item": "fridge", "x": 14, "y": 12 }, - { "chance": 30, "item": "cannedfood", "x": 17, "y": 12 }, - { "chance": 30, "item": "cannedfood", "x": 17, "y": 11 }, - { "chance": 10, "item": "magazines", "x": 11, "y": 10 }, - { "chance": 10, "item": "magazines", "x": 11, "y": 9 } + "fill_ter": "t_tar_flat_roof", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " |22222222222223 ", + " |.............3 ", + " |.............3 ", + " |~............3 ", + " |.............3 ", + " |.........3---3 ", + " |.........3 ", + " |.........3 ", + " |.........3 ", + " |.........3 ", + " |.........3 ", + " |5--------3 ", + " ", + " ", + " ", + " ", + " ", + " ", + " " ], - "place_toilets": [ { "x": 4, "y": 19 } ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_tar_flat_roof" } + } + }, + { + "method": "json", + "om_terrain": "cabin_5", + "type": "mapgen", + "weight": 350, + "object": { + "fill_ter": "t_floor", "rows": [ "........................", "........................", ".......__________.......", ".....______________.....", "....________________....", - "...._||w|||+||ww|||_....", - "...._|##f|Yffffcff|_....", - "...._w##f|fffffttcw_....", - "...._|fff|fHffcttf|_....", - "...._|||fffHffffcf|_....", - "...._|fff|fHffCCCa|_....", - "...._w##f|fffffffaw_....", - "...._|##f|{ff&sWFa|_....", - "...._||w|||+||ww|||_....", - "....________________....", + "...._##w###+##ww###_....", + "...._#BBD#Y c #_....", + "...._wBB # ttcw_....", + "...._# # O ctt #_....", + "...._### O c #_....", + "...._#D # O CCC1#_....", + "...._wBB # 2w_....", + "...._#BB #A &sSF3#_....", + "...._##w###+##ww###_....", + "....__%_____________....", ".....______________.....", "..........__............", ".._____..___............", - ".._|||_____.............", - ".._|T+____..............", - ".._|||_.................", + ".._###_____.............", + ".._#T+____..............", + ".._###_.................", ".._____.................", "........................", "........................" ], + "palettes": [ "cabin_palette" ], "terrain": { - "#": "t_floor", - "&": "t_floor", - "+": "t_door_c", ".": [ - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", + [ "t_grass", 6 ], "t_dirt", - "t_dirt", - "t_dirt", - "t_tree_pine", - "t_tree_young", - "t_tree_young", + "t_tree_dead", "t_tree_maple", - "t_tree", "t_tree_young", - "t_underbrush", - "t_underbrush", - "t_underbrush" + "t_tree", + [ "t_tree_pine", 2 ], + [ "t_underbrush", 3 ] ], - "C": "t_floor", - "F": "t_floor", - "H": "t_floor", - "Y": "t_floor", - "T": "t_floor", - "W": "t_floor", - "_": [ "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass" ], - "a": "t_floor", - "c": "t_floor", - "f": "t_floor", - "s": "t_floor", - "t": "t_floor", - "w": "t_window_domestic", - "{": "t_floor", - "|": "t_wall_wood" + "_": [ "t_dirt", [ "t_grass", 6 ] ] } - }, - "om_terrain": "cabin", - "type": "mapgen", - "weight": 350 + } }, { + "type": "mapgen", "method": "json", + "om_terrain": "cabin_roof_5", "object": { - "furniture": { - "#": "f_bed", - "&": "f_sink", - "+": "f_null", - ".": "f_null", - "C": "f_counter", - "T": "f_trashcan", - "_": "f_null", - "a": "f_cupboard", - "b": "f_bench", - "c": "f_chair", - "d": "f_toilet", - "f": "f_null", - "o": "f_oven", - "r": "f_null", - "t": "f_table", - "w": "f_null", - "{": "f_fridge", - "|": "f_null" - }, - "items": { - "#": { "item": "bed", "chance": 20 }, - "C": { "item": "kitchen_nonfood", "chance": 10 }, - "t": { "item": "dining", "chance": 15 } - }, - "place_items": [ - { "chance": 30, "item": "oven", "x": 9, "y": 8 }, - { "chance": 35, "item": "trash", "x": 13, "y": 8 }, - { "chance": 35, "item": "fridge", "x": 10, "y": 8 }, - { "chance": 35, "item": "magazines", "x": 14, "y": 6 }, - { "chance": 35, "item": "pantry", "x": 7, "y": 8 } + "fill_ter": "t_tar_flat_roof", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " |2222222222223 ", + " |............3 ", + " |............3 ", + " |............3 ", + " |............3 ", + " |............3 ", + " |............3 ", + " |.........~..3 ", + " |5-----------3 ", + " ", + " ", + " ", + " ", + " ... ", + " ... ", + " ... ", + " ", + " ", + " " ], - "place_toilets": [ { "x": 13, "y": 14 } ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_tar_flat_roof" } + } + }, + { + "method": "json", + "om_terrain": "cabin_6", + "type": "mapgen", + "weight": 350, + "object": { + "fill_ter": "t_floor", "rows": [ "........................", "........................", ".........._____.........", "........_________.......", - "........_|w|r|w|_.......", - "........_wbfffcw_.......", - ".....____|bffct|____....", - "....._||w|||=|||w||_....", - "...___|a&o{ffT|f##|_....", - "...___wfffffff|f##w_....", - "..____wfCCCfff=fff|_....", - "..____|fCCCfff|||||_....", - "..____+fffffff=fff|_....", - "...___|cttc|=||f##w_....", - "...___|cttc|fd|f##|_....", - "....._||ww||||||w||_....", + "........_#w#+#w#_.......", + "........_wb cw_.......", + ".....____#b ct#____....", + "....._##w###=###w##_....", + "...___#15SFR &# BB#_....", + "...___w2 R# BBw_....", + "..____w3 CC + D#_....", + "..____#y ll #####%....", + "..____+ + D#_....", + "...___#cttc#+## BBw_....", + "...___#cttc# T# BB#_....", + "....._##ww######w##_....", "....._______________....", "........................", "........................", @@ -520,188 +527,145 @@ "........................", "........................" ], + "palettes": [ "cabin_palette" ], "terrain": { - "#": "t_floor", - "&": "t_floor", - "=": [ "t_door_c", "t_door_o" ], - "+": "t_door_c", ".": [ - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_dirt", + [ "t_grass", 6 ], "t_dirt", - "t_tree_young", + "t_tree_dead", "t_tree_maple", - "t_tree", "t_tree_young", - "t_underbrush", - "t_underbrush" + "t_tree", + [ "t_tree_pine", 2 ], + [ "t_underbrush", 3 ] ], - "C": "t_floor", - "T": "t_floor", - "_": [ "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass" ], - "a": "t_floor", - "b": "t_floor", - "c": "t_floor", - "d": "t_floor", - "f": "t_floor", - "o": "t_floor", - "r": "t_reinforced_door_glass_c", - "t": "t_floor", - "w": "t_window_domestic", - "{": "t_floor", - "|": "t_wall_wood" + "_": [ "t_dirt", [ "t_grass", 6 ] ] } - }, - "om_terrain": "cabin", - "type": "mapgen", - "weight": 350 + } }, { + "type": "mapgen", "method": "json", + "om_terrain": "cabin_roof_6", "object": { - "furniture": { - "#": "f_bed", - "&": "f_sink", - "+": "f_null", - ".": "f_null", - "C": "f_cupboard", - "D": "f_null", - "F": "f_fireplace", - "G": "f_null", - "H": "f_sofa", - "T": "f_table", - "W": "f_null", - "_": "f_null", - "a": "f_null", - "b": "f_bench", - "c": "f_chair", - "d": "f_null", - "e": "f_counter", - "f": "f_null", - "g": "f_fridge", - "h": "f_toilet", - "i": "f_trashcan", - "o": "f_oven", - "s": "f_null", - "t": "f_table", - "w": "f_null", - "{": "f_dresser", - "|": "f_null" - }, - "items": { "#": { "item": "bed", "chance": 20 }, "t": { "item": "dining", "chance": 15 } }, - "place_items": [ - { "chance": 55, "item": "clothing_male", "x": 20, "y": 10 }, - { "chance": 55, "item": "clothing_male", "x": 19, "y": 6 }, - { "chance": 15, "item": "kitchen_nonfood", "x": 14, "y": 3 }, - { "chance": 30, "item": "oven", "x": 14, "y": 4 }, - { "chance": 55, "item": "clothing_female", "x": 21, "y": 10 }, - { "chance": 55, "item": "clothing_female", "x": 19, "y": 8 }, - { "chance": 35, "item": "trash", "x": 14, "y": 5 }, - { "chance": 10, "item": "misc_smoking", "x": 20, "y": 18 }, - { "chance": 15, "item": "produce", "x": 14, "y": 10 }, - { "chance": 35, "item": "fridge", "x": 15, "y": 3 }, - { "chance": 35, "item": "pantry", "x": 17, "y": 3 }, - { "chance": 35, "item": "pantry", "x": 18, "y": 3 }, - { "chance": 15, "item": "snacks", "x": [ 15, 16 ], "y": 11 } + "fill_ter": "t_tar_flat_roof", + "rows": [ + " ", + " ", + " ", + " ", + " |222223 ", + " |.....3 ", + " |.....3 ", + " |22|.....3223 ", + " |..~........3 ", + " |...........3 ", + " |...........3 ", + " |...........5 ", + " |...........3 ", + " |...........3 ", + " |...........3 ", + " |-----------3 ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " ], - "place_toilets": [ { "x": 21, "y": 3 } ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_tar_flat_roof" } + } + }, + { + "method": "json", + "om_terrain": "cabin_7", + "type": "mapgen", + "weight": 350, + "object": { + "fill_ter": "t_floor", "place_vehicles": [ { "chance": 60, "fuel": 30, "rotation": 90, "status": -1, "vehicle": "forgotten_vehicles", "x": 8, "y": 7 } ], "rows": [ "________________________", "______..................", - "_____........|||aa|||||.", - "_____........|eg&CC|&h|.", - "_____........aoffffDff|.", - "_____........|ifff|||||.", - "_____........+ffff|{##a.", - "_____........|ffffDfff|.", - "_____........|ccff|{##a.", - "_____........attcf|||||.", - "____.........attcfDf{{|.", - "___.WWddW....|HHHf|fff|.", - "__.WwwddwW...|ffff|f##a.", - "__.Wwwddwss..|FFFf|f##a.", - "__swwwddwwss.||||+||aa|.", - "_.WwwwwwwwwW......______", - "_swwwwwwwwwwWWW..._...._", - "_swwwwwwwwwwwssdWW..bb._", - "_sswwwwwwwwwwwwdwWW.TT._", - "_.WwwwwwwwwwwwGdwwW.TT._", - "_.WswwwwwwwwwwwwwwW.bb._", - "_.WWWwwwwwwwwwwwwWW...._", - "__..WWwwssswwwwwWW._____", - "______ss___sssss________" + "_____........###ww#####.", + "_____........#F1s23#sT#.", + "_____........wS + #.", + "_____........#C #####.", + "_____........+ #DBBw.", + "_____........# + #.", + "_____........#cc #DBBw.", + "_____........wttc #####.", + "____.........wttc + DD#.", + "___.qq>>q....#OOO # #%", + "__.qQQ>>Qq...# # BBw.", + "__.qQQ>>Qqq..#AZA # BBw.", + "__qQQQ>>QQqq.####+##ww#.", + "_.qQQQQQQQQq......______", + "_qQQQQQQQQQQqqq..._...._", + "_qQQQQQQQQQQQqq>qq..bb._", + "_qqQQQQQQQQQQQQ>Qqq...._", + "_.qQQQQQQQQQQQG>QQq...._", + "_.qqQQQQQQQQQQGQQQq.bb._", + "_.qqqQQQQQQQQQQQQQq...._", + "__..qqQQqqqQQQQQqq._____", + "______qq___qqqqq________" ], + "palettes": [ "cabin_palette" ], "terrain": { - "#": "t_floor", - "&": "t_floor", - "+": "t_door_c", - ".": [ "t_dirt", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass" ], - "C": "t_floor", - "D": [ "t_door_c", "t_door_o" ], - "F": "t_floor", + ".": [ "t_dirt", [ "t_grass", 6 ] ], "G": "t_slide", - "H": "t_floor", - "T": "t_dirt", - "W": "t_water_sh", "_": [ - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_grass", - "t_dirt", - "t_dirt", - "t_dirt", + [ "t_grass", 13 ], + [ "t_dirt", 3 ], "t_tree_willow", - "t_tree_pine", - "t_tree", - "t_tree_pine", - "t_tree", - "t_tree_young", - "t_tree_young", - "t_tree_young", - "t_underbrush", - "t_underbrush", - "t_underbrush", - "t_underbrush" + [ "t_tree_pine", 2 ], + [ "t_tree", 2 ], + [ "t_tree_young", 3 ], + [ "t_underbrush", 4 ] ], - "a": "t_window_domestic", - "b": "t_dirt", - "c": "t_floor", - "d": "t_dock", - "e": "t_floor", - "f": "t_floor", - "g": "t_floor", - "h": "t_floor", - "i": "t_floor", - "o": "t_floor", - "s": "t_swater_sh", - "t": "t_floor", - "w": "t_water_dp", - "{": "t_floor", - "|": "t_wall_log" + ">": "t_dock", + "b": "t_grass" } - }, - "om_terrain": "cabin", + } + }, + { "type": "mapgen", - "weight": 350 + "method": "json", + "om_terrain": "cabin_roof_7", + "object": { + "fill_ter": "t_tar_flat_roof", + "rows": [ + " ", + " ", + " |222222223 ", + " |........3 ", + " |~.......3 ", + " |........3 ", + " |........3 ", + " |........3 ", + " |........3 ", + " |........3 ", + " |........3 ", + " |........5 ", + " |........3 ", + " |........3 ", + " |--------3 ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_tar_flat_roof" } + } }, { "type": "mapgen", @@ -732,7 +696,7 @@ " w.............|d.bb.| ", " |.............+..bb.w ", " |-+|-w-==-w-|-|.....| ", - " |L.|ssssssss|r+.....| ", + " 4|L.|ssssssss|r+.....| ", " |--|ssssssss|-|--w--| ", " ssCssssCss ", " ^ ^ " @@ -750,7 +714,7 @@ " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], "%": "t_shrub", "+": "t_door_c", - "-": "t_wall", + "-": "t_wall_w", "=": "t_door_boarded", ">": "t_stairs_down", "C": "t_column", @@ -761,7 +725,8 @@ "f": "t_fence_h", "s": "t_sidewalk", "w": "t_window_boarded", - "|": "t_wall" + "|": "t_wall_w", + "4": "t_gutter_downspout" }, "furniture": { "A": "f_armchair", @@ -838,5 +803,41 @@ { "monster": "mon_blood_sacrifice", "x": 4, "y": 21, "repeat": 1 } ] } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": "cabin_strange_roof", + "object": { + "fill_ter": "t_tar_flat_roof", + "rows": [ + " ", + " ", + " ", + " ", + " |222223 ", + " |.....3 ", + " |222|.....3 |2223 ", + " |.........3-----|...3 ", + " |...................3 ", + " |...................3 ", + " |...................3 ", + " |...................3 ", + " |...................3 ", + " |...................3 ", + " |...................3 ", + " |...................3 ", + " |...................3 ", + " |...................3 ", + " |...................3 ", + " |..3--------|.......3 ", + " 5..3oooooooo|.......3 ", + " |--3oooooooo|-------3 ", + " oooooooooo ", + " " + ], + "palettes": [ "roof_palette" ], + "terrain": { ".": "t_tar_flat_roof" } + } } ] diff --git a/data/json/mapgen_palettes/cabin.json b/data/json/mapgen_palettes/cabin.json index 1b984cb105e38..cde7fd1d73c7b 100644 --- a/data/json/mapgen_palettes/cabin.json +++ b/data/json/mapgen_palettes/cabin.json @@ -17,7 +17,10 @@ "r": "t_rock_floor", "S": "t_rock_floor", "w": "t_window_domestic", - "W": [ [ "t_window_boarded", 2 ], "t_window" ] + "W": [ [ "t_window_boarded", 2 ], "t_window" ], + "%": "t_gutter_downspout", + "q": "t_swater_sh", + "Q": "t_water_dp" }, "furniture": { "a": "f_armchair", @@ -42,18 +45,27 @@ "V": "f_oven", "u": "f_cupboard", "Y": "f_rack_coat", + "z": "f_brazier", + "Z": "f_fireplace", + "y": [ "f_indoor_plant_y", "f_indoor_plant" ], "1": "f_cupboard", "2": "f_cupboard", "3": "f_cupboard", "4": "f_cupboard", - "5": "f_sink" + "5": "f_sink", + "&": "f_trashcan", + "0": "f_standing_tank" }, + "liquids": { "0": { "liquid": "water_clean", "amount": [ 10, 900 ] } }, "items": { "a": { "item": "livingroom", "chance": 20 }, "A": [ { "item": "homebooks", "chance": 60 }, { "item": "magazines", "chance": 60 }, { "item": "manuals", "chance": 30 } ], "B": { "item": "bed", "chance": 60 }, "d": [ { "item": "livingroom", "chance": 40 }, { "item": "office", "chance": 40 } ], - "D": { "item": "dresser", "chance": 70, "repeat": [ 1, 4 ] }, + "D": [ + { "item": "dresser_mens", "chance": 50, "repeat": [ 1, 4 ] }, + { "item": "dresser_womens", "chance": 50, "repeat": [ 1, 4 ] } + ], "F": { "item": "fridge", "chance": 35, "repeat": [ 1, 14 ] }, "h": { "item": "shower", "chance": 20 }, "L": [ @@ -61,6 +73,8 @@ { "item": "tools_home", "chance": 30, "repeat": [ 1, 4 ] } ], "O": { "item": "livingroom", "chance": 20 }, + "S": { "item": "stash_wood", "chance": 60, "repeat": [ 2, 4 ] }, + "&": { "item": "trash", "chance": 20 }, "R": [ { "item": "camping", "chance": 50 }, { "item": "gear_survival", "chance": 30 }, @@ -78,11 +92,11 @@ ], "V": { "item": "oven", "chance": 70 }, "Y": { "item": "coat_rack", "chance": 35, "repeat": [ 1, 4 ] }, - "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" } + "1": [ { "item": "SUS_dishes", "chance": 35 }, { "item": "SUS_silverware", "chance": 35 } ], + "2": { "item": "SUS_cookware", "chance": 35 }, + "3": [ { "item": "SUS_utensils", "chance": 35 }, { "item": "SUS_knife_drawer", "chance": 35 } ], + "4": { "item": "SUS_junk_drawer", "chance": 35 }, + "5": { "item": "SUS_kitchen_sink", "chance": 35 } }, "toilets": { "T": { } } } diff --git a/data/json/mapgen_palettes/roof_palette.json b/data/json/mapgen_palettes/roof_palette.json index 0067c37d66249..05e2c26837867 100644 --- a/data/json/mapgen_palettes/roof_palette.json +++ b/data/json/mapgen_palettes/roof_palette.json @@ -32,6 +32,7 @@ "&": "f_roof_turbine_vent", ":": "f_cellphone_booster", "X": "f_small_satelitte_dish", + "~": "f_chimney", "=": "f_vent_pipe", "A": "f_air_conditioner", "b": "f_bench", diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index 5114a8e66ba5a..31b22266641e8 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -237,11 +237,81 @@ { "type": "overmap_special", "id": "Cabin", - "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cabin_north" } ], + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cabin_north" }, { "point": [ 0, 0, 1 ], "overmap": "cabin_roof_north" } ], "locations": [ "wilderness" ], "city_distance": [ 20, -1 ], "city_sizes": [ 0, 20 ], - "occurrences": [ 0, 10 ], + "occurrences": [ 0, 2 ], + "flags": [ "CLASSIC" ] + }, + { + "type": "overmap_special", + "id": "Cabin_1", + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cabin_1_north" }, { "point": [ 0, 0, 1 ], "overmap": "cabin_roof_1_north" } ], + "locations": [ "wilderness" ], + "city_distance": [ 20, -1 ], + "city_sizes": [ 0, 20 ], + "occurrences": [ 0, 2 ], + "flags": [ "CLASSIC" ] + }, + { + "type": "overmap_special", + "id": "Cabin_2", + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cabin_2_north" }, { "point": [ 0, 0, 1 ], "overmap": "cabin_roof_2_north" } ], + "locations": [ "wilderness" ], + "city_distance": [ 20, -1 ], + "city_sizes": [ 0, 20 ], + "occurrences": [ 0, 2 ], + "flags": [ "CLASSIC" ] + }, + { + "type": "overmap_special", + "id": "Cabin_3", + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cabin_3_north" }, { "point": [ 0, 0, 1 ], "overmap": "cabin_roof_3_north" } ], + "locations": [ "wilderness" ], + "city_distance": [ 20, -1 ], + "city_sizes": [ 0, 20 ], + "occurrences": [ 0, 2 ], + "flags": [ "CLASSIC" ] + }, + { + "type": "overmap_special", + "id": "Cabin_4", + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cabin_4_north" }, { "point": [ 0, 0, 1 ], "overmap": "cabin_roof_4_north" } ], + "locations": [ "wilderness" ], + "city_distance": [ 20, -1 ], + "city_sizes": [ 0, 20 ], + "occurrences": [ 0, 2 ], + "flags": [ "CLASSIC" ] + }, + { + "type": "overmap_special", + "id": "Cabin_5", + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cabin_5_north" }, { "point": [ 0, 0, 1 ], "overmap": "cabin_roof_5_north" } ], + "locations": [ "wilderness" ], + "city_distance": [ 20, -1 ], + "city_sizes": [ 0, 20 ], + "occurrences": [ 0, 2 ], + "flags": [ "CLASSIC" ] + }, + { + "type": "overmap_special", + "id": "Cabin_6", + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cabin_6_north" }, { "point": [ 0, 0, 1 ], "overmap": "cabin_roof_6_north" } ], + "locations": [ "wilderness" ], + "city_distance": [ 20, -1 ], + "city_sizes": [ 0, 20 ], + "occurrences": [ 0, 2 ], + "flags": [ "CLASSIC" ] + }, + { + "type": "overmap_special", + "id": "Cabin_7", + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cabin_7_north" }, { "point": [ 0, 0, 1 ], "overmap": "cabin_roof_7_north" } ], + "locations": [ "wilderness" ], + "city_distance": [ 20, -1 ], + "city_sizes": [ 0, 20 ], + "occurrences": [ 0, 2 ], "flags": [ "CLASSIC" ] }, { @@ -249,6 +319,7 @@ "id": "Strange Cabin", "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cabin_strange_north" }, + { "point": [ 0, 0, 1 ], "overmap": "cabin_strange_roof_north" }, { "point": [ 0, 0, -1 ], "overmap": "cabin_strange_b_north" } ], "locations": [ "forest" ], diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json index 3f11201ac1d50..6a2be13e9d509 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain.json @@ -283,6 +283,15 @@ "see_cost": 5, "extras": "build" }, + { + "type": "overmap_terrain", + "id": "cabin_strange_roof", + "name": "forest", + "sym": ".", + "color": "blue", + "see_cost": 5, + "extras": "field" + }, { "type": "overmap_terrain", "id": "cabin", @@ -294,6 +303,155 @@ "mondensity": 2, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, + { + "type": "overmap_terrain", + "id": "cabin_roof", + "name": "cabin roof", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build" + }, + { + "type": "overmap_terrain", + "id": "cabin_1", + "name": "cabin", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build", + "mondensity": 2, + "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] + }, + { + "type": "overmap_terrain", + "id": "cabin_roof_1", + "name": "cabin roof", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build" + }, + { + "type": "overmap_terrain", + "id": "cabin_2", + "name": "cabin", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build", + "mondensity": 2, + "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] + }, + { + "type": "overmap_terrain", + "id": "cabin_roof_2", + "name": "cabin roof", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build" + }, + { + "type": "overmap_terrain", + "id": "cabin_3", + "name": "cabin", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build", + "mondensity": 2, + "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] + }, + { + "type": "overmap_terrain", + "id": "cabin_roof_3", + "name": "cabin roof", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build" + }, + { + "type": "overmap_terrain", + "id": "cabin_4", + "name": "cabin", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build", + "mondensity": 2, + "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] + }, + { + "type": "overmap_terrain", + "id": "cabin_roof_4", + "name": "cabin roof", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build" + }, + { + "type": "overmap_terrain", + "id": "cabin_5", + "name": "cabin", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build", + "mondensity": 2, + "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] + }, + { + "type": "overmap_terrain", + "id": "cabin_roof_5", + "name": "cabin roof", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build" + }, + { + "type": "overmap_terrain", + "id": "cabin_6", + "name": "cabin", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build", + "mondensity": 2, + "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] + }, + { + "type": "overmap_terrain", + "id": "cabin_roof_6", + "name": "cabin roof", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build" + }, + { + "type": "overmap_terrain", + "id": "cabin_7", + "name": "cabin", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build", + "mondensity": 2, + "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] + }, + { + "type": "overmap_terrain", + "id": "cabin_roof_7", + "name": "cabin roof", + "sym": "C", + "color": "i_green", + "see_cost": 5, + "extras": "build" + }, { "type": "overmap_terrain", "id": "dirtroad1_aban1",