From 05ad197357cec013def2177c5c182f33e169a2c3 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Fri, 21 Apr 2023 11:22:52 -0400
Subject: Never mind, we are not shuffling the mandatory wall snipes

It would complicate logic too much because of ZERO needing to become a black puzzle. We can still shuffle the puzzles near these, though.
---
 Archipelago/load.gd |  9 ---------
 data/LL1.yaml       | 12 ++++++------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/Archipelago/load.gd b/Archipelago/load.gd
index 5403adb..f526411 100644
--- a/Archipelago/load.gd
+++ b/Archipelago/load.gd
@@ -44,15 +44,6 @@ func _load():
 
 	var gamedata = apclient.get_node("Gamedata")
 	if apclient._panel_shuffle == apclient.kREARRANGE_PANELS:
-		# Move mandatory wall-snipes in front of their respective walls. In
-		# the case of ZERO, we need to change it to be a black puzzle because
-		# the wall is black.
-		self.get_node("Panels/Backside Room/Panel_zero_zero").translation.z = 16.499
-		set_static_panel("Backside Room/Panel_zero_zero", "reknits", "stinker")
-
-		self.get_node("Panels/Backside Room/Panel_fourth_fourth").translation.z = -65.001
-		self.get_node("Panels/Chemistry Room/Panel_open").translation.x = -87.001
-
 		# Do the actual shuffling.
 		var panel_pools = {}
 		for panel in gamedata.panels:
diff --git a/data/LL1.yaml b/data/LL1.yaml
index 08d7d4f..7924044 100644
--- a/data/LL1.yaml
+++ b/data/LL1.yaml
@@ -1450,14 +1450,14 @@
 - id: Backside Room/Panel_third_third
   color: white
   tag: midwhite
-# We are displacing this panel in front of the wall.
+# This is a mandatory wall-snipe, so we will not shuffle it.
 - id: Backside Room/Panel_fourth_fourth
   color: white
-  tag: midwhite
-# We are displacing this panel in front of the black wall
+  tag: forbid
+# This is a mandatory wall-snipe, so we will not shuffle it.
 - id: Backside Room/Panel_zero_zero
   color: black
-  tag: midblack
+  tag: forbid
 - id: Backside Room/Panel_one_one
   color: white
   tag: midwhite
@@ -2300,10 +2300,10 @@
 - id: Ceiling Room/Panel_answer_4
   color: yellow
   tag: topyellow
-# We are displacing this panel in front of the wall.
+# This is a mandatory wall-snipe, so we will not shuffle it.
 - id: Chemistry Room/Panel_open
   color: white
-  tag: midwhite
+  tag: forbid
 - id: Chemistry Room/Panel_close
   color: black
   tag: botblack
-- 
cgit 1.4.1