1 files changed, 230 insertions, 65 deletions

@@ -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"
@@ -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
@@ -716,7 +772,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 +876,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 +924,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 +933,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 +952,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 +962,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 +1009,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 +1030,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 +1088,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 +1279,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 +1345,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 +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" }
@@ -1613,6 +1654,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 +1690,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 +1722,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 +1731,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 +1739,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 +1764,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 +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"
@@ -1952,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"
@@ -2187,6 +2259,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 +2379,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"
+}