fix: use regional terrain for s_garage_2 and other changes (#5854)

Update garage.json
cataclysmbnteam · Dec 30, 2024 · 105ca30 · 105ca30
1 parent 6a460c3
commit 105ca30
Showing 1 changed file with 16 additions and 18 deletions.
diff --git a/data/json/mapgen/garage.json b/data/json/mapgen/garage.json
@@ -344,36 +344,35 @@
         "    EEEEEE      XXX     ",
         "    EEEEEE      XXX     ",
         "   eEEEEEEXXXXXXXXXXXXXX",
-        " ---======-----HHOHH---X",
+        " |||======|||||HHOHH|||X",
         " |.eM#MM#M..|y.......y|X",
         " |..M#MM#M..|b........|X",
-        " :..M#MM#M..:b..|-ddd-|X",
+        " :..M#MM#M..:b..||ddd||X",
         " :..M#MM#M..:b..|f.h.y|X",
-        " A..M#MM#M..:b..|--.--|X",
+        " A..M#MM#M..:b..|||.|||X",
         " |..M#MM#M..+...+...hd|X",
-        " |..MMMMMM..|-+-|f6ddd|X",
-        " |..........|&.s|-----|X",
-        " |---....---|---|LLLLL|X",
+        " |..MMMMMM..||+||f6ddd|X",
+        " |..........|t.s|||||||X",
+        " ||||....||||||||LLLLL|X",
         " |..............|bbbbb|X",
         " |WWWW..WWWW|...+.....|X",
-        " |c........c|-------+-|X",
+        " |c........c||||||||+||X",
         " |c.xx..xx.p|xx.+T|<..OX",
-        " |l.xx..xx.c|x..-|----|X",
+        " |l.xx..xx.c|x..|||||||X",
         " |w.........O..xx|4UUXXX",
-        " |ScccccccwS|----|UXXXXX",
-        " |----------|WWWWWWWWWWW",
+        " |ScccccccwS||||||UXXXXX",
+        " ||||||||||||WWWWWWWWWWW",
         "                        "
       ],
       "terrain": {
-        " ": [ "t_grass", "t_grass", "t_grass", "t_dirt", "t_shrub", "t_grass", "t_grass", "t_grass", "t_dirt" ],
-        "'": "t_dirt",
+        " ": "t_region_groundcover_urban",
+        "'": "t_region_groundcover_urban",
         "E": "t_pavement",
         "X": "t_sidewalk",
         "U": "t_sidewalk",
         "$": "t_door_glass_c",
         "+": "t_door_c",
         "O": "t_door_locked",
-        "-": "t_wall_b",
         ".": "t_thconc_floor",
         "6": "t_console_broken",
         ":": "t_window",
@@ -382,14 +381,13 @@
         "H": "t_wall_glass",
         "e": "t_gates_mech_control",
         "|": "t_wall_b",
-        "W": "t_chainfence_h",
+        "W": "t_chainfence",
         "^": "t_chaingate_c",
         "M": "t_metal_floor",
-        "#": "t_grate",
+        "#": "t_grate_indoor",
         "4": "t_gutter_downspout",
         "<": "t_stairs_up"
       },
-      "toilets": { "&": {  } },
       "furniture": {
         "'": "f_street_light",
         "A": "f_air_conditioner",
@@ -402,14 +400,14 @@
         "l": "f_heavy_lathe",
         "S": "f_utility_shelf",
         "s": "f_sink",
-        "t": "f_toilet",
         "w": "f_utility_shelf",
         "x": "f_crate_c",
         "f": "f_filing_cabinet",
         "h": "f_chair",
-        "U": [ "f_dumpster", "f_recycle_bin" ],
+        "U": "f_dumpster",
         "y": [ "f_indoor_plant", "f_indoor_plant_y" ]
       },
+      "toilets": { "t": {  } },
       "items": {
         "L": { "item": "clothing_work_set", "chance": 55 },
         "c": { "item": "mechanics", "chance": 60 },