9 files changed, 40 insertions, 20 deletions
diff --git a/data/maps/the_darkroom/connections.txtpb b/data/maps/the_darkroom/connections.txtpb
index 1b7ad05..43bca70 100644
--- a/data/maps/the_darkroom/connections.txtpb
+++ b/data/maps/the_darkroom/connections.txtpb

@@ -1,7 +1,12 @@
 connections {
+  from_room: "First Room"
+  to_room: "First Room Exit"
+  door { name: "Second Room Entrance" }
+}
+connections {
  from {
    port {
-      room: "First Room"
+      room: "First Room Exit"
      name: "NEXT"
    }
  }
@@ -14,9 +19,14 @@ connections {
  oneway: true
 }
 connections {
+  from_room: "Second Room"
+  to_room: "Second Room Exit"
+  door { name: "Third Room Entrance" }
+}
+connections {
  from {
    port {
-      room: "Second Room"
+      room: "Second Room Exit"
      name: "NEXT"
    }
  }
diff --git a/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb b/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb
index 7ea1286..c8f5dd7 100644
--- a/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb
+++ b/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "Second Room"
 ports {
  name: "CONGRUENT"
  path: "Components/Warps/worldport7"
-  orientation: "east"
+  destination { x: 51.5 y: 0 z: 29 }
+  rotation: 90
 }
diff --git a/data/maps/the_darkroom/rooms/Cyan Hallway.txtpb b/data/maps/the_darkroom/rooms/Cyan Hallway.txtpb
index 308efb1..eba02f5 100644
--- a/data/maps/the_darkroom/rooms/Cyan Hallway.txtpb
+++ b/data/maps/the_darkroom/rooms/Cyan Hallway.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "First Room"
 ports {
  name: "COLORFUL"
  path: "Components/Warps/worldport8"
-  orientation: "north"
+  destination { x: 20 y: 0 z: -12 }
+  rotation: 180
 }
diff --git a/data/maps/the_darkroom/rooms/Double Sided Entrance.txtpb b/data/maps/the_darkroom/rooms/Double Sided Entrance.txtpb
index 9d25108..7b258cf 100644
--- a/data/maps/the_darkroom/rooms/Double Sided Entrance.txtpb
+++ b/data/maps/the_darkroom/rooms/Double Sided Entrance.txtpb

@@ -3,5 +3,6 @@ panel_display_name: "First Room"
 ports {
  name: "DOUBLESIDED"
  path: "Components/Warps/worldport6"
-  orientation: "east"
+  destination { x: 15 y: 0 z: 23 }
+  rotation: 90
 }
diff --git a/data/maps/the_darkroom/rooms/First Room Exit.txtpb b/data/maps/the_darkroom/rooms/First Room Exit.txtpb
new file mode 100644
index 0000000..852d562
--- /dev/null
+++ b/data/maps/the_darkroom/rooms/First Room Exit.txtpb

@@ -0,0 +1,8 @@
+name: "First Room Exit"
+panel_display_name: "First Room"
+ports {
+  name: "NEXT"
+  path: "Components/Warps/worldport2"
+  destination { x: 0 y: 0 z: -15 }
+  rotation: 180
+}
diff --git a/data/maps/the_darkroom/rooms/First Room.txtpb b/data/maps/the_darkroom/rooms/First Room.txtpb
index c635757..5e8167c 100644
--- a/data/maps/the_darkroom/rooms/First Room.txtpb
+++ b/data/maps/the_darkroom/rooms/First Room.txtpb

@@ -34,11 +34,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: -10 y: 0 z: 10 }
-}
+  rotation: 0
-ports {
-  name: "NEXT"
-  path: "Components/Warps/worldport2"
-  orientation: "north"
-  required_door { name: "Second Room Entrance" }
 }
diff --git a/data/maps/the_darkroom/rooms/Second Room Exit.txtpb b/data/maps/the_darkroom/rooms/Second Room Exit.txtpb
new file mode 100644
index 0000000..9f197ae
--- /dev/null
+++ b/data/maps/the_darkroom/rooms/Second Room Exit.txtpb

@@ -0,0 +1,8 @@
+name: "Second Room Exit"
+panel_display_name: "Second Room"
+ports {
+  name: "NEXT"
+  path: "Components/Warps/worldport4"
+  destination { x: 48 y: 0 z: -15 }
+  rotation: 180
+}
diff --git a/data/maps/the_darkroom/rooms/Second Room.txtpb b/data/maps/the_darkroom/rooms/Second Room.txtpb
index a3964ea..fed0669 100644
--- a/data/maps/the_darkroom/rooms/Second Room.txtpb
+++ b/data/maps/the_darkroom/rooms/Second Room.txtpb

@@ -39,11 +39,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport3"
-  orientation: "south"
+  destination { x: 38 y: 0 z: 10 }
-}
+  rotation: 0
-ports {
-  name: "NEXT"
-  path: "Components/Warps/worldport4"
-  orientation: "north"
-  required_door { name: "Third Room Entrance" }
 }
diff --git a/data/maps/the_darkroom/rooms/Third Room.txtpb b/data/maps/the_darkroom/rooms/Third Room.txtpb
index fc80fa7..5e5fc62 100644
--- a/data/maps/the_darkroom/rooms/Third Room.txtpb
+++ b/data/maps/the_darkroom/rooms/Third Room.txtpb

@@ -66,5 +66,6 @@ panels {
 ports {
  name: "ENTRY"
  path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: 97 y: 0 z: 10 }
+  rotation: 0
 }