From 86a92ea239adf0c462009096e91e06c1c121ade2 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Sun, 5 Oct 2025 11:57:29 -0400
Subject: Liberated/Literate entrance panels in logic looking up

---
 data/ids.yaml                                        | 10 ++++++----
 data/maps/the_entry/connections.txtpb                | 20 ++++++++++++++++++++
 data/maps/the_entry/doors.txtpb                      |  4 ++--
 data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb | 18 ++++--------------
 .../the_entry/rooms/Liberated Entrance Panel.txtpb   |  9 +++++++++
 .../the_entry/rooms/Literate Entrance Panel.txtpb    |  9 +++++++++
 6 files changed, 50 insertions(+), 20 deletions(-)
 create mode 100644 data/maps/the_entry/rooms/Liberated Entrance Panel.txtpb
 create mode 100644 data/maps/the_entry/rooms/Literate Entrance Panel.txtpb

(limited to 'data')

diff --git a/data/ids.yaml b/data/ids.yaml
index 80ace1a..be5c0f8 100644
--- a/data/ids.yaml
+++ b/data/ids.yaml
@@ -1635,10 +1635,6 @@ maps:
       Flipped Link Area:
         panels:
           WANDER: 340
-      Flipped Pyramid Area:
-        panels:
-          TURN (1): 341
-          TURN (2): 342
       Flipped Right Eye:
         panels:
           HERE: 344
@@ -1662,6 +1658,9 @@ maps:
           STEALER: 352
           TRUST: 354
           WANT: 351
+      Liberated Entrance Panel:
+        panels:
+          TURN (1): 341
       Lime Room:
         panels:
           COLOR: 361
@@ -1670,6 +1669,9 @@ maps:
       Link Area:
         panels:
           WANDER: 362
+      Literate Entrance Panel:
+        panels:
+          TURN (2): 342
       Parthenon Return:
         panels:
           RETURN: 363
diff --git a/data/maps/the_entry/connections.txtpb b/data/maps/the_entry/connections.txtpb
index 7ab15ff..6260665 100644
--- a/data/maps/the_entry/connections.txtpb
+++ b/data/maps/the_entry/connections.txtpb
@@ -63,6 +63,16 @@ connections {
   to_room: "Flipped Pyramid Area"
   door { name: "Flipped Pyramid Area Entrance" }
 }
+connections {
+  from_room: "Flipped Pyramid Area"
+  to_room: "Liberated Entrance Panel"
+  oneway: true
+}
+connections {
+  from_room: "Flipped Pyramid Area"
+  to_room: "Literate Entrance Panel"
+  oneway: true
+}
 connections {
   from_room: "Right Eye"
   to_room: "Least Blue Last"
@@ -225,3 +235,13 @@ connections {
   to_room: "Literate Entrance"
   door { name: "Literate Entrance" }
 }
+connections {
+  from_room: "Liberated Entrance"
+  to_room: "Liberated Entrance Panel"
+  oneway: true
+}
+connections {
+  from_room: "Literate Entrance"
+  to_room: "Literate Entrance Panel"
+  oneway: true
+}
diff --git a/data/maps/the_entry/doors.txtpb b/data/maps/the_entry/doors.txtpb
index 466f5ce..40e486a 100644
--- a/data/maps/the_entry/doors.txtpb
+++ b/data/maps/the_entry/doors.txtpb
@@ -211,7 +211,7 @@ doors {
   name: "Liberated Entrance"
   type: STANDARD
   receivers: "Components/Doors/Entry/entry_proxied_10"
-  panels { room: "Flipped Pyramid Area" name: "TURN (1)" }
+  panels { room: "Liberated Entrance Panel" name: "TURN (1)" }
   location_room: "Flipped Pyramid Area"
 }
 doors {
@@ -224,7 +224,7 @@ doors {
   name: "Literate Entrance"
   type: STANDARD
   receivers: "Components/Doors/Entry/entry_proxied_11"
-  panels { room: "Flipped Pyramid Area" name: "TURN (2)" }
+  panels { room: "Literate Entrance Panel" name: "TURN (2)" }
   location_room: "Flipped Pyramid Area"
 }
 doors {
diff --git a/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb b/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb
index c0be783..30e737f 100644
--- a/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb	
+++ b/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb	
@@ -1,16 +1,6 @@
 name: "Flipped Pyramid Area"
 panel_display_name: "Pyramid Area"
-panels {
-  name: "TURN (1)"
-  path: "Panels/Entry/l_opener_3"
-  clue: "turn"
-  answer: "flip"
-  symbols: SUN
-}
-panels {
-  name: "TURN (2)"
-  path: "Panels/Entry/l_opener_4"
-  clue: "turn"
-  answer: "spin"
-  symbols: SUN
-}
\ No newline at end of file
+# The fact that the doors here cover up the panels once they open is a problem
+# since you're not guaranteed to have access to the lower area if painting
+# shuffle is a thing. So we need to edit these doors so that they don't cover up
+# the panels.
diff --git a/data/maps/the_entry/rooms/Liberated Entrance Panel.txtpb b/data/maps/the_entry/rooms/Liberated Entrance Panel.txtpb
new file mode 100644
index 0000000..7c5ef71
--- /dev/null
+++ b/data/maps/the_entry/rooms/Liberated Entrance Panel.txtpb	
@@ -0,0 +1,9 @@
+name: "Liberated Entrance Panel"
+panel_display_name: "Pyramid Area"
+panels {
+  name: "TURN (1)"
+  path: "Panels/Entry/l_opener_3"
+  clue: "turn"
+  answer: "flip"
+  symbols: SUN
+}
diff --git a/data/maps/the_entry/rooms/Literate Entrance Panel.txtpb b/data/maps/the_entry/rooms/Literate Entrance Panel.txtpb
new file mode 100644
index 0000000..676598b
--- /dev/null
+++ b/data/maps/the_entry/rooms/Literate Entrance Panel.txtpb	
@@ -0,0 +1,9 @@
+name: "Literate Entrance Panel"
+panel_display_name: "Pyramid Area"
+panels {
+  name: "TURN (2)"
+  path: "Panels/Entry/l_opener_4"
+  clue: "turn"
+  answer: "spin"
+  symbols: SUN
+}
-- 
cgit 1.4.1