12 files changed, 30 insertions, 16 deletions
diff --git a/data/maps/the_congruent/doors.txtpb b/data/maps/the_congruent/doors.txtpb
index 7c21f55..fab8d95 100644
--- a/data/maps/the_congruent/doors.txtpb
+++ b/data/maps/the_congruent/doors.txtpb

@@ -1,12 +1,22 @@
 doors {
  name: "Obverse Magenta Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
  receivers: "Components/Doors/magenta_enterer2"
  panels { room: "Main Area" name: "LAKE" }
  panels { room: "Main Area" name: "DIE" }
  location_room: "Main Area"
 }
 doors {
+  name: "Main Area Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "LAKE" }
+  panels { room: "Main Area" name: "DIE" }
+  panels { room: "Main Area" name: "LIGHT" }
+  location_room: "Main Area"
+  location_name: "DIE, LAKE, LIGHT"
+}
+doors {
  name: "Flipped Magenta Door"
  type: STANDARD
  receivers: "Components/Doors/magenta_enterer"
@@ -17,6 +27,7 @@ doors {
  panels { room: "Main Area" name: "LABS (1)" }
  panels { room: "Main Area" name: "LABS (2)" }
  location_room: "Main Area"
+  location_name: "Obverse Cyan Large Room"
 }
 doors {
  name: "Flipped Yellow Door"
@@ -33,6 +44,7 @@ doors {
  panels { room: "Flipped Magenta Room" name: "LUST" }
  panels { room: "Flipped Magenta Room" name: "LAND" }
  location_room: "Flipped Magenta Room"
+  location_name: "Flipped Magenta Room"
 }
 doors {
  name: "C Keyholder Blocker"
@@ -47,6 +59,7 @@ doors {
  panels { room: "Flipped Yellow Room" name: "CAVE (1)" }
  panels { room: "Flipped Yellow Room" name: "CAVE (2)" }
  location_room: "Flipped Yellow Room"
+  location_name: "Flipped Yellow Room"
 }
 doors {
  name: "C2 Door"
@@ -59,6 +72,7 @@ doors {
    key: "c"
  }
  location_room: "C Keyholder"
+  location_name: "C Keyholder"
 }
 doors {
  name: "Obverse Yellow Door"
@@ -111,10 +125,15 @@ doors {
    key: "g"
  }
  location_room: "G Keyholder"
+  location_name: "G Keyholder"
 }
 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_congruent/metadata.txtpb b/data/maps/the_congruent/metadata.txtpb
index 16428c4..6260ed4 100644
--- a/data/maps/the_congruent/metadata.txtpb
+++ b/data/maps/the_congruent/metadata.txtpb

@@ -1 +1,5 @@
 display_name: "The Congruent"
+worldport_entrance {
+  room: "Main Area"
+  name: "DARKROOM"
+}
diff --git a/data/maps/the_congruent/rooms/C Keyholder.txtpb b/data/maps/the_congruent/rooms/C Keyholder.txtpb
index 0af0f32..d9a8cf2 100644
--- a/data/maps/the_congruent/rooms/C Keyholder.txtpb
+++ b/data/maps/the_congruent/rooms/C Keyholder.txtpb

@@ -1,7 +1,5 @@
 name: "C Keyholder"
-display_name: "Main Area"
 keyholders {
  name: "C"
  path: "Components/KeyHolders/keyHolder"
-  # TODO: This will need to be modified so that it doesn't actually take the letter.
 }
diff --git a/data/maps/the_congruent/rooms/C2 Room.txtpb b/data/maps/the_congruent/rooms/C2 Room.txtpb
index 852d4e2..ff53ebd 100644
--- a/data/maps/the_congruent/rooms/C2 Room.txtpb
+++ b/data/maps/the_congruent/rooms/C2 Room.txtpb

@@ -1,5 +1,4 @@
 name: "C2 Room"
-display_name: "Main Area"
 letters {
  key: "c"
  level2: true
diff --git a/data/maps/the_congruent/rooms/Flipped Magenta Room.txtpb b/data/maps/the_congruent/rooms/Flipped Magenta Room.txtpb
index 402e9e0..a51b667 100644
--- a/data/maps/the_congruent/rooms/Flipped Magenta Room.txtpb
+++ b/data/maps/the_congruent/rooms/Flipped Magenta Room.txtpb

@@ -1,5 +1,4 @@
 name: "Flipped Magenta Room"
-display_name: "Flipped Magenta Room"
 panels {
  name: "LOOK"
  path: "Panels/Side Up 1/panel_1"
diff --git a/data/maps/the_congruent/rooms/Flipped Yellow Room.txtpb b/data/maps/the_congruent/rooms/Flipped Yellow Room.txtpb
index 3952373..b407f0d 100644
--- a/data/maps/the_congruent/rooms/Flipped Yellow Room.txtpb
+++ b/data/maps/the_congruent/rooms/Flipped Yellow Room.txtpb

@@ -1,5 +1,4 @@
 name: "Flipped Yellow Room"
-display_name: "Flipped Yellow Room"
 panels {
  name: "DANCER"
  path: "Panels/Back 1/panel_1"
diff --git a/data/maps/the_congruent/rooms/G Keyholder.txtpb b/data/maps/the_congruent/rooms/G Keyholder.txtpb
index c52d7ba..cd12419 100644
--- a/data/maps/the_congruent/rooms/G Keyholder.txtpb
+++ b/data/maps/the_congruent/rooms/G Keyholder.txtpb

@@ -1,7 +1,5 @@
 name: "G Keyholder"
-display_name: "Obverse Yellow Room"
 keyholders {
  name: "G"
  path: "Components/KeyHolders/keyHolder2"
-  # TODO: This will need to be modified so that it doesn't actually take the letter.
 }
diff --git a/data/maps/the_congruent/rooms/G2 Room.txtpb b/data/maps/the_congruent/rooms/G2 Room.txtpb
index 80a23cb..25490a8 100644
--- a/data/maps/the_congruent/rooms/G2 Room.txtpb
+++ b/data/maps/the_congruent/rooms/G2 Room.txtpb

@@ -1,5 +1,4 @@
 name: "G2 Room"
-display_name: "Main Area"
 letters {
  key: "g"
  level2: true
diff --git a/data/maps/the_congruent/rooms/Main Area.txtpb b/data/maps/the_congruent/rooms/Main Area.txtpb
index a783eab..2b3f62e 100644
--- a/data/maps/the_congruent/rooms/Main Area.txtpb
+++ b/data/maps/the_congruent/rooms/Main Area.txtpb

@@ -1,5 +1,4 @@
 name: "Main Area"
-display_name: "Main Area"
 panels {
  name: "LANE (1)"
  path: "Panels/Main/panel_1"
@@ -86,8 +85,10 @@ panels {
 }
 ports {
  name: "DARKROOM"
+  display_name: "Entrance"
  path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: -19 y: 0 z: 7.5 }
+  rotation: 180
 }
 paintings {
  name: "P"
diff --git a/data/maps/the_congruent/rooms/Obverse Magenta Room.txtpb b/data/maps/the_congruent/rooms/Obverse Magenta Room.txtpb
index b69a4d4..895c4da 100644
--- a/data/maps/the_congruent/rooms/Obverse Magenta Room.txtpb
+++ b/data/maps/the_congruent/rooms/Obverse Magenta Room.txtpb

@@ -1,5 +1,4 @@
 name: "Obverse Magenta Room"
-display_name: "Obverse Magenta Room"
 # TODO: Should these two maybe not be randomizable because they hint the keyholder?
 paintings {
  name: "TEA"
diff --git a/data/maps/the_congruent/rooms/Obverse Yellow Room.txtpb b/data/maps/the_congruent/rooms/Obverse Yellow Room.txtpb
index 334df67..c87efdf 100644
--- a/data/maps/the_congruent/rooms/Obverse Yellow Room.txtpb
+++ b/data/maps/the_congruent/rooms/Obverse Yellow Room.txtpb

@@ -1,5 +1,4 @@
 name: "Obverse Yellow Room"
-display_name: "Obverse Yellow Room"
 panels {
  name: "CIVIL"
  path: "Panels/Main/panel_6"
diff --git a/data/maps/the_congruent/rooms/T Keyholder.txtpb b/data/maps/the_congruent/rooms/T Keyholder.txtpb
index 1cfd2bd..143ea53 100644
--- a/data/maps/the_congruent/rooms/T Keyholder.txtpb
+++ b/data/maps/the_congruent/rooms/T Keyholder.txtpb

@@ -1,6 +1,6 @@
 name: "T Keyholder"
-display_name: "Obverse Magenta Room"
 keyholders {
  name: "T"
  path: "Components/KeyHolders/keyHolderT"
+  key: "t"
 }