7 files changed, 43 insertions, 19 deletions
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 4d94d5a..d4650f0 100644
--- a/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Four Rooms Entrance.txtpb

@@ -5,5 +5,5 @@ ports {
  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.
 }
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/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/Rabbit Hole.txtpb b/data/maps/the_entry/rooms/Rabbit Hole.txtpb
index 4ffeb84..4799fde 100644
--- a/data/maps/the_entry/rooms/Rabbit Hole.txtpb
+++ b/data/maps/the_entry/rooms/Rabbit Hole.txtpb

@@ -1,7 +1,7 @@
 name: "Rabbit Hole"
 panel_display_name: "Red Blue Area"
 panels {
-  name: "PUZZLE"
+  name: "Blank"
  path: "Panels/Back Right/br_6"
  clue: ""
  answer: "down"
diff --git a/data/maps/the_entry/rooms/Repetitive Entrance.txtpb b/data/maps/the_entry/rooms/Repetitive Entrance.txtpb
index 25c3307..a83eea4 100644
--- a/data/maps/the_entry/rooms/Repetitive Entrance.txtpb
+++ b/data/maps/the_entry/rooms/Repetitive Entrance.txtpb

@@ -6,7 +6,4 @@ ports {
  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
 }
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"