From 7b1b1daaba9f1b5046a778eb9e6df8ae929bd0a1 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sat, 7 Oct 2023 16:46:24 -0500 Subject: [PATCH] Consistency updates for street light placement (#3369) * Consistency updates for street light placement * misc * Update town_hall.json Swear on yer fuckin yeezies * Fix the things * Update gym.json --- data/json/mapgen/abstorefront.json | 2 +- data/json/mapgen/bank.json | 10 +++---- data/json/mapgen/cs_public_space.json | 6 ++-- data/json/mapgen/gym.json | 13 ++++---- .../mapgen/homeimprovement_superstore.json | 8 ++--- .../homeimprovement_superstore_new.json | 10 ++++--- data/json/mapgen/hospital.json | 6 ++-- data/json/mapgen/mall/mall_ground.json | 2 +- data/json/mapgen/megastore.json | 4 +-- data/json/mapgen/motel.json | 20 +++++++++---- data/json/mapgen/stadium_football.json | 30 +++++++++++++------ data/json/mapgen/town_hall.json | 2 +- data/json/mapgen/zoo.json | 12 ++++---- data/json/mapgen_palettes/hospital.json | 2 ++ .../homeimprovement_superstore_new.json | 6 ++-- 15 files changed, 79 insertions(+), 54 deletions(-) diff --git a/data/json/mapgen/abstorefront.json b/data/json/mapgen/abstorefront.json index f7c7429509fe..44ead493f623 100644 --- a/data/json/mapgen/abstorefront.json +++ b/data/json/mapgen/abstorefront.json @@ -135,8 +135,8 @@ "object": { "fill_ter": "t_floor", "rows": [ + "_______ '", "_______ ", - "_______' ", "___~~~~O |-xx--xx-| ", "_______O b|B......B| ", "_______O b|B..BB..B| ", diff --git a/data/json/mapgen/bank.json b/data/json/mapgen/bank.json index 128f3b1ca8d8..ca6e55e6042e 100644 --- a/data/json/mapgen/bank.json +++ b/data/json/mapgen/bank.json @@ -7,7 +7,7 @@ "object": { "fill_ter": "t_floor", "rows": [ - " S'S S SIS ", + " S SIS '", " #gggggggGgggggggggggg# ", " #A..........CTC.CTC.p# ", " #A...................w ", @@ -34,7 +34,7 @@ ], "terrain": { " ": [ "t_grass", "t_grass", "t_grass", "t_dirt", "t_shrub" ], - "'": "t_sidewalk", + "'": "t_dirt", "#": "t_wall_w", "$": "t_metal_floor", "%": [ "t_door_c", "t_door_c", "t_door_locked_interior" ], @@ -145,8 +145,8 @@ "object": { "fill_ter": "t_floor", "rows": [ - " SS S'S SSS", - " ggGGgggggggggg#######iS", + " SS SiSS'", + " ggGGgggggggggg#######SS", " gA.........ccx.#....##S", " gA........C-C..+....p# ", " gA.........ccx.#aca..##", @@ -233,7 +233,7 @@ "failures": [ { "action": "alarm" }, { "action": "damage" }, { "action": "secubots" } ] } }, - "place_loot": [ { "item": "american_flag", "x": 22, "y": 0, "chance": 50 } ], + "place_loot": [ { "item": "american_flag", "x": 21, "y": 0, "chance": 50 } ], "place_monster": [ { "monster": "mon_secubot", "x": [ 7, 18 ], "y": [ 7, 18 ], "chance": 30, "repeat": 4 } ] } }, diff --git a/data/json/mapgen/cs_public_space.json b/data/json/mapgen/cs_public_space.json index dfbd3edb3e8e..5c69bcbd1395 100644 --- a/data/json/mapgen/cs_public_space.json +++ b/data/json/mapgen/cs_public_space.json @@ -6,8 +6,8 @@ "weight": 1000, "object": { "rows": [ - "...,....'''''''',...,,..", - "..,...,!'I''''I'!..,...,", + "...,....'''''''',...,,.!", + "..,...,,'I''''I',..,...,", "..,...,.''''''''.....,..", "...,fsfsfs,'',sfsfsf,.,.", ".,.f,,,,,,,'',,,,,,,f...", @@ -34,7 +34,7 @@ "terrain": { ".": "t_grass", ",": "t_dirt", - "!": "t_sidewalk", + "!": "t_dirt", "'": "t_sidewalk", "w": "t_water_sh", "s": "t_underbrush", diff --git a/data/json/mapgen/gym.json b/data/json/mapgen/gym.json index 25fd83c984d8..5fb917d05374 100644 --- a/data/json/mapgen/gym.json +++ b/data/json/mapgen/gym.json @@ -7,7 +7,7 @@ "object": { "fill_ter": "t_floor", "rows": [ - ".........,,,,,'.........", + ".........,,,,,,........'", ".U.....,,,,,,,,,,U......", ".......,|--==--|,.......", ".......,8y y8,.......", @@ -36,7 +36,7 @@ " ": "t_floor", "+": "t_door_c", ",": "t_sidewalk", - "'": "t_sidewalk", + "'": "t_dirt", "-": "t_wall_w", ".": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt", "t_shrub" ], "5": "t_wall_glass", @@ -48,7 +48,7 @@ "4": "t_gutter_downspout" }, "furniture": { - ",": "f_street_light", + "'": "f_street_light", "!": "f_ergometer", "#": "f_counter", "*": "f_shower", @@ -134,8 +134,8 @@ "object": { "fill_ter": "t_floor", "rows": [ - "..............|55===55|.", - "..'...........|c c|.", + "..............|55===55|'", + "..............|c c|.", "..|555555555|||c ### c|.", "..5 |c # c|.", "..5 @ @ @ c ||+|||+||.", @@ -165,7 +165,6 @@ ":": "t_linoleum_white", "*": "t_linoleum_white", "+": "t_door_c", - ",": "t_sidewalk", ".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_shrub", "t_dirt" ], "'": "t_dirt", "5": "t_wall_glass", @@ -179,7 +178,7 @@ "<": "t_stairs_up" }, "furniture": { - ",": "f_street_light", + "'": "f_street_light", "!": "f_ergometer", "{": "f_bigmirror", "#": "f_counter", diff --git a/data/json/mapgen/homeimprovement_superstore.json b/data/json/mapgen/homeimprovement_superstore.json index 29324da56e6e..3ba64470fb5e 100644 --- a/data/json/mapgen/homeimprovement_superstore.json +++ b/data/json/mapgen/homeimprovement_superstore.json @@ -44,8 +44,8 @@ "________________________", "________________________", "..........|_____________", - "..........|!____________", - "-----------_____________" + "..........|_____________", + "-----------____________!" ], "terrain": { "!": "t_pavement", @@ -115,8 +115,8 @@ "________________________", "________________________", "___________|............", - "__________!|............", - "___________-------------" + "___________|............", + "__________!-------------" ], "terrain": { "$": "t_floor", diff --git a/data/json/mapgen/homeimprovement_superstore_new.json b/data/json/mapgen/homeimprovement_superstore_new.json index 0f39624c9432..ec48505e6c1e 100644 --- a/data/json/mapgen/homeimprovement_superstore_new.json +++ b/data/json/mapgen/homeimprovement_superstore_new.json @@ -83,9 +83,9 @@ "/S_______SS____,____,____,____,____,____,____SBS", "&S_______SS____,____,____,____,____,____,____SBS", " S_______SS____,____,____,____,____,____,____S S", - " S_______SS__________________________________S/S", - "&S_______[S__________________________________S[S", - "/S_______SS__________________________________SSS", + "/S_______SS__________________________________S/S", + "&S_______SS__________________________________S[S", + "[S_______SS______________]___________________SSS", "************************************************", "*zzzzz***********??????????????????????????????*", "*zzzzz***********?zzzzzzzzzzzzzzzzzzzzzzzzzzzz??", @@ -270,7 +270,8 @@ "|": "t_wall", "O": "t_flat_roof", "S": "t_sidewalk", - "[": "t_sidewalk", + "[": "t_dirt", + "]": "t_pavement", "?": "t_railing", "*": "t_open_air", "z": "t_flat_roof", @@ -280,6 +281,7 @@ }, "furniture": { "[": "f_street_light", + "]": "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 d074b3465a09..de6ae0ac314d 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...#", + "__________________________[___________________________'########;########", + "______________________________________________________,#...cT#...#Tc...#", "_:____:____:____:_________:____:____:____:____:____:__,#BB...+...+...BB#", "_:____:____:____:_________:____:____:____:____:____:__,#BB...+...+...BB#", "_:____:____:____:_________:____:____:____:____:____:__,#....l#...#l....#", "_:____:____:____:_________:____:____:____:____:____:__,#######...#######", "_:____:____:____:_________:____:____:____:____:____:__,#....l#...#l....#", "_:____:____:____:_________:____:____:____:____:____:__,#BB...+...+...BB#", - ",',,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#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 46790154b544..26a29a349479 100644 --- a/data/json/mapgen/mall/mall_ground.json +++ b/data/json/mapgen/mall/mall_ground.json @@ -3856,7 +3856,7 @@ "s__,,,,___ssss____,,___s", "s___,,_____ss_____,,___s", "s______________________s", - "________________________" + "'_______________________" ], "palettes": [ "mall_palette" ], "place_monsters": [ { "monster": "GROUP_MALL", "x": [ 0, 23 ], "y": [ 0, 23 ], "density": 0.25 } ] diff --git a/data/json/mapgen/megastore.json b/data/json/mapgen/megastore.json index 599a428b0378..7ac8b327bbde 100644 --- a/data/json/mapgen/megastore.json +++ b/data/json/mapgen/megastore.json @@ -177,7 +177,7 @@ "object": { "fill_ter": "t_pavement", "rows": [ - "'W....................WT", + "#W....................WT", "W......................W", "........................", "______............______", @@ -200,7 +200,7 @@ ".....v..................", "........................", "W_____............_____W", - "TW....................W#" + "'W....................W#" ], "rotation": 0, "terrain": { diff --git a/data/json/mapgen/motel.json b/data/json/mapgen/motel.json index 8b474fc248c9..263cc9ad1fdb 100644 --- a/data/json/mapgen/motel.json +++ b/data/json/mapgen/motel.json @@ -21,7 +21,7 @@ "weight": 1000, "object": { "rows": [ - ".SS..........._________.", + ".SS..........._________]", ".SS..........._________.", "#SS##########._________.", "-MM-gg------#._________.", @@ -49,6 +49,7 @@ "set": [ { "point": "terrain", "id": "t_dirt", "x": 23, "y": [ 0, 23 ], "repeat": [ 5, 10 ] } ], "terrain": { " ": "t_floor", + "]": "t_dirt", "!": "t_sidewalk", "#": "t_shrub", "'": "t_pavement_y", @@ -88,6 +89,7 @@ }, "furniture": { "!": "f_street_light", + "]": "f_street_light", "6": "f_table", "7": "f_bookcase", "8": "f_bathtub", @@ -128,7 +130,7 @@ "weight": 1000, "object": { "rows": [ - "........................", + ".......................]", ".###########............", ".#SSSSSSSSS#.....#######", ".#SWWWWWWWS#.....----gg-", @@ -160,6 +162,7 @@ ], "terrain": { " ": "t_floor", + "]": "t_dirt", "#": "t_shrub", "'": "t_pavement_y", "+": "t_door_c", @@ -202,6 +205,7 @@ "<": "t_ladder_up" }, "furniture": { + "]": "f_street_light", "0": "f_dive_block", "6": "f_table", "7": "f_bookcase", @@ -721,7 +725,7 @@ "weight": 1000, "object": { "rows": [ - ".SS..........._________.", + ".SS..........._________]", ".SS..........._________.", "#SS##########._________.", "-MM-gg------#._________.", @@ -749,6 +753,7 @@ "terrain": { ".": "t_grass", "!": "t_sidewalk", + "]": "t_dirt", "-": "t_wall", "_": "t_pavement", "'": "t_pavement_y", @@ -787,6 +792,7 @@ }, "furniture": { "!": "f_street_light", + "]": "f_street_light", "6": "f_table", "7": "f_bookcase", "8": "f_bathtub", @@ -827,7 +833,7 @@ "weight": 1000, "object": { "rows": [ - "........................", + ".......................]", ".###########............", ".#SSSSSSSSS#.....#######", ".#SWWWWWWWS#.....----gg-", @@ -854,6 +860,7 @@ ], "terrain": { ".": "t_grass", + "]": "t_dirt", "-": "t_wall", "_": "t_pavement", "'": "t_pavement_y", @@ -894,6 +901,7 @@ "<": "t_stairs_up" }, "furniture": { + "]": "f_street_light", "6": "f_table", "7": "f_bookcase", "8": "f_bathtub", @@ -1581,8 +1589,8 @@ "weight": 50, "object": { "rows": [ + "______________,,,,,,,__!__________,,,,,,,______!", "______________,,,,,,,_____________,,,,,,,_______", - "____________!_,,,,,,,_____________,,,,,,,_!_____", "|----|''''''''ddddddd'''''''''''''''''''''|----|", "|T.>t|_))))))),,,,,,,))))))))))))),,,,,,,_wtbbt|", "|.c>.+_),C,a,,,,,,,,,,``,,,),,,,,,,,,,,,,_+....|", @@ -1689,8 +1697,8 @@ "weight": 500, "object": { "rows": [ + "______________,,,,,,,__!__________,,,,,,,______!", "______________,,,,,,,_____________,,,,,,,_______", - "____________!_,,,,,,,_____________,,,,,,,_!_____", "|----|________,,,,,,,_____________,,,,,,,_|----|", "|T.>t|_))))))),,,,,,,))))))))))))),,,,,,,_wtbbt|", "|.c>.+_),,,,,,,,,,,,,,,,,,,),,,,,,,,,,,,,_+....|", diff --git a/data/json/mapgen/stadium_football.json b/data/json/mapgen/stadium_football.json index 972d0df435a0..e92754d2540f 100644 --- a/data/json/mapgen/stadium_football.json +++ b/data/json/mapgen/stadium_football.json @@ -2,9 +2,8 @@ { "method": "json", "object": { - "furniture": { ".": "f_null", "_": "f_null", "p": "f_null", "s": "f_null" }, "rows": [ - "____.....____.....______", + "____.....____....._____'", "____.....____.....______", "_.......................", "_.......................", @@ -29,7 +28,8 @@ "_....p....p.....p.......", "_sssssssssssssssssssssss" ], - "terrain": { ".": "t_pavement", "_": "t_grass", "p": "t_pavement_y", "s": "t_sidewalk" } + "terrain": { ".": "t_pavement", "_": "t_grass", "'": "t_grass", "p": "t_pavement_y", "s": "t_sidewalk" }, + "furniture": { "'": "f_street_light" } }, "om_terrain": "stadium_0_0", "type": "mapgen", @@ -432,10 +432,19 @@ { "method": "json", "object": { - "furniture": { "!": "f_street_light", "#": "f_bench", "&": "f_trashcan", ".": "f_null", "_": "f_null", "g": "f_null", "p": "f_null" }, + "furniture": { + "!": "f_street_light", + "'": "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", + "gggg.....gggg.....ggggg'", "gggg.....gggg.....gggggg", "........................", "........................", @@ -466,6 +475,7 @@ "&": "t_sidewalk", ".": "t_pavement", "_": "t_sidewalk", + "'": "t_dirt", "g": "t_grass", "p": "t_pavement_y" } @@ -671,7 +681,7 @@ "________________________", "________________________", "gggggggggggggggggggggggg", - "________________________", + "______________________C_", "________________________", "________________________", "________________________", @@ -699,6 +709,7 @@ "+": "t_door_c", "-": "t_brick_wall", ".": "t_thconc_floor", + "C": "t_chainfence_posts", "S": "t_thconc_floor", "T": "t_thconc_floor", "_": "t_grass", @@ -722,7 +733,7 @@ "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", + "gggg.....gggg.....ggggg'", "gggg.....gggg.....gggggg", "........................", "........................", @@ -753,6 +764,7 @@ "&": "t_sidewalk", ".": "t_pavement", "_": "t_sidewalk", + "'": "t_dirt", "g": "t_grass", "p": "t_pavement_y" } @@ -984,7 +996,6 @@ { "method": "json", "object": { - "furniture": { ".": "f_null", "_": "f_null", "p": "f_null", "s": "f_null" }, "rows": [ "____.....____.....______", "____.....____.....______", @@ -1011,7 +1022,8 @@ ".....p....p.....p......_", ".ssssssssssssssssssssss_" ], - "terrain": { ".": "t_pavement", "_": "t_grass", "p": "t_pavement_y", "s": "t_sidewalk" } + "terrain": { ".": "t_pavement", "_": "t_grass", "'": "t_dirt", "p": "t_pavement_y", "s": "t_sidewalk" }, + "furniture": { "'": "f_street_light" } }, "om_terrain": "stadium_3_0", "type": "mapgen", diff --git a/data/json/mapgen/town_hall.json b/data/json/mapgen/town_hall.json index 3af289157d2f..01217c6acc8a 100644 --- a/data/json/mapgen/town_hall.json +++ b/data/json/mapgen/town_hall.json @@ -92,8 +92,8 @@ "object": { "fill_ter": "t_floor", "rows": [ + "ssssssssssssssssssss[ssssssssssssssssssssssssss[", "ssssssssssssssssssssssssssssssssssssssssssssssss", - "[ssssssssssssssssssssssssssssssssssssssssssssss[", ".s.....||vvvv||......ssssss......||vvvv||.....s.", ".s.|||||p p|||||...ssss...|||||pBBBBp|||||.s.", ".s.|T+i|c c|i+T|...3ss3...|p p|.s.", diff --git a/data/json/mapgen/zoo.json b/data/json/mapgen/zoo.json index fa4a6d193767..2dbce72d4e2f 100644 --- a/data/json/mapgen/zoo.json +++ b/data/json/mapgen/zoo.json @@ -24,7 +24,7 @@ "weight": 100, "object": { "rows": [ - "___......______......___", + "___......______......'__", "___......______......___", "___......______......___", "___......______......___", @@ -44,13 +44,13 @@ "_....p....p....p....p...", "_....p....p....p....p...", "_....p....p....p....p...", - "_'ssssssssssssssssssssss", + "_sssssssssssssssssssssss", "____d____________d____ss", "___d7d__________d4d___ss", "____d____________d____ss" ], "terrain": { - "'": "t_sidewalk", + "'": "t_grass", ".": "t_pavement", "4": "t_tree_pine", "7": "t_tree_apple_harvested", @@ -399,7 +399,7 @@ "weight": 100, "object": { "rows": [ - "___......______......___", + "___......______......'__", "___......______......___", "___......______......___", "___......______......___", @@ -419,13 +419,13 @@ ".....p....p....p....p___", ".....p....p....p....p___", ".....p....p....p....p___", - "ssssssssssssssssssss'___", + "sssssssssssssssssssss___", "ss__d____________d______", "ss_d7d__________d4d_____", "ss__d____________d______" ], "terrain": { - "'": "t_sidewalk", + "'": "t_grass", ".": "t_pavement", "4": "t_tree_pine", "7": "t_tree_apple_harvested", diff --git a/data/json/mapgen_palettes/hospital.json b/data/json/mapgen_palettes/hospital.json index f32bd0bf51d8..224b49525ce9 100644 --- a/data/json/mapgen_palettes/hospital.json +++ b/data/json/mapgen_palettes/hospital.json @@ -6,6 +6,7 @@ " ": "t_region_groundcover_urban", ",": "t_sidewalk", "'": "t_sidewalk", + "[": "t_pavement", "#": "t_wall", ":": "t_pavement_y", "&": "t_floor", @@ -48,6 +49,7 @@ "?": "t_floor" }, "furniture": { + "[": "f_street_light", "'": "f_street_light", "*": "f_centrifuge", "b": "f_bench", diff --git a/data/mods/No_Hope/Mapgen/homeimprovement_superstore_new.json b/data/mods/No_Hope/Mapgen/homeimprovement_superstore_new.json index 9d2af9abd840..9895c9e5b57c 100644 --- a/data/mods/No_Hope/Mapgen/homeimprovement_superstore_new.json +++ b/data/mods/No_Hope/Mapgen/homeimprovement_superstore_new.json @@ -85,7 +85,7 @@ " S_______SS____,____,____,____,____,____,____S S", " S_______SS__________________________________S/S", "&S_______SS__________________________________SSS", - "/S_______SS__________________________________SSS", + "[S_______SS______________]___________________SSS", "************************************************", "*zzzzz***********??????????????????????????????*", "*zzzzz***********?zzzzzzzzzzzzzzzzzzzzzzzzzzzz??", @@ -269,7 +269,8 @@ "|": "t_wall", "O": "t_flat_roof", "S": "t_sidewalk", - "[": "t_sidewalk", + "[": "t_dirt", + "]": "t_pavement", "?": "t_railing", "*": "t_open_air", "z": "t_flat_roof", @@ -280,6 +281,7 @@ }, "furniture": { "[": "f_street_light", + "]": "f_street_light", "V": "f_vending_c", "C": "f_chair", "T": "f_table",