From 8bcc14c41254b64775b1be01866ec0c860acadd0 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Tue, 26 Sep 2023 00:35:59 -0500 Subject: [PATCH 1/4] Add street lights to more places, allow deconstructing --- .../furniture-terrains.json | 10 ++++ .../json/mapgen/abandoned_shopping_plaza.json | 8 ++- data/json/mapgen/abstorefront.json | 10 ++-- data/json/mapgen/bank.json | 9 ++- data/json/mapgen/bus_station.json | 4 +- data/json/mapgen/cs_public_space.json | 5 +- .../mapgen/homeimprovement_superstore.json | 8 ++- .../homeimprovement_superstore_new.json | 4 +- data/json/mapgen/hospital.json | 18 +++--- data/json/mapgen/mall/mall_ground.json | 60 +++++++++---------- data/json/mapgen/megastore.json | 4 +- data/json/mapgen/motel.json | 32 ++++++---- data/json/mapgen/stadium_football.json | 36 ++++++++--- data/json/mapgen/town_hall.json | 6 +- data/json/mapgen/zoo.json | 12 ++-- data/json/mapgen_palettes/hospital.json | 3 + data/json/mapgen_palettes/mall_palette.json | 2 + 17 files changed, 151 insertions(+), 80 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index e6baf079c8a3..5e02fddcae80 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -723,6 +723,16 @@ "coverage": 40, "required_str": 32, "flags": [ "BASHABLE" ], + "deconstruct": { + "items": [ + { "item": "pipe", "count": 8 }, + { "item": "sheet_metal", "count": 2 }, + { "item": "amplifier", "count": 4 }, + { "item": "light_bulb", "count": 4 }, + { "item": "cable", "charges": 4 }, + { "item": "plastic_chunk", "count": 4 } + ] + }, "bash": { "str_min": 30, "str_max": 100, diff --git a/data/json/mapgen/abandoned_shopping_plaza.json b/data/json/mapgen/abandoned_shopping_plaza.json index 194ac89737a3..52241dfd5e27 100644 --- a/data/json/mapgen/abandoned_shopping_plaza.json +++ b/data/json/mapgen/abandoned_shopping_plaza.json @@ -4,6 +4,7 @@ "id": "shoppingplaza", "terrain": { " ": "t_floor", + "'": "t_sidewalk", "+": "t_door_locked", ",": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], "-": "t_wall_h", @@ -30,6 +31,7 @@ "|": "t_wall_v" }, "furniture": { + "'": "f_street_light", "A": "f_rack", "B": "f_toilet", "C": "f_counter", @@ -70,7 +72,7 @@ "7...y...y...y...y...y...y...y...y...y...y...y...y...y...y...y...y...y...", "7yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy", "455555555555555555555555555555555555555555555555555555555555555555555555", - "455555555555555555555555555555555555555555555555555555555555555555555555", + "455555555555555555555555'55555555555555555555555'55555555555555555555555", "|-111111---++---111111-||-111111--5555--111111-||-111111---++---111111-|", "| 1 1 || |-++-| || 1 1 |", "| 1 1 || || 1 1 |", @@ -131,12 +133,12 @@ "..........................................yyyyyy551 |", "y...y...y...y...y...y...y...y...y..............y551 |", "y...y...y...y...y...y...y...y...y..............y551 |", - "y...y...y...y...y...y...y...y...y..........55555551 |", + "y...y...y...y...y...y...y...y...y..........'5555551 |", "y...y...y...y...y...y...y...y...y..........55555551 |", "y...y...y...y...y...y...y...y...y..............y55| |", "yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy55|---------------------", "55555555555555555555555555555555555555555555555555+ A|", - "55555555555555555555555555555555555555555555555555+ A A A A A|", + "'55555555555555555555555'5555555555555555555555555+ A A A A A|", "|-111111---++---111111-||-111111--5555--111111-|--| A A A A A|", "| 1 1 || |-++-| |A A A A A A|", "| 1 1 || |A FHF A A A A A|", diff --git a/data/json/mapgen/abstorefront.json b/data/json/mapgen/abstorefront.json index f867b7cd1441..f7c7429509fe 100644 --- a/data/json/mapgen/abstorefront.json +++ b/data/json/mapgen/abstorefront.json @@ -6,7 +6,7 @@ "object": { "fill_ter": "t_floor", "rows": [ - " ", + " '", " |-xxxxxxxxDDxxxxxxxx-| ", " |...................B| ", " |B..c........B..B...B| ", @@ -54,6 +54,7 @@ "t_dirt" ], " ": "t_sidewalk", + "'": "t_sidewalk", "+": "t_door_c", "-": "t_wall_w", ".": "t_floor", @@ -63,7 +64,7 @@ "<": "t_stairs_up", "|": "t_wall_w" }, - "furniture": { "B": "f_rack", "c": "f_counter" }, + "furniture": { "B": "f_rack", "c": "f_counter", "'": "f_street_light" }, "items": { ".": { "item": "trash", "chance": 12 } }, "vehicles": { ".": { "vehicle": "shopping_cart", "chance": 1, "status": 1 } } } @@ -135,7 +136,7 @@ "fill_ter": "t_floor", "rows": [ "_______ ", - "_______ ", + "_______' ", "___~~~~O |-xx--xx-| ", "_______O b|B......B| ", "_______O b|B..BB..B| ", @@ -182,6 +183,7 @@ "t_dirt" ], " ": "t_sidewalk", + "'": "t_sidewalk", "_": "t_pavement", "~": "t_pavement_y", "+": "t_door_c", @@ -196,7 +198,7 @@ "<": "t_ladder_up", "|": "t_wall_w" }, - "furniture": { "B": "f_rack", "R": "f_dumpster", "l": "f_locker", "b": "f_bench", "c": "f_counter" }, + "furniture": { "B": "f_rack", "R": "f_dumpster", "l": "f_locker", "b": "f_bench", "c": "f_counter", "'": "f_street_light" }, "items": { ".": { "item": "trash", "chance": 15 } }, "vehicles": { ".": { "vehicle": "shopping_cart", "chance": 1, "status": 1 } } } diff --git a/data/json/mapgen/bank.json b/data/json/mapgen/bank.json index b3a08c3fc6f1..128f3b1ca8d8 100644 --- a/data/json/mapgen/bank.json +++ b/data/json/mapgen/bank.json @@ -7,7 +7,7 @@ "object": { "fill_ter": "t_floor", "rows": [ - " S SIS ", + " S'S S SIS ", " #gggggggGgggggggggggg# ", " #A..........CTC.CTC.p# ", " #A...................w ", @@ -34,6 +34,7 @@ ], "terrain": { " ": [ "t_grass", "t_grass", "t_grass", "t_dirt", "t_shrub" ], + "'": "t_sidewalk", "#": "t_wall_w", "$": "t_metal_floor", "%": [ "t_door_c", "t_door_c", "t_door_locked_interior" ], @@ -54,7 +55,7 @@ "w": "t_window_alarm" }, "furniture": { - "$": "f_safe_l", + "'": "f_street_light", "C": "f_chair", "T": "f_table", "c": "f_counter", @@ -144,7 +145,7 @@ "object": { "fill_ter": "t_floor", "rows": [ - " SS SSS", + " SS S'S SSS", " ggGGgggggggggg#######iS", " gA.........ccx.#....##S", " gA........C-C..+....p# ", @@ -171,6 +172,7 @@ ], "terrain": { " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ], + "'": "t_sidewalk", "_": "t_metal_floor", "|": [ "t_door_c", "t_wall_w", "t_wall_w", "t_wall_w", "t_wall_w", "t_wall_w", "t_wall_w", "t_wall_w", "t_wall_w" ], "I": "t_wall_w", @@ -197,6 +199,7 @@ "w": "t_window_alarm" }, "furniture": { + "'": "f_street_light", "a": "f_armchair", "D": "f_sofa", "o": "f_bookcase", diff --git a/data/json/mapgen/bus_station.json b/data/json/mapgen/bus_station.json index 50d86028f638..4e9b49f793b1 100644 --- a/data/json/mapgen/bus_station.json +++ b/data/json/mapgen/bus_station.json @@ -7,7 +7,7 @@ "object": { "fill_ter": "t_floor", "rows": [ - "...........ss________sssssssssssssssPyyyyy___sss", + "...........!s________sssssssssssssssPyyyyy___s!s", "....,,,....ss________s,;,,,;,,;,,,;,syyyyy___s,s", "||||www||||ss________ssssssssssssssss________s;s", "|p p|ss________________________________s,s", @@ -34,6 +34,7 @@ ], "terrain": { " ": "t_floor", + "!": "t_concrete", "+": "t_door_c", ".": [ [ "t_dirt", 5 ], [ "t_grass", 16 ], [ "t_grass_long", 5 ] ], ",": [ @@ -70,6 +71,7 @@ "f": "t_chainfence" }, "furniture": { + "!": "f_street_light", "c": "f_counter", "S": "f_sink", "B": "f_bench", diff --git a/data/json/mapgen/cs_public_space.json b/data/json/mapgen/cs_public_space.json index a4109b8b7bcd..dfbd3edb3e8e 100644 --- a/data/json/mapgen/cs_public_space.json +++ b/data/json/mapgen/cs_public_space.json @@ -7,7 +7,7 @@ "object": { "rows": [ "...,....'''''''',...,,..", - "..,...,.'I''''I',..,...,", + "..,...,!'I''''I'!..,...,", "..,...,.''''''''.....,..", "...,fsfsfs,'',sfsfsf,.,.", ".,.f,,,,,,,'',,,,,,,f...", @@ -34,6 +34,7 @@ "terrain": { ".": "t_grass", ",": "t_dirt", + "!": "t_sidewalk", "'": "t_sidewalk", "w": "t_water_sh", "s": "t_underbrush", @@ -44,7 +45,7 @@ "N": "t_sidewalk", "f": "t_dirtmound" }, - "furniture": { "S": "f_statue", "b": "f_bench", "D": "f_dumpster", "N": "f_bulletin", "f": "f_bluebell" }, + "furniture": { "!": "f_street_light", "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 } }, "place_loot": [ { "item": "american_flag", "x": 10, "y": 1, "chance": 25 } ] } diff --git a/data/json/mapgen/homeimprovement_superstore.json b/data/json/mapgen/homeimprovement_superstore.json index 8db8b3f69ab1..29324da56e6e 100644 --- a/data/json/mapgen/homeimprovement_superstore.json +++ b/data/json/mapgen/homeimprovement_superstore.json @@ -44,10 +44,11 @@ "________________________", "________________________", "..........|_____________", - "..........|_____________", + "..........|!____________", "-----------_____________" ], "terrain": { + "!": "t_pavement", "$": "t_floor", "&": "t_floor", "+": "t_door_glass_c", @@ -66,6 +67,7 @@ "|": "t_wall" }, "furniture": { + "!": "f_street_light", "$": "f_vending_c", "C": "f_chair", "T": "f_table", @@ -113,11 +115,12 @@ "________________________", "________________________", "___________|............", - "___________|............", + "__________!|............", "___________-------------" ], "terrain": { "$": "t_floor", + "!": "t_pavement", "&": "t_floor", "+": "t_door_glass_c", ",": "t_pavement_y", @@ -138,6 +141,7 @@ "|": "t_wall" }, "furniture": { + "!": "f_street_light", "$": "f_vending_c", "&": "f_trashcan", "C": "f_chair", diff --git a/data/json/mapgen/homeimprovement_superstore_new.json b/data/json/mapgen/homeimprovement_superstore_new.json index 9d43fc0088a3..0f39624c9432 100644 --- a/data/json/mapgen/homeimprovement_superstore_new.json +++ b/data/json/mapgen/homeimprovement_superstore_new.json @@ -84,7 +84,7 @@ "&S_______SS____,____,____,____,____,____,____SBS", " S_______SS____,____,____,____,____,____,____S S", " S_______SS__________________________________S/S", - "&S_______SS__________________________________SSS", + "&S_______[S__________________________________S[S", "/S_______SS__________________________________SSS", "************************************************", "*zzzzz***********??????????????????????????????*", @@ -270,6 +270,7 @@ "|": "t_wall", "O": "t_flat_roof", "S": "t_sidewalk", + "[": "t_sidewalk", "?": "t_railing", "*": "t_open_air", "z": "t_flat_roof", @@ -278,6 +279,7 @@ "Z": "t_glass_roof" }, "furniture": { + "[": "f_street_light", "V": "f_vending_c", "C": "f_chair", "T": "f_table", diff --git a/data/json/mapgen/hospital.json b/data/json/mapgen/hospital.json index f706ed72ff28..d074b3465a09 100644 --- a/data/json/mapgen/hospital.json +++ b/data/json/mapgen/hospital.json @@ -11,15 +11,15 @@ "object": { "fill_ter": "t_dirt", "rows": [ - "_______________________________________________________########;########", - "_______________________________________________________#...cT#...#Tc...#", - "_:____:____:____:_________:____:____:____:____:____:___#BB...+...+...BB#", - "_:____:____:____:_________:____:____:____:____:____:___#BB...+...+...BB#", - "_:____:____:____:_________:____:____:____:____:____:___#....l#...#l....#", - "_:____:____:____:_________:____:____:____:____:____:___#######...#######", - "_:____:____:____:_________:____:____:____:____:____:___#....l#...#l....#", - "_:____:____:____:_________:____:____:____:____:____:___#BB...+...+...BB#", - "_______________________________________________________#BB...+...+...BB#", + "______________________________________________________,########;########", + "______________________________________________________'#...cT#...#Tc...#", + "_:____:____:____:_________:____:____:____:____:____:__,#BB...+...+...BB#", + "_:____:____:____:_________:____:____:____:____:____:__,#BB...+...+...BB#", + "_:____:____:____:_________:____:____:____:____:____:__,#....l#...#l....#", + "_:____:____:____:_________:____:____:____:____:____:__,#######...#######", + "_:____:____:____:_________:____:____:____:____:____:__,#....l#...#l....#", + "_:____:____:____:_________:____:____:____:____:____:__,#BB...+...+...BB#", + ",',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#BB...+...+...BB#", "####################//####xxxxxxxxxxxxxxxxxxxxxxxxxx#;;#...cT#...#Tc...#", "#&#&#&#&#&#sssss#.........TbbbbTbbbbTbbbbTbbbbTbbbbT#``#######...#######", "#.#.#.#.#.#.....#..................................b#``#...cT#...#Tc...#", diff --git a/data/json/mapgen/mall/mall_ground.json b/data/json/mapgen/mall/mall_ground.json index 211718090dcc..46790154b544 100644 --- a/data/json/mapgen/mall/mall_ground.json +++ b/data/json/mapgen/mall/mall_ground.json @@ -239,7 +239,7 @@ "__,,___,________________", "_,,_____________________", "_,,_____________________", - "_,,_____ssssssssss______", + "_,,_____sssssssss'______", "_,,____sss______________", "_,,____ss_______________", "_,,____ss_______________", @@ -280,7 +280,7 @@ "________________________", "________________________", "________________________", - "____sssssssssssssssssss_", + "____'sssssssssssssssss'_", "___________ssss_________", "____________ss__________", "____________ss__________", @@ -323,7 +323,7 @@ "________________________", "________________________", "________________________", - "_________sssssssssssssss", + "_________'ssssssssssssss", "________________ssss____", "_________________ss_____", "_________________ss_____", @@ -366,7 +366,7 @@ "______________s.....#T#.", "______________s.....###.", "______________ss........", - "ssss___________ssssssss.", + "sss'___________ssssssss.", "_____________________ss.", "______________________s.", "______________________s.", @@ -639,7 +639,7 @@ "_______ss____________,,,", "_______ss_____________,,", "_______sss______________", - "________ssssssssss______", + "________sssssssss'______", "_________sssssssss__,,,,", "________________________", "________________________", @@ -681,7 +681,7 @@ ",___________ss__________", "____________ss__________", "___________ssss_________", - "____sssssssssssssssssss_", + "____'sssssssssssssssss'_", ",,__sssssssssssssssssss_", "________________________", "________________________", @@ -725,7 +725,7 @@ "__,,,,___________ss_____", "___,,____________ss_____", "________________ssss____", - "_________sssssssssssssss", + "_________'ssssssssssssss", "_,,,,,,__sssssssssssssss", "________________________", "________________________", @@ -769,7 +769,7 @@ "_______,,,,___________s.", "________,,____________s.", "_____________________ss.", - "ssss___________sssssss..", + "sss'___________sssssss..", "ssss__,,,,,,__ss........", "______________s..#####..", "______________s.##...##.", @@ -1165,7 +1165,7 @@ "..####...###.....sss..T.", "----------|#..###.sss...", " r|#..#T#.ssssss", - " c r|...###ssss___", + " c r|...###sss'___", " c6ccc6c|-|-|sssssss____", " [ [sspssss____", " [ [sssssss____", @@ -1317,7 +1317,7 @@ ".aAAssAAAasssUUss|e cc", "....ss...asssssss|r rc ", "ssssss...|-|HHH|-|--+--|", - "___sss..#| |ccc: |t S|", + "___'ss..#| |ccc: |t S|", "____ss.##| |---| |-----|", "____ss..#| ", "____ss...| |--:--|---", @@ -2249,7 +2249,7 @@ "____ss...Vc| | + rr ", "____ss...Vc| |-| rr rr ", "____ss...|:| | rr ", - "___sss.|-| | | ", + "___'ss.|-| | | ", "ssssss.|< -::-|--|cccc|", "...sss.|-|2222yV22|HHHH|", "###.sssssZ21112Z22222222", @@ -2260,7 +2260,7 @@ "###.sssssZ21112Z21111111", "...sss.|-|2222yV22222222", "ssssss.|< -::-|HHH|-HHH", - "___sss.|-| | :ccc|r hn", + "___'ss.|-| | :ccc|r hn", "____ss...|:| |---|r ", "____ss...Vc| |rrrrr r", "____ss...Vc| ||r ", @@ -2581,7 +2581,7 @@ " c|##.....ss____", " h c|##.....ss____", " S|##.###.ss____", - "nhhn P|-|.#T#.sss___", + "nhhn P|-|.#T#.ss'___", "-HHH-HHH|-|.|.###sssssss", "22222222|y|||..psss.....", "11111112Z22Zssssss.#####", @@ -2592,7 +2592,7 @@ "11111112Z22Zssssss.#####", "22222222|y|||..psss.....", "-HHH-HHH|-|.|.###sssssss", - " B|-|.#T#.sss___", + " B|-|.#T#.ss'___", "BBBBBBB B|...###.ss____", "BBBBBBB B|.......ss____", " B|.......ss____", @@ -3251,11 +3251,11 @@ "____ss.##|---------|----", "____ss..###..###....###.", "____ss...#....#......#..", - "___ssss.................", + "___'sss.................", "ssssssssssssssssssssssss", "..ssssssssssssssssssssss", - "..ssssssssssssssssssssss", - ".ss_____,______,______,_", + ".sssssssssssssssssssssss", + ".s'_____,______,______,_", ".s______,______,______,_", ".s______,______,______,_", "#s______,______,______,_" @@ -3315,8 +3315,8 @@ "........................", "ssssssssssssssssssssssss", "ssssssssssssssssssssssss", - "ssssssssssss.....sssssss", - "_____,_____ss...ss_____,", + "sssssssssssss...ssssssss", + "_____,_____'s...s'_____,", "_____,______s.#.s______,", "_____,______s###s______,", "_____,______s#T#s______," @@ -3377,8 +3377,8 @@ "....................|---", "ssssssssssssssssssssssss", "ssssssssssssssssssssssss", - "ssssssssssssssssssss....", - "______,______,_____ss.#.", + "sssssssssssssssssssss...", + "______,______,_____'s.#.", "______,______,______s.#.", "______,______,______s.#.", "______,______,______s.#." @@ -3433,8 +3433,8 @@ "|sspsssssssssssssssspss|", "ssssssssssssssssssssssss", "ssssssspsspsspsspsssssss", - ".sssssssssssssssssssss..", - "ss____________________ss", + "ssssssssssssssssssssssss", + "s'____________________'s", "s______________________s", "s______________________s", "s______________________s" @@ -3473,8 +3473,8 @@ "---|....................", "ssssssssssssssssssssssss", "ssssssssssssssssssssssss", - "....ssssssssssssssssssss", - ".#.ss_____,______,______", + "...sssssssssssssssssssss", + ".#.s'_____,______,______", ".#.s______,______,______", ".#.s______,______,______", ".#.s______,______,______" @@ -3533,8 +3533,8 @@ "........................", "ssssssssssssssssssssssss", "ssssssssssssssssssssssss", - "sssssss.....ssssssssssss", - ",_____ss...ss_____,_____", + "ssssssss...sssssssssssss", + ",_____'s...s'_____,_____", ",______s.#.s______,_____", ",______s###s______,_____", ",______s#T#s______,_____" @@ -3589,11 +3589,11 @@ "HHHH-HHHH-|...###.ss____", "#..###........#T#.ss____", "....#.........###.ss____", - ".................ssss___", + ".................sss'___", "ssssssssssssssssssssssss", "ssssssssssssssssssssss..", - "ssssssssssssssssssssss..", - "_,______,______,_____ss.", + "sssssssssssssssssssssss.", + "_,______,______,_____'s.", "_,______,______,______s.", "_,______,______,______s.", "_,______,______,______s#" diff --git a/data/json/mapgen/megastore.json b/data/json/mapgen/megastore.json index d147f8e6fe7c..ffaf4eae1a9d 100644 --- a/data/json/mapgen/megastore.json +++ b/data/json/mapgen/megastore.json @@ -3,6 +3,7 @@ "type": "palette", "id": "megastore", "terrain": { + "'": "t_dirt", "#": "t_open_air", "*": "t_open_air_rooved", "~": "t_flat_roof", @@ -27,6 +28,7 @@ "Y": "t_switchgear_s" }, "furniture": { + "'": "f_street_light", "a": "f_armchair", "A": "f_sofa", "b": "f_bookcase", @@ -177,7 +179,7 @@ "object": { "fill_ter": "t_pavement", "rows": [ - "#W....................WT", + "'W....................WT", "W......................W", "........................", "______............______", diff --git a/data/json/mapgen/motel.json b/data/json/mapgen/motel.json index 109cf2c500d1..8b474fc248c9 100644 --- a/data/json/mapgen/motel.json +++ b/data/json/mapgen/motel.json @@ -35,7 +35,7 @@ "-MM-gg------#._________#", ".SS##########._________#", ".SS..........._________#", - "SSSSSSSSSSSSSS_________#", + "SSSSSSSSSSSS!S_________#", "SSSSSSSSSSSSSS_________#", "_______________________#", "_______________________#", @@ -49,6 +49,7 @@ "set": [ { "point": "terrain", "id": "t_dirt", "x": 23, "y": [ 0, 23 ], "repeat": [ 5, 10 ] } ], "terrain": { " ": "t_floor", + "!": "t_sidewalk", "#": "t_shrub", "'": "t_pavement_y", "+": "t_door_c", @@ -86,6 +87,7 @@ "~": "t_fence_h" }, "furniture": { + "!": "f_street_light", "6": "f_table", "7": "f_bookcase", "8": "f_bathtub", @@ -388,7 +390,7 @@ "_______________________#", "_______________________#", "_______________________#", - "SSSSSSSSSSSSSSSSSSSSSSS#", + "SSSSSSSSSSSSSSSSSSSSS!S#", "SSSSSSSSSSSSSSSSSSSSSSS#", "-22+---22+---223--223---", " C| C| C| C|", @@ -406,6 +408,7 @@ "set": [ { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": 23, "repeat": [ 5, 10 ] } ], "terrain": { " ": "t_floor", + "!": "t_sidewalk", "#": "t_shrub", "'": "t_pavement_y", "+": "t_door_c", @@ -445,6 +448,7 @@ "~": "t_fence_h" }, "furniture": { + "!": "f_street_light", "6": "f_table", "7": "f_bookcase", "8": "f_bathtub", @@ -731,7 +735,7 @@ "-MM-gg------#._________#", ".SS##########._________#", ".SS..........._________#", - "SSSSSSSSSSSSSS_________#", + "SSSSSSSSSSSS!S_________#", "SSSSSSSSSSSSSS_________#", "_______________________#", "_______________________#", @@ -744,6 +748,7 @@ ], "terrain": { ".": "t_grass", + "!": "t_sidewalk", "-": "t_wall", "_": "t_pavement", "'": "t_pavement_y", @@ -781,6 +786,7 @@ "x": "t_fencegate_c" }, "furniture": { + "!": "f_street_light", "6": "f_table", "7": "f_bookcase", "8": "f_bathtub", @@ -1070,11 +1076,11 @@ "_______________________#", "_______________________#", "_______________________#", - "_______________________#", - "_______________________#", - "_______________________#", - "SSSSSSSSSSSSSSSSSSSSSSS#", - "SSSSSSSSSSSSSSSSSSSSSS<#", + "______________________SS", + "______________________!S", + "______________________SS", + "SSSSSSSSSSSSSSSSSSSSSSSS", + "SSSSSSSSSSSSSSSSSSSSSSt|_))))))),,,,,,,))))))))))))),,,,,,,_wtbbt|", "|.c>.+_),C,a,,,,,,,,,,``,,,),,,,,,,,,,,,,_+....|", @@ -1600,6 +1608,7 @@ ], "terrain": { "*": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ], + "!": "t_sidewalk", ".": "t_floor", "%": "t_floor", "&": "t_floor", @@ -1634,6 +1643,7 @@ "Q": "t_pavement" }, "furniture": { + "!": "f_street_light", "d": "f_dumpster", "b": "f_bed", "c": "f_chair", @@ -1680,7 +1690,7 @@ "object": { "rows": [ "______________,,,,,,,_____________,,,,,,,_______", - "______________,,,,,,,_____________,,,,,,,_______", + "____________!_,,,,,,,_____________,,,,,,,_!_____", "|----|________,,,,,,,_____________,,,,,,,_|----|", "|T.>t|_))))))),,,,,,,))))))))))))),,,,,,,_wtbbt|", "|.c>.+_),,,,,,,,,,,,,,,,,,,),,,,,,,,,,,,,_+....|", @@ -1706,6 +1716,7 @@ ], "terrain": { "*": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ], + "!": "t_sidewalk", ".": "t_floor", "%": "t_floor", "&": "t_floor", @@ -1730,6 +1741,7 @@ ")": "t_pavement_y" }, "furniture": { + "!": "f_street_light", "b": "f_bed", "c": "f_chair", "t": "f_table", diff --git a/data/json/mapgen/stadium_football.json b/data/json/mapgen/stadium_football.json index ac24e27fe677..972d0df435a0 100644 --- a/data/json/mapgen/stadium_football.json +++ b/data/json/mapgen/stadium_football.json @@ -39,6 +39,7 @@ "method": "json", "object": { "furniture": { + "!": "f_street_light", "#": "f_bench", "&": "f_sink", "+": "f_null", @@ -79,7 +80,7 @@ ], "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 4, 20 ], "y": [ 4, 20 ], "repeat": [ 4, 10 ] } ], "rows": [ - "ssssssssssssssssssssssss", + "!sssssssssssssssssssssss", "__________----__________", "_________------_________", "_-----------------------", @@ -105,6 +106,7 @@ "-.....|...|#c#c#crcgg___" ], "terrain": { + "!": "t_sidewalk", "#": "t_concrete", "&": "t_thconc_floor", "+": "t_door_metal_c", @@ -430,7 +432,7 @@ { "method": "json", "object": { - "furniture": { "#": "f_bench", "&": "f_trashcan", ".": "f_null", "_": "f_null", "g": "f_null", "p": "f_null" }, + "furniture": { "!": "f_street_light", "#": "f_bench", "&": "f_trashcan", ".": "f_null", "_": "f_null", "g": "f_null", "p": "f_null" }, "place_items": [ { "chance": 65, "item": "trash", "x": 17, "y": 20 } ], "rows": [ "gggg.....gggg.....gggggg", @@ -449,7 +451,7 @@ ".....p.....p............", ".....p.....p............", ".....p.....p............", - "................________", + "................!_______", "................________", "................_#______", "................_#______", @@ -458,7 +460,15 @@ ".....p....p.....________", "._______________________" ], - "terrain": { "#": "t_sidewalk", "&": "t_sidewalk", ".": "t_pavement", "_": "t_sidewalk", "g": "t_grass", "p": "t_pavement_y" } + "terrain": { + "!": "t_sidewalk", + "#": "t_sidewalk", + "&": "t_sidewalk", + ".": "t_pavement", + "_": "t_sidewalk", + "g": "t_grass", + "p": "t_pavement_y" + } }, "om_terrain": "stadium_1_0", "type": "mapgen", @@ -709,7 +719,7 @@ { "method": "json", "object": { - "furniture": { "#": "f_bench", "&": "f_trashcan", ".": "f_null", "_": "f_null", "g": "f_null", "p": "f_null" }, + "furniture": { "!": "f_street_light", "#": "f_bench", "&": "f_trashcan", ".": "f_null", "_": "f_null", "g": "f_null", "p": "f_null" }, "place_items": [ { "chance": 65, "item": "trash", "x": 6, "y": 20 } ], "rows": [ "gggg.....gggg.....gggggg", @@ -728,7 +738,7 @@ "...............p....p...", "........................", "........................", - "________................", + "_______!................", "________................", "______#_................", "______#_................", @@ -737,7 +747,15 @@ "________....p....p......", "________________________" ], - "terrain": { "#": "t_sidewalk", "&": "t_sidewalk", ".": "t_pavement", "_": "t_sidewalk", "g": "t_grass", "p": "t_pavement_y" } + "terrain": { + "!": "t_sidewalk", + "#": "t_sidewalk", + "&": "t_sidewalk", + ".": "t_pavement", + "_": "t_sidewalk", + "g": "t_grass", + "p": "t_pavement_y" + } }, "om_terrain": "stadium_2_0", "type": "mapgen", @@ -1003,6 +1021,7 @@ "method": "json", "object": { "furniture": { + "!": "f_street_light", "#": "f_bench", "&": "f_toilet", "+": "f_null", @@ -1052,7 +1071,7 @@ ], "place_vehicles": [ { "chance": 3, "fuel": 3, "rotation": 270, "status": -1, "vehicle": "ice_cream_cart", "x": 10, "y": 11 } ], "rows": [ - "ssssssssssssssssssssssss", + "sssssssssssssssssssssss!", "__________----__________", "_________------_________", "------------------------", @@ -1078,6 +1097,7 @@ "___ggcrc#c#c#|...|.....-" ], "terrain": { + "!": "t_sidewalk", "#": "t_concrete", "&": "t_thconc_floor", "+": "t_door_glass_c", diff --git a/data/json/mapgen/town_hall.json b/data/json/mapgen/town_hall.json index 2bcbdca22308..3af289157d2f 100644 --- a/data/json/mapgen/town_hall.json +++ b/data/json/mapgen/town_hall.json @@ -26,6 +26,7 @@ "O": "t_linoleum_white", "u": "t_linoleum_white", "s": "t_sidewalk", + "[": "t_sidewalk", "x": "t_console_broken", "|": "t_brick_wall", "!": "t_door_glass_c", @@ -34,6 +35,7 @@ "v": "t_window" }, "furniture": { + "[": "f_street_light", "3": "f_bench", "B": "f_bench", "S": "f_sink", @@ -91,7 +93,7 @@ "fill_ter": "t_floor", "rows": [ "ssssssssssssssssssssssssssssssssssssssssssssssss", - ".ssssssssssssssssssssssssssssssssssssssssssssss.", + "[ssssssssssssssssssssssssssssssssssssssssssssss[", ".s.....||vvvv||......ssssss......||vvvv||.....s.", ".s.|||||p p|||||...ssss...|||||pBBBBp|||||.s.", ".s.|T+i|c c|i+T|...3ss3...|p p|.s.", @@ -134,7 +136,7 @@ ".s.||||| #### |||||''||||||||| c xc|||||.s.", ".s..,,,| cc + hx|''+'''|x h hc hc hd|,,,..s.", ".s..,,,|h h|ddx|''|lll|ddc ddx ddx d|,,,..s.", - ".ss..,,|||vv|||||||--|||||||||||||||vv|||,,..ss.", + ".ss[.,,|||vv|||||||--|||||||||||||||vv|||,,.[ss.", "..ss...............ss.......................ss..", "...ssssssssssssssssssssssssssssssssssssssssss...", "................................................", diff --git a/data/json/mapgen/zoo.json b/data/json/mapgen/zoo.json index acad92cfd315..fa4a6d193767 100644 --- a/data/json/mapgen/zoo.json +++ b/data/json/mapgen/zoo.json @@ -44,12 +44,13 @@ "_....p....p....p....p...", "_....p....p....p....p...", "_....p....p....p....p...", - "_sssssssssssssssssssssss", + "_'ssssssssssssssssssssss", "____d____________d____ss", "___d7d__________d4d___ss", "____d____________d____ss" ], "terrain": { + "'": "t_sidewalk", ".": "t_pavement", "4": "t_tree_pine", "7": "t_tree_apple_harvested", @@ -57,7 +58,8 @@ "d": "t_dirt", "p": "t_pavement_y", "s": "t_sidewalk" - } + }, + "furniture": { "'": "f_street_light" } } }, { @@ -417,12 +419,13 @@ ".....p....p....p....p___", ".....p....p....p....p___", ".....p....p....p....p___", - "sssssssssssssssssssss___", + "ssssssssssssssssssss'___", "ss__d____________d______", "ss_d7d__________d4d_____", "ss__d____________d______" ], "terrain": { + "'": "t_sidewalk", ".": "t_pavement", "4": "t_tree_pine", "7": "t_tree_apple_harvested", @@ -430,7 +433,8 @@ "d": "t_dirt", "p": "t_pavement_y", "s": "t_sidewalk" - } + }, + "furniture": { "'": "f_street_light" } } }, { diff --git a/data/json/mapgen_palettes/hospital.json b/data/json/mapgen_palettes/hospital.json index 2d28835bf146..f32bd0bf51d8 100644 --- a/data/json/mapgen_palettes/hospital.json +++ b/data/json/mapgen_palettes/hospital.json @@ -4,6 +4,8 @@ "id": "hospital", "terrain": { " ": "t_region_groundcover_urban", + ",": "t_sidewalk", + "'": "t_sidewalk", "#": "t_wall", ":": "t_pavement_y", "&": "t_floor", @@ -46,6 +48,7 @@ "?": "t_floor" }, "furniture": { + "'": "f_street_light", "*": "f_centrifuge", "b": "f_bench", "c": "f_chair", diff --git a/data/json/mapgen_palettes/mall_palette.json b/data/json/mapgen_palettes/mall_palette.json index 8138876cfd99..245d489b6519 100644 --- a/data/json/mapgen_palettes/mall_palette.json +++ b/data/json/mapgen_palettes/mall_palette.json @@ -5,6 +5,7 @@ "furniture": { "?": "f_sofa", "!": "f_rack", + "'": "f_street_light", "@": "f_bed", "$": "f_counter", "%": "f_indoor_plant", @@ -61,6 +62,7 @@ "terrain": { "#": "t_shrub", "!": "t_linoleum_gray_no_roof", + "'": "t_sidewalk", "$": "t_linoleum_white_no_roof", "%": "t_carpet_green", "^": "t_linoleum_white_no_roof", From 1da3c47f74e7ded1a73288ae91aa0e461aec9a0a Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Tue, 26 Sep 2023 00:38:00 -0500 Subject: [PATCH 2/4] Update furniture-terrains.json --- data/json/furniture_and_terrain/furniture-terrains.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index 5e02fddcae80..043289a5a766 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -728,7 +728,7 @@ { "item": "pipe", "count": 8 }, { "item": "sheet_metal", "count": 2 }, { "item": "amplifier", "count": 4 }, - { "item": "light_bulb", "count": 4 }, + { "item": "light_bulb", "count": 2 }, { "item": "cable", "charges": 4 }, { "item": "plastic_chunk", "count": 4 } ] @@ -742,7 +742,7 @@ { "item": "pipe", "count": [ 1, 7 ] }, { "item": "scrap", "count": [ 3, 12 ] }, { "item": "amplifier", "count": [ 1, 3 ] }, - { "item": "light_bulb", "count": [ 0, 3 ] }, + { "item": "light_bulb", "count": [ 0, 2 ] }, { "item": "cable", "charges": [ 1, 2 ] }, { "item": "plastic_chunk", "count": [ 2, 4 ] } ] From f9ff8dc9a9afbea1fec96d0b9db829b3c8fa63cb Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Tue, 26 Sep 2023 00:58:36 -0500 Subject: [PATCH 3/4] Update megastore.json --- data/json/mapgen/megastore.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/mapgen/megastore.json b/data/json/mapgen/megastore.json index ffaf4eae1a9d..599a428b0378 100644 --- a/data/json/mapgen/megastore.json +++ b/data/json/mapgen/megastore.json @@ -3,7 +3,6 @@ "type": "palette", "id": "megastore", "terrain": { - "'": "t_dirt", "#": "t_open_air", "*": "t_open_air_rooved", "~": "t_flat_roof", @@ -28,7 +27,6 @@ "Y": "t_switchgear_s" }, "furniture": { - "'": "f_street_light", "a": "f_armchair", "A": "f_sofa", "b": "f_bookcase", @@ -206,12 +204,14 @@ ], "rotation": 0, "terrain": { + "'": "t_dirt", ".": "t_pavement", "_": "t_pavement_y", "#": [ "t_underbrush", "t_grass" ], "T": [ "t_tree_young", "t_tree" ], "W": "t_sidewalk" }, + "furniture": { "'": "f_street_light" }, "vehicles": { "v": { "vehicle": "city_vehicles", "chance": 10 } } } }, From 27ab5692b6b3efabc9a2bcc26ee59dbb9471b9ae Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Tue, 26 Sep 2023 01:26:52 -0500 Subject: [PATCH 4/4] Update homeimprovement_superstore_new.json --- data/mods/No_Hope/Mapgen/homeimprovement_superstore_new.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/mods/No_Hope/Mapgen/homeimprovement_superstore_new.json b/data/mods/No_Hope/Mapgen/homeimprovement_superstore_new.json index 7a1b8fe1c01a..9d2af9abd840 100644 --- a/data/mods/No_Hope/Mapgen/homeimprovement_superstore_new.json +++ b/data/mods/No_Hope/Mapgen/homeimprovement_superstore_new.json @@ -269,6 +269,7 @@ "|": "t_wall", "O": "t_flat_roof", "S": "t_sidewalk", + "[": "t_sidewalk", "?": "t_railing", "*": "t_open_air", "z": "t_flat_roof", @@ -278,6 +279,7 @@ "x": "t_console_broken" }, "furniture": { + "[": "f_street_light", "V": "f_vending_c", "C": "f_chair", "T": "f_table",