From 193c1726f849f359ef7947eb7a2a8e7b6be7e972 Mon Sep 17 00:00:00 2001
From: 0Monet <146018959+0Monet@users.noreply.github.com>
Date: Thu, 23 Nov 2023 23:29:05 +0100
Subject: [PATCH] fix: movie_theater mapgen (#3743)

* Fix movie_theater

* remove "&" ATM
---
 data/json/mapgen/movie_theater.json                  | 6 +++---
 data/json/mapgen_palettes/movie_theater_palette.json | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/data/json/mapgen/movie_theater.json b/data/json/mapgen/movie_theater.json
index 86d396bd0283..bb2c1bdbe2ef 100644
--- a/data/json/mapgen/movie_theater.json
+++ b/data/json/mapgen/movie_theater.json
@@ -19,8 +19,8 @@
         "!&|&|&|&|&|&|&|&|&|&|..|___*$$$$$$$$$$$$$$$$*___........-.-..Tc..T|X...!",
         "!||||||||||||||||||||...___*$**************$*___@%@.....-.-..T...g|....!",
         "!&|&|&|&|&|&|&|&|&|&|...___*$$$$********$$$$*___@%@.....-.-..T...g|...X!",
-        "!+|+|+|+|+|+|+|.....||||___****$********$****___@%@.....-.-..T...r|t..X!",
-        "!...................||||______*$*|Z%Z%|*$*______@%@.......-..T...r|t..X!",
+        "!+|+|+|+|+|+|+|+|+|+||||___****$********$****___@%@.....-.-..T...r|t..X!",
+        "!......................|______*$*|Z%Z%|*$*______@%@.......-..T...r|t..X!",
         "!.......................______*$*d*e*e|*$*______..........-..|...o|....!",
         "!TsTsTsTsTsTsTsTTG......____!_*$*||||||*$*_!____........RR-..|.........!",
         "!|||||||||||||||||||||||______*$********$*______@%@..........|.........!",
@@ -84,7 +84,7 @@
         "!.......................+**********************+.......................!",
         "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
       ],
-      "palettes": [ "movie_theater_palette.json" ],
+      "palettes": [ "movie_theater_palette" ],
       "terrain": { "#": "t_thconc_floor", "H": "t_thconc_floor", "y": "t_thconc_floor" },
       "toilets": { "&": {  } },
       "vendingmachines": { "v": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
diff --git a/data/json/mapgen_palettes/movie_theater_palette.json b/data/json/mapgen_palettes/movie_theater_palette.json
index 87e6569e2813..35080106c6e9 100644
--- a/data/json/mapgen_palettes/movie_theater_palette.json
+++ b/data/json/mapgen_palettes/movie_theater_palette.json
@@ -1,7 +1,7 @@
 [
   {
     "type": "palette",
-    "id": "movie_theater_palette.json",
+    "id": "movie_theater_palette",
     "furniture": {
       "T": "f_counter",
       "f": "f_counter",
@@ -45,7 +45,6 @@
       "%": "t_wall_glass",
       "+": "t_door_metal_c",
       "^": "t_door_glass_c",
-      "&": "t_atm",
       "D": "t_door_c",
       "d": "t_door_c",
       "a": "t_atm",