11 files changed, 58 insertions, 2 deletions
diff --git a/data/maps/control_center/doors.txtpb b/data/maps/control_center/doors.txtpb
index 0bb29c1..08476a7 100644
--- a/data/maps/control_center/doors.txtpb
+++ b/data/maps/control_center/doors.txtpb

@@ -109,6 +109,7 @@ doors {
  keyholders { room: "Main Area" name: "3" key: "r" }
  keyholders { room: "Main Area" name: "4" key: "e" }
  location_room: "Main Area"
+  location_name: "Keyword MORE"
 }
 doors {
  name: "Perceptive From Outside"
@@ -132,6 +133,7 @@ doors {
  keyholders { room: "Main Area" name: "3" key: "r" }
  keyholders { room: "Main Area" name: "4" key: "o" }
  location_room: "Main Area"
+  location_name: "Keyword ZERO"
 }
 doors {
  name: "Between Door"
diff --git a/data/maps/control_center/rooms/Ancient Entrance.txtpb b/data/maps/control_center/rooms/Ancient Entrance.txtpb
index 9fe50c5..5b65d9a 100644
--- a/data/maps/control_center/rooms/Ancient Entrance.txtpb
+++ b/data/maps/control_center/rooms/Ancient Entrance.txtpb

@@ -1,5 +1,10 @@
 name: "Ancient Entrance"
 ports {
  name: "ANCIENT"
+  display_name: "Ancient Entrance"
  path: "Components/Warps/worldport8"
+  destination { x: -27 y: 0 z: -34 }
+  rotation: 90
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }
diff --git a/data/maps/control_center/rooms/Between Entrance.txtpb b/data/maps/control_center/rooms/Between Entrance.txtpb
index 2c21bdd..9da5344 100644
--- a/data/maps/control_center/rooms/Between Entrance.txtpb
+++ b/data/maps/control_center/rooms/Between Entrance.txtpb

@@ -8,5 +8,8 @@ panels {
 }
 ports {
  name: "BETWEEN"
+  display_name: "Between Connector"
  path: "Components/Warps/worldport5"
+  destination { x: 39 y: 0 z: -17 }
+  rotation: 270
 }
diff --git a/data/maps/control_center/rooms/Entry Entrance.txtpb b/data/maps/control_center/rooms/Entry Entrance.txtpb
index d920523..ad882f5 100644
--- a/data/maps/control_center/rooms/Entry Entrance.txtpb
+++ b/data/maps/control_center/rooms/Entry Entrance.txtpb

@@ -8,5 +8,8 @@ panels {
 }
 ports {
  name: "ENTRY"
+  display_name: "Entry Connector"
  path: "Components/Warps/worldport2"
+  destination { x: 26 y: 0 z: -16.5 }
+  rotation: 0
 }
diff --git a/data/maps/control_center/rooms/Entry.txtpb b/data/maps/control_center/rooms/Entry.txtpb
index 7ef380c..09c21aa 100644
--- a/data/maps/control_center/rooms/Entry.txtpb
+++ b/data/maps/control_center/rooms/Entry.txtpb

@@ -8,5 +8,8 @@ panels {
 }
 ports {
  name: "GREAT"
+  display_name: "Main Entrance"
  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: -1.5 }
+  rotation: 0
 }
diff --git a/data/maps/control_center/rooms/Main Area.txtpb b/data/maps/control_center/rooms/Main Area.txtpb
index 192c02a..2c1e418 100644
--- a/data/maps/control_center/rooms/Main Area.txtpb
+++ b/data/maps/control_center/rooms/Main Area.txtpb

@@ -4,7 +4,7 @@ panels {
  path: "Panels/Doors/entry_2"
  clue: "color"
  answer: "red"
-  #proxies { answer: "red" path: "Panels/Colors/color_1" }
+  proxies { answer: "red" path: "Panels/Colors/color_1" }
  proxies { answer: "blue" path: "Panels/Colors/color_2" }
  proxies { answer: "green" path: "Panels/Colors/color_3" }
  proxies { answer: "yellow" path: "Panels/Colors/color_4" }
@@ -30,37 +30,52 @@ panels {
 keyholders {
  name: "1"
  path: "Components/KeyHolders/keyHolder"
+  key: "z"
 }
 keyholders {
  name: "2"
  path: "Components/KeyHolders/keyHolder2"
+  key: "e"
 }
 keyholders {
  name: "3"
  path: "Components/KeyHolders/keyHolder3"
+  key: "r"
 }
 keyholders {
  name: "4"
  path: "Components/KeyHolders/keyHolder4"
+  key: "o"
 }
 ports {
  name: "RIGHT"
+  display_name: "Hinterlands South Entrance"
  path: "Components/Warps/worldport6"
+  destination { x: 82 y: 0 z: -10 }
+  rotation: 90
 }
 ports {
  name: "LEFT"
+  display_name: "Hinterlands North Entrance"
  path: "Components/Warps/worldport7"
-  # Check that this is correct.
+  destination { x: 82 y: 0 z: -48 }
+  rotation: 90
 }
 ports {
  name: "RELENTLESS_LEFT"
+  display_name: "Relentless LEFT Entrance"
  path: "Components/Warps/worldport9"
+  no_shuffle: true
 }
 ports {
  name: "RELENTLESS_SHOP"
+  display_name: "Relentless SHOP Entrance"
  path: "Components/Warps/worldport11"
+  no_shuffle: true
 }
 ports {
  name: "RELENTLESS_TURN"
+  display_name: "Relentless TURN Entrance"
  path: "Components/Warps/worldport10"
+  no_shuffle: true
 }
diff --git a/data/maps/control_center/rooms/Partial Entrance.txtpb b/data/maps/control_center/rooms/Partial Entrance.txtpb
index 77b68fa..5771afc 100644
--- a/data/maps/control_center/rooms/Partial Entrance.txtpb
+++ b/data/maps/control_center/rooms/Partial Entrance.txtpb

@@ -8,5 +8,10 @@ panels {
 }
 ports {
  name: "PARTIAL"
+  display_name: "Partial Connector"
  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 6eec265..cf5a82c 100644
--- a/data/maps/control_center/rooms/Perceptive Entrance.txtpb
+++ b/data/maps/control_center/rooms/Perceptive Entrance.txtpb

@@ -16,5 +16,10 @@ panels {
 }
 ports {
  name: "PERCEPTIVE"
+  display_name: "Perceptive Entrance"
  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 08b8fa4..6e242f3 100644
--- a/data/maps/control_center/rooms/Repetitive Entrance.txtpb
+++ b/data/maps/control_center/rooms/Repetitive Entrance.txtpb

@@ -1,5 +1,10 @@
 name: "Repetitive Entrance"
 ports {
  name: "REPETITIVE"
+  display_name: "Repetitive Entrance"
  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 0527d50..2689589 100644
--- a/data/maps/control_center/rooms/Tenacious Entrance.txtpb
+++ b/data/maps/control_center/rooms/Tenacious Entrance.txtpb

@@ -8,5 +8,10 @@ panels {
 }
 ports {
  name: "TENACIOUS"
+  display_name: "Tenacious Connector"
  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 b6fc074..5e65254 100644
--- a/data/maps/control_center/rooms/Unkempt Entrance.txtpb
+++ b/data/maps/control_center/rooms/Unkempt Entrance.txtpb

@@ -8,5 +8,10 @@ panels {
 }
 ports {
  name: "UNKEMPT"
+  display_name: "Unkempt Connector"
  path: "Components/Warps/worldport3"
+  destination { x: 34 y: 0 z: -38.5 }
+  rotation: 90
+  # TODO: shuffle entrances with dependent keyholders
+  no_shuffle: true
 }