34 files changed, 74 insertions, 67 deletions
diff --git a/data/maps/the_entry/rooms/Blue Alcove.txtpb b/data/maps/the_entry/rooms/Blue Alcove.txtpb
index 4c2c48c..3df58b9 100644
--- a/data/maps/the_entry/rooms/Blue Alcove.txtpb
+++ b/data/maps/the_entry/rooms/Blue Alcove.txtpb

@@ -1,5 +1,5 @@
 name: "Blue Alcove"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
  name: "BLUE"
  path: "Panels/Back Right/br_11"
diff --git a/data/maps/the_entry/rooms/Colored Doors Area.txtpb b/data/maps/the_entry/rooms/Colored Doors Area.txtpb
index 29e89b5..4767387 100644
--- a/data/maps/the_entry/rooms/Colored Doors Area.txtpb
+++ b/data/maps/the_entry/rooms/Colored Doors Area.txtpb

@@ -1,5 +1,5 @@
 name: "Colored Doors Area"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 panels {
  name: "OPEN"
  path: "Panels/Back Left/backleft_proxying_1"
diff --git a/data/maps/the_entry/rooms/Composite Room Entrance.txtpb b/data/maps/the_entry/rooms/Composite Room Entrance.txtpb
index 4c18625..b9a8098 100644
--- a/data/maps/the_entry/rooms/Composite Room Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Composite Room Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Composite Room Entrance"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
  name: "COMPOSITE"
  path: "Components/Warps/worldport12"
diff --git a/data/maps/the_entry/rooms/Ctrl Tutorial.txtpb b/data/maps/the_entry/rooms/Ctrl Tutorial.txtpb
index 0819953..fabcd60 100644
--- a/data/maps/the_entry/rooms/Ctrl Tutorial.txtpb
+++ b/data/maps/the_entry/rooms/Ctrl Tutorial.txtpb

@@ -1,5 +1,5 @@
 name: "Ctrl Tutorial"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 panels {
  name: "RIGHT"
  path: "Panels/Back Left/backleft_proxying_2"
diff --git a/data/maps/the_entry/rooms/D Room Final.txtpb b/data/maps/the_entry/rooms/D Room Final.txtpb
index 960cb1c..bb8ee87 100644
--- a/data/maps/the_entry/rooms/D Room Final.txtpb
+++ b/data/maps/the_entry/rooms/D Room Final.txtpb

@@ -1,5 +1,5 @@
 name: "D Room Final"
-display_name: "D Room"
+panel_display_name: "D Room"
 letters {
  key: "d"
  path: "Components/Collectables/d"
diff --git a/data/maps/the_entry/rooms/D Room.txtpb b/data/maps/the_entry/rooms/D Room.txtpb
index 27a975b..fdf6846 100644
--- a/data/maps/the_entry/rooms/D Room.txtpb
+++ b/data/maps/the_entry/rooms/D Room.txtpb

@@ -1,5 +1,5 @@
 name: "D Room"
-display_name: "D Room"
+panel_display_name: "D Room"
 panels {
  name: "BASEBALL"
  path: "Panels/D/d_2"
diff --git a/data/maps/the_entry/rooms/Daedalus Entrance.txtpb b/data/maps/the_entry/rooms/Daedalus Entrance.txtpb
index 60b41cb..db9b78a 100644
--- a/data/maps/the_entry/rooms/Daedalus Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Daedalus Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Daedalus Entrance"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
  name: "DAEDALUS"
  path: "Components/Warps/worldport6"
diff --git a/data/maps/the_entry/rooms/Digital Entrance.txtpb b/data/maps/the_entry/rooms/Digital Entrance.txtpb
index 5713a8d..dd8b5f4 100644
--- a/data/maps/the_entry/rooms/Digital Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Digital Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Digital Entrance"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
  name: "DIGITAL"
  path: "Components/Warps/worldport"
diff --git a/data/maps/the_entry/rooms/Entry Exit.txtpb b/data/maps/the_entry/rooms/Entry Exit.txtpb
index 6b4fadd..b5d75aa 100644
--- a/data/maps/the_entry/rooms/Entry Exit.txtpb
+++ b/data/maps/the_entry/rooms/Entry Exit.txtpb

@@ -1,5 +1,5 @@
 name: "Entry Exit"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
  name: "GREAT"
  path: "Components/Warps/worldport2"
diff --git a/data/maps/the_entry/rooms/Eye Room.txtpb b/data/maps/the_entry/rooms/Eye Room.txtpb
index 8c6290b..da17163 100644
--- a/data/maps/the_entry/rooms/Eye Room.txtpb
+++ b/data/maps/the_entry/rooms/Eye Room.txtpb

@@ -1,5 +1,5 @@
 name: "Eye Room"
-display_name: "Eye Room"
+panel_display_name: "Eye Room"
 panels {
  name: "I"
  path: "Panels/Entry/eyes_1"
diff --git a/data/maps/the_entry/rooms/Flipped Link Area.txtpb b/data/maps/the_entry/rooms/Flipped Link Area.txtpb
index 5251023..950e9b1 100644
--- a/data/maps/the_entry/rooms/Flipped Link Area.txtpb
+++ b/data/maps/the_entry/rooms/Flipped Link Area.txtpb

@@ -1,18 +1,19 @@
 name: "Flipped Link Area"
-display_name: "Pyramid Area"
+panel_display_name: "Pyramid Area"
 panels {
  name: "WANDER"
  path: "Panels/Pilgrimage/cream_4"
  clue: "wander"
  answer: "roam"
  symbols: SUN
+  display_name: "WANDER (Flipped)"
 }
 paintings {
  name: "NEAR"
  path: "Components/Paintings/aches2"
  orientation: "north"
  gravity: Y_PLUS
-  display_name: "Flipper Near Painting"
+  display_name: "Flipped Near Painting"
 }
 paintings {
  name: "FAR"
diff --git a/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb b/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb
index e2dd992..c0be783 100644
--- a/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb
+++ b/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb

@@ -1,5 +1,5 @@
 name: "Flipped Pyramid Area"
-display_name: "Pyramid Area"
+panel_display_name: "Pyramid Area"
 panels {
  name: "TURN (1)"
  path: "Panels/Entry/l_opener_3"
diff --git a/data/maps/the_entry/rooms/Flipped Right Eye.txtpb b/data/maps/the_entry/rooms/Flipped Right Eye.txtpb
index 429d63e..14f3f5a 100644
--- a/data/maps/the_entry/rooms/Flipped Right Eye.txtpb
+++ b/data/maps/the_entry/rooms/Flipped Right Eye.txtpb

@@ -1,5 +1,5 @@
 name: "Flipped Right Eye"
-display_name: "Flip Area"
+panel_display_name: "Flip Area"
 panels {
  name: "WHERE"
  path: "Panels/Pilgrimage/cream_5"
diff --git a/data/maps/the_entry/rooms/Flipped Second Room.txtpb b/data/maps/the_entry/rooms/Flipped Second Room.txtpb
index d4ee780..0d518bb 100644
--- a/data/maps/the_entry/rooms/Flipped Second Room.txtpb
+++ b/data/maps/the_entry/rooms/Flipped Second Room.txtpb

@@ -1,5 +1,5 @@
 name: "Flipped Second Room"
-display_name: "Flip Area"
+panel_display_name: "Flip Area"
 panels {
  name: "CLUE"
  path: "Panels/Entry/second_right_top"
@@ -21,10 +21,3 @@ paintings {
  gravity: Y_PLUS
  display_name: "Eye Painting"
 }
-ports {
-  name: "FOUR"
-  path: "Components/Warps/worldport9"
-  orientation: "south"
-  gravity: Y_PLUS
-  required_door { name: "Flipped Second Room Right Door" }
-}
-\ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb
new file mode 100644
index 0000000..689d23e
--- /dev/null
+++ b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb

@@ -0,0 +1,7 @@
+name: "Four Rooms Entrance"
+ports {
+  name: "FOUR"
+  path: "Components/Warps/worldport9"
+  orientation: "south"
+  gravity: Y_PLUS
+}
diff --git a/data/maps/the_entry/rooms/Gallery Return.txtpb b/data/maps/the_entry/rooms/Gallery Return.txtpb
index 1273928..987a3ca 100644
--- a/data/maps/the_entry/rooms/Gallery Return.txtpb
+++ b/data/maps/the_entry/rooms/Gallery Return.txtpb

@@ -1,5 +1,5 @@
 name: "Gallery Return"
-display_name: "Starting Room"
+panel_display_name: "Gallery Return"
 panels {
  name: "RETURN"
  path: "Panels/Entry/gallery_return"
diff --git a/data/maps/the_entry/rooms/Least Blue Last.txtpb b/data/maps/the_entry/rooms/Least Blue Last.txtpb
index 0f198b7..adbe545 100644
--- a/data/maps/the_entry/rooms/Least Blue Last.txtpb
+++ b/data/maps/the_entry/rooms/Least Blue Last.txtpb

@@ -1,5 +1,5 @@
 name: "Least Blue Last"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
  name: "CAPABLE (1)"
  path: "Panels/LBL/lbl_1"
diff --git a/data/maps/the_entry/rooms/Liberated Entrance.txtpb b/data/maps/the_entry/rooms/Liberated Entrance.txtpb
new file mode 100644
index 0000000..f0176a0
--- /dev/null
+++ b/data/maps/the_entry/rooms/Liberated Entrance.txtpb

@@ -0,0 +1,6 @@
+name: "Liberated Entrance"
+ports {
+  name: "BLUE"
+  path: "worldport8"
+  orientation: "west"
+}
diff --git a/data/maps/the_entry/rooms/Lime Room.txtpb b/data/maps/the_entry/rooms/Lime Room.txtpb
index 6054dd7..e94f775 100644
--- a/data/maps/the_entry/rooms/Lime Room.txtpb
+++ b/data/maps/the_entry/rooms/Lime Room.txtpb

@@ -1,5 +1,5 @@
 name: "Lime Room"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 panels {
  name: "HIDE"
  path: "Panels/Back Left/backleft_proxying_3"
diff --git a/data/maps/the_entry/rooms/Link Area.txtpb b/data/maps/the_entry/rooms/Link Area.txtpb
index 2866abd..5b68279 100644
--- a/data/maps/the_entry/rooms/Link Area.txtpb
+++ b/data/maps/the_entry/rooms/Link Area.txtpb

@@ -1,11 +1,12 @@
 name: "Link Area"
-display_name: "Pyramid Area"
+panel_display_name: "Pyramid Area"
 panels {
  name: "WANDER"
  path: "Panels/Pilgrimage/cream_3"
  clue: "wander"
  answer: "amble"
  symbols: SUN
+  display_name: "WANDER (Obverse)"
 }
 paintings {
  name: "NEAR"
@@ -25,15 +26,3 @@ paintings {
  orientation: "south"
  display_name: "Center Painting"
 }
-ports {
-  name: "BLUE"
-  path: "worldport8"
-  orientation: "west"
-  required_door { name: "Liberated Entrance" }
-}
-ports {
-  name: "BROWN"
-  path: "worldport9"
-  orientation: "east"
-  required_door { name: "Literate Entrance" }
-}
-\ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Literate Entrance.txtpb b/data/maps/the_entry/rooms/Literate Entrance.txtpb
new file mode 100644
index 0000000..4ec402f
--- /dev/null
+++ b/data/maps/the_entry/rooms/Literate Entrance.txtpb

@@ -0,0 +1,6 @@
+name: "Literate Entrance"
+ports {
+  name: "BROWN"
+  path: "worldport9"
+  orientation: "east"
+}
diff --git a/data/maps/the_entry/rooms/Parthenon Return.txtpb b/data/maps/the_entry/rooms/Parthenon Return.txtpb
index 5a7f6b8..4776d11 100644
--- a/data/maps/the_entry/rooms/Parthenon Return.txtpb
+++ b/data/maps/the_entry/rooms/Parthenon Return.txtpb

@@ -1,5 +1,5 @@
 name: "Parthenon Return"
-display_name: "Starting Room"
+panel_display_name: "Parthenon Return"
 panels {
  name: "RETURN"
  path: "Panels/Back Left/backleft_return"
diff --git a/data/maps/the_entry/rooms/Rabbit Hole Lock.txtpb b/data/maps/the_entry/rooms/Rabbit Hole Lock.txtpb
new file mode 100644
index 0000000..78b4f3b
--- /dev/null
+++ b/data/maps/the_entry/rooms/Rabbit Hole Lock.txtpb

@@ -0,0 +1,18 @@
+name: "Rabbit Hole Lock"
+panel_display_name: "Red Blue Area"
+panels {
+  name: "RABBIT"
+  path: "Panels/Back Right/br_4"
+  clue: "rabbit"
+  answer: "hair"
+  symbols: SUN
+  symbols: ZERO
+}
+panels {
+  name: "HOLE"
+  path: "Panels/Back Right/br_5"
+  clue: "hole"
+  answer: "part"
+  symbols: ZERO
+  symbols: BOXES
+}
diff --git a/data/maps/the_entry/rooms/Rabbit Hole.txtpb b/data/maps/the_entry/rooms/Rabbit Hole.txtpb
index 9b18bc8..520d513 100644
--- a/data/maps/the_entry/rooms/Rabbit Hole.txtpb
+++ b/data/maps/the_entry/rooms/Rabbit Hole.txtpb

@@ -1,5 +1,5 @@
 name: "Rabbit Hole"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
  name: "PUZZLE"
  path: "Panels/Back Right/br_6"
diff --git a/data/maps/the_entry/rooms/Red Alcove.txtpb b/data/maps/the_entry/rooms/Red Alcove.txtpb
index 5c4085e..503b4a9 100644
--- a/data/maps/the_entry/rooms/Red Alcove.txtpb
+++ b/data/maps/the_entry/rooms/Red Alcove.txtpb

@@ -1,5 +1,5 @@
 name: "Red Alcove"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
  name: "BROW"
  path: "Panels/Back Right/br_10"
diff --git a/data/maps/the_entry/rooms/Red Blue Halls.txtpb b/data/maps/the_entry/rooms/Red Blue Halls.txtpb
index 7d07f9e..789ca42 100644
--- a/data/maps/the_entry/rooms/Red Blue Halls.txtpb
+++ b/data/maps/the_entry/rooms/Red Blue Halls.txtpb

@@ -1,5 +1,5 @@
 name: "Red Blue Halls"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
 panels {
  name: "CENTER"
  path: "Panels/Back Right/br_1"
diff --git a/data/maps/the_entry/rooms/Repetitive Entrance.txtpb b/data/maps/the_entry/rooms/Repetitive Entrance.txtpb
index 982e3f3..04ddcf3 100644
--- a/data/maps/the_entry/rooms/Repetitive Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Repetitive Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Repetitive Entrance"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 ports {
  name: "REPETITIVE"
  path: "Components/Warps/worldport7"
diff --git a/data/maps/the_entry/rooms/Right Eye.txtpb b/data/maps/the_entry/rooms/Right Eye.txtpb
index 1c7bf68..8f6c431 100644
--- a/data/maps/the_entry/rooms/Right Eye.txtpb
+++ b/data/maps/the_entry/rooms/Right Eye.txtpb

@@ -1,5 +1,5 @@
 name: "Right Eye"
-display_name: "Right Eye Area"
+panel_display_name: "Right Eye Area"
 panels {
  name: "EYE"
  path: "Panels/Entry/front_2"
diff --git a/data/maps/the_entry/rooms/Shop Entrance.txtpb b/data/maps/the_entry/rooms/Shop Entrance.txtpb
index b52cde7..67aa6de 100644
--- a/data/maps/the_entry/rooms/Shop Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Shop Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Shop Entrance"
-display_name: "Starting Room"
+panel_display_name: "Shop Entrance"
 panels {
  name: "TURN"
  path: "Panels/Entry/l_opener_2"
diff --git a/data/maps/the_entry/rooms/Starting Room.txtpb b/data/maps/the_entry/rooms/Starting Room.txtpb
index aeb66ab..8e8373b 100644
--- a/data/maps/the_entry/rooms/Starting Room.txtpb
+++ b/data/maps/the_entry/rooms/Starting Room.txtpb

@@ -1,10 +1,11 @@
 name: "Starting Room"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 panels {
  name: "HI"
  path: "Panels/Entry/entry_proxying_1"
  clue: "hi"
  answer: "hi"
+  proxies { answer: "hi" path: "Panels/Entry/entry_proxied_1" }
  proxies { answer: "bye" path: "Panels/Entry/entry_proxied_2" }
  proxies { answer: "hidden" path: "Panels/Entry/entry_proxied_5" }
  proxies { answer: "high" path: "Panels/Entry/entry_proxied_3" }
@@ -23,7 +24,9 @@ panels {
  path: "Panels/Entry/front_1"
  clue: "eye"
  answer: "i"
-  symbols: ZERO
+  #symbols: ZERO
+  # This panel blocks getting N1 and T1. We will mod it to be I/I with no symbol
+  # when symbol shuffle is on.
 }
 panels {
  name: "HINT"
diff --git a/data/maps/the_entry/rooms/Trick Room.txtpb b/data/maps/the_entry/rooms/Trick Room.txtpb
index ff9be38..d20502e 100644
--- a/data/maps/the_entry/rooms/Trick Room.txtpb
+++ b/data/maps/the_entry/rooms/Trick Room.txtpb

@@ -1,5 +1,5 @@
 name: "Trick Room"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 panels {
  name: "INK"
  path: "Panels/Entry/l_opener_1"
diff --git a/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb b/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb
index bf1398d..ce35e5b 100644
--- a/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb
+++ b/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb

@@ -1,5 +1,5 @@
 name: "White Hallway To Daedalus"
-display_name: "Colored Doors Area"
+panel_display_name: "Colored Doors Area"
 ports {
  name: "DAEDALUS"
  path: "Components/Warps/worldport11"
diff --git a/data/maps/the_entry/rooms/Wrath Room.txtpb b/data/maps/the_entry/rooms/Wrath Room.txtpb
index 29bd1cb..903a0b7 100644
--- a/data/maps/the_entry/rooms/Wrath Room.txtpb
+++ b/data/maps/the_entry/rooms/Wrath Room.txtpb

@@ -1,21 +1,5 @@
 name: "Wrath Room"
-display_name: "Red Blue Area"
+panel_display_name: "Red Blue Area"
-panels {
-  name: "RABBIT"
-  path: "Panels/Back Right/br_4"
-  clue: "rabbit"
-  answer: "hair"
-  symbols: SUN
-  symbols: ZERO
-}
-panels {
-  name: "HOLE"
-  path: "Panels/Back Right/br_5"
-  clue: "hole"
-  answer: "part"
-  symbols: ZERO
-  symbols: BOXES
-}
 panels {
  name: "WREATH"
  path: "Panels/Back Right/br_17"
diff --git a/data/maps/the_entry/rooms/X Area.txtpb b/data/maps/the_entry/rooms/X Area.txtpb
index ada16f8..3f61c26 100644
--- a/data/maps/the_entry/rooms/X Area.txtpb
+++ b/data/maps/the_entry/rooms/X Area.txtpb

@@ -1,5 +1,5 @@
 name: "X Area"
-display_name: "Starting Room"
+panel_display_name: "Starting Room"
 letters {
  key: "x"
  path: "Components/Collectables/x"