Merge pull request CleverRaven#78578 from Maarifrah/jewelry-store-fix

Jewelry store fix and terrain pruning
arijust · Dec 15, 2024 · e166bbc · e166bbc
2 parents 2e504ae + 5b09d0b
commit e166bbc
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/data/json/mapgen/jewel_store.json b/data/json/mapgen/jewel_store.json
@@ -17,10 +17,10 @@
         "..-.##hhhhh++hhhhh##....",
         "..-.#              #....",
         "..-.#hh ;;;;;;;; hh#....",
-        "..-.#%v ;;hhhh;; v%#....",
-        "..-.#%v ;;v//v;; v%#....",
-        "..-.#%v ;;v//v;; v%#....",
-        "==^=#%v ;;hhhh;; v%#....",
+        "..-.#%h ;;hhhh;; h%#....",
+        "..-.#%h ;;h;;h;; h%#....",
+        "..-.#%h ;;h;;h;; h%#....",
+        "==^=#%h ;;hhhh;; h%#....",
         "=---#hh ;;;;;;;; hh#....",
         "=---#   ;;CttC;;  r#....",
         "=--4#   ;;;;;;;;  r#####",
@@ -39,7 +39,6 @@
         "x": "t_floor",
         "r": "t_floor",
         "%": "t_floor",
-        "/": { "param": "carpet_color_type", "fallback": "t_carpet_yellow" },
         ";": { "param": "carpet_color_type", "fallback": "t_carpet_yellow" },
         "C": { "param": "carpet_color_type", "fallback": "t_carpet_yellow" },
         "t": { "param": "carpet_color_type", "fallback": "t_carpet_yellow" },
@@ -55,11 +54,9 @@
         "_": "t_pavement",
         "~": "t_thconc_floor",
         "h": "t_wall_glass_alarm",
-        "v": "t_wall_glass_alarm",
         "4": "t_gutter_downspout"
       },
       "furniture": {
-        "#": "f_counter",
         "%": "f_counter",
         "@": "f_counter",
         "G": "f_desk",