21 files changed, 60 insertions, 19 deletions

@@ -2,6 +2,7 @@ name: "Composite Room Entrance"
 panel_display_name: "Starting Room"
 ports {
   name: "COMPOSITE"
+  display_name: "Starting Room NE Worldport"
   path: "Components/Warps/worldport12"
   destination { x: 16 y: 0 z: -20 }
   rotation: 90
@@ -2,6 +2,7 @@ name: "Daedalus Entrance"
 panel_display_name: "Starting Room"
 ports {
   name: "DAEDALUS"
+  display_name: "Starting Room North Wall West Worldport"
   path: "Components/Warps/worldport6"
   destination { x: -16 y: 0 z: -20 }
   rotation: 270
@@ -2,6 +2,7 @@ name: "Digital Entrance"
 panel_display_name: "Starting Room"
 ports {
   name: "DIGITAL"
+  display_name: "Second Room Left Worldport"
   path: "Components/Warps/worldport"
   destination { x: -78 y: 0 z: -24 }
   rotation: 270
@@ -2,6 +2,7 @@ name: "Entry Exit"
 panel_display_name: "Starting Room"
 ports {
   name: "GREAT"
+  display_name: "Second Room Right Worldport"
   path: "Components/Warps/worldport2"
   destination { x: 18 y: 0 z: -36 }
   rotation: 180
@@ -31,6 +31,7 @@ paintings {
 }
 ports {
   name: "LIONIZED"
+  display_name: "Eye Room Worldport"
   path: "Components/Warps/worldport10"
   destination { x: 18 y: 0 z: -88.5 }
   rotation: 180
@@ -1,16 +1,6 @@
 name: "Flipped Pyramid Area"
 panel_display_name: "Pyramid Area"
-panels {
-  name: "TURN (1)"
-  path: "Panels/Entry/l_opener_3"
-  clue: "turn"
-  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
+# The fact that the doors here cover up the panels once they open is a problem
+# since you're not guaranteed to have access to the lower area if painting
+# shuffle is a thing. So we need to edit these doors so that they don't cover up
+# the panels.
@@ -1,8 +1,9 @@
 name: "Four Rooms Entrance"
 ports {
   name: "FOUR"
+  display_name: "Flipped Second Room Right Worldport"
   path: "Components/Warps/worldport9"
   destination { x: -41 y: 6 z: -17.5 }
   rotation: 0
-  gravity: Y_PLUS
+  # This isn't actually Y_PLUS gravity! A nearby warp sneakily flips you.
 }
@@ -9,6 +9,7 @@ panels {
 }
 ports {
   name: "GALLERY"
+  display_name: "Gallery Return"
   path: "Components/Warps/worldport4"
   destination { x: -38 y: 0 z: 8.5 }
   rotation: 180
@@ -72,6 +72,7 @@ panels {
 }
 ports {
   name: "DARKROOM"
+  display_name: "Near L1 Worldport"
   path: "Components/Warps/worldport5"
   destination { x: 43 y: 0 z: -10 }
   rotation: 0
@@ -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
+}
@@ -1,6 +1,7 @@
 name: "Liberated Entrance"
 ports {
   name: "BLUE"
+  display_name: "Pyramid Area Blue Worldport"
   path: "worldport8"
   destination { x: 18 y: 0 z: 55 }
   rotation: 270
@@ -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
+}
@@ -1,6 +1,7 @@
 name: "Literate Entrance"
 ports {
   name: "BROWN"
+  display_name: "Pyramid Area Brown Worldport"
   path: "worldport9"
   destination { x: 39 y: 0 z: 55 }
   rotation: 90
@@ -9,6 +9,7 @@ panels {
 }
 ports {
   name: "PARTHENON"
+  display_name: "Parthenon Return"
   path: "Components/Warps/worldport8"
   destination { x: -5.5 y: 0 z: 18 }
   rotation: 180
@@ -1,13 +1,14 @@
 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"
   destination { x: 74 y: 0 z: -43 }
   rotation: 0
@@ -2,10 +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"
   destination { x: -20 y: 0 z: -16 }
   rotation: 180
-  # TODO: this is part of what makes the keyholder dependent connection from CC
-  # safe in vanilla doors
-  no_shuffle: true
 }
@@ -2,6 +2,7 @@ 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
@@ -9,6 +9,7 @@ panels {
 }
 ports {
   name: "SHOP"
+  display_name: "Shop Entrance"
   path: "Components/Warps/worldport13"
   destination { x: 18 y: 0 z: 49 }
   rotation: 90
@@ -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"
@@ -2,6 +2,7 @@ name: "White Hallway To Daedalus"
 panel_display_name: "Colored Doors Area"
 ports {
   name: "DAEDALUS"
+  display_name: "White Control Center Hallway"
   path: "Components/Warps/worldport11"
   destination { x: -45 y: 0 z: 24 }
   rotation: 270
@@ -6,6 +6,7 @@ letters {
 }
 ports {
   name: "CC"
+  display_name: "Near X1 Worldport"
   path: "Components/Warps/worldport3"
   destination { x: -12.5 y: 0 z: 60 }
   rotation: 270