Consistency updates for street light placement (cataclysmbnteam#3369)

* Consistency updates for street light placement * misc * Update town_hall.json Swear on yer fuckin yeezies * Fix the things * Update gym.json
chaosvolt · Oct 7, 2023 · 7b1b1da · 7b1b1da
1 parent b9e90a1
commit 7b1b1da
Show file tree

Hide file tree

Showing 15 changed files with 79 additions and 54 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>.+_),,,,,,,,,,,,,,,,,,,),,,,,,,,,,,,,_+....|",