From cf4873159bdf6c11872daa3fbb79d7b263c09e22 Mon Sep 17 00:00:00 2001
From: 0Monet <146018959+0Monet@users.noreply.github.com>
Date: Sat, 17 Aug 2024 01:17:52 +0200
Subject: [PATCH] fix: use regional terrain for `s_garage` (garage) (#5215)

* Update garage.json

* Update garage.json
---
 data/json/mapgen/garage.json | 40 +++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/data/json/mapgen/garage.json b/data/json/mapgen/garage.json
index a63a0ae50c1e..c8f3ee0def29 100644
--- a/data/json/mapgen/garage.json
+++ b/data/json/mapgen/garage.json
@@ -12,7 +12,7 @@
         "     EEEEEE    EEEEEE   ",
         "     EEEEEE    EEEEEE   ",
         "    eEEEEEE   eEEEEEEEEE",
-        " ----======----======--E",
+        " ||||======||||======||E",
         " |S.eM#MM#M...eM#MM#M.|E",
         " |S..M#MM#M....M#MM#M.|E",
         " |c..M#MM#M....M#MM#M.|E",
@@ -21,25 +21,24 @@
         " |c..M#MM#M....M#MM#M.|E",
         " |c..MMMMMMMMMMMMMMMM.|E",
         " |....................|E",
-        " |---l...........HHHHH|E",
+        " ||||l...........HHHHH|E",
         " |ts|c...........HLLLL|E",
-        " |-+|p...........Hbbbb|E",
+        " ||+|p...........Hbbbb|E",
         "4|...............$....+E",
         " |^W|............Hhbbb|E",
         " |xx|cccccSScccccH6LLL|E",
-        " |----::::--::::------|E",
+        " |||||::::||::::|||||||E",
         "                  EU<UEE",
         "                  EUEEEE",
         "                        "
       ],
       "terrain": {
-        " ": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt", "t_shrub" ],
-        "'": "t_dirt",
+        " ": "t_region_groundcover_urban",
+        "'": "t_region_groundcover_urban",
         "E": "t_pavement",
         "U": "t_pavement",
         "$": "t_door_glass_c",
         "+": "t_door_c",
-        "-": "t_brick_wall",
         ".": "t_thconc_floor",
         "6": "t_console_broken",
         ":": "t_window",
@@ -48,10 +47,10 @@
         "H": "t_wall_glass",
         "e": "t_gates_mech_control",
         "|": "t_brick_wall",
-        "W": "t_chainfence_h",
+        "W": "t_chainfence",
         "^": "t_chaingate_c",
         "M": "t_metal_floor",
-        "#": "t_grate",
+        "#": "t_grate_indoor",
         "4": "t_gutter_downspout",
         "<": "t_ladder_up"
       },
@@ -65,11 +64,11 @@
         "S": "f_utility_shelf",
         "p": "f_hydraulic_press",
         "l": "f_heavy_lathe",
-        "t": "f_toilet",
         "x": "f_utility_shelf",
         "h": "f_chair",
         "U": [ "f_dumpster", "f_recycle_bin" ]
       },
+      "toilets": { "t": {  } },
       "items": {
         "L": { "item": "clothing_work_set", "chance": 55 },
         "c": { "item": "mechanics", "chance": 60 },
@@ -97,35 +96,34 @@
         "             EEEEEE     ",
         "  EEEEEEEEEEEEEEEEE     ",
         "  ErrrrrrrrEeEEEEEEEEEEE",
-        " ------------======----E",
+        " ||||||||||||======||||E",
         " |L..CC|1...eM#MM#M..S|E",
         " |L..CC|2....M#MM#M..S|E",
         " |S...c|6...5M#MM#M..c|E",
         " |S...c|5...5M#MM#M..c|E",
-        " |-R==-|....3M#MM#M..c|E",
+        " ||R==||....3M#MM#M..c|E",
         " |...........M#MM#M..c|E",
         " |...........MMMMMM..c|E",
         " |GG..................|E",
-        " |---l...........HHHHH|E",
+        " ||||l...........HHHHH|E",
         " |ts|c...........HLLLL|E",
-        " |-+|p...........Hbbbb|E",
+        " ||+|p...........Hbbbb|E",
         "4|...............$....+E",
         " |^W|............Hhbbb|E",
         " |xx|cccccSScccccH6LLL|E",
-        " |----::::--::::------|E",
+        " |||||::::||::::|||||||E",
         "                  EU<UEE",
         "                  EUEEEE",
         "                        "
       ],
       "terrain": {
-        " ": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt", "t_shrub" ],
-        "'": "t_dirt",
+        " ": "t_region_groundcover_urban",
+        "'": "t_region_groundcover_urban",
         "5": "t_machinery_electronic",
         "E": "t_pavement",
         "U": "t_pavement",
         "$": "t_door_glass_c",
         "+": "t_door_c",
-        "-": "t_brick_wall",
         ".": "t_thconc_floor",
         "6": "t_console_broken",
         ":": "t_window",
@@ -136,11 +134,11 @@
         "e": "t_gates_mech_control",
         "|": "t_brick_wall",
         "R": "t_card_industrial",
-        "W": "t_chainfence_h",
+        "W": "t_chainfence",
         "^": "t_chaingate_c",
         "M": "t_metal_floor",
         "r": "t_pavement",
-        "#": "t_grate",
+        "#": "t_grate_indoor",
         "4": "t_gutter_downspout",
         "<": "t_ladder_up"
       },
@@ -159,11 +157,11 @@
         "p": "f_hydraulic_press",
         "l": "f_heavy_lathe",
         "r": "f_utility_shelf",
-        "t": "f_toilet",
         "x": "f_utility_shelf",
         "h": "f_chair",
         "U": [ "f_dumpster", "f_recycle_bin" ]
       },
+      "toilets": { "t": {  } },
       "items": {
         "C": { "item": "atomic_vehicle_servicing", "chance": 75, "repeat": [ 1, 2 ] },
         "L": { "item": "clothing_work_set", "chance": 50 },