11 files changed, 74 insertions, 18 deletions

@@ -15,6 +15,8 @@ doors {
 doors {
   name: "Hidden Door"
   type: EVENT
+  latch: true
+  receivers: "Components/Doors/entry_12"
   keyholders { room: "Main Area" name: "1" key: "h" }
   keyholders { room: "Main Area" name: "2" key: "i" }
   keyholders { room: "Main Area" name: "3" key: "d" }
@@ -84,54 +86,49 @@ doors {
 doors {
   name: "White Ending Door"
   type: EVENT
-  # This is the only time a door depends on endings. However, it's nice to do it
-  # this way instead of just checking for ending room access because this lets
-  # us use events, which makes the playthrough more readable.
-  endings: "MINT"
-  endings: "ORANGE"
-  endings: "GREEN"
-  endings: "GRAY"
-  endings: "PLUM"
-  endings: "YELLOW"
-  endings: "GOLD"
-  endings: "BLACK"
-  endings: "CYAN"
-  endings: "PURPLE"
-  endings: "RED"
-  endings: "BLUE"
+  white_ending: true
 }
 doors {
   name: "Repetitive Entrance"
   type: STANDARD
+  latch: true
   receivers: "Components/Doors/entry_7"
   keyholders { room: "Main Area" name: "1" key: "m" }
   keyholders { room: "Main Area" name: "2" key: "o" }
   keyholders { room: "Main Area" name: "3" key: "r" }
   keyholders { room: "Main Area" name: "4" key: "e" }
   location_room: "Main Area"
+  location_name: "Keyword MORE"
 }
 doors {
   name: "Perceptive From Outside"
-  type: EVENT
+  type: STANDARD
+  latch: true
+  receivers: "Components/Doors/entry_26"
   keyholders { room: "Main Area" name: "1" key: "p" }
   keyholders { room: "Main Area" name: "2" key: "a" }
   keyholders { room: "Main Area" name: "3" key: "r" }
   keyholders { room: "Main Area" name: "4" key: "t" }
+  location_room: "Main Area"
+  location_name: "Keyword PART"
 }
 doors {
   name: "Perceptive From Inside"
-  type: EVENT
+  type: LOCATION_ONLY
   panels { room: "Perceptive Entrance" name: "PART" }
+  location_room: "Perceptive Entrance"
 }
 doors {
   name: "Ancient Entrance"
   type: STANDARD
+  latch: true
   receivers: "Components/Doors/entry_20"
   keyholders { room: "Main Area" name: "1" key: "z" }
   keyholders { room: "Main Area" name: "2" key: "e" }
   keyholders { room: "Main Area" name: "3" key: "r" }
   keyholders { room: "Main Area" name: "4" key: "o" }
   location_room: "Main Area"
+  location_name: "Keyword ZERO"
 }
 doors {
   name: "Between Door"
@@ -168,3 +165,16 @@ doors {
   panels { room: "Unyielding Entrance" name: "SEEK" }
   location_room: "Unyielding Entrance"
 }
+doors {
+  name: "Near Perceptive Panel"
+  type: LOCATION_ONLY
+  panels { room: "Perceptive Entrance" name: "COLORS" }
+  location_room: "Perceptive Entrance"
+  location_name: "COLORS"
+}
+doors {
+  name: "Letters Panel"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "Letters" }
+  location_room: "Main Area"
+}
@@ -1,5 +1,12 @@
 name: "Ancient Entrance"
 ports {
   name: "ANCIENT"
+  display_name: "Ancient Entrance"
   path: "Components/Warps/worldport8"
+  destination { x: -27 y: 0 z: -34 }
+  rotation: 90
+  # This is because there's no port on the other side of the connection, so if
+  # this connection was removed and gallery paintings aren't shuffled then
+  # there'd be no way into The Ancient.
+  no_shuffle: true
 }
@@ -8,5 +8,8 @@ panels {
 }
 ports {
   name: "BETWEEN"
+  display_name: "Between Connector"
   path: "Components/Warps/worldport5"
+  destination { x: 39 y: 0 z: -17 }
+  rotation: 270
 }
@@ -8,5 +8,8 @@ panels {
 }
 ports {
   name: "ENTRY"
+  display_name: "Entry Connector"
   path: "Components/Warps/worldport2"
+  destination { x: 26 y: 0 z: -16.5 }
+  rotation: 0
 }
@@ -8,5 +8,8 @@ panels {
 }
 ports {
   name: "GREAT"
+  display_name: "Main Entrance"
   path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: -1.5 }
+  rotation: 0
 }
@@ -30,37 +30,52 @@ panels {
 keyholders {
   name: "1"
   path: "Components/KeyHolders/keyHolder"
+  key: "z"
 }
 keyholders {
   name: "2"
   path: "Components/KeyHolders/keyHolder2"
+  key: "e"
 }
 keyholders {
   name: "3"
   path: "Components/KeyHolders/keyHolder3"
+  key: "r"
 }
 keyholders {
   name: "4"
   path: "Components/KeyHolders/keyHolder4"
+  key: "o"
 }
 ports {
   name: "RIGHT"
+  display_name: "Hinterlands South Entrance"
   path: "Components/Warps/worldport6"
+  destination { x: 82 y: 0 z: -10 }
+  rotation: 90
 }
 ports {
   name: "LEFT"
+  display_name: "Hinterlands North Entrance"
   path: "Components/Warps/worldport7"
-  # Check that this is correct.
+  destination { x: 82 y: 0 z: -48 }
+  rotation: 90
 }
 ports {
   name: "RELENTLESS_LEFT"
+  display_name: "Relentless LEFT Entrance"
   path: "Components/Warps/worldport9"
+  no_shuffle: true
 }
 ports {
   name: "RELENTLESS_SHOP"
+  display_name: "Relentless SHOP Entrance"
   path: "Components/Warps/worldport11"
+  no_shuffle: true
 }
 ports {
   name: "RELENTLESS_TURN"
+  display_name: "Relentless TURN Entrance"
   path: "Components/Warps/worldport10"
+  no_shuffle: true
 }
@@ -8,5 +8,8 @@ panels {
 }
 ports {
   name: "PARTIAL"
+  display_name: "Partial Connector"
   path: "Components/Warps/worldport4"
+  destination { x: 21 y: 0 z: -41 }
+  rotation: 270
 }
@@ -16,5 +16,8 @@ panels {
 }
 ports {
   name: "PERCEPTIVE"
+  display_name: "Perceptive Entrance"
   path: "Components/Warps/worldport12"
+  destination { x: -23 y: 0 z: -11 }
+  rotation: 0
 }
@@ -1,5 +1,8 @@
 name: "Repetitive Entrance"
 ports {
   name: "REPETITIVE"
+  display_name: "Repetitive Entrance"
   path: "Components/Warps/worldport14"
+  destination { x: -16 y: 0 z: -17.5 }
+  rotation: 0
 }
@@ -8,5 +8,8 @@ panels {
 }
 ports {
   name: "TENACIOUS"
+  display_name: "Tenacious Connector"
   path: "Components/Warps/worldport13"
+  destination { x: 56 y: 0 z: -38 }
+  rotation: 180
 }
@@ -8,5 +8,8 @@ panels {
 }
 ports {
   name: "UNKEMPT"
+  display_name: "Unkempt Connector"
   path: "Components/Warps/worldport3"
+  destination { x: 34 y: 0 z: -38.5 }
+  rotation: 90
 }