1 files changed, 159 insertions, 84 deletions

@@ -188,18 +188,18 @@ doors {
 }
 doors {
   name: "Welcome Back Secret Door"
-  type: STANDARD
+  type: ITEM_ONLY
   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"
 }
 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 {
@@ -296,9 +296,10 @@ doors {
   panels { room: "Black Hex" name: "CLUES" }
   panels { room: "Black Hex" name: "SECRET" }
   location_room: "Black Hex"
+  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 +309,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" }
@@ -382,6 +383,7 @@ doors {
   panels { room: "Z2 Room" name: "CAPE" }
   panels { room: "Z2 Room" name: "GLANCE" }
   location_room: "Z2 Room"
+  location_name: "West Puzzles"
 }
 doors {
   name: "Z2 Room Northwest Door"
@@ -413,6 +415,7 @@ doors {
   panels { room: "Z2 Room" name: "DISCORD" }
   panels { room: "Z2 Room" name: "CAT" }
   location_room: "Z2 Room"
+  location_name: "East Puzzles"
 }
 doors {
   name: "Z2 Room Southeast Door"
@@ -517,6 +520,7 @@ doors {
   panels { room: "Outside House" name: "BLITHELY" }
   panels { room: "Purple Room South" name: "THESE" }
   location_room: "Outside House"
+  location_name: "West Purple Vestibules"
 }
 doors {
   name: "Purple West Area South Door"
@@ -545,6 +549,7 @@ doors {
   panels { room: "Godot Room" name: "TRAIN" }
   panels { room: "Godot Room" name: "RECORDING" }
   location_room: "Godot Room"
+  location_name: "Godot Room"
 }
 doors {
   name: "Beehalls Intersection"
@@ -576,6 +581,7 @@ doors {
   panels { room: "Purple Room South" name: "ANY" }
   panels { room: "Outside House" name: "A" }
   location_room: "Outside House"
+  location_name: "East Purple Vestibules"
 }
 doors {
   name: "Purple East Area North Door"
@@ -593,6 +599,7 @@ doors {
   panels { room: "Outside House" name: "BLITHELY" }
   panels { room: "Purple Room South" name: "THESE" }
   location_room: "Outside House"
+  location_name: "Purple Vestibules"
 }
 doors {
   name: "Purple Room South Entrance"
@@ -622,6 +629,20 @@ doors {
   panels { room: "Purple Room South" name: "THESE" }
 }
 doors {
+  name: "Purple Room"
+  type: LOCATION_ONLY
+  panels { room: "Purple Room" name: "HOIST" }
+  panels { room: "Purple Room" name: "CORE" }
+  panels { room: "Purple Room" name: "FISH" }
+  panels { room: "Purple Room" name: "ALLOW" }
+  panels { room: "Purple Room" name: "BIRD" }
+  panels { room: "Purple Room" name: "HONK" }
+  panels { room: "Purple Room" name: "APE" }
+  panels { room: "Purple Room" name: "APATHY" }
+  location_room: "Purple Room"
+  location_name: "Puzzles"
+}
+doors {
   name: "Hedges Tower"
   type: LOCATION_ONLY
   # TODO: Not making this an item right now in order to force the player to
@@ -676,6 +697,7 @@ doors {
   panels { room: "Blue Room" name: "CELEBRATORY" }
   panels { room: "Blue Room" name: "DETECTIVE" }
   location_room: "Blue Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "O2 Prize"
@@ -694,7 +716,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" }
@@ -734,6 +756,7 @@ doors {
   panels { room: "Composite Room S" name: "BLEAKCARD" }
   panels { room: "Composite Room S" name: "MISSIONMISSION" }
   location_room: "Composite Room S"
+  location_name: "East Rooms"
 }
 doors {
   name: "Composite Room North Door"
@@ -762,6 +785,7 @@ doors {
   panels { room: "Composite Room NW" name: "OUTGARDEN" }
   panels { room: "Composite Room NW" name: "HELLOTALE" }
   location_room: "Composite Room NE"
+  location_name: "North Rooms"
 }
 doors {
   name: "Composite Room West Door"
@@ -792,12 +816,13 @@ doors {
   panels { room: "Composite Room S" name: "OUTEAT" }
   panels { room: "Composite Room S" name: "SUMMERIN" }
   location_room: "Composite Room NW"
+  location_name: "West Rooms"
 }
 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 {
@@ -829,9 +854,10 @@ doors {
   panels { room: "Composite Room S" name: "OUTEAT" }
   panels { room: "Composite Room S" name: "SUMMERIN" }
   location_room: "Composite Room S"
+  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" }
@@ -858,7 +884,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)" }
@@ -866,36 +892,32 @@ doors {
 }
 doors {
   name: "White Hallway From Entry"
-  # TODO: This should be combined with the corresponding door in the_entry, at
-  # least when connections are not shuffled.
   type: CONTROL_CENTER_COLOR
   receivers: "Components/Doors/Halls/froom_6"
   control_center_color: "white"
 }
 doors {
   name: "Purple Hallway From Great"
-  # TODO: This should be combined with the corresponding door in the_great, at
-  # least when connections are not shuffled.
   type: CONTROL_CENTER_COLOR
   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" }
@@ -916,7 +938,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" }
@@ -937,21 +959,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" }
@@ -995,7 +1017,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" }
@@ -1004,6 +1026,7 @@ doors {
   panels { room: "Wonderland" name: "ARTS" }
   panels { room: "Wonderland" name: "SONG" }
   location_room: "Wonderland"
+  location_name: "Wonderland"
 }
 doors {
   name: "Pyramid Entrance"
@@ -1034,6 +1057,7 @@ doors {
   panels { room: "Orange Room" name: "COAL" }
   panels { room: "Orange Room" name: "OWED" }
   location_room: "Orange Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Hedges Entrance"
@@ -1052,6 +1076,7 @@ doors {
   panels { room: "Outside Snake Room" name: "SONG (South)" }
   panels { room: "West Castle Area" name: "SONG (2)" }
   location_room: "West Castle Area"
+  location_name: "South SONGs"
 }
 doors {
   name: "Amber North Door"
@@ -1060,6 +1085,7 @@ doors {
   panels { room: "Outside Snake Room" name: "SONG (North)" }
   panels { room: "Amber North 2" name: "SONG" }
   location_room: "Amber North 2"
+  location_name: "North SONGs"
 }
 doors {
   name: "Amber East Doors"
@@ -1182,70 +1208,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"
@@ -1281,7 +1274,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" }
@@ -1389,12 +1382,32 @@ doors {
 }
 doors {
   name: "Roof Access"
-  type: STANDARD
+  type: ITEM_ONLY
   receivers: "Components/Doors/Castle/entry_stairs_big"
   receivers: "Components/Doors/Castle/entry_stairs_big2"
+  receivers: "Meshes/Stairs/staircase31/teleportListener"
+  receivers: "Meshes/Stairs/staircase32/teleportListener2"
+  receivers: "Meshes/Stairs/staircase33/teleportListener3"
   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" }
+}
+doors {
+  name: "North Castle Panel"
+  type: LOCATION_ONLY
+  panels { room: "North Castle Area" name: "A SUMMER PLACE" }
+  location_room: "North Castle Area"
+}
+doors {
+  name: "West Castle Panel"
+  type: LOCATION_ONLY
+  panels { room: "West Castle Area" name: "SONG FACE" }
+  location_room: "West Castle Area"
+}
+doors {
+  name: "South Castle Panel"
+  type: LOCATION_ONLY
+  panels { room: "South Castle Area" name: "AN OFFER VILLAGE BEFORE LAIR" }
   location_room: "South Castle Area"
 }
 doors {
@@ -1411,6 +1424,7 @@ doors {
   panels { room: "West Spire" name: "CUT" }
   panels { room: "West Spire" name: "STONES" }
   location_room: "West Spire"
+  location_name: "Pairs Room Puzzles"
 }
 doors {
   name: "Pairs Room West Door"
@@ -1453,87 +1467,87 @@ doors {
 }
 doors {
   name: "Red Rainbow Room"
-  type: ITEM_ONLY
+  type: STANDARD
   receivers: "Components/Doors/Color Reading/door_3"
   panels { room: "Rainbow Start" name: "PAINTING" }
-  panels { room: "Red Smiley" name: "SMILE" }
+  location_room: "Rainbow Start"
 }
 doors {
   name: "Orange Rainbow Room"
   type: ITEM_ONLY
   receivers: "Components/Doors/Color Reading/door_4"
   panels { room: "Rainbow Red" name: "THEME" }
-  panels { room: "Outside Orange Room" name: "SMILE" }
+  panels { room: "Red Smiley" name: "SMILE" }
 }
 doors {
   name: "Yellow Rainbow Room"
   type: ITEM_ONLY
   receivers: "Components/Doors/Color Reading/door_17"
   panels { room: "Rainbow Orange" name: "THEME" }
-  panels { room: "Hedges" name: "SMILE" }
+  panels { room: "Outside Orange Room" name: "SMILE" }
 }
 doors {
   name: "Green Rainbow Room"
   type: ITEM_ONLY
   receivers: "Components/Doors/Color Reading/door_5"
   panels { room: "Rainbow Yellow" name: "THEME" }
-  panels { room: "Green Smiley" name: "SMILE" }
+  panels { room: "Hedges" name: "SMILE" }
 }
 doors {
   name: "Blue Rainbow Room"
   type: ITEM_ONLY
   receivers: "Components/Doors/Color Reading/door_6"
   panels { room: "Rainbow Green" name: "THEME" }
-  panels { room: "Blue Smiley" name: "SMILE" }
+  panels { room: "Green Smiley" name: "SMILE" }
 }
 doors {
   name: "Purple Rainbow Room"
   type: ITEM_ONLY
   receivers: "Components/Doors/Color Reading/door_7"
   panels { room: "Rainbow Blue" name: "THEME" }
-  panels { room: "Purple Smiley" name: "SMILE" }
+  panels { room: "Blue Smiley" name: "SMILE" }
 }
 doors {
   name: "Red Rainbow Panel"
   type: LOCATION_ONLY
-  panels { room: "Rainbow Start" name: "PAINTING" }
-  location_room: "Rainbow Start"
-}
-doors {
-  name: "Orange Rainbow Panel"
-  type: LOCATION_ONLY
   panels { room: "Rainbow Red" name: "THEME" }
   location_room: "Rainbow Red"
 }
 doors {
-  name: "Yellow Rainbow Panel"
+  name: "Orange Rainbow Panel"
   type: LOCATION_ONLY
   panels { room: "Rainbow Orange" name: "THEME" }
   location_room: "Rainbow Orange"
 }
 doors {
-  name: "Green Rainbow Panel"
+  name: "Yellow Rainbow Panel"
   type: LOCATION_ONLY
   panels { room: "Rainbow Yellow" name: "THEME" }
   location_room: "Rainbow Yellow"
 }
 doors {
-  name: "Blue Rainbow Panel"
+  name: "Green Rainbow Panel"
   type: LOCATION_ONLY
   panels { room: "Rainbow Green" name: "THEME" }
   location_room: "Rainbow Green"
 }
 doors {
-  name: "Purple Rainbow Panel"
+  name: "Blue Rainbow Panel"
   type: LOCATION_ONLY
   panels { room: "Rainbow Blue" name: "THEME" }
   location_room: "Rainbow Blue"
 }
 doors {
   name: "Cyan Rainbow Room"
-  type: STANDARD
+  type: ITEM_ONLY
   receivers: "Components/Doors/Color Reading/door_18"
   panels { room: "Rainbow Purple" name: "THEME" }
+  panels { room: "Purple Smiley" name: "SMILE" }
+}
+doors {
+  name: "Purple Rainbow Panel"
+  type: LOCATION_ONLY
+  panels { room: "Rainbow Purple" name: "THEME" }
   location_room: "Rainbow Purple"
 }
 doors {
@@ -1542,6 +1556,7 @@ doors {
   receivers: "Components/Doors/Color Reading/door_8"
   panels { room: "Rainbow Cyan" name: "THEME" }
   location_room: "Rainbow Cyan"
+  location_name: "Cyan Rainbow Panel"
 }
 doors {
   name: "Pepper Room Entrance"
@@ -1565,6 +1580,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"
@@ -1600,6 +1616,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"
@@ -1631,6 +1648,7 @@ doors {
   receivers: "Components/Doors/Smileys/yellow_2"
   panels { room: "Hedges" name: "SMILE" }
   location_room: "Hedges"
+  location_name: "Yellow SMILE"
 }
 doors {
   name: "Green Smiley"
@@ -1639,6 +1657,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"
@@ -1646,6 +1665,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"
@@ -1670,6 +1690,7 @@ doors {
   type: LOCATION_ONLY
   panels { room: "Red Smiley" name: "SMILE" }
   location_room: "Red Smiley"
+  location_name: "Red SMILE"
 }
 doors {
   name: "Pink Hallway"
@@ -1708,6 +1729,7 @@ doors {
   panels { room: "Cyan Room" name: "COLD" }
   panels { room: "Cyan Room" name: "WORDWORD" }
   location_room: "Cyan Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Green Room Entrance"
@@ -1731,6 +1753,7 @@ doors {
   panels { room: "Green Room" name: "DOUBLE" }
   panels { room: "Green Room" name: "BADMINTON" }
   location_room: "Green Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Blue Hallway South Divider"
@@ -1769,6 +1792,7 @@ doors {
   panels { room: "Red Room" name: "TESTAMENT" }
   panels { room: "Red Room" name: "TAKEOUT" }
   location_room: "Red Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Blue Hallway To Red Room"
@@ -1782,6 +1806,7 @@ doors {
   panels { room: "Blue Hallway" name: "CHOP" }
   panels { room: "Blue Hallway Tall Side" name: "TALL" }
   location_room: "Blue Hallway Tall Side"
+  location_name: "CHOP, TALL"
 }
 doors {
   name: "Near Yellow Room Door"
@@ -1794,6 +1819,7 @@ doors {
   panels { room: "Blue Hallway Tall Side" name: "CHILD" }
   panels { room: "Blue Hallway Tall Side" name: "NEW" }
   location_room: "Blue Hallway Tall Side"
+  location_name: "Pink Hex"
 }
 doors {
   name: "House Side Door"
@@ -1830,6 +1856,7 @@ doors {
   panels { room: "Yellow Room" name: "PROTON" }
   panels { room: "Yellow Room" name: "SPIRIT" }
   location_room: "Yellow Room"
+  location_name: "Puzzles"
 }
 doors {
   name: "Dark Light Room Entrance"
@@ -1865,6 +1892,7 @@ doors {
   type: LOCATION_ONLY
   panels { room: "Dark Light Exit" name: "GASKET" }
   location_room: "Dark Light Exit"
+  location_name: "GASKET"
 }
 doors {
   name: "Dark Light Room Divider"
@@ -1884,6 +1912,7 @@ doors {
   # Not technically true; it's complete_at=11 with both rooms, but you couldn't
   # get to the other side in vanilla doors anyway.
   location_room: "Dark Light Room"
+  location_name: "Main Puzzles"
 }
 doors {
   name: "Near Sweet Blue Door"
@@ -1896,6 +1925,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"
 }
 doors {
   name: "South Castle Area Back Door"
@@ -1935,6 +1965,7 @@ doors {
   panels { room: "Plum Room" name: "SNAKE" }
   panels { room: "Plum Room" name: "CENTER" }
   location_room: "Plum Room"
+  location_name: "Plum Room"
 }
 doors {
   name: "D Keyholder Blocker"
@@ -2036,6 +2067,7 @@ doors {
   panels { room: "Computer Room" name: "MOUSE (2)" }
   panels { room: "Computer Room" name: "KEYBOARD (2)" }
   location_room: "Computer Room"
+  location_name: "Main Puzzles"
 }
 doors {
   name: "Computer Room Entrance"
@@ -2048,12 +2080,17 @@ doors {
   panels { room: "Rainbow Color Doors" name: "MISCHIEF" }
   panels { room: "Rainbow Color Doors" name: "CASUAL" }
   location_room: "Rainbow Color Doors"
+  location_name: "Red Tower"
 }
 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"
@@ -2115,6 +2152,7 @@ doors {
   panels { room: "Book Room" name: "BOOK (11)" }
   panels { room: "Book Room" name: "BOOK (12)" }
   location_room: "Book Room"
+  location_name: "Book Room"
 }
 doors {
   name: "Sticks And Stones Door"
@@ -2122,6 +2160,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"
@@ -2141,6 +2180,7 @@ doors {
   panels { room: "Black Hex" name: "BARK" }
   panels { room: "Zoo N" name: "LEAF" }
   location_room: "Zoo N"
+  location_name: "BARK, LEAF"
 }
 doors {
   name: "Zoo East Entrance"
@@ -2226,3 +2266,38 @@ doors {
   panels { room: "Yellow Color Backside" name: "REDACTED" }
   location_room: "Yellow Color Backside"
 }
+doors {
+  name: "Tenacious Color Painting"
+  type: EVENT
+  panels { room: "South Castle Area" name: "COLOR (1)" answer: "red" }
+  panels { room: "South Castle Area" name: "COLOR (2)" answer: "yellow" }
+  panels { room: "South Castle Area" name: "COLOR (3)" answer: "purple" }
+  panels { room: "South Castle Area" name: "COLOR (4)" answer: "green" }
+}
+doors {
+  name: "Eye Painting"
+  type: ITEM_ONLY
+  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"
+}