16 files changed, 25 insertions, 30 deletions
diff --git a/data/maps/the_extravagant/connections.txtpb b/data/maps/the_extravagant/connections.txtpb
index 50b65d5..777b3a8 100644
--- a/data/maps/the_extravagant/connections.txtpb
+++ b/data/maps/the_extravagant/connections.txtpb

@@ -143,3 +143,8 @@ connections {
  }
  oneway: true
 }
+connections {
+  from_room: "Y Minus First Floor"
+  to_room: "E Room"
+  door { name: "E Door" }
+}
diff --git a/data/maps/the_extravagant/metadata.txtpb b/data/maps/the_extravagant/metadata.txtpb
new file mode 100644
index 0000000..0a35c90
--- /dev/null
+++ b/data/maps/the_extravagant/metadata.txtpb

@@ -0,0 +1,3 @@
+display_name: "The Extravagant"
+# This appears to be completely inaccessible.
+excluded_nodes: "Components/Warps/worldport"
diff --git a/data/maps/the_extravagant/rooms/E Room.txtpb b/data/maps/the_extravagant/rooms/E Room.txtpb
index 4b1f284..2f91764 100644
--- a/data/maps/the_extravagant/rooms/E Room.txtpb
+++ b/data/maps/the_extravagant/rooms/E Room.txtpb

@@ -1,5 +1,4 @@
 name: "E Room"
