From 8444f8bc1d0c55b6b1ab6815c2e42e04229662b7 Mon Sep 17 00:00:00 2001
From: 0Monet <146018959+0Monet@users.noreply.github.com>
Date: Sat, 30 Dec 2023 16:57:05 +0100
Subject: [PATCH 1/3] Fix bike store

---
 data/json/mapgen/bike_shop.json | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/data/json/mapgen/bike_shop.json b/data/json/mapgen/bike_shop.json
index 790cce94afe7..b04329383895 100644
--- a/data/json/mapgen/bike_shop.json
+++ b/data/json/mapgen/bike_shop.json
@@ -87,17 +87,8 @@
         "           ----------   ",
         "                        "
       ],
-      "terrain": {
-        ".": "t_flat_roof",
-        " ": "t_open_air",
-        "2": "t_gutter_north",
-        "-": "t_gutter_south",
-        "3": "t_gutter_east",
-        "|": "t_gutter_west",
-        ">": "t_ladder_down",
-        "5": "t_gutter_drop"
-      },
-      "furniture": { "&": "f_roof_turbine_vent", ":": "f_cellphone_booster", "=": "f_vent_pipe" },
+      "palettes": [ "roof_palette" ],
+      "terrain": { ">": "t_ladder_down" },
       "place_items": [ { "item": "roof_trash", "x": [ 5, 11 ], "y": [ 8, 15 ], "chance": 50, "repeat": [ 1, 3 ] } ],
       "place_nested": [
         {
@@ -150,6 +141,7 @@
         "________________________"
       ],
       "palettes": [ "bike_shop" ],
+      "terrain": { "<": "t_stairs_up" },
       "items": {
         "&": { "item": "trash", "chance": 70 },
         "@": { "item": "trash", "chance": 90 },
@@ -200,20 +192,8 @@
         " -------#####---        ",
         "                        "
       ],
-      "terrain": {
-        ".": "t_flat_roof",
-        " ": "t_open_air",
-        "2": "t_gutter_north",
-        "-": "t_gutter_south",
-        "3": "t_gutter_east",
-        "|": "t_gutter_west",
-        ">": "t_stairs_down",
-        "5": "t_gutter_drop",
-        "#": "t_wall_b",
-        "_": "t_floor",
-        ";": "t_door_locked"
-      },
-      "furniture": { "&": "f_roof_turbine_vent", "X": "f_small_satelitte_dish", "=": "f_vent_pipe" },
+      "palettes": [ "roof_palette" ],
+      "terrain": { "#": "t_wall_b", "_": "t_floor", ";": "t_door_locked" },
       "place_items": [ { "item": "roof_trash", "x": [ 3, 18 ], "y": [ 4, 16 ], "chance": 50, "repeat": [ 1, 3 ] } ],
       "place_nested": [
         {
@@ -231,4 +211,4 @@
       ]
     }
   }
-]
+]
\ No newline at end of file

From aed22199e3283faa2ac0405dc89057cc57d177b6 Mon Sep 17 00:00:00 2001
From: 0Monet <146018959+0Monet@users.noreply.github.com>
Date: Sat, 30 Dec 2023 16:59:27 +0100
Subject: [PATCH 2/3] Fix bike store 1 id

---
 data/json/overmap/multitile_city_buildings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
index c99b06a8e765..0f85cff5f01d 100644
--- a/data/json/overmap/multitile_city_buildings.json
+++ b/data/json/overmap/multitile_city_buildings.json
@@ -3295,7 +3295,7 @@
   },
   {
     "type": "city_building",
-    "id": "bike_shop_1",
+    "id": "s_bike_shop_1",
     "locations": [ "land" ],
     "overmaps": [
       { "point": [ 0, 0, 0 ], "overmap": "s_bike_shop_1_north" },

From c04a425425db86082773d99a0da20d20059d6c54 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Sat, 30 Dec 2023 16:18:00 +0000
Subject: [PATCH 3/3] style(autofix.ci): automated formatting

---
 data/json/mapgen/bike_shop.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/mapgen/bike_shop.json b/data/json/mapgen/bike_shop.json
index b04329383895..a6210ac920c7 100644
--- a/data/json/mapgen/bike_shop.json
+++ b/data/json/mapgen/bike_shop.json
@@ -211,4 +211,4 @@
       ]
     }
   }
-]
\ No newline at end of file
+]