20 files changed, 314 insertions, 92 deletions

@@ -100,6 +100,11 @@ connections {
   oneway: true
 }
 connections {
+  from_room: "Outside House"
+  to_room: "Blue Hallway Tall Side"
+  door { name: "House Side Door" }
+}
+connections {
   from_room: "Purple SE Vestibule"
   to_room: "Welcome Back Area"
   oneway: true
@@ -222,12 +227,12 @@ connections {
 connections {
   from_room: "West Castle Area"
   to_room: "Post Orange Smiley Three Way"
-  door { name: "Splintering Exit Left Door" }
+  door { name: "Splintering Exit North Door" }
 }
 connections {
   from_room: "West Castle Area"
   to_room: "Amber North 2"
-  door { name: "Splintering Exit Right Door" }
+  door { name: "Splintering Exit South Door" }
 }
 connections {
   from_room: "Z2 Room"
@@ -378,7 +383,7 @@ connections {
 connections {
   from_room: "O2 Room"
   to_room: "Blue Smiley"
-  door { name: "Blue Smiley Entrance" }
+  door { name: "O2 Room Southeast Door" }
 }
 connections {
   from_room: "O2 Room"
@@ -408,7 +413,7 @@ connections {
 connections {
   from_room: "O2 Room"
   to_room: "Blue Hallway"
-  door { name: "O2 Room Back Door" }
+  door { name: "O2 Room Northeast Door" }
 }
 connections {
   from_room: "O2 Room"
@@ -423,7 +428,7 @@ connections {
 connections {
   from_room: "Sweet Foyer"
   to_room: "F2 Room"
-  door { name: "F2 Room Entrance" }
+  door { name: "F2 Room Southeast Door" }
 }
 connections {
   from_room: "Globe Room"
@@ -438,17 +443,17 @@ connections {
 connections {
   from_room: "F2 Room"
   to_room: "Blue Hallway"
-  door { name: "F2 Room Back Right Door" }
+  door { name: "F2 Room Southwest Door" }
 }
 connections {
   from_room: "F2 Room"
   to_room: "Outside Salt Room"
-  door { name: "F2 Room Back Left Door" }
+  door { name: "F2 Room Northwest Door" }
 }
 connections {
   from_room: "F2 Room"
   to_room: "Red Color Door"
-  door { name: "F2 Room Back Middle Door" }
+  door { name: "F2 Room West Door" }
   oneway: true
   # This is the red backside, which has nothing in it. Maybe could be its own
   # region at some point.
@@ -461,7 +466,7 @@ connections {
 connections {
   from_room: "U2 Room"
   to_room: "Maze Paintings Area"
-  door { name: "U2 Room Shortcut" }
+  door { name: "U2 Room Southeast Door" }
 }
 connections {
   from_room: "Maze Paintings Area"
@@ -476,17 +481,17 @@ connections {
 connections {
   from_room: "U2 Room"
   to_room: "Purple SE Vestibule"
-  door { name: "U2 Room Back Right Door" }
+  door { name: "U2 Room Southwest Door" }
 }
 connections {
   from_room: "U2 Room"
   to_room: "Purple Room East"
-  door { name: "U2 Room Back Door" }
+  door { name: "U2 Room West Door" }
 }
 connections {
   from_room: "Maze"
   to_room: "U2 Room"
-  door { name: "U2 Room Entrance" }
+  door { name: "U2 Room East Door" }
 }
 connections {
   from_room: "Outside Magic Room"
@@ -511,7 +516,7 @@ connections {
 connections {
   from_room: "Wonderland"
   to_room: "Black Hex"
-  door { name: "Wonderland Right Door" }
+  door { name: "Wonderland South Door" }
 }
 connections {
   from_room: "Outside Pyramid"
@@ -601,7 +606,7 @@ connections {
 connections {
   from_room: "Wonderland"
   to_room: "Number Paintings Area"
-  door { name: "Wonderland Left Door" }
+  door { name: "Wonderland North Door" }
 }
 connections {
   from_room: "Outside House"
@@ -1857,3 +1862,15 @@ connections {
   oneway: true
   roof_access: true
 }
+connections {
+  from_room: "Roof"
+  to_room: "F Keyholder"
+  oneway: true
+  roof_access: true
+}
+connections {
+  from_room: "Roof"
+  to_room: "Yellow Color Backside"
+  oneway: true
+  roof_access: true
+}
@@ -188,17 +188,20 @@ 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"
-  type: STANDARD
-  receivers: "Components/Doors/Entry/entry_14"
+  type: LOCATION_ONLY
+  #receivers: "Components/Doors/Entry/entry_14"
   panels { room: "Welcome Back Area" name: "GREETINGS OLD FRIEND" }
   location_room: "Welcome Back Area"
+  location_name: "GREETINGS OLD FRIEND"
 }
 # entry_3 is the door to SEAL, which we will ignore.
 doors {
@@ -224,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"
@@ -298,8 +310,9 @@ doors {
   location_name: "Black Hex"
 }
 doors {
-  name: "Splintering Exit Left Door"
-  type: STANDARD
+  name: "Splintering Exit North Door"
+  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" }
@@ -308,7 +321,7 @@ doors {
   location_room: "West Castle Area"
 }
 doors {
-  name: "Splintering Exit Right Door"
+  name: "Splintering Exit South Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/Entry/gate_5"
   panels { room: "West Castle Area" name: "EVER" }
@@ -317,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"
@@ -493,7 +548,6 @@ doors {
   panels { room: "Outside House" name: "WALLS" }
   panels { room: "Outside House" name: "LOCK" }
   location_room: "Outside House"
-  location_name: "North Purple Vestibules"
 }
 doors {
   name: "Purple NW Vestibule"
@@ -716,7 +770,7 @@ doors {
   panels { room: "O2 Room" name: "UNBLOCKED" }
 }
 doors {
-  name: "Blue Smiley Entrance"
+  name: "O2 Room Southeast Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/oroom_2"
   panels { room: "O2 Room" name: "HONEST" }
@@ -820,9 +874,20 @@ 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: "Left" }
+  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 {
@@ -857,7 +922,7 @@ doors {
   location_name: "South Rooms"
 }
 doors {
-  name: "O2 Room Back Door"
+  name: "O2 Room Northeast Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/oroom_4"
   panels { room: "O2 Room" name: "UNBLOCKED" }
@@ -866,6 +931,7 @@ doors {
 doors {
   name: "Control Center Orange Door"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/Halls/oroom_6"
   control_center_color: "orange"
 }
@@ -884,8 +950,9 @@ doors {
   panels { room: "F2 Room" name: "SHAPE" }
 }
 doors {
-  name: "F2 Room Entrance"
-  type: STANDARD
+  name: "F2 Room Southeast Door"
+  type: ITEM_ONLY
+  legacy_location: true
   receivers: "Components/Doors/Halls/froom_2"
   panels { room: "Sweet Foyer" name: "RENT (1)" }
   location_room: "Sweet Foyer"
@@ -893,31 +960,33 @@ doors {
 doors {
   name: "White Hallway From Entry"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/Halls/froom_6"
   control_center_color: "white"
 }
 doors {
   name: "Purple Hallway From Great"
   type: CONTROL_CENTER_COLOR
+  latch: true
   receivers: "Components/Doors/Halls/froom_7"
   control_center_color: "purple"
 }
 doors {
-  name: "F2 Room Back Right Door"
+  name: "F2 Room Southwest Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/froom_3"
   panels { room: "F2 Room" name: "RISKY" }
   location_room: "F2 Room"
 }
 doors {
-  name: "F2 Room Back Left Door"
+  name: "F2 Room Northwest Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/froom_4"
   panels { room: "F2 Room" name: "SHAPE" }
   location_room: "F2 Room"
 }
 doors {
-  name: "F2 Room Back Middle Door"
+  name: "F2 Room West Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/froom_5"
   panels { room: "F2 Room" name: "DIRT" }
@@ -938,7 +1007,7 @@ doors {
   panels { room: "U2 Room" name: "HEAVEN" }
 }
 doors {
-  name: "U2 Room Shortcut"
+  name: "U2 Room Southeast Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/uroom_2"
   panels { room: "U2 Room" name: "WICKED" }
@@ -959,21 +1028,21 @@ doors {
   location_room: "House Entrance"
 }
 doors {
-  name: "U2 Room Back Right Door"
+  name: "U2 Room Southwest Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/uroom_3"
   panels { room: "U2 Room" name: "HEAVEN" }
   location_room: "U2 Room"
 }
 doors {
-  name: "U2 Room Back Door"
+  name: "U2 Room West Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/Halls/uroom_5"
   panels { room: "Purple Room South" name: "ANY" }
   panels { room: "Outside House" name: "A" }
 }
 doors {
-  name: "U2 Room Entrance"
+  name: "U2 Room East Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/Halls/uroom_4"
   panels { room: "Outside Magic Room" name: "WIZARD" }
@@ -1017,7 +1086,7 @@ doors {
   panels { room: "Outside Magic Room" name: "WIZARD" }
 }
 doors {
-  name: "Wonderland Right Door"
+  name: "Wonderland South Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/wonderland_1"
   panels { room: "Wonderland" name: "APRIL" }
@@ -1208,70 +1277,37 @@ doors {
   type: ITEM_ONLY
   receivers: "Components/Doors/Halls/connections_1"
   receivers: "Components/Doors/Halls/connections_3"
+  # These have the same effect as the above, but including them here prevents
+  # them from opening in door shuffle when the J2 door opens.
+  receivers: "Components/Triggers/teleportListenerConnections3"
+  receivers: "Components/Triggers/teleportListenerConnections4"
+  # This door can open from either solving all panels, or just the smiley ones,
+  # and the latter is obviously a subset of the former so let's just check for
+  # that.
   panels { room: "Hotel" name: "PARKA" }
-  panels { room: "Hotel" name: "MARLIN" }
-  panels { room: "Hotel" name: "WHO" }
   panels { room: "Hotel" name: "CLOAK" }
-  panels { room: "Hotel" name: "MANE" }
-  panels { room: "Hotel" name: "WHAT" }
-  panels { room: "Hotel" name: "BLAZER" }
-  panels { room: "Hotel" name: "WHERE" }
   panels { room: "Hotel" name: "DOROTHY" }
-  panels { room: "Hotel" name: "JACKET" }
-  panels { room: "Hotel" name: "TAIL" }
   panels { room: "Hotel" name: "JAWS" }
-  panels { room: "Hotel" name: "FLOUNDER" }
   panels { room: "Hotel" name: "WHEN" }
   panels { room: "Hotel" name: "CLAWS" }
-  panels { room: "Hotel" name: "BRUCE" }
   panels { room: "Hotel" name: "POTATO" }
-  panels { room: "Hotel" name: "SALAD" }
-  panels { room: "Hotel" name: "BATHING" }
   panels { room: "Hotel" name: "MICRO" }
-  panels { room: "Hotel" name: "BUSINESS" }
-  panels { room: "Hotel" name: "WEDDING" }
-  panels { room: "Hotel" name: "TREE" }
-  panels { room: "Hotel" name: "RIVER" }
   panels { room: "Hotel" name: "TUNING" }
-  panels { room: "Hotel" name: "BOXING" }
-  panels { room: "Hotel" name: "TELEPHONE" }
   panels { room: "Hotel" name: "LAW" }
-  panels { room: "Hotel" name: "POKER" }
   panels { room: "Hotel" name: "CARD" }
   panels { room: "Hotel" name: "ROAD" }
-  panels { room: "Hotel" name: "CHOCOLATE" }
   panels { room: "Hotel" name: "DEPART" }
-  panels { room: "Hotel" name: "WITHDRAW" }
-  panels { room: "Hotel" name: "QUIT" }
   panels { room: "Hotel" name: "LEAVE" }
-  panels { room: "Hotel" name: "PALE" }
-  panels { room: "Hotel" name: "JUST" }
-  panels { room: "Hotel" name: "NEW" }
-  panels { room: "Hotel" name: "UNTALENTED" }
   panels { room: "Hotel" name: "SERVICE" }
-  panels { room: "Hotel" name: "FULL" }
-  panels { room: "Hotel" name: "EVIL" }
   panels { room: "Hotel" name: "HONEY" }
-  panels { room: "Hotel" name: "CRESCENT" }
   panels { room: "Hotel" name: "INVALID" }
   panels { room: "Hotel" name: "FESTIVAL" }
-  panels { room: "Hotel" name: "BEAUTIFUL" }
   panels { room: "Hotel" name: "WILTED" }
-  panels { room: "Hotel" name: "DROOPED" }
-  panels { room: "Hotel" name: "FADED" }
   panels { room: "Hotel" name: "WANED" }
-  panels { room: "Hotel" name: "TALL" }
-  panels { room: "Hotel" name: "CANVAS" }
-  panels { room: "Hotel" name: "LEVER" }
-  panels { room: "Hotel" name: "SCULPTURE" }
   panels { room: "Hotel" name: "RAGE" }
-  panels { room: "Hotel" name: "BALL" }
-  panels { room: "Hotel" name: "FOOL" }
   panels { room: "Hotel" name: "VERGE" }
-  panels { room: "Hotel" name: "ART" }
   panels { room: "Hotel" name: "EVER" }
   panels { room: "Hotel" name: "PAIN" }
-  panels { room: "Hotel" name: "FOOT" }
 }
 doors {
   name: "J2 Door 1"
@@ -1307,7 +1343,7 @@ doors {
   panels { room: "J2 Vestibule" name: "COLORFUL" }
 }
 doors {
-  name: "Wonderland Left Door"
+  name: "Wonderland North Door"
   type: ITEM_ONLY
   receivers: "Components/Doors/Halls/wonderland_2"
   panels { room: "Wonderland" name: "APRIL" }
@@ -1421,6 +1457,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" }
@@ -1613,6 +1652,7 @@ doors {
   panels { room: "Salt Room" name: "SEASONING" }
   panels { room: "Pepper Room" name: "SEASONING" }
   location_room: "Pepper Room"
+  location_name: "Seasonings"
 }
 doors {
   name: "Bow Side"
@@ -1648,6 +1688,7 @@ doors {
   # Components/Doors/Smileys/blue_1
   panels { room: "Blue Smiley" name: "SMILE" }
   location_room: "Blue Smiley"
+  location_name: "Blue SMILE"
 }
 doors {
   name: "Blue Smiley Annex"
@@ -1679,6 +1720,7 @@ doors {
   receivers: "Components/Doors/Smileys/yellow_2"
   panels { room: "Hedges" name: "SMILE" }
   location_room: "Hedges"
+  location_name: "Yellow SMILE"
 }
 doors {
   name: "Green Smiley"
@@ -1687,6 +1729,7 @@ doors {
   receivers: "Components/Doors/Smileys/green_2"
   panels { room: "Green Smiley" name: "SMILE" }
   location_room: "Green Smiley"
+  location_name: "Green SMILE"
 }
 doors {
   name: "Orange Smiley Exit"
@@ -1694,6 +1737,7 @@ doors {
   receivers: "Components/Doors/Smileys/orange_1"
   panels { room: "Outside Orange Room" name: "SMILE" }
   location_room: "Outside Orange Room"
+  location_name: "Orange SMILE"
 }
 doors {
   name: "F Keyholder Door"
@@ -1718,6 +1762,7 @@ doors {
   type: LOCATION_ONLY
   panels { room: "Red Smiley" name: "SMILE" }
   location_room: "Red Smiley"
+  location_name: "Red SMILE"
 }
 doors {
   name: "Pink Hallway"
@@ -1792,12 +1837,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"
@@ -1952,7 +2022,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"
@@ -2112,8 +2182,12 @@ doors {
 doors {
   name: "C Keyholder Blocker"
   type: EVENT
-  # Components/Doors/Unincorporated/temple_foyer_7
-  switches: "lavender_cubes"
+  receivers: "Components/Doors/Unincorporated/temple_foyer_7"
+  panels {
+    map: "the_ancient"
+    room: "Inside"
+    name: "COLOR"
+  }
 }
 doors {
   name: "Computer Room Back Door"
@@ -2183,6 +2257,7 @@ doors {
   receivers: "Components/Doors/Unincorporated/temple_foyer_6"
   panels { room: "Globe Room" name: "WORD" }
   location_room: "Globe Room"
+  location_name: "Sticks and Stones"
 }
 doors {
   name: "Castle Numbers Puzzle"
@@ -2302,3 +2377,95 @@ doors {
   receivers: "Components/Paintings/Temple of the Eyes/eyeRedStart/teleportListener"
   double_letters: true
 }
+doors {
+  name: "Lime Hexes"
+  type: LOCATION_ONLY
+  panels { room: "Tree Entrance" name: "RAT" }
+  panels { room: "Tree Entrance" name: "DIFFERENCE" }
+  panels { room: "Tree Entrance" name: "LEANS" }
+  panels { room: "Tree Entrance" name: "QUESTION" }
+  panels { room: "Tree Entrance" name: "WHERE" }
+  panels { room: "Tree Entrance" name: "SUNDER" }
+  location_room: "Tree Entrance"
+}
+doors {
+  name: "Theo Panels"
+  type: LOCATION_ONLY
+  panels { room: "House" name: "GOAT" }
+  panels { room: "House" name: "AMAZE" }
+  panels { room: "House" name: "SKINNYHIM" }
+  panels { room: "House" name: "THEO" }
+  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,5 +1,5 @@
 name: "C Keyholder"
-panel_display_name: "North Area"
+panel_display_name: "East Area"
 keyholders {
   name: "C"
   path: "Components/KeyHolders/keyHolderC"
@@ -194,5 +194,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Composite Room Worldport"
   path: "Components/Warps/Worldports/worldport16"
+  destination { x: -84 y: 0 z: 81 }
+  rotation: 270
 }
@@ -10,5 +10,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Starting Room West Wall Middle Worldport"
   path: "Components/Warps/Worldports/worldport4"
+  destination { x: -21 y: 0 z: -4 }
+  rotation: 90
 }
@@ -2,5 +2,7 @@ name: "Hedges Tower"
 panel_display_name: "Hedges"
 ports {
   name: "TENACIOUS"
+  display_name: "Hedge Maze Tower"
   path: "Components/Warps/Worldports/worldport13"
+  no_shuffle: true
 }
@@ -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"
@@ -6,5 +6,8 @@ paintings {
 }
 ports {
   name: "HIVE"
+  display_name: "Moat Worldport"
   path: "Components/Warps/Worldports/worldport9"
+  destination { x: 64 y: 1 z: 24.5 }
+  rotation: 0
 }
@@ -76,5 +76,8 @@ paintings {
 }
 ports {
   name: "REVITALIZED"
+  display_name: "Near Hedges Plum Hallway"
   path: "Components/Warps/Worldports/worldport7"
+  destination { x: 45 y: 0 z: 94 }
+  rotation: 270
 }
@@ -2,5 +2,8 @@ name: "Purple Hallway From Great"
 panel_display_name: "South Area"
 ports {
   name: "GREAT"
+  display_name: "Near Sweet Purple Hallway"
   path: "Components/Warps/Worldports/worldport17"
+  destination { x: -24 y: 0 z: 61 }
+  rotation: 270
 }
@@ -16,5 +16,8 @@ paintings {
 }
 ports {
   name: "QUIET"
+  display_name: "Near Planet Painting Worldport"
   path: "Components/Warps/Worldports/worldport5"
+  destination { x: -32 y: 0 z: -40 }
+  rotation: 90
 }
@@ -10,5 +10,8 @@ panels {
 }
 ports {
   name: "BEARER"
+  display_name: "Rain Panel Worldport"
   path: "Components/Warps/Worldports/worldport11"
+  destination { x: 93.5 y: 0 z: 27 }
+  rotation: 90
 }
@@ -1,7 +1,7 @@
 name: "Red Color Door"
 panel_display_name: "Southwest Area"
 panels {
-  name: "Left"
+  name: "Near Obscured Puzzles"
   path: "Panels/Halls/wb_1"
   clue: ""
   answer: "sidewalk"
@@ -9,5 +9,8 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Starting Room South Wall Middle Worldport"
   path: "Components/Warps/Worldports/worldport"
+  destination { x: 0 y: 0 z: 11 }
+  rotation: 0
 }
@@ -51,9 +51,15 @@ paintings {
 }
 ports {
   name: "SWEET1"
+  display_name: "Sweet East Entrance"
   path: "Components/Warps/Worldports/worldport14"
+  destination { x: -27 y: 0 z: 76.5 }
+  rotation: 270
 }
 ports {
   name: "SWEET2"
+  display_name: "Sweet West Entrance"
   path: "Components/Warps/Worldports/worldport15"
+  destination { x: -36 y: 0 z: 76.5 }
+  rotation: 90
 }
@@ -48,5 +48,8 @@ panels {
 }
 ports {
   name: "TREE"
+  display_name: "Near Pumpkin Brown Hallway"
   path: "Components/Warps/Worldports/worldport12"
+  destination { x: 41 y: 0 z: 50.5 }
+  rotation: 0
 }
@@ -2,5 +2,8 @@ name: "Unkempt Entrance"
 panel_display_name: "O2 Room"
 ports {
   name: "UNKEMPT"
+  display_name: "O2 Room Worldport"
   path: "Components/Warps/Worldports/worldport6"
+  destination { x: -61 y: 0 z: 95 }
+  rotation: 270
 }
@@ -1,12 +1,9 @@
 name: "White Hallway From Entry"
 panel_display_name: "Southwest Area"
-# Not exactly sure what to do with this yet. In unshuffled connections, the door
-# here should be paired with the door on the other end (which is vanilla) even
-# if control center color doors are shuffled. But when connections are shuffled
-# maybe this should be shuffled separately? I might also want to find a way to
-# register when there's a door immediately outside of a connection so that when
-# two connections behind doors are shuffled together, their doors can be paired.
 ports {
   name: "ENTRY"
+  display_name: "Near Globe White Hallway"
   path: "Components/Warps/Worldports/worldport10"
+  destination { x: -46 y: 0 z: 23 }
+  rotation: 90
 }
@@ -1,6 +1,5 @@
 name: "Wonderland"
 panel_display_name: "Northwest Area"
-# TODO: There's a warp from The Entry into here.
 panels {
   name: "APRIL"
   path: "Panels/Wonderland/wonderland_1"
@@ -38,5 +37,8 @@ panels {
 }
 ports {
   name: "WONDROUS"
+  display_name: "Wonderland Worldport"
   path: "Components/Warps/Worldports/worldport3"
+  destination { x: -104 y: 0 z: -69 }
+  rotation: 180
 }
@@ -30,5 +30,8 @@ paintings {
 }
 ports {
   name: "FOURROOMS"
+  display_name: "Near Yellow Worldport"
   path: "Components/Warps/Worldports/worldport8"
+  destination { x: 92.5 y: 0 z: -62 }
+  rotation: 90
 }