6 files changed, 49 insertions, 40 deletions
diff --git a/data/maps/the_gallery/doors.txtpb b/data/maps/the_gallery/doors.txtpb
index a7a5d85..e87e807 100644
--- a/data/maps/the_gallery/doors.txtpb
+++ b/data/maps/the_gallery/doors.txtpb

@@ -1,9 +1,9 @@
 # The Gallery is interesting because there's so many cross-map requirements.
 doors {
  name: "Darkroom Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "DARKROOM" }
-  receivers: "Components/Paintings/darkroom/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerDarkroom"
  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" }
@@ -27,16 +27,16 @@ doors {
 }
 doors {
  name: "Butterfly Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "BUTTERFLY" }
-  receivers: "Components/Paintings/butterfly/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerButterfly"
  rooms { map: "the_butterfly" name: "Main Area" }
 }
 doors {
  name: "Between Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "BETWEEN" }
-  receivers: "Components/Paintings/between/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerBetween"
  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" }
@@ -70,16 +70,16 @@ doors {
 }
 doors {
  name: "Entry Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "ENTRY" }
-  receivers: "Components/Paintings/eyes/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerEyes"
  panels { map: "the_entry" room: "Eye Room" name: "I" }
 }
 doors {
  name: "Wise Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "WISE" }
-  receivers: "Components/Paintings/triangle/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerTriangle"
  panels { map: "the_wise" room: "Entry" name: "INK" }
  panels { map: "the_wise" room: "Puzzles" name: "STORY" }
  panels { map: "the_wise" room: "Puzzles" name: "VENTURE" }
@@ -105,9 +105,9 @@ doors {
 }
 doors {
  name: "Tree Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "TREE" }
-  receivers: "Components/Paintings/Clue Maps/tree/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerTree"
  panels { map: "the_tree" room: "Main Area" name: "COLOR" }
  panels { map: "the_tree" room: "Main Area" name: "DAMAGE (1)" }
  panels { map: "the_tree" room: "Main Area" name: "DAMAGE (2)" }
@@ -142,37 +142,43 @@ doors {
 }
 doors {
  name: "Unyielding Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "UNYIELDING" }
-  receivers: "Components/Paintings/Clue Maps/unyielding/teleportListener"
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerUnyielding"
  rooms { map: "the_unyielding" name: "Digital Entrance" }
 }
 doors {
+  name: "Cyan Doors"
+  type: EVENT
+  receivers: "Components/Listeners/Hint Room/unlockReaderListenerDoubles"
+  double_letters: true
+}
+doors {
  name: "Graveyard Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "GRAVEYARD" }
-  receivers: "Components/Paintings/Endings/grave/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerGraveyard"
  rooms { map: "the_graveyard" name: "Outside" }
 }
 doors {
  name: "Control Center Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "CC" }
-  receivers: "Components/Paintings/Endings/desert/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerDesert"
  rooms { map: "the_impressive" name: "M2 Room" }
 }
 doors {
  name: "Tower Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "TOWER" }
-  receivers: "Components/Paintings/Endings/red/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerTower"
  rooms { map: "the_tower" name: "First Floor" }
 }
 doors {
  name: "Wondrous Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "WONDROUS" }
-  receivers: "Components/Paintings/Endings/window/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerWonderland"
  panels { map: "the_wondrous" room: "Entry" name: "WONDER" }
  panels { map: "the_wondrous" room: "Regular" name: "SHRINK" }
  panels { map: "the_wondrous" room: "Huge" name: "SHRINK" }
@@ -187,44 +193,44 @@ doors {
 }
 doors {
  name: "Rainbow Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "RAINBOW" }
-  receivers: "Components/Paintings/Endings/rainbow/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerRainbow"
  rooms { map: "daedalus" name: "Rainbow Start" }
 }
 doors {
  name: "Words Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "WORDS" }
-  receivers: "Components/Paintings/Endings/words/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerWords"
  rooms { map: "the_words" name: "Main Area" }
 }
 doors {
  name: "Colorful Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "COLORFUL" }
-  receivers: "Components/Paintings/Endings/colorful/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerColorful"
  rooms { map: "the_colorful" name: "White Room" }
 }
 doors {
  name: "Castle Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "CASTLE" }
-  receivers: "Components/Paintings/Endings/castle/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerCastle"
  rooms { map: "daedalus" name: "Castle" }
 }
 doors {
  name: "Sun Temple Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "SUNTEMPLE" }
-  receivers: "Components/Paintings/Endings/temple/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerTemple"
  rooms { map: "the_sun_temple" name: "Entrance" }
 }
 doors {
  name: "Ancient Painting"
-  type: ITEM_ONLY
+  type: GALLERY_PAINTING
  #move_paintings { room: "Main Area" name: "ANCIENT" }
-  receivers: "Components/Paintings/Endings/cubes/teleportListener"
+  receivers: "Components/Listeners/Endings/unlockReaderListenerQuartz"
  rooms { map: "the_ancient" name: "Outside" }
 }
 doors {
@@ -245,6 +251,7 @@ doors {
  doors { name: "Wise Painting" }
  doors { name: "Tree Painting" }
  doors { name: "Unyielding Painting" }
+  doors { name: "Cyan Doors" }
  doors { name: "Graveyard Painting" }
  doors { name: "Control Center Painting" }
  doors { name: "Tower Painting" }
@@ -255,7 +262,7 @@ doors {
  doors { name: "Castle Painting" }
  doors { name: "Sun Temple Painting" }
  doors { name: "Ancient Painting" }
-  doors { name: "Gallery Extension" }
+  panels { room: "Daedalus Extension" name: "WHERE" }
 }
 doors {
  name: "Ending Door"
diff --git a/data/maps/the_gallery/metadata.txtpb b/data/maps/the_gallery/metadata.txtpb
index 41ec36e..a1bbe25 100644
--- a/data/maps/the_gallery/metadata.txtpb
+++ b/data/maps/the_gallery/metadata.txtpb

@@ -1,4 +1,6 @@
 display_name: "The Gallery"
+rte_room: "Main Area"
+daedalus_only_mode: DAED_ONLY_PARTIAL
 # These are the eyes in the foyer, and aren't normal paintings.
 excluded_nodes: "Components/Paintings/Starting/eye"
 excluded_nodes: "Components/Paintings/Starting/eye2"
diff --git a/data/maps/the_gallery/rooms/Back Room.txtpb b/data/maps/the_gallery/rooms/Back Room.txtpb
index baf7270..74d5304 100644
--- a/data/maps/the_gallery/rooms/Back Room.txtpb
+++ b/data/maps/the_gallery/rooms/Back Room.txtpb

@@ -1,5 +1,4 @@
 name: "Back Room"
-display_name: "Back Room"
 panels {
  name: "UNYIELDING"
  path: "Panels/entry_2"
diff --git a/data/maps/the_gallery/rooms/Daedalus Extension.txtpb b/data/maps/the_gallery/rooms/Daedalus Extension.txtpb
index e525a2c..c3a72c2 100644
--- a/data/maps/the_gallery/rooms/Daedalus Extension.txtpb
+++ b/data/maps/the_gallery/rooms/Daedalus Extension.txtpb

@@ -1,5 +1,5 @@
 name: "Daedalus Extension"
-display_name: "Daedalus Extension"
+daedalus_only_allow: true
 panels {
  name: "WHERE"
  path: "Panels/entry_1"
diff --git a/data/maps/the_gallery/rooms/Ending.txtpb b/data/maps/the_gallery/rooms/Ending.txtpb
index 72c8e72..f713acc 100644
--- a/data/maps/the_gallery/rooms/Ending.txtpb
+++ b/data/maps/the_gallery/rooms/Ending.txtpb

@@ -1,5 +1,4 @@
 name: "Ending"
-display_name: "Back Room"
 endings {
  name: "YELLOW"
  path: "Components/Endings/yellow_ending"
diff --git a/data/maps/the_gallery/rooms/Main Area.txtpb b/data/maps/the_gallery/rooms/Main Area.txtpb
index a8fb3c6..e88dc48 100644
--- a/data/maps/the_gallery/rooms/Main Area.txtpb
+++ b/data/maps/the_gallery/rooms/Main Area.txtpb

@@ -1,8 +1,8 @@
 name: "Main Area"
-display_name: "Main Area"
 keyholders {
  name: "P"
  path: "Components/KeyHolders/keyHolderP"
+  key: "p"
 }
 paintings {
  name: "OWL"
@@ -162,6 +162,8 @@ paintings {
 }
 ports {
  name: "ENTRY"
+  display_name: "Entrance"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -3.5 y: 0 z: 16 }
+  rotation: 270
 }