From 7cbadc54777fc537191c0e18d88754dd4caaf591 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Thu, 23 Oct 2025 14:53:05 -0400
Subject: Fixed Trans Rights area not being accessible in unshuffled doors

---
 data/ids.yaml                                    |  6 ++++--
 data/maps/icarus/connections.txtpb               | 10 ++++++++++
 data/maps/icarus/doors.txtpb                     |  6 +++---
 data/maps/icarus/rooms/Trans Rights Panels.txtpb | 22 ++++++++++++++++++++++
 data/maps/icarus/rooms/Trans Rights.txtpb        | 21 ---------------------
 5 files changed, 39 insertions(+), 26 deletions(-)
 create mode 100644 data/maps/icarus/rooms/Trans Rights Panels.txtpb

diff --git a/data/ids.yaml b/data/ids.yaml
index f2dcf9a..42f886f 100644
--- a/data/ids.yaml
+++ b/data/ids.yaml
@@ -1287,12 +1287,14 @@ maps:
           BASIS (1): 2922
           PRINCE: 2921
       Trans Rights:
+        panels:
+          SERVANT (1): 2926
+          SERVANT (2): 2927
+      Trans Rights Panels:
         panels:
           AGENDER: 2923
           HUMAN (3): 2924
           HUMAN (4): 2925
-          SERVANT (1): 2926
-          SERVANT (2): 2927
       Welcome Spine (Obverse):
         panels:
           FISHWIFE: 2928
diff --git a/data/maps/icarus/connections.txtpb b/data/maps/icarus/connections.txtpb
index 1ec90d9..b42a660 100644
--- a/data/maps/icarus/connections.txtpb
+++ b/data/maps/icarus/connections.txtpb
@@ -607,6 +607,16 @@ connections {
   }
   oneway: true
 }
+connections {
+  from_room: "Trans Rights"
+  to_room: "Trans Rights Panels"
+  oneway: true
+}
+connections {
+  from_room: "Above Trans Rights"
+  to_room: "Trans Rights Panels"
+  oneway: true
+}
 # It is possible to fall out of the map from every room, which always sends you
 # back to the beginning.
 connections {
diff --git a/data/maps/icarus/doors.txtpb b/data/maps/icarus/doors.txtpb
index 5554393..8cd54fc 100644
--- a/data/maps/icarus/doors.txtpb
+++ b/data/maps/icarus/doors.txtpb
@@ -2,14 +2,14 @@ doors {
   name: "Agender Door"
   type: STANDARD
   receivers: "Components/Doors/quicktravel3"
-  panels { room: "Trans Rights" name: "AGENDER" }
-  location_room: "Trans Rights"
+  panels { room: "Trans Rights Panels" name: "AGENDER" }
+  location_room: "Trans Rights Panels"
 }
 doors {
   name: "Quick Travel 3"
   type: ITEM_ONLY
   receivers: "Components/Paintings/QuickTravel/go3"
-  panels { room: "Trans Rights" name: "AGENDER" }
+  panels { room: "Trans Rights Panels" name: "AGENDER" }
 }
 doors {
   name: "Pea Door"
diff --git a/data/maps/icarus/rooms/Trans Rights Panels.txtpb b/data/maps/icarus/rooms/Trans Rights Panels.txtpb
new file mode 100644
index 0000000..e51d4bc
--- /dev/null
+++ b/data/maps/icarus/rooms/Trans Rights Panels.txtpb	
@@ -0,0 +1,22 @@
+name: "Trans Rights Panels"
+panels {
+  name: "AGENDER"
+  path: "Panels/Room_1/human4"
+  clue: "agender"
+  answer: "human"
+  symbols: GENDER
+}
+panels {
+  name: "HUMAN (3)"
+  path: "Panels/Room_1/human5"
+  clue: "human"
+  answer: "female"
+  symbols: GENDER
+}
+panels {
+  name: "HUMAN (4)"
+  path: "Panels/Room_1/human6"
+  clue: "human"
+  answer: "male"
+  symbols: GENDER
+}
diff --git a/data/maps/icarus/rooms/Trans Rights.txtpb b/data/maps/icarus/rooms/Trans Rights.txtpb
index 2e95de6..2ca98dd 100644
--- a/data/maps/icarus/rooms/Trans Rights.txtpb	
+++ b/data/maps/icarus/rooms/Trans Rights.txtpb	
@@ -1,26 +1,5 @@
 name: "Trans Rights"
 # slay
-panels {
-  name: "AGENDER"
-  path: "Panels/Room_1/human4"
-  clue: "agender"
-  answer: "human"
-  symbols: GENDER
-}
-panels {
-  name: "HUMAN (3)"
-  path: "Panels/Room_1/human5"
-  clue: "human"
-  answer: "female"
-  symbols: GENDER
-}
-panels {
-  name: "HUMAN (4)"
-  path: "Panels/Room_1/human6"
-  clue: "human"
-  answer: "male"
-  symbols: GENDER
-}
 panels {
   name: "SERVANT (1)"
   path: "Panels/Room_1/servant"
-- 
cgit 1.4.1