2 files changed, 25 insertions, 20 deletions

@@ -18,20 +18,6 @@ func _load():
                 if "answer" in node:
                         node.answer = apclient.ap_user
 
-        # Handle our other static panels.
-        set_static_panel("Entry Room/Panel_write_write", "seed")
-        set_static_panel("Entry Room/Panel_same_same", str(apclient._slot_seed))
-        set_static_panel("Entry Room/Panel_type_type", "victory")
-
-        var victory_condition = "unknown"
-        if apclient._victory_condition == apclient.kTHE_END:
-                victory_condition = "the end"
-        elif apclient._victory_condition == apclient.kTHE_MASTER:
-                victory_condition = "the master"
-
-        set_static_panel("Entry Room/Panel_this_this", victory_condition)
-        set_static_panel("Entry Room/Panel_hidden_hidden", "hewwo")
-
         # This is the best time to create the location nodes, since the map is now
         # loaded but the panels haven't been solved from the save file yet.
         var panels_parent = self.get_node("Panels")
@@ -104,6 +90,25 @@ func _load():
                                         target_panel_node.text = source["hint"]
                                         target_panel_node.answer = source["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")
+        set_static_panel("Entry Room/Panel_write_write", "seed")
+        set_static_panel("Entry Room/Panel_same_same", str(apclient._slot_seed))
+        set_static_panel("Entry Room/Panel_type_type", "victory")
+
+        var victory_condition = "unknown"
+        if apclient._victory_condition == apclient.kTHE_END:
+                victory_condition = "the end"
+        elif apclient._victory_condition == apclient.kTHE_MASTER:
+                victory_condition = "the master"
+
+        set_static_panel("Entry Room/Panel_this_this", victory_condition)
+        set_static_panel("Entry Room/Panel_hidden_hidden", "hewwo")
+        set_static_panel("Entry Room/Panel_hi_high", "goode", "good")
+        set_static_panel("Entry Room/Panel_low_low", "serendipity", "luck")
+        set_static_panel("Shuffle Room/Panel_secret_secret", "trans rights", "human rights")
+
         # Randomize the paintings, if necessary.
         if apclient._painting_shuffle:
                 var pd_script = ResourceLoader.load("user://maps/Archipelago/paintingdata.gd")
@@ -1,22 +1,22 @@
 ---
 - id: Entry Room/Panel_hi_hi
   color: white
-  tag: forbid
+  tag: midwhite
 - id: Entry Room/Panel_type_type
   color: white
-  tag: forbid
+  tag: midwhite
 - id: Entry Room/Panel_this_this
   color: white
-  tag: forbid
+  tag: midwhite
 - id: Entry Room/Panel_write_write
   color: white
-  tag: forbid
+  tag: midwhite
 - id: Entry Room/Panel_same_same
   color: white
-  tag: forbid
+  tag: midwhite
 - id: Entry Room/Panel_hidden_hidden
   color: white
-  tag: forbid
+  tag: midwhite
 - id: Entry Room/Panel_hi_high
   color: white
   tag: topwhite