40 files changed, 483 insertions, 202 deletions

@@ -64,6 +64,16 @@ connections {
   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"
   door { name: "Red Blue Area Left Door" }
@@ -90,8 +100,19 @@ connections {
 }
 connections {
   from_room: "Red Blue Halls"
-  to_room: "Wrath Area"
+  to_room: "Least Blue Last"
+  oneway: true
+}
+connections {
+  from_room: "Red Blue Halls"
+  to_room: "Wrath Room"
   door { name: "Noon Door" }
+  oneway: true
+}
+connections {
+  from_room: "Wrath Room"
+  to_room: "Least Blue Last"
+  oneway: true
 }
 connections {
   from_room: "Red Blue Halls"
@@ -99,12 +120,17 @@ connections {
   door { name: "Scarf Door" }
 }
 connections {
-  from_room: "Wrath Area"
+  from_room: "Wrath Room"
+  to_room: "Rabbit Hole Lock"
+  door { name: "Noon Door" }
+}
+connections {
+  from_room: "Wrath Room"
   to_room: "Rabbit Hole"
   door { name: "Rabbithole Door" }
 }
 connections {
-  from_room: "Wrath Area"
+  from_room: "Wrath Room"
   to_room: "Blue Alcove"
   door { name: "Blue Alcove Entrance" }
 }
@@ -116,7 +142,7 @@ connections {
 connections {
   from_room: "Blue Alcove"
   to_room: "Least Blue Last"
-  door { name: "Red Alcove Exit" }
+  door { name: "Blue Alcove Exit" }
 }
 connections {
   from_room: "Parthenon Return"
@@ -144,6 +170,11 @@ connections {
   door { name: "Lime Room Entrance" }
 }
 connections {
+  from_room: "Lime Room"
+  to_room: "Revitalized Entrance"
+  door { name: "Revitalized Entrance" }
+}
+connections {
   from { painting { room: "Link Area" name: "NEAR" } }
   to { painting { room: "Flipped Link Area" name: "NEAR" } }
   oneway: true
@@ -157,4 +188,60 @@ connections {
   from_room: "D Room"
   to_room: "D Room Final"
   door { name: "D Room Panels" }
-}
\ No newline at end of file
+}
+connections {
+  from_room: "Starting Room"
+  to_room: "Digital Entrance"
+  door { name: "Second Room Left Door" }
+}
+connections {
+  from_room: "Digital Entrance"
+  to_room: "Starting Room"
+  oneway: true
+  vanilla_only: true
+}
+connections {
+  from_room: "Starting Room"
+  to_room: "Daedalus Entrance"
+  door { name: "Daedalus Entrance" }
+}
+connections {
+  from_room: "Starting Room"
+  to_room: "Composite Room Entrance"
+  door { name: "Composite Room Entrance" }
+}
+connections {
+  from_room: "Starting Room"
+  to_room: "Repetitive Entrance"
+  door { name: "Starting Room West Wall North Door" }
+}
+connections {
+  from_room: "Lime Room"
+  to_room: "White Hallway To Daedalus"
+  door { name: "Control Center White Door" }
+}
+connections {
+  from_room: "Flipped Second Room"
+  to_room: "Four Rooms Entrance"
+  door { name: "Flipped Second Room Right Door" }
+}
+connections {
+  from_room: "Link Area"
+  to_room: "Liberated Entrance"
+  door { name: "Liberated Entrance" }
+}
+connections {
+  from_room: "Link Area"
+  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
+}
@@ -62,27 +62,47 @@ doors {
   name: "Rabbithole Door"
   type: STANDARD
   receivers: "Components/Doors/second_right8"
-  panels { room: "Wrath Room" name: "RABBIT" }
-  panels { room: "Wrath Room" name: "HOLE" }
-  location_room: "Wrath Room"
+  panels { room: "Rabbit Hole Lock" name: "RABBIT" }
+  panels { room: "Rabbit Hole Lock" name: "HOLE" }
+  location_room: "Rabbit Hole Lock"
 }
 # second_right is vanilla because it's like LOST door.
 doors {
   name: "Noon Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/second_right5"
   receivers: "Components/Doors/second_right10"
   panels { room: "Red Blue Halls" name: "CENTER DAY" }
   location_room: "Red Blue Halls"
 }
 doors {
+  name: "Noon Door Panels"
+  type: LOCATION_ONLY
+  panels { room: "Red Blue Halls" name: "CENTER" }
+  panels { room: "Red Blue Halls" name: "DAY" }
+  panels { room: "Red Blue Halls" name: "CENTER DAY" }
+  location_room: "Red Blue Halls"
+  location_name: "CENTER, DAY, CENTER DAY"
+}
+doors {
   name: "Scarf Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/second_right6"
   panels { room: "Red Blue Halls" name: "RAIN WOMAN" }
   location_room: "Red Blue Halls"
 }
 doors {
+  name: "Scarf Door Panels"
+  type: LOCATION_ONLY
+  panels { room: "Red Blue Halls" name: "RAIN" }
+  panels { room: "Red Blue Halls" name: "WOMAN" }
+  panels { room: "Red Blue Halls" name: "RAIN WOMAN" }
+  location_room: "Red Blue Halls"
+  location_name: "RAIN, WOMAN, RAIN WOMAN"
+}
+doors {
   name: "Blue Alcove Entrance"
   type: STANDARD
   receivers: "Components/Doors/second_right9"
@@ -113,14 +133,14 @@ doors {
 }
 doors {
   name: "Right Eye Entrance"
-  type: STANDARD
+  type: ITEM_ONLY
   receivers: "Components/Doors/third_right"
   panels { room: "Trick Room" name: "INK" }
-  location_room: "Trick Room"
 }
 doors {
   name: "Red Blue Area Left Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/fourth_right"
   panels { room: "Right Eye" name: "WANDER" }
   location_room: "Right Eye"
@@ -132,14 +152,41 @@ doors {
   panels { room: "Right Eye" name: "WANDER" }
   location_room: "Right Eye"
 }
+doors {
+  name: "Wander Panels"
+  type: LOCATION_ONLY
+  panels { room: "Right Eye" name: "WANDER" }
+  panels { room: "Red Blue Halls" name: "WANDER" }
+  panels { room: "Link Area" name: "WANDER" }
+  panels { room: "Flipped Link Area" name: "WANDER" }
+  location_room: "Flipped Link Area"
+}
+doors {
+  name: "Flipped Right Eye Panels"
+  type: LOCATION_ONLY
+  panels { room: "Flipped Right Eye" name: "HERE" }
+  panels { room: "Flipped Right Eye" name: "WHERE" }
+  location_room: "Flipped Right Eye"
+  location_name: "HERE, WHERE"
+}
+doors {
+  name: "Big Eyes"
+  type: LOCATION_ONLY
+  panels { room: "Starting Room" name: "EYE" }
+  panels { room: "Right Eye" name: "EYE" }
+  location_room: "Right Eye"
+  location_name: "EYE"
+}
 # Components/Doors/back_left_1, _3, _4, _6 are vanilla because they're nothing.
 doors {
   name: "Orange Door Hider"
   type: STANDARD
   receivers: "Components/Doors/back_left_2"
   panels { room: "Colored Doors Area" name: "OPEN" answer: "orange" }
-  # "wall" is supposed to also work. idk man
+  panels { room: "Colored Doors Area" name: "OPEN" answer: "wall" }
+  complete_at: 1
   location_room: "Colored Doors Area"
+  location_name: "OPEN"
 }
 doors {
   name: "Lime Room Entrance"
@@ -160,6 +207,7 @@ doors {
 doors {
   name: "Control Center White Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/back_left_7"
   control_center_color: "white"
 }
@@ -194,10 +242,10 @@ doors {
   location_room: "Starting Room"
 }
 doors {
-  name: "Repetitive Entrance"
+  name: "Starting Room West Wall North Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/Entry/entry_proxied_9"
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
   name: "Shop Entrance"
@@ -210,20 +258,20 @@ 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 {
   name: "Flipped Pyramid Area Entrance"
-  type: ITEM_ONLY
+  type: EVENT
   receivers: "Components/Doors/Entry/entry_proxied_12"
-  switches: "double_letters"
+  double_letters: true
 }
 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 {
@@ -252,7 +300,7 @@ doors {
   type: ITEM_ONLY
   receivers: "Components/Doors/Entry/d_3"
   receivers: "Components/Doors/Entry/d_4"
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
   name: "D Room Panels"
@@ -287,7 +335,8 @@ doors {
 doors {
   name: "Least Blue Last Panels"
   type: EVENT
-  move_paintings { room: "Starting Room" name: "OWL" }
+  #move_paintings { room: "Starting Room" name: "OWL" }
+  #receivers: "Components/Paintings/owl/visibilityListener"
   panels { room: "Least Blue Last" name: "CAPABLE (1)" }
   panels { room: "Least Blue Last" name: "CAPABLE (2)" }
   panels { room: "Least Blue Last" name: "LUSTRE" }
@@ -301,14 +350,56 @@ doors {
 doors {
   name: "Red Room Painting"
   type: STANDARD
-  move_paintings { room: "Right Eye" name: "PSYCHIC" }
+  receivers: "Components/Paintings/psychic/teleportListener"
   panels { room: "Right Eye" name: "FAINT" }
   location_room: "Right Eye"
 }
 doors {
   name: "Third Eye Painting"
-  type: STANDARD
-  move_paintings { room: "Eye Room" name: "GALLERY" }
+  type: LOCATION_ONLY
+  # TODO: ummmm
   panels { room: "Eye Room" name: "I" }
   location_room: "Eye Room"
-}
\ No newline at end of file
+}
+doors {
+  name: "Gift Maps Entrance"
+  type: EVENT
+  receivers: "Components/GiftMapEntrance/PanelTeleporter"
+  double_letters: true
+}
+doors {
+  name: "Least Blue Last"
+  type: LOCATION_ONLY
+  panels { room: "Least Blue Last" name: "CAPABLE (1)" }
+  panels { room: "Least Blue Last" name: "CAPABLE (2)" }
+  panels { room: "Least Blue Last" name: "LUSTRE" }
+  panels { room: "Least Blue Last" name: "WANT" }
+  panels { room: "Least Blue Last" name: "STEALER" }
+  panels { room: "Least Blue Last" name: "OLD" }
+  panels { room: "Least Blue Last" name: "TRUST" }
+  panels { room: "Least Blue Last" name: "LABEL" }
+  panels { room: "Least Blue Last" name: "AIL" }
+  location_room: "Least Blue Last"
+}
+doors {
+  name: "Control Center White Panel"
+  type: LOCATION_ONLY
+  panels { room: "Lime Room" name: "COLOR" }
+  location_room: "Lime Room"
+  location_name: "COLOR"
+}
+doors {
+  name: "Rabbit Hole Blank Puzzle"
+  type: LOCATION_ONLY
+  panels { room: "Rabbit Hole" name: "Blank" }
+  location_room: "Rabbit Hole"
+  location_name: "Blank Puzzle"
+}
+doors {
+  name: "Wrath Room Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Wrath Room" name: "DICE" }
+  panels { room: "Wrath Room" name: "WREATH" }
+  location_room: "Wrath Room"
+  location_name: "DICE, WRATH"
+}
@@ -0,0 +1,23 @@
+display_name: "The Entry"
+# This is a debug warp to The Ancient and as far as I can tell there is no way
+# to access it.
+excluded_nodes: "Components/Warps/worldport-test"
+# Proxy stuff related to the Ctrl Tutorial.
+excluded_nodes: "Panels/Back Left/backleft_2_proxied_1"
+excluded_nodes: "Panels/Back Left/backleft_2_proxied_2"
+excluded_nodes: "Panels/Back Left/backleft_3_proxied_1"
+excluded_nodes: "Panels/Back Left/backleft_3_proxied_2"
+excluded_nodes: "Panels/Back Left/backleft_4_proxied_1"
+excluded_nodes: "Panels/Back Left/backleft_4_proxied_2"
+# This is a proxy related to the first panel and it doesn't seem useful.
+excluded_nodes: "Panels/Entry/entry_proxied_fake"
+# The gift map entrance is created by the mod.
+custom_nodes: "Components/GiftMapEntrance/GongusPanel"
+custom_nodes: "Components/GiftMapEntrance/HatkirbyPanel"
+custom_nodes: "Components/GiftMapEntrance/IcelyPanel"
+custom_nodes: "Components/GiftMapEntrance/KirbyPanel"
+custom_nodes: "Components/GiftMapEntrance/KiwiPanel"
+custom_nodes: "Components/GiftMapEntrance/Panel"
+custom_nodes: "Components/GiftMapEntrance/QPanel"
+custom_nodes: "Components/GiftMapEntrance/SouveyPanel"
+custom_nodes: "Components/GiftMapEntrance/StarPanel"
@@ -1,16 +1,16 @@
 name: "Blue Alcove"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
   name: "BLUE"
   path: "Panels/Back Right/br_11"
   clue: "blue"
   answer: "orange"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "ARMY"
   path: "Panels/Back Right/br_13"
   clue: "army"
   answer: "navy"
-  symbols: "example"
+  symbols: EXAMPLE
 }
\ No newline at end of file
@@ -1,5 +1,5 @@
 name: "Colored Doors Area"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 panels {
   name: "OPEN"
   path: "Panels/Back Left/backleft_proxying_1"
@@ -0,0 +1,9 @@
+name: "Composite Room Entrance"
+panel_display_name: "Starting Room"
+ports {
+  name: "COMPOSITE"
+  display_name: "Starting Room NE Worldport"
+  path: "Components/Warps/worldport12"
+  destination { x: 16 y: 0 z: -20 }
+  rotation: 90
+}
@@ -1,5 +1,5 @@
 name: "Ctrl Tutorial"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 panels {
   name: "RIGHT"
   path: "Panels/Back Left/backleft_proxying_2"
@@ -1,5 +1,5 @@
 name: "D Room Final"
-display_name: "D Room"
+panel_display_name: "D Room"
 letters {
   key: "d"
   path: "Components/Collectables/d"
@@ -1,65 +1,65 @@
 name: "D Room"
-display_name: "D Room"
+panel_display_name: "D Room"
 panels {
   name: "BASEBALL"
   path: "Panels/D/d_2"
   clue: "baseball"
   answer: "hat"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
   name: "BIKERS"
   path: "Panels/D/d_3"
   clue: "biker's"
   answer: "tan"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
   name: "RED"
   path: "Panels/D/d_4"
   clue: "red"
   answer: "ant"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
   name: "SUN"
   path: "Panels/D/d_5"
   clue: "sun"
   answer: "tan"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
   name: "BLACK"
   path: "Panels/D/d_6"
   clue: "black"
   answer: "ant"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
   name: "COWBOY"
   path: "Panels/D/d_7"
   clue: "cowboy"
   answer: "hat"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
   name: "SPRAY"
   path: "Panels/D/d_8"
   clue: "spray"
   answer: "tan"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
   name: "BOWLER"
   path: "Panels/D/d_9"
   clue: "bowler"
   answer: "hat"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
   name: "CARPENTER"
   path: "Panels/D/d_10"
   clue: "carpenter"
   answer: "ant"
-  symbols: "example"
+  symbols: EXAMPLE
 }
\ No newline at end of file
@@ -0,0 +1,9 @@
+name: "Daedalus Entrance"
+panel_display_name: "Starting Room"
+ports {
+  name: "DAEDALUS"
+  display_name: "Starting Room North Wall West Worldport"
+  path: "Components/Warps/worldport6"
+  destination { x: -16 y: 0 z: -20 }
+  rotation: 270
+}
@@ -0,0 +1,9 @@
+name: "Digital Entrance"
+panel_display_name: "Starting Room"
+ports {
+  name: "DIGITAL"
+  display_name: "Second Room Left Worldport"
+  path: "Components/Warps/worldport"
+  destination { x: -78 y: 0 z: -24 }
+  rotation: 270
+}
@@ -1,7 +1,9 @@
 name: "Entry Exit"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
   name: "GREAT"
+  display_name: "Second Room Right Worldport"
   path: "Components/Warps/worldport2"
-  orientation: "north"
-}
\ No newline at end of file
+  destination { x: 18 y: 0 z: -36 }
+  rotation: 180
+}
@@ -1,12 +1,12 @@
 name: "Eye Room"
-display_name: "Eye Room"
+panel_display_name: "Eye Room"
 panels {
   name: "I"
   path: "Panels/Entry/eyes_1"
   clue: "i"
   answer: "eyes"
-  symbols: "zero"
-  symbols: "planet"
+  symbols: ZERO
+  symbols: PLANET
 }
 paintings {
   name: "ENTER"
@@ -28,4 +28,11 @@ paintings {
   enter_only: true
   required_door { name: "Third Eye Painting" }
   display_name: "Painting Beside Panel"
-}
\ No newline at end of file
+}
+ports {
+  name: "LIONIZED"
+  display_name: "Eye Room Worldport"
+  path: "Components/Warps/worldport10"
+  destination { x: 18 y: 0 z: -88.5 }
+  rotation: 180
+}
@@ -1,23 +1,24 @@
 name: "Flipped Link Area"
-display_name: "Pyramid Area"
+panel_display_name: "Pyramid Area"
 panels {
   name: "WANDER"
   path: "Panels/Pilgrimage/cream_4"
   clue: "wander"
   answer: "roam"
-  symbols: "sun"
+  symbols: SUN
+  display_name: "WANDER (Flipped)"
 }
 paintings {
   name: "NEAR"
   path: "Components/Paintings/aches2"
   orientation: "north"
-  flipped: true
-  display_name: "Flipper Near Painting"
+  gravity: Y_PLUS
+  display_name: "Flipped Near Painting"
 }
 paintings {
   name: "FAR"
   path: "Components/Paintings/aches4"
   orientation: "south"
-  flipped: true
+  gravity: Y_PLUS
   display_name: "Flipped Far Painting"
 }
\ No newline at end of file
@@ -1,16 +1,6 @@
 name: "Flipped Pyramid Area"
-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
+panel_display_name: "Pyramid Area"
+# 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.
@@ -1,16 +1,16 @@
 name: "Flipped Right Eye"
-display_name: "Flip Area"
+panel_display_name: "Flip Area"
 panels {
   name: "WHERE"
   path: "Panels/Pilgrimage/cream_5"
   clue: "where"
   answer: "here"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "HERE"
   path: "Panels/Pilgrimage/cream_6"
   clue: "here"
   answer: "there"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
\ No newline at end of file
@@ -1,29 +1,23 @@
 name: "Flipped Second Room"
-display_name: "Flip Area"
+panel_display_name: "Flip Area"
 panels {
   name: "CLUE"
   path: "Panels/Entry/second_right_top"
   clue: "clue"
   answer: "hint"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "SLENDER"
   path: "Panels/Entry/second_left_top"
   clue: "slender"
   answer: "thin"
-  symbols: "sun"
+  symbols: SUN
 }
 paintings {
   name: "EYE"
   path: "Components/Paintings/eyes"
   orientation: "north"
-  flipped: true
+  gravity: Y_PLUS
   display_name: "Eye Painting"
 }
-ports {
-  name: "FOUR"
-  path: "Components/Warps/worldport9"
-  orientation: "south"
-  required_door { name: "Flipped Second Room Right Door" }
-}
\ No newline at end of file
@@ -0,0 +1,9 @@
+name: "Four Rooms Entrance"
+ports {
+  name: "FOUR"
+  display_name: "Flipped Second Room Right Worldport"
+  path: "Components/Warps/worldport9"
+  destination { x: -41 y: 6 z: -17.5 }
+  rotation: 0
+  # This isn't actually Y_PLUS gravity! A nearby warp sneakily flips you.
+}
@@ -1,14 +1,16 @@
 name: "Gallery Return"
-display_name: "Starting Room"
+panel_display_name: "Gallery Return"
 panels {
   name: "RETURN"
   path: "Panels/Entry/gallery_return"
   clue: "return"
   answer: "turn"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 ports {
   name: "GALLERY"
+  display_name: "Gallery Return"
   path: "Components/Warps/worldport4"
-  orientation: "north"
+  destination { x: -38 y: 0 z: 8.5 }
+  rotation: 180
 }
\ No newline at end of file
@@ -1,67 +1,67 @@
 name: "Least Blue Last"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
   name: "CAPABLE (1)"
   path: "Panels/LBL/lbl_1"
   clue: "capable"
   answer: "able"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "CAPABLE (2)"
   path: "Panels/LBL/lbl_2"
   clue: "capable"
   answer: "able"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "LUSTRE"
   path: "Panels/LBL/lbl_3"
   clue: "lustre"
   answer: "lust"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "WANT"
   path: "Panels/LBL/lbl_4"
   clue: "want"
   answer: "lust"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "STEALER"
   path: "Panels/LBL/lbl_5"
   clue: "stealer"
   answer: "stale"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "OLD"
   path: "Panels/LBL/lbl_6"
   clue: "old"
   answer: "stale"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "TRUST"
   path: "Panels/LBL/lbl_7"
   clue: "trust"
   answer: "lust"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "LABEL"
   path: "Panels/LBL/lbl_8"
   clue: "label"
   answer: "able"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "AIL"
   path: "Panels/LBL/lbl_9"
   clue: "ail"
   answer: "stale"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "CORNERS"
@@ -72,8 +72,10 @@ panels {
 }
 ports {
   name: "DARKROOM"
+  display_name: "Near L1 Worldport"
   path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: 43 y: 0 z: -10 }
+  rotation: 0
 }
 paintings {
   name: "PAINS"
@@ -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
+}
@@ -0,0 +1,8 @@
+name: "Liberated Entrance"
+ports {
+  name: "BLUE"
+  display_name: "Pyramid Area Blue Worldport"
+  path: "worldport8"
+  destination { x: 18 y: 0 z: 55 }
+  rotation: 270
+}
@@ -1,5 +1,5 @@
 name: "Lime Room"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 panels {
   name: "HIDE"
   path: "Panels/Back Left/backleft_proxying_3"
@@ -17,17 +17,5 @@ panels {
   path: "Panels/Back Left/backleft_proxying_5"
   clue: "color"
   answer: "white"
-  symbols: "example"
+  symbols: EXAMPLE
 }
-ports {
-  name: "DAEDALUS"
-  path: "Components/Warps/worldport11"
-  orientation: "west"
-  required_door { name: "Control Center White Door" }
-}
-ports {
-  name: "REVITALIZED"
-  path: "worldport7"
-  orientation: "north"
-  required_door { name: "Revitalized Entrance" }
-}
\ No newline at end of file
@@ -1,11 +1,12 @@
 name: "Link Area"
-display_name: "Pyramid Area"
+panel_display_name: "Pyramid Area"
 panels {
   name: "WANDER"
   path: "Panels/Pilgrimage/cream_3"
   clue: "wander"
   answer: "amble"
-  symbols: "sun"
+  symbols: SUN
+  display_name: "WANDER (Obverse)"
 }
 paintings {
   name: "NEAR"
@@ -25,15 +26,3 @@ paintings {
   orientation: "south"
   display_name: "Center Painting"
 }
-ports {
-  name: "BLUE"
-  path: "worldport8"
-  orientation: "west"
-  required_door { name: "Liberated Entrance" }
-}
-ports {
-  name: "BROWN"
-  path: "worldport9"
-  orientation: "east"
-  required_door { name: "Literate Entrance" }
-}
\ No newline at end of file
@@ -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
+}
@@ -0,0 +1,8 @@
+name: "Literate Entrance"
+ports {
+  name: "BROWN"
+  display_name: "Pyramid Area Brown Worldport"
+  path: "worldport9"
+  destination { x: 39 y: 0 z: 55 }
+  rotation: 90
+}
@@ -1,14 +1,16 @@
 name: "Parthenon Return"
-display_name: "Starting Room"
+panel_display_name: "Parthenon Return"
 panels {
   name: "RETURN"
   path: "Panels/Back Left/backleft_return"
   clue: "return"
   answer: "turn"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 ports {
   name: "PARTHENON"
+  display_name: "Parthenon Return"
   path: "Components/Warps/worldport8"
-  orientation: "north"
-}
\ No newline at end of file
+  destination { x: -5.5 y: 0 z: 18 }
+  rotation: 180
+}
@@ -0,0 +1,18 @@
+name: "Rabbit Hole Lock"
+panel_display_name: "Red Blue Area"
+panels {
+  name: "RABBIT"
+  path: "Panels/Back Right/br_4"
+  clue: "rabbit"
+  answer: "hair"
+  symbols: SUN
+  symbols: ZERO
+}
+panels {
+  name: "HOLE"
+  path: "Panels/Back Right/br_5"
+  clue: "hole"
+  answer: "part"
+  symbols: ZERO
+  symbols: BOXES
+}
@@ -1,13 +1,15 @@
 name: "Rabbit Hole"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
-  name: "PUZZLE"
+  name: "Blank"
   path: "Panels/Back Right/br_6"
   clue: ""
   answer: "down"
 }
 ports {
   name: "HOLE"
+  display_name: "Rabbit Hole"
   path: "worldport4"
-  orientation: "down"
-}
\ No newline at end of file
+  destination { x: 74 y: 0 z: -43 }
+  rotation: 0
+}
@@ -1,16 +1,16 @@
 name: "Red Alcove"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
   name: "BROW"
   path: "Panels/Back Right/br_10"
   clue: "brow"
   answer: "brown"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "DEAD"
   path: "Panels/Back Right/br_12"
   clue: "dead"
   answer: "red"
-  symbols: "zero"
+  symbols: ZERO
 }
\ No newline at end of file
@@ -1,56 +1,56 @@
 name: "Red Blue Halls"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
   name: "CENTER"
   path: "Panels/Back Right/br_1"
   clue: "center"
   answer: "middle"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "DAY"
   path: "Panels/Back Right/br_2"
   clue: "day"
   answer: "night"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "CENTER DAY"
   path: "Panels/Back Right/br_3"
   clue: ""
   answer: "noon"
-  symbols: "sun"
-  symbols: "sparkles"
-  symbols: "lingo"
+  symbols: SUN
+  symbols: SPARKLES
+  symbols: LINGO
 }
 panels {
   name: "WANDER"
   path: "Panels/Pilgrimage/cream_2"
   clue: "wander"
   answer: "meander"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "RAIN"
   path: "Panels/Back Right/br_7"
   clue: "rain"
   answer: "snow"
-  symbols: "cross"
+  symbols: CROSS
 }
 panels {
   name: "WOMAN"
   path: "Panels/Back Right/br_8"
   clue: "woman"
   answer: "man"
-  symbols: "gender"
+  symbols: GENDER
 }
 panels {
   name: "RAIN WOMAN"
   path: "Panels/Back Right/br_9"
   clue: ""
   answer: "scarf"
-  symbols: "boxes"
-  symbols: "lingo"
+  symbols: BOXES
+  symbols: LINGO
 }
 paintings {
   name: "BLARE"
@@ -0,0 +1,9 @@
+name: "Repetitive Entrance"
+panel_display_name: "Starting Room"
+ports {
+  name: "REPETITIVE"
+  display_name: "Starting Room West Wall North Worldport"
+  path: "Components/Warps/worldport7"
+  destination { x: -20 y: 0 z: -16 }
+  rotation: 180
+}
@@ -0,0 +1,9 @@
+name: "Revitalized Entrance"
+panel_display_name: "Colored Doors Area"
+ports {
+  name: "REVITALIZED"
+  display_name: "Plum Hallway"
+  path: "worldport7"
+  destination { x: -58 y: 0 z: 31.5 }
+  rotation: 180
+}
@@ -1,11 +1,11 @@
 name: "Right Eye"
-display_name: "Right Eye Area"
+panel_display_name: "Right Eye Area"
 panels {
   name: "EYE"
   path: "Panels/Entry/front_2"
   clue: "eye"
   answer: "spy"
-  symbols: "zero"
+  symbols: ZERO
 }
 panels {
   name: "WANDER"
@@ -19,7 +19,7 @@ panels {
   path: "Panels/Entry/partial_1"
   clue: "faint"
   answer: "paint"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 paintings {
   name: "PSYCHIC"
@@ -1,14 +1,16 @@
 name: "Shop Entrance"
-display_name: "Starting Room"
+panel_display_name: "Shop Entrance"
 panels {
   name: "TURN"
   path: "Panels/Entry/l_opener_2"
   clue: "turn"
   answer: "turned"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 ports {
   name: "SHOP"
+  display_name: "Shop Entrance"
   path: "Components/Warps/worldport13"
-  orientation: "east"
+  destination { x: 18 y: 0 z: 49 }
+  rotation: 90
 }
\ No newline at end of file
@@ -1,10 +1,11 @@
 name: "Starting Room"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 panels {
   name: "HI"
   path: "Panels/Entry/entry_proxying_1"
   clue: "hi"
   answer: "hi"
+  proxies { answer: "hi" path: "Panels/Entry/entry_proxied_1" }
   proxies { answer: "bye" path: "Panels/Entry/entry_proxied_2" }
   proxies { answer: "hidden" path: "Panels/Entry/entry_proxied_5" }
   proxies { answer: "high" path: "Panels/Entry/entry_proxied_3" }
@@ -23,7 +24,9 @@ panels {
   path: "Panels/Entry/front_1"
   clue: "eye"
   answer: "i"
-  symbols: "zero"
+  #symbols: ZERO
+  # This panel blocks getting N1 and T1. We will mod it to be I/I with no symbol
+  # when symbol shuffle is on.
 }
 panels {
   name: "HINT"
@@ -43,6 +46,25 @@ panels {
   clue: "than"
   answer: "than"
 }
+panels {
+  name: "Gift Maps"
+  # TODO: exclude from panelsanity
+  path: "Components/GiftMapEntrance/Panel"
+  clue: "player"
+  answer: ""
+  # The puzzle solution doesn't matter. We'll change it to the player's name
+  # for fun.
+  symbols: QUESTION
+  proxies { answer: "gongus" path: "Components/GiftMapEntrance/GongusPanel" }
+  proxies { answer: "hatkirby" path: "Components/GiftMapEntrance/HatkirbyPanel" }
+  proxies { answer: "icely" path: "Components/GiftMapEntrance/IcelyPanel" }
+  proxies { answer: "kirby" path: "Components/GiftMapEntrance/KirbyPanel" }
+  proxies { answer: "kiwi" path: "Components/GiftMapEntrance/KiwiPanel" }
+  proxies { answer: "q" path: "Components/GiftMapEntrance/QPanel" }
+  proxies { answer: "souvey" path: "Components/GiftMapEntrance/SouveyPanel" }
+  proxies { answer: "star" path: "Components/GiftMapEntrance/StarPanel" }
+  required_door { name: "Gift Maps Entrance" }
+}
 letters {
   key: "h"
   path: "Components/Collectables/h"
@@ -77,27 +99,3 @@ paintings {
   required_door { name: "Near D Room Painting" }
   display_name: "Near D Room Painting"
 }
-ports {
-  name: "DIGITAL"
-  path: "Components/Warps/worldport"
-  orientation: "west"
-  required_door { name: "Second Room Left Door" }
-}
-ports {
-  name: "DAEDALUS"
-  path: "Components/Warps/worldport6"
-  orientation: "west"
-  required_door { name: "Daedalus Entrance" }
-}
-ports {
-  name: "REPETITIVE"
-  path: "Components/Warps/worldport7"
-  orientation: "north"
-  required_door { name: "Repetitive Entrance" }
-}
-ports {
-  name: "COMPOSITE"
-  path: "Components/Warps/worldport12"
-  orientation: "east"
-  required_door { name: "Composite Room Entrance" }
-}
@@ -1,5 +1,5 @@
 name: "Trick Room"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 panels {
   name: "INK"
   path: "Panels/Entry/l_opener_1"
@@ -0,0 +1,9 @@
+name: "White Hallway To Daedalus"
+panel_display_name: "Colored Doors Area"
+ports {
+  name: "DAEDALUS"
+  display_name: "White Control Center Hallway"
+  path: "Components/Warps/worldport11"
+  destination { x: -45 y: 0 z: 24 }
+  rotation: 270
+}
@@ -1,40 +1,24 @@
 name: "Wrath Room"
-display_name: "Red Blue Area"
-panels {
-  name: "RABBIT"
-  path: "Panels/Back Right/br_4"
-  clue: "rabbit"
-  answer: "hair"
-  symbols: "sun"
-  symbols: "zero"
-}
-panels {
-  name: "HOLE"
-  path: "Panels/Back Right/br_5"
-  clue: "hole"
-  answer: "part"
-  symbols: "zero"
-  symbols: "boxes"
-}
+panel_display_name: "Red Blue Area"
 panels {
   name: "WREATH"
   path: "Panels/Back Right/br_17"
   clue: "wreath"
   answer: "wrath"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "DICE"
   path: "Panels/Back Right/br_16"
   clue: "dice"
   answer: "die"
-  symbols: "planet"
+  symbols: PLANET
 }
 panels {
   name: "CORN"
   path: "Panels/Back Right/br_15"
   clue: "corn"
   answer: "corners"
-  symbols: "sparkles"
-  symbols: "planet"
+  symbols: SPARKLES
+  symbols: PLANET
 }
\ No newline at end of file
@@ -1,11 +1,13 @@
 name: "X Area"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 letters {
   key: "x"
   path: "Components/Collectables/x"
 }
 ports {
   name: "CC"
+  display_name: "Near X1 Worldport"
   path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: -12.5 y: 0 z: 60 }
+  rotation: 270
 }