diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json index df406865daf1d..99a635beb87ab 100644 --- a/data/json/furniture_and_terrain/furniture-recreation.json +++ b/data/json/furniture_and_terrain/furniture-recreation.json @@ -548,5 +548,46 @@ { "item": "scrap", "count": [ 0, 1 ] } ] } + }, + { + "type": "furniture", + "id": "f_organ", + "name": "pipe organ", + "description": "A majestic pipe organ. Dubbed \"the king of instruments\", it is capable of producing powerful sound harmonies if used by a skilled player. Rows of off-white and black keys all linked to a set of iron pipes, which resonate at a specific pitch when pressurized air is driven through them.", + "symbol": "P", + "color": "i_brown", + "move_cost_mod": -1, + "coverage": 100, + "required_str": -1, + "flags": [ "FLAMMABLE", "ORGANIC", "NOITEM" ], + "looks_like": "f_piano", + "deconstruct": { + "items": [ + { "item": "pipe", "count": 26 }, + { "item": "2x4", "count": 12 }, + { "item": "nail", "charges": [ 10, 15 ] }, + { "item": "wire", "count": [ 4, 12 ] }, + { "item": "plastic_chunk", "count": [ 1, 12 ] }, + { "item": "steel_chunk", "count": [ 1, 3 ] }, + { "item": "cable", "count": [ 1, 3 ] }, + { "item": "motor_tiny", "count": 1 } + ] + }, + "bash": { + "str_min": 16, + "str_max": 40, + "sound": "a dramatic pipe organ!", + "sound_fail": "kerchang.", + "items": [ + { "item": "pipe", "count": [ 4, 12 ] }, + { "item": "2x4", "count": [ 4, 8 ] }, + { "item": "nail", "charges": [ 6, 12 ] }, + { "item": "wire", "count": [ 0, 4 ] }, + { "item": "splinter", "count": [ 1, 3 ] }, + { "item": "plastic_chunk", "count": [ 1, 6 ] }, + { "item": "steel_chunk", "count": [ 1, 4 ] }, + { "item": "cable", "count": [ 1, 3 ] } + ] + } } ] diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json index cd05d85d81c8a..b5cc602c96eae 100644 --- a/data/json/itemgroups/misc.json +++ b/data/json/itemgroups/misc.json @@ -186,5 +186,31 @@ "type": "item_group", "id": "spiral", "items": [ [ "spiral_stone", 20 ], [ "vortex_stone", 2 ] ] + }, + { + "type": "item_group", + "id": "makeshift_memorial", + "subtype": "collection", + "entries": [ + { "item": "candle", "prob": 100, "count": [ 1, 3 ], "charges-max": 50 }, + { "item": "candle", "prob": 33, "count": [ 1, 2 ], "charges-min": 50 }, + { "item": "family_photo", "prob": 20, "count": [ 1, 2 ] }, + { "item": "teddy_bear", "prob": 5 } + ] + }, + { + "type": "item_group", + "id": "cathedral_archives", + "subtype": "collection", + "entries": [ + { "item": "book_binder", "prob": 90, "charges-max": 90, "count": [ 1, 5 ] }, + { "item": "file", "prob": 50, "count": [ 1, 15 ] }, + { "item": "paper", "prob": 60, "count": [ 10, 125 ] }, + { "item": "book_pieces", "prob": 20 }, + { "item": "candle", "prob": 3, "charges": 100 }, + { "item": "holybook_bible1", "prob": 3 }, + { "item": "candlestick", "prob": 2 }, + { "item": "book_ruined", "prob": 1 } + ] } ] diff --git a/data/json/mapgen/cathedral.json b/data/json/mapgen/cathedral.json index e956e3d5e1eb6..2fa671af5cf1b 100644 --- a/data/json/mapgen/cathedral.json +++ b/data/json/mapgen/cathedral.json @@ -2,203 +2,447 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ - [ "cathedral_1_NW", "cathedral_1_NE" ], - [ "cathedral_1_SW", "cathedral_1_SE" ], - [ "cathedral_b_NW", "cathedral_b_NE" ], - [ "cathedral_b_SW", "cathedral_b_SE" ] - ], + "om_terrain": [ [ "cathedral_b_NW", "cathedral_b_NE" ], [ "cathedral_b_SW", "cathedral_b_SE" ] ], "weight": 250, "object": { - "fill_ter": "t_dirt", + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " |||||| |||||| ", + " |b...| |hh.l| ", + " |b.<.| ||| |h<.l| ", + " |b.<.|||G||| ||||||||||||||||||||.<.h| ", + " |Y...L.^.^.| |.hh.hddhqqq.......L..hh| ", + " ||||||.....| |qqqq.qqq....ddqqqq|||||| ", + " |.hdh.| |dh.h.....q.hddh.hh| ", + " |.....| |h....qqhdqhhqqqqqd| ", + " |||.....| ||L||||||||||||||||||| ", + " |w.w.w.w| |W,,W|T,+,,,| |,,,+,T| ", + " |w.w.w.w| |W,,W||||,,S| |S,,|||| ", + " |wHw.w.w| |W,,W|T,+,,S| |S,,+,T| ", + " |w.w.w.w| |W,,W||||,,S| |S,,|||| ", + " |w.w.w.w| |W,,W|T,+,,,| |,,,+,T| ", + " |w.w.wHw| ||L|||||||+|||||+||||| ", + " |w.w.w.w| |1,44|...............| ", + " |w.w.w.w| |2,,,C.qtttq...qtttq.| ", + " |w.wHw.w| |3,,,C.qtttq...qtttq.| ", + " |w.w.w.w| |,,,,C.qtttq...qtttq.| ", + " |w.w.w.w| |eevv|...............| ", + " |w.w.w.w| ||||||......YIY......| ", + " |.......| |...............| ", + "|||||||||..hhh.^|| ||^qtttq...qtttq.|||||||||", + "|R.....X.....X.....R>w ss", - "ss XXXXXGGXXXHHHXXXGGXXXXX ss", - "ss w.....................w ss", - "ss Xbbb....bbbbbbb....bbbX ss", - "ss XX.....................XX ss", - "ss XXbbbb...bbbbbbb...bbbbXX ss", - "ss X.....................X ss", - "ss wbbbb...bbbbbbb...bbbbw ss", - "ss w.....................w ss", - "ss wbbbb...bbbbbbb...bbbbw ss", - "ss X.....................X ss", - "ss XXbbbb...bbbbbbb...bbbbXX ss", - "ss XX.....................XX ss", - "ss Xbbbb...bbbbbbb...bbbbX ss", - "ss w.....................w ss", - "ssssssssssssswbbbb...bbbbbbb...bbbbwssssssssssss", - "ssssssssssss>X.....................X>sssssssssss", - " XXsssXXbbbb...bbbbbbb...bbbbXXsssXX ", - " XXXXX+XX.......................XX+XXXXX ", - " XXX.....................................XXX ", - " X.........................................X ", - " XX..bbbbbbbbbbb...bbbbbbbbb...bbbbbbbbbbb..XX ", - " w.........................................w ", - " w..bbbbbbbbbbb...bbbbbbbbb...bbbbbbbbbbb..w ", - " w.........................................w ", - " XX......bbbbbbb...bbbbbbbbb...bbbbbbb......XX ", - " X...C.................................C...X ", - " XXX.....................................XXX ", - " XXXXwwwX..kkkkkkkk...kkkkkkkk..XwwwXXXX ", - " XX XXXR.................RXXX XX ", - " w...................w ", - " XXX.....ccccc.....XXX ", - " w..h.........h..w ", - " XX.............XX ", - " XX..B.ccc.B..XX ", - " XXXwwwwwwwXXX ", - " XX XX ", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "################################################", - "#############|------|---------|----|############", - "#############|.....u|uu.vh....|r..7|############", - "#############|vh....+...vvv...|r..7|############", - "#############|vxv..^|.........|...7|############", - "#############|----D-|-ccccc-+-|-D--|############", - "#############|<...................<|############", - "#############|.....................|############", - "#############|^...hhh........^tt^..|############", - "#############|--------|...|--------|############", - "#############|........|...|....8h8h|############", - "#############|..htth..|...|........|############", - "#############|..htth..+...+....8h8h|############", - "#############|..htth..|...|........|############", - "#############|..htth..|...|h8..8h8h|############", - "#############|........|...|.8......|############", - "#############|-|-|-|--|...|--|-|-|-|############", - "#############|T|T|T|..|...|..|T|T|T|############", - "#############|+|D|+|..|...|..|+|+|+|############", - "#############|........+...+........|############", - "#############|..S.S.S.|...|.S.S.S..|############", - "###########|-|--------|...|--------|-|##########", - "###########|<+....hh......t........+<|##########", - "#########|-|-|............th..htth.|-|---|######", - "#########|hhh|................htth.|r...e|######", - "#########|hhh|...M..M..M......htth.+....e|######", - "#########|tt.|.....................|....O|######", - "#########|tt.D...M..M..M..M..M.....c....O|######", - "#########|tt.D.....................c....c|######", - "#########|tt.|...M..M..M..M..M.....c....S|######", - "#########|tth|.................hhh.c....c|######", - "#########|---|----------------------|-+-||######", - "############________________________D...|#######", - "############________________________|rrr|#######", - "############______1___1__1___1______|---|#######", - "################________________################", - "################________________################", - "###################__1____1__###################", - "###################__________###################", - "###################__1_c__1__###################", - "####################________####################", - "################################################", - "################################################" + "s #ssss# s", + "s #ssssss# s", + "s #ssnnss# s", + "s |##| #ss@@ss# |##| s", + "s ||oo|| #ssssss# ||oo|| s", + "s ||hh..| #ssss# |hh.q|| s", + "s #o.<>.||###||###||ssss||###||###||h>.|||o||||o||||++||||o||||o|||.>**i #o........._.........._.........o# i**>s", + "siiii #o.bbbbbbb._.bbbbbbbb._.bbbbbbb.o# iiiis", + "s #|........._.........._.........|# s", + "sssssss|||bbbbbbI._.bbbbbbbb._.Ibbbbbb|||sssssss", + "s ||L|Y........._.........._.........Y|L|| s", + "s |.....bbbbbbb._.bbbbbbbb._.bbbbbbb.....| s", + "s ||.h.h........._.........._..........xxx|| s", + "s #o.h.h.hhhhhhh._.........._.hhhhhhh..+.ho# s", + "s #o.h.h.........____________..........xxyo# s", + "s #o.h.h.......I..............I........+.bo# s", + "s ||.h.h........rrrr......rrrr.........xxx|| s", + "s |.......ccc..r............r..ccc.......| s", + "s ||||^...cGc..r....CCCC....r..cGc...^|||| s", + "s |||||ooo|||.B........B.|||ooo||||| s", + "s |###| |.......h....| |###| s", + "s |hhh.........| s", + "s |oo|GCCCCG|oo| iiiii s", + "s |##|oooooo|##| i***i s", + "s |######| iii>i s", + "ssssssssssssssssssssssssssssssssssssssssssssssss" + ], + "palettes": [ "cathedral" ], + "item": { "C": { "item": "candlestick", "chance": 50 } }, + "terrain": { "_": "t_carpet_concrete_red", " ": "t_region_groundcover_urban", "*": "t_open_air" }, + "furniture": { " ": [ [ "f_region_flower_decorative", 1 ], [ "f_null", 25 ] ] }, + "place_nested": [ + { "chunks": [ "garden_3x3_3" ], "x": 2, "y": 2 }, + { "chunks": [ "garden_3x3_3" ], "x": 16, "y": 2 }, + { "chunks": [ "garden_3x3_3" ], "x": 29, "y": 2 }, + { "chunks": [ "garden_3x3_3" ], "x": 43, "y": 2 }, + { "chunks": [ "garden_3x3_3" ], "x": 2, "y": 15 }, + { "chunks": [ "garden_3x3_3" ], "x": 2, "y": 21 }, + { "chunks": [ "garden_3x3_3" ], "x": 43, "y": 15 }, + { "chunks": [ "garden_3x3_3" ], "x": 43, "y": 21 }, + { "chunks": [ "garden_3x3_3" ], "x": 2, "y": 43 }, + { "chunks": [ "garden_3x3_3" ], "x": 6, "y": 43 }, + { "chunks": [ "garden_3x3_3" ], "x": 39, "y": 43 }, + { "chunks": [ "garden_3x3_3" ], "x": 43, "y": 43 } ], - "terrain": { - " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], - "#": "t_soil", - "+": "t_door_c", - "-": "t_wall", - ".": "t_floor", - "1": "t_column", - "7": "t_floor", - "8": "t_floor", - "<": "t_stairs_up", - "=": "t_door_locked", - ">": "t_stairs_down", - "C": "t_floor", - "D": "t_door_locked_interior", - "G": "t_door_glass_c", - "H": "t_wall_glass", - "M": "t_floor", - "O": "t_floor", - "R": "t_railing_v", - "S": "t_floor", - "T": "t_floor", - "V": "t_wall_glass", - "^": "t_floor", - "_": "t_concrete", - "b": "t_floor", - "c": "t_floor", - "d": "t_floor", - "e": "t_floor", - "h": "t_floor", - "k": "t_railing_h", - "l": "t_floor", - "o": "t_floor", - "s": "t_sidewalk", - "t": "t_floor", - "u": "t_floor", - "v": "t_floor", - "w": [ "t_window_stained_red", "t_window_stained_blue", "t_window_stained_green" ], - "x": "t_floor", - "|": "t_wall", - "X": "t_rock_wall" - }, - "furniture": { - "x": "f_console_broken", - "7": "f_rack", - "8": "f_desk", - "B": "f_brazier", - "C": "f_crate_c", - "M": "f_makeshift_bed", - "O": "f_oven", - "S": "f_sink", - "T": "f_toilet", - "^": "f_indoor_plant", - "b": "f_bench", - "c": "f_counter", - "d": "f_desk", - "e": "f_fridge", - "h": "f_chair", - "l": "f_locker", - "o": "f_bookcase", - "r": "f_rack", - "t": "f_table", - "u": "f_locker", - "v": "f_table" - }, - "toilets": { "T": { } }, - "items": { - "7": { "item": "cleaning", "chance": 70 }, - "8": { "item": "school", "chance": 50 }, - "O": { "item": "oven", "chance": 70 }, - "b": { "item": "church", "chance": 10 }, - "e": { "item": "fridge", "chance": 70 }, - "l": { "item": "jackets", "chance": 60 }, - "r": { "item": "cannedfood", "chance": 40 }, - "t": { "item": "fridgesnacks", "chance": 40 }, - "u": { "item": "office", "chance": 30 }, - "v": { "item": "office", "chance": 70 } - }, - "place_items": [ ], - "place_item": [ { "item": "small_relic", "x": 23, "y": 92 } ], "place_monsters": [ - { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "repeat": [ 1, 2 ], "density": 0.2 }, - { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 24, 47 ], "y": [ 0, 23 ], "repeat": [ 1, 2 ], "density": 0.2 }, - { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 0, 23 ], "y": [ 24, 47 ], "repeat": [ 1, 2 ], "density": 0.2 }, - { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 24, 47 ], "y": [ 24, 47 ], "repeat": [ 1, 2 ], "density": 0.2 }, - { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 0, 23 ], "y": [ 48, 71 ], "repeat": [ 1, 2 ], "density": 0.2 }, - { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 24, 47 ], "y": [ 48, 71 ], "repeat": [ 1, 2 ], "density": 0.2 }, - { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 0, 23 ], "y": [ 72, 95 ], "repeat": [ 1, 2 ], "density": 0.2 }, - { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 24, 47 ], "y": [ 72, 95 ], "repeat": [ 1, 2 ], "density": 0.2 }, - { "monster": "GROUP_CHURCH_BLANK", "x": [ 23, 23 ], "y": [ 92, 92 ], "density": 0.1 } + { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "density": 0.1 }, + { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 24, 47 ], "y": [ 0, 23 ], "density": 0.1 }, + { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 0, 23 ], "y": [ 24, 47 ], "density": 0.1 }, + { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 24, 47 ], "y": [ 24, 47 ], "density": 0.1 } + ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "cathedral_2_NW", "cathedral_2_NE" ], [ "cathedral_2_SW", "cathedral_2_SE" ] ], + "weight": 250, + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " ", + " | | | | ", + " ||oo|| ||oo|| ", + " ||qhhh| |qqqq|| ", + " oq>.o ", + " oq><.|||o||||o||||oo||||o||||o|||.<>ho ", + " ||q...L.bbb||bbb|..OO..|bbb||bbb.L...h|| ", + " ||||||.............H............|||||| ", + " |Y.....hhh........hhh.....Y| ", + " |..G.6..................G..| ", + " íii||ooo||iii||....||iii||ooo||iií ", + " i_______|****iiiiii****|_______i ", + " i_______o**************o_______i ", + " i_______o**************o_______i ", + " i_______o**************o_______i ", + " i_______|**************|_______i ", + " íi__|___||**************||___|__ií ", + " i_______|**************|_______i ", + " i_______o**************o_______i ", + " i_______o**************o_______i ", + " i_______o**************o_______i ", + " i_______|**************|_______i ", + " íi__|___||**************||___|__ií ", + " i_______|**************|_______i ", + " i_______o**************o_______i ", + " i_______o**************o_______i ", + " i_______o**************o_______i ", + " i_______|**************|_______i ", + " íi_||ooo||**************||ooo||_ií ", + " iiii__|**************************|__iiii ", + " i_____|**************************|_____i ", + " ii___i||**************************||i___ii ", + " i_____o**************************o_____i ", + " i_____o**************************o_____i ", + " i_____o*****I**************I*****o_____i ", + " ii___i||**************************||i___ii ", + " i_____|**************************|_____i ", + " iiii__|**************************|__iiii ", + " iii||ooo|||************|||ooo||iii ", + " | | |************| | | ", + " |************| ", + " |oo|******|oo| ", + " | |oooooo| | ", + " | | ", + " " + ], + "palettes": [ "cathedral" ], + "terrain": { "_": "t_rock_floor_no_roof", " ": "t_open_air", "*": "t_open_air_rooved" }, + "place_monsters": [ + { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 6, 23 ], "y": [ 6, 12 ], "density": 0.1 }, + { "monster": "GROUP_CHURCH_ZOMBIE", "x": [ 24, 41 ], "y": [ 6, 12 ], "density": 0.1 } + ], + "computers": { + "6": { + "name": "Cathedral Bells 1.2", + "options": [ + { "name": "Gathering Toll", "action": "toll" }, + { "name": "Wedding Toll", "action": "toll" }, + { "name": "Funeral Toll", "action": "toll" } + ] + } + } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "cathedral_3_NW", "cathedral_3_NE" ], [ "cathedral_3_SW", "cathedral_3_SE" ] ], + "weight": 250, + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " ", + " | | | | ", + " ||oo|| ||oo|| ", + " ||....| |hh..|| ", + " o.<>.|| ií ii ii íi ||.><.o ", + " o.<>.|iiiiiiiiiiiiiiiiiiiiiiiiii|.><.|i i|.<>.o ", + " o.><.| |.<>.o ", + " ||....| |....|| ", + " |||||| |||||| ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " i i i i ", + " ||oo|| ||oo|| ", + " i|....| |....|i ", + " o.<>.| |.><.o ", + " o.<>.| |.><.o ", + " i|....| |....|i ", + " |||||| |||||| ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "cathedral" ], + "terrain": { " ": "t_open_air" } + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "cathedral_6_NW", "cathedral_6_NE" ], [ "cathedral_7_NW", "cathedral_7_NE" ] ], + "weight": 250, + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + " ", + " ", + " ", + " ", + " iiii iiii ", + " ||..|| ||..|| ", + " i|....|i i|....|i ", + " i..>...i i...>..i ", + " i..>...i i...>..i ", + " i|....|i i|....|i ", + " ||..|| ||..|| ", + " iiii iiii ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " iiiiii iiiiii ", + " i____i i____i ", + " i____i i____i ", + " i____i i____i ", + " i____i i____i ", + " iiiiii iiiiii ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "cathedral" ], + "place_nested": [ + { + "chunks": [ [ "null", 180 ], [ "radio_tower_2x2_map", 30 ], [ "radio_tower_2x2_holdout", 20 ], [ "radio_tower_2x2_sniper", 10 ] ], + "x": [ 7, 8 ], + "y": [ 6, 8 ] + }, + { + "chunks": [ [ "null", 180 ], [ "radio_tower_2x2_map", 30 ], [ "radio_tower_2x2_holdout", 20 ], [ "radio_tower_2x2_sniper", 10 ] ], + "x": [ 37, 38 ], + "y": [ 6, 8 ] + } + ], + "terrain": { " ": "t_open_air", "_": "t_rock_floor_no_roof" } + } } ] diff --git a/data/json/mapgen_palettes/cathedral_palette.json b/data/json/mapgen_palettes/cathedral_palette.json new file mode 100644 index 0000000000000..987bd1c788642 --- /dev/null +++ b/data/json/mapgen_palettes/cathedral_palette.json @@ -0,0 +1,94 @@ +[ + { + "type": "palette", + "id": "cathedral", + "terrain": { + "#": [ [ "t_region_shrub_decorative", 5 ], [ "t_region_groundcover", 1 ] ], + "+": "t_door_c", + "S": "t_linoleum_gray", + "T": "t_linoleum_gray", + "v": "t_linoleum_gray", + "1": "t_linoleum_gray", + "2": "t_linoleum_gray", + "3": "t_linoleum_gray", + "4": "t_linoleum_gray", + "W": "t_linoleum_gray", + "e": "t_linoleum_gray", + "I": "t_column", + "<": "t_stairs_up", + ">": "t_stairs_down", + "L": [ [ "t_door_locked_interior", 15 ], [ "t_door_locked", 5 ], [ "t_door_c", 2 ] ], + "r": "t_railing", + ".": "t_thconc_floor", + "@": "t_concrete", + "n": "t_concrete", + "s": "t_concrete", + "o": [ "t_window_stained_red", "t_window_stained_blue", "t_window_stained_green" ], + "|": "t_rock_wall", + "i": "t_rock_wall_half", + "í": "t_rock_wall_half", + "x": "t_wall_wood", + "X": "t_rock_floor", + "R": "t_door_metal_c", + "P": "t_door_bar_locked", + "-": "t_bars", + "y": "t_embrasure_wood" + }, + "furniture": { + "X": [ "f_grave_monument", "f_slab", "f_grave_head", "f_grave_stone_old", "f_grave_stone" ], + "^": [ "f_indoor_plant", "f_indoor_plant_y" ], + "@": "f_statue", + "G": "f_statue", + "í": "f_statue", + "O": "f_organ", + "U": "f_bulletin", + "n": "f_slab", + "W": "f_rack", + "w": "f_rack_wood", + "B": "f_brazier", + "S": "f_sink", + "4": "f_sink", + "T": "f_toilet", + "b": "f_bench", + "q": "f_bench", + "c": "f_counter", + "C": "f_counter", + "d": "f_desk", + "D": "f_desk", + "Y": "f_rack_coat", + "e": "f_fridge", + "v": "f_oven", + "1": "f_cupboard", + "2": "f_cupboard", + "3": "f_cupboard", + "t": "f_table", + "h": "f_chair", + "H": "f_stool", + "l": "f_locker", + "a": "f_trashcan", + "6": "f_console" + }, + "items": { + "1": [ { "item": "SUS_dishes", "chance": 100 }, { "item": "SUS_silverware", "chance": 100 } ], + "2": { "item": "SUS_cookware", "chance": 100, "repeat": [ 1, 3 ] }, + "3": [ { "item": "SUS_utensils", "chance": 50 }, { "item": "SUS_knife_drawer", "chance": 50 } ], + "4": { "item": "SUS_kitchen_sink", "chance": 100 }, + "v": { "item": "SUS_oven", "chance": 100 }, + "t": { "item": "silverware", "chance": 15, "repeat": [ 1, 2 ] }, + "e": { "item": "fridge", "chance": 80, "repeat": [ 1, 5 ] }, + "W": [ + { "item": "SUS_pantry", "chance": 5 }, + { "item": "big_canned_food", "chance": 10 }, + { "item": "cannedfood", "chance": 15, "repeat": [ 1, 3 ] } + ], + "w": { "item": "cathedral_archives", "chance": 90 }, + "Y": { "item": "coat_rack", "chance": 50, "repeat": [ 1, 5 ] }, + "c": { "item": "makeshift_memorial", "chance": 50 }, + "D": { "item": "school", "chance": 50 }, + "b": { "item": "church", "chance": 10 }, + "a": { "item": "trash", "chance": 80, "repeat": [ 1, 3 ] }, + "l": { "item": "SUS_janitors_closet", "chance": 100 } + }, + "toilets": { "T": { } } + } +] diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index 239210e9d254d..ed113b50f52a0 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -2101,6 +2101,22 @@ "id": "cathedral", "locations": [ "land" ], "overmaps": [ + { "point": [ 0, 0, 6 ], "overmap": "cathedral_7_NW_north" }, + { "point": [ 1, 0, 6 ], "overmap": "cathedral_7_NE_north" }, + { "point": [ 0, 0, 5 ], "overmap": "cathedral_6_NW_north" }, + { "point": [ 1, 0, 5 ], "overmap": "cathedral_6_NE_north" }, + { "point": [ 0, 0, 4 ], "overmap": "cathedral_5_NW_north" }, + { "point": [ 1, 0, 4 ], "overmap": "cathedral_5_NE_north" }, + { "point": [ 0, 0, 3 ], "overmap": "cathedral_4_NW_north" }, + { "point": [ 1, 0, 3 ], "overmap": "cathedral_4_NE_north" }, + { "point": [ 0, 0, 2 ], "overmap": "cathedral_3_NW_north" }, + { "point": [ 1, 0, 2 ], "overmap": "cathedral_3_NE_north" }, + { "point": [ 0, 1, 2 ], "overmap": "cathedral_3_SW_north" }, + { "point": [ 1, 1, 2 ], "overmap": "cathedral_3_SE_north" }, + { "point": [ 0, 0, 1 ], "overmap": "cathedral_2_NW_north" }, + { "point": [ 1, 0, 1 ], "overmap": "cathedral_2_NE_north" }, + { "point": [ 0, 1, 1 ], "overmap": "cathedral_2_SW_north" }, + { "point": [ 1, 1, 1 ], "overmap": "cathedral_2_SE_north" }, { "point": [ 0, 0, 0 ], "overmap": "cathedral_1_NW_north" }, { "point": [ 1, 0, 0 ], "overmap": "cathedral_1_NE_north" }, { "point": [ 0, 1, 0 ], "overmap": "cathedral_1_SW_north" }, diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json b/data/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json index 87964fcc940e0..b15fb9ed0306c 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json @@ -26,20 +26,49 @@ }, { "type": "overmap_terrain", - "id": [ "cathedral_1_NW", "cathedral_1_NE", "cathedral_1_SW", "cathedral_1_SE" ], + "id": [ + "cathedral_1_NW", + "cathedral_1_NE", + "cathedral_1_SW", + "cathedral_1_SE", + "cathedral_2_NW", + "cathedral_2_NE", + "cathedral_2_SW", + "cathedral_2_SE", + "cathedral_3_NW", + "cathedral_3_NE", + "cathedral_3_SW", + "cathedral_3_SE" + ], "name": "cathedral", "sym": "C", "color": "i_light_red", "see_cost": 5, "mondensity": 2, - "flags": [ "SIDEWALK", "KNOWN_DOWN" ] + "flags": [ "SIDEWALK" ] }, { "type": "overmap_terrain", "id": [ "cathedral_b_NW", "cathedral_b_NE", "cathedral_b_SW", "cathedral_b_SE" ], "copy-from": "cathedral_1_NW", "name": "cathedral basement", - "delete": { "flags": [ "SIDEWALK", "KNOWN_DOWN" ] } + "delete": { "flags": [ "SIDEWALK" ] } + }, + { + "type": "overmap_terrain", + "id": [ + "cathedral_4_NW", + "cathedral_4_NE", + "cathedral_5_NW", + "cathedral_5_NE", + "cathedral_6_NW", + "cathedral_6_NE", + "cathedral_7_NW", + "cathedral_7_NE" + ], + "copy-from": "cathedral_1_NW", + "name": "cathedral tower", + "delete": { "flags": [ "SIDEWALK" ] } }, { "type": "overmap_terrain",