43 files changed, 282 insertions, 169 deletions
diff --git a/data/maps/daedalus/connections.txtpb b/data/maps/daedalus/connections.txtpb
index 09613ae..07b6513 100644
--- a/data/maps/daedalus/connections.txtpb
+++ b/data/maps/daedalus/connections.txtpb

@@ -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
@@ -1857,3 +1862,9 @@ connections {
  oneway: true
  roof_access: true
 }
+connections {
+  from_room: "Roof"
+  to_room: "F Keyholder"
+  oneway: true
+  roof_access: true
+}
diff --git a/data/maps/daedalus/doors.txtpb b/data/maps/daedalus/doors.txtpb
index 2d8ba0b..ace15a1 100644
--- a/data/maps/daedalus/doors.txtpb
+++ b/data/maps/daedalus/doors.txtpb

@@ -195,8 +195,8 @@ doors {
 }
 doors {
  name: "Welcome Back Door"
-  type: STANDARD
+  type: LOCATION_ONLY
-  receivers: "Components/Doors/Entry/entry_14"
+  #receivers: "Components/Doors/Entry/entry_14"
  panels { room: "Welcome Back Area" name: "GREETINGS OLD FRIEND" }
  location_room: "Welcome Back Area"
 }
@@ -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"
@@ -892,16 +891,12 @@ 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"
@@ -1080,6 +1075,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"
@@ -1088,6 +1084,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"
@@ -1210,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"
@@ -1921,6 +1885,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"
@@ -2113,8 +2078,12 @@ doors {
 doors {
  name: "C Keyholder Blocker"
  type: EVENT
-  # Components/Doors/Unincorporated/temple_foyer_7
+  receivers: "Components/Doors/Unincorporated/temple_foyer_7"
-  switches: "lavender_cubes"
+  panels {
+    map: "the_ancient"
+    room: "Inside"
+    name: "COLOR"
+  }
 }
 doors {
  name: "Computer Room Back Door"
@@ -2184,6 +2153,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"
@@ -2303,3 +2273,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"
+}
diff --git a/data/maps/daedalus/rooms/Wonderland.txtpb b/data/maps/daedalus/rooms/Wonderland.txtpb
index 4b69e99..ae9b3f1 100644
--- a/data/maps/daedalus/rooms/Wonderland.txtpb
+++ b/data/maps/daedalus/rooms/Wonderland.txtpb

@@ -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"
diff --git a/data/maps/the_ancient/doors.txtpb b/data/maps/the_ancient/doors.txtpb
index 5dc062e..e550306 100644
--- a/data/maps/the_ancient/doors.txtpb
+++ b/data/maps/the_ancient/doors.txtpb

@@ -38,7 +38,8 @@ doors {
 }
 doors {
  name: "Lavender Cubes"
-  type: STANDARD
+  type: LOCATION_ONLY
  panels { room: "Inside" name: "COLOR" }
  location_room: "Inside"
+  location_name: "COLOR"
 }
diff --git a/data/maps/the_ancient/rooms/Inside.txtpb b/data/maps/the_ancient/rooms/Inside.txtpb
index d6e8575..3723b2d 100644
--- a/data/maps/the_ancient/rooms/Inside.txtpb
+++ b/data/maps/the_ancient/rooms/Inside.txtpb

@@ -5,5 +5,4 @@ panels {
  clue: "color"
  answer: "lavender"
  symbols: EXAMPLE
-  # TODO: how does this connect to the "lavender_cubes" switch?
 }
diff --git a/data/maps/the_bearer/connections.txtpb b/data/maps/the_bearer/connections.txtpb
index 23410f0..ba14d83 100644
--- a/data/maps/the_bearer/connections.txtpb
+++ b/data/maps/the_bearer/connections.txtpb

@@ -263,3 +263,8 @@ connections {
  to_room: "Butterfly Room"
  door { name: "Butterfly Entrance" }
 }
+connections {
+  from_room: "Back Area"
+  to_room: "Tree Entrance"
+  door { name: "Control Center Brown Door" }
+}
diff --git a/data/maps/the_bearer/rooms/Back Area.txtpb b/data/maps/the_bearer/rooms/Back Area.txtpb
index 27e175c..b1860de 100644
--- a/data/maps/the_bearer/rooms/Back Area.txtpb
+++ b/data/maps/the_bearer/rooms/Back Area.txtpb

@@ -7,12 +7,6 @@ panels {
  symbols: EXAMPLE
 }
 ports {
-  name: "TREE"
-  path: "Components/Warps/worldport3"
-  orientation: "north"
-  required_door { name: "Control Center Brown Door" }
-}
-ports {
  name: "DAEDALUS"
  path: "Components/Warps/worldport2"
  orientation: "north"
diff --git a/data/maps/the_bearer/rooms/Tree Entrance.txtpb b/data/maps/the_bearer/rooms/Tree Entrance.txtpb
new file mode 100644
index 0000000..97a07da
--- /dev/null
+++ b/data/maps/the_bearer/rooms/Tree Entrance.txtpb

@@ -0,0 +1,6 @@
+name: "Tree Entrance"
+ports {
+  name: "TREE"
+  path: "Components/Warps/worldport3"
+  orientation: "north"
+}
diff --git a/data/maps/the_congruent/doors.txtpb b/data/maps/the_congruent/doors.txtpb
index 7c79c00..a714eba 100644
--- a/data/maps/the_congruent/doors.txtpb
+++ b/data/maps/the_congruent/doors.txtpb

@@ -119,7 +119,11 @@ doors {
 }
 doors {
  name: "T Keyholder Blocker"
-  type: ITEM_ONLY
+  type: EVENT
  receivers: "Components/Doors/magenta_enterer3"
-  switches: "lavender_cubes"
+  panels {
+    map: "the_ancient"
+    room: "Inside"
+    name: "COLOR"
+  }
 }
diff --git a/data/maps/the_darkroom/connections.txtpb b/data/maps/the_darkroom/connections.txtpb
index 4093585..1b7ad05 100644
--- a/data/maps/the_darkroom/connections.txtpb
+++ b/data/maps/the_darkroom/connections.txtpb

@@ -33,3 +33,18 @@ connections {
  to_room: "S Room"
  door { name: "S1 Door" }
 }
+connections {
+  from_room: "First Room"
+  to_room: "Cyan Hallway"
+  door { name: "Colorful Entrance" }
+}
+connections {
+  from_room: "Second Room"
+  to_room: "Congruent Entrance"
+  door { name: "Congruent Entrance" }
+}
+connections {
+  from_room: "First Room"
+  to_room: "Double Sided Entrance"
+  door { name: "Double Sided Entrance" }
+}
diff --git a/data/maps/the_darkroom/doors.txtpb b/data/maps/the_darkroom/doors.txtpb
index d7094ae..047c7d0 100644
--- a/data/maps/the_darkroom/doors.txtpb
+++ b/data/maps/the_darkroom/doors.txtpb

@@ -2,8 +2,8 @@
 doors {
  name: "Double Letter Panel Blockers"
  type: EVENT
-  #receivers: "Panels/Room 1/panel_3/visibilityListener"
+  receivers: "Panels/Room 1/panel_3/visibilityListener"
-  #receivers: "Panels/Room 2/panel_3/visibilityListener"
+  receivers: "Panels/Room 2/panel_3/visibilityListener"
  double_letters: true
 }
 doors {
diff --git a/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb b/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb
new file mode 100644
index 0000000..7ea1286
--- /dev/null
+++ b/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb

@@ -0,0 +1,7 @@
+name: "Congruent Entrance"
+panel_display_name: "Second Room"
+ports {
+  name: "CONGRUENT"
+  path: "Components/Warps/worldport7"
+  orientation: "east"
+}
diff --git a/data/maps/the_darkroom/rooms/Cyan Hallway.txtpb b/data/maps/the_darkroom/rooms/Cyan Hallway.txtpb
new file mode 100644
index 0000000..308efb1
--- /dev/null
+++ b/data/maps/the_darkroom/rooms/Cyan Hallway.txtpb

@@ -0,0 +1,7 @@
+name: "Cyan Hallway"
+panel_display_name: "First Room"
+ports {
+  name: "COLORFUL"
+  path: "Components/Warps/worldport8"
+  orientation: "north"
+}
diff --git a/data/maps/the_darkroom/rooms/Double Sided Entrance.txtpb b/data/maps/the_darkroom/rooms/Double Sided Entrance.txtpb
new file mode 100644
index 0000000..9d25108
--- /dev/null
+++ b/data/maps/the_darkroom/rooms/Double Sided Entrance.txtpb

@@ -0,0 +1,7 @@
+name: "Double Sided Entrance"
+panel_display_name: "First Room"
+ports {
+  name: "DOUBLESIDED"
+  path: "Components/Warps/worldport6"
+  orientation: "east"
+}
diff --git a/data/maps/the_darkroom/rooms/First Room.txtpb b/data/maps/the_darkroom/rooms/First Room.txtpb
index c93f5b4..c635757 100644
--- a/data/maps/the_darkroom/rooms/First Room.txtpb
+++ b/data/maps/the_darkroom/rooms/First Room.txtpb

@@ -42,15 +42,3 @@ ports {
  orientation: "north"
  required_door { name: "Second Room Entrance" }
 }
-ports {
-  name: "COLORFUL"
-  path: "Components/Warps/worldport8"
-  orientation: "north"
-  required_door { name: "Colorful Entrance" }
-}
-ports {
-  name: "DOUBLESIDED"
-  path: "Components/Warps/worldport6"
-  orientation: "east"
-  required_door { name: "Double Sided Entrance" }
-}
diff --git a/data/maps/the_darkroom/rooms/Second Room.txtpb b/data/maps/the_darkroom/rooms/Second Room.txtpb
index baeea12..a3964ea 100644
--- a/data/maps/the_darkroom/rooms/Second Room.txtpb
+++ b/data/maps/the_darkroom/rooms/Second Room.txtpb

@@ -47,9 +47,3 @@ ports {
  orientation: "north"
  required_door { name: "Third Room Entrance" }
 }
-ports {
-  name: "CONGRUENT"
-  path: "Components/Warps/worldport7"
-  orientation: "east"
-  required_door { name: "Congruent Entrance" }
-}
diff --git a/data/maps/the_entry/connections.txtpb b/data/maps/the_entry/connections.txtpb
index 6f847da..9813f85 100644
--- a/data/maps/the_entry/connections.txtpb
+++ b/data/maps/the_entry/connections.txtpb

@@ -192,10 +192,25 @@ connections {
 connections {
  from_room: "Starting Room"
  to_room: "Repetitive Entrance"
-  door { name: "Repetitive Entrance" }
+  door { name: "Starting Room West Wall North Door" }
 }
 connections {
  from_room: "Lime Room"
  to_room: "White Hallway To Daedalus"
  door { name: "Control Center White Door" }
 }
+connections {
+  from_room: "Flipped Second Room"
+  to_room: "Four Rooms Entrance"
+  door { name: "Flipped Second Room Right Door" }
+}
+connections {
+  from_room: "Link Area"
+  to_room: "Liberated Entrance"
+  door { name: "Liberated Entrance" }
+}
+connections {
+  from_room: "Link Area"
+  to_room: "Literate Entrance"
+  door { name: "Literate Entrance" }
+}
diff --git a/data/maps/the_entry/doors.txtpb b/data/maps/the_entry/doors.txtpb
index 78ffa52..466f5ce 100644
--- a/data/maps/the_entry/doors.txtpb
+++ b/data/maps/the_entry/doors.txtpb

@@ -137,8 +137,10 @@ doors {
  type: STANDARD
  receivers: "Components/Doors/back_left_2"
  panels { room: "Colored Doors Area" name: "OPEN" answer: "orange" }
-  # "wall" is supposed to also work. idk man
+  panels { room: "Colored Doors Area" name: "OPEN" answer: "wall" }
+  complete_at: 1
  location_room: "Colored Doors Area"
+  location_name: "OPEN"
 }
 doors {
  name: "Lime Room Entrance"
@@ -193,7 +195,7 @@ doors {
  location_room: "Starting Room"
 }
 doors {
-  name: "Repetitive Entrance"
+  name: "Starting Room West Wall North Door"
  type: ITEM_ONLY
  receivers: "Components/Doors/Entry/entry_proxied_9"
  double_letters: true
diff --git a/data/maps/the_entry/rooms/Flipped Second Room.txtpb b/data/maps/the_entry/rooms/Flipped Second Room.txtpb
index 5841ca1..0d518bb 100644
--- a/data/maps/the_entry/rooms/Flipped Second Room.txtpb
+++ b/data/maps/the_entry/rooms/Flipped Second Room.txtpb

@@ -21,10 +21,3 @@ paintings {
  gravity: Y_PLUS
  display_name: "Eye Painting"
 }
-ports {
-  name: "FOUR"
-  path: "Components/Warps/worldport9"
-  orientation: "south"
-  gravity: Y_PLUS
-  required_door { name: "Flipped Second Room Right Door" }
-}
-\ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb
new file mode 100644
index 0000000..689d23e
--- /dev/null
+++ b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb

@@ -0,0 +1,7 @@
+name: "Four Rooms Entrance"
+ports {
+  name: "FOUR"
+  path: "Components/Warps/worldport9"
+  orientation: "south"
+  gravity: Y_PLUS
+}
diff --git a/data/maps/the_entry/rooms/Liberated Entrance.txtpb b/data/maps/the_entry/rooms/Liberated Entrance.txtpb
new file mode 100644
index 0000000..f0176a0
--- /dev/null
+++ b/data/maps/the_entry/rooms/Liberated Entrance.txtpb

@@ -0,0 +1,6 @@
+name: "Liberated Entrance"
+ports {
+  name: "BLUE"
+  path: "worldport8"
+  orientation: "west"
+}
diff --git a/data/maps/the_entry/rooms/Link Area.txtpb b/data/maps/the_entry/rooms/Link Area.txtpb
index 689f57a..5b68279 100644
--- a/data/maps/the_entry/rooms/Link Area.txtpb
+++ b/data/maps/the_entry/rooms/Link Area.txtpb

@@ -26,15 +26,3 @@ paintings {
  orientation: "south"
  display_name: "Center Painting"
 }
-ports {
-  name: "BLUE"
-  path: "worldport8"
-  orientation: "west"
-  required_door { name: "Liberated Entrance" }
-}
-ports {
-  name: "BROWN"
-  path: "worldport9"
-  orientation: "east"
-  required_door { name: "Literate Entrance" }
-}
-\ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Literate Entrance.txtpb b/data/maps/the_entry/rooms/Literate Entrance.txtpb
new file mode 100644
index 0000000..4ec402f
--- /dev/null
+++ b/data/maps/the_entry/rooms/Literate Entrance.txtpb

@@ -0,0 +1,6 @@
+name: "Literate Entrance"
+ports {
+  name: "BROWN"
+  path: "worldport9"
+  orientation: "east"
+}
diff --git a/data/maps/the_entry/rooms/Starting Room.txtpb b/data/maps/the_entry/rooms/Starting Room.txtpb
index bc77e6d..8e8373b 100644
--- a/data/maps/the_entry/rooms/Starting Room.txtpb
+++ b/data/maps/the_entry/rooms/Starting Room.txtpb

@@ -24,7 +24,9 @@ panels {
  path: "Panels/Entry/front_1"
  clue: "eye"
  answer: "i"
-  symbols: ZERO
+  #symbols: ZERO
+  # This panel blocks getting N1 and T1. We will mod it to be I/I with no symbol
+  # when symbol shuffle is on.
 }
 panels {
  name: "HINT"
diff --git a/data/maps/the_gallery/doors.txtpb b/data/maps/the_gallery/doors.txtpb
index a7a5d85..adbc766 100644
--- a/data/maps/the_gallery/doors.txtpb
+++ b/data/maps/the_gallery/doors.txtpb

@@ -1,7 +1,7 @@
 # The Gallery is interesting because there's so many cross-map requirements.
 doors {
  name: "Darkroom Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "DARKROOM" }
  receivers: "Components/Paintings/darkroom/teleportListener"
  panels { map: "the_darkroom" room: "First Room" name: "BISON" }
@@ -27,14 +27,14 @@ doors {
 }
 doors {
  name: "Butterfly Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "BUTTERFLY" }
  receivers: "Components/Paintings/butterfly/teleportListener"
  rooms { map: "the_butterfly" name: "Main Area" }
 }
 doors {
  name: "Between Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "BETWEEN" }
  receivers: "Components/Paintings/between/teleportListener"
  panels { map: "the_between" room: "Main Area" name: "SUN" }
@@ -70,14 +70,14 @@ doors {
 }
 doors {
  name: "Entry Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "ENTRY" }
  receivers: "Components/Paintings/eyes/teleportListener"
  panels { map: "the_entry" room: "Eye Room" name: "I" }
 }
 doors {
  name: "Wise Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "WISE" }
  receivers: "Components/Paintings/triangle/teleportListener"
  panels { map: "the_wise" room: "Entry" name: "INK" }
@@ -105,7 +105,7 @@ doors {
 }
 doors {
  name: "Tree Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "TREE" }
  receivers: "Components/Paintings/Clue Maps/tree/teleportListener"
  panels { map: "the_tree" room: "Main Area" name: "COLOR" }
@@ -142,35 +142,35 @@ doors {
 }
 doors {
  name: "Unyielding Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "UNYIELDING" }
  receivers: "Components/Paintings/Clue Maps/unyielding/teleportListener"
  rooms { map: "the_unyielding" name: "Digital Entrance" }
 }
 doors {
  name: "Graveyard Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "GRAVEYARD" }
  receivers: "Components/Paintings/Endings/grave/teleportListener"
  rooms { map: "the_graveyard" name: "Outside" }
 }
 doors {
  name: "Control Center Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "CC" }
  receivers: "Components/Paintings/Endings/desert/teleportListener"
  rooms { map: "the_impressive" name: "M2 Room" }
 }
 doors {
  name: "Tower Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "TOWER" }
  receivers: "Components/Paintings/Endings/red/teleportListener"
  rooms { map: "the_tower" name: "First Floor" }
 }
 doors {
  name: "Wondrous Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "WONDROUS" }
  receivers: "Components/Paintings/Endings/window/teleportListener"
  panels { map: "the_wondrous" room: "Entry" name: "WONDER" }
@@ -187,42 +187,42 @@ doors {
 }
 doors {
  name: "Rainbow Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "RAINBOW" }
  receivers: "Components/Paintings/Endings/rainbow/teleportListener"
  rooms { map: "daedalus" name: "Rainbow Start" }
 }
 doors {
  name: "Words Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "WORDS" }
  receivers: "Components/Paintings/Endings/words/teleportListener"
  rooms { map: "the_words" name: "Main Area" }
 }
 doors {
  name: "Colorful Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "COLORFUL" }
  receivers: "Components/Paintings/Endings/colorful/teleportListener"
  rooms { map: "the_colorful" name: "White Room" }
 }
 doors {
  name: "Castle Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "CASTLE" }
  receivers: "Components/Paintings/Endings/castle/teleportListener"
  rooms { map: "daedalus" name: "Castle" }
 }
 doors {
  name: "Sun Temple Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "SUNTEMPLE" }
  receivers: "Components/Paintings/Endings/temple/teleportListener"
  rooms { map: "the_sun_temple" name: "Entrance" }
 }
 doors {
  name: "Ancient Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "ANCIENT" }
  receivers: "Components/Paintings/Endings/cubes/teleportListener"
  rooms { map: "the_ancient" name: "Outside" }
diff --git a/data/maps/the_graveyard/doors.txtpb b/data/maps/the_graveyard/doors.txtpb
index 5e5e929..a10d8f6 100644
--- a/data/maps/the_graveyard/doors.txtpb
+++ b/data/maps/the_graveyard/doors.txtpb

@@ -19,5 +19,7 @@ doors {
 doors {
  name: "Double Letters"
  type: EVENT
+  receivers: "Panels/panel_3/teleportListener"
+  receivers: "Components/Paintings/omrt/teleportListener"
  double_letters: true
 }
diff --git a/data/maps/the_great/doors.txtpb b/data/maps/the_great/doors.txtpb
index dc25128..abbbc11 100644
--- a/data/maps/the_great/doors.txtpb
+++ b/data/maps/the_great/doors.txtpb

@@ -49,6 +49,7 @@ doors {
  type: LOCATION_ONLY
  panels { room: "West Side" name: "ERASE" }
  location_room: "West Side"
+  location_name: "ERASE"
 }
 doors {
  name: "Control Center Purple Door"
@@ -65,7 +66,7 @@ doors {
 doors {
  name: "Control Center Red Door"
  type: CONTROL_CENTER_COLOR
-  receivers: "Components/Doors/Gates/Gate"
+  receivers: "Components/Doors/entry_18"
  control_center_color: "red"
 }
 doors {
@@ -470,9 +471,13 @@ doors {
 }
 doors {
  name: "Lavender Cube"
-  type: ITEM_ONLY
+  type: EVENT
  receivers: "Components/Doors/entry_28"
-  switches: "lavender_cubes"
+  panels {
+    map: "the_ancient"
+    room: "Inside"
+    name: "COLOR"
+  }
 }
 doors {
  name: "Zero Entrance"
@@ -497,3 +502,14 @@ doors {
  panels { room: "Back Area" name: "PAINTING" }
  location_room: "Back Area"
 }
+doors {
+  name: "Cyan Doors"
+  type: EVENT
+  receivers: "Panels/General/entry_7/teleportListener"
+  double_letters: true
+}
+doors {
+  name: "Partial Entrance"
+  type: EVENT
+  panels { room: "West Side" name: "CLUE" }
+}
diff --git a/data/maps/the_great/rooms/Main Area.txtpb b/data/maps/the_great/rooms/Main Area.txtpb
index 18bcf9b..82ec48c 100644
--- a/data/maps/the_great/rooms/Main Area.txtpb
+++ b/data/maps/the_great/rooms/Main Area.txtpb

@@ -111,6 +111,7 @@ panels {
  answer: "high"
  symbols: SUN
  symbols: ZERO
+  required_door { name: "Cyan Doors" }
 }
 panels {
  name: "CURT"
diff --git a/data/maps/the_great/rooms/West Side.txtpb b/data/maps/the_great/rooms/West Side.txtpb
index daf1718..8279e16 100644
--- a/data/maps/the_great/rooms/West Side.txtpb
+++ b/data/maps/the_great/rooms/West Side.txtpb

@@ -76,4 +76,5 @@ ports {
  path: "Meshes/Blocks/Warps/worldport7"
  orientation: "east"
  # ER with this is weird; make sure to place on the surface
+  required_door { name: "Partial Entrance" }
 }
diff --git a/data/maps/the_linear/doors.txtpb b/data/maps/the_linear/doors.txtpb
index 63d8ae8..9a57158 100644
--- a/data/maps/the_linear/doors.txtpb
+++ b/data/maps/the_linear/doors.txtpb

@@ -10,4 +10,5 @@ doors {
  panels { room: "Room" name: "INTO" }
  panels { room: "Room" name: "NOR" }
  location_room: "Room"
+  location_name: "Gravestone"
 }
diff --git a/data/maps/the_owl/connections.txtpb b/data/maps/the_owl/connections.txtpb
index 2bd2380..cb4bee3 100644
--- a/data/maps/the_owl/connections.txtpb
+++ b/data/maps/the_owl/connections.txtpb

@@ -10,10 +10,20 @@ connections {
 }
 connections {
  from_room: "R2C2 Bottom"
+  to_room: "R2C2 Top"
+  door { name: "Sky Owl" }
+}
+connections {
+  from_room: "R2C2 Bottom"
  to_room: "Connected Area"
  door { name: "Gray Owl" }
 }
 connections {
+  from_room: "R2C2 Bottom"
+  to_room: "Connected Area"
+  door { name: "Sky Owl" }
+}
+connections {
  from_room: "R2C3 Bottom"
  to_room: "Connected Area"
  oneway: true
@@ -45,6 +55,11 @@ connections {
 }
 connections {
  from_room: "Connected Area"
+  to_room: "R2C3 Bottom"
+  door { name: "Sky Owl" }
+}
+connections {
+  from_room: "Connected Area"
  to_room: "Magenta Hallway"
  door { name: "Control Center Magenta Door" }
 }
@@ -70,6 +85,11 @@ connections {
 }
 connections {
  from_room: "Connected Area"
+  to_room: "R1C4 Left"
+  door { name: "Sky Owl" }
+}
+connections {
+  from_room: "Connected Area"
  to_room: "R2C1 Left"
  door { name: "Sky Top Doors" }
 }
@@ -84,6 +104,11 @@ connections {
  door { name: "Gray Owl" }
 }
 connections {
+  from_room: "Connected Area"
+  to_room: "R2C1 Left"
+  door { name: "Sky Owl" }
+}
+connections {
  from {
    painting {
      room: "Connected Area"
diff --git a/data/maps/the_owl/doors.txtpb b/data/maps/the_owl/doors.txtpb
index 3d2d055..9254c2a 100644
--- a/data/maps/the_owl/doors.txtpb
+++ b/data/maps/the_owl/doors.txtpb

@@ -233,20 +233,20 @@ doors {
 doors {
  name: "Gray Panel"
  type: EVENT
-  # TODO: Is it okay to have an event with an in-game effect?
+  #receivers: "Panels/Colors/owl_2/animationListener2"
-  receivers: "Panels/Colors/owl_2/animationListener2"
+  panels { room: "Connected Area" name: "RANGE" }
-  doors { name: "Orange Owl" }
+  panels { room: "Connected Area" name: "WHITE" }
-  doors { name: "Black Owl" }
+  panels { room: "Blue Room" name: "SKY" }
-  doors { name: "Blue Owl" }
 }
 doors {
  name: "Owl Painting"
  type: EVENT
  #move_paintings { room: "Connected Area" name: "OWL" }
  #receivers: "Components/Paintings/owl/teleportListener"
-  doors { name: "Orange Owl" }
+  panels { room: "R2C1 Left" name: "DUSKY" }
-  doors { name: "Black Owl" }
+  panels { room: "R2C2 Top" name: "RAY" }
-  doors { name: "Blue Owl" }
+  panels { room: "Connected Area" name: "RANGE" }
-  doors { name: "White Owl" }
+  panels { room: "R2C3 Bottom" name: "BLACK" }
-  doors { name: "Sky Owl" }
+  panels { room: "Connected Area" name: "WHITE" }
+  panels { room: "Blue Room" name: "SKY" }
 }
diff --git a/data/maps/the_parthenon/doors.txtpb b/data/maps/the_parthenon/doors.txtpb
index bb57d12..1161917 100644
--- a/data/maps/the_parthenon/doors.txtpb
+++ b/data/maps/the_parthenon/doors.txtpb

@@ -1,12 +1,24 @@
 doors {
  name: "Double Letters"
  type: EVENT
+  receivers: "Components/Doors/entry_11"
+  receivers: "Components/Doors/entry_5"
+  receivers: "Components/Doors/entry_6"
+  receivers: "Components/Doors/entry_7"
+  receivers: "Components/Doors/entry_8"
+  receivers: "Components/Doors/entry_9"
+  receivers: "Components/Doors/entry_10"
  double_letters: true
 }
 doors {
  name: "Lavender Cubes"
  type: EVENT
-  switches: "lavender_cubes"
+  receivers: "Components/Doors/entry_3"
+  panels {
+    map: "the_ancient"
+    room: "Inside"
+    name: "COLOR"
+  }
 }
 doors {
  name: "K2 Door"
diff --git a/data/maps/the_repetitive/connections.txtpb b/data/maps/the_repetitive/connections.txtpb
index 2b115a9..0afe72d 100644
--- a/data/maps/the_repetitive/connections.txtpb
+++ b/data/maps/the_repetitive/connections.txtpb

@@ -6,7 +6,7 @@ connections {
 connections {
  from_room: "Main Room"
  to_room: "Plaza Connector"
-  door { name: "Plaza Entrance" }
+  door { name: "Black Hallway" }
  oneway: true
 }
 connections {
diff --git a/data/maps/the_repetitive/doors.txtpb b/data/maps/the_repetitive/doors.txtpb
index 9e63c1d..d964928 100644
--- a/data/maps/the_repetitive/doors.txtpb
+++ b/data/maps/the_repetitive/doors.txtpb

@@ -6,7 +6,7 @@ doors {
  location_room: "Main Room"
 }
 doors {
-  name: "Plaza Entrance"
+  name: "Black Hallway"
  type: STANDARD
  receivers: "Components/Doors/Door12"
  panels { room: "Main Room" name: "I" }
@@ -194,3 +194,9 @@ doors {
  panels { room: "Yellow Room" name: "ASSESSES" }
  panels { room: "Yellow Room" name: "TINTING" }
 }
+doors {
+  name: "Anti-Collectable"
+  type: LOCATION_ONLY
+  senders: "Components/Collectables/anticollectable"
+  location_room: "Anti Room"
+}
diff --git a/data/maps/the_repetitive/metadata.txtpb b/data/maps/the_repetitive/metadata.txtpb
index 6f5c459..76a0f50 100644
--- a/data/maps/the_repetitive/metadata.txtpb
+++ b/data/maps/the_repetitive/metadata.txtpb

@@ -1,10 +1,6 @@
 display_name: "The Repetitive"
-# The anti-collectable doesn't fit into our system right now so let's ignore it.
-excluded_nodes: "Components/Collectables/anticollectable"
 # These paintings are directly above/behind panels and thus can't be entered.
 excluded_nodes: "Meshes/eyeRed3"
 excluded_nodes: "Meshes/eyeRed4"
-# I do not know what this is.
-excluded_nodes: "Components/Doors/Door3/Hinge/panel_i"
 # This has something to do with the magenta room entrance proxy panel.
 excluded_nodes: "Panels/Eval/panel_26_proxyied_fake"
diff --git a/data/maps/the_repetitive/rooms/Anti Room.txtpb b/data/maps/the_repetitive/rooms/Anti Room.txtpb
index 641fede..65a99ff 100644
--- a/data/maps/the_repetitive/rooms/Anti Room.txtpb
+++ b/data/maps/the_repetitive/rooms/Anti Room.txtpb

@@ -1,5 +1,4 @@
 name: "Anti Room"
-# Ignore the collectible. The mod should remove it and the back wall too.
 panels {
  name: "HA (1)"
  path: "Panels/Entry/panel_7"
@@ -38,9 +37,17 @@ panels {
  symbols: EXAMPLE
 }
 panels {
-  name: "EYE"
+  name: "EYE (1)"
  path: "Panels/Entry/panel4"
  clue: "eye"
  answer: "iris"
  symbols: BOXES
 }
+panels {
+  # This appears after grabbing the anti-collectable.
+  name: "EYE (2)"
+  path: "Components/Doors/Door3/Hinge/panel_i"
+  clue: "eye"
+  answer: "i"
+  symbols: ZERO
+}
diff --git a/data/maps/the_symbolic/doors.txtpb b/data/maps/the_symbolic/doors.txtpb
index e84811e..5a443e7 100644
--- a/data/maps/the_symbolic/doors.txtpb
+++ b/data/maps/the_symbolic/doors.txtpb

@@ -1,62 +1,55 @@
 doors {
  name: "White Door"
-  type: STANDARD
+  type: EVENT
-  receivers: "Components/Doors/Door18"
+  #receivers: "Components/Doors/Door18"
  panels { room: "White Room" name: "WRITE" }
-  location_room: "White Room"
 }
 doors {
  name: "Black Door"
-  type: STANDARD
+  type: EVENT
-  receivers: "Components/Doors/Door19"
+  #receivers: "Components/Doors/Door19"
  panels { room: "Black Room" name: "HERE" }
-  location_room: "Black Room"
 }
 doors {
  name: "Red Door"
-  type: STANDARD
+  type: EVENT
-  receivers: "Components/Doors/Door20"
+  #receivers: "Components/Doors/Door20"
  panels { room: "Red Room" name: "SYNONYM" }
-  location_room: "Red Room"
 }
 doors {
  name: "Blue Door"
-  type: STANDARD
+  type: EVENT
-  receivers: "Components/Doors/Door21"
+  #receivers: "Components/Doors/Door21"
  panels { room: "Blue Room" name: "DEPLETE" }
-  location_room: "Blue Room"
 }
 doors {
  name: "Green Door"
-  type: STANDARD
+  type: EVENT
-  receivers: "Components/Doors/Door22"
+  #receivers: "Components/Doors/Door22"
  panels { room: "Green Room" name: "INERT" }
-  location_room: "Green Room"
 }
 doors {
  name: "Yellow Door"
-  type: STANDARD
+  type: EVENT
-  receivers: "Components/Doors/Door23"
+  #receivers: "Components/Doors/Door23"
  panels { room: "Yellow Room" name: "WHOLE" }
-  location_room: "Yellow Room"
 }
 doors {
  name: "Purple Door"
-  type: STANDARD
+  type: EVENT
-  receivers: "Components/Doors/Door24"
+  #receivers: "Components/Doors/Door24"
  panels { room: "Purple Room" name: "TIME" }
-  location_room: "Purple Room"
 }
 doors {
  name: "Orange Door"
-  type: STANDARD
+  type: EVENT
-  receivers: "Components/Doors/Door25"
+  #receivers: "Components/Doors/Door25"
  panels { room: "Orange Room" name: "YOUNG" }
-  location_room: "Orange Room"
 }
 doors {
  name: "Tutorial Door"
-  type: EVENT
+  type: ITEM_ONLY
+  receivers: "Components/Doors/Door"
  panels { room: "Tutorial" name: "<- (1)" }
  panels { room: "Tutorial" name: "<- (2)" }
  panels { room: "Tutorial" name: "<- (3)" }
diff --git a/data/maps/the_three_doors/doors.txtpb b/data/maps/the_three_doors/doors.txtpb
index 99fbcee..5ae9d90 100644
--- a/data/maps/the_three_doors/doors.txtpb
+++ b/data/maps/the_three_doors/doors.txtpb

@@ -50,4 +50,5 @@ doors {
  panels { room: "Dead End Room" name: "DEAD" }
  panels { room: "Dead End Room" name: "END" }
  location_room: "Loose Strings Room"
+  location_name: "Gravestone"
 }
diff --git a/data/maps/the_tree/doors.txtpb b/data/maps/the_tree/doors.txtpb
index b62a881..6cb4086 100644
--- a/data/maps/the_tree/doors.txtpb
+++ b/data/maps/the_tree/doors.txtpb

@@ -38,4 +38,5 @@ doors {
  panels { room: "Main Area" name: "SMALL (3)" }
  panels { room: "Main Area" name: "SPRINKLE" }
  location_room: "Main Area"
+  location_name: "Gravestone"
 }
diff --git a/data/maps/the_unkempt/doors.txtpb b/data/maps/the_unkempt/doors.txtpb
index 9a13c82..2349913 100644
--- a/data/maps/the_unkempt/doors.txtpb
+++ b/data/maps/the_unkempt/doors.txtpb

@@ -21,6 +21,7 @@ doors {
 doors {
  name: "Cyan Doors"
  type: EVENT
+  receivers: "Components/Doors/entry_12"
  double_letters: true
 }
 doors {
@@ -67,6 +68,7 @@ doors {
  type: CONTROL_CENTER_COLOR
  receivers: "Components/Doors/entry_6"
  receivers: "Components/Doors/entry_13"
+  receivers: "Panels/Assorted/panel_1/teleportListener"
  control_center_color: "orange"
  double_letters: true
 }
diff --git a/data/maps/the_unkempt/rooms/Right Area.txtpb b/data/maps/the_unkempt/rooms/Right Area.txtpb
index 1475fb0..03d7cea 100644
--- a/data/maps/the_unkempt/rooms/Right Area.txtpb
+++ b/data/maps/the_unkempt/rooms/Right Area.txtpb

@@ -159,6 +159,5 @@ panels {
  clue: "color"
  answer: "orange"
  symbols: EXAMPLE
-  # TODO: This is hidden in-game until double letters are unlocked AND "orange"
+  required_door { name: "Control Center Orange Door" }
-  # is entered in the control center.
 }
diff --git a/data/maps/the_unyielding/doors.txtpb b/data/maps/the_unyielding/doors.txtpb
index b9d0d77..a3c3999 100644
--- a/data/maps/the_unyielding/doors.txtpb
+++ b/data/maps/the_unyielding/doors.txtpb

@@ -499,5 +499,8 @@ doors {
 doors {
  name: "Cyan Doors"
  type: EVENT
+  receivers: "Components/Doors/entry_4"
+  receivers: "Panels/Miscellaneous/entry_2/teleportListener"
+  receivers: "Panels/Miscellaneous/entry_3/teleportListener"
  double_letters: true
 }