21 files changed, 96 insertions, 31 deletions
diff --git a/data/maps/daedalus/doors.txtpb b/data/maps/daedalus/doors.txtpb
index 2d8ba0b..ccbf3f0 100644
--- a/data/maps/daedalus/doors.txtpb
+++ b/data/maps/daedalus/doors.txtpb

@@ -892,16 +892,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 +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"
@@ -1088,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"
@@ -1921,6 +1919,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 +2112,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"
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_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/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_entry/connections.txtpb b/data/maps/the_entry/connections.txtpb
index 6f847da..a2e325a 100644
--- a/data/maps/the_entry/connections.txtpb
+++ b/data/maps/the_entry/connections.txtpb

@@ -192,7 +192,7 @@ 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"
diff --git a/data/maps/the_entry/doors.txtpb b/data/maps/the_entry/doors.txtpb
index 78ffa52..6bef160 100644
--- a/data/maps/the_entry/doors.txtpb
+++ b/data/maps/the_entry/doors.txtpb

@@ -193,7 +193,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_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..f0f2fde 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"
@@ -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,9 @@ 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
+}
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_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..8171dc4 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" }
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
 }