7 files changed, 28 insertions, 28 deletions
diff --git a/data/maps/control_center/doors.txtpb b/data/maps/control_center/doors.txtpb
index 08476a7..bec8714 100644
--- a/data/maps/control_center/doors.txtpb
+++ b/data/maps/control_center/doors.txtpb

@@ -15,6 +15,8 @@ doors {
 doors {
  name: "Hidden Door"
  type: EVENT
+  latch: true
+  receivers: "Components/Doors/entry_12"
  keyholders { room: "Main Area" name: "1" key: "h" }
  keyholders { room: "Main Area" name: "2" key: "i" }
  keyholders { room: "Main Area" name: "3" key: "d" }
@@ -84,25 +86,12 @@ doors {
 doors {
  name: "White Ending Door"
  type: EVENT
-  # This is the only time a door depends on endings. However, it's nice to do it
+  white_ending: true
-  # this way instead of just checking for ending room access because this lets
-  # us use events, which makes the playthrough more readable.
-  endings: "MINT"
-  endings: "ORANGE"
-  endings: "GREEN"
-  endings: "GRAY"
-  endings: "PLUM"
-  endings: "YELLOW"
-  endings: "GOLD"
-  endings: "BLACK"
-  endings: "CYAN"
-  endings: "PURPLE"
-  endings: "RED"
-  endings: "BLUE"
 }
 doors {
  name: "Repetitive Entrance"
  type: STANDARD
+  latch: true
  receivers: "Components/Doors/entry_7"
  keyholders { room: "Main Area" name: "1" key: "m" }
  keyholders { room: "Main Area" name: "2" key: "o" }
@@ -113,20 +102,26 @@ doors {
 }
 doors {
  name: "Perceptive From Outside"
-  type: EVENT
+  type: STANDARD
+  latch: true
+  receivers: "Components/Doors/entry_26"
  keyholders { room: "Main Area" name: "1" key: "p" }
  keyholders { room: "Main Area" name: "2" key: "a" }
  keyholders { room: "Main Area" name: "3" key: "r" }
  keyholders { room: "Main Area" name: "4" key: "t" }
+  location_room: "Main Area"
+  location_name: "Keyword PART"
 }
 doors {
  name: "Perceptive From Inside"
-  type: EVENT
+  type: LOCATION_ONLY
  panels { room: "Perceptive Entrance" name: "PART" }
+  location_room: "Perceptive Entrance"
 }
 doors {
  name: "Ancient Entrance"
  type: STANDARD
+  latch: true
  receivers: "Components/Doors/entry_20"
  keyholders { room: "Main Area" name: "1" key: "z" }
  keyholders { room: "Main Area" name: "2" key: "e" }
@@ -170,3 +165,16 @@ doors {
  panels { room: "Unyielding Entrance" name: "SEEK" }
  location_room: "Unyielding Entrance"
 }
+doors {
+  name: "Near Perceptive Panel"
+  type: LOCATION_ONLY
+  panels { room: "Perceptive Entrance" name: "COLORS" }
+  location_room: "Perceptive Entrance"
+  location_name: "COLORS"
+}
+doors {
+  name: "Letters Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "Letters" }
+  location_room: "Main Area"
+}
diff --git a/data/maps/control_center/rooms/Ancient Entrance.txtpb b/data/maps/control_center/rooms/Ancient Entrance.txtpb
index 5b65d9a..dc018ba 100644
--- a/data/maps/control_center/rooms/Ancient Entrance.txtpb
+++ b/data/maps/control_center/rooms/Ancient Entrance.txtpb

@@ -5,6 +5,8 @@ ports {
  path: "Components/Warps/worldport8"
  destination { x: -27 y: 0 z: -34 }
  rotation: 90
-  # TODO: shuffle entrances with dependent keyholders
+  # This is because there's no port on the other side of the connection, so if
+  # this connection was removed and gallery paintings aren't shuffled then
+  # there'd be no way into The Ancient.
  no_shuffle: true
 }
diff --git a/data/maps/control_center/rooms/Partial Entrance.txtpb b/data/maps/control_center/rooms/Partial Entrance.txtpb
index 5771afc..de5d91a 100644
--- a/data/maps/control_center/rooms/Partial Entrance.txtpb
+++ b/data/maps/control_center/rooms/Partial Entrance.txtpb

@@ -12,6 +12,4 @@ ports {
  path: "Components/Warps/worldport4"
  destination { x: 21 y: 0 z: -41 }
  rotation: 270
-  # TODO: shuffle entrances with dependent keyholders
-  no_shuffle: true
 }
diff --git a/data/maps/control_center/rooms/Perceptive Entrance.txtpb b/data/maps/control_center/rooms/Perceptive Entrance.txtpb
index cf5a82c..99b100b 100644
--- a/data/maps/control_center/rooms/Perceptive Entrance.txtpb
+++ b/data/maps/control_center/rooms/Perceptive Entrance.txtpb

@@ -20,6 +20,4 @@ ports {
  path: "Components/Warps/worldport12"
  destination { x: -23 y: 0 z: -11 }
  rotation: 0
-  # TODO: shuffle entrances with dependent keyholders
-  no_shuffle: true
 }
diff --git a/data/maps/control_center/rooms/Repetitive Entrance.txtpb b/data/maps/control_center/rooms/Repetitive Entrance.txtpb
index 6e242f3..0767e2c 100644
--- a/data/maps/control_center/rooms/Repetitive Entrance.txtpb
+++ b/data/maps/control_center/rooms/Repetitive Entrance.txtpb

@@ -5,6 +5,4 @@ ports {
  path: "Components/Warps/worldport14"
  destination { x: -16 y: 0 z: -17.5 }
  rotation: 0
-  # TODO: shuffle entrances with dependent keyholders
-  no_shuffle: true
 }
diff --git a/data/maps/control_center/rooms/Tenacious Entrance.txtpb b/data/maps/control_center/rooms/Tenacious Entrance.txtpb
index 2689589..093e4fc 100644
--- a/data/maps/control_center/rooms/Tenacious Entrance.txtpb
+++ b/data/maps/control_center/rooms/Tenacious Entrance.txtpb

@@ -12,6 +12,4 @@ ports {
  path: "Components/Warps/worldport13"
  destination { x: 56 y: 0 z: -38 }
  rotation: 180
-  # TODO: shuffle entrances with dependent keyholders
-  no_shuffle: true
 }
diff --git a/data/maps/control_center/rooms/Unkempt Entrance.txtpb b/data/maps/control_center/rooms/Unkempt Entrance.txtpb
index 5e65254..a89cceb 100644
--- a/data/maps/control_center/rooms/Unkempt Entrance.txtpb
+++ b/data/maps/control_center/rooms/Unkempt Entrance.txtpb

@@ -12,6 +12,4 @@ ports {
  path: "Components/Warps/worldport3"
  destination { x: 34 y: 0 z: -38.5 }
  rotation: 90
-  # TODO: shuffle entrances with dependent keyholders
-  no_shuffle: true
 }