19 files changed, 50 insertions, 24 deletions
diff --git a/data/maps/the_entry/connections.txtpb b/data/maps/the_entry/connections.txtpb
index ca0207e..5fe279c 100644
--- a/data/maps/the_entry/connections.txtpb
+++ b/data/maps/the_entry/connections.txtpb

@@ -160,6 +160,11 @@ connections {
  door { name: "Lime Room Entrance" }
 }
 connections {
+  from_room: "Lime Room"
+  to_room: "Revitalized Entrance"
+  door { name: "Revitalized Entrance" }
+}
+connections {
  from { painting { room: "Link Area" name: "NEAR" } }
  to { painting { room: "Flipped Link Area" name: "NEAR" } }
  oneway: true
diff --git a/data/maps/the_entry/rooms/Composite Room Entrance.txtpb b/data/maps/the_entry/rooms/Composite Room Entrance.txtpb
index b9a8098..9d9f362 100644
--- a/data/maps/the_entry/rooms/Composite Room Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Composite Room Entrance.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Starting Room"
 ports {
  name: "COMPOSITE"
  path: "Components/Warps/worldport12"
-  orientation: "east"
+  destination { x: 16 y: 0 z: -20 }
+  rotation: 90
 }
diff --git a/data/maps/the_entry/rooms/Daedalus Entrance.txtpb b/data/maps/the_entry/rooms/Daedalus Entrance.txtpb
index db9b78a..4967857 100644
--- a/data/maps/the_entry/rooms/Daedalus Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Daedalus Entrance.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Starting Room"
 ports {
  name: "DAEDALUS"
  path: "Components/Warps/worldport6"
-  orientation: "west"
+  destination { x: -16 y: 0 z: -20 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/Digital Entrance.txtpb b/data/maps/the_entry/rooms/Digital Entrance.txtpb
index dd8b5f4..fe474b3 100644
--- a/data/maps/the_entry/rooms/Digital Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Digital Entrance.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Starting Room"
 ports {
  name: "DIGITAL"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -78 y: 0 z: -24 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/Entry Exit.txtpb b/data/maps/the_entry/rooms/Entry Exit.txtpb
index b5d75aa..68c7006 100644
--- a/data/maps/the_entry/rooms/Entry Exit.txtpb
+++ b/data/maps/the_entry/rooms/Entry Exit.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Starting Room"
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 18 y: 0 z: -36 }
+  rotation: 180
 }
diff --git a/data/maps/the_entry/rooms/Eye Room.txtpb b/data/maps/the_entry/rooms/Eye Room.txtpb
index da17163..f56ce59 100644
--- a/data/maps/the_entry/rooms/Eye Room.txtpb
+++ b/data/maps/the_entry/rooms/Eye Room.txtpb

@@ -32,5 +32,6 @@ paintings {
 ports {
  name: "LIONIZED"
  path: "Components/Warps/worldport10"
-  orientation: "north"
+  destination { x: 18 y: 0 z: -88.5 }
+  rotation: 180
 }
diff --git a/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb
index 689d23e..42e3173 100644
--- a/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb

@@ -2,6 +2,7 @@ name: "Four Rooms Entrance"
 ports {
  name: "FOUR"
  path: "Components/Warps/worldport9"
-  orientation: "south"
+  destination { x: -41 y: 6 z: -17.5 }
+  rotation: 0
  gravity: Y_PLUS
 }
diff --git a/data/maps/the_entry/rooms/Gallery Return.txtpb b/data/maps/the_entry/rooms/Gallery Return.txtpb
index 987a3ca..231dff9 100644
--- a/data/maps/the_entry/rooms/Gallery Return.txtpb
+++ b/data/maps/the_entry/rooms/Gallery Return.txtpb

@@ -10,5 +10,6 @@ panels {
 ports {
  name: "GALLERY"
  path: "Components/Warps/worldport4"
-  orientation: "north"
+  destination { x: -38 y: 0 z: 8.5 }
+  rotation: 180
 }
 \ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Least Blue Last.txtpb b/data/maps/the_entry/rooms/Least Blue Last.txtpb
index adbe545..4fb715e 100644
--- a/data/maps/the_entry/rooms/Least Blue Last.txtpb
+++ b/data/maps/the_entry/rooms/Least Blue Last.txtpb

@@ -73,7 +73,8 @@ panels {
 ports {
  name: "DARKROOM"
  path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: 43 y: 0 z: -10 }
+  rotation: 0
 }
 paintings {
  name: "PAINS"
diff --git a/data/maps/the_entry/rooms/Liberated Entrance.txtpb b/data/maps/the_entry/rooms/Liberated Entrance.txtpb
index f0176a0..7c50e39 100644
--- a/data/maps/the_entry/rooms/Liberated Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Liberated Entrance.txtpb

@@ -2,5 +2,6 @@ name: "Liberated Entrance"
 ports {
  name: "BLUE"
  path: "worldport8"
-  orientation: "west"
+  destination { x: 18 y: 0 z: 55 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/Lime Room.txtpb b/data/maps/the_entry/rooms/Lime Room.txtpb
index e94f775..603fbdc 100644
--- a/data/maps/the_entry/rooms/Lime Room.txtpb
+++ b/data/maps/the_entry/rooms/Lime Room.txtpb

@@ -19,9 +19,3 @@ panels {
  answer: "white"
  symbols: EXAMPLE
 }
-ports {
-  name: "REVITALIZED"
-  path: "worldport7"
-  orientation: "north"
-  required_door { name: "Revitalized Entrance" }
-}
-\ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Literate Entrance.txtpb b/data/maps/the_entry/rooms/Literate Entrance.txtpb
index 4ec402f..c15e242 100644
--- a/data/maps/the_entry/rooms/Literate Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Literate Entrance.txtpb

@@ -2,5 +2,6 @@ name: "Literate Entrance"
 ports {
  name: "BROWN"
  path: "worldport9"
-  orientation: "east"
+  destination { x: 39 y: 0 z: 55 }
+  rotation: 90
 }
diff --git a/data/maps/the_entry/rooms/Parthenon Return.txtpb b/data/maps/the_entry/rooms/Parthenon Return.txtpb
index 4776d11..bd49b55 100644
--- a/data/maps/the_entry/rooms/Parthenon Return.txtpb
+++ b/data/maps/the_entry/rooms/Parthenon Return.txtpb

@@ -10,5 +10,6 @@ panels {
 ports {
  name: "PARTHENON"
  path: "Components/Warps/worldport8"
-  orientation: "north"
+  destination { x: -5.5 y: 0 z: 18 }
-}
-\ No newline at end of file
+  rotation: 180
+}
diff --git a/data/maps/the_entry/rooms/Rabbit Hole.txtpb b/data/maps/the_entry/rooms/Rabbit Hole.txtpb
index 520d513..0cb4661 100644
--- a/data/maps/the_entry/rooms/Rabbit Hole.txtpb
+++ b/data/maps/the_entry/rooms/Rabbit Hole.txtpb

@@ -9,5 +9,6 @@ panels {
 ports {
  name: "HOLE"
  path: "worldport4"
-  orientation: "down"
+  destination { x: 74 y: 0 z: -43 }
-}
-\ No newline at end of file
+  rotation: 0
+}
diff --git a/data/maps/the_entry/rooms/Repetitive Entrance.txtpb b/data/maps/the_entry/rooms/Repetitive Entrance.txtpb
index 04ddcf3..40937a7 100644
--- a/data/maps/the_entry/rooms/Repetitive Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Repetitive Entrance.txtpb

@@ -3,5 +3,9 @@ panel_display_name: "Starting Room"
 ports {
  name: "REPETITIVE"
  path: "Components/Warps/worldport7"
-  orientation: "north"
+  destination { x: -20 y: 0 z: -16 }
+  rotation: 180
+  # TODO: this is part of what makes the keyholder dependent connection from CC
+  # safe in vanilla doors
+  no_shuffle: true
 }
diff --git a/data/maps/the_entry/rooms/Revitalized Entrance.txtpb b/data/maps/the_entry/rooms/Revitalized Entrance.txtpb
new file mode 100644
index 0000000..1c38164
--- /dev/null
+++ b/data/maps/the_entry/rooms/Revitalized Entrance.txtpb

@@ -0,0 +1,8 @@
+name: "Revitalized Entrance"
+panel_display_name: "Colored Doors Area"
+ports {
+  name: "REVITALIZED"
+  path: "worldport7"
+  destination { x: -58 y: 0 z: 31.5 }
+  rotation: 180
+}
diff --git a/data/maps/the_entry/rooms/Shop Entrance.txtpb b/data/maps/the_entry/rooms/Shop Entrance.txtpb
index 67aa6de..ad407c3 100644
--- a/data/maps/the_entry/rooms/Shop Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Shop Entrance.txtpb

@@ -10,5 +10,6 @@ panels {
 ports {
  name: "SHOP"
  path: "Components/Warps/worldport13"
-  orientation: "east"
+  destination { x: 18 y: 0 z: 49 }
+  rotation: 90
 }
 \ No newline at end of file
diff --git a/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb b/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb
index ce35e5b..9149c03 100644
--- a/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb
+++ b/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Colored Doors Area"
 ports {
  name: "DAEDALUS"
  path: "Components/Warps/worldport11"
-  orientation: "west"
+  destination { x: -45 y: 0 z: 24 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/X Area.txtpb b/data/maps/the_entry/rooms/X Area.txtpb
index 3f61c26..215e223 100644
--- a/data/maps/the_entry/rooms/X Area.txtpb
+++ b/data/maps/the_entry/rooms/X Area.txtpb

@@ -7,5 +7,6 @@ letters {
 ports {
  name: "CC"
  path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: -12.5 y: 0 z: 60 }
+  rotation: 270
 }