From b51d2ff1962d46785c2933983ccbfc47216a3b33 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 19 Apr 2023 23:35:09 -0400
Subject: Art gallery ORDER is now set to the randomized subpanels

---
 Archipelago/load.gd | 11 +++++++++++
 data/LL1.yaml       |  8 ++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Archipelago/load.gd b/Archipelago/load.gd
index 60a78d4..9632d61 100644
--- a/Archipelago/load.gd
+++ b/Archipelago/load.gd
@@ -100,6 +100,17 @@ func _load():
 					for sign_name in target["copy_to_sign"]:
 						self.get_node("Decorations/PanelSign").get_node(sign_name).value = source["hint"]
 
+		# Change the answer to the final puzzle in the art gallery based on the
+		# puzzles that were shuffled into the constituent places.
+		var new_answer = panels_parent.get_node("Painting Room/Panel_eon_one").answer
+		new_answer += " "
+		new_answer += panels_parent.get_node("Painting Room/Panel_path_road").answer
+		new_answer += " "
+		new_answer += panels_parent.get_node("Painting Room/Panel_any_many").answer
+		new_answer += " "
+		new_answer += panels_parent.get_node("Painting Room/Panel_send_use_turns").answer
+		panels_parent.get_node("Painting Room/Panel_order_onepathmanyturns").answer = new_answer
+
 	# Handle our other static panels after panel randomization, so that the old
 	# values can enter the pool, if necessary.
 	set_static_panel("Entry Room/Panel_hi_hi", "hi")
diff --git a/data/LL1.yaml b/data/LL1.yaml
index 6270e39..c1d53c2 100644
--- a/data/LL1.yaml
+++ b/data/LL1.yaml
@@ -1185,7 +1185,7 @@
   tag: midbrown
 - id: Painting Room/Panel_eon_one
   color: yellow
-  tag: forbid # because of ORDER
+  tag: midyellow
 - id: Painting Room/Panel_to_two
   color: red
   tag: midred
@@ -1200,7 +1200,7 @@
   tag: botblue
 - id: Painting Room/Panel_path_road
   color: brown
-  tag: forbid # because of ORDER
+  tag: botbrown
 - id: Painting Room/Panel_park_drive
   color: black
   tag: botblack
@@ -1215,7 +1215,7 @@
   tag: midblue
 - id: Painting Room/Panel_any_many
   color: blue
-  tag: forbid # because of ORDER
+  tag: midblue
 - id: Painting Room/Panel_man_many
   color: blue
   tag: midblue
@@ -1230,7 +1230,7 @@
   tag: midyellow
 - id: Painting Room/Panel_send_use_turns
   color: orange
-  tag: forbid # because of ORDER
+  tag: midorange
 - id: Painting Room/Panel_trust_06890
   color: orange
   tag: midorange
-- 
cgit 1.4.1