8 files changed, 29 insertions, 6 deletions
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 5c16ac0..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" }
@@ -21,7 +21,8 @@ doors {
 doors {
  name: "Cyan Doors"
  type: EVENT
-  switches: "double_letters"
+  receivers: "Components/Doors/entry_12"
+  double_letters: true
 }
 doors {
  name: "Sun Temple Entrance"
@@ -65,8 +66,11 @@ doors {
 doors {
  name: "Control Center Orange Door"
  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
 }
 doors {
  name: "W2 Door"
diff --git a/data/maps/the_unkempt/rooms/Control Center Entrance.txtpb b/data/maps/the_unkempt/rooms/Control Center Entrance.txtpb
index e8fa13a..847b8ad 100644
--- a/data/maps/the_unkempt/rooms/Control Center Entrance.txtpb
+++ b/data/maps/the_unkempt/rooms/Control Center Entrance.txtpb

@@ -8,5 +8,10 @@ panels {
 }
 ports {
  name: "CC"
+  display_name: "Control Center Connector"
  path: "Components/Warps/worldport2"
+  destination { x: -4.5 y: 0 z: 7 }
+  rotation: 0
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
diff --git a/data/maps/the_unkempt/rooms/Daedalus Entrance.txtpb b/data/maps/the_unkempt/rooms/Daedalus Entrance.txtpb
index 851c863..f20d2cf 100644
--- a/data/maps/the_unkempt/rooms/Daedalus Entrance.txtpb
+++ b/data/maps/the_unkempt/rooms/Daedalus Entrance.txtpb

@@ -1,5 +1,8 @@
 name: "Daedalus Entrance"
 ports {
  name: "DAEDALUS"
+  display_name: "Orange Hallway"
  path: "Components/Warps/worldport4"
+  destination { x: 33 y: 0 z: -10 }
+  rotation: 90
 }
diff --git a/data/maps/the_unkempt/rooms/Main Area.txtpb b/data/maps/the_unkempt/rooms/Main Area.txtpb
index ed3ce21..f98220d 100644
--- a/data/maps/the_unkempt/rooms/Main Area.txtpb
+++ b/data/maps/the_unkempt/rooms/Main Area.txtpb

@@ -212,17 +212,27 @@ panels {
 keyholders {
  name: "I"
  path: "Components/KeyHolders/keyHolderL"
+  key: "i"
 }
 ports {
  name: "GREAT"
+  display_name: "Main Entrance"
  path: "Components/Warps/worldport"
+  destination { x: -3 y: 0 z: 11 }
+  rotation: 270
 }
 ports {
  name: "TREE"
+  display_name: "Brown Hallway"
  path: "Components/Warps/worldport5"
+  destination { x: -34 y: 0 z: 7 }
+  rotation: 270
 }
 ports {
  name: "SUNTEMPLE"
+  display_name: "Sun Temple Entrance"
  path: "Components/Warps/worldport3"
+  destination { x: -42 y: 0 z: -2 }
+  rotation: 270
  required_door { name: "Sun Temple Entrance" }
 }
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_unkempt/rooms/V Keyholder.txtpb b/data/maps/the_unkempt/rooms/V Keyholder.txtpb
index a7ec93f..8a4941d 100644
--- a/data/maps/the_unkempt/rooms/V Keyholder.txtpb
+++ b/data/maps/the_unkempt/rooms/V Keyholder.txtpb

@@ -1,5 +1,6 @@
 name: "V Keyholder"
 keyholders {
-  name: "KEYHOLDERV"
+  name: "V"
  path: "Components/KeyHolders/keyHolderV"
+  key: "v"
 }
diff --git a/data/maps/the_unkempt/rooms/W Keyholder.txtpb b/data/maps/the_unkempt/rooms/W Keyholder.txtpb
index ae367b2..e16f997 100644
--- a/data/maps/the_unkempt/rooms/W Keyholder.txtpb
+++ b/data/maps/the_unkempt/rooms/W Keyholder.txtpb

@@ -2,4 +2,5 @@ name: "W Keyholder"
 keyholders {
  name: "W"
  path: "Components/KeyHolders/keyHolderW"
+  key: "w"
 }