35 files changed, 227 insertions, 160 deletions
diff --git a/data/maps/daedalus/connections.txtpb b/data/maps/daedalus/connections.txtpb
index 09613ae..cb27c38 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
@@ -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
+}
diff --git a/data/maps/daedalus/doors.txtpb b/data/maps/daedalus/doors.txtpb
index ccbf3f0..95a3537 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"
 }
@@ -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"
+}
diff --git a/data/maps/daedalus/rooms/C Keyholder.txtpb b/data/maps/daedalus/rooms/C Keyholder.txtpb
index ef10a90..28793b2 100644
--- a/data/maps/daedalus/rooms/C Keyholder.txtpb
+++ b/data/maps/daedalus/rooms/C Keyholder.txtpb

@@ -1,5 +1,5 @@
 name: "C Keyholder"
-panel_display_name: "North Area"
+panel_display_name: "East Area"
 keyholders {
  name: "C"
  path: "Components/KeyHolders/keyHolderC"
diff --git a/data/maps/daedalus/rooms/Red Color Door.txtpb b/data/maps/daedalus/rooms/Red Color Door.txtpb
index f7eab21..344193e 100644
--- a/data/maps/daedalus/rooms/Red Color Door.txtpb
+++ b/data/maps/daedalus/rooms/Red Color Door.txtpb

@@ -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"
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/rooms/Outside.txtpb b/data/maps/the_ancient/rooms/Outside.txtpb
index a3372af..1458357 100644
--- a/data/maps/the_ancient/rooms/Outside.txtpb
+++ b/data/maps/the_ancient/rooms/Outside.txtpb

@@ -4,4 +4,5 @@ panels {
  path: "Panels/panel_1"
  clue: "this"
  answer: "sphinx"
+  symbols: QUESTION
 }
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_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/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 a2e325a..ca0207e 100644
--- a/data/maps/the_entry/connections.txtpb
+++ b/data/maps/the_entry/connections.txtpb

@@ -97,6 +97,12 @@ connections {
  from_room: "Red Blue Halls"
  to_room: "Wrath Room"
  door { name: "Noon Door" }
+  oneway: true
+}
+connections {
+  from_room: "Wrath Room"
+  to_room: "Least Blue Last"
+  oneway: true
 }
 connections {
  from_room: "Red Blue Halls"
@@ -199,3 +205,18 @@ connections {
  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 6bef160..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"
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/Shop Entrance.txtpb b/data/maps/the_entry/rooms/Shop Entrance.txtpb
index f793da3..67aa6de 100644
--- a/data/maps/the_entry/rooms/Shop Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Shop Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Shop Entrance"
-panel_display_name: "Starting Room"
+panel_display_name: "Shop Entrance"
 panels {
  name: "TURN"
  path: "Panels/Entry/l_opener_2"
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_great/doors.txtpb b/data/maps/the_great/doors.txtpb
index 5d0e90d..abbbc11 100644
--- a/data/maps/the_great/doors.txtpb
+++ b/data/maps/the_great/doors.txtpb

@@ -66,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 {
diff --git a/data/maps/the_nuanced/doors.txtpb b/data/maps/the_nuanced/doors.txtpb
index 9b58001..cd29766 100644
--- a/data/maps/the_nuanced/doors.txtpb
+++ b/data/maps/the_nuanced/doors.txtpb

@@ -1,5 +1,5 @@
 doors {
-  name: "Left Room Puzzles"
+  name: "Blue Side Puzzles"
  type: LOCATION_ONLY
  panels { room: "Main Room" name: "HOARSE" }
  panels { room: "Main Room" name: "NAY" }
@@ -11,7 +11,7 @@ doors {
  location_room: "Main Room"
 }
 doors {
-  name: "Right Room Puzzles"
+  name: "Green Side Puzzles"
  type: LOCATION_ONLY
  panels { room: "Main Room" name: "HOSE" }
  panels { room: "Main Room" name: "NIGH" }
diff --git a/data/maps/the_parthenon/connections.txtpb b/data/maps/the_parthenon/connections.txtpb
index a07d858..331ac66 100644
--- a/data/maps/the_parthenon/connections.txtpb
+++ b/data/maps/the_parthenon/connections.txtpb

@@ -7,6 +7,7 @@ connections {
  from_room: "Main Area"
  to_room: "Ending"
  door { name: "Ending Door" }
+  cyan_ending: true
 }
 connections {
  from_room: "Main Area"
diff --git a/data/maps/the_plaza/connections.txtpb b/data/maps/the_plaza/connections.txtpb
index 44586be..6da201c 100644
--- a/data/maps/the_plaza/connections.txtpb
+++ b/data/maps/the_plaza/connections.txtpb

@@ -21,22 +21,22 @@ connections {
 connections {
  from_room: "Center Room"
  to_room: "Top Left Room"
-  door { name: "Top Left Door" }
+  door { name: "Northwest Door" }
 }
 connections {
  from_room: "Center Room"
  to_room: "Top Right Room"
-  door { name: "Top Right Door" }
+  door { name: "Northeast Door" }
 }
 connections {
  from_room: "Center Room"
  to_room: "Bottom Left Room"
-  door { name: "Bottom Left Door" }
+  door { name: "Southwest Door" }
 }
 connections {
  from_room: "Center Room"
  to_room: "Bottom Right Room"
-  door { name: "Bottom Right Door" }
+  door { name: "Southeast Door" }
 }
 connections {
  from_room: "Center Room"
diff --git a/data/maps/the_plaza/doors.txtpb b/data/maps/the_plaza/doors.txtpb
index 322fe39..d95273c 100644
--- a/data/maps/the_plaza/doors.txtpb
+++ b/data/maps/the_plaza/doors.txtpb

@@ -31,7 +31,7 @@ doors {
  location_room: "Main Area"
 }
 doors {
-  name: "Top Left Door"
+  name: "Northwest Door"
  type: STANDARD
  receivers: "Components/Doors/entry_6"
  panels { room: "Center Room" name: "REPORTER" }
@@ -44,7 +44,7 @@ doors {
  location_name: "First Room"
 }
 doors {
-  name: "Top Right Door"
+  name: "Northeast Door"
  type: ITEM_ONLY
  receivers: "Components/Doors/entry_7"
  panels { room: "Center Room" name: "REPORTER" }
@@ -55,7 +55,7 @@ doors {
  panels { room: "Center Room" name: "SQUIRREL" }
 }
 doors {
-  name: "Bottom Left Door"
+  name: "Southwest Door"
  type: ITEM_ONLY
  receivers: "Components/Doors/entry_5"
  panels { room: "Center Room" name: "REPORTER" }
@@ -66,7 +66,7 @@ doors {
  panels { room: "Center Room" name: "SQUIRREL" }
 }
 doors {
-  name: "Bottom Right Door"
+  name: "Southeast Door"
  type: ITEM_ONLY
  receivers: "Components/Doors/entry_4"
  panels { room: "Center Room" name: "REPORTER" }
@@ -77,7 +77,7 @@ doors {
  panels { room: "Center Room" name: "SQUIRREL" }
 }
 doors {
-  name: "Top Left Puzzles"
+  name: "Northwest Puzzles"
  type: LOCATION_ONLY
  panels { room: "Top Left Room" name: "BARE SOD" }
  panels { room: "Top Left Room" name: "SOD" }
@@ -104,7 +104,7 @@ doors {
  location_room: "Top Left Room"
 }
 doors {
-  name: "Top Right Puzzles"
+  name: "Northeast Puzzles"
  type: LOCATION_ONLY
  panels { room: "Top Right Room" name: "RIGHT WING" }
  panels { room: "Top Right Room" name: "WING" }
@@ -130,7 +130,7 @@ doors {
  location_room: "Top Right Room"
 }
 doors {
-  name: "Bottom Left Puzzles"
+  name: "Southwest Puzzles"
  type: LOCATION_ONLY
  panels { room: "Bottom Left Room" name: "SHELL (1)" }
  panels { room: "Bottom Left Room" name: "SHELL (2)" }
@@ -141,7 +141,7 @@ doors {
  location_room: "Bottom Left Room"
 }
 doors {
-  name: "Bottom Right Puzzles"
+  name: "Southeast Puzzles"
  type: LOCATION_ONLY
  panels { room: "Bottom Right Room" name: "FLY" }
  panels { room: "Bottom Right Room" name: "DECLOG" }
diff --git a/data/maps/the_repetitive/doors.txtpb b/data/maps/the_repetitive/doors.txtpb
index 8171dc4..d964928 100644
--- a/data/maps/the_repetitive/doors.txtpb
+++ b/data/maps/the_repetitive/doors.txtpb

@@ -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_sun_temple/connections.txtpb b/data/maps/the_sun_temple/connections.txtpb
index b0b3a0a..ffe4d5d 100644
--- a/data/maps/the_sun_temple/connections.txtpb
+++ b/data/maps/the_sun_temple/connections.txtpb

@@ -7,6 +7,7 @@ connections {
  from_room: "Temple"
  to_room: "Ending"
  door { name: "Ending" }
+  purple_ending: true
 }
 connections {
  from_room: "Temple"
diff --git a/data/maps/the_unkempt/connections.txtpb b/data/maps/the_unkempt/connections.txtpb
index a9e30db..d4a046c 100644
--- a/data/maps/the_unkempt/connections.txtpb
+++ b/data/maps/the_unkempt/connections.txtpb

@@ -1,7 +1,7 @@
 connections {
  from_room: "Main Area"
  to_room: "Right Area"
-  door { name: "Right Door" }
+  door { name: "East Door" }
 }
 connections {
  from_room: "Middle Room"
diff --git a/data/maps/the_unkempt/doors.txtpb b/data/maps/the_unkempt/doors.txtpb
index 2349913..29065ec 100644
--- a/data/maps/the_unkempt/doors.txtpb
+++ b/data/maps/the_unkempt/doors.txtpb

@@ -1,5 +1,5 @@
 doors {
-  name: "Right Door"
+  name: "East Door"
  type: STANDARD
  receivers: "Components/Doors/entry_2"
  panels { room: "Main Area" name: "EYE" }