38 files changed, 37 insertions, 46 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/doors.txtpb b/data/maps/the_bearer/doors.txtpb
index 1faddef..acbf86a 100644
--- a/data/maps/the_bearer/doors.txtpb
+++ b/data/maps/the_bearer/doors.txtpb

@@ -211,7 +211,7 @@ doors {
 }
 doors {
  name: "Q2 Door"
-  type: STANDARD
+  type: EVENT
  receivers: "Components/Doors/entry_3"
  panels { room: "Entry" name: "SQUISH" }
  panels { room: "Entry" name: "MANE" }
@@ -237,11 +237,11 @@ doors {
  panels { room: "Red Vegetable" name: "CARD" }
  panels { room: "Yellow Planet" name: "ZEUS" }
  panels { room: "Yellow Vegetable" name: "CAKE" }
-  location_room: "Entry"
 }
 doors {
  name: "Control Center Brown Door"
  type: CONTROL_CENTER_COLOR
+  latch: true
  receivers: "Components/Doors/brown_1"
  control_center_color: "brown"
 }
@@ -249,5 +249,20 @@ doors {
  name: "Butterfly Entrance"
  type: ITEM_ONLY
  receivers: "Components/Doors/brown_2"
-  switches: "double_letters"
+  double_letters: true
+}
+doors {
+  name: "Control Center Color Panel"
+  type: LOCATION_ONLY
+  panels { room: "Back Area" name: "COLOR" }
+  location_room: "Back Area"
+  location_name: "COLOR"
+}
+doors {
+  name: "Butterfly Room Panels"
+  type: LOCATION_ONLY
+  panels { room: "Butterfly Room" name: "DARKNESS" }
+  panels { room: "Butterfly Room" name: "VIBRANT" }
+  location_room: "Butterfly Room"
+  location_name: "DARKNESS, VIBRANT"
 }
diff --git a/data/maps/the_bearer/rooms/Back Area.txtpb b/data/maps/the_bearer/rooms/Back Area.txtpb
index bd90b50..2be4cb4 100644
--- a/data/maps/the_bearer/rooms/Back Area.txtpb
+++ b/data/maps/the_bearer/rooms/Back Area.txtpb

@@ -1,5 +1,4 @@
 name: "Back Area"
-display_name: "Back Area"
 panels {
  name: "COLOR"
  path: "Panels/Entry/panel_3"
@@ -8,13 +7,9 @@ panels {
  symbols: EXAMPLE
 }
 ports {
-  name: "TREE"
-  path: "Components/Warps/worldport3"
-  orientation: "north"
-  required_door { name: "Control Center Brown Door" }
-}
-ports {
  name: "DAEDALUS"
+  display_name: "Dark Hallway"
  path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 10 y: 0 z: -84.5 }
+  rotation: 180
 }
diff --git a/data/maps/the_bearer/rooms/Blue Animal (View).txtpb b/data/maps/the_bearer/rooms/Blue Animal (View).txtpb
index a13ce1d..33c278c 100644
--- a/data/maps/the_bearer/rooms/Blue Animal (View).txtpb
+++ b/data/maps/the_bearer/rooms/Blue Animal (View).txtpb

@@ -1,5 +1,4 @@
 name: "Blue Animal (View)"
-display_name: "Main Area"
 panels {
  name: "HALF"
  path: "Panels/Blue/panel_2"
diff --git a/data/maps/the_bearer/rooms/Blue Animal.txtpb b/data/maps/the_bearer/rooms/Blue Animal.txtpb
index 49ac048..e503c93 100644
--- a/data/maps/the_bearer/rooms/Blue Animal.txtpb
+++ b/data/maps/the_bearer/rooms/Blue Animal.txtpb

@@ -1,2 +1 @@
 name: "Blue Animal"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Blue Planet (View).txtpb b/data/maps/the_bearer/rooms/Blue Planet (View).txtpb
index 172565b..e745718 100644
--- a/data/maps/the_bearer/rooms/Blue Planet (View).txtpb
+++ b/data/maps/the_bearer/rooms/Blue Planet (View).txtpb

@@ -1,5 +1,4 @@
 name: "Blue Planet (View)"
-display_name: "Main Area"
 panels {
  name: "TUNE"
  path: "Panels/Blue/panel_4"
diff --git a/data/maps/the_bearer/rooms/Blue Planet.txtpb b/data/maps/the_bearer/rooms/Blue Planet.txtpb
index b291c35..b044590 100644
--- a/data/maps/the_bearer/rooms/Blue Planet.txtpb
+++ b/data/maps/the_bearer/rooms/Blue Planet.txtpb

@@ -1,2 +1 @@
 name: "Blue Planet"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Blue Town (View).txtpb b/data/maps/the_bearer/rooms/Blue Town (View).txtpb
index f66eae9..f57fc9b 100644
--- a/data/maps/the_bearer/rooms/Blue Town (View).txtpb
+++ b/data/maps/the_bearer/rooms/Blue Town (View).txtpb

@@ -1,5 +1,4 @@
 name: "Blue Town (View)"
-display_name: "Main Area"
 panels {
  name: "LICE"
  path: "Panels/Blue/panel_3"
diff --git a/data/maps/the_bearer/rooms/Blue Town.txtpb b/data/maps/the_bearer/rooms/Blue Town.txtpb
index b24af76..5ceed12 100644
--- a/data/maps/the_bearer/rooms/Blue Town.txtpb
+++ b/data/maps/the_bearer/rooms/Blue Town.txtpb

@@ -1,2 +1 @@
 name: "Blue Town"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Blue Vegetable (View).txtpb b/data/maps/the_bearer/rooms/Blue Vegetable (View).txtpb
index f9443fd..cf1ffd3 100644
--- a/data/maps/the_bearer/rooms/Blue Vegetable (View).txtpb
+++ b/data/maps/the_bearer/rooms/Blue Vegetable (View).txtpb

@@ -1,5 +1,4 @@
 name: "Blue Vegetable (View)"
-display_name: "Main Area"
 panels {
  name: "THORN"
  path: "Panels/Blue/panel_1"
diff --git a/data/maps/the_bearer/rooms/Blue Vegetable.txtpb b/data/maps/the_bearer/rooms/Blue Vegetable.txtpb
index 9034471..64ce77d 100644
--- a/data/maps/the_bearer/rooms/Blue Vegetable.txtpb
+++ b/data/maps/the_bearer/rooms/Blue Vegetable.txtpb

@@ -1,2 +1 @@
 name: "Blue Vegetable"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Butterfly Room.txtpb b/data/maps/the_bearer/rooms/Butterfly Room.txtpb
index bd20505..a702737 100644
--- a/data/maps/the_bearer/rooms/Butterfly Room.txtpb
+++ b/data/maps/the_bearer/rooms/Butterfly Room.txtpb

@@ -1,5 +1,4 @@
 name: "Butterfly Room"
-display_name: "Back Area"
 panels {
  name: "VIBRANT"
  path: "Panels/Entry/panel_4"
diff --git a/data/maps/the_bearer/rooms/Entry.txtpb b/data/maps/the_bearer/rooms/Entry.txtpb
index d7a8db6..517088d 100644
--- a/data/maps/the_bearer/rooms/Entry.txtpb
+++ b/data/maps/the_bearer/rooms/Entry.txtpb

@@ -1,5 +1,4 @@
 name: "Entry"
-display_name: "Main Area"
 panels {
  name: "VIEW"
  path: "Panels/Entry/panel_1"
@@ -58,6 +57,8 @@ panels {
 }
 ports {
  name: "UNYIELDING"
+  display_name: "Main Entrance"
  path: "Components/Warps/worldport"
-  orientation: "east"
+  destination { x: 3 y: 4 z: 15 }
+  rotation: 90
 }
diff --git a/data/maps/the_bearer/rooms/Green Animal.txtpb b/data/maps/the_bearer/rooms/Green Animal.txtpb
index 61522cc..147f825 100644
--- a/data/maps/the_bearer/rooms/Green Animal.txtpb
+++ b/data/maps/the_bearer/rooms/Green Animal.txtpb

@@ -1,2 +1 @@
 name: "Green Animal"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Green Planet (View).txtpb b/data/maps/the_bearer/rooms/Green Planet (View).txtpb
index 79363bc..4d9f449 100644
--- a/data/maps/the_bearer/rooms/Green Planet (View).txtpb
+++ b/data/maps/the_bearer/rooms/Green Planet (View).txtpb

@@ -1,5 +1,4 @@
 name: "Green Planet (View)"
-display_name: "Main Area"
 panels {
  name: "SOIL"
  path: "Panels/Green/panel_4"
diff --git a/data/maps/the_bearer/rooms/Green Planet.txtpb b/data/maps/the_bearer/rooms/Green Planet.txtpb
index b97b731..efe000a 100644
--- a/data/maps/the_bearer/rooms/Green Planet.txtpb
+++ b/data/maps/the_bearer/rooms/Green Planet.txtpb

@@ -1,2 +1 @@
 name: "Green Planet"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Green Town.txtpb b/data/maps/the_bearer/rooms/Green Town.txtpb
index 184ded3..fd80201 100644
--- a/data/maps/the_bearer/rooms/Green Town.txtpb
+++ b/data/maps/the_bearer/rooms/Green Town.txtpb

@@ -1,2 +1 @@
 name: "Green Town"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Green Vegetable (View).txtpb b/data/maps/the_bearer/rooms/Green Vegetable (View).txtpb
index 4bbab5d..98fbbe8 100644
--- a/data/maps/the_bearer/rooms/Green Vegetable (View).txtpb
+++ b/data/maps/the_bearer/rooms/Green Vegetable (View).txtpb

@@ -1,5 +1,4 @@
 name: "Green Vegetable (View)"
-display_name: "Main Area"
 panels {
  name: "SPIN"
  path: "Panels/Green/panel_1"
diff --git a/data/maps/the_bearer/rooms/Green Vegetable.txtpb b/data/maps/the_bearer/rooms/Green Vegetable.txtpb
index ccb817a..051a6d3 100644
--- a/data/maps/the_bearer/rooms/Green Vegetable.txtpb
+++ b/data/maps/the_bearer/rooms/Green Vegetable.txtpb

@@ -1,2 +1 @@
 name: "Green Vegetable"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Orange Planet.txtpb b/data/maps/the_bearer/rooms/Orange Planet.txtpb
index 0fbd929..15fae66 100644
--- a/data/maps/the_bearer/rooms/Orange Planet.txtpb
+++ b/data/maps/the_bearer/rooms/Orange Planet.txtpb

@@ -1,5 +1,4 @@
 name: "Orange Planet"
-display_name: "Main Area"
 panels {
  name: "MAR"
  path: "Panels/Red/panel_4"
diff --git a/data/maps/the_bearer/rooms/Orange Vegetable.txtpb b/data/maps/the_bearer/rooms/Orange Vegetable.txtpb
index d4f7b82..e4d59e6 100644
--- a/data/maps/the_bearer/rooms/Orange Vegetable.txtpb
+++ b/data/maps/the_bearer/rooms/Orange Vegetable.txtpb

@@ -1,5 +1,4 @@
 name: "Orange Vegetable"
-display_name: "Main Area"
 panels {
  name: "POTATO"
  path: "Panels/Red/panel_1"
diff --git a/data/maps/the_bearer/rooms/Overlook.txtpb b/data/maps/the_bearer/rooms/Overlook.txtpb
index 384802c..9eadf8f 100644
--- a/data/maps/the_bearer/rooms/Overlook.txtpb
+++ b/data/maps/the_bearer/rooms/Overlook.txtpb

@@ -1,2 +1 @@
 name: "Overlook"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Purple Animal (View).txtpb b/data/maps/the_bearer/rooms/Purple Animal (View).txtpb
index 7122059..04ae0f8 100644
--- a/data/maps/the_bearer/rooms/Purple Animal (View).txtpb
+++ b/data/maps/the_bearer/rooms/Purple Animal (View).txtpb

@@ -1,5 +1,4 @@
 name: "Purple Animal (View)"
-display_name: "Main Area"
 panels {
  name: "SUNBASS"
  path: "Panels/Purple/panel_2"
diff --git a/data/maps/the_bearer/rooms/Purple Animal.txtpb b/data/maps/the_bearer/rooms/Purple Animal.txtpb
index 9ddb70e..1c3a52c 100644
--- a/data/maps/the_bearer/rooms/Purple Animal.txtpb
+++ b/data/maps/the_bearer/rooms/Purple Animal.txtpb

@@ -1,2 +1 @@
 name: "Purple Animal"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Purple Planet (View).txtpb b/data/maps/the_bearer/rooms/Purple Planet (View).txtpb
index 4ab506d..bacfae6 100644
--- a/data/maps/the_bearer/rooms/Purple Planet (View).txtpb
+++ b/data/maps/the_bearer/rooms/Purple Planet (View).txtpb

@@ -1,5 +1,4 @@
 name: "Purple Planet (View)"
-display_name: "Main Area"
 panels {
  name: "DOG"
  path: "Panels/Purple/panel_4"
diff --git a/data/maps/the_bearer/rooms/Purple Planet.txtpb b/data/maps/the_bearer/rooms/Purple Planet.txtpb
index 37f7ddc..03021d5 100644
--- a/data/maps/the_bearer/rooms/Purple Planet.txtpb
+++ b/data/maps/the_bearer/rooms/Purple Planet.txtpb

@@ -1,2 +1 @@
 name: "Purple Planet"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Purple Town (View).txtpb b/data/maps/the_bearer/rooms/Purple Town (View).txtpb
index 40927f4..855e3ea 100644
--- a/data/maps/the_bearer/rooms/Purple Town (View).txtpb
+++ b/data/maps/the_bearer/rooms/Purple Town (View).txtpb

@@ -1,5 +1,4 @@
 name: "Purple Town (View)"
-display_name: "Main Area"
 panels {
  name: "GRACEFUL"
  path: "Panels/Purple/panel_3"
diff --git a/data/maps/the_bearer/rooms/Purple Town.txtpb b/data/maps/the_bearer/rooms/Purple Town.txtpb
index 768f378..b077178 100644
--- a/data/maps/the_bearer/rooms/Purple Town.txtpb
+++ b/data/maps/the_bearer/rooms/Purple Town.txtpb

@@ -1,2 +1 @@
 name: "Purple Town"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Purple Vegetable (View).txtpb b/data/maps/the_bearer/rooms/Purple Vegetable (View).txtpb
index 182a5bb..1a6ab04 100644
--- a/data/maps/the_bearer/rooms/Purple Vegetable (View).txtpb
+++ b/data/maps/the_bearer/rooms/Purple Vegetable (View).txtpb

@@ -1,5 +1,4 @@
 name: "Purple Vegetable (View)"
-display_name: "Main Area"
 panels {
  name: "AUBERGINE"
  path: "Panels/Purple/panel_1"
diff --git a/data/maps/the_bearer/rooms/Purple Vegetable.txtpb b/data/maps/the_bearer/rooms/Purple Vegetable.txtpb
index ef5dd7e..380b909 100644
--- a/data/maps/the_bearer/rooms/Purple Vegetable.txtpb
+++ b/data/maps/the_bearer/rooms/Purple Vegetable.txtpb

@@ -1,2 +1 @@
 name: "Purple Vegetable"
-display_name: "Main Area"
diff --git a/data/maps/the_bearer/rooms/Q2 Room.txtpb b/data/maps/the_bearer/rooms/Q2 Room.txtpb
index ab5032a..5cdea80 100644
--- a/data/maps/the_bearer/rooms/Q2 Room.txtpb
+++ b/data/maps/the_bearer/rooms/Q2 Room.txtpb

@@ -1,5 +1,4 @@
 name: "Q2 Room"
-display_name: "Back Area"
 letters {
  key: "q"
  level2: true
diff --git a/data/maps/the_bearer/rooms/Red Animal.txtpb b/data/maps/the_bearer/rooms/Red Animal.txtpb
index 845fbed..d5ae244 100644
--- a/data/maps/the_bearer/rooms/Red Animal.txtpb
+++ b/data/maps/the_bearer/rooms/Red Animal.txtpb

@@ -1,5 +1,4 @@
 name: "Red Animal"
-display_name: "Main Area"
 panels {
  name: "FOOLSHARK"
  path: "Panels/Orange/panel_2"
diff --git a/data/maps/the_bearer/rooms/Red Planet.txtpb b/data/maps/the_bearer/rooms/Red Planet.txtpb
index 55a105d..dd3f2ec 100644
--- a/data/maps/the_bearer/rooms/Red Planet.txtpb
+++ b/data/maps/the_bearer/rooms/Red Planet.txtpb

@@ -1,5 +1,4 @@
 name: "Red Planet"
-display_name: "Main Area"
 panels {
  name: "FUEL"
  path: "Panels/Red/panel_3"
diff --git a/data/maps/the_bearer/rooms/Red Town.txtpb b/data/maps/the_bearer/rooms/Red Town.txtpb
index 8a29ced..ed608cc 100644
--- a/data/maps/the_bearer/rooms/Red Town.txtpb
+++ b/data/maps/the_bearer/rooms/Red Town.txtpb

@@ -1,5 +1,4 @@
 name: "Red Town"
-display_name: "Main Area"
 panels {
  name: "DESTRUCTION"
  path: "Panels/Orange/panel_3"
diff --git a/data/maps/the_bearer/rooms/Red Vegetable.txtpb b/data/maps/the_bearer/rooms/Red Vegetable.txtpb
index 1494e26..fb694db 100644
--- a/data/maps/the_bearer/rooms/Red Vegetable.txtpb
+++ b/data/maps/the_bearer/rooms/Red Vegetable.txtpb

@@ -1,5 +1,4 @@
 name: "Red Vegetable"
-display_name: "Main Area"
 panels {
  name: "CARD"
  path: "Panels/Red/panel_2"
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..1b50ddd
--- /dev/null
+++ b/data/maps/the_bearer/rooms/Tree Entrance.txtpb

@@ -0,0 +1,8 @@
+name: "Tree Entrance"
+ports {
+  name: "TREE"
+  display_name: "Brown Hallway"
+  path: "Components/Warps/worldport3"
+  destination { x: -19 y: 0 z: -83.5 }
+  rotation: 180
+}
diff --git a/data/maps/the_bearer/rooms/Yellow Planet.txtpb b/data/maps/the_bearer/rooms/Yellow Planet.txtpb
index 9c6d39d..7f8a86b 100644
--- a/data/maps/the_bearer/rooms/Yellow Planet.txtpb
+++ b/data/maps/the_bearer/rooms/Yellow Planet.txtpb

@@ -1,5 +1,4 @@
 name: "Yellow Planet"
-display_name: "Main Area"
 panels {
  name: "ZEUS"
  path: "Panels/Orange/panel_4"
diff --git a/data/maps/the_bearer/rooms/Yellow Vegetable.txtpb b/data/maps/the_bearer/rooms/Yellow Vegetable.txtpb
index 26ef491..f37faa5 100644
--- a/data/maps/the_bearer/rooms/Yellow Vegetable.txtpb
+++ b/data/maps/the_bearer/rooms/Yellow Vegetable.txtpb

@@ -1,5 +1,4 @@
 name: "Yellow Vegetable"
-display_name: "Main Area"
 panels {
  name: "CAKE"
  path: "Panels/Orange/panel_1"