From f8a27375aef6d01b0d020c62a3da330039628dfd Mon Sep 17 00:00:00 2001 From: Milopetilo <78963720+Milopetilo@users.noreply.github.com> Date: Mon, 18 Nov 2024 16:08:16 +0100 Subject: [PATCH 1/2] First few buildings --- data/json/mapgen/s_apt.json | 10 +- data/json/mapgen/s_bookstore.json | 142 +++++----- data/json/mapgen/s_candy.json | 89 ++++--- data/json/mapgen/s_clothing.json | 80 +++--- data/json/mapgen/s_coffee.json | 144 +++++------ data/json/mapgen/s_cosmetic.json | 44 ++-- data/json/mapgen/s_electronics.json | 75 +++--- data/json/mapgen/s_furniture.json | 56 ++-- data/json/mapgen/s_grocery.json | 287 ++++++++++----------- data/json/mapgen/s_gun.json | 8 +- data/json/mapgen/s_hardware.json | 137 +++++----- data/json/mapgen/s_icecream.json | 37 ++- data/json/mapgen/s_lightindustry.json | 49 ++-- data/json/mapgen/s_lightindustry_scen.json | 49 ++-- data/json/mapgen/s_liquor.json | 118 ++++----- data/json/mapgen/salon.json | 45 ++-- data/json/mapgen/school_1.json | 272 +++++++++---------- 17 files changed, 804 insertions(+), 838 deletions(-) diff --git a/data/json/mapgen/s_apt.json b/data/json/mapgen/s_apt.json index a33434561d80d..2032a3164d976 100644 --- a/data/json/mapgen/s_apt.json +++ b/data/json/mapgen/s_apt.json @@ -31,11 +31,10 @@ "%%%%%%%%#<===<#%%%%%%%..", "!!!!!!!%##&*&##%!!!!!!!." ], - "palettes": [ "domestic_general_and_variant_palette", "parametrized_carpets_palette" ], + "palettes": [ "domestic_general_and_variant_palette", "parametrized_carpets_palette", "parametrized_highrise_walls_palette" ], "terrain": { "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ], "!": "t_region_groundcover_urban", - "#": "t_adobe_brick_wall", "<": "t_stairs_up", "&": "t_window", "~": "t_thconc_floor", @@ -91,9 +90,8 @@ "........#>=<=>#.........", "........##&#&##........." ], - "palettes": [ "domestic_general_and_variant_palette", "parametrized_carpets_palette" ], + "palettes": [ "domestic_general_and_variant_palette", "parametrized_carpets_palette", "parametrized_highrise_walls_palette" ], "terrain": { - "#": "t_adobe_brick_wall", ".": "t_open_air", "<": "t_stairs_up", ">": "t_stairs_down", @@ -138,8 +136,8 @@ " #__>__# ", " ####### " ], - "palettes": [ "roof_palette" ], - "terrain": { "#": "t_adobe_brick_wall", "+": "t_door_c" } + "palettes": [ "roof_palette", "parametrized_highrise_walls_palette" ], + "terrain": { "+": "t_door_c" } } }, { diff --git a/data/json/mapgen/s_bookstore.json b/data/json/mapgen/s_bookstore.json index 436d44568cbfd..23f9f56f315a6 100644 --- a/data/json/mapgen/s_bookstore.json +++ b/data/json/mapgen/s_bookstore.json @@ -9,47 +9,46 @@ "rows": [ " ~~ ~", " ~~ ~", - " |----OOO-::--OO--OO--|~", - " |s.l#.Thf..#ccccccccc|~", - " |e..%................|~", - " |#..#.hT...##%#%#%#--|~", - " |...%..............:.:~", - " |.###.Th...........:.:~", - " |..................--| ", - " |.h..h...TT.TT..]]..]| ", - " |.T..T..........]]..]| ", - " |.h..h...TT.TT..]]..]| ", - " |f..............]]..]| ", - " |...............]]..]| ", - " |]..]]..]]..]]].....]| ", - " |]..]]..]]........|--| ", - " |]..]]..]]........+''| ", - " |]..........]]]]]]|St| ", - " |------+----------|--| ", - " 4|C.......f|bb.L| ", - "^ |CC.......+...L| ^ ", - " |CCC...CC<|----- ", - " ^ |----O----| ^ ", + " #####OOO#::##OO##OO###~", + " #s.l-.Thf..-ccccccccc#~", + " #e..%................#~", + " #-..-.hT...--%-%-%-||#~", + " #...%..............:.:~", + " #.---.Th...........:.:~", + " #..................||# ", + " #.h..h...TT.TT..]]..]# ", + " #.T..T..........]]..]# ", + " #.h..h...TT.TT..]]..]# ", + " #f..............]]..]# ", + " #...............]]..]# ", + " #]..]]..]]..]]].....]# ", + " #]..]]..]]........|||# ", + " #]..]]..]]........+''# ", + " #]..........]]]]]]|St# ", + " ####|||+||||||||||#### ", + " 4#C.......f|bb.L# ", + "^ #CC.......+...L# ^ ", + " #CCC...CC<###### ", + " ^ #####O##### ^ ", " " ], + "palettes": [ "parametrized_walls_palette" ], "terrain": { " ": "t_region_groundcover_urban", "^": "t_region_tree_nut", "+": "t_door_c", - "-": "t_wall_w", "'": "t_linoleum_white", "t": "t_linoleum_white", "S": "t_linoleum_white", ":": "t_door_glass_c", "O": "t_window", - "|": "t_wall_w", "4": "t_gutter_downspout", "<": "t_ladder_up", "~": "t_sidewalk" }, "furniture": { "%": "f_counter", - "#": "f_counter", + "-": "f_counter", "T": "f_table", "]": "f_rack", "c": "f_cupboard", @@ -130,8 +129,8 @@ " ------##### ", " " ], - "palettes": [ "roof_palette" ], - "terrain": { "#": "t_wall_r", "C": "t_floor", "+": "t_door_locked" }, + "palettes": [ "roof_palette", "parametrized_walls_palette" ], + "terrain": { "C": "t_floor", "+": "t_door_locked" }, "furniture": { "C": "f_cardboard_box" }, "place_items": [ { "item": "roof_trash", "x": [ 3, 20 ], "y": [ 4, 15 ], "chance": 50, "repeat": [ 1, 3 ] } ], "items": { @@ -212,33 +211,33 @@ " ~~ ", " ~~ ", " ~~ ", - " |========::-OO--OO-| ", - " |hTh.hTh...#.h..h..| ", - " |.h...h....#%##%##.| ", + " #========::#OO##OO## ", + " #hTh.hTh...-.h..h..# ", + " #.h...h....-%--%--.# ", " qO..................Oq ", - " |###%#.h...........| ", - " |e...#.T...[[[[[..]| ", - " |s..c#....>|-|....]| ", - " |c..c#....||S|....]| ", - " |...a#.h..|t'|TT..]| ", - " |.##%#.T..|-+|TT..]| ", - " qO.................]| ", - " |hTh.hTh..........]| ", - " qO.................]| ", - " |[[[[[[[..[[[[[[..]| ", - " |[[[[[[[..[[[[[[..]| ", - " |..................| ", + " #---%-.h...........# ", + " #e...-.T...[[[[[..]# ", + " #s..c-....>|||....]# ", + " #c..c-....||S|....]# ", + " #...a-.h..|t'|TT..]# ", + " #.--%-.T..||+|TT..]# ", + " qO.................]# ", + " #hTh.hTh..........]# ", + " qO.................]# ", + " #[[[[[[[..[[[[[[..]# ", + " #[[[[[[[..[[[[[[..]# ", + " #..................# ", " qO..................Oq ", - " |]]]]]]]]]]]]]]]]]]| ", - " |------------------| ", + " #]]]]]]]]]]]]]]]]]]# ", + " #################### ", " ", " " ], + "palettes": [ "parametrized_walls_palette" ], "terrain": { - "#": "t_floor", + "-": "t_floor", " ": "t_region_groundcover_urban", "+": "t_door_c", - "-": "t_wall_w", ".": "t_floor", "'": "t_linoleum_white", "S": "t_linoleum_white", @@ -248,12 +247,11 @@ ">": "t_stairs_up", "O": "t_window", "q": "t_region_groundcover_urban", - "|": "t_wall_w", "~": "t_sidewalk" }, "furniture": { "%": "f_counter", - "#": "f_counter", + "-": "f_counter", "T": "f_table", "[": "f_rack", "]": "f_bookcase", @@ -303,9 +301,9 @@ " ##O#O###O#O#O##O#O## ", " #FSc__btb_btb___btb# ", " OF_c____________btbO ", - " #_cc___b####_______O ", - " O______t#AX#___btb_# ", - " #tb____b#+##_##O#O## ", + " #_cc___b||||_______O ", + " O______t|AX|___btb_# ", + " #tb____b|+||_##O#O## ", " ###+#####_>__+...HH- ", " -.....&4##OO##...PP- ", " -................HH- ", @@ -322,7 +320,7 @@ " ", " " ], - "palettes": [ "roof_palette" ], + "palettes": [ "roof_palette", "parametrized_walls_palette" ], "terrain": { ".": "t_tile_flat_roof", "H": "t_tile_flat_roof", @@ -331,8 +329,7 @@ "&": "t_tile_flat_roof", "-": "t_glass_railing", "O": "t_window_domestic", - "+": "t_door_locked", - "#": "t_wall_w" + "+": "t_door_locked" }, "furniture": { "X": "f_water_heater", @@ -414,30 +411,30 @@ "~~~~~~~~~~~~~~~~~~~~~~~~", "~~~~~~~~~~~~~~~~~~~~~~~~", " ~ ", - " ~ |-----| ", - " ^ ~ |]]]]]| ", - " ~ |]...]| ", - " ^ ~ |].].]| ", - " ~ |].].]| ", - " ~ |].].]| ", - " |------+-O|....]| ", - " |]]]]]..#a...T.]| ", - " |]......###..T.]| ", - " |].]]].........]| ", - " |].]]].TT..TT..]| ", - " |].............]| ", - " |]]]]]]]]]]]]..]| ", - " |------------.--|| ", - " 4|LbL|.|ts| ", - " o +...+.+''| ", - " o ---------| ", + " ~ ####### ", + " ^ ~ #]]]]]# ", + " ~ #]...]# ", + " ^ ~ #].].]# ", + " ~ #].].]# ", + " ~ #].].]# ", + " #######+#O#....]# ", + " #]]]]]..-a...T.]# ", + " #]......---..T.]# ", + " #].]]].........]# ", + " #].]]].TT..TT..]# ", + " #].............]# ", + " #]]]]]]]]]]]]..]# ", + " #########||||.||## ", + " 4#LbL|.|ts# ", + " o +...+.+''# ", + " o ########## ", " o ", " " ], + "palettes": [ "parametrized_walls_palette" ], "terrain": { " ": "t_region_groundcover_urban", "+": [ "t_door_c", "t_door_locked" ], - "-": "t_wall_w", ".": "t_floor", "t": "t_linoleum_white", "s": "t_linoleum_white", @@ -447,12 +444,11 @@ "^": "t_region_tree_nut", "o": "t_region_groundcover_barren", "q": "t_region_groundcover_barren", - "|": "t_wall_w", "4": "t_gutter_downspout", "~": "t_sidewalk" }, "furniture": { - "#": "f_counter", + "-": "f_counter", "S": "f_statue", "T": "f_table", "]": "f_bookcase", diff --git a/data/json/mapgen/s_candy.json b/data/json/mapgen/s_candy.json index 94cbdd9f3526d..c5113e11e5dd7 100644 --- a/data/json/mapgen/s_candy.json +++ b/data/json/mapgen/s_candy.json @@ -11,27 +11,28 @@ ".....7.......fssf.......", ".............fssf.......", "...uuuuu.....fssf..7....", - "..|-----|rrrrrssf.......", - "..|____^|sbbsRssfuuuu...", - "..|B____asssssss|----|..", - "..|B____asssssss|H__H|..", - "..|^____|sbbssss|t__t|..", - "..|B____||||---||H__H|..", - "..|B____{{&__________|..", - "..|__________________|..", - "..|^{_____________SSS|..", - "..|||cccc|||www|__||||..", - "..|_^__C__&|F##|__|e#|..", - "..|C_______ |__+ |..", - "..|tt______ +__|T |..", - "..|ttC_{{{_|o##|__||||..", - "..|||w||w|||||||__|T |..", - "........4pggppph__+ |..", - "........ppppppp|ll|#e|..", - "........ppppppp|||||||..", + "..#######rrrrrssf.......", + "..#____^#sbbsRssfuuuu...", + "..#B____asssssss######..", + "..#B____asssssss#H__H#..", + "..#^____#sbbssss#t__t#..", + "..#B____#########H__H#..", + "..#B____{{&__________#..", + "..#__________________#..", + "..#^{_____________SSS#..", + "..#||cccc|||www|__|||#..", + "..#_^__C__&|FAA|__|eA#..", + "..#C_______ |__+ #..", + "..#tt______ +__|T #..", + "..#ttC_{{{_|oAA|__|||#..", + "..###w##w#######__|T #..", + "........4pggppph__+ #..", + "........ppppppp#ll|Ae#..", + "........ppppppp#######..", "........................", "........................" ], + "palettes": [ "parametrized_walls_palette" ], "terrain": { "+": "t_door_c", "-": "t_wall_glass", @@ -41,7 +42,7 @@ "_": "t_floor", " ": "t_linoleum_white", "e": "t_linoleum_white", - "#": "t_linoleum_white", + "A": "t_linoleum_white", "T": "t_linoleum_white", "o": "t_linoleum_white", "F": "t_linoleum_white", @@ -55,11 +56,10 @@ "s": "t_sidewalk", "u": "t_region_shrub_decorative", "w": "t_window", - "4": "t_gutter_downspout", - "|": "t_wall_y" + "4": "t_gutter_downspout" }, "furniture": { - "#": "f_counter", + "A": "f_counter", "&": "f_trashcan", "B": "f_bench", "C": "f_chair", @@ -165,28 +165,29 @@ "............ss..........", "............ss..........", "...d....d...ssuuuuuuuuu.", - "..dtd..dtd..ss|||||||||.", - "...d....d..bss-____#__|.", - "...........bss-____#__|.", - "............ss|||__#C_|.", - "...d........ssss+__#__|.", - "..dtd.......ssss+__#__|.", - "...d...u||-----||__#&_|.", - ".......u|^_________##_|.", - ".......u-_____________|.", - "...d...u-__{__{_______|.", - "..dtd..u-__{__{___{w_w|.", - "...d...u-__{__{___{w__|.", - ".......u-__{__{___{wwa|.", - ".......u|__{__{___#wT |.", - "...d...u|__{__{___#wS |.", - "..dtd..u|__{__{__||||||.", - "...d...u|________appcc5.", - ".......u|^______&|ppppp.", - ".......u||||||||||ppppp.", + "..dtd..dtd..ss#########.", + "...d....d..bss-____A__#.", + "...........bss-____A__#.", + "............ss###__AC_#.", + "...d........ssss+__A__#.", + "..dtd.......ssss+__A__#.", + "...d...u##-----##__A&_#.", + ".......u#^_________AA_#.", + ".......u-_____________#.", + "...d...u-__{__{_______#.", + "..dtd..u-__{__{___{w_w#.", + "...d...u-__{__{___{w__#.", + ".......u-__{__{___{wwa#.", + ".......u#__{__{___AwT #.", + "...d...u#__{__{___AwS #.", + "..dtd..u#__{__{__######.", + "...d...u#________appcc5.", + ".......u#^______&#ppppp.", + ".......u##########ppppp.", "..................ppppp.", "........................" ], + "palettes": [ "parametrized_walls_palette" ], "terrain": { "+": "t_door_glass_c", "-": "t_wall_glass", @@ -203,12 +204,10 @@ "s": "t_sidewalk", "t": "t_tree_maple_tapped", "u": "t_region_shrub_decorative", - "w": "t_wall_y", - "5": "t_gutter_downspout", - "|": "t_brick_wall" + "5": "t_gutter_downspout" }, "furniture": { - "#": "f_counter", + "A": "f_counter", "&": "f_trashcan", "C": "f_chair", "S": "f_sink", diff --git a/data/json/mapgen/s_clothing.json b/data/json/mapgen/s_clothing.json index caa6f06deb502..f4c2c64182ea4 100644 --- a/data/json/mapgen/s_clothing.json +++ b/data/json/mapgen/s_clothing.json @@ -280,32 +280,32 @@ "~~~~~~~~~~~~~~~~~~~~~~~~", "~~~~~~~~~~~~~~~~~~~~~~~~", "~~~~11~~~~1111~~~11~~~~~", - "***|===::----==::==|****", - "***|]....#.|##...#@|****", - "***|]....#.|.......|****", - "***|]......|##.....|****", - "***|]..]..]|.#....U|****", - "***|]..]..]|&#....U|****", - "***|]..]..]|.......|****", - "***|]..]..]|].....#|****", - "***|]..]..]|]..@..#|****", - "***|]..]..]|]..T..#|****", - "***|].....]|].....#|****", - "***|--|--i-|-i-|---|****", - "***|dd|o.......+..]|****", - "***|.h|o..TTh.F|---|****", - "***O..|o..hh..}|ust|****", - "***|..+........+___O****", - "***|--|--O-+---|---|****", + "***#===::####==::==#****", + "***#]....-.|--...-@#****", + "***#]....-.|.......#****", + "***#]......|--.....#****", + "***#]..]..]|.-....U#****", + "***#]..]..]|&-....U#****", + "***#]..]..]|.......#****", + "***#]..]..]|].....-#****", + "***#]..]..]|]..@..-#****", + "***#]..]..]|]..T..-#****", + "***#].....]|].....-#****", + "***#|||||i|||i|||||#****", + "***#dd|o.......+..]#****", + "***#.h|o..TTh.F||||#****", + "***O..|o..hh..}|ust#****", + "***#..+........+___O****", + "***######O#+########****", "******4***~~~***********", "**********~~~***********", "**********~~~***********", "**********~~~***********" ], + "palettes": [ "parametrized_walls_palette" ], "terrain": { "*": "t_region_groundcover_urban", "+": "t_door_c", - "-": "t_wall_w", ".": "t_floor", "u": "t_linoleum_white", "s": "t_linoleum_white", @@ -315,14 +315,13 @@ "=": "t_wall_glass", "O": "t_window", "i": "t_door_locked_interior", - "|": "t_wall_w", "~": "t_sidewalk", "1": "t_sidewalk", "4": "t_gutter_downspout" }, "sealed_item": { "1": { "item": { "item": "seed_rose" }, "furniture": "f_planter_harvest" } }, "furniture": { - "#": "f_counter", + "-": "f_counter", "&": "f_counter_gate_c", "@": "f_mannequin", "F": "f_fridge", @@ -478,8 +477,8 @@ " ", " " ], - "palettes": [ "roof_palette" ], - "terrain": { "#": "t_wall_b", "H": "t_wall_glass", "+": "t_door_c", "&": "t_flat_roof" }, + "palettes": [ "roof_palette", "parametrized_walls_palette" ], + "terrain": { "H": "t_wall_glass", "+": "t_door_c", "&": "t_flat_roof" }, "furniture": { "z": "f_cardboard_box", "d": "f_mannequin" }, "items": { "z": [ @@ -554,31 +553,31 @@ "*****rzr**~~~**rzr******", "*****rzr**~~~**rzr******", "*~~~~~~~~~~~~~~~~~~~~~~*", - "*|---===--:::--===|---|*", - "*|[..f@.........@y|ddd|*", - "*|[..........@....|h.h|*", - "*|[...............+...|*", - "*|--+|-+|..@...@..|d..O*", - "*|h..|u_|.........|dh.|*", - "*|...|s_|..@...@..|]..|*", - "*|U..|t_|........y|]..|*", - "*|-O-|--|::-|.----|--.|*", - "*zrzrzrzr~~r|.[[[[[[[.|*", - "*********~~z|.........|4", - "*******&*~~r|.........|*", - "R********~~z|-+--|--+-|*", - "******~~~~~r|....|...h|*", - "******~~~~~z|h..U|U...|*", - "***********r|-O--|--O-|*", + "*####===##:::##===#####*", + "*#[..f@.........@y|ddd#*", + "*#[..........@....|h.h#*", + "*#[...............+...#*", + "*#||+||+|..@...@..|d..O*", + "*#h..|u_|.........|dh.#*", + "*#...|s_|..@...@..|]..#*", + "*#U..|t_|........y|]..#*", + "*##O#####::##.|||||||.#*", + "*zrzrzrzr~~r#.[[[[[[[.#*", + "*********~~z#.........#4", + "*******&*~~r#.........#*", + "R********~~z#|+|||||+|#*", + "******~~~~~r#....|...h#*", + "******~~~~~z#h..U|U...#*", + "***********r##O#####O##*", "************************", "*******^****************", "************************" ], + "palettes": [ "parametrized_walls_palette" ], "terrain": { "*": "t_region_groundcover_urban", "&": "t_region_groundcover_urban", "+": "t_door_c", - "-": "t_brick_wall", ".": "t_floor", "_": "t_linoleum_gray", "u": "t_linoleum_gray", @@ -594,14 +593,13 @@ "^": "t_region_tree_fruit", "r": "t_region_groundcover_urban", "z": "t_region_shrub_decorative", - "|": "t_brick_wall", "~": "t_sidewalk", "R": "t_region_groundcover_urban", "4": "t_gutter_downspout" }, "furniture": { "%": "f_console_broken", - "#": "f_counter", + "-": "f_counter", "@": "f_mannequin", "H": "f_chair", "T": "f_table", diff --git a/data/json/mapgen/s_coffee.json b/data/json/mapgen/s_coffee.json index fe886aefa79a8..c817758fd15b0 100644 --- a/data/json/mapgen/s_coffee.json +++ b/data/json/mapgen/s_coffee.json @@ -12,27 +12,27 @@ "S_____,_____SSSSSSSSSMzS", "S_____,_____SSSSSSSSSMzS", "S_____,_____SSSSSSSSSMzS", - "S_____,_____SS||V{{{V||S", - "S_____,_____SS|D <|S", - "SSSSSSSSSSSSSS|r OS", - "SSSSSSSSSSSSSS|r |S", - "SVVVVVVVzMSSzz| #W##|S", - "SVD>>>>VzMSSMzV #ww%|S", - "SV BBB>VzMSSSS{ xww(|S", - "SV B>VzMSSSS{ flwl|S", - "SV B>VzMMMMzV flwU|S", - "SV B>Vzzzzzz|X #wwG|S", - "S|B ^||||||||||^ ||I||S", - "SO6 B|=;|;=|99 r|FwC|S", - "S|B 6|=A|A=|9 r|Fwc|S", - "S| B|+|||+|9 D|!ww|S", - "S|B |Lwl|S", - "SO6 6 6 6 B66B|Lwl|S", - "S|B ^???????^ B66B|Lwl|S", - "S|||||||||||||||||||3||S", + "S_____,_____SS##V{{{V##S", + "S_____,_____SS#D <#S", + "SSSSSSSSSSSSSS#r OS", + "SSSSSSSSSSSSSS#r #S", + "SVVVVVVVzMSSzz# -W--#S", + "SVD>>>>VzMSSMzV -ww%#S", + "SV BBB>VzMSSSS{ xww(#S", + "SV B>VzMSSSS{ flwl#S", + "SV B>VzMMMMzV flwU#S", + "SV B>Vzzzzzz#X -wwG#S", + "S#B ^##########^ ||I|#S", + "SO6 B|=;|;=|99 r|FwC#S", + "S#B 6|=A|A=|9 r|Fwc#S", + "S# B|+|||+|9 D|!ww#S", + "S#B |Lwl#S", + "SO6 6 6 6 B66B|Lwl#S", + "S#B ^???????^ B66B|Lwl#S", + "S###################3##S", "S4SSSSSSSSSSSSSSSSSSSSSS" ], - "palettes": [ "commercial" ], + "palettes": [ "commercial", "parametrized_walls_palette" ], "terrain": { ".": "t_region_groundcover_urban", "M": "t_region_groundcover_urban", @@ -42,7 +42,7 @@ "S": "t_sidewalk", " ": "t_floor", "!": "t_linoleum_white", - "#": "t_linoleum_white", + "-": "t_linoleum_white", "%": "t_linoleum_white", ";": "t_linoleum_white", "=": "t_linoleum_white", @@ -65,7 +65,6 @@ "O": "t_window", "V": "t_wall_glass", "{": "t_door_glass_c", - "|": "t_wall_b", "<": "t_stairs_up", "4": "t_gutter_downspout", "T": "t_tree_coffee" @@ -74,7 +73,7 @@ "M": "f_region_flower", "^": [ "f_indoor_plant", "f_indoor_plant_y" ], "x": "f_counter", - "#": "f_counter", + "-": "f_counter", ">": "f_counter", "W": "f_counter_gate_c", "%": "f_trashcan", @@ -98,7 +97,7 @@ "toilets": { ";": { } }, "items": { "x": { "item": "cash_register_random", "chance": 100 }, - "#": { "item": "coffee_counter", "chance": 10 }, + "-": { "item": "coffee_counter", "chance": 10 }, "6": { "item": "coffee_table", "chance": 35 }, "9": { "item": "coffee_display_2", "chance": 85, "repeat": [ 1, 8 ] }, ";": { "item": "coffee_bathroom", "chance": 15 }, @@ -176,37 +175,37 @@ "//": "Default fill is floor but some tables are outside", "fill_ter": "t_linoleum_white", "rows": [ - "_______,,,,,,,ss########", - "______________ss#pppppp#", - "______________sssphtthp#", - "______________ssspppppp#", - "______________sssphpphp#", - "_______,,,,,,,sssptpptp#", - "______________sssphpphp#", - "______________ssspppppp#", - "______________ss#phtthp#", - "______________ss#pppppp#", - "_______,,,,,,,ss|-5555-|", - "______________ss|.HTTH.|", - "______________ss%......|", - "______________ss+.....&|", - "______________ss+......|", - "s4ssssssssssssss%....HH|", - "|--555-555-555--|....TT|", - "|..HTH.HTH.HTH.......TT|", - "|....................HH|", - "|......................|", - "|-D---D---cWWcccxccxccc|", - "|S==|==S|==============|", - "|P==|==P|llSO==rrrrrSce|", - "|-------------L--------|" + "_______,,,,,,,ss--------", + "______________ss-pppppp-", + "______________sssphtthp-", + "______________ssspppppp-", + "______________sssphpphp-", + "_______,,,,,,,sssptpptp-", + "______________sssphpphp-", + "______________ssspppppp-", + "______________ss-phtthp-", + "______________ss-pppppp-", + "_______,,,,,,,ss##5555##", + "______________ss#.HTTH.#", + "______________ss%......#", + "______________ss+.....&#", + "______________ss+......#", + "s4ssssssssssssss%....HH#", + "###555#555#555###....TT#", + "#..HTH.HTH.HTH.......TT#", + "#....................HH#", + "#......................#", + "#|D|||D|||cWWcccxccxccc#", + "#S==|==S|==============#", + "#P==|==P|llSO==rrrrrSce#", + "##############L#########" ], + "palettes": [ "parametrized_walls_palette" ], "terrain": { - "#": "t_region_shrub_decorative", + "-": "t_region_shrub_decorative", "%": "t_wall_glass", "+": "t_door_glass_c", ",": "t_pavement_y", - "-": "t_wall_b", ".": "t_floor", "H": "t_floor", "T": "t_floor", @@ -220,8 +219,7 @@ "h": "t_concrete", "=": "t_linoleum_white", "s": "t_sidewalk", - "4": "t_gutter_downspout", - "|": "t_wall_b" + "4": "t_gutter_downspout" }, "furniture": { "x": "f_counter", @@ -313,31 +311,32 @@ " sss ", " sss ", " SSSS sss SSS ", - " ||||||----||sss||w|| ", - " |{{o|#tr{t#|sss|..^| ", - " |...|.##t#.|+|+|...| ", - " |...D..#..#r{rvr...| ", - " |...|......#.tt....| ", - " |...c..............| ", - " |...c.............^| ", - " |...c..............| ", - " |...c..............| ", - " |...x......#.......| ", - " |..c|.....#t#......| ", - " |..c|......#....|D|| ", - " |..&|...........|''| ", - " |...|||||#...#..|''| ", - " |.....D<|t#.#t#.|aT| ", - " |.....|||||||||||||| ", - " |#t#....bppppdd4ppS ", - " |#t#.lll|pppppppppS ", - " |||||||||pppppppppS ", + " ############sss##w## ", + " #{{o|Atr{tA#sss#..^# ", + " #...|.AAtA.#+#+#...# ", + " #...D..A..Ar{rvr...# ", + " #...|......A.tt....# ", + " #...c..............# ", + " #...c.............^# ", + " #...c..............# ", + " #...c..............# ", + " #...x......A.......# ", + " #..c|.....AtA......# ", + " #..c|......A....|D|# ", + " #..&|...........|''# ", + " #...|||||A...A..|''# ", + " #.....D<|tA.AtA.|aT# ", + " #.....||############ ", + " #AtA....bppppdd4ppS ", + " #AtA.lll#pppppppppS ", + " #########pppppppppS ", " pppppppppS ", " " ], + "palettes": [ "parametrized_walls_palette" ], "fill_ter": "t_floor", "furniture": { - "#": "f_chair", + "A": "f_chair", "&": "f_trashcan", "T": "f_toilet", "^": "f_indoor_plant", @@ -366,8 +365,7 @@ "s": "t_sidewalk", "w": "t_window_boarded_noglass", "4": "t_gutter_downspout", - "<": "t_ladder_up", - "|": "t_wall_b" + "<": "t_ladder_up" }, "vendingmachines": { "v": { "item_group": "vending_drink", "lootable": true } }, "place_items": [ diff --git a/data/json/mapgen/s_cosmetic.json b/data/json/mapgen/s_cosmetic.json index 15c52563c452c..00b87e5ad67d0 100644 --- a/data/json/mapgen/s_cosmetic.json +++ b/data/json/mapgen/s_cosmetic.json @@ -10,29 +10,29 @@ "__.v.v.v.v.v.v.v.v.v.v._", "__....................._", "__....................._", - "__|gggg-gggg-g[[g-gggg|_", - "__| tt^tt t^==^# b |_", - "__| #### |_", + "__#gggg#gggg#g[[g#gggg#_", + "__# tt^tt t^==^- b #_", + "__# ---- #_", "__gt rrr rrr g_", - "__|r r|r r|r r|t |_", - "__|r r|r r|r r|7 |_", - "__|r r|r r|r r|7 |_", - "__|r r|r r|r r|7 |_", - "__|r r|r r|r r|t |_", + "__#r r|r r|r r|t #_", + "__#r r|r r|r r|7 #_", + "__#r r|r r|r r|7 #_", + "__#r r|r r|r r|7 #_", + "__#r r|r r|r r|t #_", "__g g_", - "__| |r r|t t|r r|_", - "__| ^ |r r|t t|r r|_", - "__| |r r|t t|r r|_", - "__| ^ |r r|t t|r r|_", - "__| |_", - "__|--I----------------|_", - ".4|***C|**CC**kkkk*| T|_", - "..|***C|***********| |_", - "..L****+***********I j|_", - "..|-------------------|_" + "__# |r r|t t|r r#_", + "__# ^ |r r|t t|r r#_", + "__# |r r|t t|r r#_", + "__# ^ |r r|t t|r r#_", + "__# #_", + "__#||I||||||||||||||||#_", + ".4#***C|**CC**kkkk*| T#_", + "..#***C|***********| #_", + "..L****+***********I j#_", + "..#####################_" ], "fill_ter": "t_linoleum_white", - "palettes": [ "parametrized_carpets_palette" ], + "palettes": [ "parametrized_carpets_palette", "parametrized_walls_palette" ], "terrain": { " ": "t_linoleum_white", "j": "t_linoleum_white", @@ -40,7 +40,6 @@ "*": "t_thconc_floor", "k": "t_thconc_floor", "+": "t_door_c", - "-": "t_wall_w", "g": "t_wall_glass", "C": "t_thconc_floor", "I": [ "t_door_locked_interior", "t_door_c" ], @@ -49,11 +48,10 @@ "_": "t_region_groundcover_urban", ".": "t_concrete", "v": "t_concrete", - "4": "t_gutter_downspout", - "|": "t_wall_w" + "4": "t_gutter_downspout" }, "furniture": { - "#": "f_counter", + "-": "f_counter", "7": "f_bookcase", "C": "f_crate_c", "S": "f_sink", diff --git a/data/json/mapgen/s_electronics.json b/data/json/mapgen/s_electronics.json index e372b46bfe2fc..64e5e8eb1e3e6 100644 --- a/data/json/mapgen/s_electronics.json +++ b/data/json/mapgen/s_electronics.json @@ -15,29 +15,28 @@ "zs______,______,______sz", "zs______,______,______sz", "zssssssssssssssssssssssz", - " --5555--5555--+--55555 ", - " |.CCCC..CCCC.^.^|rrrr8 ", - " 8r.............r|L---| ", + " ##5555##5555##+##55555 ", + " #.CCCC..CCCC.^.^#rrrr8 ", + " 8r.............r#L#### ", " 8r..CCCCrr......x...^8 ", - " 8r..###rr1......#q...8 ", - " |r..............#...r| ", - " |...######......#c..r| ", - " |r..######..-------I-| ", - " 8r..........|EEEEt..F| ", + " 8r..---rr1......-q...8 ", + " #r..............-...r# ", + " #...------......-c..r# ", + " #r..------..|||||||I|# ", + " 8r..........|EEEEt..F# ", " 8r..xxxwyw..|E.c...cE8 ", " 8r..xxxywy..I.......E8 ", - " |..........^|.##llll^| ", - " |D---D|------L----55-| ", - "4|.S|S.|d........^|ooo.####.ooo|*", - "s_____________________ss**|||||||||A.c|l.................|............w*", - "s_____________________ss**|DDFF.%#|A.c|l.................|...........lw*", - "s_____________________ss*$wxH...%.|..#|l..|IIII..IIII|...+...........lw*", - "sLLLLLLL_______LLLLLLLss*$w....H%.y..#|l..I......hhhhI...+.hh..hh..hh.w*", - "ssssssssssssssssssssssss*$w..@....|..#|l..I......ddddI...|.dd..dd..dd.|*", - "ssssssssssssssssssssssss**|^.@.Y..|^..|l..I......ddddI...|.dd..dd..dd.|*", - "|||||||||||++||||wwww|||||||||||||||+||^..I......hhhhI..?w.hh..hh..hh.w*", - "|######cY|^..a...........^llllllll^.....................?w............w*", - "|......c.|..................................M...........?w.hh..hh..hh.w*", - "P####Y...|.....BBB..........####..........I?..M......I..?w.dd..dd..dd.w*", - "|......|.+....|||||||||||≠≠≠≠||≠≠≠≠|+||...I?.n.......I...|.dd..dd..dd.|*", - "|######|.|....|SS|T|T|T|^.a..89....Y..|...I?...M.....I...|.hh..hh..hh.|*", - "||||||||||....|ii|+|+|+|..............≠...I???.......I...+............w*", - "|######|.|....|iiiiiiii|.#tt#.#tt#....≠...|IIII..IIII|...+............w*", - "|......|.+....+iiiiiiii|.#tt#.#tt#....≠..................|..BB..dddd..w*", - "P####Y...|....|ii|+|+|+|.#tt#.#tt#....≠..................|.......H.x..w*", - "|......c.|l..>|SS|T|T|T|.#tt#.#tt#....|^llllllllll^...ccc|^oooo......^|*", - "|######cY|l...||||||||||..............|||||||||||||+++|||||||||||||||||*", - "||||||||||l...|SS|T|T|T|..............+ii+T|rir|.a......Y####........^|*", - "|p.p|.x.^|....|ii|+|+|+|.#tt#.#tt#...^|Si|||ri(|......................w*", - "|p.p|HD..+....+iiiiiiii|.#tt#.#tt#...a|Si+T|ri(|B.....dh.dh.dh.dh.dh..w*", - "|p.p|.D.F|....|iiiiiiii|.#tt#.#tt#....|||||||+||......dh.dh.dh.dh.dh..w*", - "|p.p|a..F|...^|ii|+|+|+|.#tt#.#tt#....+iiOOOiii|..d..................nw*", - "|p..+...#||++||SS|T|T|T|..............|iiiiiiiU|..d...dh.dh.dh.dh.dh.n|*", - "||+|||||||^...||||||||||..............CiiiCiiiU|.Hd...dh.dh.dh.dh.dh.n|*", - "|,,,,,,,,,,,,,,,,,,,,,,|.#tt#.#tt#....CiiiWiiiU|..d..................nw*", - "w,::::::::::::::::::::,|.#tt#.#tt#....CiiiSiiiU|......dh.dh.dh.dh.dh..w*", - "w,:,,,,,,,,,,,,,,,,,,:,|.#tt#.#tt#....CiiiCiiiU|x.....dh.dh.dh.dh.dh..w*", - "w,:,,,,,,,,,,,,,,,,,,:,|.#tt#.#tt#....CiiiiiiiU|x.....................w*", - "|,:,,,,,,,,,,,,,,,,,,:,|^.............|eeeiiiii|^.............ll......|*", - "|,::::,,,,,,,,,,,,::::,||wwww||||||w+w||||wwww|||wwww||||wwww||||wwww||*", - "|,:,,:,,,,,,,,,,,,:,,:,|$$$********sss*******************************f**", - "|,:7,:,,,,,,,,,,,,:,7:,|$;$********sss***********;****************;**f**", - "|,:,,:,,,,,,,,,,,,:,,:,|$$$****$$**sss**$$*****$$****bbbb***/**/**$$*f**", + "s_____________________ss**$#.£££££...Y|.....|.F|......dh.dh.dh.dh.dh..w*", + "sLLLLLLL_______LLLLLLL§s**##||||||||+|||w|++|+||x.....dh.dh.dh.dh.dh..w*", + "s_____________________ss**#^.D..oo|...|.......n|x.....................w*", + "s_____________________ss*$w.MD....|..£|l......n|.......Y££££...ll....^#*", + "s_____________________ss*$w..D.M..+..£|l......n||||+++||||||||||||||||#*", + "sLLLLLLL_______LLLLLLLss**#F.....^|..£|l.......>........^|ooo.££££.ooo#*", + "s_____________________ss**#||||||||A.c|l.................|............w*", + "s_____________________ss**#DDFF.%£|A.c|l.................|...........lw*", + "s_____________________ss*$wxH...%.|..£|l..|IIII..IIII|...+...........lw*", + "sLLLLLLL_______LLLLLLLss*$w....H%.y..£|l..I......hhhhI...+.hh..hh..hh.w*", + "ssssssssssssssssssssssss*$w..@....|..£|l..I......ddddI...|.dd..dd..dd.#*", + "ssssssssssssssssssssssss**#^.@.Y..|^..|l..I......ddddI...|.dd..dd..dd.#*", + "###########++####wwww######|||||||||+||^..I......hhhhI..?w.hh..hh..hh.w*", + "#££££££cY|^..a...........^llllllll^.....................?w............w*", + "#......c.|..................................M...........?w.hh..hh..hh.w*", + "P££££Y...|.....BBB..........££££..........I?..M......I..?w.dd..dd..dd.w*", + "#......|.+....|||||||||||≠≠≠≠||≠≠≠≠|+||...I?.n.......I...|.dd..dd..dd.#*", + "#££££££|.|....|SS|T|T|T|^.a..89....Y..|...I?...M.....I...|.hh..hh..hh.#*", + "#|||||||||....|ii|+|+|+|..............≠...I???.......I...+............w*", + "#££££££|.|....|iiiiiiii|.£tt£.£tt£....≠...|IIII..IIII|...+............w*", + "#......|.+....+iiiiiiii|.£tt£.£tt£....≠..................|..BB..dddd..w*", + "P££££Y...|....|ii|+|+|+|.£tt£.£tt£....≠..................|.......H.x..w*", + "#......c.|l..>|SS|T|T|T|.£tt£.£tt£....|^llllllllll^...ccc|^oooo......^#*", + "#££££££cY|l...||||||||||..............|||||||||||||+++||||||||||||||||#*", + "#|||||||||l...|SS|T|T|T|..............+ii+T|rir|.a......Y££££........^#*", + "#p.p|.x.^|....|ii|+|+|+|.£tt£.£tt£...^|Si|||ri(|......................w*", + "#p.p|HD..+....+iiiiiiii|.£tt£.£tt£...a|Si+T|ri(|B.....dh.dh.dh.dh.dh..w*", + "#p.p|.D.F|....|iiiiiiii|.£tt£.£tt£....|||||||+||......dh.dh.dh.dh.dh..w*", + "#p.p|a..F|...^|ii|+|+|+|.£tt£.£tt£....+iiOOOiii|..d..................nw*", + "#p..+...£||++||SS|T|T|T|..............|iiiiiiiU|..d...dh.dh.dh.dh.dh.n#*", + "#|+|||||||^...||||||||||..............CiiiCiiiU|.Hd...dh.dh.dh.dh.dh.n#*", + "#,,,,,,,,,,,,,,,,,,,,,,|.£tt£.£tt£....CiiiWiiiU|..d..................nw*", + "w,::::::::::::::::::::,|.£tt£.£tt£....CiiiSiiiU|......dh.dh.dh.dh.dh..w*", + "w,:,,,,,,,,,,,,,,,,,,:,|.£tt£.£tt£....CiiiCiiiU|x.....dh.dh.dh.dh.dh..w*", + "w,:,,,,,,,,,,,,,,,,,,:,|.£tt£.£tt£....CiiiiiiiU|x.....................w*", + "#,:,,,,,,,,,,,,,,,,,,:,|^.............|eeeiiiii|^.............ll......#*", + "#,::::,,,,,,,,,,,,::::,##wwww######w+w####wwww###wwww####wwww####wwww##*", + "#,:,,:,,,,,,,,,,,,:,,:,#$$$********sss*******************************f**", + "#,:7,:,,,,,,,,,,,,:,7:,#$;$********sss***********;****************;**f**", + "#,:,,:,,,,,,,,,,,,:,,:,#$$$****$$**sss**$$*****$$****bbbb***/**/**$$*f**", "w,::::,,,,,,,,,,,,::::,w*******$$**sss**$$*****$************/**/***$*f**", "w,:,,,,,,,,,,,,,,,,,,:,w******$$**sssss**$$***$$************/**/****;f**", "w,:,,,,,,,,::,,,,,,,,:,w*****$$**sssssss**$$**;*************/**/*****f**", - "|,:,,,,,,,:,,:,,,,,,,:,|$$$**$$**sss§sss**$$**********mmm******/*****f**", - "|,::::::::::::::::::::,|$;$**$$**sssssss**$$**********mmm************f**", - "|,:,,,,,,,:,,:,,,,,,,:,|$$$**$$**sssssss**$$**********mmm**====******f**", - "|,:,,,,,,,,::,,,,,,,,:,|||****$$**sssss**$$****************====***b**f**", - "|,:,,,,,,,,,,,,,,,,,,:,.^|*****$$**sss**$$***;$****b*******====***b**f**", - "w,:,,,,,,,,,,,,,,,,,,:,.#w******$$*sss*$$*****$$***b*******====***b**f**", - "w,::::,,,,,,,,,,,,::::,.#w******$$*sss*$$*******;**b*****************f**", - "w,:,,:,,,,,,,,,,,,:,,:,.#w*********sss*****************************;*f**", - "|,:7,:,,,,,,,,,,,,:,7:,..|ssssssssssssssssssssssssssssssssssssssss***f**", - "|,:,,:,,,,,,,,,,,,:,,:,..+sssssssssssssssssssssssssssssssssssssssss**f**", - "|,::::,,,,,,,,,,,,::::,..|ssssssssssssssssssssssssssssssssssssssss***f**", - "w,:,,,,,,,,,,,,,,,,,,:,.#w**********s********************************f**", - "w,:,,,,,,,,,,,,,,,,,,:,.#w**$$**$$**s**$$**$$**$$**$$**$$**$$**$$****f**", - "w,::::::::::::::::::::,.#w**********s********************************f**", - "|,,,,,,,,,,,,,,,,,,,,,,.^|ffffffffffGfffffffffffffffffffffffffffffffff**", - "||wwww|||||wwww|||||wwww||**********************************************" + "#,:,,,,,,,:,,:,,,,,,,:,#$$$**$$**sss§sss**$$**********mmm******/*****f**", + "#,::::::::::::::::::::,#$;$**$$**sssssss**$$**********mmm************f**", + "#,:,,,,,,,:,,:,,,,,,,:,#$$$**$$**sssssss**$$**********mmm**====******f**", + "#,:,,,,,,,,::,,,,,,,,:,###****$$**sssss**$$****************====***b**f**", + "#,:,,,,,,,,,,,,,,,,,,:,.^#*****$$**sss**$$***;$****b*******====***b**f**", + "w,:,,,,,,,,,,,,,,,,,,:,.£w******$$*sss*$$*****$$***b*******====***b**f**", + "w,::::,,,,,,,,,,,,::::,.£w******$$*sss*$$*******;**b*****************f**", + "w,:,,:,,,,,,,,,,,,:,,:,.£w*********sss*****************************;*f**", + "#,:7,:,,,,,,,,,,,,:,7:,..#ssssssssssssssssssssssssssssssssssssssss***f**", + "#,:,,:,,,,,,,,,,,,:,,:,..+sssssssssssssssssssssssssssssssssssssssss**f**", + "#,::::,,,,,,,,,,,,::::,..#ssssssssssssssssssssssssssssssssssssssss***f**", + "w,:,,,,,,,,,,,,,,,,,,:,.£w**********s********************************f**", + "w,:,,,,,,,,,,,,,,,,,,:,.£w**$$**$$**s**$$**$$**$$**$$**$$**$$**$$****f**", + "w,::::::::::::::::::::,.£w**********s********************************f**", + "#,,,,,,,,,,,,,,,,,,,,,,.^#ffffffffffGfffffffffffffffffffffffffffffffff**", + "##wwww#####wwww#####wwww##**********************************************" ], "palettes": [ "school_palette" ], "place_monster": [ @@ -115,74 +115,74 @@ " ", " ", " ", - " ||wwww||||wwww||||wwww|| ", - " ||www||www|| |^.....ll.cccc........^| ", - " |H.....H.D.| |x.....................w ", - " wDDx.DDx.Dh| |x.....dh.dh.dh.dh.dh..w ", - " w.H...H..x.| |......dh.dh.dh.dh.dh..w ", - " wDDx.DDx...||w||||w||..d...dh.dh.dh.dh.dh.nw ", - " |H....H...a|^.....i)|.Hd..................n| ", - " |DDx.DDx.....HttH.iU|..d..................n| ", - " |............HttH.iU|.dd...dh.dh.dh.dh.dh.nw ", - " |FFFcFFF..^|.HttH.iS|......dh.dh.dh.dh.dh..w ", - " |||||||||||||.HttH.iC|B.....dh.dh.dh.dh.dh..w ", - " |o....FFF|^..........|......................w ", - " wo.DD....+........Y..|.a.....Y####..oooo...^| ", - " w..MD..||||+|||+++|||||||+++||||||||||||||||| ", - " |x..D..|FcD.|........<>.......n|....nnnn...^| ", - " |||||..|.HD.|l................n|............w ", - " |x.....|..x.|l................n|..hh.hh.hh..w ", + " ##wwww####wwww####wwww## ", + " ##www##www## #^.....ll.cccc........^# ", + " #H.....H.D.# #x.....................w ", + " wDDx.DDx.Dh# #x.....dh.dh.dh.dh.dh..w ", + " w.H...H..x.# #......dh.dh.dh.dh.dh..w ", + " wDDx.DDx...##w####w##..d...dh.dh.dh.dh.dh.nw ", + " #H....H...a|^.....i)|.Hd..................n# ", + " #DDx.DDx.....HttH.iU|..d..................n# ", + " #............HttH.iU|.dd...dh.dh.dh.dh.dh.nw ", + " #FFFcFFF..^|.HttH.iS|......dh.dh.dh.dh.dh..w ", + " ##|||||||||||.HttH.iC|B.....dh.dh.dh.dh.dh..w ", + " #o....FFF|^..........|......................w ", + " wo.DD....+........Y..|.a.....Y££££..oooo...^# ", + " w..MD..||||+|||+++|||||||+++||||||||||||||||# ", + " #x..D..|FcD.|........<>.......n|....nnnn...^# ", + " #||||..|.HD.|l................n|............w ", + " #x.....|..x.|l................n|..hh.hh.hh..w ", " w..DH..|a...|l..|IIIIIIIIII|...+..dd.dd.dd..w ", " w.MDH.^|.xDD|l..I~~~~~~~~~~I...+............w ", - " w..D..A|..Hc|l..I~~~~~~~~~~I...|a.hh.hh.hh.l| ", - " |ooo..A|FF.^|l..I~~~~~~~~~~I...|..dd.dd.dd.l| ", - "|||wwww||||||||||wwww||||||||||+|||||||...I~~~~~~~~~~I..?w#...........w ", - "|^......B|.......####...^lllll...lllll^...I~~~~~~~~~~I..?w#.hh.hh.hh..w ", - "|..M.M...|l...............................I~~~~~~~~~~I..?w#.dd.dd.dd..w ", - "w..DDDDM.|l...................###.........I~~~~~~~~~~I..?w#...........w ", - "w.MD..D..|l...|||||||||||||+||||cc...cc...I~~~~~~~~~~I...|..hh.hh.hh..| ", - "w..D..DM.|l...|SS|T|T|T|a.....^|......c...I~~~~~~~~~~I...|Y.dd.dd.dd..| ", + " w..D..A|..Hc|l..I~~~~~~~~~~I...|a.hh.hh.hh.l# ", + " #ooo..A|FF.^|l..I~~~~~~~~~~I...|..dd.dd.dd.l# ", + "###wwww##########wwww######||||+|||||||...I~~~~~~~~~~I..?w£...........w ", + "#^......B|.......££££...^lllll...lllll^...I~~~~~~~~~~I..?w£.hh.hh.hh..w ", + "#..M.M...|l...............................I~~~~~~~~~~I..?w£.dd.dd.dd..w ", + "w..DDDDM.|l...................£££.........I~~~~~~~~~~I..?w£...........w ", + "w.MD..D..|l...|||||||||||||+||||cc...cc...I~~~~~~~~~~I...|..hh.hh.hh..# ", + "w..D..DM.|l...|SS|T|T|T|a.....^|......c...I~~~~~~~~~~I...|Y.dd.dd.dd..# ", "w.MDDDD..|....|ii|+|+|+|..M.M..|.hddh.....I~~~~~~~~~~I...+............w ", - "|...M.M..y....+iiiiiiii|..DDDM.|.hddh.....|IIIIIIIIII|...+...........xw ", - "|a.......|....|iiiiiiii|.MDDD..|.hddh....................|....dddd...xw ", - "||||||||||l...|ii|+|+|+|...M...|.hddh.c..................|....d.Hd....w ", - "|FFFccFFF|l..<|SS|T|T|T|FF...B.|......c......lllll......^|..B........^| ", - "|........|l...|||||||||||||||||||wwwww|||+++|||||||+++||||||||||||||||| ", - "wFFF..FFF|l..>|SS|T|T|T|^..ll....####Y.........|^......B.......B.oooo.| ", - "w........|l...|ii|+|+|+|o.....................x|#.........H.x.........w ", - "wFFF..FFF|....|iiiiiiii|o..hd.hd.hd.hd.hd.....x|#........dddd........aw ", - "w........y....+iiiiiiii|o..hd.hd.hd.hd.hd.....^|#.....................w ", - "|......H.|a...|ii|+|+|+|o...................d..|#...dd.dd.dd.dd.dd...nw ", - "|FFF.xDDD||++||SS|T|T|T|...hd.hd.hd.hd.hd...dH.|Y...hh.hh.hh.hh.hh...n| ", - "||||||||||^..^||||||||||...hd.hd.hd.hd.hd...d..|.....................n| ", - "|.#######......#######a|o...................d..|....dd.dd.dd.dd.dd...nw ", + "#...M.M..y....+iiiiiiii|..DDDM.|.hddh.....|IIIIIIIIII|...+...........xw ", + "#a.......|....|iiiiiiii|.MDDD..|.hddh....................|....dddd...xw ", + "#|||||||||l...|ii|+|+|+|...M...|.hddh.c..................|....d.Hd....w ", + "#FFFccFFF|l..<|SS|T|T|T|FF...B.|......c......lllll......^|..B........^# ", + "#........|l...|||||||||||||||||||wwwww|||+++|||||||+++||||||||||||||||# ", + "wFFF..FFF|l..>|SS|T|T|T|^..ll....££££Y.........|^......B.......B.oooo.# ", + "w........|l...|ii|+|+|+|o.....................x|£.........H.x.........w ", + "wFFF..FFF|....|iiiiiiii|o..hd.hd.hd.hd.hd.....x|£........dddd........aw ", + "w........y....+iiiiiiii|o..hd.hd.hd.hd.hd.....^|£.....................w ", + "#......H.|a...|ii|+|+|+|o...................d..|£...dd.dd.dd.dd.dd...nw ", + "#FFF.xDDD||++||SS|T|T|T|...hd.hd.hd.hd.hd...dH.|Y...hh.hh.hh.hh.hh...n# ", + "#|||||||||^..^||||||||||...hd.hd.hd.hd.hd...d..|.....................n# ", + "#.£££££££......£££££££a|o...................d..|....dd.dd.dd.dd.dd...nw ", "w......................|o..hd.hd.hd.hd.hd......|l...hh.hh.hh.hh.hh....w ", "wIIIIIIIIIIIIIIIIIIII..|o..hd.hd.hd.hd.hd.....B|l.....................w ", "w~~~~~~~~~~~~~~~~~~~I..|o......................|....dd.dd.dd.dd.dd....w ", - "|~~~~~~~~~~~~~~~~~~~I..|^....nnnn.......a......|^...hh.hh.hh.hh.hh...^| ", - "|~~~~~~~~~~~~~~~~~~~I..||wwww||||wwwww||||wwww|||wwww||||wwww||||wwww|| ", - "|~~~~~~~~~~~~~~~~~~~I..| ", - "|~~~~~~~~~~~~~~~~~~~I..| ", - "|~~~~~~~~~~~~~~~~~~~I..| ", + "#~~~~~~~~~~~~~~~~~~~I..|^....nnnn.......a......|^...hh.hh.hh.hh.hh...^# ", + "#~~~~~~~~~~~~~~~~~~~I..##wwww####wwwww####wwww###wwww####wwww####wwww## ", + "#~~~~~~~~~~~~~~~~~~~I..# ", + "#~~~~~~~~~~~~~~~~~~~I..# ", + "#~~~~~~~~~~~~~~~~~~~I..# ", "w~~~~~~~~~~~~~~~~~~~I..w ", "w~~~~~~~~~~~~~~~~~~~I..w ", "w~~~~~~~~~~~~~~~~~~~I..w ", - "|~~~~~~~~~~~~~~~~~~~I..| ", - "|~~~~~~~~~~~~~~~~~~~I..| ", - "|~~~~~~~~~~~~~~~~~~~I..| ", - "|~~~~~~~~~~~~~~~~~~~I..||| ", - "|~~~~~~~~~~~~~~~~~~~I...^| ", - "w~~~~~~~~~~~~~~~~~~~I.#.#w ", - "w~~~~~~~~~~~~~~~~~~~I.#.#w ", - "w~~~~~~~~~~~~~~~~~~~I.#.#w ", - "|~~~~~~~~~~~~~~~~~~~I.#.#| ", - "|~~~~~~~~~~~~~~~~~~~I...#| ", - "|~~~~~~~~~~~~~~~~~~~I.#.#| ", - "w~~~~~~~~~~~~~~~~~~~I.#.#w ", - "w~~~~~~~~~~~~~~~~~~~I.#.#w ", - "w~~~~~~~~~~~~~~~~~~~I.#.#w ", - "|~~~~~~~~~~~~~~~~~~~I...^| ", - "||wwww|||||wwww|||||wwww|| " + "#~~~~~~~~~~~~~~~~~~~I..# ", + "#~~~~~~~~~~~~~~~~~~~I..# ", + "#~~~~~~~~~~~~~~~~~~~I..# ", + "#~~~~~~~~~~~~~~~~~~~I..### ", + "#~~~~~~~~~~~~~~~~~~~I...^# ", + "w~~~~~~~~~~~~~~~~~~~I.£.£w ", + "w~~~~~~~~~~~~~~~~~~~I.£.£w ", + "w~~~~~~~~~~~~~~~~~~~I.£.£w ", + "#~~~~~~~~~~~~~~~~~~~I.£.£# ", + "#~~~~~~~~~~~~~~~~~~~I...£# ", + "#~~~~~~~~~~~~~~~~~~~I.£.£# ", + "w~~~~~~~~~~~~~~~~~~~I.£.£w ", + "w~~~~~~~~~~~~~~~~~~~I.£.£w ", + "w~~~~~~~~~~~~~~~~~~~I.£.£w ", + "#~~~~~~~~~~~~~~~~~~~I...^# ", + "##wwww#####wwww#####wwww## " ], "palettes": [ "school_palette" ], "place_items": [ ], @@ -224,7 +224,7 @@ " |dH..oo...Hn.......o|......dh.dh.dh.dh.dh..w ", " ||x...oo...Hn..oooo.o|......dh.dh.dh.dh.dh..w ", " |oooo...............o|......................w ", - " w.......oooo|.M.....^|xx.....Y####.........^| ", + " w.......oooo|.M.....^|xx.....Y££££.........^| ", " wM..........|||+++|||||||+++||||||||||||||||| ", " |oooo...oooo|a........<.......^|..ooo..ooo.^| ", " |oooo...oooo|l.................|............w ", @@ -233,19 +233,19 @@ " w.HnnH.HnnH.|l..I~~~~~~~~~~I...+..hhh..hhh..w ", " w...........|l..I~~~~~~~~~~I...|..ddd..ddd..| ", " |oooo..aoooo|l..I~~~~~~~~~~I...|..ddd..ddd..| ", - "|||wwww||||||||||wwww||||||||||w+w|||||...I~~~~~~~~~~I...w#.hhh..hhh.cw ", - "|MMM..hhh|.lllll.........a|llll...llll|...I~~~~~~~~~~I...w#..........cw ", - "|MM.HHh.h|................................I~~~~~~~~~~I...w#.hhh..hhh.cw ", - "w.M..H.h?|......^####.....................I~~~~~~~~~~I...w#.ddd..ddd.cw ", - "wx.M..h#?|....|||||||||||||||||w+w|||||...I~~~~~~~~~~I...|..ddd..ddd..| ", - "w.B....#?|....|SS|T|T|T|DD|xxxx..^|x!!|?..I~~~~~~~~~~I...|..hhh..hhh..| ", - "wB..nn.#?|....|ii|+|+|+|D..hhhh...y...|?..I~~~~~~~~~~I...+............w ", + "|||wwww||||||||||wwww||||||||||w+w|||||...I~~~~~~~~~~I...w£.hhh..hhh.cw ", + "|MMM..hhh|.lllll.........a|llll...llll|...I~~~~~~~~~~I...w£..........cw ", + "|MM.HHh.h|................................I~~~~~~~~~~I...w£.hhh..hhh.cw ", + "w.M..H.h?|......^££££.....................I~~~~~~~~~~I...w£.ddd..ddd.cw ", + "wx.M..h£?|....|||||||||||||||||w+w|||||...I~~~~~~~~~~I...|..ddd..ddd..| ", + "w.B....£?|....|SS|T|T|T|DD|xxxx..^|x!!|?..I~~~~~~~~~~I...|..hhh..hhh..| ", + "wB..nn.£?|....|ii|+|+|+|D..hhhh...y...|?..I~~~~~~~~~~I...+............w ", "|B..nn...y....+iiiiiiii|xH........|||||?..|IIIIIIIIII|...+...........xw ", - "|nnn.####|....|iiiiiiii|B.........|CCS|.................c|Y...dddd...xw ", + "|nnn.££££|....|iiiiiiii|B.........|CCS|.................c|Y...dddd...xw ", "||||||||||..|||ii|+|+|+|.hhhhhhhhh|iiiy.................c|.....H.d....w ", "|jjjjjjjj|..y>|SS|T|T|T|.xxxxxxxxx|ggg|^.....lllll......c|^........B..| ", "|']]j'[['|..|||||||||||||||||||||||||||||+++|||||||+++||||||||||||||||| ", - "w']]''[['|...<|SS|T|T|T|...ll.................^|.......Y####........ii| ", + "w']]''[['|...<|SS|T|T|T|...ll.................^|.......Y££££........ii| ", "w''''''''|....|ii|+|+|+|.......................|x...................iSw ", "wR'''''ff|....|iiiiiiii|...hd.hd.hd.hd.hd.....B|x.....dh.dh.dh.dh...iSw ", "wR''0''G'y....+iiiiiiii|...hd.hd.hd.hd.hd......|......dh.dh.dh.dh...iSw ", @@ -256,7 +256,7 @@ "-zfuuuuuuuuuuuuuuuuuuuuw...hd.hd.hd.hd.hd......|......dh.dh.dh.+iiiiikw ", "-zfuuuuuuuuuuuuuuuuuuuuw...hd.hd.hd.hd.hd.....x|.B....dh.dh.dh.|kiCCikw ", "-zfuuuuuuuuuuuuuuuuuuuuw......................x|......dh.dh.dh.|kiCCikw ", - "-zfuZZZZuuZZZZuuZZZZuuu|^........####Y..a......|^nnnn..........|kiiiik| ", + "-zfuZZZZuuZZZZuuZZZZuuu|^........££££Y..a......|^nnnn..........|kiiiik| ", "-zfuZZZZuuZZZZuuZZZZuff||wwww||||wwwww||||wwww|||wwww||||wwww||||wwww|| ", "-zfuZZZZuuZZZZuuZZZZufz- ", "-zfuuuuuuuuuuuuuuuuuufz- ", @@ -432,6 +432,7 @@ { "type": "palette", "id": "school_palette", + "palettes": [ "parametrized_walls_palette" ], "terrain": { " ": "t_open_air", "~": "t_open_air_rooved", @@ -463,7 +464,6 @@ "w": "t_window", "≠": "t_wall_glass", "P": "t_curtains", - "|": "t_wall_y", ",": "t_floor_waxed", ":": "t_floor_waxed_y", "7": "t_backboard_in", @@ -488,7 +488,7 @@ "x": "f_console_broken", "%": "f_curtain", "@": "f_bed", - "#": "f_bench", + "£": "f_bench", "b": "f_bench", "?": "f_sofa", "S": "f_sink", From 3ce8a5bb56680294857f434893e1c901f6a6e880 Mon Sep 17 00:00:00 2001 From: Milopetilo <78963720+Milopetilo@users.noreply.github.com> Date: Mon, 18 Nov 2024 16:35:14 +0100 Subject: [PATCH 2/2] Make game load --- data/json/mapgen/s_candy.json | 10 +++++----- data/json/mapgen/s_electronics.json | 1 + data/json/mapgen/s_grocery.json | 2 +- data/json/mapgen/salon.json | 1 + 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/data/json/mapgen/s_candy.json b/data/json/mapgen/s_candy.json index c5113e11e5dd7..f0806a325fccc 100644 --- a/data/json/mapgen/s_candy.json +++ b/data/json/mapgen/s_candy.json @@ -175,11 +175,11 @@ ".......u#^_________AA_#.", ".......u-_____________#.", "...d...u-__{__{_______#.", - "..dtd..u-__{__{___{w_w#.", - "...d...u-__{__{___{w__#.", - ".......u-__{__{___{wwa#.", - ".......u#__{__{___AwT #.", - "...d...u#__{__{___AwS #.", + "..dtd..u-__{__{___{|_|#.", + "...d...u-__{__{___{|__#.", + ".......u-__{__{___{||a#.", + ".......u#__{__{___A|T #.", + "...d...u#__{__{___A|S #.", "..dtd..u#__{__{__######.", "...d...u#________appcc5.", ".......u#^______&#ppppp.", diff --git a/data/json/mapgen/s_electronics.json b/data/json/mapgen/s_electronics.json index 64e5e8eb1e3e6..ffbcdea0fc218 100644 --- a/data/json/mapgen/s_electronics.json +++ b/data/json/mapgen/s_electronics.json @@ -33,6 +33,7 @@ " #######ssssssssss ", " " ], + "palettes": [ "parametrized_walls_palette" ], "terrain": { "%": "t_region_shrub_decorative", "+": "t_door_metal_pickable", diff --git a/data/json/mapgen/s_grocery.json b/data/json/mapgen/s_grocery.json index 80894c81035c9..8db92bf2b5a11 100644 --- a/data/json/mapgen/s_grocery.json +++ b/data/json/mapgen/s_grocery.json @@ -147,7 +147,7 @@ "####|+|| #_", "ss4#**C|[[[[|[[[[|[[[[#_", "sss#**C|]]]]]]]]]]]]]]#_", - "sssL***+**************#_", + "sss#***+**************#_", "sss####################_" ], "fill_ter": "t_linoleum_white", diff --git a/data/json/mapgen/salon.json b/data/json/mapgen/salon.json index 6294c7bbf4bd7..1b34a5b677cb8 100644 --- a/data/json/mapgen/salon.json +++ b/data/json/mapgen/salon.json @@ -31,6 +31,7 @@ " %sss%%%%%%%%%%%%%%%% ", " ! sss ! ! " ], + "palettes": [ "parametrized_walls_palette" ], "terrain": { "!": "t_region_tree_shade", "%": "t_region_shrub_decorative",