10 files changed, 565 insertions, 41 deletions

@@ -10,16 +10,12 @@
 # the_bearer/Back Area/DAEDALUS
 # the_between/Main Area/GREAT
 # the_between/Main Area/PLAZA
-# gallery -> between
 # the_between/Control Center Side/CC
 # the_between/Control Center Side/LIVELY
-# butterfly -> gallery
 # the_colorful/White Room/GREAT
 # the_colorful/Cyan Hallway/STURDY
 # the_digital/Main Area/UNYIELDING
 # the_digital/Tree Area/TREE
-# the_extravagant/Y Minus First Floor/GALLERY
-# the_extravagant/Engine Room/GALLERY
 connections {
   from {
     panel {
@@ -235,6 +231,22 @@ connections {
 connections {
   from {
     painting {
+      map: "the_gallery"
+      room: "Main Area"
+      name: "ENTRY"
+    }
+  }
+  to {
+    room {
+      map: "the_entry"
+      name: "Eye Room"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
       map: "the_bearer"
       room: "Butterfly"
       name: "BUTTERFLY"
@@ -346,3 +358,113 @@ connections {
     }
   }
 }
+connections {
+  from {
+    painting {
+      map: "the_gallery"
+      room: "Main Area"
+      name: "EXTRAVAGANT"
+    }
+  }
+  to {
+    painting {
+      map: "the_extravagant"
+      room: "Y Minus First Floor"
+      name: "GALLERY"
+    }
+  }
+}
+connections {
+  from {
+    port {
+      map: "the_extravagant"
+      room: "Engine Room"
+      name: "GALLERY"
+    }
+  }
+  to {
+    room {
+      map: "the_gallery"
+      name: "Main Area"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      map: "the_gallery"
+      room: "Main Area"
+      name: "BETWEEN"
+    }
+  }
+  to {
+    room {
+      map: "the_between"
+      name: "Main Area"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      map: "the_gallery"
+      room: "Main Area"
+      name: "BUTTERFLY"
+    }
+  }
+  to {
+    port {
+      map: "the_butterfly"
+      room: "Main Area"
+      name: "GALLERY"
+    }
+  }
+}
+connections {
+  from {
+    painting {
+      map: "the_gallery"
+      room: "Main Area"
+      name: "DARKROOM"
+    }
+  }
+  to {
+    room {
+      map: "the_darkroom"
+      name: "First Room"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      map: "the_gallery"
+      room: "Main Area"
+      name: "COLORFUL"
+    }
+  }
+  to {
+    room {
+      map: "the_colorful"
+      name: "White Room"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    painting {
+      map: "the_gallery"
+      room: "Main Area"
+      name: "ANCIENT"
+    }
+  }
+  to {
+    map: "the_ancient"
+    name: "Outside"
+  }
+  oneway: true
+}
@@ -67,41 +67,6 @@ doors {
   location_room: "Main Area"
 }
 doors {
-  name: "Gallery Painting"
-  type: ITEM_ONLY
-  # TODO: How does this door move the painting in the gallery?
-  panels { room: "Main Area" name: "SUN" }
-  panels { room: "Main Area" name: "KOI" }
-  panels { room: "Main Area" name: "SUN KOI" }
-  panels { room: "Main Area" name: "CHOP" }
-  panels { room: "Main Area" name: "YOU" }
-  panels { room: "Main Area" name: "PLOT" }
-  panels { room: "Main Area" name: "CHOP YOU PLOT" }
-  panels { room: "Main Area" name: "OUT" }
-  panels { room: "Main Area" name: "SEW" }
-  panels { room: "Main Area" name: "NEAR" }
-  panels { room: "Main Area" name: "OUT SEW NEAR" }
-  panels { room: "Main Area" name: "SHINE" }
-  panels { room: "Main Area" name: "CURTSY" }
-  panels { room: "Main Area" name: "SHINE CURTSY" }
-  panels { room: "Main Area" name: "NEW" }
-  panels { room: "Main Area" name: "DOLLARS" }
-  panels { room: "Main Area" name: "NEW DOLLARS" }
-  panels { room: "Main Area" name: "FOUR" }
-  panels { room: "Main Area" name: "CAUGHT" }
-  panels { room: "Main Area" name: "NET" }
-  panels { room: "Main Area" name: "FOUR CAUGHT NET" }
-  panels { room: "Main Area" name: "GREEN" }
-  panels { room: "Main Area" name: "THINK" }
-  panels { room: "Main Area" name: "LION" }
-  panels { room: "Main Area" name: "GREEN THINK LION" }
-  panels { room: "Main Area" name: "MOON" }
-  panels { room: "Main Area" name: "POWER" }
-  panels { room: "Main Area" name: "MOON POWER" }
-  panels { room: "Control Center Side" name: "RIGHT" }
-  complete_at: 1
-}
-doors {
   name: "Control Center Entrance"
   type: ITEM_ONLY
   receivers: "Components/Doors/entry_3"
@@ -307,8 +307,9 @@ doors {
 }
 doors {
   name: "Third Eye Painting"
-  type: STANDARD
-  move_paintings { room: "Eye Room" name: "GALLERY" }
+  type: LOCATION_ONLY
+  # move_paintings { room: "Eye Room" name: "GALLERY" }
+  # TODO: ummmm
   panels { room: "Eye Room" name: "I" }
   location_room: "Eye Room"
 }
\ No newline at end of file
@@ -0,0 +1,15 @@
+connections {
+  from_room: "Daedalus Extension"
+  to_room: "Main Area"
+  door { name: "Gallery Extension" }
+}
+connections {
+  from_room: "Main Area"
+  to_room: "Back Room"
+  door { name: "Back Door" }
+}
+connections {
+  from_room: "Back Room"
+  to_room: "Ending"
+  door { name: "Ending Door" }
+}
@@ -0,0 +1,189 @@
+# The Gallery is interesting because there's so many cross-map requirements.
+doors {
+  name: "Darkroom Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "DARKROOM" }
+  panels { map: "the_darkroom" room: "First Room" name: "BISON" }
+  panels { map: "the_darkroom" room: "First Room" name: "FISH" }
+  panels { map: "the_darkroom" room: "First Room" name: "SHEEP" }
+  panels { map: "the_darkroom" room: "First Room" name: "KOI" }
+  panels { map: "the_darkroom" room: "First Room" name: "TUNA" }
+  panels { map: "the_darkroom" room: "Second Room" name: "BISON" }
+  panels { map: "the_darkroom" room: "Second Room" name: "FISH" }
+  panels { map: "the_darkroom" room: "Second Room" name: "SHEEP" }
+  panels { map: "the_darkroom" room: "Second Room" name: "KOI" }
+  panels { map: "the_darkroom" room: "Second Room" name: "TUNA" }
+  panels { map: "the_darkroom" room: "Third Room" name: "CULTS" }
+  panels { map: "the_darkroom" room: "Third Room" name: "TURNS" }
+  panels { map: "the_darkroom" room: "Third Room" name: "COINS" }
+  panels { map: "the_darkroom" room: "Third Room" name: "INKS" }
+  panels { map: "the_darkroom" room: "Third Room" name: "KNOTS" }
+  panels { map: "the_darkroom" room: "Third Room" name: "LINKS" }
+  panels { map: "the_darkroom" room: "Third Room" name: "LOCKS" }
+  panels { map: "the_darkroom" room: "Third Room" name: "TOUCHES" }
+  panels { map: "the_darkroom" room: "Third Room" name: "KOI" }
+  complete_at: 1
+}
+doors {
+  name: "Butterfly Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "BUTTERFLY" }
+  required_room { map: "the_butterfly" name: "Main Area" }
+}
+doors {
+  name: "Between Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "BETWEEN" }
+  panels { map: "the_between" room: "Main Area" name: "SUN" }
+  panels { map: "the_between" room: "Main Area" name: "KOI" }
+  panels { map: "the_between" room: "Main Area" name: "SUN KOI" }
+  panels { map: "the_between" room: "Main Area" name: "CHOP" }
+  panels { map: "the_between" room: "Main Area" name: "YOU" }
+  panels { map: "the_between" room: "Main Area" name: "PLOT" }
+  panels { map: "the_between" room: "Main Area" name: "CHOP YOU PLOT" }
+  panels { map: "the_between" room: "Main Area" name: "OUT" }
+  panels { map: "the_between" room: "Main Area" name: "SEW" }
+  panels { map: "the_between" room: "Main Area" name: "NEAR" }
+  panels { map: "the_between" room: "Main Area" name: "OUT SEW NEAR" }
+  panels { map: "the_between" room: "Main Area" name: "SHINE" }
+  panels { map: "the_between" room: "Main Area" name: "CURTSY" }
+  panels { map: "the_between" room: "Main Area" name: "SHINE CURTSY" }
+  panels { map: "the_between" room: "Main Area" name: "NEW" }
+  panels { map: "the_between" room: "Main Area" name: "DOLLARS" }
+  panels { map: "the_between" room: "Main Area" name: "NEW DOLLARS" }
+  panels { map: "the_between" room: "Main Area" name: "FOUR" }
+  panels { map: "the_between" room: "Main Area" name: "CAUGHT" }
+  panels { map: "the_between" room: "Main Area" name: "NET" }
+  panels { map: "the_between" room: "Main Area" name: "FOUR CAUGHT NET" }
+  panels { map: "the_between" room: "Main Area" name: "GREEN" }
+  panels { map: "the_between" room: "Main Area" name: "THINK" }
+  panels { map: "the_between" room: "Main Area" name: "LION" }
+  panels { map: "the_between" room: "Main Area" name: "GREEN THINK LION" }
+  panels { map: "the_between" room: "Main Area" name: "MOON" }
+  panels { map: "the_between" room: "Main Area" name: "POWER" }
+  panels { map: "the_between" room: "Main Area" name: "MOON POWER" }
+  panels { map: "the_between" room: "Control Center Side" name: "RIGHT" }
+  complete_at: 1
+}
+doors {
+  name: "Entry Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "ENTRY" }
+  panels { map: "the_entry" room: "Eye Room" name: "I" }
+}
+doors {
+  name: "Wise Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "WISE" }
+  # TODO: any panel in The Wise
+}
+doors {
+  name: "Tree Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "TREE" }
+  # TODO: any panel in The Tree
+}
+doors {
+  name: "Unyielding Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "UNYIELDING" }
+  # TODO: Enter the room where the warp from The Digital is
+}
+doors {
+  name: "Graveyard Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "GRAVEYARD" }
+  # TODO: Enter The Graveyard
+}
+doors {
+  name: "Control Center Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "CC" }
+  # TODO: Collect M1 in The Impressive
+}
+doors {
+  name: "Tower Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "TOWER" }
+  # TODO: Enter The Tower
+}
+doors {
+  name: "Wondrous Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "WONDROUS" }
+  # TODO: any panel in The Wondrous
+}
+doors {
+  name: "Rainbow Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "RAINBOW" }
+  # TODO: Enter the room with the rainbow painting in Daedalus
+}
+doors {
+  name: "Words Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "WORDS" }
+  # TODO: Enter The Words
+}
+doors {
+  name: "Colorful Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "COLORFUL" }
+  required_room { map: "the_colorful" name: "White Room" }
+}
+doors {
+  name: "Castle Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "CASTLE" }
+  # TODO: Enter the castle in Daedalus
+}
+doors {
+  name: "Sun Temple Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "SUNTEMPLE" }
+  # TODO: Enter The Sun Temple
+}
+doors {
+  name: "Ancient Painting"
+  type: ITEM_ONLY
+  move_paintings { room: "Main Area" name: "ANCIENT" }
+  # TODO: Enter The Ancient
+}
+doors {
+  name: "Gallery Extension"
+  type: STANDARD
+  receivers: "Components/Doors/entry_2"
+  panels { room: "Daedalus Extension" name: "WHERE" }
+  location_room: "Daedalus Extension"
+}
+doors {
+  name: "Back Door"
+  type: EVENT
+  receivers: "Components/Doors/entry_1"
+  doors { name: "Darkroom Painting" }
+  doors { name: "Butterfly Painting" }
+  doors { name: "Between Painting" }
+  doors { name: "Entry Painting" }
+  doors { name: "Wise Painting" }
+  doors { name: "Tree Painting" }
+  doors { name: "Unyielding Painting" }
+  doors { name: "Graveyard Painting" }
+  doors { name: "Control Center Painting" }
+  doors { name: "Tower Painting" }
+  doors { name: "Wondrous Painting" }
+  doors { name: "Rainbow Painting" }
+  doors { name: "Words Painting" }
+  doors { name: "Colorful Painting" }
+  doors { name: "Castle Painting" }
+  doors { name: "Sun Temple Painting" }
+  doors { name: "Ancient Painting" }
+  doors { name: "Gallery Extension" }
+}
+doors {
+  name: "Ending Door"
+  type: STANDARD
+  receivers: "Components/Doors/entry_3"
+  panels { room: "Back Room" name: "UNYIELDING" }
+  panels { room: "Back Room" name: "TREE" }
+  location_room: "Back Room"
+}
@@ -0,0 +1,17 @@
+name: "Back Room"
+display_name: "Back Room"
+panels {
+  name: "UNYIELDING"
+  path: "Panels/entry_2"
+  clue: ""
+  answer: "jab"
+  symbols: "question"
+}
+panels {
+  name: "TREE"
+  path: "Panels/entry_3"
+  clue: ""
+  answer: "icy"
+  symbols: "question"
+}
+# Not sure whether the two paintings in here should be randomized, since they're hints.
@@ -0,0 +1,44 @@
+name: "Daedalus Extension"
+display_name: "Daedalus Extension"
+panels {
+  name: "WHERE"
+  path: "Panels/entry_1"
+  clue: "where"
+  answer: "question"
+  symbols: "example"
+}
+paintings {
+  name: "EYE"
+  path: "Components/Paintings/Daedalus/eyeRed"
+  orientation: "north"
+}
+paintings {
+  name: "PYRAMID"
+  path: "Components/Paintings/Daedalus/pyramid"
+  orientation: "west"
+}
+paintings {
+  name: "TOWER"
+  path: "Components/Paintings/Daedalus/tower"
+  orientation: "west"
+}
+paintings {
+  name: "GATE"
+  path: "Components/Paintings/Daedalus/gate"
+  orientation: "west"
+}
+paintings {
+  name: "PUMPKIN"
+  path: "Components/Paintings/Daedalus/pumpkin"
+  orientation: "east"
+}
+paintings {
+  name: "HOUSE"
+  path: "Components/Paintings/Daedalus/house"
+  orientation: "east"
+}
+paintings {
+  name: "SNAKE"
+  path: "Components/Paintings/Daedalus/snake"
+  orientation: "east"
+}
@@ -0,0 +1,3 @@
+name: "Ending"
+display_name: "Back Room"
+# TODO: Yellow Ending
@@ -0,0 +1,167 @@
+name: "Main Area"
+display_name: "Main Area"
+keyholders {
+  name: "P"
+  path: "Components/KeyHolders/keyHolderP"
+}
+paintings {
+  name: "OWL"
+  path: "Components/Paintings/Starting/owl"
+  orientation: "east"
+}
+paintings {
+  name: "EXTRAVAGANT"
+  path: "Components/Paintings/Starting/unless"
+  orientation: "west"
+}
+paintings {
+  name: "MAZE"
+  path: "Components/Paintings/Starting/spiral"
+  orientation: "north"
+}
+paintings {
+  name: "DARKROOM"
+  path: "Components/Paintings/darkroom"
+  orientation: "west"
+  move: true
+  enter_only: true
+  required_door { name: "Darkroom Painting" }
+}
+paintings {
+  name: "BUTTERFLY"
+  path: "Components/Paintings/butterfly"
+  orientation: "west"
+  move: true
+  enter_only: true
+  required_door { name: "Butterfly Painting" }
+}
+paintings {
+  name: "BETWEEN"
+  path: "Components/Paintings/between"
+  orientation: "east"
+  move: true
+  enter_only: true
+  required_door { name: "Between Painting" }
+}
+paintings {
+  name: "ENTRY"
+  path: "Components/Paintings/eyes"
+  orientation: "east"
+  move: true
+  enter_only: true
+  required_door { name: "Entry Painting" }
+}
+paintings {
+  name: "WISE"
+  path: "Components/Paintings/triangle"
+  orientation: "west"
+  move: true
+  enter_only: true
+  required_door { name: "Wise Painting" }
+}
+paintings {
+  name: "TREE"
+  path: "Components/Paintings/Clue Maps/tree"
+  orientation: "north"
+  move: true
+  enter_only: true
+  required_door { name: "Tree Painting" }
+}
+paintings {
+  name: "UNYIELDING"
+  path: "Components/Paintings/Clue Maps/unyielding"
+  orientation: "north"
+  move: true
+  enter_only: true
+  required_door { name: "Unyielding Painting" }
+}
+paintings {
+  name: "PARTHENON"
+  path: "Components/Paintings/Endings/parthenon"
+  orientation: "east"
+}
+paintings {
+  name: "GRAVEYARD"
+  path: "Components/Paintings/Endings/grave"
+  orientation: "south"
+  move: true
+  enter_only: true
+  required_door { name: "Graveyard Painting" }
+}
+paintings {
+  name: "CC"
+  path: "Components/Paintings/Endings/desert"
+  orientation: "south"
+  move: true
+  enter_only: true
+  required_door { name: "Control Center Painting" }
+}
+paintings {
+  name: "TOWER"
+  path: "Components/Paintings/Endings/red"
+  orientation: "north"
+  move: true
+  enter_only: true
+  required_door { name: "Tower Painting" }
+}
+paintings {
+  name: "WONDROUS"
+  path: "Components/Paintings/Endings/window"
+  orientation: "north"
+  move: true
+  enter_only: true
+  required_door { name: "Wondrous Painting" }
+}
+paintings {
+  name: "RAINBOW"
+  path: "Components/Paintings/Endings/rainbow"
+  orientation: "east"
+  move: true
+  enter_only: true
+  required_door { name: "Rainbow Painting" }
+}
+paintings {
+  name: "WORDS"
+  path: "Components/Paintings/Endings/words"
+  orientation: "west"
+  move: true
+  enter_only: true
+  required_door { name: "Words Painting" }
+}
+paintings {
+  name: "COLORFUL"
+  path: "Components/Paintings/Endings/colorful"
+  orientation: "north"
+  move: true
+  enter_only: true
+  required_door { name: "Colorful Painting" }
+}
+paintings {
+  name: "CASTLE"
+  path: "Components/Paintings/Endings/castle"
+  orientation: "south"
+  move: true
+  enter_only: true
+  required_door { name: "Castle Painting" }
+}
+paintings {
+  name: "SUNTEMPLE"
+  path: "Components/Paintings/Endings/temple"
+  orientation: "east"
+  move: true
+  enter_only: true
+  required_door { name: "Sun Temple Painting" }
+}
+paintings {
+  name: "ANCIENT"
+  path: "Components/Paintings/Endings/cubes"
+  orientation: "west"
+  move: true
+  enter_only: true
+  required_door { name: "Ancient Painting" }
+}
+ports {
+  name: "ENTRY"
+  path: "Components/Warps/worldport"
+  orientation: "west"
+}
@@ -85,6 +85,7 @@ message HumanDoor {
   repeated string switches = 7;
   repeated KeyholderIdentifier keyholders = 10;
   repeated RoomIdentifier rooms = 11;
+  repeated DoorIdentifier doors = 12;
 
   optional DoorType type = 4;
   optional string location_room = 5;