9 files changed, 71 insertions, 51 deletions
diff --git a/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb b/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb
new file mode 100644
index 0000000..e6600a2
--- /dev/null
+++ b/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb

@@ -0,0 +1,9 @@
+name: "Congruent Entrance"
+panel_display_name: "Second Room"
+ports {
+  name: "CONGRUENT"
+  display_name: "Second Room Gray Hallway"
+  path: "Components/Warps/worldport7"
+  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
new file mode 100644
index 0000000..bce0e5b
--- /dev/null
+++ b/data/maps/the_darkroom/rooms/Cyan Hallway.txtpb

@@ -0,0 +1,9 @@
+name: "Cyan Hallway"
+panel_display_name: "First Room"
+ports {
+  name: "COLORFUL"
+  display_name: "First Room Cyan Hallway"
+  path: "Components/Warps/worldport8"
+  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
new file mode 100644
index 0000000..79ca839
--- /dev/null
+++ b/data/maps/the_darkroom/rooms/Double Sided Entrance.txtpb

@@ -0,0 +1,9 @@
+name: "Double Sided Entrance"
+panel_display_name: "First Room"
+ports {
+  name: "DOUBLESIDED"
+  display_name: "First Room White Hallway"
+  path: "Components/Warps/worldport6"
+  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..4a7ebc2
--- /dev/null
+++ b/data/maps/the_darkroom/rooms/First Room Exit.txtpb

@@ -0,0 +1,9 @@
+name: "First Room Exit"
+panel_display_name: "First Room"
+ports {
+  name: "NEXT"
+  display_name: "First Room Exit"
+  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 f79d055..1113435 100644
--- a/data/maps/the_darkroom/rooms/First Room.txtpb
+++ b/data/maps/the_darkroom/rooms/First Room.txtpb

@@ -1,5 +1,5 @@
 name: "First Room"
-display_name: "First Room"
+panel_display_name: "First Room"
 panels {
  name: "BISON"
  path: "Panels/Room 1/panel_1"
@@ -33,24 +33,8 @@ panels {
 }
 ports {
  name: "ENTRY"
+  display_name: "First Room Entrance"
  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" }
-}
-ports {
-  name: "COLORFUL"
-  path: "Components/Warps/worldport8"
-  orientation: "north"
-  required_door { name: "Colorful Entrance" }
-}
-ports {
-  name: "DOUBLESIDED"
-  path: "Components/Warps/worldport6"
-  orientation: "east"
-  required_door { name: "Double Sided Entrance" }
 }
diff --git a/data/maps/the_darkroom/rooms/S Room.txtpb b/data/maps/the_darkroom/rooms/S Room.txtpb
index 0f56af1..9960b86 100644
--- a/data/maps/the_darkroom/rooms/S Room.txtpb
+++ b/data/maps/the_darkroom/rooms/S Room.txtpb

@@ -1,5 +1,4 @@
 name: "S Room"
-display_name: "Third Room"
 letters {
  key: "s"
  path: "Components/Collectables/collectable"
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..d500691
--- /dev/null
+++ b/data/maps/the_darkroom/rooms/Second Room Exit.txtpb

@@ -0,0 +1,9 @@
+name: "Second Room Exit"
+panel_display_name: "Second Room"
+ports {
+  name: "NEXT"
+  display_name: "Second Room Exit"
+  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 911132d..2219895 100644
--- a/data/maps/the_darkroom/rooms/Second Room.txtpb
+++ b/data/maps/the_darkroom/rooms/Second Room.txtpb

@@ -1,25 +1,25 @@
 name: "Second Room"
-display_name: "Second Room"
+panel_display_name: "Second Room"
 panels {
  name: "BISON"
  path: "Panels/Room 2/panel_1"
  clue: "bison"
  answer: "bison"
-  symbols: "planet"
+  symbols: PLANET
 }
 panels {
  name: "FISH"
  path: "Panels/Room 2/panel_2"
  clue: "fish"
  answer: "fish"
-  symbols: "planet"
+  symbols: PLANET
 }
 panels {
  name: "SHEEP"
  path: "Panels/Room 2/panel_3"
  clue: "sheep"
  answer: "sheep"
-  symbols: "planet"
+  symbols: PLANET
  required_door { name: "Double Letter Panel Blockers" }
 }
 panels {
@@ -27,29 +27,19 @@ panels {
  path: "Panels/Room 2/panel_4"
  clue: "koi"
  answer: "koi"
-  symbols: "planet"
+  symbols: PLANET
 }
 panels {
  name: "TUNA"
  path: "Panels/Room 2/panel_5"
  clue: "tuna"
  answer: "tuna"
-  symbols: "planet"
+  symbols: PLANET
 }
 ports {
  name: "ENTRY"
+  display_name: "Second Room Entrance"
  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" }
-}
-ports {
-  name: "CONGRUENT"
-  path: "Components/Warps/worldport7"
-  orientation: "east"
-  required_door { name: "Congruent Entrance" }
 }
diff --git a/data/maps/the_darkroom/rooms/Third Room.txtpb b/data/maps/the_darkroom/rooms/Third Room.txtpb
index 25fa376..0400476 100644
--- a/data/maps/the_darkroom/rooms/Third Room.txtpb
+++ b/data/maps/the_darkroom/rooms/Third Room.txtpb

@@ -1,70 +1,72 @@
 name: "Third Room"
-display_name: "Third Room"
+panel_display_name: "Third Room"
 panels {
  name: "CULTS"
  path: "Panels/Room 3/panel_1"
  clue: "cults"
  answer: "cult"
-  symbols: "planet"
+  symbols: PLANET
 }
 panels {
  name: "TURNS"
  path: "Panels/Room 3/panel_2"
  clue: "turns"
  answer: "turn"
-  symbols: "planet"
+  symbols: PLANET
 }
 panels {
  name: "COINS"
  path: "Panels/Room 3/panel_3"
  clue: "coins"
  answer: "coin"
-  symbols: "planet"
+  symbols: PLANET
 }
 panels {
  name: "INKS"
  path: "Panels/Room 3/panel_4"
  clue: "inks"
  answer: "ink"
-  symbols: "planet"
+  symbols: PLANET
 }
 panels {
  name: "KNOTS"
  path: "Panels/Room 3/panel_5"
  clue: "knots"
  answer: "knot"
-  symbols: "planet"
+  symbols: PLANET
 }
 panels {
  name: "LINKS"
  path: "Panels/Room 3/panel_6"
  clue: "links"
  answer: "link"
-  symbols: "planet"
+  symbols: PLANET
 }
 panels {
  name: "LOCKS"
  path: "Panels/Room 3/panel_7"
  clue: "locks"
  answer: "lock"
-  symbols: "planet"
+  symbols: PLANET
 }
 panels {
  name: "TOUCHES"
  path: "Panels/Room 3/panel_8"
  clue: "touches"
  answer: "touch"
-  symbols: "planet"
+  symbols: PLANET
 }
 panels {
  name: "KOI"
  path: "Panels/Room 3/panel_9"
  clue: "koi"
  answer: "koi"
-  symbols: "planet"
+  symbols: PLANET
 }
 ports {
  name: "ENTRY"
+  display_name: "Third Room Entrance"
  path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: 97 y: 0 z: 10 }
+  rotation: 0
 }