5 files changed, 30 insertions, 29 deletions

@@ -1,5 +1,4 @@
 name: "B Room"
-display_name: "Orb"
 letters {
   key: "b"
   path: "Components/Collectables/b"
@@ -10,19 +9,10 @@ paintings {
   # TODO: This is too high up to enter. It's also a hint painting.
   exit_only: true
 }
-# TODO: Should these two be independent for shuffling purposes, or always tied
-# to the Main Area's port?
-ports {
-  name: "MID"
-  path: "Components/Warps/worldport4"
-  orientation: "south"
-  # This port is in the room immediately after solving the B puzzles, which
-  # means it seems like it would be inaccessible if you enter the map from the
-  # painting or from the final port, but entering the O or R areas brings you
-  # back to the beginning.
-}
 ports {
   name: "FINAL"
+  display_name: "Final Worldport"
   path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: -69 y: 0 z: 87 }
+  rotation: 90
 }
@@ -1,91 +1,92 @@
 name: "Main Area"
-display_name: "Orb"
 panels {
   name: "STRIKE"
   path: "Panels/O/entry_1"
   clue: "strike"
   answer: "hit"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "METAL"
   path: "Panels/O/entry_2"
   clue: "metal"
   answer: "tin"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 panels {
   name: "HINT"
   path: "Panels/O/entry_3"
   clue: "hint"
   answer: "hit"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "THIN"
   path: "Panels/O/entry_4"
   clue: "thin"
   answer: "tin"
-  symbols: "sparkles"
+  symbols: SPARKLES
 }
 panels {
   name: "NARROW"
   path: "Panels/R/entry_5"
   clue: "narrow"
   answer: "thin"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "CLUE"
   path: "Panels/R/entry_6"
   clue: "clue"
   answer: "hint"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "IMPLY"
   path: "Panels/R/entry_7"
   clue: "imply"
   answer: "hint"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "THICK"
   path: "Panels/R/entry_8"
   clue: "thick"
   answer: "thin"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "MUSE"
   path: "Panels/B/entry_9"
   clue: "muse"
   answer: "think"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "ACT"
   path: "Panels/B/entry_10"
   clue: "act"
   answer: "think"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "SOUTH"
   path: "Panels/B/entry_11"
   clue: "south"
   answer: "north"
-  symbols: "sun"
+  symbols: SUN
 }
 panels {
   name: "EAST"
   path: "Panels/B/entry_12"
   clue: "east"
   answer: "north"
-  symbols: "example"
+  symbols: EXAMPLE
 }
 ports {
   name: "GREAT"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
-  orientation: "south"
+  destination { x: 38 y: 0 z: 39 }
+  rotation: 90
 }
@@ -0,0 +1,12 @@
+name: "Middle Room"
+# This is the room after solving the B puzzles but before getting to B1 itself.
+# It has to be a separate region because if you are shuffling worldports and you
+# warp to the B1 room port, you can't access this port if you're not able to
+# solve the B puzzles.
+ports {
+  name: "MID"
+  display_name: "Middle Worldport"
+  path: "Components/Warps/worldport4"
+  destination { x: -69 y: 0 z: 43 }
+  rotation: 90
+}
@@ -1,5 +1,4 @@
 name: "O Room"
-display_name: "Orb"
 letters {
   key: "o"
   path: "Components/Collectables/o"
@@ -1,5 +1,4 @@
 name: "R Room"
-display_name: "Orb"
 letters {
   key: "r"
   path: "Components/Collectables/r"