From 613f7e41b05048f36f23990daa221fc4d3774b11 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Fri, 21 Apr 2023 11:03:11 -0400
Subject: OPEN and FOURTH are now displaced as well

Now all three mandatory wall-snipes (and their adjacent panels) can be shuffled in panel shuffle mode.
---
 Archipelago/load.gd |  8 ++++++--
 data/LL1.yaml       | 18 +++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Archipelago/load.gd b/Archipelago/load.gd
index 59b510a..6b65b0e 100644
--- a/Archipelago/load.gd
+++ b/Archipelago/load.gd
@@ -44,11 +44,15 @@ func _load():
 
 	var gamedata = apclient.get_node("Gamedata")
 	if apclient._panel_shuffle == apclient.kREARRANGE_PANELS:
-		# Move ZERO in front of the black wall, and replace the puzzle because
-		# it has to be a black puzzle now.
+		# 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 c1d53c2..08d7d4f 100644
--- a/data/LL1.yaml
+++ b/data/LL1.yaml
@@ -1441,19 +1441,19 @@
 - id: Backside Room/Panel_farther_far
   color: red
   tag: midred
-# We will forbid these four for now because the fourth is hidden
 - id: Backside Room/Panel_first_first
   color: white
-  tag: forbid
+  tag: midwhite
 - id: Backside Room/Panel_second_second
   color: white
-  tag: forbid
+  tag: midwhite
 - id: Backside Room/Panel_third_third
   color: white
-  tag: forbid
+  tag: midwhite
+# We are displacing this panel in front of the wall.
 - id: Backside Room/Panel_fourth_fourth
   color: white
-  tag: forbid
+  tag: midwhite
 # We are displacing this panel in front of the black wall
 - id: Backside Room/Panel_zero_zero
   color: black
@@ -2300,16 +2300,16 @@
 - id: Ceiling Room/Panel_answer_4
   color: yellow
   tag: topyellow
-# Forbid these three for now because one is hidden
+# We are displacing this panel in front of the wall.
 - id: Chemistry Room/Panel_open
   color: white
-  tag: forbid
+  tag: midwhite
 - id: Chemistry Room/Panel_close
   color: black
-  tag: forbid
+  tag: botblack
 - id: Chemistry Room/Panel_ahead
   color: black
-  tag: forbid
+  tag: botblack
 - id: Chemistry Room/Panel_yellow_bot_1
   color: yellow
   tag: botyellow
-- 
cgit 1.4.1