-display_name: "3"
 letters {
  key: "e"
  path: "Components/Collectables/e"
diff --git a/data/maps/the_extravagant/rooms/Engine Room.txtpb b/data/maps/the_extravagant/rooms/Engine Room.txtpb
index b724a65..3dcc437 100644
--- a/data/maps/the_extravagant/rooms/Engine Room.txtpb
+++ b/data/maps/the_extravagant/rooms/Engine Room.txtpb

@@ -1,18 +1,17 @@
 name: "Engine Room"
-display_name: "Engine Room"
 panels {
  name: "ENGINE"
  path: "Panels/panel_8"
  clue: "engine"
  answer: "train"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
  name: "CABOOSE"
  path: "Panels/panel_9"
  clue: "caboose"
  answer: "train"
-  symbols: "boxes"
+  symbols: BOXES
 }
 paintings {
  name: "UNDUE"
diff --git a/data/maps/the_extravagant/rooms/Hat Chamber.txtpb b/data/maps/the_extravagant/rooms/Hat Chamber.txtpb
index 62ac741..a100130 100644
--- a/data/maps/the_extravagant/rooms/Hat Chamber.txtpb
+++ b/data/maps/the_extravagant/rooms/Hat Chamber.txtpb

@@ -1,18 +1,17 @@
 name: "Hat Chamber"
-display_name: "3"
 panels {
  name: "BRIM"
  path: "Panels/panel_14"
  clue: "brim"
  answer: "hat"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
  name: "OUTFIT"
  path: "Panels/panel_15"
  clue: "outfit"
  answer: "hat"
-  symbols: "boxes"
+  symbols: BOXES
 }
 paintings {
  name: "UNDUE"
diff --git a/data/maps/the_extravagant/rooms/X Minus Middle Leg.txtpb b/data/maps/the_extravagant/rooms/X Minus Middle Leg.txtpb
index f1ecdb2..1455a4b 100644
--- a/data/maps/the_extravagant/rooms/X Minus Middle Leg.txtpb
+++ b/data/maps/the_extravagant/rooms/X Minus Middle Leg.txtpb

@@ -1,9 +1,8 @@
 name: "X Minus Middle Leg"
-display_name: "W"
 panels {
  name: "ANTENNA"
  path: "Panels/panel_7"
  clue: "antenna"
  answer: "ant"
-  symbols: "boxes"
+  symbols: BOXES
 }
diff --git a/data/maps/the_extravagant/rooms/X Minus Right Leg.txtpb b/data/maps/the_extravagant/rooms/X Minus Right Leg.txtpb
index 54fe1d4..ea45e10 100644
--- a/data/maps/the_extravagant/rooms/X Minus Right Leg.txtpb
+++ b/data/maps/the_extravagant/rooms/X Minus Right Leg.txtpb

@@ -1,9 +1,8 @@
 name: "X Minus Right Leg"
-display_name: "W"
 panels {
  name: "ROWBOAT"
  path: "Panels/panel_13"
  clue: "rowboat"
  answer: "oar"
-  symbols: "boxes"
+  symbols: BOXES
 }
diff --git a/data/maps/the_extravagant/rooms/X Minus.txtpb b/data/maps/the_extravagant/rooms/X Minus.txtpb
index 45847e1..92b15dc 100644
--- a/data/maps/the_extravagant/rooms/X Minus.txtpb
+++ b/data/maps/the_extravagant/rooms/X Minus.txtpb

@@ -1,11 +1,10 @@
 name: "X Minus"
-display_name: "W"
 panels {
  name: "DUO"
  path: "Panels/panel_1"
  clue: "duo"
  answer: "trio"
-  symbols: "boxes"
+  symbols: BOXES
 }
 paintings {
  name: "SMILE"
diff --git a/data/maps/the_extravagant/rooms/X Plus Middle Leg.txtpb b/data/maps/the_extravagant/rooms/X Plus Middle Leg.txtpb
index b117781..cb7cba6 100644
--- a/data/maps/the_extravagant/rooms/X Plus Middle Leg.txtpb
+++ b/data/maps/the_extravagant/rooms/X Plus Middle Leg.txtpb

@@ -1,9 +1,8 @@
 name: "X Plus Middle Leg"
-display_name: "M"
 panels {
  name: "COLONY"
  path: "Panels/panel_10"
  clue: "colony"
  answer: "ant"
-  symbols: "boxes"
+  symbols: BOXES
 }
diff --git a/data/maps/the_extravagant/rooms/X Plus Right Leg.txtpb b/data/maps/the_extravagant/rooms/X Plus Right Leg.txtpb
index 9b258fb..98dfad6 100644
--- a/data/maps/the_extravagant/rooms/X Plus Right Leg.txtpb
+++ b/data/maps/the_extravagant/rooms/X Plus Right Leg.txtpb

@@ -1,9 +1,8 @@
 name: "X Plus Right Leg"
-display_name: "M"
 panels {
  name: "HEAD"
  path: "Panels/panel_4"
  clue: "head"
  answer: "hair"
-  symbols: "boxes"
+  symbols: BOXES
 }
diff --git a/data/maps/the_extravagant/rooms/X Plus.txtpb b/data/maps/the_extravagant/rooms/X Plus.txtpb
index f8c08d0..a1c4b9d 100644
--- a/data/maps/the_extravagant/rooms/X Plus.txtpb
+++ b/data/maps/the_extravagant/rooms/X Plus.txtpb

@@ -1,11 +1,10 @@
 name: "X Plus"
-display_name: "M"
 panels {
  name: "ROSE"
  path: "Panels/panel_16"
  clue: "rose"
  answer: "thorn"
-  symbols: "boxes"
+  symbols: BOXES
 }
 paintings {
  name: "UNLESS"
@@ -24,4 +23,5 @@ paintings {
 keyholders {
  name: "M"
  path: "Components/KeyHolders/keyHolderM"
+  key: "m"
 }
diff --git a/data/maps/the_extravagant/rooms/Y Minus First Floor.txtpb b/data/maps/the_extravagant/rooms/Y Minus First Floor.txtpb
index fb674c0..f80d68a 100644
--- a/data/maps/the_extravagant/rooms/Y Minus First Floor.txtpb
+++ b/data/maps/the_extravagant/rooms/Y Minus First Floor.txtpb

@@ -1,18 +1,17 @@
 name: "Y Minus First Floor"
-display_name: "3"
 panels {
  name: "RHINO"
  path: "Panels/panel_2"
  clue: "rhino"
  answer: "horn"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
  name: "HORN"
  path: "Panels/panel_3"
  clue: "horn"
  answer: "rhino"
-  symbols: "boxes"
+  symbols: BOXES
 }
 paintings {
  name: "GALLERY"
diff --git a/data/maps/the_extravagant/rooms/Y Minus Second Floor.txtpb b/data/maps/the_extravagant/rooms/Y Minus Second Floor.txtpb
index 71c819f..34a3c9d 100644
--- a/data/maps/the_extravagant/rooms/Y Minus Second Floor.txtpb
+++ b/data/maps/the_extravagant/rooms/Y Minus Second Floor.txtpb

@@ -1,11 +1,10 @@
 name: "Y Minus Second Floor"
-display_name: "3"
 panels {
  name: "COMPASS"
  path: "Panels/panel_5"
  clue: "compass"
  answer: "north"
-  symbols: "boxes"
+  symbols: BOXES
 }
 paintings {
  name: "UNMORE"
diff --git a/data/maps/the_extravagant/rooms/Y Minus Third Floor.txtpb b/data/maps/the_extravagant/rooms/Y Minus Third Floor.txtpb
index f5ebe14..7aa5e1c 100644
--- a/data/maps/the_extravagant/rooms/Y Minus Third Floor.txtpb
+++ b/data/maps/the_extravagant/rooms/Y Minus Third Floor.txtpb

@@ -1,9 +1,8 @@
 name: "Y Minus Third Floor"
-display_name: "3"
 panels {
  name: "WHISKERS"
  path: "Panels/panel_11"
  clue: "whiskers"
  answer: "rat"
-  symbols: "boxes"
+  symbols: BOXES
 }
diff --git a/data/maps/the_extravagant/rooms/Y Plus First Floor.txtpb b/data/maps/the_extravagant/rooms/Y Plus First Floor.txtpb
index 9c8120c..6226aa6 100644
--- a/data/maps/the_extravagant/rooms/Y Plus First Floor.txtpb
+++ b/data/maps/the_extravagant/rooms/Y Plus First Floor.txtpb

@@ -1,5 +1,4 @@
 name: "Y Plus First Floor"
-display_name: "E"
 paintings {
  name: "UNDUE"
  path: "Components/Paintings/undue4"
diff --git a/data/maps/the_extravagant/rooms/Y Plus Third Floor.txtpb b/data/maps/the_extravagant/rooms/Y Plus Third Floor.txtpb
index 3fd845b..1cf0480 100644
--- a/data/maps/the_extravagant/rooms/Y Plus Third Floor.txtpb
+++ b/data/maps/the_extravagant/rooms/Y Plus Third Floor.txtpb

@@ -1,19 +1,18 @@
 name: "Y Plus Third Floor"
 # It's the second floor too...
-display_name: "E"
 panels {
  name: "CACTUS"
  path: "Panels/panel_6"
  clue: "cactus"
  answer: "thorn"
-  symbols: "boxes"
+  symbols: BOXES
 }
 panels {
  name: "TAIL"
  path: "Panels/panel_12"
  clue: "tail"
  answer: "rat"
-  symbols: "boxes"
+  symbols: BOXES
 }
 paintings {
  name: "UNMORE"