57 files changed, 1588 insertions, 66 deletions

@@ -165,3 +165,16 @@ doors {
   panels { room: "Unyielding Entrance" name: "SEEK" }
   location_room: "Unyielding Entrance"
 }
+doors {
+  name: "Near Perceptive Panel"
+  type: LOCATION_ONLY
+  panels { room: "Perceptive Entrance" name: "COLORS" }
+  location_room: "Perceptive Entrance"
+  location_name: "COLORS"
+}
+doors {
+  name: "Letters Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "Letters" }
+  location_room: "Main Area"
+}
@@ -5,6 +5,8 @@ ports {
   path: "Components/Warps/worldport8"
   destination { x: -27 y: 0 z: -34 }
   rotation: 90
-  # TODO: shuffle entrances with dependent keyholders
+  # This is because there's no port on the other side of the connection, so if
+  # this connection was removed and gallery paintings aren't shuffled then
+  # there'd be no way into The Ancient.
   no_shuffle: true
 }
@@ -188,10 +188,12 @@ doors {
 }
 doors {
   name: "Welcome Back Secret Door"
-  type: ITEM_ONLY
+  type: STANDARD
   receivers: "Components/Doors/Entry/entry_13"
   panels { room: "Welcome Back Area" name: "FAREWELL LITTLE LAMB" }
   panels { room: "West Spire" name: "BYE" }
+  location_room: "West Spire"
+  location_name: "BYE, FAREWELL LITTLE LAMB"
 }
 doors {
   name: "Welcome Back Door"
@@ -225,12 +227,21 @@ doors {
 }
 doors {
   name: "Starting Room East Wall Center Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/Entry/entry_6"
   panels { room: "Rainbow Color Backside" name: "?" }
   location_room: "Rainbow Color Backside"
 }
 doors {
+  name: "Rainbow Color Backside Panels"
+  type: LOCATION_ONLY
+  panels { room: "Rainbow Color Backside" name: "?" }
+  panels { room: "Rainbow Color Backside" name: "BACKSIDE" }
+  location_room: "Rainbow Color Backside"
+  location_name: "BACKSIDE, ?"
+}
+doors {
   name: "Starting Room East Wall North Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/Entry/entry_7"
@@ -300,7 +311,8 @@ doors {
 }
 doors {
   name: "Splintering Exit North Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/Entry/gate_4"
   panels { room: "West Castle Area" name: "EVER" }
   panels { room: "West Castle Area" name: "AXES" }
@@ -318,6 +330,48 @@ doors {
   panels { room: "West Castle Area" name: "SLOT" }
 }
 doors {
+  name: "Splintering Area Panels"
+  type: LOCATION_ONLY
+  panels { room: "West Castle Area" name: "EVER" }
+  panels { room: "West Castle Area" name: "AXES" }
+  panels { room: "West Castle Area" name: "FLIP (1)" }
+  panels { room: "West Castle Area" name: "SLOT" }
+  panels { room: "West Castle Area" name: "WICKEDLY" }
+  panels { room: "West Castle Area" name: "CATHOLIC" }
+  panels { room: "West Castle Area" name: "SISTERLY" }
+  panels { room: "West Castle Area" name: "SQUEALED" }
+  panels { room: "West Castle Area" name: "READ" }
+  panels { room: "West Castle Area" name: "WORD" }
+  panels { room: "West Castle Area" name: "EACH" }
+  panels { room: "West Castle Area" name: "RANK" }
+  panels { room: "West Castle Area" name: "TEAR" }
+  panels { room: "West Castle Area" name: "SHUT" }
+  panels { room: "West Castle Area" name: "FLIP (2)" }
+  panels { room: "West Castle Area" name: "STUN" }
+  panels { room: "West Castle Area" name: "CHAT" }
+  panels { room: "West Castle Area" name: "LOST" }
+  panels { room: "West Castle Area" name: "PODS" }
+  panels { room: "West Castle Area" name: "FAME" }
+  location_room: "West Castle Area"
+}
+doors {
+  name: "West Sticks And Stones Panel"
+  type: LOCATION_ONLY
+  panels { room: "West Castle Area" name: "LETTERS" }
+  location_room: "West Castle Area"
+  location_name: "LETTERS"
+}
+doors {
+  name: "Amber Room Panels"
+  type: LOCATION_ONLY
+  panels { room: "West Castle Area" name: "HARMONY" }
+  panels { room: "West Castle Area" name: "MELODY" }
+  panels { room: "West Castle Area" name: "RHYTHM" }
+  panels { room: "West Castle Area" name: "TEXTURE" }
+  location_room: "West Castle Area"
+  location_name: "HARMONY, MELODY, RHYTHM, TEXTURE"
+}
+doors {
   name: "Z2 Room Back Exit"
   type: ITEM_ONLY
   receivers: "Components/Doors/Entry/gate_2"
@@ -645,6 +699,8 @@ doors {
 doors {
   name: "Hedges Tower"
   type: LOCATION_ONLY
+  latch: true
+  receivers: "Components/Doors/Halls/tower_door"
   # TODO: Not making this an item right now in order to force the player to
   # solve the puzzles in order to enter The Tenacious. In the future, I'd like
   # to make this an item, and make you solve the panels in order to get the
@@ -820,12 +876,23 @@ doors {
 }
 doors {
   name: "Composite Room NW Entrance"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/Halls/oroom_10"
   panels { room: "Red Color Door" name: "Near Obscured Puzzles" }
   location_room: "Red Color Door"
 }
 doors {
+  name: "Yellow Roof Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Red Color Door" name: "BACKSIDE" }
+  panels { room: "Red Color Door" name: "WALK BACK" }
+  panels { room: "Red Color Door" name: "Back (1)" }
+  panels { room: "Red Color Door" name: "Back (2)" }
+  panels { room: "Red Color Door" name: "Near Obscured Puzzles" }
+  location_room: "Red Color Door"
+}
+doors {
   name: "Composite Room South Door"
   type: LOCATION_ONLY
   #receivers: "Components/Doors/Halls/oroom_9"
@@ -886,7 +953,8 @@ doors {
 }
 doors {
   name: "F2 Room Southeast Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/Halls/froom_2"
   panels { room: "Sweet Foyer" name: "RENT (1)" }
   location_room: "Sweet Foyer"
@@ -1391,6 +1459,9 @@ doors {
   receivers: "Meshes/Stairs/staircase31/teleportListener"
   receivers: "Meshes/Stairs/staircase32/teleportListener2"
   receivers: "Meshes/Stairs/staircase33/teleportListener3"
+  receivers: "Panels/Castle Entrance/castle_direction_1/teleportListener"
+  receivers: "Panels/Castle Entrance/castle_direction_2/teleportListener"
+  receivers: "Panels/Castle Entrance/castle_direction_3/teleportListener"
   panels { room: "North Castle Area" name: "A SUMMER PLACE" }
   panels { room: "West Castle Area" name: "SONG FACE" }
   panels { room: "South Castle Area" name: "AN OFFER VILLAGE BEFORE LAIR" }
@@ -1768,12 +1839,37 @@ doors {
 }
 doors {
   name: "Near Sweet Brown Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/Halls 2/halls_2"
   panels { room: "Sweet Foyer" name: "RENT (4)" }
   location_room: "Sweet Foyer"
 }
 doors {
+  name: "Rent Panels"
+  type: LOCATION_ONLY
+  panels { room: "Sweet Foyer" name: "RENT (1)" }
+  panels { room: "Sweet Foyer" name: "RENT (2)" }
+  panels { room: "Sweet Foyer" name: "RENT (3)" }
+  panels { room: "Sweet Foyer" name: "RENT (4)" }
+  location_room: "Sweet Foyer"
+}
+doors {
+  name: "Equality Panels"
+  type: LOCATION_ONLY
+  panels { room: "Sweet Foyer" name: "EQUAL" }
+  panels { room: "Sweet Foyer" name: "QUALITY" }
+  location_room: "Sweet Foyer"
+  location_name: "EQUAL, QUALITY"
+}
+doors {
+  name: "Orange Panels"
+  type: LOCATION_ONLY
+  panels { room: "Blue Smiley Annex" name: "ORANGE (1)" }
+  panels { room: "Blue Smiley Annex" name: "ORANGE (2)" }
+  location_room: "Blue Smiley Annex"
+}
+doors {
   name: "Red Room Entrance"
   type: STANDARD
   receivers: "Components/Doors/Halls 2/halls_3"
@@ -1928,7 +2024,7 @@ doors {
   panels { room: "Gray Color Backside" name: "LAST" }
   panels { room: "Gray Color Backside" name: "RISE" }
   location_room: "Gray Color Backside"
-  location_name: "Light Green Hex"
+  location_name: "Pale Green Hex"
 }
 doors {
   name: "South Castle Area Back Door"
@@ -2304,3 +2400,74 @@ doors {
   location_room: "House"
   location_name: "All Puzzles"
 }
+doors {
+  name: "West Spire Panel"
+  type: LOCATION_ONLY
+  panels { room: "West Spire" name: "MISSING" }
+  location_room: "West Spire"
+  location_name: "MISSING"
+}
+doors {
+  name: "Tree Panels"
+  type: LOCATION_ONLY
+  panels { room: "Red Color Door" name: "FIR" }
+  panels { room: "Red Color Door" name: "OAK" }
+  panels { room: "Red Color Door" name: "PINE" }
+  panels { room: "Red Color Door" name: "ASH" }
+  location_room: "Red Color Door"
+  location_name: "ASH, FIR, OAK, PINE"
+}
+doors {
+  name: "Teal Panel"
+  type: LOCATION_ONLY
+  panels { room: "Outside Book Room" name: "TEAL" }
+  location_room: "Outside Book Room"
+  location_name: "TEAL"
+}
+doors {
+  name: "Direction Panels"
+  type: LOCATION_ONLY
+  panels { room: "Rainbow Color Doors" name: "DIRECTION (1)" }
+  panels { room: "Rainbow Color Doors" name: "DIRECTION (2)" }
+  panels { room: "Rainbow Color Doors" name: "DIRECTION (3)" }
+  location_room: "Rainbow Color Doors"
+}
+doors {
+  name: "Nursery Panels"
+  type: LOCATION_ONLY
+  panels { room: "Nursery" name: "Paintings" }
+  panels { room: "Nursery" name: "?" }
+  location_room: "Nursery"
+  location_name: "Paintings, ?"
+}
+doors {
+  name: "Near H Keyholder Panel"
+  type: LOCATION_ONLY
+  panels { room: "Outside House" name: "SILENCE" }
+  location_room: "Outside House"
+  location_name: "SILENCE"
+}
+doors {
+  name: "Plum Panels"
+  type: LOCATION_ONLY
+  panels { room: "Outside Hedges" name: "PLUM (1)" }
+  panels { room: "Outside Hedges" name: "PLUM (2)" }
+  location_room: "Outside Hedges"
+}
+doors {
+  name: "Yellow Smiley Annex Panels"
+  type: LOCATION_ONLY
+  panels { room: "Yellow Smiley Annex" name: "BELL" }
+  panels { room: "Yellow Smiley Annex" name: "COW" }
+  location_room: "Yellow Smiley Annex"
+  location_name: "BELL, COW"
+}
+doors {
+  name: "Farewell Little Lamb Panels"
+  type: LOCATION_ONLY
+  panels { room: "Purple Room South" name: "FAREWELL" }
+  panels { room: "Purple Room South" name: "LITTLE" }
+  panels { room: "Purple Room South" name: "LAMB" }
+  location_room: "Purple Room South"
+  location_name: "FAREWELL, LITTLE, LAMB"
+}
@@ -1,7 +1,5 @@
 name: "Hotel"
 panel_display_name: "Southwest Area"
-# TODO: Something has to be changed in-game so that the puzzles don't disappear
-# and thus cause them to become unsolvable.
 panels {
   name: "MARLIN"
   path: "Panels/Connections/connections_2"
@@ -0,0 +1,30 @@
+connections {
+  from_room: "Main Area"
+  to_room: "Center Building"
+  door { name: "Center Building" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Flower Hallway"
+  door { name: "Flower Hallway" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Tower"
+  door { name: "Tower Entrance" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Castle"
+  door { name: "Castle" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Backside Area"
+  door { name: "Backside Entrance" }
+}
+connections {
+  from_room: "Backside Area"
+  to_room: "Mastery"
+  door { name: "Mastery Door" }
+}
@@ -0,0 +1,161 @@
+doors {
+  name: "Center Building"
+  type: STANDARD
+  receivers: "Components/Doors/demo_1"
+  panels { room: "Main Area" name: "HI" }
+  location_room: "Main Area"
+}
+doors {
+  name: "Flower Hallway"
+  type: STANDARD
+  receivers: "Components/Doors/demo_32"
+  panels { room: "Main Area" name: "TEES" }
+  location_room: "Main Area"
+}
+doors {
+  name: "Center Building Panels"
+  type: LOCATION_ONLY
+  panels { room: "Center Building" name: "WORLD" }
+  panels { room: "Center Building" name: "FUZZIES" }
+  panels { room: "Main Area" name: "COLORFUL" }
+  panels { room: "Main Area" name: "WORD" }
+  location_room: "Center Building"
+  location_name: "COLORFUL, FUZZIES, WORD, WORLD"
+}
+doors {
+  name: "Orange Door"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "HID" }
+  panels { room: "Main Area" name: "MESS" }
+  panels { room: "Main Area" name: "DEN" }
+  panels { room: "Main Area" name: "AGES" }
+  location_room: "Main Area"
+  location_name: "AGES, DEN, HID, MESS"
+}
+doors {
+  name: "Purple Door"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "COUNTER" }
+  panels { room: "Main Area" name: "POSSIBLE" }
+  panels { room: "Main Area" name: "PACES" }
+  panels { room: "Main Area" name: "CLOCKWISE" }
+  location_room: "Main Area"
+  location_name: "CLOCKWISE, COUNTER, PACES, POSSIBLE"
+}
+doors {
+  name: "Yellow Door"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "ANY" }
+  panels { room: "Main Area" name: "RODS" }
+  panels { room: "Main Area" name: "TWO" }
+  panels { room: "Main Area" name: "TALK" }
+  panels { room: "Main Area" name: "SECRETIVE" }
+  panels { room: "Main Area" name: "TOADS" }
+  panels { room: "Main Area" name: "TON" }
+  panels { room: "Main Area" name: "MIND" }
+  panels { room: "Main Area" name: "END" }
+  panels { room: "Main Area" name: "RAD" }
+  panels { room: "Main Area" name: "TOO" }
+  panels { room: "Main Area" name: "STALK" }
+  location_room: "Main Area"
+  location_name: "Yellow Area Puzzles"
+}
+doors {
+  name: "Red Door"
+  type: LOCATION_ONLY
+  panels { room: "Castle" name: "SERIES" }
+  location_room: "Castle"
+  location_name: "SERIES"
+}
+doors {
+  name: "Castle"
+  type: STANDARD
+  receivers: "Components/Doors/demo_15"
+  panels { room: "Main Area" name: "CASTS" }
+  location_room: "Main Area"
+}
+doors {
+  name: "Scavenger Hunt"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "S" }
+  panels { room: "Main Area" name: "C" }
+  panels { room: "Main Area" name: "A" }
+  panels { room: "Main Area" name: "V" }
+  panels { room: "Main Area" name: "E (1)" }
+  panels { room: "Main Area" name: "N" }
+  panels { room: "Castle" name: "G" }
+  panels { room: "Main Area" name: "E (2)" }
+  panels { room: "Main Area" name: "R" }
+  location_room: "Castle"
+}
+doors {
+  name: "Gold Door"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "DISCOVER" }
+  panels { room: "Main Area" name: "FAMILY" }
+  panels { room: "Flower Hallway" name: "LACES" }
+  location_room: "Flower Hallway"
+  location_name: "DISCOVER, FAMILY, LACES"
+}
+doors {
+  name: "Tower Entrance"
+  type: EVENT
+  panels { room: "Main Area" name: "HI" }
+  panels { room: "Main Area" name: "ART" }
+  panels { room: "Main Area" name: "TEES" }
+  panels { room: "Center Building" name: "WORLD" }
+  panels { room: "Center Building" name: "FUZZIES" }
+  panels { room: "Main Area" name: "COLORFUL" }
+  panels { room: "Main Area" name: "WORD" }
+  panels { room: "Main Area" name: "HID" }
+  panels { room: "Main Area" name: "MESS" }
+  panels { room: "Main Area" name: "DEN" }
+  panels { room: "Main Area" name: "AGES" }
+  panels { room: "Main Area" name: "COUNTER" }
+  panels { room: "Main Area" name: "POSSIBLE" }
+  panels { room: "Main Area" name: "PACES" }
+  panels { room: "Main Area" name: "CLOCKWISE" }
+  panels { room: "Main Area" name: "ANY" }
+  panels { room: "Main Area" name: "RODS" }
+  panels { room: "Main Area" name: "TWO" }
+  panels { room: "Main Area" name: "TALK" }
+  panels { room: "Main Area" name: "SECRETIVE" }
+  panels { room: "Main Area" name: "TOADS" }
+  panels { room: "Main Area" name: "TON" }
+  panels { room: "Main Area" name: "MIND" }
+  panels { room: "Main Area" name: "END" }
+  panels { room: "Main Area" name: "RAD" }
+  panels { room: "Main Area" name: "TOO" }
+  panels { room: "Main Area" name: "STALK" }
+  panels { room: "Castle" name: "SERIES" }
+  panels { room: "Main Area" name: "CASTS" }
+  panels { room: "Main Area" name: "HAZES" }
+  panels { room: "Main Area" name: "DAZES" }
+  panels { room: "Main Area" name: "GAZES" }
+  panels { room: "Main Area" name: "S" }
+  panels { room: "Main Area" name: "C" }
+  panels { room: "Main Area" name: "A" }
+  panels { room: "Main Area" name: "V" }
+  panels { room: "Main Area" name: "E (1)" }
+  panels { room: "Main Area" name: "N" }
+  panels { room: "Castle" name: "G" }
+  panels { room: "Main Area" name: "E (2)" }
+  panels { room: "Main Area" name: "R" }
+  panels { room: "Main Area" name: "Blank" }
+  panels { room: "Main Area" name: "DISCOVER" }
+  panels { room: "Main Area" name: "FAMILY" }
+  panels { room: "Flower Hallway" name: "LACES" }
+}
+doors {
+  name: "Backside Entrance"
+  type: EVENT
+  panels { room: "Tower" name: "ENDS (1)" }
+}
+doors {
+  name: "Mastery Door"
+  type: EVENT
+  panels { room: "Backside Area" name: "BACKSIDE" }
+  panels { room: "Backside Area" name: "DOORWAYS" }
+  panels { room: "Backside Area" name: "SEE" }
+  panels { room: "Backside Area" name: "ENDS (2)" }
+}
@@ -0,0 +1,6 @@
+display_name: "Demo"
+type: DEMO
+# This painting is above a panel and can't be entered.
+excluded_nodes: "Meshes/owl"
+# The map's mastery is created at runtime.
+custom_nodes: "Components/Collectables/collectable"
@@ -0,0 +1,25 @@
+name: "Backside Area"
+panels {
+  name: "BACKSIDE"
+  path: "Panels/Endings/demo_41"
+  clue: "backside"
+  answer: "back"
+}
+panels {
+  name: "DOORWAYS"
+  path: "Panels/Endings/demo_42"
+  clue: "doorways"
+  answer: "doors"
+}
+panels {
+  name: "SEE"
+  path: "Panels/Endings/demo_43"
+  clue: "see"
+  answer: "secret"
+}
+panels {
+  name: "ENDS (2)"
+  path: "Panels/Endings/demo_44"
+  clue: "ends"
+  answer: "endings"
+}
@@ -0,0 +1,13 @@
+name: "Castle"
+panels {
+  name: "SERIES"
+  path: "Panels/Red/demo_26"
+  clue: "series"
+  answer: "mysteries"
+}
+panels {
+  name: "G"
+  path: "Panels/Blue/demo_37"
+  clue: "g"
+  answer: "g"
+}
@@ -0,0 +1,13 @@
+name: "Center Building"
+panels {
+  name: "WORLD"
+  path: "Panels/Room 1/demo_3"
+  clue: "world"
+  answer: "word"
+}
+panels {
+  name: "FUZZIES"
+  path: "Panels/Room 1/demo_4"
+  clue: "fuzzies"
+  answer: "puzzles"
+}
@@ -0,0 +1,7 @@
+name: "Flower Hallway"
+panels {
+  name: "LACES"
+  path: "Panels/Gold/demo_47"
+  clue: "laces"
+  answer: "places"
+}
@@ -0,0 +1,241 @@
+name: "Main Area"
+panels {
+  name: "HI"
+  path: "Panels/Entry/demo_1"
+  clue: "hi"
+  answer: "hi"
+}
+panels {
+  name: "ART"
+  path: "Panels/Entry/demo_49"
+  clue: "\"art\""
+  answer: "art"
+}
+panels {
+  name: "TEES"
+  path: "Panels/Entry/demo_50"
+  clue: "tees"
+  answer: "trees"
+}
+panels {
+  name: "COLORFUL"
+  path: "Panels/Room 1/demo_5"
+  clue: "colorful"
+  answer: "colorful"
+}
+panels {
+  name: "WORD"
+  path: "Panels/Room 1/demo_6"
+  clue: "word"
+  answer: "world"
+}
+panels {
+  name: "AGES"
+  path: "Panels/Orange/demo_7"
+  clue: "ages"
+  answer: "messages"
+}
+panels {
+  name: "DEN"
+  path: "Panels/Orange/demo_8"
+  clue: "den"
+  answer: "hidden"
+}
+panels {
+  name: "HID"
+  path: "Panels/Orange/demo_9"
+  clue: "hid"
+  answer: "hidden"
+}
+panels {
+  name: "MESS"
+  path: "Panels/Orange/demo_10"
+  clue: "mess"
+  answer: "messages"
+}
+panels {
+  name: "CLOCKWISE"
+  path: "Panels/Purple/demo_2"
+  clue: "clockwise"
+  answer: "counter"
+}
+panels {
+  name: "POSSIBLE"
+  path: "Panels/Purple/demo_12"
+  clue: "possible"
+  answer: "impossible"
+}
+panels {
+  name: "PACES"
+  path: "Panels/Purple/demo_13"
+  clue: "paces"
+  answer: "spaces"
+}
+panels {
+  name: "COUNTER"
+  path: "Panels/Purple/demo_30"
+  clue: "counter"
+  answer: "clockwise"
+}
+panels {
+  name: "ANY"
+  path: "Panels/Yellow/demo_14"
+  clue: "any"
+  answer: "many"
+}
+panels {
+  name: "RODS"
+  path: "Panels/Yellow/demo_15"
+  clue: "rods"
+  answer: "roads"
+}
+panels {
+  name: "TWO"
+  path: "Panels/Yellow/demo_16"
+  clue: "two"
+  answer: "to"
+}
+panels {
+  name: "TALK"
+  path: "Panels/Yellow/demo_17"
+  clue: "talk"
+  answer: "walk"
+}
+panels {
+  name: "SECRETIVE"
+  path: "Panels/Yellow/demo_18"
+  clue: "secretive"
+  answer: "secret"
+}
+panels {
+  name: "TOADS"
+  path: "Panels/Yellow/demo_19"
+  clue: "toads"
+  answer: "roads"
+}
+panels {
+  name: "TON"
+  path: "Panels/Yellow/demo_20"
+  clue: "ton"
+  answer: "to"
+}
+panels {
+  name: "MIND"
+  path: "Panels/Yellow/demo_21"
+  clue: "mind"
+  answer: "find"
+}
+panels {
+  name: "END"
+  path: "Panels/Yellow/demo_22"
+  clue: "end"
+  answer: "endless"
+}
+panels {
+  name: "RAD"
+  path: "Panels/Yellow/demo_23"
+  clue: "rad"
+  answer: "roads"
+}
+panels {
+  name: "TOO"
+  path: "Panels/Yellow/demo_24"
+  clue: "too"
+  answer: "to"
+}
+panels {
+  name: "STALK"
+  path: "Panels/Yellow/demo_25"
+  clue: "stalk"
+  answer: "walk"
+}
+panels {
+  name: "HAZES"
+  path: "Panels/Green/demo_27"
+  clue: "hazes"
+  answer: "mazes"
+}
+panels {
+  name: "DAZES"
+  path: "Panels/Green/demo_28"
+  clue: "dazes"
+  answer: "mazes"
+}
+panels {
+  name: "GAZES"
+  path: "Panels/Green/demo_29"
+  clue: "gazes"
+  answer: "mazes"
+}
+panels {
+  name: "CASTS"
+  path: "Panels/Green/demo_30"
+  clue: "casts"
+  answer: "castles"
+}
+panels {
+  name: "S"
+  path: "Panels/Blue/demo_31"
+  clue: "s"
+  answer: "s"
+}
+panels {
+  name: "C"
+  path: "Panels/Blue/demo_32"
+  clue: "c"
+  answer: "c"
+}
+panels {
+  name: "A"
+  path: "Panels/Blue/demo_33"
+  clue: "a"
+  answer: "a"
+}
+panels {
+  name: "V"
+  path: "Panels/Blue/demo_34"
+  clue: "v"
+  answer: "v"
+}
+panels {
+  name: "E (1)"
+  path: "Panels/Blue/demo_35"
+  clue: "e"
+  answer: "e"
+}
+panels {
+  name: "N"
+  path: "Panels/Blue/demo_36"
+  clue: "n"
+  answer: "n"
+}
+panels {
+  name: "E (2)"
+  path: "Panels/Blue/demo_38"
+  clue: "e"
+  answer: "e"
+}
+panels {
+  name: "R"
+  path: "Panels/Blue/demo_39"
+  clue: "r"
+  answer: "r"
+}
+panels {
+  name: "Blank"
+  path: "Panels/Blue/demo_40"
+  clue: ""
+  answer: "hunts"
+}
+panels {
+  name: "DISCOVER"
+  path: "Panels/Gold/demo_45"
+  clue: "discover"
+  answer: "rediscover"
+}
+panels {
+  name: "FAMILY"
+  path: "Panels/Gold/demo_46"
+  clue: "family"
+  answer: "familiar"
+}
@@ -0,0 +1,5 @@
+name: "Mastery"
+masteries {
+  name: "MASTERY"
+  path: "Components/Collectables/collectable"
+}
@@ -0,0 +1,7 @@
+name: "Tower"
+panels {
+  name: "ENDS (1)"
+  path: "Panels/Endings/demo_48"
+  clue: "ends"
+  answer: "endings"
+}
@@ -251,3 +251,18 @@ doors {
   receivers: "Components/Doors/brown_2"
   double_letters: true
 }
+doors {
+  name: "Control Center Color Panel"
+  type: LOCATION_ONLY
+  panels { room: "Back Area" name: "COLOR" }
+  location_room: "Back Area"
+  location_name: "COLOR"
+}
+doors {
+  name: "Butterfly Room Panels"
+  type: LOCATION_ONLY
+  panels { room: "Butterfly Room" name: "DARKNESS" }
+  panels { room: "Butterfly Room" name: "VIBRANT" }
+  location_room: "Butterfly Room"
+  location_name: "DARKNESS, VIBRANT"
+}
@@ -1,4 +1,3 @@
-# TODO: The gallery painting
 doors {
   name: "Panels"
   type: EVENT
@@ -1,4 +1,3 @@
-# TODO: gallery painting
 doors {
   name: "White Door"
   type: STANDARD
@@ -104,3 +103,10 @@ doors {
   panels { room: "Gray Room" name: "MEND" }
   location_room: "Gray Room"
 }
+doors {
+  name: "Chaos Panel"
+  type: LOCATION_ONLY
+  panels { room: "Cyan Hallway" name: "CHAOS" }
+  location_room: "Cyan Hallway"
+  location_name: "CHAOS"
+}
@@ -1,12 +1,22 @@
 doors {
   name: "Obverse Magenta Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/magenta_enterer2"
   panels { room: "Main Area" name: "LAKE" }
   panels { room: "Main Area" name: "DIE" }
   location_room: "Main Area"
 }
 doors {
+  name: "Main Area Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "LAKE" }
+  panels { room: "Main Area" name: "DIE" }
+  panels { room: "Main Area" name: "LIGHT" }
+  location_room: "Main Area"
+  location_name: "DIE, LAKE, LIGHT"
+}
+doors {
   name: "Flipped Magenta Door"
   type: STANDARD
   receivers: "Components/Doors/magenta_enterer"
@@ -2,5 +2,4 @@ name: "C Keyholder"
 keyholders {
   name: "C"
   path: "Components/KeyHolders/keyHolder"
-  # TODO: This will need to be modified so that it doesn't actually take the letter.
 }
@@ -2,5 +2,4 @@ name: "G Keyholder"
 keyholders {
   name: "G"
   path: "Components/KeyHolders/keyHolder2"
-  # TODO: This will need to be modified so that it doesn't actually take the letter.
 }
@@ -1,6 +1,7 @@
 connections {
   from_room: "Main Area"
   to_room: "Painting Divot"
+  door { name: "Checkpoint Panels" }
   oneway: true
 }
 connections {
@@ -3,3 +3,12 @@ doors {
   type: EVENT
   panels { room: "Flip Area" name: "SUCCEED" }
 }
+doors {
+  name: "Checkpoint Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "DROP" }
+  panels { room: "Main Area" name: "LEAP" }
+  panels { room: "Main Area" name: "SPIN" }
+  location_room: "Main Area"
+  location_name: "DROP, LEAP, SPIN"
+}
@@ -1,4 +1,3 @@
-# TODO: gallery painting
 doors {
   name: "Double Letter Panel Blockers"
   type: EVENT
@@ -53,3 +53,10 @@ doors {
   panels { room: "Tree Area" name: "TREE" }
   location_room: "Tree Area"
 }
+doors {
+  name: "Control Center Blue Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "COLOR" }
+  location_room: "Main Area"
+  location_name: "COLOR"
+}
@@ -113,3 +113,82 @@ doors {
   # The panel blocks your way; there's no door.
   panels { room: "Flipped Black Area" name: "SEAPLANE" }
 }
+# These locations are kind of deranged but hey. Welcome to The Double Sided.
+doors {
+  name: "5 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Flipped Black Area" name: "SEAPLANE" }
+  panels { room: "Flipped Blue Area" name: "SKY" }
+  panels { room: "Flipped Blue Area" name: "HEAD" }
+  panels { room: "Flipped Green Area" name: "HIGH" }
+  panels { room: "Flipped Orange Area" name: "HEAVEN" }
+  panels { room: "Flipped Purple Area" name: "CEILING" }
+  panels { room: "Flipped Purple Area" name: "LEAVES" }
+  panels { room: "Flipped Red Area" name: "RAISED" }
+  panels { room: "Flipped Yellow Back Area" name: "ANGELS" }
+  panels { room: "Obverse Black Area" name: "MOUNTAIN" }
+  panels { room: "Obverse Black Area" name: "TRAIN" }
+  panels { room: "Obverse Green Area" name: "UPSIDE" }
+  panels { room: "Obverse Orange Back Area" name: "OVER" }
+  panels { room: "Obverse Orange Front Area" name: "UP" }
+  panels { room: "Obverse Orange Isolated Section" name: "TOP" }
+  panels { room: "Obverse Pink Area" name: "CLOUD" }
+  panels { room: "Obverse Purple Area" name: "DRAGON" }
+  panels { room: "Obverse Purple Area" name: "ABOVE" }
+  panels { room: "Start" name: "ATTIC" }
+  panels { room: "Start" name: "FULL" }
+  location_room: "Start"
+  complete_at: 5
+}
+doors {
+  name: "10 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Flipped Black Area" name: "SEAPLANE" }
+  panels { room: "Flipped Blue Area" name: "SKY" }
+  panels { room: "Flipped Blue Area" name: "HEAD" }
+  panels { room: "Flipped Green Area" name: "HIGH" }
+  panels { room: "Flipped Orange Area" name: "HEAVEN" }
+  panels { room: "Flipped Purple Area" name: "CEILING" }
+  panels { room: "Flipped Purple Area" name: "LEAVES" }
+  panels { room: "Flipped Red Area" name: "RAISED" }
+  panels { room: "Flipped Yellow Back Area" name: "ANGELS" }
+  panels { room: "Obverse Black Area" name: "MOUNTAIN" }
+  panels { room: "Obverse Black Area" name: "TRAIN" }
+  panels { room: "Obverse Green Area" name: "UPSIDE" }
+  panels { room: "Obverse Orange Back Area" name: "OVER" }
+  panels { room: "Obverse Orange Front Area" name: "UP" }
+  panels { room: "Obverse Orange Isolated Section" name: "TOP" }
+  panels { room: "Obverse Pink Area" name: "CLOUD" }
+  panels { room: "Obverse Purple Area" name: "DRAGON" }
+  panels { room: "Obverse Purple Area" name: "ABOVE" }
+  panels { room: "Start" name: "ATTIC" }
+  panels { room: "Start" name: "FULL" }
+  location_room: "Start"
+  complete_at: 10
+}
+doors {
+  name: "15 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Flipped Black Area" name: "SEAPLANE" }
+  panels { room: "Flipped Blue Area" name: "SKY" }
+  panels { room: "Flipped Blue Area" name: "HEAD" }
+  panels { room: "Flipped Green Area" name: "HIGH" }
+  panels { room: "Flipped Orange Area" name: "HEAVEN" }
+  panels { room: "Flipped Purple Area" name: "CEILING" }
+  panels { room: "Flipped Purple Area" name: "LEAVES" }
+  panels { room: "Flipped Red Area" name: "RAISED" }
+  panels { room: "Flipped Yellow Back Area" name: "ANGELS" }
+  panels { room: "Obverse Black Area" name: "MOUNTAIN" }
+  panels { room: "Obverse Black Area" name: "TRAIN" }
+  panels { room: "Obverse Green Area" name: "UPSIDE" }
+  panels { room: "Obverse Orange Back Area" name: "OVER" }
+  panels { room: "Obverse Orange Front Area" name: "UP" }
+  panels { room: "Obverse Orange Isolated Section" name: "TOP" }
+  panels { room: "Obverse Pink Area" name: "CLOUD" }
+  panels { room: "Obverse Purple Area" name: "DRAGON" }
+  panels { room: "Obverse Purple Area" name: "ABOVE" }
+  panels { room: "Start" name: "ATTIC" }
+  panels { room: "Start" name: "FULL" }
+  location_room: "Start"
+  complete_at: 15
+}
@@ -69,20 +69,40 @@ doors {
 # 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"
@@ -119,7 +139,8 @@ doors {
 }
 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"
@@ -131,6 +152,31 @@ 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"
@@ -304,7 +350,6 @@ 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"
@@ -312,7 +357,6 @@ doors {
 doors {
   name: "Third Eye Painting"
   type: LOCATION_ONLY
-  # move_paintings { room: "Eye Room" name: "GALLERY" }
   # TODO: ummmm
   panels { room: "Eye Room" name: "I" }
   location_room: "Eye Room"
@@ -323,3 +367,39 @@ doors {
   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"
+}
@@ -12,9 +12,11 @@ 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"
@@ -5,5 +5,5 @@ ports {
   path: "Components/Warps/worldport9"
   destination { x: -41 y: 6 z: -17.5 }
   rotation: 0
-  gravity: Y_PLUS
+  # This isn't actually Y_PLUS gravity! A nearby warp sneakily flips you.
 }
@@ -1,7 +1,7 @@
 name: "Rabbit Hole"
 panel_display_name: "Red Blue Area"
 panels {
-  name: "PUZZLE"
+  name: "Blank"
   path: "Panels/Back Right/br_6"
   clue: ""
   answer: "down"
@@ -55,9 +55,11 @@ panels {
   # 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" }
@@ -25,6 +25,6 @@ ports {
   display_name: "Engine Room Worldport"
   path: "Components/Warps/worldport2"
   gravity: Z_PLUS
-  # TODO: entrance shuffling for non Y axis gravity
+  # TODO: entrance shuffling for non Y_MINUS gravity
   no_shuffle: true
 }
@@ -0,0 +1,5 @@
+connections {
+  from_room: "Main Area"
+  to_room: "Mastery"
+  door { name: "Mastery Door" }
+}
@@ -0,0 +1,29 @@
+doors {
+  name: "Black Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "WHERETO" }
+  panels { room: "Main Area" name: "COMBINED" }
+  location_room: "Main Area"
+}
+doors {
+  name: "Green Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "ACHIEVES" }
+  panels { room: "Main Area" name: "BEFORE" }
+  panels { room: "Main Area" name: "Blank" }
+  panels { room: "Main Area" name: "BOTH" }
+  panels { room: "Main Area" name: "CAGED" }
+  panels { room: "Main Area" name: "DICE" }
+  panels { room: "Main Area" name: "FIRST" }
+  panels { room: "Main Area" name: "FORGED" }
+  panels { room: "Main Area" name: "LOTTO" }
+  panels { room: "Main Area" name: "TOED" }
+  panels { room: "Main Area" name: "TUTU" }
+  panels { room: "Main Area" name: "UNVEILED" }
+  location_room: "Main Area"
+}
+doors {
+  name: "Mastery Door"
+  type: EVENT
+  panels { room: "Main Area" name: "OTHERS" }
+}
@@ -0,0 +1,4 @@
+display_name: "The Fuzzy"
+type: GIFT_MAP
+# The map's mastery is created at runtime.
+custom_nodes: "Components/Collectables/collectable"
@@ -0,0 +1,119 @@
+name: "Main Area"
+panels {
+  name: "Blank"
+  path: "Panels/Room_1/panel_1"
+  clue: ""
+  answer: "2475"
+  symbols: LINGO
+  symbols: QUESTION
+}
+panels {
+  name: "TUTU"
+  path: "Panels/Room_1/panel_2"
+  clue: "tutu"
+  answer: "22"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "LOTTO"
+  path: "Panels/Room_1/panel_3"
+  clue: "lotto"
+  answer: "22222222"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "WHERETO"
+  path: "Panels/Room_1/panel_10"
+  clue: "whereto"
+  answer: "sides"
+  symbols: QUESTION
+}
+panels {
+  name: "DICE"
+  path: "Panels/Room_1/panel_11"
+  clue: "dice"
+  answer: "4935"
+  symbols: QUESTION
+}
+panels {
+  name: "CAGED"
+  path: "Panels/Room_1/panel_12"
+  clue: "caged"
+  answer: "31754"
+  symbols: QUESTION
+}
+panels {
+  name: "BEFORE"
+  path: "Panels/Room_1/panel_13"
+  clue: "before"
+  answer: "100"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "TOED"
+  path: "Panels/Room_1/panel_14"
+  clue: "toed"
+  answer: "108"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "FORGED"
+  path: "Panels/Room_1/panel_15"
+  clue: "forged"
+  answer: "3016"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "OTHERS"
+  path: "Panels/Room_1/panel_4"
+  clue: "others"
+  answer: "34390869"
+  symbols: QUESTION
+}
+panels {
+  name: "COMBINED"
+  path: "Panels/Room_1/panel_9"
+  clue: "combined"
+  answer: "added"
+  symbols: SUN
+}
+panels {
+  name: "ACHIEVES"
+  path: "Panels/Room_1/panel_5"
+  clue: "achieves"
+  answer: "4214"
+  symbols: QUESTION
+}
+panels {
+  name: "UNVEILED"
+  path: "Panels/Room_1/panel_6"
+  clue: "unveiled"
+  answer: "12122021"
+  symbols: QUESTION
+}
+panels {
+  name: "FIRST"
+  path: "Panels/Room_1/panel_8"
+  clue: "first"
+  answer: "1"
+  symbols: QUESTION
+}
+panels {
+  name: "BOTH"
+  path: "Panels/Room_1/panel_7"
+  clue: "both"
+  answer: "2"
+  symbols: QUESTION
+}
+ports {
+  name: "WORLDPORT"
+  display_name: "Entrance"
+  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 9 }
+  rotation: 0
+}
@@ -0,0 +1,5 @@
+name: "Mastery"
+masteries {
+  name: "MASTERY"
+  path: "Components/Collectables/collectable"
+}
@@ -3,7 +3,7 @@ doors {
   name: "Darkroom Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "DARKROOM" }
-  receivers: "Components/Paintings/darkroom/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerDarkroom"
   panels { map: "the_darkroom" room: "First Room" name: "BISON" }
   panels { map: "the_darkroom" room: "First Room" name: "FISH" }
   panels { map: "the_darkroom" room: "First Room" name: "SHEEP" }
@@ -29,14 +29,14 @@ doors {
   name: "Butterfly Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "BUTTERFLY" }
-  receivers: "Components/Paintings/butterfly/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerButterfly"
   rooms { map: "the_butterfly" name: "Main Area" }
 }
 doors {
   name: "Between Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "BETWEEN" }
-  receivers: "Components/Paintings/between/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerBetween"
   panels { map: "the_between" room: "Main Area" name: "SUN" }
   panels { map: "the_between" room: "Main Area" name: "KOI" }
   panels { map: "the_between" room: "Main Area" name: "SUN KOI" }
@@ -72,14 +72,14 @@ doors {
   name: "Entry Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "ENTRY" }
-  receivers: "Components/Paintings/eyes/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerEyes"
   panels { map: "the_entry" room: "Eye Room" name: "I" }
 }
 doors {
   name: "Wise Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "WISE" }
-  receivers: "Components/Paintings/triangle/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerTriangle"
   panels { map: "the_wise" room: "Entry" name: "INK" }
   panels { map: "the_wise" room: "Puzzles" name: "STORY" }
   panels { map: "the_wise" room: "Puzzles" name: "VENTURE" }
@@ -107,7 +107,7 @@ doors {
   name: "Tree Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "TREE" }
-  receivers: "Components/Paintings/Clue Maps/tree/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerTree"
   panels { map: "the_tree" room: "Main Area" name: "COLOR" }
   panels { map: "the_tree" room: "Main Area" name: "DAMAGE (1)" }
   panels { map: "the_tree" room: "Main Area" name: "DAMAGE (2)" }
@@ -144,35 +144,35 @@ doors {
   name: "Unyielding Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "UNYIELDING" }
-  receivers: "Components/Paintings/Clue Maps/unyielding/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerUnyielding"
   rooms { map: "the_unyielding" name: "Digital Entrance" }
 }
 doors {
   name: "Graveyard Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "GRAVEYARD" }
-  receivers: "Components/Paintings/Endings/grave/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerGraveyard"
   rooms { map: "the_graveyard" name: "Outside" }
 }
 doors {
   name: "Control Center Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "CC" }
-  receivers: "Components/Paintings/Endings/desert/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerDesert"
   rooms { map: "the_impressive" name: "M2 Room" }
 }
 doors {
   name: "Tower Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "TOWER" }
-  receivers: "Components/Paintings/Endings/red/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerTower"
   rooms { map: "the_tower" name: "First Floor" }
 }
 doors {
   name: "Wondrous Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "WONDROUS" }
-  receivers: "Components/Paintings/Endings/window/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerWonderland"
   panels { map: "the_wondrous" room: "Entry" name: "WONDER" }
   panels { map: "the_wondrous" room: "Regular" name: "SHRINK" }
   panels { map: "the_wondrous" room: "Huge" name: "SHRINK" }
@@ -189,42 +189,42 @@ doors {
   name: "Rainbow Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "RAINBOW" }
-  receivers: "Components/Paintings/Endings/rainbow/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerRainbow"
   rooms { map: "daedalus" name: "Rainbow Start" }
 }
 doors {
   name: "Words Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "WORDS" }
-  receivers: "Components/Paintings/Endings/words/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerWords"
   rooms { map: "the_words" name: "Main Area" }
 }
 doors {
   name: "Colorful Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "COLORFUL" }
-  receivers: "Components/Paintings/Endings/colorful/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerColorful"
   rooms { map: "the_colorful" name: "White Room" }
 }
 doors {
   name: "Castle Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "CASTLE" }
-  receivers: "Components/Paintings/Endings/castle/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerCastle"
   rooms { map: "daedalus" name: "Castle" }
 }
 doors {
   name: "Sun Temple Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "SUNTEMPLE" }
-  receivers: "Components/Paintings/Endings/temple/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerTemple"
   rooms { map: "the_sun_temple" name: "Entrance" }
 }
 doors {
   name: "Ancient Painting"
   type: GALLERY_PAINTING
   #move_paintings { room: "Main Area" name: "ANCIENT" }
-  receivers: "Components/Paintings/Endings/cubes/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerQuartz"
   rooms { map: "the_ancient" name: "Outside" }
 }
 doors {
@@ -255,7 +255,8 @@ doors {
   doors { name: "Castle Painting" }
   doors { name: "Sun Temple Painting" }
   doors { name: "Ancient Painting" }
-  doors { name: "Gallery Extension" }
+  panels { room: "Daedalus Extension" name: "WHERE" }
+  double_letters: true
 }
 doors {
   name: "Ending Door"
@@ -0,0 +1,7 @@
+doors {
+  name: "The Panel"
+  type: LOCATION_ONLY
+  panels { room: "The Whole Thing" name: "PANEL" }
+  location_room: "The Whole Thing"
+  location_name: "Panel"
+}
@@ -23,3 +23,10 @@ doors {
   receivers: "Components/Paintings/omrt/teleportListener"
   double_letters: true
 }
+doors {
+  name: "Remember Panel"
+  type: LOCATION_ONLY
+  panels { room: "Inside" name: "REMEMBER" }
+  location_room: "Inside"
+  location_name: "REMEMBER"
+}
@@ -29,6 +29,15 @@ doors {
   location_room: "Main Area"
 }
 doors {
+  name: "Near Linear Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "DEW" }
+  panels { room: "Main Area" name: "EWE" }
+  panels { room: "Main Area" name: "NO" }
+  location_room: "Main Area"
+  location_name: "DEW, EWE, NO"
+}
+doors {
   name: "Courtyard Entrance"
   type: STANDARD
   receivers: "Components/Doors/entry_1"
@@ -417,7 +426,8 @@ doors {
 }
 doors {
   name: "Question Room Back Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/question_11"
   panels { room: "Behind Question Area" name: "YEW" answer: "ewe" }
   location_room: "Behind Question Area"
@@ -522,3 +532,99 @@ doors {
   type: EVENT
   panels { room: "West Side" name: "CLUE" }
 }
+doors {
+  name: "Why Is It Not Red"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "WHY" }
+  panels { room: "Main Area" name: "IS" }
+  panels { room: "Main Area" name: "IT" }
+  panels { room: "Main Area" name: "NOT" }
+  panels { room: "Main Area" name: "RED" }
+  location_room: "Main Area"
+  location_name: "WHY, IS, IT, NOT, RED"
+}
+doors {
+  name: "Control Center Gray Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "COLOR" }
+  location_room: "Main Area"
+  location_name: "COLOR"
+}
+doors {
+  name: "Control Center Purple Panel"
+  type: LOCATION_ONLY
+  panels { room: "East Landscape" name: "COLOR" }
+  location_room: "East Landscape"
+  location_name: "COLOR"
+}
+doors {
+  name: "Control Center Red Panel"
+  type: LOCATION_ONLY
+  panels { room: "West Side" name: "COLOR" }
+  location_room: "West Side"
+  location_name: "COLOR"
+}
+doors {
+  name: "Mistreat Panel"
+  type: LOCATION_ONLY
+  panels { room: "East Landscape" name: "MISTREAT" }
+  location_room: "East Landscape"
+  location_name: "MISTREAT"
+}
+doors {
+  name: "Tower Panels"
+  type: LOCATION_ONLY
+  panels { room: "Back Area" name: "TOWEL" }
+  panels { room: "Maze Tower" name: "SPIRE" }
+  location_room: "Maze Tower"
+  location_name: "SPIRE, TOWEL"
+}
+doors {
+  name: "Tree Panels"
+  type: LOCATION_ONLY
+  panels { room: "Back Area" name: "PLANT" }
+  panels { room: "Back Area" name: "TREE" }
+  location_room: "Back Area"
+  location_name: "PLANT, TREE"
+}
+doors {
+  name: "Behind Question Room Panels"
+  type: LOCATION_ONLY
+  panels { room: "Behind Question Area" name: "DEW" }
+  panels { room: "Behind Question Area" name: "YEW" answer: "ewe" }
+  panels { room: "Behind Question Area" name: "NO" }
+  location_room: "Behind Question Area"
+  location_name: "DEW, YEW/EWE, NO"
+}
+doors {
+  name: "Broken Shed Panels"
+  type: LOCATION_ONLY
+  panels { room: "North Landscape" name: "LAUGH" }
+  panels { room: "North Landscape" name: "FINISHED" }
+  panels { room: "North Landscape" name: "LAUGH FINISHED" }
+  location_room: "North Landscape"
+  location_name: "LAUGH, FINISHED, LAUGH FINISHED"
+}
+doors {
+  name: "Nature Panels"
+  type: LOCATION_ONLY
+  panels { room: "North Landscape" name: "WEATHER" }
+  panels { room: "North Landscape" name: "ANIMALS" }
+  panels { room: "North Landscape" name: "PLANTS" }
+  location_room: "North Landscape"
+  location_name: "ANIMALS, PLANTS, WEATHER"
+}
+doors {
+  name: "Teal Panel"
+  type: LOCATION_ONLY
+  panels { room: "Maze Wreck Area" name: "MAROON" }
+  location_room: "Maze Wreck Area"
+  location_name: "MAROON"
+}
+doors {
+  name: "Behind Orb Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "BROWN RED ORANGE" }
+  location_room: "Main Area"
+  location_name: "Brown Red Orange"
+}
@@ -1,5 +1,4 @@
 name: "Maze Tower"
-panel_display_name: "Courtyard"
 panels {
   name: "FEEL"
   path: "Panels/Maze/maze_12"
@@ -30,9 +30,25 @@ doors {
   panels { room: "Green Eye" name: "LEFT" }
 }
 doors {
+  name: "Green Eye Panels"
+  type: LOCATION_ONLY
+  panels { room: "Green Eye" name: "RETURN" }
+  panels { room: "Green Eye" name: "TO" }
+  panels { room: "Green Eye" name: "LEFT" }
+  location_room: "Green Eye"
+  location_name: "RETURN, TO, LEFT"
+}
+doors {
   name: "Control Center Green Door"
   type: CONTROL_CENTER_COLOR
   latch: true
   receivers: "Components/Doors/entry_2"
   control_center_color: "green"
 }
+doors {
+  name: "Control Center Green Panel"
+  type: LOCATION_ONLY
+  panels { room: "Side Area" name: "COLOR" }
+  location_room: "Side Area"
+  location_name: "COLOR"
+}
@@ -31,3 +31,14 @@ doors {
   panels { room: "Main Area" name: "QUEEN" answer: "jack" }
   location_room: "Main Area"
 }
+doors {
+  name: "Side Room Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Side Area" name: "CALLBACK" }
+  panels { room: "Side Area" name: "CALL" }
+  panels { room: "Side Area" name: "PUSHBACK" }
+  panels { room: "Side Area" name: "PUSH" }
+  panels { room: "Side Area" name: "FLASHBACK" }
+  panels { room: "Side Area" name: "FLASH" }
+  location_room: "Side Area"
+}
@@ -52,3 +52,10 @@ doors {
   panels { room: "Back Room" name: "LIMB" }
   panels { room: "Back Room" name: "SPARE" }
 }
+doors {
+  name: "Stores Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Room" name: "TORE" }
+  location_room: "Main Room"
+  location_name: "TORE"
+}
@@ -1,13 +1,15 @@
 doors {
   name: "Brush Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/entry_1"
   panels { room: "R2C2 Top" name: "CRUSH" }
   location_room: "R2C2 Top"
 }
 doors {
   name: "Sky Top Doors"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/entry_2"
   receivers: "Components/Doors/entry_4"
   panels { room: "R2C1 Left" name: "VERB" }
@@ -15,7 +17,8 @@ doors {
 }
 doors {
   name: "Sky Bottom Doors"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/entry_3"
   receivers: "Components/Doors/entry_5"
   panels { room: "R2C1 Left" name: "FOIL" }
@@ -23,21 +26,24 @@ doors {
 }
 doors {
   name: "First Room Shortcut"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/entry_6"
   panels { room: "Connected Area" name: "FIZZLE" }
   location_room: "Connected Area"
 }
 doors {
   name: "First Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/entry_7"
   panels { room: "R2C2 Bottom" name: "FOUL" }
   location_room: "R2C2 Bottom"
 }
 doors {
   name: "Blue Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/entry_8"
   panels { room: "Connected Area" name: "PAST" }
   panels { room: "Connected Area" name: "LAY" }
@@ -65,7 +71,8 @@ doors {
 }
 doors {
   name: "Sky Owl"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Owl/Room 1/LB"
   receivers: "Components/Owl/Room 1/LBG"
   receivers: "Components/Owl/Room 2/LB"
@@ -93,7 +100,8 @@ doors {
 }
 doors {
   name: "Gray Owl"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Owl/Room 1/G"
   receivers: "Components/Owl/Room 1/GG"
   receivers: "Components/Owl/Room 2/G"
@@ -121,7 +129,8 @@ doors {
 }
 doors {
   name: "Orange Owl"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Owl/Room 1/O"
   receivers: "Components/Owl/Room 1/OG"
   receivers: "Components/Owl/Room 2/O"
@@ -149,7 +158,8 @@ doors {
 }
 doors {
   name: "White Owl"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Owl/Room 1/W"
   receivers: "Components/Owl/Room 1/WG"
   receivers: "Components/Owl/Room 2/W"
@@ -177,7 +187,8 @@ doors {
 }
 doors {
   name: "Black Owl"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Owl/Room 1/BK"
   receivers: "Components/Owl/Room 1/BKG"
   receivers: "Components/Owl/Room 2/BK"
@@ -205,7 +216,8 @@ doors {
 }
 doors {
   name: "Blue Owl"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Owl/Room 1/BL"
   receivers: "Components/Owl/Room 1/BLG"
   receivers: "Components/Owl/Room 2/BL"
@@ -251,3 +263,95 @@ doors {
   panels { room: "Connected Area" name: "WHITE" }
   panels { room: "Blue Room" name: "SKY" }
 }
+doors {
+  name: "R1C1 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "ETCH" }
+  panels { room: "Connected Area" name: "SHOE" }
+  panels { room: "Connected Area" name: "MARKER" }
+  location_room: "Connected Area"
+  location_name: "ETCH, MARKER, SHOE"
+}
+doors {
+  name: "R1C2 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "FAINT" }
+  panels { room: "Connected Area" name: "PURE" }
+  panels { room: "Connected Area" name: "MODE" }
+  location_room: "Connected Area"
+  location_name: "FAINT, MODE, PURE"
+}
+doors {
+  name: "Control Center Magenta Panel"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "COLOR" }
+  location_room: "Connected Area"
+  location_name: "COLOR"
+}
+doors {
+  name: "R1C3 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "PENCIL" }
+  panels { room: "Connected Area" name: "WING" }
+  location_room: "Connected Area"
+  location_name: "PENCIL, WING"
+}
+doors {
+  name: "R1C4 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "SKETCH" }
+  panels { room: "Connected Area" name: "PHOTO" }
+  panels { room: "R1C4 Left" name: "WALK" }
+  panels { room: "R1C4 Left" name: "STENCIL" }
+  location_room: "R1C4 Left"
+  location_name: "PHOTO, SKETCH, STENCIL, WALK"
+}
+doors {
+  name: "R2C1 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "LAY" }
+  panels { room: "Connected Area" name: "PAST" }
+  panels { room: "R2C1 Left" name: "VERB" }
+  panels { room: "R2C1 Left" name: "FOIL" }
+  location_room: "R2C1 Left"
+  location_name: "FOIL, LAY, PAST, VERB"
+}
+doors {
+  name: "R2C2 Panels"
+  type: LOCATION_ONLY
+  panels { room: "R2C2 Bottom" name: "FOUL" }
+  panels { room: "R2C2 Top" name: "CRUSH" }
+  panels { room: "Connected Area" name: "FIZZLE" }
+  location_room: "R2C2 Top"
+  location_name: "CRUSH, FOUL, FIZZLE"
+}
+doors {
+  name: "R2C3 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "PRIMARY" }
+  panels { room: "R2C3 Bottom" name: "FIGMENT" }
+  location_room: "R2C3 Bottom"
+  location_name: "FIGMENT, PRIMARY"
+}
+doors {
+  name: "R2C4 Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "SHOW" }
+  panels { room: "Connected Area" name: "HAD" }
+  panels { room: "Connected Area" name: "HEAVY" }
+  location_room: "Connected Area"
+  location_name: "HAD, HEAVY, SHOW"
+}
+doors {
+  name: "Near Z1 Panel"
+  type: LOCATION_ONLY
+  panels { room: "Z Room" name: "MAZE" }
+  location_room: "Z Room"
+  location_name: "MAZE"
+}
+doors {
+  name: "Double Letters"
+  type: EVENT
+  receivers: "Panels/Warps/magenta/visibilityListener"
+  double_letters: true
+}
@@ -26,6 +26,7 @@ panels {
   clue: "color"
   answer: "magenta"
   symbols: EXAMPLE
+  required_door { name: "Double Letters" }
 }
 panels {
   name: "WHITE"
@@ -43,3 +43,12 @@ doors {
   panels { room: "Main Area" name: "ALEXANDER" answer: "alexander" }
   panels { room: "Main Area" name: "CAESAR" answer: "caesar" }
 }
+doors {
+  name: "Lavender Area Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Lavender Area" name: "ME" }
+  panels { room: "Lavender Area" name: "SHEEP" }
+  panels { room: "Lavender Area" name: "WOOD" }
+  location_room: "Lavender Area"
+  location_name: "ME, SHEEP, WOOD"
+}
@@ -50,8 +50,10 @@ doors {
 doors {
   name: "Control Center Entrance"
   type: EVENT
+  legacy_location: true
   #receivers: "Components/Doors/controlDoor"
   panels { room: "Control Center Entrance" name: "RETURN" }
+  location_room: "Control Center Entrance"
 }
 doors {
   name: "F Door"
@@ -210,3 +210,31 @@ doors {
   panels { room: "Bottom Right Room" name: "HONEY" }
   panels { room: "Bottom Right Room" name: "INJECT" }
 }
+doors {
+  name: "Near Sirenic Panel"
+  type: LOCATION_ONLY
+  panels { room: "Sirenic Entrance" name: "SIREN" }
+  location_room: "Sirenic Entrance"
+  location_name: "SIREN"
+}
+doors {
+  name: "Near Symbolic Panel"
+  type: LOCATION_ONLY
+  panels { room: "Symbolic Entrance" name: "FIGURATIVE" }
+  location_room: "Symbolic Entrance"
+  location_name: "FIGURATIVE"
+}
+doors {
+  name: "Near Repetitive Panel"
+  type: LOCATION_ONLY
+  panels { room: "Repetitive Entrance" name: "TEDIOUS" }
+  location_room: "Repetitive Entrance"
+  location_name: "TEDIOUS"
+}
+doors {
+  name: "Near Broken Portal Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "AFFABLE" }
+  location_room: "Main Area"
+  location_name: "AFFABLE"
+}
@@ -1,6 +1,33 @@
 doors {
-  name: "Left/Turn Door"
+  name: "Turn Only Puzzles"
   type: LOCATION_ONLY
+  panels { room: "Turn Room" name: "HIDE (1)" }
+  panels { room: "Turn Room" name: "HIDE (2)" }
+  panels { room: "Turn Room" name: "MORE" }
+  location_room: "Turn Room"
+}
+doors {
+  name: "Shop Only Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Shop Room" name: "LEFT (1)" }
+  panels { room: "Shop Room" name: "LEFT (2)" }
+  panels { room: "Shop Room" name: "EXIT (1)" }
+  panels { room: "Shop Room" name: "EXIT (2)" }
+  panels { room: "Shop Room" name: "EXIT (3)" }
+  location_room: "Shop Room"
+}
+doors {
+  name: "Left Only Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Left Room" name: "HIDE" }
+  panels { room: "Left Room" name: "LEFT" }
+  panels { room: "Left Room" name: "MORE" }
+  location_room: "Left Room"
+}
+doors {
+  name: "Left/Turn Door"
+  type: EVENT
+  legacy_location: true
   panels { room: "Left Room" name: "HIDE" }
   panels { room: "Left Room" name: "LEFT" }
   panels { room: "Left Room" name: "MORE" }
@@ -11,7 +38,8 @@ doors {
 }
 doors {
   name: "Turn/Shop Door"
-  type: LOCATION_ONLY
+  type: EVENT
+  legacy_location: true
   panels { room: "Turn Room" name: "HIDE (1)" }
   panels { room: "Turn Room" name: "HIDE (2)" }
   panels { room: "Turn Room" name: "MORE" }
@@ -20,12 +20,21 @@ doors {
 }
 doors {
   name: "Dot Area Entrance"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/Door8"
   panels { room: "Main Room" name: "HOTS (2)" }
   location_room: "Main Room"
 }
 doors {
+  name: "Hots Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Room" name: "HOTS (1)" }
+  panels { room: "Main Room" name: "HOTS (2)" }
+  location_room: "Main Room"
+  location_name: "HOTS (1), HOTS (2)"
+}
+doors {
   name: "Lime Door"
   type: STANDARD
   receivers: "Components/Doors/Door9"
@@ -200,3 +209,35 @@ doors {
   senders: "Components/Collectables/anticollectable"
   location_room: "Anti Room"
 }
+doors {
+  name: "H2 Room Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Main Room" name: "HEIGHT (1)" }
+  panels { room: "Main Room" name: "HEIGHT (2)" }
+  panels { room: "Main Room" name: "HEIGHT (3)" }
+  panels { room: "Main Room" name: "HEIGHT (4)" }
+  panels { room: "Main Room" name: "HEIGHT (5)" }
+  panels { room: "Main Room" name: "HEIGHT (6)" }
+  panels { room: "Main Room" name: "QUESTION" }
+  panels { room: "Main Room" name: "INTUITION" }
+  panels { room: "Main Room" name: "?" }
+  panels { room: "Main Room" name: "HAND" }
+  panels { room: "Main Room" name: "? HAND" }
+  panels { room: "Main Room" name: "RICHES" }
+  panels { room: "Main Room" name: "? RICHES" }
+  panels { room: "Main Room" name: "MISHMASH" }
+  location_room: "Main Room"
+}
+doors {
+  name: "Anti-Collectable Room Panels"
+  type: LOCATION_ONLY
+  panels { room: "Anti Room" name: "EYE (1)" }
+  panels { room: "Anti Room" name: "EYE (2)" }
+  panels { room: "Anti Room" name: "HA (1)" }
+  panels { room: "Anti Room" name: "HA (2)" }
+  panels { room: "Anti Room" name: "HA (3)" }
+  panels { room: "Anti Room" name: "HA (4)" }
+  panels { room: "Anti Room" name: "HA (5)" }
+  panels { room: "Anti Room" name: "TWO" }
+  location_room: "Anti Room"
+}
@@ -93,3 +93,12 @@ doors {
   panels { room: "Connected Area" name: "QUESTION (2)" }
   location_room: "Connected Area"
 }
+doors {
+  name: "Welcome Back Panels"
+  type: LOCATION_ONLY
+  panels { room: "Connected Area" name: "GREETINGS" }
+  panels { room: "Connected Area" name: "BEHIND" }
+  panels { room: "Connected Area" name: "Blank" }
+  location_room: "Connected Area"
+  location_name: "BEHIND, GREETINGS, Blank"
+}
@@ -139,17 +139,13 @@ doors {
 doors {
   name: "Poetry Room Panels"
   type: LOCATION_ONLY
-  panels { room: "Poetry Room 1" name: "ABSORBED" }
-  panels { room: "Poetry Room 1" name: "PRIMORDIAL" }
   panels { room: "Poetry Room 2" name: "NOT" }
   panels { room: "Poetry Room 2" name: "THERE" }
   panels { room: "Poetry Room 2" name: "NOT THERE" }
   panels { room: "Poetry Room 3" name: "NOT" }
   panels { room: "Poetry Room 3" name: "PRETTY" }
-  panels { room: "Poetry Room 3" name: "NOT PRETTY" }
   panels { room: "Poetry Room Left" name: "NOT" }
   panels { room: "Poetry Room Left" name: "TRUE" }
-  panels { room: "Poetry Room Left" name: "NOT TRUE" }
   panels { room: "Poetry Room Left Left" name: "NOT (1)" }
   panels { room: "Poetry Room Left Left" name: "NOT (2)" }
   panels { room: "Poetry Room Left Left" name: "LEFT" }
@@ -160,7 +156,6 @@ doors {
   panels { room: "Poetry Room Left Right" name: "NOT NOT MISS" }
   panels { room: "Poetry Room Right" name: "NOT" }
   panels { room: "Poetry Room Right" name: "BETTER" }
-  panels { room: "Poetry Room Right" name: "NOT BETTER" }
   panels { room: "Poetry Room Right Left" name: "NOT (1)" }
   panels { room: "Poetry Room Right Left" name: "NOT (2)" }
   panels { room: "Poetry Room Right Left" name: "TABLET" }
@@ -276,6 +271,9 @@ doors {
 doors {
   name: "Main Area Exit"
   type: EVENT
+  # The game logic here requires you to solve every panel on the map, EXCEPT:
+  # 1) The four panels past the door, and
+  # 2) Any panel that has a proxy.
   panels { room: "Main Area" name: "JUSTICE" }
   panels { room: "Main Area" name: "NOTICE (1)" }
   panels { room: "Main Area" name: "NOTICE (2)" }
@@ -353,6 +351,36 @@ doors {
   panels { room: "Main Area" name: "LIKE" }
   panels { room: "Main Area" name: "NEEDLESS" }
   panels { room: "Main Area" name: "RESTLESS" }
+  panels { room: "Poetry Room 2" name: "NOT" }
+  panels { room: "Poetry Room 2" name: "THERE" }
+  panels { room: "Poetry Room 2" name: "NOT THERE" }
+  panels { room: "Poetry Room 3" name: "NOT" }
+  panels { room: "Poetry Room 3" name: "PRETTY" }
+  panels { room: "Poetry Room Left" name: "NOT" }
+  panels { room: "Poetry Room Left" name: "TRUE" }
+  panels { room: "Poetry Room Left Left" name: "NOT (1)" }
+  panels { room: "Poetry Room Left Left" name: "NOT (2)" }
+  panels { room: "Poetry Room Left Left" name: "LEFT" }
+  panels { room: "Poetry Room Left Left" name: "NOT NOT LEFT" }
+  panels { room: "Poetry Room Left Right" name: "NOT (1)" }
+  panels { room: "Poetry Room Left Right" name: "NOT (2)" }
+  panels { room: "Poetry Room Left Right" name: "MISS" }
+  panels { room: "Poetry Room Left Right" name: "NOT NOT MISS" }
+  panels { room: "Poetry Room Right" name: "NOT" }
+  panels { room: "Poetry Room Right" name: "BETTER" }
+  panels { room: "Poetry Room Right Left" name: "NOT (1)" }
+  panels { room: "Poetry Room Right Left" name: "NOT (2)" }
+  panels { room: "Poetry Room Right Left" name: "TABLET" }
+  panels { room: "Poetry Room Right Left" name: "NOT NOT TABLET" }
+  panels { room: "Poetry Room Right Right" name: "NOT (1)" }
+  panels { room: "Poetry Room Right Right" name: "NOT (2)" }
+  panels { room: "Poetry Room Right Right" name: "NOT (3)" }
+  panels { room: "Poetry Room Right Right" name: "NOT NOT NOT" }
+  panels { room: "Whirred Room" name: "TAIPEI" }
+  panels { room: "Whirred Room" name: "NAYSAYER" }
+  panels { room: "Whirred Room" name: "NAY" }
+  panels { room: "Whirred Room" name: "INDEX (1)" }
+  panels { room: "Whirred Room" name: "INDEX (2)" }
 }
 doors {
   name: "Mastery"
@@ -52,3 +52,10 @@ doors {
   panels { room: "Back Room" name: "RELEVANT" }
   panels { room: "Back Room" name: "LONE" }
 }
+doors {
+  name: "Keyholder Hint Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "EARL" }
+  location_room: "Main Area"
+  location_name: "EARL"
+}
@@ -71,7 +71,6 @@ doors {
   latch: true
   receivers: "Components/Doors/entry_6"
   receivers: "Components/Doors/entry_13"
-  receivers: "Panels/Assorted/panel_1/teleportListener"
   control_center_color: "orange"
   double_letters: true
 }
@@ -185,3 +184,20 @@ doors {
   panels { room: "Right Area" name: "TOUGH" }
   location_room: "Right Area"
 }
+doors {
+  name: "Near Teal Door Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "I" }
+  panels { room: "Main Area" name: "SPY" }
+  panels { room: "Main Area" name: "HEFT" }
+  panels { room: "Main Area" name: "THEFT" }
+  location_room: "Main Area"
+  location_name: "HEFT, I, SPY, THEFT"
+}
+doors {
+  name: "Control Center Orange Panel"
+  type: LOCATION_ONLY
+  panels { room: "Right Area" name: "COLOR" }
+  location_room: "Right Area"
+  location_name: "COLOR"
+}
@@ -159,5 +159,4 @@ panels {
   clue: "color"
   answer: "orange"
   symbols: EXAMPLE
-  required_door { name: "Control Center Orange Door" }
 }
@@ -504,3 +504,42 @@ doors {
   receivers: "Panels/Miscellaneous/entry_3/teleportListener"
   double_letters: true
 }
+doors {
+  name: "Blue D Room Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Central Connected Area" name: "FOX" }
+  panels { room: "Central Connected Area" name: "LOCKS" }
+  panels { room: "Central Connected Area" name: "BOX" }
+  panels { room: "Central Connected Area" name: "SQUAWKS" }
+  panels { room: "Central Connected Area" name: "HAWKS" }
+  panels { room: "Central Connected Area" name: "TALKS" }
+  location_room: "Central Connected Area"
+}
+doors {
+  name: "Color Hallway Panels"
+  type: LOCATION_ONLY
+  panels { room: "Brown Alcove" name: "BROW" }
+  panels { room: "Central Connected Area" name: "RANGE" }
+  panels { room: "Central Connected Area" name: "WHIT" }
+  panels { room: "Central Connected Area" name: "ALMOND" }
+  panels { room: "Central Connected Area" name: "DAY" }
+  panels { room: "Central Connected Area" name: "REAM" }
+  panels { room: "Central Connected Area" name: "SON (2)" }
+  panels { room: "Central Connected Area" name: "RAY" }
+  panels { room: "Central Connected Area" name: "BURROWING" }
+  panels { room: "Orange Alcove" name: "ON" }
+  panels { room: "Plaza Entrance" name: "GEE" }
+  panels { room: "Plaza Entrance" name: "SEA" }
+  panels { room: "Gray Alcove" name: "GRAVELY" }
+  panels { room: "Cyan Alcove" name: "CAN" }
+  panels { room: "Star Rooms" name: "CYANIDE" }
+  panels { room: "Star Rooms" name: "BACK" }
+  panels { room: "Black Alcove" name: "LACK" }
+  panels { room: "White Corners" name: "ARCH" }
+  panels { room: "White Corners" name: "ZERO" }
+  panels { room: "White Corners" name: "DAM" }
+  panels { room: "White Corners" name: "WHEN" }
+  panels { room: "Hero Room" name: "HER" }
+  panels { room: "Daisy Alcove" name: "CYANIDES" }
+  location_room: "Central Connected Area"
+}