10 files changed, 81 insertions, 36 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 047c7d0..c4a47a0 100644
--- a/data/maps/the_darkroom/doors.txtpb
+++ b/data/maps/the_darkroom/doors.txtpb

@@ -1,4 +1,3 @@
-# TODO: gallery painting
 doors {
  name: "Double Letter Panel Blockers"
  type: EVENT
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 c93f5b4..1113435 100644
--- a/data/maps/the_darkroom/rooms/First Room.txtpb
+++ b/data/maps/the_darkroom/rooms/First Room.txtpb

@@ -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/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 baeea12..2219895 100644
--- a/data/maps/the_darkroom/rooms/Second Room.txtpb
+++ b/data/maps/the_darkroom/rooms/Second Room.txtpb

@@ -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 fc80fa7..0400476 100644
--- a/data/maps/the_darkroom/rooms/Third Room.txtpb
+++ b/data/maps/the_darkroom/rooms/Third Room.txtpb

@@ -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
 }

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 @@
1	connections {	1	connections {
		2	from_room: "First Room"
		3	to_room: "First Room Exit"
		4	door { name: "Second Room Entrance" }
		5	}
		6	connections {
2	from {	7	from {
3	port {	8	port {
4	room: "First Room"	9	room: "First Room Exit"
5	name: "NEXT"	10	name: "NEXT"
6	}	11	}
7	}	12	}
@@ -14,9 +19,14 @@ connections {
14	oneway: true	19	oneway: true
15	}	20	}
16	connections {	21	connections {
		22	from_room: "Second Room"
		23	to_room: "Second Room Exit"
		24	door { name: "Third Room Entrance" }
		25	}
		26	connections {
17	from {	27	from {
18	port {	28	port {
19	room: "Second Room"	29	room: "Second Room Exit"
20	name: "NEXT"	30	name: "NEXT"
21	}	31	}
22	}	32	}
@@ -33,3 +43,18 @@ connections {
33	to_room: "S Room"	43	to_room: "S Room"
34	door { name: "S1 Door" }	44	door { name: "S1 Door" }
35	}	45	}
		46	connections {
		47	from_room: "First Room"
		48	to_room: "Cyan Hallway"
		49	door { name: "Colorful Entrance" }
		50	}
		51	connections {
		52	from_room: "Second Room"
		53	to_room: "Congruent Entrance"
		54	door { name: "Congruent Entrance" }
		55	}
		56	connections {
		57	from_room: "First Room"
		58	to_room: "Double Sided Entrance"
		59	door { name: "Double Sided Entrance" }
		60	}


diff --git a/data/maps/the_darkroom/doors.txtpb b/data/maps/the_darkroom/doors.txtpb index 047c7d0..c4a47a0 100644 --- a/data/maps/the_darkroom/doors.txtpb +++ b/data/maps/the_darkroom/doors.txtpb
@@ -1,4 +1,3 @@
1	# TODO: gallery painting
2	doors {	1	doors {
3	name: "Double Letter Panel Blockers"	2	name: "Double Letter Panel Blockers"
4	type: EVENT	3	type: EVENT


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 @@
		1	name: "Congruent Entrance"
		2	panel_display_name: "Second Room"
		3	ports {
		4	name: "CONGRUENT"
		5	display_name: "Second Room Gray Hallway"
		6	path: "Components/Warps/worldport7"
		7	destination { x: 51.5 y: 0 z: 29 }
		8	rotation: 90
		9	}


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 @@
		1	name: "Cyan Hallway"
		2	panel_display_name: "First Room"
		3	ports {
		4	name: "COLORFUL"
		5	display_name: "First Room Cyan Hallway"
		6	path: "Components/Warps/worldport8"
		7	destination { x: 20 y: 0 z: -12 }
		8	rotation: 180
		9	}


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 @@
		1	name: "Double Sided Entrance"
		2	panel_display_name: "First Room"
		3	ports {
		4	name: "DOUBLESIDED"
		5	display_name: "First Room White Hallway"
		6	path: "Components/Warps/worldport6"
		7	destination { x: 15 y: 0 z: 23 }
		8	rotation: 90
		9	}


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 @@
		1	name: "First Room Exit"
		2	panel_display_name: "First Room"
		3	ports {
		4	name: "NEXT"
		5	display_name: "First Room Exit"
		6	path: "Components/Warps/worldport2"
		7	destination { x: 0 y: 0 z: -15 }
		8	rotation: 180
		9	}


diff --git a/data/maps/the_darkroom/rooms/First Room.txtpb b/data/maps/the_darkroom/rooms/First Room.txtpb index c93f5b4..1113435 100644 --- a/data/maps/the_darkroom/rooms/First Room.txtpb +++ b/data/maps/the_darkroom/rooms/First Room.txtpb
@@ -33,24 +33,8 @@ panels {
33	}	33	}
34	ports {	34	ports {
35	name: "ENTRY"	35	name: "ENTRY"
		36	display_name: "First Room Entrance"
36	path: "Components/Warps/worldport"	37	path: "Components/Warps/worldport"
37	orientation: "south"	38	destination { x: -10 y: 0 z: 10 }
38	}	39	rotation: 0
39	ports {
40	name: "NEXT"
41	path: "Components/Warps/worldport2"
42	orientation: "north"
43	required_door { name: "Second Room Entrance" }
44	}
45	ports {
46	name: "COLORFUL"
47	path: "Components/Warps/worldport8"
48	orientation: "north"
49	required_door { name: "Colorful Entrance" }
50	}
51	ports {
52	name: "DOUBLESIDED"
53	path: "Components/Warps/worldport6"
54	orientation: "east"
55	required_door { name: "Double Sided Entrance" }
56	}	40	}


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 @@
		1	name: "Second Room Exit"
		2	panel_display_name: "Second Room"
		3	ports {
		4	name: "NEXT"
		5	display_name: "Second Room Exit"
		6	path: "Components/Warps/worldport4"
		7	destination { x: 48 y: 0 z: -15 }
		8	rotation: 180
		9	}


diff --git a/data/maps/the_darkroom/rooms/Second Room.txtpb b/data/maps/the_darkroom/rooms/Second Room.txtpb index baeea12..2219895 100644 --- a/data/maps/the_darkroom/rooms/Second Room.txtpb +++ b/data/maps/the_darkroom/rooms/Second Room.txtpb
@@ -38,18 +38,8 @@ panels {
38	}	38	}
39	ports {	39	ports {
40	name: "ENTRY"	40	name: "ENTRY"
		41	display_name: "Second Room Entrance"
41	path: "Components/Warps/worldport3"	42	path: "Components/Warps/worldport3"
42	orientation: "south"	43	destination { x: 38 y: 0 z: 10 }
43	}	44	rotation: 0
44	ports {
45	name: "NEXT"
46	path: "Components/Warps/worldport4"
47	orientation: "north"
48	required_door { name: "Third Room Entrance" }
49	}
50	ports {
51	name: "CONGRUENT"
52	path: "Components/Warps/worldport7"
53	orientation: "east"
54	required_door { name: "Congruent Entrance" }
55	}	45	}


diff --git a/data/maps/the_darkroom/rooms/Third Room.txtpb b/data/maps/the_darkroom/rooms/Third Room.txtpb index fc80fa7..0400476 100644 --- a/data/maps/the_darkroom/rooms/Third Room.txtpb +++ b/data/maps/the_darkroom/rooms/Third Room.txtpb
@@ -65,6 +65,8 @@ panels {
65	}	65	}
66	ports {	66	ports {
67	name: "ENTRY"	67	name: "ENTRY"
		68	display_name: "Third Room Entrance"
68	path: "Components/Warps/worldport5"	69	path: "Components/Warps/worldport5"
69	orientation: "south"	70	destination { x: 97 y: 0 z: 10 }
		71	rotation: 0
70	}	72	}