14 files changed, 69 insertions, 37 deletions
diff --git a/data/maps/the_bearer/connections.txtpb b/data/maps/the_bearer/connections.txtpb
index 23410f0..ba14d83 100644
--- a/data/maps/the_bearer/connections.txtpb
+++ b/data/maps/the_bearer/connections.txtpb

@@ -263,3 +263,8 @@ connections {
  to_room: "Butterfly Room"
  door { name: "Butterfly Entrance" }
 }
+connections {
+  from_room: "Back Area"
+  to_room: "Tree Entrance"
+  door { name: "Control Center Brown Door" }
+}
diff --git a/data/maps/the_bearer/rooms/Back Area.txtpb b/data/maps/the_bearer/rooms/Back Area.txtpb
index 27e175c..b1860de 100644
--- a/data/maps/the_bearer/rooms/Back Area.txtpb
+++ b/data/maps/the_bearer/rooms/Back Area.txtpb

@@ -7,12 +7,6 @@ panels {
  symbols: EXAMPLE
 }
 ports {
-  name: "TREE"
-  path: "Components/Warps/worldport3"
-  orientation: "north"
-  required_door { name: "Control Center Brown Door" }
-}
-ports {
  name: "DAEDALUS"
  path: "Components/Warps/worldport2"
  orientation: "north"
diff --git a/data/maps/the_bearer/rooms/Tree Entrance.txtpb b/data/maps/the_bearer/rooms/Tree Entrance.txtpb
new file mode 100644
index 0000000..97a07da
--- /dev/null
+++ b/data/maps/the_bearer/rooms/Tree Entrance.txtpb

@@ -0,0 +1,6 @@
+name: "Tree Entrance"
+ports {
+  name: "TREE"
+  path: "Components/Warps/worldport3"
+  orientation: "north"
+}
diff --git a/data/maps/the_darkroom/connections.txtpb b/data/maps/the_darkroom/connections.txtpb
index 87e9b0e..1b7ad05 100644
--- a/data/maps/the_darkroom/connections.txtpb
+++ b/data/maps/the_darkroom/connections.txtpb

@@ -38,3 +38,13 @@ connections {
  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/rooms/Congruent Entrance.txtpb b/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb
new file mode 100644
index 0000000..7ea1286
--- /dev/null
+++ b/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb

@@ -0,0 +1,7 @@
+name: "Congruent Entrance"
+panel_display_name: "Second Room"
+ports {
+  name: "CONGRUENT"
+  path: "Components/Warps/worldport7"
+  orientation: "east"
+}
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..9d25108
--- /dev/null
+++ b/data/maps/the_darkroom/rooms/Double Sided Entrance.txtpb

@@ -0,0 +1,7 @@
+name: "Double Sided Entrance"
+panel_display_name: "First Room"
+ports {
+  name: "DOUBLESIDED"
+  path: "Components/Warps/worldport6"
+  orientation: "east"
+}
diff --git a/data/maps/the_darkroom/rooms/First Room.txtpb b/data/maps/the_darkroom/rooms/First Room.txtpb
index 4e656bf..c635757 100644
--- a/data/maps/the_darkroom/rooms/First Room.txtpb
+++ b/data/maps/the_darkroom/rooms/First Room.txtpb

@@ -42,9 +42,3 @@ ports {
  orientation: "north"
  required_door { name: "Second Room 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.txtpb b/data/maps/the_darkroom/rooms/Second Room.txtpb
index baeea12..a3964ea 100644
--- a/data/maps/the_darkroom/rooms/Second Room.txtpb
+++ b/data/maps/the_darkroom/rooms/Second Room.txtpb

@@ -47,9 +47,3 @@ ports {
  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_entry/connections.txtpb b/data/maps/the_entry/connections.txtpb
index a2e325a..9813f85 100644
--- a/data/maps/the_entry/connections.txtpb
+++ b/data/maps/the_entry/connections.txtpb

@@ -199,3 +199,18 @@ connections {
  to_room: "White Hallway To Daedalus"
  door { name: "Control Center White Door" }
 }
+connections {
+  from_room: "Flipped Second Room"
+  to_room: "Four Rooms Entrance"
+  door { name: "Flipped Second Room Right Door" }
+}
+connections {
+  from_room: "Link Area"
+  to_room: "Liberated Entrance"
+  door { name: "Liberated Entrance" }
+}
+connections {
+  from_room: "Link Area"
+  to_room: "Literate Entrance"
+  door { name: "Literate Entrance" }
+}
diff --git a/data/maps/the_entry/rooms/Flipped Second Room.txtpb b/data/maps/the_entry/rooms/Flipped Second Room.txtpb
index 5841ca1..0d518bb 100644
--- a/data/maps/the_entry/rooms/Flipped Second Room.txtpb
+++ b/data/maps/the_entry/rooms/Flipped Second Room.txtpb

@@ -21,10 +21,3 @@ paintings {
  gravity: Y_PLUS
  display_name: "Eye Painting"
 }
-ports {
-  name: "FOUR"
-  path: "Components/Warps/worldport9"
-  orientation: "south"
-  gravity: Y_PLUS
-  required_door { name: "Flipped Second Room Right Door" }
-}
-\ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb
new file mode 100644
index 0000000..689d23e
--- /dev/null
+++ b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb

@@ -0,0 +1,7 @@
+name: "Four Rooms Entrance"
+ports {
+  name: "FOUR"
+  path: "Components/Warps/worldport9"
+  orientation: "south"
+  gravity: Y_PLUS
+}
diff --git a/data/maps/the_entry/rooms/Liberated Entrance.txtpb b/data/maps/the_entry/rooms/Liberated Entrance.txtpb
new file mode 100644
index 0000000..f0176a0
--- /dev/null
+++ b/data/maps/the_entry/rooms/Liberated Entrance.txtpb

@@ -0,0 +1,6 @@
+name: "Liberated Entrance"
+ports {
+  name: "BLUE"
+  path: "worldport8"
+  orientation: "west"
+}
diff --git a/data/maps/the_entry/rooms/Link Area.txtpb b/data/maps/the_entry/rooms/Link Area.txtpb
index 689f57a..5b68279 100644
--- a/data/maps/the_entry/rooms/Link Area.txtpb
+++ b/data/maps/the_entry/rooms/Link Area.txtpb

@@ -26,15 +26,3 @@ paintings {
  orientation: "south"
  display_name: "Center Painting"
 }
-ports {
-  name: "BLUE"
-  path: "worldport8"
-  orientation: "west"
-  required_door { name: "Liberated Entrance" }
-}
-ports {
-  name: "BROWN"
-  path: "worldport9"
-  orientation: "east"
-  required_door { name: "Literate 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
new file mode 100644
index 0000000..4ec402f
--- /dev/null
+++ b/data/maps/the_entry/rooms/Literate Entrance.txtpb

@@ -0,0 +1,6 @@
+name: "Literate Entrance"
+ports {
+  name: "BROWN"
+  path: "worldport9"
+  orientation: "east"
+}

diff --git a/data/maps/the_bearer/connections.txtpb b/data/maps/the_bearer/connections.txtpb index 23410f0..ba14d83 100644 --- a/data/maps/the_bearer/connections.txtpb +++ b/data/maps/the_bearer/connections.txtpb
@@ -263,3 +263,8 @@ connections {
263	to_room: "Butterfly Room"	263	to_room: "Butterfly Room"
264	door { name: "Butterfly Entrance" }	264	door { name: "Butterfly Entrance" }
265	}	265	}
		266	connections {
		267	from_room: "Back Area"
		268	to_room: "Tree Entrance"
		269	door { name: "Control Center Brown Door" }
		270	}


diff --git a/data/maps/the_bearer/rooms/Back Area.txtpb b/data/maps/the_bearer/rooms/Back Area.txtpb index 27e175c..b1860de 100644 --- a/data/maps/the_bearer/rooms/Back Area.txtpb +++ b/data/maps/the_bearer/rooms/Back Area.txtpb
@@ -7,12 +7,6 @@ panels {
7	symbols: EXAMPLE	7	symbols: EXAMPLE
8	}	8	}
9	ports {	9	ports {
10	name: "TREE"
11	path: "Components/Warps/worldport3"
12	orientation: "north"
13	required_door { name: "Control Center Brown Door" }
14	}
15	ports {
16	name: "DAEDALUS"	10	name: "DAEDALUS"
17	path: "Components/Warps/worldport2"	11	path: "Components/Warps/worldport2"
18	orientation: "north"	12	orientation: "north"


diff --git a/data/maps/the_bearer/rooms/Tree Entrance.txtpb b/data/maps/the_bearer/rooms/Tree Entrance.txtpb new file mode 100644 index 0000000..97a07da --- /dev/null +++ b/data/maps/the_bearer/rooms/Tree Entrance.txtpb
@@ -0,0 +1,6 @@
		1	name: "Tree Entrance"
		2	ports {
		3	name: "TREE"
		4	path: "Components/Warps/worldport3"
		5	orientation: "north"
		6	}


diff --git a/data/maps/the_darkroom/connections.txtpb b/data/maps/the_darkroom/connections.txtpb index 87e9b0e..1b7ad05 100644 --- a/data/maps/the_darkroom/connections.txtpb +++ b/data/maps/the_darkroom/connections.txtpb
@@ -38,3 +38,13 @@ connections {
38	to_room: "Cyan Hallway"	38	to_room: "Cyan Hallway"
39	door { name: "Colorful Entrance" }	39	door { name: "Colorful Entrance" }
40	}	40	}
		41	connections {
		42	from_room: "Second Room"
		43	to_room: "Congruent Entrance"
		44	door { name: "Congruent Entrance" }
		45	}
		46	connections {
		47	from_room: "First Room"
		48	to_room: "Double Sided Entrance"
		49	door { name: "Double Sided Entrance" }
		50	}


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..7ea1286 --- /dev/null +++ b/data/maps/the_darkroom/rooms/Congruent Entrance.txtpb
@@ -0,0 +1,7 @@
		1	name: "Congruent Entrance"
		2	panel_display_name: "Second Room"
		3	ports {
		4	name: "CONGRUENT"
		5	path: "Components/Warps/worldport7"
		6	orientation: "east"
		7	}


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..9d25108 --- /dev/null +++ b/data/maps/the_darkroom/rooms/Double Sided Entrance.txtpb
@@ -0,0 +1,7 @@
		1	name: "Double Sided Entrance"
		2	panel_display_name: "First Room"
		3	ports {
		4	name: "DOUBLESIDED"
		5	path: "Components/Warps/worldport6"
		6	orientation: "east"
		7	}


diff --git a/data/maps/the_darkroom/rooms/First Room.txtpb b/data/maps/the_darkroom/rooms/First Room.txtpb index 4e656bf..c635757 100644 --- a/data/maps/the_darkroom/rooms/First Room.txtpb +++ b/data/maps/the_darkroom/rooms/First Room.txtpb
@@ -42,9 +42,3 @@ ports {
42	orientation: "north"	42	orientation: "north"
43	required_door { name: "Second Room Entrance" }	43	required_door { name: "Second Room Entrance" }
44	}	44	}
45	ports {
46	name: "DOUBLESIDED"
47	path: "Components/Warps/worldport6"
48	orientation: "east"
49	required_door { name: "Double Sided Entrance" }
50	}


diff --git a/data/maps/the_darkroom/rooms/Second Room.txtpb b/data/maps/the_darkroom/rooms/Second Room.txtpb index baeea12..a3964ea 100644 --- a/data/maps/the_darkroom/rooms/Second Room.txtpb +++ b/data/maps/the_darkroom/rooms/Second Room.txtpb
@@ -47,9 +47,3 @@ ports {
47	orientation: "north"	47	orientation: "north"
48	required_door { name: "Third Room Entrance" }	48	required_door { name: "Third Room Entrance" }
49	}	49	}
50	ports {
51	name: "CONGRUENT"
52	path: "Components/Warps/worldport7"
53	orientation: "east"
54	required_door { name: "Congruent Entrance" }
55	}


diff --git a/data/maps/the_entry/connections.txtpb b/data/maps/the_entry/connections.txtpb index a2e325a..9813f85 100644 --- a/data/maps/the_entry/connections.txtpb +++ b/data/maps/the_entry/connections.txtpb
@@ -199,3 +199,18 @@ connections {
199	to_room: "White Hallway To Daedalus"	199	to_room: "White Hallway To Daedalus"
200	door { name: "Control Center White Door" }	200	door { name: "Control Center White Door" }
201	}	201	}
		202	connections {
		203	from_room: "Flipped Second Room"
		204	to_room: "Four Rooms Entrance"
		205	door { name: "Flipped Second Room Right Door" }
		206	}
		207	connections {
		208	from_room: "Link Area"
		209	to_room: "Liberated Entrance"
		210	door { name: "Liberated Entrance" }
		211	}
		212	connections {
		213	from_room: "Link Area"
		214	to_room: "Literate Entrance"
		215	door { name: "Literate Entrance" }
		216	}


diff --git a/data/maps/the_entry/rooms/Flipped Second Room.txtpb b/data/maps/the_entry/rooms/Flipped Second Room.txtpb index 5841ca1..0d518bb 100644 --- a/data/maps/the_entry/rooms/Flipped Second Room.txtpb +++ b/data/maps/the_entry/rooms/Flipped Second Room.txtpb
@@ -21,10 +21,3 @@ paintings {
21	gravity: Y_PLUS	21	gravity: Y_PLUS
22	display_name: "Eye Painting"	22	display_name: "Eye Painting"
23	}	23	}
24	ports {
25	name: "FOUR"
26	path: "Components/Warps/worldport9"
27	orientation: "south"
28	gravity: Y_PLUS
29	required_door { name: "Flipped Second Room Right Door" }
30	} \ No newline at end of file


diff --git a/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb new file mode 100644 index 0000000..689d23e --- /dev/null +++ b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb
@@ -0,0 +1,7 @@
		1	name: "Four Rooms Entrance"
		2	ports {
		3	name: "FOUR"
		4	path: "Components/Warps/worldport9"
		5	orientation: "south"
		6	gravity: Y_PLUS
		7	}


diff --git a/data/maps/the_entry/rooms/Liberated Entrance.txtpb b/data/maps/the_entry/rooms/Liberated Entrance.txtpb new file mode 100644 index 0000000..f0176a0 --- /dev/null +++ b/data/maps/the_entry/rooms/Liberated Entrance.txtpb
@@ -0,0 +1,6 @@
		1	name: "Liberated Entrance"
		2	ports {
		3	name: "BLUE"
		4	path: "worldport8"
		5	orientation: "west"
		6	}


diff --git a/data/maps/the_entry/rooms/Link Area.txtpb b/data/maps/the_entry/rooms/Link Area.txtpb index 689f57a..5b68279 100644 --- a/data/maps/the_entry/rooms/Link Area.txtpb +++ b/data/maps/the_entry/rooms/Link Area.txtpb
@@ -26,15 +26,3 @@ paintings {
26	orientation: "south"	26	orientation: "south"
27	display_name: "Center Painting"	27	display_name: "Center Painting"
28	}	28	}
29	ports {
30	name: "BLUE"
31	path: "worldport8"
32	orientation: "west"
33	required_door { name: "Liberated Entrance" }
34	}
35	ports {
36	name: "BROWN"
37	path: "worldport9"
38	orientation: "east"
39	required_door { name: "Literate Entrance" }
40	} \ 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 new file mode 100644 index 0000000..4ec402f --- /dev/null +++ b/data/maps/the_entry/rooms/Literate Entrance.txtpb
@@ -0,0 +1,6 @@
		1	name: "Literate Entrance"
		2	ports {
		3	name: "BROWN"
		4	path: "worldport9"
		5	orientation: "east"
		6	}