5 files changed, 84 insertions, 75 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
+}
@@ -195,8 +195,8 @@ doors {
 }
 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"
 }
@@ -298,7 +298,7 @@ doors {
   location_name: "Black Hex"
 }
 doors {
-  name: "Splintering Exit Left Door"
+  name: "Splintering Exit North Door"
   type: STANDARD
   receivers: "Components/Doors/Entry/gate_4"
   panels { room: "West Castle Area" name: "EVER" }
@@ -308,7 +308,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" }
@@ -493,7 +493,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 +715,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" }
@@ -822,7 +821,7 @@ doors {
   name: "Composite Room NW Entrance"
   type: STANDARD
   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 {
@@ -857,7 +856,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" }
@@ -884,7 +883,7 @@ doors {
   panels { room: "F2 Room" name: "SHAPE" }
 }
 doors {
-  name: "F2 Room Entrance"
+  name: "F2 Room Southeast Door"
   type: STANDARD
   receivers: "Components/Doors/Halls/froom_2"
   panels { room: "Sweet Foyer" name: "RENT (1)" }
@@ -903,21 +902,21 @@ doors {
   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 +937,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 +958,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 +1016,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 +1207,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 +1273,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" }
@@ -1648,6 +1614,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 +1646,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 +1655,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 +1663,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 +1688,7 @@ doors {
   type: LOCATION_ONLY
   panels { room: "Red Smiley" name: "SMILE" }
   location_room: "Red Smiley"
+  location_name: "Red SMILE"
 }
 doors {
   name: "Pink Hallway"
@@ -2187,6 +2158,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"
@@ -2306,3 +2278,24 @@ 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"
+}
@@ -1,5 +1,5 @@
 name: "C Keyholder"
-panel_display_name: "North Area"
+panel_display_name: "East Area"
 keyholders {
   name: "C"
   path: "Components/KeyHolders/keyHolderC"
@@ -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"
@@ -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"