diff --git a/data/json/mapgen/cs_private_park.json b/data/json/mapgen/cs_private_park.json index 081ea073ab7dc..12a7a30bdd948 100644 --- a/data/json/mapgen/cs_private_park.json +++ b/data/json/mapgen/cs_private_park.json @@ -5,95 +5,78 @@ "om_terrain": [ "cs_private_park" ], "weight": 1000, "object": { - "fill_ter": "t_floor", + "predecessor_mapgen": "forest", "rows": [ - "..xxxxxxxxxxxxxxxxxxxx.,", - ".WWWWWWWWW-XX-WWWWWWWWW.", - ",W......T.PxxP.s,p.p..W,", - ",W.f.p.f..oxxo..f..T..W.", - ".W.Y..p...oxxo.A.~dpA.W.", - ".Wo..T...T.xx.d.p.f.,.W.", - ",W..f.YfA.dxxxxxxxxxT.W,", - ",W~.,.dwwwAxxxxxxxxxY.W.", - ".WP..TwwwwwwwwwA.pxxY,W.", - ",W.f.AwwwwwwwwwwwAxxp.W,", - ".W.d.xxxxxxxxxxxxxxx..W.", - ".W~.Txxxxxxxxxxxxxxx.TW.", - ".W.,.xxwwwwwwwwwwfY.p,W.", - ",W.f.xxAwwwwwwwwA.Y.d.W,", - ".W.Y.xx,.wwwwwwwf.Tf,pW.", - ".W.T.xx.Y.T.wwT.f..A.pW.", - ".W..fxx...Y..p...~.T,.W,", - ",Wdddxxd~o~....P.fY...W.", - ".WzzzDDzzzo.T..f...,ooW.", - ".WazS Lz~.Y.,pY.d.T.W.", - ",W C 21G,,.f...T.,..W,", - ".WtzBE 1z@@T.P...Y,.YW.", - ",WWWWWWWWWWWWWWWWW-X-WW.", - "..,,..,.....,......,..,." + "...........ss...........", + ".#########-XX-#########.", + ".# f__f #.", + ".# f__f #.", + ".# f__fffffff #.", + ".# f________ff #.", + ".# ff________f #.", + ".# 7 WWfffffff__f #.", + ".# WWWWWWW f__f #.", + ".# fffWwwwwwwWWWf__f #.", + ".# ff__==========___f #.", + ".# f___==========__ff #.", + ".# f__fWwwwwwwwwWf'f #.", + ".# f__fWWwwwwwwWW ' #.", + ".# f__f WWwwwwwW ' #.", + ".# f__f WWwwWWW 7 ' #.", + ".# f__f 7 WWWW ' #.", + ".# f__f ''''' ' #.", + ".#||DD|G||'bbb''''''' #.", + ".#a|,,S,L|''''' ' #.", + ".#,C,,,,1G'4'4' ' #.", + ".#t|BE,21|''''' ' #.", + ".#################-X-##.", + "........................" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "palettes": [ "park_nature_palette" ], "terrain": { - ",": "t_dirt", - "-": "t_chainfence_h", - ".": "t_grass", - " ": "t_floor", - "x": "t_sidewalk", - "w": "t_water_dp", - "z": "t_wall_wood", - "A": "t_tree_willow", + "-": "t_chainfence", + ".": "t_region_groundcover_urban", + "f": "t_region_groundcover_urban", + ",": "t_floor", + "1": "t_floor", + "2": "t_floor", + "a": "t_floor", + "t": "t_floor", + "B": "t_floor", + "E": "t_floor", + "L": "t_floor", + "S": "t_floor", + "s": "t_sidewalk", + "|": "t_wall_wood", "D": "t_door_locked_peep", "C": "t_door_c", "G": "t_curtains", - "P": "t_tree_cherry", - "T": "t_tree", - "W": "t_brick_wall", - "X": "t_chaingate_l", - "Y": "t_tree_young", - "~": "t_grass", - "@": "t_grass", - "d": "t_grass", - "f": "t_grass", - "o": "t_grass", - "p": "t_grass", - "s": "t_grass" + "4": "t_tree_cherry", + "7": "t_tree_willow", + "#": "t_brick_wall", + "X": "t_chaingate_l" }, "furniture": { - "~": "f_dahlia", - "@": "f_dumpster", - "d": "f_dandelion", - "f": "f_bluebell", - "o": "f_datura", - "p": "f_mutpoppy", - "s": "f_bulletin", "1": "f_desk", "2": "f_chair", "a": "f_sink", "t": "f_toilet", "B": "f_bookcase", "E": "f_armchair", - "F": "f_fridge", "L": "f_locker", - "S": "f_woodstove" + "S": "f_woodstove", + "f": "f_region_flower_decorative" }, "toilets": { "t": { } }, - "place_vehicles": [ { "vehicle": "bicycle", "x": 3, "y": 2, "rotation": 0, "chance": 50 } ], - "place_items": [ - { "item": "trash_forest", "chance": 50, "x": [ 17, 19 ], "y": [ 19, 21 ] }, - { "item": "trash", "chance": 50, "x": [ 4, 5 ], "y": [ 8, 11 ] }, - { "item": "trash", "chance": 50, "x": [ 6, 15 ], "y": [ 10, 15 ] }, - { "item": "trash_forest", "chance": 50, "x": [ 17, 19 ], "y": [ 19, 21 ] }, - { "item": "trash", "chance": 50, "x": [ 4, 5 ], "y": [ 8, 11 ] }, - { "item": "trash", "chance": 50, "x": [ 6, 15 ], "y": [ 10, 15 ] }, - { "item": "trash_forest", "chance": 50, "x": 9, "y": 21 }, - { "item": "trash_forest", "chance": 50, "x": 10, "y": 21 }, - { "item": "trash", "chance": 50, "x": 9, "y": 21 }, - { "item": "trash", "chance": 50, "x": 10, "y": 21 }, - { "item": "trash_forest", "chance": 50, "x": 9, "y": 21 }, - { "item": "trash_forest", "chance": 50, "x": 10, "y": 21 }, - { "item": "trash", "chance": 50, "x": 10, "y": 21 }, - { "item": "trash", "chance": 50, "x": 11, "y": 21 } - ], - "place_signs": [ { "signage": "Private Property: No Trespassing", "x": 8, "y": 0 } ] + "items": { + "B": { "item": "homebooks", "chance": 60, "repeat": [ 1, 5 ] }, + "1": { "item": "office", "chance": 50 }, + "S": { "item": "fireplace_fill", "chance": 80, "repeat": [ 1, 3 ] }, + "L": { "item": "tools_earthworking", "chance": 40, "repeat": [ 1, 2 ] } + }, + "place_vehicles": [ { "vehicle": "bicycle", "x": 6, "y": 0, "rotation": 0, "chance": 50 } ], + "place_signs": [ { "signage": "Private Property: No Trespassing", "x": 15, "y": 0 } ] } }, { diff --git a/data/json/mapgen/cs_public_art_piece.json b/data/json/mapgen/cs_public_art_piece.json index 5d801ade8b04a..cf10074314c33 100644 --- a/data/json/mapgen/cs_public_art_piece.json +++ b/data/json/mapgen/cs_public_art_piece.json @@ -1,49 +1,41 @@ [ - { - "type": "item_group", - "id": "oa_pap_chess_pieces", - "items": [ [ "rock", 60 ] ] - }, { "type": "mapgen", "method": "json", "om_terrain": [ "cs_public_art_piece" ], "weight": 1000, "object": { + "fill_ter": "t_region_groundcover_urban", "rows": [ - "........,.....,...,.....", - "....,...,.,.....,...,...", - "....,........,..........", - "........,.......,...,...", - "...,,........,.....,,...", - ".........cbbbbc.........", - "....,..........,,......,", - ".......++++++++++...,...", - ".,.....+OXOXOXOX+.,.....", - ".....c.+XOXOXOXO+.c.....", - "...,.b.+OXOXOXOX+.b..,..", - ".....b,+XOXOXOXO+.b,....", - "..,..b.+OXOXOXOX+.b.....", - ".....b,+XOXOXOXO+.b...,.", - "...,.c.+OXOXOXOX+.c.....", - ".......+XOXOXOXO+...,,..", - "....,..++++++++++.......", - ".,.....,...,.,......,...", - "...,,..,.cbbbbc..,......", - "...........,.......,....", - ".......,...,....,.......", - "...,................,...", - "......,,.....,..,.......", - "....,,....,..........,.." + " ss ", + " ss ", + " ss ", + " ss ", + " ss ", + " ss ", + " ss ", + " ssssssssss ", + " sOXOXOXOXs ", + " c sXOXOXOXOs c ", + " b sOXOXOXOXs b ", + " b sXOXOXOXOs b ", + " b sOXOXOXOXs b ", + " b sXOXOXOXOs b ", + " c sOXOXOXOXs c ", + " sXOXOXOXOs ", + " ssssssssss ", + " ", + " cbbbbc ", + " ", + " ", + " ", + " ", + " " ], - "terrain": { ".": "t_grass", ",": "t_dirt", "+": "t_floor", "X": "t_pavement", "O": "t_sidewalk", "b": "t_dirt", "c": "t_dirt" }, + "terrain": { " ": "t_region_groundcover_urban", "s": "t_sidewalk", "X": "t_pavement", "O": "t_concrete" }, "furniture": { "b": "f_bench", "c": "f_trashcan" }, - "items": { - "c": { "item": "oa_custom_trash", "chance": 30 }, - "b": { "item": "oa_discarded_news", "chance": 5 }, - "X": { "item": "oa_pap_chess_pieces", "chance": 20 }, - "O": { "item": "oa_pap_chess_pieces", "chance": 20 } - } + "items": { "c": { "item": "oa_custom_trash", "chance": 30 }, "b": { "item": "oa_discarded_news", "chance": 5 } }, + "item": { "X": { "item": "rock", "chance": 20 }, "O": { "item": "rock", "chance": 20 } } } } ] diff --git a/data/json/mapgen/cs_public_space.json b/data/json/mapgen/cs_public_space.json index cde7322bf22fe..a972bb1d5880e 100644 --- a/data/json/mapgen/cs_public_space.json +++ b/data/json/mapgen/cs_public_space.json @@ -5,46 +5,43 @@ "method": "json", "weight": 1000, "object": { + "fill_ter": "t_sidewalk", "rows": [ - "...,......,'',..,...,,..", - "..,...,..,,'',..,..,...,", - "..,...,...,'',,......,..", - "...,fsfsfs,'',sfsfsf,.,.", - ".,.f,,,,,,,'',,,,,,,f...", - "...s,,'''''''''''',,s..,", - "..,f,'''bb''''bb'D',f...", - "...s,''''''NN'''''',s,..", - "...f,'b''''ww''''b',f...", - ".,.s,'b''''ww''''b',s..,", - "...f,'''''wwww''''',f...", - "..,s,,''wwwSSwww'',,s...", - "...f,,''wwwSSwww'',,f.,.", - "...s,'''''wwww''''',s...", - ".,.f,'b''''ww''''b',f,..", - "...s,'b''''ww''''b',s...", - ".,.f,'''''''''''''',f..,", - "...s,'D'bb''''bb''',s...", - "...f,,''''',,''''',,f.,.", - ",..s,,,,,,,,,,,,,,,,s..,", - "...,fsfsfsf,,fsfsfsf,...", - "..,...,.....,......,...,", - "....,...,.....,.....,...", - ".........,...,....,...,." + " ss ", + " ss ", + " ####### ss ####### ", + " ##fffff ss fffff## ", + " #ff ss ff# ", + " #f ssssssssssss f# ", + " #f sssbbssssbbsss f# ", + " #f ssssssssssssss f# ", + " #f sbssssssssssbs f# ", + " #f sbssswwwwsssbs f# ", + " #f sssswwwwwwssss f# ", + " #f sssswwSSwwssss f# ", + " #f sssswwSSwwssss f# ", + " #f sssswwwwwwssss f# ", + " #f sbssswwwwsssbs f# ", + " #f sbssssssssssbs f# ", + " #f ssssssssssssss f# ", + " #f sssbbssssbbsss f# ", + " #f ssssssssssss f# ", + " #ff ff# ", + " ##ffffffffffffffff## ", + " ################## ", + " ", + " " ], "terrain": { - ".": "t_grass", - ",": "t_dirt", - "'": "t_sidewalk", - "w": "t_water_sh", - "s": "t_underbrush", - "S": "t_water_sh", - "b": "t_sidewalk", - "D": "t_sidewalk", - "N": "t_sidewalk", - "f": "t_dirtmound" + " ": "t_region_groundcover_urban", + "s": "t_sidewalk", + "w": "t_water_pool_shallow_outdoors", + "#": "t_region_shrub_decorative", + "S": "t_water_pool_shallow_outdoors", + "f": "t_region_groundcover_urban" }, - "furniture": { "S": "f_statue", "b": "f_bench", "D": "f_dumpster", "N": "f_bulletin", "f": "f_bluebell" }, - "items": { "D": { "item": "oa_custom_trash", "chance": 70 }, "b": { "item": "oa_discarded_news", "chance": 5 } } + "furniture": { "S": "f_statue", "b": "f_bench", "f": "f_region_flower_decorative" }, + "items": { "b": { "item": "oa_discarded_news", "chance": 5 } } } } ] diff --git a/data/json/mapgen/farm_tree.json b/data/json/mapgen/farm_tree.json index 9afb8dfdf653f..541c90096a42e 100644 --- a/data/json/mapgen/farm_tree.json +++ b/data/json/mapgen/farm_tree.json @@ -1,153 +1,64 @@ [ { "method": "json", + "type": "mapgen", + "om_terrain": [ [ "TreeFarm_1a", "TreeFarm_1b" ] ], + "weight": 100, "object": { - "place_item": [ { "item": "chainsaw_off", "chance": 20, "x": 3, "y": 10 }, { "item": "saw", "chance": 70, "x": 3, "y": 10 } ], - "furniture": { - "#": "f_table", - "&": "f_trashcan", - "+": "f_null", - "-": "f_null", - ".": "f_null", - "1": "f_null", - "4": "f_null", - "D": "f_null", - "P": "f_sign", - "_": "f_null", - "c": "f_chair", - "d": "f_desk", - "w": "f_null", - "|": "f_null" - }, - "place_items": [ - { "chance": 30, "item": "tools_common", "x": 4, "y": 11 }, - { "chance": 20, "repeat": [ 1, 4 ], "item": "trash", "x": 4, "y": 3 }, - { "chance": 30, "item": "tools_earthworking", "x": 3, "y": 11 }, - { "chance": 30, "item": "tools_earthworking", "x": 3, "y": 9 }, - { "chance": 30, "item": "tools_earthworking", "x": 4, "y": 9 }, - { "chance": 20, "repeat": [ 1, 2 ], "item": "office", "x": 3, "y": 5 } - ], + "fill_ter": "t_floor", "rows": [ - "........................", - "....PP..................", - "..-w--..................", - "..-_&-....1..1..1..1..1.", - "..wc_+..................", - "..-d_-..................", - "..-w--....1..1..1..1..1.", - "........................", - "..||||..................", - "..|##|....1..1..1..1..1.", - "..|#D+..................", - "..|##|..................", - "..||||....4..4..4..4..4.", - "........................", - "........................", - ".4..4..4..4..4..4..4..4.", - "........................", - "........................", - ".4..4..4..4..4..4..4..4.", - "........................", - "........................", - ".4..4..4..4..4..4..4..4.", - "........................", - "........................" + " ", + " ", + " -w-- ", + " -.&- 1 1 1 1 1 1 1 1 1 1 1 1 1 ", + " wc.+ ", + " -d.- ", + " -w-- 1 1 1 1 1 1 1 1 1 1 1 1 1 ", + " ", + " |||| ", + " |##| 1 1 1 1 1 1 1 1 1 1 1 1 1 ", + " |#D+ ", + " |##| ", + " |||| 4 4 4 4 4 4 4 4 4 4 4 4 4 ", + " ", + " ", + " 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 ", + " ", + " ", + " 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 ", + " ", + " ", + " 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 ", + " ", + " " ], + "furniture": { "#": "f_utility_shelf", "&": "f_trashcan", "c": "f_chair", "d": "f_desk" }, "terrain": { "#": "t_dirtfloor", - "&": "t_floor", "+": "t_door_c", "-": "t_wall", - ".": [ - "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_underbrush", - "t_dirt", - "t_dirt" - ], + " ": "t_region_groundcover", "1": "t_tree_young", "4": "t_tree_pine", "D": "t_dirtfloor", "P": "t_grass", - "_": "t_floor", - "c": "t_floor", - "d": "t_floor", + ".": "t_floor", "w": "t_window", "|": "t_wall_wood" }, + "place_item": [ { "item": "chainsaw_off", "chance": 70, "x": 3, "y": 10 }, { "item": "saw", "chance": 70, "x": 3, "y": 10 } ], + "place_items": [ + { "chance": 30, "item": "tools_common", "x": 4, "y": 11 }, + { "chance": 20, "repeat": [ 1, 4 ], "item": "trash", "x": 4, "y": 3 }, + { "chance": 30, "item": "tools_earthworking", "x": 3, "y": 11 }, + { "chance": 30, "item": "tools_earthworking", "x": 3, "y": 9 }, + { "chance": 30, "item": "tools_earthworking", "x": 4, "y": 9 }, + { "chance": 20, "repeat": [ 1, 2 ], "item": "office", "x": 3, "y": 5 } + ], "place_signs": [ { "signage": "'s Tree Farm, call us at 555-8758!", "x": 4, "y": 1 }, { "signage": "Christmas trees available early winter!", "x": 5, "y": 1 } ] - }, - "om_terrain": "TreeFarm_1a", - "type": "mapgen", - "weight": 100 - }, - { - "method": "json", - "object": { - "furniture": { ".": "f_null", "1": "f_null", "4": "f_null" }, - "rows": [ - "........................", - "........................", - "........................", - ".1..1..1..1..1..1..1..1.", - "........................", - "........................", - ".1..1..1..1..1..1..1..1.", - "........................", - "........................", - ".1..1..1..1..1..1..1..1.", - "........................", - "........................", - ".4..4..4..4..4..4..4..4.", - "........................", - "........................", - ".4..4..4..4..4..4..4..4.", - "........................", - "........................", - ".4..4..4..4..4..4..4..4.", - "........................", - "........................", - ".4..4..4..4..4..4..4..4.", - "........................", - "........................" - ], - "terrain": { - ".": [ - "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_underbrush", - "t_dirt", - "t_dirt" - ], - "1": "t_tree_young", - "4": "t_tree_pine" - } - }, - "om_terrain": "TreeFarm_1b", - "type": "mapgen", - "weight": 100 + } } ] diff --git a/data/json/mapgen/garden_botanical.json b/data/json/mapgen/garden_botanical.json index 992051bb606b3..eff39efc25e35 100644 --- a/data/json/mapgen/garden_botanical.json +++ b/data/json/mapgen/garden_botanical.json @@ -5,56 +5,67 @@ "type": "mapgen", "weight": 100, "object": { - "fill_ter": "t_grass", + "fill_ter": "t_region_groundcover_urban", "rows": [ - "cccccccccccccccccccccccccccccccccccccccccccccccc", - "cccccccccccccccccccccccccccccccccccccccccccccccc", - "...#.#.#.#...#...X...P____P...7..#........#.....", - "..._____.....4...P.#.______.#.P...T..#..._____#.", - ".#.______..#.P......________......P.....______..", - "..__.#..__......._____...._____........__..#.__.", - "#.__....___....______...j..______...#.___....__.", - "..__.KP.._________.___..P.___._________#.Pa..__#", - "..__#...._______...__________..._______......__.", - "..___#.._____..#.P..________..P.._______..#.___.", - ".#________#......3............9.#....._________.", - "....______....#....#..#..#..#......#.._______...", - "#.#..#.__.Z||||||||||||||||||||||||||&.__.#...#.", - "..6P...__.b|fffftFFFFtGGGGtiiiitSSSS|b.__...Pe..", - "....______b|ffsftFFsFtGGsGtisiitSsSS|b______....", - "..#________|fffftFFFFtGGGGtiiiitSSSS|________#..", - "#..___..___+tttttttttttttttttttttttt+___.#___...", - "..__....___+tttttttttttttttttttttttt+___....__.#", - ".#__.hP.___|mmmmtDDDDtIIIIt****tBBBB|___.Pg.__..", - "..__....__b|mmsmtDDsDtIIsIt*s**tBsBB|b__....__..", - ".#________b|mmmmtDDDDtIIIIt****tBBBB|b________#.", - "...______..||||||||||||||||||||||||||..______...", - "....#.........#......#.......#........#......#..", - "#..#...#...#.......#....#....#....#......#......" + "#É __ Í#", + "# ü X __ 7 Ü #", + "# _____ 4 ________ T ______ #", + "# ________ __________ ________ #", + "# __ __ ___ ___ __ __ #", + "#b__ K _____________ _____________ a __b#", + "#b__ ____________ J j ____________ __b#", + "#b__ k __ ___ ___ __ A __b#", + "# ___ ___ __________ ___ ___ #", + "# _______ é 3 ________ 9 í _______ #", + "# ______ ______ #", + "#6 __ |||||||||||||||||||||||||| __ e#", + "# __ |BBBBtFFFFtfffftiiiitSSSS| __ #", + "#á _____ |BBsBtFFsFtffsftisiitSsSS| _____ ú#", + "# ______ |BBBBtFFFFtfffftiiiitSSSS| ______ #", + "# ___ ___+tttttttttttttttttttttttt+___ ___ #", + "# ___ ___+tttttttttttttttttttttttt+___ ___ #", + "# __ h __ |mmmmtDDDDtIIIIt****tGGGG| __ g __ #", + "..__ __ |mmsmtDDsDtIIsIt*s**tGsGG| __ __..", + "# ________ |mmmmtDDDDtIIIIt****tGGGG| ________ #", + "# ______. |||||||||||||||||||||||||| ______ #", + "# Zbbb . bbbZ #", + "#Á . Ú#", + "#########.######################################" ], "terrain": { - "#": "t_underbrush", - "+": "t_reinforced_door_glass_c", - ".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ], - "B": [ "t_shrub_blueberry", "t_dirtfloor", "t_dirtfloor" ], - "S": [ "t_shrub_strawberry", "t_dirtfloor", "t_dirtfloor" ], + "+": "t_laminated_door_glass_c", + " ": "t_region_groundcover_urban", + ".": "t_region_soil", + "B": "t_shrub_blueberry", + "S": "t_shrub_strawberry", + "i": "t_shrub_rose", + "F": "t_shrub_peanut", "4": "t_tree_willow", "K": "t_tree_pine", + "k": "t_tree_juniper", "6": "t_tree_hickory", "3": "t_tree_maple", "h": "t_tree_birch", "7": "t_tree_pear", "T": "t_tree_cherry", "a": "t_tree_peach", + "A": "t_tree_almond", "9": "t_tree_apple", "e": "t_tree_apricot", "g": "t_tree_plum", "j": "t_tree_coffee", + "J": "t_tree_elm", + "é": "t_tree_mulberry", + "É": "t_tree_elderberry", + "ü": "t_tree_walnut", + "Ü": "t_tree_chestnut", + "í": "t_tree_hazelnut", + "Í": "t_tree_beech", + "á": "t_tree_blackjack", + "Á": "t_tree_cottonwood", + "ú": "t_tree_alder", + "Ú": "t_tree_pecan", "X": "t_tree", - "P": "t_grass", - "&": "t_grass", - "b": "t_grass", - "Z": "t_grass", "d": "t_dirtfloor", "f": "t_dirtfloor", "G": "t_dirtfloor", @@ -63,58 +74,62 @@ "s": "t_dirtfloor", "*": "t_dirtfloor", "D": "t_dirtfloor", - "F": "t_dirtfloor", - "i": "t_dirtfloor", "_": "t_concrete", - "c": "t_sidewalk", "t": "t_thconc_floor", - "|": "t_wall_glass" + "|": "t_laminated_glass" }, "furniture": { "b": "f_bench", "Z": "f_trashcan", - "s": "f_sign", - "P": "f_sign", - "D": [ "f_dandelion", "f_null", "f_null" ], - "*": [ "f_datura", "f_null", "f_null" ], - "i": [ "f_cattails", "f_null", "f_null" ], - "I": [ "f_dahlia", "f_null", "f_null" ], - "f": [ "f_chamomile", "f_null", "f_null" ], - "F": [ "f_mutcactus_test", "f_null", "f_null" ], - "G": [ "f_bluebell", "f_null", "f_null" ], - "m": [ "f_mutpoppy", "f_null", "f_null" ] + "D": "f_dandelion", + "*": "f_datura", + "I": "f_dahlia", + "f": "f_chamomile", + "G": "f_bluebell", + "m": "f_mutpoppy", + "#": "f_hedge_short" }, "place_signs": [ - { "signage": "Welcome to Botanical Garden! Please stay on the path!", "x": 21, "y": 2 }, - { "signage": "WILLOW", "x": 13, "y": 4 }, - { "signage": "PINE", "x": 6, "y": 7 }, - { "signage": "HICKORY", "x": 3, "y": 13 }, - { "signage": "MAPLE", "x": 17, "y": 9 }, - { "signage": "BIRCH", "x": 6, "y": 18 }, - { "signage": "OAK", "x": 17, "y": 3 }, - { "signage": "CHAMOMILE", "x": 14, "y": 14 }, - { "signage": "POPPY", "x": 14, "y": 19 }, - { "signage": "CACTUS", "x": 19, "y": 14 }, - { "signage": "DANDELION", "x": 19, "y": 19 }, - { "signage": "Welcome to Botanical Garden! Please stay on the path!", "x": 26, "y": 2 }, - { "signage": "KENTUCKY COFFEE", "x": 24, "y": 7 }, - { "signage": "PEAR", "x": 30, "y": 3 }, - { "signage": "CHERRY", "x": 34, "y": 4 }, - { "signage": "APPLE", "x": 30, "y": 9 }, - { "signage": "PEACH", "x": 41, "y": 7 }, - { "signage": "APRICOT", "x": 44, "y": 13 }, - { "signage": "PLUM", "x": 41, "y": 18 }, - { "signage": "BLUEBELL", "x": 24, "y": 14 }, - { "signage": "DAHLIA", "x": 24, "y": 19 }, - { "signage": "CATTAIL", "x": 28, "y": 14 }, - { "signage": "DATURA", "x": 28, "y": 19 }, - { "signage": "STRAWBERRY", "x": 33, "y": 14 }, - { "signage": "BLUEBERRY", "x": 33, "y": 19 } + { "signage": "Welcome to Botanical Garden! Please stay on the path!", "x": 22, "y": 0 }, + { "signage": "Welcome to Botanical Garden! Please stay on the path!", "x": 25, "y": 0 }, + { "signage": "WEEPING WILLOW\nSalix babylonica\nPlanted by ", "x": 14, "y": 3 }, + { "signage": "RED PINE\nPinus resinosa\nPlanted by ", "x": 6, "y": 5 }, + { "signage": "COMMON JUNIPER\nJuniperus communis\nPlanted by ", "x": 5, "y": 7 }, + { "signage": "SHAGBARK HICKORY\nCarya ovata\nPlanted by ", "x": 2, "y": 11 }, + { "signage": "SUGAR MAPLE\nAcer saccharum\nPlanted by ", "x": 17, "y": 8 }, + { "signage": "CANOE BIRCH\nBetula papyrifera\nPlanted by ", "x": 6, "y": 17 }, + { "signage": "POST OAK\nQuercus stellata\nPlanted by ", "x": 17, "y": 2 }, + { "signage": "BREADSEED POPPY\nPapaver somniferum\nPlanted by ", "x": 14, "y": 18 }, + { "signage": "'FLORUNNER' PEANUT\nArachis hypogaea\nPlanted by ", "x": 19, "y": 13 }, + { "signage": "COMMON DANDELION\nTaraxacum officinale\nPlanted by ", "x": 19, "y": 18 }, + { "signage": "KENTUCKY COFFEE\nGymnocladus dioicus\nPlanted by ", "x": 25, "y": 5 }, + { "signage": "AMERICAN ELM\nUlmus americana\nPlanted by ", "x": 22, "y": 5 }, + { "signage": "COMMON PEAR\nPyrus communis\nPlanted by ", "x": 30, "y": 2 }, + { "signage": "SWEET CHERRY\nPrunus avium\nPlanted by ", "x": 33, "y": 3 }, + { "signage": "'RED DELICIOUS' APPLE\nMalus domestica\nPlanted by ", "x": 30, "y": 8 }, + { "signage": "'AUTUMN RED' PEACH\nPrunus persica\nPlanted by ", "x": 41, "y": 5 }, + { "signage": "SWEET ALMOND\nPrunus dulcis\nPlanted by ", "x": 42, "y": 7 }, + { "signage": "COMMON APRICOT\nPrunus armeniaca\nPlanted by ", "x": 45, "y": 11 }, + { "signage": "EUROPEAN PLUM\nPrunus domestica\nPlanted by ", "x": 41, "y": 17 }, + { "signage": "GARDEN DAHLIA\nDahlia pinnata\nPlanted by ", "x": 24, "y": 18 }, + { "signage": "DOG ROSE\nRosa canina\nPlanted by ", "x": 28, "y": 13 }, + { "signage": "SACRED DATURA\nDatura wrightii\nPlanted by ", "x": 28, "y": 18 }, + { "signage": "WILD CHAMOMILE\nMatricaria recutita\nPlanted by ", "x": 24, "y": 13 }, + { "signage": "VIRGINIA BLUEBELL\nMertensia virginica\nPlanted by ", "x": 33, "y": 18 }, + { "signage": "NEW JERSEY BLUEBERRY\nVaccinium caesariense\nPlanted by ", "x": 14, "y": 13 }, + { "signage": "GARDEN STRAWBERRY\nFragaria × ananassa\nPlanted by ", "x": 33, "y": 13 }, + { "signage": "RED MULBERRY\nMorus rubra\nPlanted by ", "x": 13, "y": 8 }, + { "signage": "AMERICAN BLACK ELDERBERRY\nSambucus canadensis\nPlanted by ", "x": 2, "y": 1 }, + { "signage": "MADEIRA WALNUT\nJuglans regia\nPlanted by ", "x": 11, "y": 2 }, + { "signage": "AMERICAN CHESTNUT\nCastanea dentata\nPlanted by ", "x": 36, "y": 2 }, + { "signage": "COMMON HAZELNUT\nCorylus avellana\nPlanted by ", "x": 34, "y": 8 }, + { "signage": "BLACKJACK OAK\nQuercus marilandica\nPlanted by ", "x": 2, "y": 13 }, + { "signage": "BLACK COTTONWOOD\nPopulus trichocarpa\nPlanted by ", "x": 2, "y": 21 }, + { "signage": "HAZEL ALDER\nAlnus serrulata\nPlanted by ", "x": 45, "y": 13 }, + { "signage": "'OSWEGO' PECAN\nCarya illinoinensis\nPlanted by ", "x": 45, "y": 21 }, + { "signage": "COMMON BEECH\nFagus sylvatica\nPlanted by ", "x": 45, "y": 1 } ], - "place_items": [ - { "chance": 20, "repeat": [ 1, 3 ], "item": "trash", "x": 10, "y": 12 }, - { "chance": 20, "repeat": [ 1, 3 ], "item": "trash", "x": 37, "y": 12 } - ] + "items": { "z": { "chance": 40, "repeat": [ 1, 3 ], "item": "trash" } } } }, { @@ -135,7 +150,6 @@ " ", " ", " ", - " ", " oooooooooooooooooooooooooo ", " oooooooooooooooooooooooooo ", " oooooooooooooooooooooooooo ", @@ -147,6 +161,7 @@ " oooooooooooooooooooooooooo ", " oooooooooooooooooooooooooo ", " ", + " ", " " ], "palettes": [ "roof_palette" ] diff --git a/data/json/mapgen/park_state.json b/data/json/mapgen/park_state.json index 0febdf23133c3..dc60cac3105f0 100644 --- a/data/json/mapgen/park_state.json +++ b/data/json/mapgen/park_state.json @@ -2,256 +2,72 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "state_park_0_0" ], + "om_terrain": [ [ "state_park_0_0", "state_park_1_0" ], [ "state_park_0_1", "state_park_1_1" ] ], "weight": 100, "object": { + "predecessor_mapgen": "forest_thick", "rows": [ - "||||||||||||||||||||||||", - "|.........T.............", - "|.##...#......#..T....#.", - "|.##1#.4#1#4#.1#4.S7.f..", - "|1g#.#...s.#.....g..1...", - "|.#..#....#b....#..#...#", - "|.7.4.#.7....#...1......", - "|#....g....4g.#....#.1..", - "|.....1.#....#..#4.4.4..", - "|.fa..........t...______", - "|...#....1.#4___________", - "|T.1g.4.&t______________", - "|....S.#B_____..t.T4.4..", - "|.#...s_B___............", - "|...7..____..1#.7..a..4.", - "|.4..f.t__t......#......", - "|....#.___..#g#....1f#4.", - "|..#...___...7..g4s...#.", - "|#.1#.___.1.....1....c..", - "|..#.4___...#....#......", - "|.4#4.___..g.b4.S#d#....", - "|.s.#..__4..1.....#...4.", - "|..1.4.___.4..e.7...1...", - "|......_._.............." + "||||||||||||||||||||||||||||||,,,,,,,###,,,,,,,|", + "| ,,,,,,,#h#,,,,,,,|", + "| ,,,,,,,+.0,,,,,,,|", + "| _,,,,,,,#d#,,,,,,,|", + "| _,,,,,,,###,,,,,,,|", + "| _,,,,,,,,,,,,,,,,,|", + "| __,,,,,,,,,,,,,,,,,|", + "| _____,,,,,,,,,,,,,,,,,|", + "| _________,,,,,,,,,,,,,,,,,|", + "| ________ __,,,,,,,,,,,,,,,,,|", + "| _________ _;,,,;,,,;,,,;,,,;|", + "| _________ ;,,,;,,,;,,,;,,,;|", + "| _____ ;,,,;,,,;,,,;,,,;|", + "| ___ ;,,,;,,,;,,,;,,,;|", + "| ___ ;,,,;,,,;,,,;,,,;|", + "| __ ______________ |", + "| __ ________ |", + "| ___ ___ |", + "| __ __ |", + "| __ __ |", + "| __ ___ |", + "| __ __ |", + "| ___ ___ |", + "| __ __ |", + "| __ ___ |", + "| ___ __ |", + "| __ __ |", + "| __ ____ |", + "| __ _______ |", + "| ___ ___ ___ |", + "| __ ___ ___ |", + "| __ ___ ___ |", + "| __ ___ ___ |", + "| ___ ___ WWWW ___ |", + "| Y ______ Y ___ WWWWWW __ |", + "| _________ ____ WWwwwWWW ___ |", + "| __ ___& __________ WWwwwwwWW __ |", + "| __ _______________ WWwwwwwwwWW __ |", + "| ___ bbb ______bbb ___ WWwwwwwwwWW __ |", + "| __ TTT ___ TTT ___ WWWwwwwwwWW __ |", + "| ___ bbb ___ bbb ___ WWWwwwwWWW __ |", + "| bTb___ ____bTb ____ WWWWWWWW __ |", + "| bTb________ bTb ___ WWWW ___ |", + "| bTb ____ bTb _____ ____ |", + "| Y _________ |", + "| _____ |", + "| |", + "||||||||||||||||||||||||||||||||||||||||||||||||" ], - "terrain": { - "#": "t_underbrush", - "&": "t_grass", - ".": "t_grass", - "1": "t_tree_young", - "4": "t_tree_pine", - "7": "t_tree_dead", - "B": "t_dirt", - "S": "t_shrub", - "T": "t_tree_hickory_harvested", - "_": "t_dirt", - "a": "t_tree", - "b": "t_grass", - "c": "t_tree_apple_harvested", - "d": "t_tree_hickory", - "e": "t_shrub_strawberry", - "f": "t_grass", - "g": "t_grass_white", - "s": "t_shrub_blueberry", - "t": "t_tree_deadpine", - "|": "t_chainfence_h" - }, - "furniture": { "&": "f_trashcan", "B": "f_bench", "b": "f_bluebell", "f": "f_dandelion" }, - "place_item": [ - { "item": "rock", "x": 4, "y": 4 }, - { "item": "log", "x": 18, "y": 5 }, - { "item": "log", "x": 4, "y": 11 }, - { "item": "log", "x": 14, "y": 17 }, - { "item": "rock", "x": 20, "y": 18 } + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "palettes": [ "park_nature_palette" ], + "place_monsters": [ + { "monster": "GROUP_PARK_ANIMAL", "x": [ 3, 21 ], "y": [ 5, 19 ], "repeat": 4 }, + { "monster": "GROUP_PARK_ANIMAL", "x": [ 31, 43 ], "y": [ 30, 45 ], "repeat": 2 } ], - "place_monsters": [ { "monster": "GROUP_PARK_ANIMAL", "x": [ 3, 21 ], "y": [ 5, 19 ], "repeat": 4 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "state_park_0_1" ], - "weight": 100, - "object": { - "rows": [ - "|...#..___.....##.......", - "|..#.#.___#...7...4..#..", - "|##7#..___..#...1....T..", - "|..#..4___..1..#.#.t.S..", - "|.B...#___#....7....#..#", - "|..#...___...#...4#...4.", - "|.t..7____.7...f.#..1...", - "|.....____#.t...###.....", - "|#..#.____7......#.#..7.", - "|#...4______##..t..B.u..", - "|.f.#_____cbbc..s......#", - "|.u.._____caac_..###.4..", - "|....___4.caac__#4______", - "|.#14___..cbbc__________", - "|....___T.cccc__________", - "|7.#.___.B...4____.&dd_.", - "|...T____.4..____.....4.", - "|.t...__________....e...", - "|.#s.4________4..#.1.#..", - "|.##...______.......#...", - "|..1..g..___T.#.7..f..1.", - "|........44....s.....#..", - "|.#.f.#...#.#.t..4.##...", - "||||||||||||||||||||||||" - ], - "terrain": { - "#": "t_underbrush", - "&": "t_dirt", - ".": "t_grass", - "1": "t_tree_young", - "4": "t_tree_pine", - "7": "t_tree", - "B": "t_grass", - "S": "t_shrub_strawberry_harvested", - "T": "t_tree_hickory", - "_": "t_dirt", - "a": "t_concrete", - "b": "t_concrete", - "c": "t_concrete", - "d": "t_dirt", - "e": "t_shrub", - "f": "t_grass", - "g": "t_tree_apple_harvested", - "s": "t_shrub_blueberry", - "t": "t_tree_deadpine", - "u": "t_underbrush", - "|": "t_chainfence_h" - }, - "furniture": { "&": "f_trashcan", "B": "f_bluebell", "a": "f_table", "b": "f_bench", "d": "f_bench", "f": "f_dandelion" }, - "place_item": [ - { "item": "log", "x": 16, "y": 4 }, - { "item": "rock", "x": 1, "y": 7 }, - { "item": "log", "x": 2, "y": 12 }, - { "item": "log", "x": 17, "y": 19 }, - { "item": "rock", "x": 13, "y": 21 } + "place_vehicles": [ + { "vehicle": "parking_garage", "x": 44, "y": 11, "chance": 4, "rotation": 270 }, + { "vehicle": "parking_garage", "x": 40, "y": 11, "chance": 4, "rotation": 270 }, + { "vehicle": "parking_garage", "x": 36, "y": 11, "chance": 4, "rotation": 270 }, + { "vehicle": "parking_garage", "x": 32, "y": 11, "chance": 4, "rotation": 270 } ] } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "state_park_1_0" ], - "weight": 100, - "object": { - "rows": [ - "|||.......---.......||||", - "___.......-c-.......___|", - "_4_.......Df0.......___|", - "___.......-a-........._|", - "_7_.......---........._|", - "#__..................._|", - "_1_...................s|", - "__d...................s|", - "4_d...................s|", - "ddd...............pppps|", - "dddd..................s|", - "dddd..................s|", - "__dd..................s|", - "_4_d..................s|", - "____.............ppppps|", - "_#__..................s|", - "__#_..................s|", - "_7__ppppp.............s|", - "___#..................s|", - "4___.............ppppps|", - "__7_..................s|", - "____........dd........s|", - "__#_#_____ddddd_1_#_7__|", - "_1___#_7___dddS___4__#_|" - ], - "terrain": { - "#": "t_underbrush", - "-": "t_wall", - ".": "t_pavement", - "0": "t_window_empty", - "1": "t_tree_young", - "4": "t_tree_pine", - "7": "t_tree_dead", - "D": "t_door_o", - "S": "t_shrub_strawberry", - "_": "t_grass", - "a": "t_floor", - "c": "t_floor", - "d": "t_dirt", - "f": "t_floor", - "p": "t_pavement_y", - "s": "t_sidewalk", - "|": "t_chainfence_v" - }, - "furniture": { "a": "f_desk", "c": "f_chair" }, - "place_items": [ - { "item": "magazines", "x": 11, "y": 3, "chance": 30 }, - { "item": "pizza_trash", "x": 8, "y": 20, "chance": 30 }, - { "item": "pizza_trash", "x": 14, "y": 13, "chance": 30 }, - { "item": "pizza_trash", "x": 3, "y": 6, "chance": 30 }, - { "item": "pizza_trash", "x": 16, "y": 2, "chance": 30 } - ], - "place_vehicles": [ { "vehicle": "car", "x": 18, "y": 12, "chance": 4 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "state_park_1_1" ], - "weight": 100, - "object": { - "rows": [ - "...........___.........|", - "...4...7...___..#......|", - "....#......___..4...#..|", - ".#.7..4.#..____...1#4#.|", - "..*.......___s__.#.u#..|", - "..u#....4___...___#.#7.|", - "....1.f.____.U..___.f#.|", - ".4.....____4S..t____...|", - "..#7#..___U..ww..___4.1|", - "....#4___..Uwwww..___..|", - ".#f#____4.twwWWwwt.__..|", - "..#.___...wwWWWWww.__#b|", - "_______U.wwWWWWWww.&__T|", - "_____...wwWWWWWWWww-__.|", - "____4.bwwWWWWWWWWWw-__#|", - "..___..wwwWWWWWWWWw-__.|", - "...___..iwwWWWWWWww-__T|", - ".1.4____.cwwwwwwww.-__.|", - "...#.____..iwcwwi.___.#|", - "..e...4____.i..i.___.#.|", - ".#.f7...__________.#4u.|", - ".....#...._______...#7.|", - ".4..u..1.#.d.#d#.4....#|", - "||||||||||||||||||||||||" - ], - "terrain": { - "#": "t_underbrush", - "&": "t_grass", - "*": "t_underbrush", - "-": "t_railing_h", - ".": "t_grass", - "1": "t_tree_young", - "4": "t_tree_pine", - "7": "t_tree_maple", - "S": "t_shrub_blueberry_harvested", - "T": "t_tree_hickory_harvested", - "U": "t_underbrush", - "W": "t_water_dp", - "_": "t_dirt", - "b": "t_grass", - "c": "t_water_sh", - "d": "t_tree_birch", - "e": "t_shrub_strawberry_harvested", - "f": "t_grass", - "i": "t_grass", - "s": "t_shrub", - "t": "t_tree_willow", - "u": "t_underbrush", - "w": "t_water_sh", - "|": "t_chainfence_h" - }, - "furniture": { "&": "f_trashcan", "*": "f_datura", "b": "f_bluebell", "c": "f_cattails", "f": "f_dandelion", "i": "f_cattails" }, - "place_item": [ { "item": "rock", "x": 2, "y": 6 }, { "item": "rock", "x": 18, "y": 21 } ], - "place_monsters": [ { "monster": "GROUP_PARK_ANIMAL", "x": [ 7, 19 ], "y": [ 6, 21 ], "repeat": 2 } ] - } } ] diff --git a/data/json/mapgen/pond_fishing.json b/data/json/mapgen/pond_fishing.json index 9531bac238439..5516b5a3d0ffb 100644 --- a/data/json/mapgen/pond_fishing.json +++ b/data/json/mapgen/pond_fishing.json @@ -2,219 +2,70 @@ { "type": "mapgen", "method": "json", - "om_terrain": [ "fishing_pond_0_0" ], + "om_terrain": [ [ "fishing_pond_0_0", "fishing_pond_1_0" ], [ "fishing_pond_0_1", "fishing_pond_1_1" ] ], "weight": 100, "object": { + "predecessor_mapgen": "forest_thick", "rows": [ - "||||||||||||||||||||||||", - "|.......................", - "|..1...f...#.......4....", - "|t............1....#....", - "|....4....#.......#d#s..", - "|..._bb_________________", - "|#.&____________________", - "|..________#.........WWW", - "|.._______#..4.#..iWWWWW", - "|.________..f...WWWWWWww", - "|.________4....iiWWWwwww", - "|.___#____.#..iWWWwcwwww", - "|.__4..#___..WWWWwwwwwww", - "|.__.#..____pppppppppp-w", - "|d__....4__ppppppppppp-w", - "|.___u.....ppppppppppp-w", - "|.___.....iWWwwwwwwwpp-w", - "|.___.1..WiWwwwwwwwwpp-w", - "|.___#..iiWWwwwwwwwwpp-w", - "|#.___#.WWWwwwwwwwwwpp-w", - "|..___#iWWwcwwwwwwww---w", - "|..___.WiWwwwwwwwwwwwwww", - "|.4___.WWwwwwwwwwwwwwwww", - "|...__#WWwwwwwwwwwwwwwww" + "|||||||||||||||||||||||||||||||||||| _____ |||||", + "| _____ |", + "| _____ |", + "| Y ____ |", + "| _________ Y ____ |", + "| _______________________ _____ |", + "| &___________ _______ ______ |", + "| __bbb___ WWWWss______________ |", + "| __TTT__ WWWWWWWWss_____________ Y |", + "| ___bbb__ WWWWWWwwWWWsssssss________ |", + "| ________ WWWWWwwwwwWWssssssssss ___ |", + "| ___ ____ WWWWwwwwwwwwWWssssssss ___ |", + "| __ Y ___ WWWWwwwwwwwwwWWWssssss ___ |", + "| __ ____WWWWwwwwwwwwwwwWWsssssss ___ |", + "| __ __===========wwwwwWWWsssssss __ |", + "| ___ ===========wwwwwwWWWsssssss ___ |", + "| ___ WWWwwwwwww==wwwwwwwWWWssssss __ |", + "| ___ WWWwwwwwwww==wwwwwwwwWWWssssss __ |", + "| ___ WWWWwwwwwwww==wwwwwwwwwWWWWssss __ |", + "| ___ WWWwwwwwwwww==wwwwwwwwwwWWWWssss __ |", + "| ___ WWWwwwwwwwwwwwwwwwwwwwwwwwwWWssss __ |", + "| ___ WWWwwwwwwwwwwwwwwwwwwwwwwwwwWWsss __Y |", + "| ___ WWwwwwwwwwwwwwwwwwwwwwwwwwwwWWWs ___ |", + "| __ WWwwwwwwwwwwwwwwwwwwwwwwwwwwwWWs __ |", + "| __ WWwwwwwwwwwwwwwwwwwwwwwwwwwwwWW __ |", + "| __WWWwwwwwwwwwwwwwwwwwwwwwwwwwwwWW __ |", + "| __ WWwwwwwwwwwwwwwwwwwwwwwwwwwwWWW __ |", + "| __ WWwwwwwwwwwwwwwwwwwwwwwwwwwwWW __ |", + "| __ WWWwwwwwwwwwwwwwwwwwwwwwwwwwWW ___ |", + "| ___ WWwwwwwWWWWwwwwwwwwwwwwwwwwWWW __ |", + "| __ WWWwwwWW WWwwwwwwwwwwwwwwwWWW ___ |", + "| __ WWwwwWW WWwwwwwwwwwwwwwwwWWW __ |", + "| ___ WWWwwwW WWwwwwwwwwwwwwwwwwWWW __ |", + "| __ WWwwwWWWWWwwwwwwwwwwwwwwwwwWWW Y __& |", + "| ___ WWWwwwwWWwwwwwwwwwwwwwwwwwwwWW ____ |", + "| Y __ WWWWwwwwwwwwwwwwwwwwwwwwwwwWW _bTb |", + "| ___ WWWWwwwwwwwwwwwwwwwwwwwwwwWW _bTb |", + "| ____ WWWWWWwwwwwwwwwwwwwwwwwwwWW _bTb |", + "| &____ WWWWWWWWwwwwwwwwwwwwwWW ____ |", + "| _______ WWWWWWWWWwwwwwwwwWWW ___ |", + "| _________ WWWWWWWWwwwWWWW ___ |", + "| _bTb_________ Y WWWWWWWWW ____ |", + "| _bTb______________ WWWW _____ |", + "| _bTb___ _____________ _____ |", + "| _____ _____________________ Y |", + "| ____________ |", + "| |", + "||||||||||||||||||||||||||||||||||||||||||||||||" ], - "terrain": { - "#": "t_underbrush_harvested_autumn", - "&": "t_dirt", - "-": "t_railing_v", - ".": "t_grass", - "1": "t_tree_young", - "4": "t_tree_pine", - "W": "t_water_sh", - "_": "t_dirt", - "b": "t_dirt", - "c": "t_water_dp", - "d": "t_grass", - "f": "t_grass", - "i": "t_water_sh", - "p": "t_pavement", - "s": "t_shrub_strawberry", - "t": "t_tree_deadpine", - "u": "t_underbrush", - "w": "t_water_dp", - "|": "t_chainfence_h" - }, - "furniture": { "&": "f_trashcan", "b": "f_bench", "c": "f_cattails", "d": "f_dandelion", "f": "f_bluebell", "i": "f_cattails" }, + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "palettes": [ "park_nature_palette" ], "place_monsters": [ - { "monster": "GROUP_POND_ANIMAL", "x": [ 2, 8 ], "y": [ 4, 9 ], "repeat": 2 }, - { "monster": "GROUP_POND_BIRD", "x": [ 8, 9 ], "y": [ 16, 17 ], "repeat": 2 }, - { "monster": "GROUP_POND_FISH", "x": [ 7, 22 ], "y": [ 11, 23 ], "repeat": 3 } + { "monster": "GROUP_POND_ANIMAL", "x": [ 2, 8 ], "y": [ 4, 9 ], "chance": 20 }, + { "monster": "GROUP_POND_BIRD", "x": [ 8, 9 ], "y": [ 16, 17 ], "chance": 20 }, + { "monster": "GROUP_POND_FISH", "x": [ 7, 22 ], "y": [ 11, 23 ], "chance": 33 }, + { "monster": "GROUP_POND_BIRD", "x": 14, "y": 38 }, + { "monster": "GROUP_POND_FISH", "x": [ 26, 28 ], "y": [ 17, 21 ], "chance": 20 }, + { "monster": "GROUP_POND_FISH", "x": [ 31, 36 ], "y": [ 30, 35 ], "chance": 20 } ] } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "fishing_pond_0_1" ], - "weight": 100, - "object": { - "rows": [ - "|...__.WWwwwwwwwwwwwwwww", - "|4..__WWWwwwwwwwwwwwwwww", - "|...__.WWwwwwwwwwwwwwwww", - "|.#__..WWwwwwwwwwwwwwwww", - "|..__..WWWwwwwwwwwwwwwww", - "|.___4..WWwwwwwsssswwwww", - "|.__..f.WWWwwwss..sswwww", - "|.__#....WWwwwssS..swwww", - "|.___....WWWwwws...sswww", - "|..__.....iWwwwssssswwww", - "|..___u...Wiswwwwsswwwww", - "|#..__...#.WWWWwwwwwwwww", - "|..___#.....iWWiwwwwwwww", - "|..____t.....WWWWWWwwwww", - "|..&____..4.....WiWWWWWW", - "|._______...#......WiWWW", - "|._________.....4......W", - "|.._bTb_________........", - "|.._bTb____..4.____4.#t#", - "|.._bTb___#......._____t", - "|..._____#........t..4._", - "|..........u..#........#", - "|.4.............4....t..", - "||||||||||||||||||||||||" - ], - "terrain": { - "#": "t_underbrush_harvested_summer", - "&": "t_dirt", - ".": "t_grass", - "4": "t_tree_pine", - "S": "t_shrub_blueberry", - "T": "t_dirt", - "W": "t_water_sh", - "_": "t_dirt", - "b": "t_dirt", - "f": "t_grass", - "i": "t_water_sh", - "s": "t_swater_sh", - "t": "t_tree_deadpine", - "u": "t_underbrush", - "w": "t_water_dp", - "|": "t_chainfence_h" - }, - "furniture": { "&": "f_trashcan", "T": "f_table", "b": "f_bench", "f": "f_dandelion", "i": "f_cattails" }, - "place_monsters": [ { "monster": "GROUP_POND_BIRD", "x": 14, "y": 14 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "fishing_pond_1_0" ], - "weight": 100, - "object": { - "rows": [ - "||||||||||||SSSSSSS|||||", - "............SSSSSSS....|", - ".4.......#..SSSSSSS.#..|", - ".....a......SSSSSSS-...|", - "...#...1...._______-..#|", - "___........B_______....|", - "______.#...b_______....|", - "W..______________b...4.|", - "WWss_____________b.....|", - "WWWsssssss________.....|", - "wWWssssssssss#.___.....|", - "wwWWssssssss.1.___.#.1.|", - "wwWWWssssss.....___....|", - "wwwWWsssssss...#___....|", - "wwwWWWsssssss....__....|", - "wwwwWWWsssssss1..___...|", - "wwwwwWWWssssss....__.#.|", - "wwwwwwWWWssssss...__...|", - "wwwwwwwWWWWssss.1#__...|", - "wwwwwwwwWWWWssss..__.u.|", - "wwwwwwwwwwWWssss..__...|", - "wwwwwwwwwwwWWsss..__..#|", - "wwwwwwwwwwwWWWss.___...|", - "wwwwwwwwwwwwWWsst__....|" - ], - "terrain": { - "#": "t_underbrush_harvested_autumn", - "-": "t_wall_log", - ".": "t_grass", - "1": "t_tree_young", - "4": "t_tree_pine", - "B": "t_grass", - "S": "t_sidewalk", - "W": "t_water_sh", - "_": "t_dirt", - "a": "t_shrub_strawberry", - "b": "t_dirt", - "s": "t_sand", - "t": "t_tree_willow_harvested", - "u": "t_underbrush", - "w": "t_water_dp", - "|": "t_chainfence_v" - }, - "furniture": { "B": "f_bench", "b": "f_bench" }, - "place_items": [ { "item": "forest", "x": 21, "y": 14, "chance": 20 }, { "item": "forest", "x": 4, "y": 2, "chance": 20 } ], - "place_monsters": [ { "monster": "GROUP_POND_FISH", "x": [ 2, 4 ], "y": [ 17, 21 ], "repeat": 2 } ] - } - }, - { - "type": "mapgen", - "method": "json", - "om_terrain": [ "fishing_pond_1_1" ], - "weight": 100, - "object": { - "rows": [ - "wwwwwwwwwwwwWW...__....|", - "wwwwwwwwwwwwWW.#.__.#..|", - "wwwwwwwwwwwWWW...__..u.|", - "wwwwwwwwwwwWW....__....|", - "wwwwwwwwwwwWW...t___...|", - "wwwwwwwwwwwWWW#...__t.#|", - "wwwwwwwwwwwWWW.....__..|", - "wwwwwwwwwwwwWWW..4..__.|", - "wwwwwwwwwwwwwWWW....__.|", - "wwwwwwwwwwwwwWWW.#.t___|", - "wwwwwwwwwwwwwwWW....___|", - "wwwwwwwwwwwwwwWW....#__|", - "wwwwwwwwwwwwwwWW..4..__|", - "wwwwwwwwwwwwwwWW.....__|", - "wwwwwwwwwwwwwWW.#....__|", - "WWWWwwwwwwwwWWW...#4___|", - "WWWWWWWwwwWWWW.4..____.|", - "W...WWWWWWWWW...#____.#|", - "..#....WWWW4..t_____#4.|", - "__..4....4..._____#s...|", - "_________________...4.#|", - "....___________.4.u....|", - ".#....t...t4.t.....s.#.|", - "||||||||||||||||||||||||" - ], - "terrain": { - "#": "t_underbrush_harvested_spring", - ".": "t_grass", - "4": "t_tree_pine", - "W": "t_water_sh", - "_": "t_dirt", - "s": "t_shrub_blueberry", - "t": "t_tree_deadpine", - "u": "t_underbrush", - "w": "t_water_dp", - "|": "t_chainfence_h" - }, - "place_items": [ { "item": "forest", "x": 18, "y": 8, "chance": 20 } ], - "place_monsters": [ { "monster": "GROUP_POND_FISH", "x": [ 7, 7 ], "y": [ 6, 11 ], "repeat": 2 } ] - } } ] diff --git a/data/json/mapgen/pond_public.json b/data/json/mapgen/pond_public.json index 7fd07cec4b64c..63fc7652283f6 100644 --- a/data/json/mapgen/pond_public.json +++ b/data/json/mapgen/pond_public.json @@ -1,168 +1,48 @@ [ { - "method": "json", - "object": { - "furniture": { - "#": "f_null", - "&": "f_trashcan", - ".": "f_null", - "4": "f_null", - "7": "f_null", - "B": "f_brazier", - "D": "f_dandelion", - "T": "f_null", - "W": "f_null", - "_": "f_null", - "a": "f_bench", - "b": "f_bench", - "c": "f_boulder_small", - "d": "f_null", - "f": "f_dandelion", - "o": "f_boulder_small", - "t": "f_table", - "w": "f_null" - }, - "place_items": [ - { "chance": 15, "item": "barbecue", "x": 19, "y": 4 }, - { "chance": 10, "item": "barbecue", "x": 16, "y": 4 }, - { "chance": 10, "item": "barbecue", "x": 15, "y": 3 }, - { "chance": 15, "item": "barbecue", "x": 12, "y": 1 }, - { "chance": 15, "item": "trash", "x": 12, "y": 1 } - ], - "rows": [ - ".....fd........d........", - "........f...&........d..", - ".f...........7..........", - "........bttb..bttb......", - "..D..fB.bttb..bttb.B....", - "....4...bttb..btta.....W", - ".....d..............___W", - "d.4............_______WW", - "...#..f......_____WWWWWw", - ".....7..4..._WW__WWWWwww", - "..T.........WWWWWWWwwwww", - "4.....#...4.WWWWWwwwwwww", - "##.#4.......WWWwwwwwwwww", - ".#.#...#.....WWwwwwwwwww", - "#7#..7...#...WWwwwwwwwww", - "...#.#.#..7..Wwwwwwwwwww", - "#.4....#....Wwwwwwwwwwww", - ".#..c##4....Wwwwwwwwwwww", - "4.#..#..#.#dWwwwwwWWwwww", - ".#d#.7.......WwwwW...WWW", - "7..4####.4....WW...o....", - ".o#..d.#.#.#.4.#.....#.4", - ".4..##4.#.o7.#.T.4#.7.4#", - "#.7.T.##..4..#..#.4..#.#" - ], - "terrain": { - "#": "t_underbrush", - "&": "t_grass", - ".": "t_grass", - "4": "t_tree_pine", - "7": "t_tree_maple", - "B": "t_grass", - "D": "t_dirt", - "T": "t_tree_deadpine", - "W": "t_water_sh", - "_": "t_sand", - "a": "t_dirt", - "b": "t_grass", - "c": "t_tree_deadpine", - "d": "t_dirt", - "f": "t_grass", - "o": "t_grass", - "t": "t_grass", - "w": "t_water_dp" - }, - "place_monsters": [ - { "monster": "GROUP_POND_BIRD", "x": [ 16, 23 ], "y": [ 11, 17 ], "repeat": 2 }, - { "monster": "GROUP_POND_FISH", "x": [ 12, 23 ], "y": [ 8, 20 ], "repeat": 3 } - ] - }, - "om_terrain": "PublicPond_1a", "type": "mapgen", - "weight": 100 - }, - { "method": "json", + "om_terrain": [ [ "PublicPond_1a", "PublicPond_1b" ] ], + "weight": 100, "object": { - "furniture": { - "#": "f_null", - ".": "f_null", - "4": "f_null", - "7": "f_null", - "B": "f_bench", - "P": "f_sign", - "S": "f_null", - "_": "f_null", - "a": "f_null", - "b": "f_bench", - "c": "f_cattails", - "d": "f_null", - "i": "f_cattails", - "o": "f_boulder_small", - "s": "f_null", - "|": "f_null" - }, - "place_items": [ - { "chance": 5, "item": "stoner", "x": 21, "y": 5 }, - { "chance": 3, "item": "creepy", "x": 15, "y": 18 }, - { "chance": 10, "item": "forest", "x": 3, "y": 22 }, - { "chance": 10, "item": "forest", "x": 20, "y": 20 } - ], + "predecessor_mapgen": "forest_thick", "rows": [ - "......d........d........", - ".....................d..", - "....bbb....bbb..........", - "....d.SSSSS.........b...", - "..d..SSS||SSd.......b7..", - "S...SSsS||sSSS...d..b..d", - "SS__SsssssssSSS....daaa.", - "SS__sssssssssSS__Pa.....", - "ss__sssssssssss__S......", - "ss__sssssssss____sS.d...", - "ss__sssssssssss_BssS....", - "ss__sssssssssss_Bsss....", - "sssssssssssss____sssS...", - "ssssssssssssssssssssS.#.", - "sssssssssssssssssssSod..", - "ssssssssssssssssss......", - "ssssssssssssssssssS7...7", - "ssssssssssssssssssS.#...", - "ssssssssssssssssssS...#.", - "SSiicccssscissssssS.4..7", - ".#..iiicsi..#icsss.#d...", - "4.7#7o#.#d4.d.#SSS..#7.o", - ".#4.#.4.#7.#o7...#...4.#", - ".7#.7##4.#.4#..4#o.7..#." + "| ___________ __ __ |", + "| _bTTb_bTTb_ b__ __ |", + "| _bTTb_bTTb_ b__ __ |", + "| _bTTb_bTTb_ b__ WWWWW __ |", + "| _bTTb_bTTb_ b__ WWWWWWW __ |", + "| ___________ __WWWWwWWWWW __ |", + "|Y ''' ''' Y ssssWWW==WWwwwwwWWWW__ |", + "| 'O' 'O' ssssssWWWW==wwwwwwwwWWW==W |", + "| ''' ''' sssssWWWWWWWW==wwwwwwwwwwW==W |", + "| ssssWWWWWWwww==wwwwwwwwwww==WW |", + "| sWWWWWwwwwwww==wwwwwwwwwww==wWW |", + "| WWWWwwwwwwwww==wwwwwwwwwww==wWW |", + "| WWwwwwwwwwwwwwwwwwwwwwwwww==wwWW |", + "| WWwwwwwwwwwwwwwwwwwwwwww====wwWW |", + "| WWWwwwwwwwwwwwwwwwwwwwwww====wWW |", + "| WwwwwwwwwwwwwwwwwwwwwwwwwwwwwwW |", + "| WwwwwwwwwwwwwwwwwwwwwwwwwwwwwwW |", + "| WwwwwwwwwwwwwwwwwWWWWWwwwwwwwWW |", + "| WWwwwWWWWWwwwWWWWW WWWWwwwWW |", + "| WWwWW WWWWW WWWWW |", + "| WWW |", + "| |", + "| |", + "||||||||||||||||||||||||||||||||||||||||||||||||" ], - "terrain": { - "#": "t_underbrush", - ".": "t_grass", - "4": "t_tree_pine", - "7": "t_tree_maple", - "B": "t_dock", - "P": "t_sand", - "S": "t_swater_sh", - "_": "t_dock", - "a": "t_sand", - "b": "t_grass", - "c": "t_swater_dp", - "d": "t_dirt", - "i": "t_swater_sh", - "o": "t_grass", - "s": "t_swater_dp", - "|": "t_rock" - }, - "place_signs": [ { "signage": "NO lifeguard on duty, swim at own risk!", "x": 17, "y": 7 } ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "palettes": [ "park_nature_palette" ], + "place_items": [ { "chance": 5, "item": "stoner", "x": 45, "y": 5 } ], + "items": { "T": { "item": "barbecue", "chance": 5, "repeat": [ 1, 2 ] } }, "place_monsters": [ - { "monster": "GROUP_POND_FISH", "x": [ 4, 11 ], "y": [ 7, 18 ], "repeat": 2 }, - { "monster": "GROUP_POND_BIRD", "x": [ 6, 16 ], "y": [ 4, 21 ], "repeat": 3 } - ] - }, - "om_terrain": "PublicPond_1b", - "type": "mapgen", - "weight": 100 + { "monster": "GROUP_POND_BIRD", "x": [ 16, 23 ], "y": [ 11, 17 ], "chance": 20 }, + { "monster": "GROUP_POND_FISH", "x": [ 12, 23 ], "y": [ 8, 20 ], "chance": 33 }, + { "monster": "GROUP_POND_FISH", "x": [ 28, 35 ], "y": [ 7, 18 ], "chance": 20 }, + { "monster": "GROUP_POND_BIRD", "x": [ 30, 40 ], "y": [ 4, 21 ], "chance": 33 } + ], + "place_signs": [ { "signage": "NO lifeguard on duty, swim at own risk!", "x": 41, "y": 7 } ] + } } ] diff --git a/data/json/mapgen/riverside/whaleys_boat_rental.json b/data/json/mapgen/riverside/whaleys_boat_rental.json index e9b60644954df..d327cffa2285d 100644 --- a/data/json/mapgen/riverside/whaleys_boat_rental.json +++ b/data/json/mapgen/riverside/whaleys_boat_rental.json @@ -1,252 +1,196 @@ [ { - "method": "json", - "object": { - "furniture": { - "#": "f_null", - "&": "f_toilet", - "+": "f_null", - ".": "f_null", - "7": "f_null", - "C": "f_chair", - "S": "f_sink", - "_": "f_null", - "c": "f_counter", - "d": "f_null", - "s": "f_null", - "t": "f_null", - "w": "f_null", - "{": "f_vending_c", - "|": "f_null" - }, - "place_items": [ - { "chance": 75, "item": "vending_food_items", "x": 18, "y": 3 }, - { "chance": 75, "item": "vending_drink_items", "x": 19, "y": 3 }, - { "chance": 15, "item": "trash", "x": 9, "y": 9 }, - { "chance": 15, "item": "trash", "x": 3, "y": 7 }, - { "chance": 15, "item": "trash", "x": 8, "y": 5 }, - { "chance": 45, "item": "magazines", "x": [ 12, 13 ], "y": 7 } - ], - "place_toilets": [ { "x": 3, "y": 3 } ], - "place_vehicles": [ - { "chance": 50, "fuel": 0, "rotation": 90, "status": 0, "vehicle": "canoe", "x": 15, "y": 15 }, - { "chance": 50, "fuel": 0, "rotation": 90, "status": 0, "vehicle": "boatrent", "x": 19, "y": 16 }, - { "chance": 50, "fuel": 0, "rotation": 90, "status": 0, "vehicle": "boatrent", "x": 17, "y": 17 }, - { "chance": 50, "fuel": 0, "rotation": 90, "status": 0, "vehicle": "boatrent", "x": 12, "y": 18 } - ], - "rows": [ - "...d............s..dd...", - ".........d#.....s.......", - "..||||||||||w|||t||||...", - ".d|&_+___C_C_C_|+|{{|#..", - "..|S_|______________|...", - ".#||||______________|..d", - ".#|_________________|...", - "d.|_________ccccc___|...", - "..|_________c___c___|...", - ".#|_________________|d..", - "..|_________________|#..", - "..||+w||||||w|w|w||||#..", - "...|tt|..##........##...", - "#...sssssssssssssssss#..", - ".d.....................d", - "..7...#.................", - ".#...d................d.", - "........................", - ".d.....d...d.......d....", - "....d...d.....d.........", - "d...dddd..d...d..ddd...d", - "d.dddddd.d..dddd.dddd.dd", - "ddddd.dddddddd.dddddddd.", - "d.dddddddd.dddddddd.dddd" - ], - "terrain": { - "#": "t_underbrush", - "&": "t_floor", - "+": "t_door_c", - ".": "t_grass", - "7": "t_tree", - "C": "t_floor", - "S": "t_floor", - "_": "t_floor", - "c": "t_floor", - "d": "t_dirt", - "s": "t_sidewalk", - "t": "t_thconc_floor", - "w": "t_window_no_curtains", - "{": "t_floor", - "|": "t_wall" + "type": "palette", + "id": "boat_rental_palette", + "parameters": { + "wall": { + "type": "ter_str_id", + "default": { "distribution": [ [ "t_wall_wood", 1 ], [ "t_wall_log", 3 ], [ "t_wall_b", 1 ], [ "t_wall_g", 2 ] ] } } }, - "om_terrain": "boat_rental", - "type": "mapgen", - "weight": 100 + "terrain": { + "s": "t_concrete", + "'": "t_thconc_floor", + ".": "t_floor", + "c": "t_floor", + "h": "t_floor", + "D": "t_floor", + "F": "t_floor", + "S": "t_floor", + "t": "t_floor", + "T": "t_floor", + "r": "t_floor", + "&": "t_floor", + "X": "t_floor", + "w": "t_window", + "+": "t_door_c", + "|": { "param": "wall", "fallback": "t_wall_log" }, + "_": [ [ "t_region_soil", 20 ], [ "t_region_groundcover", 3 ] ], + "-": "t_region_shrub_decorative" + }, + "furniture": { + "T": "f_table", + "X": "f_cardboard_box", + "c": "f_counter", + "&": "f_trashcan", + "r": "f_rack", + "h": "f_chair", + "S": "f_sink" + }, + "item": { + "r": { "item": "flotation_vest", "chance": 75, "repeat": [ 1, 5 ] }, + "X": { "item": "flotation_vest", "chance": 75, "repeat": [ 1, 5 ] } + }, + "items": { + "&": { "item": "trash", "chance": 60, "repeat": [ 1, 3 ] }, + "r": [ + { "chance": 55, "item": "swimmer_head", "repeat": [ 1, 3 ] }, + { "chance": 75, "item": "swimmer_torso", "repeat": [ 1, 3 ] }, + { "chance": 75, "item": "swimmer_wetsuit", "repeat": [ 1, 3 ] } + ], + "X": [ + { "chance": 55, "item": "swimmer_head", "repeat": [ 1, 4 ] }, + { "chance": 75, "item": "swimmer_torso", "repeat": [ 1, 4 ] }, + { "chance": 75, "item": "swimmer_wetsuit", "repeat": [ 1, 4 ] } + ] + }, + "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } }, + "toilets": { "t": { } } }, { "method": "json", + "om_terrain": "boat_rental", + "type": "mapgen", + "weight": 100, "object": { - "furniture": { - "#": "f_null", - "&": "f_trashcan", - "+": "f_null", - ".": "f_null", - "1": "f_null", - "7": "f_null", - "C": "f_chair", - "S": "f_null", - "T": "f_table", - "_": "f_null", - "c": "f_counter", - "f": "f_null", - "s": "f_null", - "t": "f_null", - "|": "f_null" - }, - "place_items": [ - { "chance": 55, "item": "novels", "x": 12, "y": 10 }, - { "chance": 65, "item": "trash", "x": 17, "y": 10 }, - { "chance": 15, "item": "trash", "x": 14, "y": 9 }, - { "chance": 45, "item": "cubical_office", "x": 12, "y": 9 } - ], - "place_vehicles": [ - { "chance": 65, "fuel": 0, "rotation": 90, "status": 0, "vehicle": "raft", "x": 6, "y": 17 }, - { "chance": 75, "fuel": 0, "rotation": 90, "status": 0, "vehicle": "canoe", "x": 18, "y": 17 }, - { "chance": 75, "fuel": 0, "rotation": 90, "status": 0, "vehicle": "canoe", "x": 16, "y": 18 }, - { "chance": 75, "fuel": 0, "rotation": 90, "status": 0, "vehicle": "canoe", "x": 20, "y": 18 }, - { "chance": 65, "fuel": 0, "rotation": 90, "status": 0, "vehicle": "raft", "x": 10, "y": 19 }, - { "chance": 65, "fuel": 0, "rotation": 90, "status": 0, "vehicle": "raft", "x": 3, "y": 20 } - ], + "predecessor_mapgen": "lake_shore", "rows": [ - "........................", - "........................", - "...1...#................", - "........................", - "....##......ssssssss....", - "..#7..#..#.|tttttt|s..7.", - "....###....|ccc||||s....", - "...#.#1...#|fCffff|s#...", - ".......#..#|ffffff+s#...", - "...#.#.....|Tfffff|.....", - "....#7##...|Tffff&|..1..", - ".....##...#|||||+||.....", - "....S......##...s.....#.", - "...._........._.s.......", - ".#..............s_......", - "_.........._............", - "........_..........._.._", - "...._............_......", - "......._........._......", - "........._...._.........", - "__..._._.....____..__.__", - "___.___________._______.", - ".__________._________.__", - "________________________" + " ---s ", + " |||||w|+||___________ ", + " |tS|F....|___________ ", + " |..|D....|___________ ", + " ||+|&....|___________ ", + " |........|___________ ", + " |h...cccc|___________ ", + " whT....h.w___________ ", + " |h...c...|___________ ", + " |....crrr|___________ ", + " ||+|||||||___________ ", + " s'''ssssss ", + " s'''ssssss ", + " ssssssssss ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " ], - "terrain": { - "#": "t_underbrush", - "&": "t_floor", - "+": "t_door_c", - ".": "t_grass", - "1": "t_tree_young", - "7": "t_tree", - "C": "t_floor", - "S": "t_shrub", - "T": "t_floor", - "_": "t_dirt", - "c": "t_floor", - "f": "t_floor", - "s": "t_sidewalk", - "t": "t_thconc_floor", - "|": "t_wall_log" - } - }, - "om_terrain": "boat_rental", - "type": "mapgen", - "weight": 100 + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "palettes": [ "boat_rental_palette" ], + "place_vehicles": [ + { "chance": 66, "rotation": 90, "vehicle": "canoe", "x": 2, "y": [ 13, 14 ] }, + { "chance": 66, "rotation": 90, "vehicle": "canoe", "x": 4, "y": [ 13, 14 ] }, + { "chance": 66, "rotation": 90, "vehicle": "raft", "x": 7, "y": [ 11, 13 ] }, + { "chance": 66, "rotation": 90, "vehicle": "raft", "x": 9, "y": [ 11, 13 ] }, + { "chance": 66, "rotation": 90, "vehicle": "raft", "x": 11, "y": [ 11, 13 ] }, + { "chance": 66, "rotation": 90, "vehicle": "wood_rowboat_double", "x": 15, "y": [ 3, 6 ] }, + { "chance": 66, "rotation": 90, "vehicle": "wood_rowboat_double", "x": 20, "y": [ 3, 6 ] } + ] + } }, { "method": "json", + "om_terrain": "boat_rental", + "type": "mapgen", + "weight": 100, "object": { - "furniture": { - "#": "f_null", - "+": "f_null", - ".": "f_null", - "4": "f_null", - "C": "f_counter", - "T": "f_table", - "X": "f_crate_c", - "_": "f_null", - "a": "f_null", - "c": "f_chair", - "f": "f_null", - "s": "f_null", - "t": "f_null", - "{": "f_vending_c", - "|": "f_null" - }, - "place_items": [ - { "chance": 55, "item": "swimmer_head", "x": 13, "y": 10 }, - { "chance": 75, "item": "vending_food_items", "x": 13, "y": 5 }, - { "chance": 75, "item": "swimmer_torso", "x": 14, "y": 10 }, - { "chance": 75, "item": "swimmer_torso", "x": 17, "y": 9 }, - { "chance": 75, "item": "swimmer_torso", "x": [ 6, 7 ], "y": 7 }, - { "chance": 75, "item": "vending_drink_items", "x": 14, "y": 5 }, - { "chance": 75, "item": "swimmer_wetsuit", "x": 13, "y": 9 }, - { "chance": 75, "item": "swimmer_wetsuit", "x": 5, "y": 7 } - ], - "place_vehicles": [ - { "chance": 75, "fuel": 0, "rotation": 270, "status": 0, "vehicle": "canoe", "x": 17, "y": 18 }, - { "chance": 75, "fuel": 0, "rotation": 270, "status": 0, "vehicle": "raft", "x": 5, "y": 19 }, - { "chance": 75, "fuel": 0, "rotation": 270, "status": 0, "vehicle": "canoe", "x": 14, "y": 19 }, - { "chance": 75, "fuel": 0, "rotation": 270, "status": 0, "vehicle": "canoe", "x": 20, "y": 19 }, - { "chance": 75, "fuel": 0, "rotation": 270, "status": 0, "vehicle": "raft", "x": 9, "y": 20 } - ], + "predecessor_mapgen": "lake_shore", "rows": [ - "__.___._______._____.___", - "_.______________________", - "______.___________._____", - "._.__ssssssssssssss__._.", - "__._||CC|ttt||||a|||____", - "_.__|fcf|ttt|{{fffc|#__.", - "__.#|fff+ttt+fffffT|____", - "__._|fff|ttt|ffffcT|#_#_", - "___#|||||ttt|||ff|||#___", - "._#.##_._sss|XfffXf|____", - "_____.__.sss|XXffff|.___", - "_____.___sss||||||||#___", - "_#__._#__sss.._##.__.___", - "_..__._._sss......_._4_.", - "____.._______.___._._.._", - "._.___._.._.._.___.___._", - "_._.._.__.._._._.....__.", - "._._....._......._._....", - ".............._......_..", - "........................", - "........................", - "........................", - "........................", - "........................" + " ssssssssssss ", + " s--s----s--s ", + " ______s-|''''''|-s ", + " ______s-|''''''|-s ", + " ______s-|ccc|w||-s ", + " ______s-|.h..XX|-s ", + " ______s-w&.....+ss ", + " ______s-|.....h|-s ", + " ______s-|rrr.TT|-s ", + " s-||||+|||-s ", + " s-----s----s ", + " ssssssssssss ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " ], - "terrain": { - "#": "t_underbrush", - "+": "t_door_c", - ".": "t_dirt", - "4": "t_tree_willow", - "C": "t_floor", - "T": "t_floor", - "X": "t_floor", - "_": "t_grass", - "a": "t_curtains", - "c": "t_floor", - "f": "t_floor", - "s": "t_sidewalk", - "t": "t_thconc_floor", - "{": "t_floor", - "|": "t_wall_log" - } - }, + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "palettes": [ "boat_rental_palette" ], + "place_vehicles": [ + { "chance": 66, "rotation": 90, "vehicle": "raft", "x": 10, "y": [ 11, 13 ] }, + { "chance": 66, "rotation": 90, "vehicle": "raft", "x": 12, "y": [ 11, 13 ] }, + { "chance": 66, "rotation": 90, "vehicle": "raft", "x": 14, "y": [ 11, 13 ] }, + { "chance": 66, "rotation": 90, "vehicle": "canoe", "x": 16, "y": [ 12, 13 ] }, + { "chance": 66, "rotation": 90, "vehicle": "canoe", "x": 18, "y": [ 12, 13 ] }, + { "chance": 66, "rotation": 90, "vehicle": "canoe", "x": 20, "y": [ 12, 13 ] }, + { "chance": 66, "rotation": 90, "vehicle": "wood_rowboat_double", "x": 6, "y": 4 } + ] + } + }, + { + "method": "json", "om_terrain": "boat_rental", "type": "mapgen", - "weight": 100 + "weight": 100, + "object": { + "predecessor_mapgen": "lake_shore", + "rows": [ + " sss ", + " sss --- ", + " |ccc|'''||||w||| ", + " |.h.|'''|DF...h| ", + " |...+'''+.....T| ", + " |rrr|'''|....hT| ", + " ||||||'||||..||| ", + " ssssssss|XX..XX| ", + " ssssssss|XX..XX| ", + " ssssssss|||||||| ", + " ssssssssssssssss ", + " ssssssssssssssss ", + " ssssssssssssssss ", + " ssssssssssssssss ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "palettes": [ "boat_rental_palette" ], + "place_vehicles": [ + { "chance": 66, "rotation": 270, "vehicle": "raft", "x": 5, "y": [ 9, 14 ] }, + { "chance": 66, "rotation": 270, "vehicle": "raft", "x": 8, "y": [ 9, 14 ] }, + { "chance": 66, "rotation": 270, "vehicle": "canoe", "x": 12, "y": [ 12, 14 ] }, + { "chance": 66, "rotation": 270, "vehicle": "canoe", "x": 15, "y": [ 12, 14 ] }, + { "chance": 66, "rotation": 270, "vehicle": "canoe", "x": 18, "y": [ 12, 14 ] } + ] + } } ] diff --git a/data/json/mapgen/shooting_range.json b/data/json/mapgen/shooting_range.json index b2a5c275fb419..6de99736bbb35 100644 --- a/data/json/mapgen/shooting_range.json +++ b/data/json/mapgen/shooting_range.json @@ -1,7 +1,60 @@ [ { "method": "json", + "type": "mapgen", + "om_terrain": [ [ "shootingrange_1a" ], [ "shootingrange_2a" ] ], + "weight": 100, "object": { + "rows": [ + "........................", + "........................", + "..--W--.................", + "..W&Cf+.................", + "..-ddXW...s..s..........", + "..--W--.................", + "_aaaaaaaaaaaaaaaaaaaaaa_", + "_wwwwwwwwwwwwwwwwwwwwww_", + "_|ww|ww|ww|ww|ww|ww|ww|_", + "_|cc|cc|cc|cc|cc|cc|cc|_", + "_######################_", + "_ _", + "_ _", + "_ _", + "_P@ P_", + "_ @ _", + "_ _", + "_ _", + "_ _", + "_P @ P_", + "_ @ _", + "_ _", + "_ _", + "_ _", + "_P @ P_", + "_ _", + "_ _", + "_ _", + "_ _", + "_P @ P_", + "_ @ _", + "_ _", + "_ _", + "_ _", + "_P @ P_", + "_ _", + "_ @ _", + "_ @ _", + "_ _", + "_P P_", + "_ @ _", + "_ _", + "_OOOOOOOOOOOOOOOOOOOOOO_", + "_OOOOOOOOOOOOOOOOOOOOOO_", + "________________________", + "________________________", + ".______________________.", + ".....______________....." + ], "furniture": { "&": "f_trashcan", "@": "f_target", @@ -12,6 +65,28 @@ "d": "f_desk", "s": "f_sign" }, + "terrain": { + "#": "t_thconc_floor", + "&": "t_floor", + "+": "t_door_c", + "-": "t_wall_w", + ".": "t_region_groundcover", + " ": "t_region_groundcover_barren", + "@": "t_dirt", + "C": "t_floor", + "P": "t_dirt", + "W": "t_window", + "X": "t_floor", + "_": [ [ "t_region_groundcover_forest", 20 ], [ "t_region_shrub", 5 ], [ "t_region_tree", 5 ] ], + "a": "t_region_groundcover", + "c": "t_thconc_floor", + "d": "t_floor", + "f": "t_floor", + "s": "t_grass", + "w": "t_thconc_floor", + "|": "t_wall_wood", + "O": "t_dirtmound" + }, "place_items": [ { "chance": 10, "item": "ammo_pistol_common", "x": 6, "y": 9 }, { "chance": 5, "item": "ammo_pistol_common", "x": 3, "y": 9 }, @@ -31,6 +106,7 @@ { "chance": 5, "item": "guns_pistol_common", "x": 2, "y": 9 }, { "chance": 25, "item": "office", "x": [ 3, 4 ], "y": 4 } ], + "place_item": [ { "chance": 75, "item": "american_flag", "x": 7, "y": 2 } ], "items": { "w": { "item": "casings", "chance": 60, "repeat": 7 }, "a": { "item": "casings", "chance": 50, "repeat": 5 }, @@ -38,65 +114,23 @@ "c": { "item": "ear_protection", "chance": 10 }, "d": { "item": "ear_protection", "chance": 80 } }, - "rows": [ - "zzzzzzzzzzzzzzzzzzzzzzzz", - "_zzzzzzzz_______________", - "_z--W--zz_______________", - "_zW&Cf+zzzzzzzz_________", - "_z-ddXWzzzszzsz_________", - "_z--W--zzzzzzzz_________", - "_aaaaaaaaaaaaaaaaaaaaaa_", - "_wwwwwwwwwwwwwwwwwwwwww_", - "_|ww|ww|ww|ww|ww|ww|ww|_", - "_|cc|cc|cc|cc|cc|cc|cc|_", - "_######################_", - "_......................_", - "_......................_", - "_......................_", - "_P@...................P_", - "_..@..................._", - "_......................_", - "_......................_", - "_......................_", - "_P....@...............P_", - "_....@................._", - "_......................_", - "_......................_", - "_......................_" - ], - "terrain": { - "#": "t_thconc_floor", - "&": "t_floor", - "+": "t_door_c", - "-": "t_wall_w", - "z": [ [ "t_grass", 5 ], "t_dirt" ], - ".": [ [ "t_dirt", 7 ], "t_grass" ], - "@": "t_dirt", - "C": "t_floor", - "P": "t_dirt", - "W": "t_window", - "X": "t_floor", - "_": [ [ "t_grass", 20 ], [ "t_underbrush", 3 ], [ "t_dirt", 3 ], "t_tree", "t_tree_pine", "t_tree_young", "t_tree_maple" ], - "a": [ [ "t_grass", 5 ], "t_dirt" ], - "c": "t_thconc_floor", - "d": "t_floor", - "f": "t_floor", - "s": "t_grass", - "w": "t_thconc_floor", - "|": "t_wall_wood" - }, "place_signs": [ { "signage": " Family Shooting Range", "x": 10, "y": 4 }, { "signage": "Open sunrise to sunset, everyday besides Sundays", "x": 13, "y": 4 }, { "signage": "5 YARDS", "x": 1, "y": 14 }, { "signage": "5 YARDS", "x": 22, "y": 14 }, { "signage": "10 YARDS", "x": 1, "y": 19 }, - { "signage": "10 YARDS", "x": 22, "y": 19 } + { "signage": "10 YARDS", "x": 22, "y": 19 }, + { "signage": "15 YARDS", "x": 1, "y": 24 }, + { "signage": "15 YARDS", "x": 22, "y": 24 }, + { "signage": "20 YARDS", "x": 1, "y": 29 }, + { "signage": "20 YARDS", "x": 22, "y": 29 }, + { "signage": "25 YARDS", "x": 1, "y": 34 }, + { "signage": "25 YARDS", "x": 22, "y": 34 }, + { "signage": "30 YARDS", "x": 1, "y": 39 }, + { "signage": "30 YARDS", "x": 22, "y": 39 } ] - }, - "om_terrain": "shootingrange_1a", - "type": "mapgen", - "weight": 100 + } }, { "type": "mapgen", @@ -133,57 +167,5 @@ "palettes": [ "roof_palette" ], "terrain": { ".": "t_shingle_flat_roof" } } - }, - { - "method": "json", - "object": { - "furniture": { "#": "f_null", ".": "f_null", "@": "f_target", "P": "f_sign", "_": "f_null" }, - "rows": [ - "_P.....@..............P_", - "_......................_", - "_......................_", - "_......................_", - "_......................_", - "_P........@...........P_", - "_..........@..........._", - "_......................_", - "_......................_", - "_......................_", - "_P............@.......P_", - "_......................_", - "_................@....._", - "_...............@......_", - "_......................_", - "_P....................P_", - "_...................@.._", - "_......................_", - "_######################_", - "_######################_", - "______............______", - "________________________", - "________________________", - "________________________" - ], - "terrain": { - "#": "t_dirtmound", - ".": [ [ "t_dirt", 7 ], "t_grass" ], - "@": "t_dirt", - "P": "t_dirt", - "_": [ [ "t_grass", 20 ], [ "t_underbrush", 3 ], [ "t_dirt", 3 ], "t_tree", "t_tree_pine", "t_tree_young", "t_tree_maple" ] - }, - "place_signs": [ - { "signage": "15 YARDS", "x": 1, "y": 0 }, - { "signage": "15 YARDS", "x": 22, "y": 0 }, - { "signage": "20 YARDS", "x": 1, "y": 5 }, - { "signage": "20 YARDS", "x": 22, "y": 5 }, - { "signage": "25 YARDS", "x": 1, "y": 10 }, - { "signage": "25 YARDS", "x": 22, "y": 10 }, - { "signage": "30 YARDS", "x": 1, "y": 15 }, - { "signage": "30 YARDS", "x": 22, "y": 15 } - ] - }, - "om_terrain": "shootingrange_2a", - "type": "mapgen", - "weight": 100 } ] diff --git a/data/json/mapgen/sugar_house.json b/data/json/mapgen/sugar_house.json index ccd32056df506..718d3c80e2733 100644 --- a/data/json/mapgen/sugar_house.json +++ b/data/json/mapgen/sugar_house.json @@ -8,43 +8,41 @@ "fill_ter": "t_floor", "rows": [ "........................", - ".--vvvv---;;-----vv---..", + ".||vvvv|||;;|||||vv|||..", ".|hnnh p|D |p hnnh |..", - ".vhnnh | -| hnnh v..", + ".vhnnh | || hnnh v..", ".vhnnh + hnnh v..", ".|hnnh | hh hnnh |..", ".|hnnh |F nn hnnh |||", ".| p|F nn hnnh |t|", - ".|------| hh hnnh + v", + ".|||||||| hh hnnh + v", ".|Cff| t| hnnh |S|", - ".vS |+-| hhhh hnnh |||", + ".vS |+|| hhhh hnnh |||", ".vO D| nnnn hnnh |t|", ".|C cc + nnnn hnnh + v", ".|C cc S| hhhh hnnh |S|", ".|C cc O| |||", - ".|------|--------++--|4.", - ".| r|..", - ".| ww r|.M", - ".v rr r|..", - ".v rr r|.M", - ".| rr r|..", - ".|rrrrr sss rr r|..", - ".-------++------------.M", + ".||||||||||||||||++|||4.", + ".|__________________r|..", + ".|____________ww____r|.M", + ".v____________rr____r|..", + ".v____________rr____r|.M", + ".|____________rr____r|..", + ".|rrrrr___sss_rr____r|..", + ".|||||||++||||||||||||.M", "........................" ], - "set": [ - { "point": "terrain", "id": "t_grass", "x": 0, "y": [ 0, 23 ], "repeat": [ 5, 10 ] }, - { "point": "terrain", "id": "t_grass", "x": [ 0, 21 ], "y": 0, "repeat": [ 5, 10 ] }, - { "point": "terrain", "id": "t_grass", "x": [ 0, 21 ], "y": 23, "repeat": [ 5, 10 ] } - ], "terrain": { "+": "t_door_c", - "-": "t_wall_g", - ".": "t_dirt", + ".": "t_region_groundcover", ";": "t_door_c", "M": "t_tree_maple_tapped", "v": "t_window", " ": "t_floor", + "_": "t_thconc_floor", + "r": "t_thconc_floor", + "s": "t_thconc_floor", + "w": "t_thconc_floor", "|": "t_wall_g", "4": "t_gutter_downspout" }, diff --git a/data/json/mapgen/trail_nature.json b/data/json/mapgen/trail_nature.json index ae5e842b9cacc..578b33d7adc7a 100644 --- a/data/json/mapgen/trail_nature.json +++ b/data/json/mapgen/trail_nature.json @@ -1,134 +1,44 @@ [ { + "type": "mapgen", "method": "json", + "om_terrain": [ [ "NatureTrail_1a", "NatureTrail_1b" ] ], + "weight": 100, "object": { - "furniture": { - "#": "f_null", - "&": "f_trashcan", - ".": "f_null", - "1": "f_null", - "4": "f_null", - "7": "f_null", - "P": "f_sign", - "_": "f_null", - "b": "f_boulder_small", - "o": "f_boulder_small", - "p": "f_null", - "s": "f_null" - }, - "place_items": [ - { "chance": 25, "item": "trash", "x": 10, "y": 4 }, - { "chance": 25, "item": "trash", "x": 8, "y": 14 }, - { "chance": 20, "item": "trash", "x": 21, "y": 18 }, - { "chance": 5, "item": "creepy", "x": 22, "y": 21 } - ], + "predecessor_mapgen": "forest_thick", "rows": [ - "sssss_sssspppppps_ssssss", - "ssssssssssppppppsssss_ss", - "..4_......pppppp.._.....", - "......_..._____.#4.._.7.", - "_#...._._P&____7..____#.", - "#..4..#.4..___.41______4", - ".71#.4.1.7..__.##__.4__.", - "4.....#.#...__#.__.7#___", - "#1#4.#7.4.#.____________", - ".o##.41#..4.____________", - ".4.17.o.7..____4..#4.7..", - "1..##.#41____..1.7o.1.##", - "7#.4.4.._____..#.4.#._4.", - "..#1#.#___.#17...71.4.o1", - ".##.7____.4...#14.4#.#..", - "414o.___.#_#.#1o._#1417#", - "#..#.___.71o4.41.#______", - ".#.1____..##.#1.________", - "4#.4._4__#.#71_____._..4", - "7.4#1____________.41.#..", - "1#.4.7#.________.#o.4.41", - "#o7.#.4o.7.1#..4..7#_#.#", - ".414.7.#4.#_.4#7.#4#_o7.", - ".##4_#.4#1#4.b#7.4..#1#." + "|||||| ___ |||||||||||||||||||||||||||||||||||||", + "| ___ |", + "| ___ bbb |", + "| ___ _____ ___ |", + "| ___ _______ _____ |", + "| __ Y __ __ ___Y___ |", + "| ___ __ ___ __ __ |", + "| _________________ __ __ |", + "| ___________________ __ __ |", + "| ____ ______ ___ ___ |", + "| ____ ____ __ __ |", + "| _____ __ __ __b |", + "| ___ Y ______ __b |", + "| ___ ________ __b |", + "| __ __________ ___ |", + "| b__ _____________ Y __ __ |", + "| b__ ____________ __ __ |", + "| b___ _____ bbb __ __Y |", + "| ___________ ___ __ |", + "| ________ _________ |", + "| Y ______ |", + "| |", + "| |", + "||||||||||||||||||||||||||||||||||||||||||||||||" ], - "terrain": { - "#": "t_underbrush", - "&": "t_grass", - ".": "t_grass", - "1": "t_tree_young", - "4": "t_tree_pine", - "7": "t_tree", - "P": "t_grass", - "_": "t_dirt", - "b": "t_dirt", - "o": "t_grass", - "p": "t_dirt", - "s": "t_grass" - }, - "place_signs": [ { "signage": "Please don't litter, keep the trail nice!", "x": 9, "y": 4 } ] - }, - "om_terrain": "NatureTrail_1a", - "type": "mapgen", - "weight": 100 - }, - { - "method": "json", - "object": { - "furniture": { - "#": "f_null", - ".": "f_null", - "4": "f_null", - "7": "f_null", - "S": "f_null", - "_": "f_null", - "b": "f_boulder_small", - "f": "f_dandelion", - "o": "f_boulder_small", - "s": "f_null" - }, + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "palettes": [ "park_nature_palette" ], "place_items": [ - { "chance": 25, "item": "trash", "x": 7, "y": 8 }, - { "chance": 20, "item": "trash", "x": 15, "y": 16 }, - { "chance": 25, "item": "trash", "x": 22, "y": 8 } + { "chance": 75, "item": "trash", "x": [ 1, 23 ], "y": [ 1, 22 ], "repeat": [ 1, 4 ] }, + { "chance": 25, "item": "creepy", "x": [ 1, 23 ], "y": [ 1, 22 ] } ], - "rows": [ - "sss_ssssssssssssss_sssss", - "ssssssss_sssssssssssssss", - "............f......._...", - ".f..f__.f.._..._4._4_...", - "4.4.f7.4.._.4_..____....", - "_..#_.f..f7..4#4_____...", - "#47.4#.7#..4#..___4___44", - "4#.##_.#..#7..7__.#___#.", - "______4..4...#._4#.___..", - "_______.#o###7__..4___7#", - ".7#..____.#4.___7.4___..", - "#._#4.____S.#__.#.#__.4.", - ".44.7#.4.__.#__.4#.__#_#", - "#b#S..#..______4.#7__.##", - "7.#4#._________#_o#_.4_.", - "_4.__________.#S4#._..#.", - "_______.#.4__.4...__4#4#", - "____.4._7.#__7.#7___4._o", - "4.4##S.#..___.So.4___.#4", - ".#o#..7SS4.___47#4___#.#", - ".7S.4#..4.7_________..7#", - "##.4S.4#.4._.______.4#.4", - "_#4#b4S.#.7#o4##.4.S.#4.", - "7.#.7.##.#.4##7.#.4.7.#_" - ], - "terrain": { - "#": "t_underbrush", - ".": "t_grass", - "4": "t_tree_pine", - "7": "t_tree", - "S": "t_shrub_blueberry", - "_": "t_dirt", - "b": "t_dirt", - "f": "t_grass", - "o": "t_grass", - "s": "t_grass" - } - }, - "om_terrain": "NatureTrail_1b", - "type": "mapgen", - "weight": 100 + "place_signs": [ { "signage": "Please don't litter, keep the trail nice!", "x": 7, "y": 2 } ] + } } ] diff --git a/data/json/mapgen/trail_small.json b/data/json/mapgen/trail_small.json index 59c7eadbd6a9b..cbacce259733d 100644 --- a/data/json/mapgen/trail_small.json +++ b/data/json/mapgen/trail_small.json @@ -5,56 +5,36 @@ "om_terrain": [ "small_wooded_trail" ], "weight": 100, "object": { + "predecessor_mapgen": "forest_thick", "rows": [ - "ssssssssssssssssssssssss", - "||||||||||||||_c_|||||||", - "|4#..4u.......___..1...|", - "|.4.....7.4#.____.7.#.1|", - "|7.u4..1.#_______....S.|", - "|1..7u...___#.4___#.T.4|", - "|u.....t___.....___....|", - "|S.T.4#___1.#.S.#___4.4|", - "|7..1.__.....a....__#..|", - "|.4..#_.4#.4....4..__..|", - "|...__.#....#.U.#.4__#7|", - "|#..___..4.....#7#..__.|", - "|7.t___4#..7.41...4.__.|", - "|...___.#.u.....U...#_#|", - "|.#..__7.a..#.#....4#__|", - "|u7#____..u.4..S4.1.U__|", - "|1.______t..4.......__#|", - "|.7__1_____1.#.d.#.t__.|", - "|4___7._______________7|", - "|__#....7.__________...|", - "___17.7....&bb.tT...4S.|", - "|u..4...#.S.....#.#....|", - "|.7.#..#e#.4.#..U.4.#.4|", - "||||||||||||||||||||||||" + "|||||||||||||___||||||||", + "| ___ |", + "| ___ |", + "| ____ |", + "| Y ______ |", + "| ___ ___ |", + "| ____ ___ |", + "| ___ ___ |", + "| __ __ Y |", + "| __ ___ |", + "| __ __ |", + "| ___ ___ |", + "| __ __ |", + "| ___ __ |", + "| Y __ __ |", + "| ___ __ |", + "| ___ ___ |", + "| _____ ___ |", + "| ' ____________ |", + "| ' ________ |", + "| ' & bbbb Y |", + "| ' |", + "| ' |", + "||||'|||||||||||||||||||" ], - "terrain": { - "#": "t_underbrush_harvested_spring", - "&": "t_grass", - ".": "t_grass", - "1": "t_tree_young", - "4": "t_tree_pine", - "7": "t_tree", - "S": "t_shrub_blueberry", - "T": "t_tree_hickory", - "U": "t_underbrush", - "_": "t_dirt", - "a": "t_tree_apple", - "b": "t_dirt", - "c": "t_chainfence_posts", - "d": "t_tree_hickory_dead", - "e": "t_tree_cherry_harvested", - "s": "t_sidewalk", - "t": "t_tree_maple", - "u": "t_underbrush_harvested_autumn", - "|": "t_chainfence_v" - }, - "furniture": { "&": "f_trashcan", "b": "f_bench" }, - "place_item": [ { "item": "rock", "x": 13, "y": 9 }, { "item": "rock", "x": 2, "y": 13 }, { "item": "rock", "x": 22, "y": 19 } ], - "place_monsters": [ { "monster": "GROUP_PARK_ANIMAL", "x": [ 2, 15 ], "y": [ 5, 13 ], "repeat": 2 } ] + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "palettes": [ "park_nature_palette" ], + "place_monsters": [ { "monster": "GROUP_PARK_ANIMAL", "x": [ 2, 15 ], "y": [ 5, 13 ], "chance": 20 } ] } }, { @@ -63,62 +43,36 @@ "om_terrain": [ "small_wooded_trail_2" ], "weight": 100, "object": { + "predecessor_mapgen": "forest_thick", "rows": [ - "ssssssssssssssssssssssss", - "||||||||||||||_c_|||||||", - "|4#..4u.......___..1...|", - "|.4.....7.4#.____.7.#.1|", - "|7.u4..1.#_______....S.|", - "|1..7u...___#.4___#.a.4|", - "|u.....T___.....___....|", - "|S.a.4#___1.#.S.#___4.4|", - "|7..1.__...wwww...__#..|", - "|.4..#_.4#wwWWWww..__..|", - "|...__.#d#wWWWWWww4__#7|", - "|#..___bb&---WWWWw..__.|", - "|7.T___ttttt-WWWWw4.__.|", - "|...___ttt---WWWww..#_#|", - "|.#..__7#ewWWWWWww.4#__|", - "|u7#____..wwwWWww.1.U__|", - "|1.______T..wwww....__#|", - "|.7__1_____1.#.f.#.T__.|", - "|4___7._______________7|", - "|__#....7.__________...|", - "___17.7.....bb.Ta...4S.|", - "|u..4...#.S.....#.#....|", - "|.7.#..#g#.4.#..U.4.#.4|", - "||||||||||||||||||||||||" + "|||||||||||||___||||||||", + "| ___ |", + "| ___ |", + "| ____ |", + "| Y ______ |", + "| ___ ___ |", + "| ____ ___ |", + "| ___ ___ |", + "| __ WWWW __ Y |", + "| __ WWwwWWW ___ |", + "| __ WwwwwwWW __ |", + "| ___ WwwwwwwwW ___ |", + "| __'''===wwwwwW __ |", + "| ___''===wwwwWW __ |", + "| Y __ WwwwwwW __ |", + "| ___ WWWwwWW __ |", + "| ___ WWWW ___ |", + "| _____ ___ |", + "| ' ____________ |", + "| ' ________ |", + "| ' & bbbb Y |", + "| ' |", + "| ' |", + "||||'|||||||||||||||||||" ], - "terrain": { - "#": "t_underbrush_harvested_spring", - "&": "t_thconc_floor", - "-": "t_railing_v", - ".": "t_grass", - "1": "t_tree_young", - "4": "t_tree_pine", - "7": "t_tree", - "B": "t_dirt", - "S": "t_shrub_blueberry", - "T": "t_tree_maple", - "U": "t_underbrush", - "W": "t_water_dp", - "_": "t_dirt", - "a": "t_tree_hickory", - "b": "t_thconc_floor", - "c": "t_chainfence_posts", - "d": "t_shrub_strawberry_harvested", - "e": "t_tree_apple", - "f": "t_tree_hickory_dead", - "g": "t_tree_cherry_harvested", - "s": "t_sidewalk", - "t": "t_thconc_floor", - "u": "t_underbrush_harvested_autumn", - "w": "t_water_sh", - "|": "t_chainfence_v" - }, - "furniture": { "&": "f_trashcan", "b": "f_bench" }, - "place_item": [ { "item": "rock", "x": 2, "y": 13 }, { "item": "rock", "x": 22, "y": 19 } ], - "place_monsters": [ { "monster": "GROUP_PARK_ANIMAL", "x": 2, "y": 5 } ] + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "palettes": [ "park_nature_palette" ], + "place_monsters": [ { "monster": "GROUP_PARK_ANIMAL", "x": 2, "y": 5, "chance": 20 } ] } } ] diff --git a/data/json/mapgen_palettes/park_palette.json b/data/json/mapgen_palettes/park_palette.json index 7961637041d38..1084c4ba8b9c7 100644 --- a/data/json/mapgen_palettes/park_palette.json +++ b/data/json/mapgen_palettes/park_palette.json @@ -101,5 +101,70 @@ "furniture": { "b": "f_bench", "&": "f_trashcan" }, "items": { "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, "b": { "item": "trash", "chance": 2 } }, "vendingmachines": { "V": { "item_group": "vending_drink" } } + }, + { + "type": "palette", + "id": "park_nature_palette", + "parameters": { + "walkway": { + "type": "ter_str_id", + "default": { + "distribution": [ [ "t_railroad_rubble", 1 ], [ "t_region_soil", 3 ], [ "t_region_groundcover_barren", 1 ], [ "t_concrete", 1 ] ] + } + }, + "fencing": { + "type": "ter_str_id", + "default": { + "distribution": [ [ "t_chainfence", 3 ], [ "t_privacy_fence", 1 ], [ "t_drystone_wall_half", 1 ], [ "t_region_groundcover", 1 ] ] + } + } + }, + "terrain": { + "#": "t_wall_g", + ".": "t_floor", + "d": "t_floor", + "h": "t_floor", + ",": "t_pavement", + ";": "t_pavement_y", + "0": "t_window_empty", + "+": "t_door_c", + "'": "t_region_soil", + "O": "t_region_soil", + "|": { "param": "fencing", "fallback": "t_chainfence" }, + "_": { "param": "walkway", "fallback": "t_region_soil" }, + "&": { "param": "walkway", "fallback": "t_region_soil" }, + "b": { "param": "walkway", "fallback": "t_region_soil" }, + "T": { "param": "walkway", "fallback": "t_region_soil" }, + "s": "t_sand", + "=": "t_dock", + "w": "t_water_dp", + "W": "t_water_sh" + }, + "furniture": { + "Y": { + "switch": { "param": "walkway", "fallback": "f_null" }, + "cases": { + "t_railroad_rubble": "f_null", + "t_region_soil": "f_null", + "t_region_groundcover_barren": "f_null", + "t_concrete": "f_street_light" + } + }, + "T": "f_table", + "b": "f_bench", + "&": "f_trashcan", + "d": "f_desk", + "h": "f_chair", + "O": "f_brazier" + }, + "items": { + "&": { "item": "trash", "chance": 70, "repeat": [ 2, 7 ] }, + "b": { "item": "trash", "chance": 2 }, + "T": [ { "item": "snacks", "chance": 4 }, { "item": "games", "chance": 2 } ] + }, + "nested": { + "W": { "chunks": [ [ "pond_water_furniture", 8 ], [ "null", 92 ] ] }, + "w": { "chunks": [ [ "pond_water_furniture", 8 ], [ "null", 500 ] ] } + } } ] diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index 939d0cf2fe16c..9a1408dd71062 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -39,12 +39,11 @@ { "type": "overmap_special", "id": "Boat Rental", - "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "boat_rental_north" } ], + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "boat_rental_north", "locations": [ "lake_shore" ] } ], "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road" } ], - "locations": [ "water" ], - "city_distance": [ 5, 15 ], + "city_distance": [ 5, 40 ], "occurrences": [ 0, 5 ], - "flags": [ "CLASSIC" ] + "flags": [ "CLASSIC", "LAKE", "MAN_MADE" ] }, { "type": "overmap_special", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json b/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json index 1b8550699e9f0..9677d79f1ddde 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json @@ -81,7 +81,7 @@ { "type": "overmap_terrain", "id": [ "fishing_pond_0_0", "fishing_pond_0_1", "fishing_pond_1_0", "fishing_pond_1_1" ], - "copy-from": "generic_city_building_no_sidewalk", + "copy-from": "generic_city_building", "name": "fishing pond", "sym": "S", "color": "i_blue"