11 files changed, 89 insertions, 45 deletions
diff --git a/data/maps/the_darkroom/connections.txtpb b/data/maps/the_darkroom/connections.txtpb
index 4093585..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"
    }
  }
@@ -33,3 +43,18 @@ connections {
  to_room: "S Room"
  door { name: "S1 Door" }
 }
+connections {
+  from_room: "First Room"
+  to_room: "Cyan Hallway"
+  door { name: "Colorful Entrance" }
+}
+connections {
+  from_room: "Second Room"
+  to_room: "Congruent Entrance"
+  door { name: "Congruent Entrance" }
+}
+connections {
+  from_room: "First Room"
+  to_room: "Double Sided Entrance"
+  door { name: "Double Sided Entrance" }
+}
diff --git a/data/maps/the_darkroom/doors.txtpb b/data/maps/the_darkroom/doors.txtpb
index bbf6a1d..047c7d0 100644
--- a/data/maps/the_darkroom/doors.txtpb
+++ b/data/maps/the_darkroom/doors.txtpb

@@ -1,11 +1,10 @@
 # TODO: gallery painting
 doors {
  name: "Double Letter Panel Blockers"
-  type: ITEM_ONLY
+  type: EVENT
  receivers: "Panels/Room 1/panel_3/visibilityListener"
  receivers: "Panels/Room 2/panel_3/visibilityListener"
-  # TODO: honestly idk if this should even exist
+  double_letters: true
-  switches: "double_letters"
 }
 doors {
  name: "Second Room Entrance"
@@ -23,8 +22,7 @@ doors {
 }
 doors {
  name: "S1 Door"
-  type: LOCATION_ONLY
+  type: EVENT
-  receivers: "Components/Doors/entry_3"
  panels { room: "Third Room" name: "CULTS" }
  panels { room: "Third Room" name: "TURNS" }
  panels { room: "Third Room" name: "COINS" }
@@ -34,7 +32,6 @@ doors {
  panels { room: "Third Room" name: "LOCKS" }
  panels { room: "Third Room" name: "TOUCHES" }
  panels { room: "Third Room" name: "KOI" }
-  location_room: "Third Room"
 }
 doors {
  name: "Colorful Entrance"
@@ -46,6 +43,7 @@ doors {
  panels { room: "First Room" name: "KOI" }
  panels { room: "First Room" name: "TUNA" }
  location_room: "First Room"
+  location_name: "All Puzzles"
 }
 doors {
  name: "Congruent Entrance"
@@ -57,6 +55,7 @@ doors {
  panels { room: "Second Room" name: "KOI" }
  panels { room: "Second Room" name: "TUNA" }
  location_room: "Second Room"
+  location_name: "All Puzzles"
 }
 doors {
  name: "Double Sided Entrance"
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 ce780f3..2219895 100644
--- a/data/maps/the_darkroom/rooms/Second Room.txtpb
+++ b/data/maps/the_darkroom/rooms/Second Room.txtpb

@@ -1,5 +1,5 @@
 name: "Second Room"
-display_name: "Second Room"
+panel_display_name: "Second Room"
 panels {
  name: "BISON"
  path: "Panels/Room 2/panel_1"
@@ -38,18 +38,8 @@ panels {
 }
 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 5202243..0400476 100644
--- a/data/maps/the_darkroom/rooms/Third Room.txtpb
+++ b/data/maps/the_darkroom/rooms/Third Room.txtpb

@@ -1,5 +1,5 @@
 name: "Third Room"
-display_name: "Third Room"
+panel_display_name: "Third Room"
 panels {
  name: "CULTS"
  path: "Panels/Room 3/panel_1"
@@ -65,6 +65,8 @@ panels {
 }
 ports {
  name: "ENTRY"
+  display_name: "Third Room Entrance"
  path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: 97 y: 0 z: 10 }
+  rotation: 0
 }