22 files changed, 102 insertions, 40 deletions
diff --git a/data/maps/the_entry/rooms/Composite Room Entrance.txtpb b/data/maps/the_entry/rooms/Composite Room Entrance.txtpb
index b9a8098..ca9e7f4 100644
--- a/data/maps/the_entry/rooms/Composite Room Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Composite Room Entrance.txtpb

@@ -2,6 +2,8 @@ name: "Composite Room Entrance"
 panel_display_name: "Starting Room"
 ports {
  name: "COMPOSITE"
+  display_name: "Starting Room NE Worldport"
  path: "Components/Warps/worldport12"
-  orientation: "east"
+  destination { x: 16 y: 0 z: -20 }
+  rotation: 90
 }
diff --git a/data/maps/the_entry/rooms/Daedalus Entrance.txtpb b/data/maps/the_entry/rooms/Daedalus Entrance.txtpb
index db9b78a..76dc278 100644
--- a/data/maps/the_entry/rooms/Daedalus Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Daedalus Entrance.txtpb

@@ -2,6 +2,8 @@ name: "Daedalus Entrance"
 panel_display_name: "Starting Room"
 ports {
  name: "DAEDALUS"
+  display_name: "Starting Room North Wall West Worldport"
  path: "Components/Warps/worldport6"
-  orientation: "west"
+  destination { x: -16 y: 0 z: -20 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/Digital Entrance.txtpb b/data/maps/the_entry/rooms/Digital Entrance.txtpb
index dd8b5f4..b7689bd 100644
--- a/data/maps/the_entry/rooms/Digital Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Digital Entrance.txtpb

@@ -2,6 +2,8 @@ name: "Digital Entrance"
 panel_display_name: "Starting Room"
 ports {
  name: "DIGITAL"
+  display_name: "Second Room Left Worldport"
  path: "Components/Warps/worldport"
-  orientation: "west"
+  destination { x: -78 y: 0 z: -24 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/Entry Exit.txtpb b/data/maps/the_entry/rooms/Entry Exit.txtpb
index b5d75aa..e270bf8 100644
--- a/data/maps/the_entry/rooms/Entry Exit.txtpb
+++ b/data/maps/the_entry/rooms/Entry Exit.txtpb

@@ -2,6 +2,8 @@ name: "Entry Exit"
 panel_display_name: "Starting Room"
 ports {
  name: "GREAT"
+  display_name: "Second Room Right Worldport"
  path: "Components/Warps/worldport2"
-  orientation: "north"
+  destination { x: 18 y: 0 z: -36 }
+  rotation: 180
 }
diff --git a/data/maps/the_entry/rooms/Eye Room.txtpb b/data/maps/the_entry/rooms/Eye Room.txtpb
index da17163..00f2534 100644
--- a/data/maps/the_entry/rooms/Eye Room.txtpb
+++ b/data/maps/the_entry/rooms/Eye Room.txtpb

@@ -31,6 +31,8 @@ paintings {
 }
 ports {
  name: "LIONIZED"
+  display_name: "Eye Room Worldport"
  path: "Components/Warps/worldport10"
-  orientation: "north"
+  destination { x: 18 y: 0 z: -88.5 }
+  rotation: 180
 }
diff --git a/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb b/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb
index c0be783..30e737f 100644
--- a/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb
+++ b/data/maps/the_entry/rooms/Flipped Pyramid Area.txtpb

@@ -1,16 +1,6 @@
 name: "Flipped Pyramid Area"
 panel_display_name: "Pyramid Area"
-panels {
+# The fact that the doors here cover up the panels once they open is a problem
-  name: "TURN (1)"
+# since you're not guaranteed to have access to the lower area if painting
-  path: "Panels/Entry/l_opener_3"
+# shuffle is a thing. So we need to edit these doors so that they don't cover up
-  clue: "turn"
+# the panels.
-  answer: "flip"
-  symbols: SUN
-}
-panels {
-  name: "TURN (2)"
-  path: "Panels/Entry/l_opener_4"
-  clue: "turn"
-  answer: "spin"
-  symbols: SUN
-}
-\ 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
index 689d23e..d4650f0 100644
--- a/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb

@@ -1,7 +1,9 @@
 name: "Four Rooms Entrance"
 ports {
  name: "FOUR"
+  display_name: "Flipped Second Room Right Worldport"
  path: "Components/Warps/worldport9"
-  orientation: "south"
+  destination { x: -41 y: 6 z: -17.5 }
-  gravity: Y_PLUS
+  rotation: 0
+  # This isn't actually Y_PLUS gravity! A nearby warp sneakily flips you.
 }
diff --git a/data/maps/the_entry/rooms/Gallery Return.txtpb b/data/maps/the_entry/rooms/Gallery Return.txtpb
index 987a3ca..7235d80 100644
--- a/data/maps/the_entry/rooms/Gallery Return.txtpb
+++ b/data/maps/the_entry/rooms/Gallery Return.txtpb

@@ -9,6 +9,8 @@ panels {
 }
 ports {
  name: "GALLERY"
+  display_name: "Gallery Return"
  path: "Components/Warps/worldport4"
-  orientation: "north"
+  destination { x: -38 y: 0 z: 8.5 }
+  rotation: 180
 }
 \ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Least Blue Last.txtpb b/data/maps/the_entry/rooms/Least Blue Last.txtpb
index adbe545..dde203a 100644
--- a/data/maps/the_entry/rooms/Least Blue Last.txtpb
+++ b/data/maps/the_entry/rooms/Least Blue Last.txtpb

@@ -72,8 +72,10 @@ panels {
 }
 ports {
  name: "DARKROOM"
+  display_name: "Near L1 Worldport"
  path: "Components/Warps/worldport5"
-  orientation: "south"
+  destination { x: 43 y: 0 z: -10 }
+  rotation: 0
 }
 paintings {
  name: "PAINS"
diff --git a/data/maps/the_entry/rooms/Liberated Entrance Panel.txtpb b/data/maps/the_entry/rooms/Liberated Entrance Panel.txtpb
new file mode 100644
index 0000000..7c5ef71
--- /dev/null
+++ b/data/maps/the_entry/rooms/Liberated Entrance Panel.txtpb

@@ -0,0 +1,9 @@
+name: "Liberated Entrance Panel"
+panel_display_name: "Pyramid Area"
+panels {
+  name: "TURN (1)"
+  path: "Panels/Entry/l_opener_3"
+  clue: "turn"
+  answer: "flip"
+  symbols: SUN
+}
diff --git a/data/maps/the_entry/rooms/Liberated Entrance.txtpb b/data/maps/the_entry/rooms/Liberated Entrance.txtpb
index f0176a0..56cc597 100644
--- a/data/maps/the_entry/rooms/Liberated Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Liberated Entrance.txtpb

@@ -1,6 +1,8 @@
 name: "Liberated Entrance"
 ports {
  name: "BLUE"
+  display_name: "Pyramid Area Blue Worldport"
  path: "worldport8"
-  orientation: "west"
+  destination { x: 18 y: 0 z: 55 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/Lime Room.txtpb b/data/maps/the_entry/rooms/Lime Room.txtpb
index e94f775..603fbdc 100644
--- a/data/maps/the_entry/rooms/Lime Room.txtpb
+++ b/data/maps/the_entry/rooms/Lime Room.txtpb

@@ -19,9 +19,3 @@ panels {
  answer: "white"
  symbols: EXAMPLE
 }
-ports {
-  name: "REVITALIZED"
-  path: "worldport7"
-  orientation: "north"
-  required_door { name: "Revitalized Entrance" }
-}
-\ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Literate Entrance Panel.txtpb b/data/maps/the_entry/rooms/Literate Entrance Panel.txtpb
new file mode 100644
index 0000000..676598b
--- /dev/null
+++ b/data/maps/the_entry/rooms/Literate Entrance Panel.txtpb

@@ -0,0 +1,9 @@
+name: "Literate Entrance Panel"
+panel_display_name: "Pyramid Area"
+panels {
+  name: "TURN (2)"
+  path: "Panels/Entry/l_opener_4"
+  clue: "turn"
+  answer: "spin"
+  symbols: SUN
+}
diff --git a/data/maps/the_entry/rooms/Literate Entrance.txtpb b/data/maps/the_entry/rooms/Literate Entrance.txtpb
index 4ec402f..b86ac80 100644
--- a/data/maps/the_entry/rooms/Literate Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Literate Entrance.txtpb

@@ -1,6 +1,8 @@
 name: "Literate Entrance"
 ports {
  name: "BROWN"
+  display_name: "Pyramid Area Brown Worldport"
  path: "worldport9"
-  orientation: "east"
+  destination { x: 39 y: 0 z: 55 }
+  rotation: 90
 }
diff --git a/data/maps/the_entry/rooms/Parthenon Return.txtpb b/data/maps/the_entry/rooms/Parthenon Return.txtpb
index 4776d11..bb12964 100644
--- a/data/maps/the_entry/rooms/Parthenon Return.txtpb
+++ b/data/maps/the_entry/rooms/Parthenon Return.txtpb

@@ -9,6 +9,8 @@ panels {
 }
 ports {
  name: "PARTHENON"
+  display_name: "Parthenon Return"
  path: "Components/Warps/worldport8"
-  orientation: "north"
+  destination { x: -5.5 y: 0 z: 18 }
-}
-\ No newline at end of file
+  rotation: 180
+}
diff --git a/data/maps/the_entry/rooms/Rabbit Hole.txtpb b/data/maps/the_entry/rooms/Rabbit Hole.txtpb
index 520d513..4799fde 100644
--- a/data/maps/the_entry/rooms/Rabbit Hole.txtpb
+++ b/data/maps/the_entry/rooms/Rabbit Hole.txtpb

@@ -1,13 +1,15 @@
 name: "Rabbit Hole"
 panel_display_name: "Red Blue Area"
 panels {
-  name: "PUZZLE"
+  name: "Blank"
  path: "Panels/Back Right/br_6"
  clue: ""
  answer: "down"
 }
 ports {
  name: "HOLE"
+  display_name: "Rabbit Hole"
  path: "worldport4"
-  orientation: "down"
+  destination { x: 74 y: 0 z: -43 }
-}
-\ No newline at end of file
+  rotation: 0
+}
diff --git a/data/maps/the_entry/rooms/Repetitive Entrance.txtpb b/data/maps/the_entry/rooms/Repetitive Entrance.txtpb
index 04ddcf3..a83eea4 100644
--- a/data/maps/the_entry/rooms/Repetitive Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Repetitive Entrance.txtpb

@@ -2,6 +2,8 @@ name: "Repetitive Entrance"
 panel_display_name: "Starting Room"
 ports {
  name: "REPETITIVE"
+  display_name: "Starting Room West Wall North Worldport"
  path: "Components/Warps/worldport7"
-  orientation: "north"
+  destination { x: -20 y: 0 z: -16 }
+  rotation: 180
 }
diff --git a/data/maps/the_entry/rooms/Revitalized Entrance.txtpb b/data/maps/the_entry/rooms/Revitalized Entrance.txtpb
new file mode 100644
index 0000000..fb5e7e0
--- /dev/null
+++ b/data/maps/the_entry/rooms/Revitalized Entrance.txtpb

@@ -0,0 +1,9 @@
+name: "Revitalized Entrance"
+panel_display_name: "Colored Doors Area"
+ports {
+  name: "REVITALIZED"
+  display_name: "Plum Hallway"
+  path: "worldport7"
+  destination { x: -58 y: 0 z: 31.5 }
+  rotation: 180
+}
diff --git a/data/maps/the_entry/rooms/Shop Entrance.txtpb b/data/maps/the_entry/rooms/Shop Entrance.txtpb
index 67aa6de..4a99efa 100644
--- a/data/maps/the_entry/rooms/Shop Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Shop Entrance.txtpb

@@ -9,6 +9,8 @@ panels {
 }
 ports {
  name: "SHOP"
+  display_name: "Shop Entrance"
  path: "Components/Warps/worldport13"
-  orientation: "east"
+  destination { x: 18 y: 0 z: 49 }
+  rotation: 90
 }
 \ No newline at end of file
diff --git a/data/maps/the_entry/rooms/Starting Room.txtpb b/data/maps/the_entry/rooms/Starting Room.txtpb
index 8e8373b..d01d807 100644
--- a/data/maps/the_entry/rooms/Starting Room.txtpb
+++ b/data/maps/the_entry/rooms/Starting Room.txtpb

@@ -46,6 +46,25 @@ panels {
  clue: "than"
  answer: "than"
 }
+panels {
+  name: "Gift Maps"
+  # TODO: exclude from panelsanity
+  path: "Components/GiftMapEntrance/Panel"
+  clue: "player"
+  answer: ""
+  # The puzzle solution doesn't matter. We'll change it to the player's name
+  # for fun.
+  symbols: QUESTION
+  proxies { answer: "gongus" path: "Components/GiftMapEntrance/GongusPanel" }
+  proxies { answer: "hatkirby" path: "Components/GiftMapEntrance/HatkirbyPanel" }
+  proxies { answer: "icely" path: "Components/GiftMapEntrance/IcelyPanel" }
+  proxies { answer: "kirby" path: "Components/GiftMapEntrance/KirbyPanel" }
+  proxies { answer: "kiwi" path: "Components/GiftMapEntrance/KiwiPanel" }
+  proxies { answer: "q" path: "Components/GiftMapEntrance/QPanel" }
+  proxies { answer: "souvey" path: "Components/GiftMapEntrance/SouveyPanel" }
+  proxies { answer: "star" path: "Components/GiftMapEntrance/StarPanel" }
+  required_door { name: "Gift Maps Entrance" }
+}
 letters {
  key: "h"
  path: "Components/Collectables/h"
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 ce35e5b..de0cec2 100644
--- a/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb
+++ b/data/maps/the_entry/rooms/White Hallway To Daedalus.txtpb

@@ -2,6 +2,8 @@ name: "White Hallway To Daedalus"
 panel_display_name: "Colored Doors Area"
 ports {
  name: "DAEDALUS"
+  display_name: "White Control Center Hallway"
  path: "Components/Warps/worldport11"
-  orientation: "west"
+  destination { x: -45 y: 0 z: 24 }
+  rotation: 270
 }
diff --git a/data/maps/the_entry/rooms/X Area.txtpb b/data/maps/the_entry/rooms/X Area.txtpb
index 3f61c26..8388b4e 100644
--- a/data/maps/the_entry/rooms/X Area.txtpb
+++ b/data/maps/the_entry/rooms/X Area.txtpb

@@ -6,6 +6,8 @@ letters {
 }
 ports {
  name: "CC"
+  display_name: "Near X1 Worldport"
  path: "Components/Warps/worldport3"
-  orientation: "west"
+  destination { x: -12.5 y: 0 z: 60 }
+  rotation: 270
 }