10 files changed, 168 insertions, 27 deletions
diff --git a/data/maps/the_entry/connections.txtpb b/data/maps/the_entry/connections.txtpb
index 7ab15ff..6260665 100644
--- a/data/maps/the_entry/connections.txtpb
+++ b/data/maps/the_entry/connections.txtpb

@@ -64,6 +64,16 @@ connections {
  door { name: "Flipped Pyramid Area Entrance" }
 }
 connections {
+  from_room: "Flipped Pyramid Area"
+  to_room: "Liberated Entrance Panel"
+  oneway: true
+}
+connections {
+  from_room: "Flipped Pyramid Area"
+  to_room: "Literate Entrance Panel"
+  oneway: true
+}
+connections {
  from_room: "Right Eye"
  to_room: "Least Blue Last"
  door { name: "Red Blue Area Left Door" }
@@ -225,3 +235,13 @@ connections {
  to_room: "Literate Entrance"
  door { name: "Literate Entrance" }
 }
+connections {
+  from_room: "Liberated Entrance"
+  to_room: "Liberated Entrance Panel"
+  oneway: true
+}
+connections {
+  from_room: "Literate Entrance"
+  to_room: "Literate Entrance Panel"
+  oneway: true
+}
diff --git a/data/maps/the_entry/doors.txtpb b/data/maps/the_entry/doors.txtpb
index 466f5ce..3f62338 100644
--- a/data/maps/the_entry/doors.txtpb
+++ b/data/maps/the_entry/doors.txtpb

@@ -69,20 +69,40 @@ doors {
 # second_right is vanilla because it's like LOST door.
 doors {
  name: "Noon Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
  receivers: "Components/Doors/second_right5"
  receivers: "Components/Doors/second_right10"
  panels { room: "Red Blue Halls" name: "CENTER DAY" }
  location_room: "Red Blue Halls"
 }
 doors {
+  name: "Noon Door Panels"
+  type: LOCATION_ONLY
+  panels { room: "Red Blue Halls" name: "CENTER" }
+  panels { room: "Red Blue Halls" name: "DAY" }
+  panels { room: "Red Blue Halls" name: "CENTER DAY" }
+  location_room: "Red Blue Halls"
+  location_name: "CENTER, DAY, CENTER DAY"
+}
+doors {
  name: "Scarf Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
  receivers: "Components/Doors/second_right6"
  panels { room: "Red Blue Halls" name: "RAIN WOMAN" }
  location_room: "Red Blue Halls"
 }
 doors {
+  name: "Scarf Door Panels"
+  type: LOCATION_ONLY
+  panels { room: "Red Blue Halls" name: "RAIN" }
+  panels { room: "Red Blue Halls" name: "WOMAN" }
+  panels { room: "Red Blue Halls" name: "RAIN WOMAN" }
+  location_room: "Red Blue Halls"
+  location_name: "RAIN, WOMAN, RAIN WOMAN"
+}
+doors {
  name: "Blue Alcove Entrance"
  type: STANDARD
  receivers: "Components/Doors/second_right9"
@@ -119,7 +139,8 @@ doors {
 }
 doors {
  name: "Red Blue Area Left Door"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
  receivers: "Components/Doors/fourth_right"
  panels { room: "Right Eye" name: "WANDER" }
  location_room: "Right Eye"
@@ -131,6 +152,31 @@ doors {
  panels { room: "Right Eye" name: "WANDER" }
  location_room: "Right Eye"
 }
+doors {
+  name: "Wander Panels"
+  type: LOCATION_ONLY
+  panels { room: "Right Eye" name: "WANDER" }
+  panels { room: "Red Blue Halls" name: "WANDER" }
+  panels { room: "Link Area" name: "WANDER" }
+  panels { room: "Flipped Link Area" name: "WANDER" }
+  location_room: "Flipped Link Area"
+}
+doors {
+  name: "Flipped Right Eye Panels"
+  type: LOCATION_ONLY
+  panels { room: "Flipped Right Eye" name: "HERE" }
+  panels { room: "Flipped Right Eye" name: "WHERE" }
+  location_room: "Flipped Right Eye"
+  location_name: "HERE, WHERE"
+}
+doors {
+  name: "Big Eyes"
+  type: LOCATION_ONLY
+  panels { room: "Starting Room" name: "EYE" }
+  panels { room: "Right Eye" name: "EYE" }
+  location_room: "Right Eye"
+  location_name: "EYE"
+}
 # Components/Doors/back_left_1, _3, _4, _6 are vanilla because they're nothing.
 doors {
  name: "Orange Door Hider"
@@ -161,6 +207,7 @@ doors {
 doors {
  name: "Control Center White Door"
  type: CONTROL_CENTER_COLOR
+  latch: true
  receivers: "Components/Doors/back_left_7"
  control_center_color: "white"
 }
@@ -211,7 +258,7 @@ doors {
  name: "Liberated Entrance"
  type: STANDARD
  receivers: "Components/Doors/Entry/entry_proxied_10"
-  panels { room: "Flipped Pyramid Area" name: "TURN (1)" }
+  panels { room: "Liberated Entrance Panel" name: "TURN (1)" }
  location_room: "Flipped Pyramid Area"
 }
 doors {
@@ -224,7 +271,7 @@ doors {
  name: "Literate Entrance"
  type: STANDARD
  receivers: "Components/Doors/Entry/entry_proxied_11"
-  panels { room: "Flipped Pyramid Area" name: "TURN (2)" }
+  panels { room: "Literate Entrance Panel" name: "TURN (2)" }
  location_room: "Flipped Pyramid Area"
 }
 doors {
@@ -303,7 +350,6 @@ doors {
 doors {
  name: "Red Room Painting"
  type: STANDARD
-  #move_paintings { room: "Right Eye" name: "PSYCHIC" }
  receivers: "Components/Paintings/psychic/teleportListener"
  panels { room: "Right Eye" name: "FAINT" }
  location_room: "Right Eye"
@@ -311,8 +357,49 @@ doors {
 doors {
  name: "Third Eye Painting"
  type: LOCATION_ONLY
-  # move_paintings { room: "Eye Room" name: "GALLERY" }
  # TODO: ummmm
  panels { room: "Eye Room" name: "I" }
  location_room: "Eye Room"
-}
-\ No newline at end of file
+}
+doors {
+  name: "Gift Maps Entrance"
+  type: EVENT
+  receivers: "Components/GiftMapEntrance/PanelTeleporter"
+  double_letters: true
+}
+doors {
+  name: "Least Blue Last"
+  type: LOCATION_ONLY
+  panels { room: "Least Blue Last" name: "CAPABLE (1)" }
+  panels { room: "Least Blue Last" name: "CAPABLE (2)" }
+  panels { room: "Least Blue Last" name: "LUSTRE" }
+  panels { room: "Least Blue Last" name: "WANT" }
+  panels { room: "Least Blue Last" name: "STEALER" }
+  panels { room: "Least Blue Last" name: "OLD" }
+  panels { room: "Least Blue Last" name: "TRUST" }
+  panels { room: "Least Blue Last" name: "LABEL" }
+  panels { room: "Least Blue Last" name: "AIL" }
+  location_room: "Least Blue Last"
+}
+doors {
+  name: "Control Center White Panel"
+  type: LOCATION_ONLY
+  panels { room: "Lime Room" name: "COLOR" }
+  location_room: "Lime Room"
+  location_name: "COLOR"
+}
+doors {
+  name: "Rabbit Hole Blank Puzzle"
+  type: LOCATION_ONLY
+  panels { room: "Rabbit Hole" name: "Blank" }
+  location_room: "Rabbit Hole"
+  location_name: "Blank Puzzle"
+}
+doors {
+  name: "Wrath Room Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Wrath Room" name: "DICE" }
+  panels { room: "Wrath Room" name: "WREATH" }
+  location_room: "Wrath Room"
+  location_name: "DICE, WRATH"
+}
diff --git a/data/maps/the_entry/metadata.txtpb b/data/maps/the_entry/metadata.txtpb
index 0eeb29a..da2194b 100644
--- a/data/maps/the_entry/metadata.txtpb
+++ b/data/maps/the_entry/metadata.txtpb

@@ -11,3 +11,13 @@ excluded_nodes: "Panels/Back Left/backleft_4_proxied_1"
 excluded_nodes: "Panels/Back Left/backleft_4_proxied_2"
 # This is a proxy related to the first panel and it doesn't seem useful.
 excluded_nodes: "Panels/Entry/entry_proxied_fake"
+# The gift map entrance is created by the mod.
+custom_nodes: "Components/GiftMapEntrance/GongusPanel"
+custom_nodes: "Components/GiftMapEntrance/HatkirbyPanel"
+custom_nodes: "Components/GiftMapEntrance/IcelyPanel"
+custom_nodes: "Components/GiftMapEntrance/KirbyPanel"
+custom_nodes: "Components/GiftMapEntrance/KiwiPanel"
+custom_nodes: "Components/GiftMapEntrance/Panel"
+custom_nodes: "Components/GiftMapEntrance/QPanel"
+custom_nodes: "Components/GiftMapEntrance/SouveyPanel"
+custom_nodes: "Components/GiftMapEntrance/StarPanel"
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"

diff --git a/data/maps/the_entry/connections.txtpb b/data/maps/the_entry/connections.txtpb index 7ab15ff..6260665 100644 --- a/data/maps/the_entry/connections.txtpb +++ b/data/maps/the_entry/connections.txtpb
@@ -64,6 +64,16 @@ connections {
64	door { name: "Flipped Pyramid Area Entrance" }	64	door { name: "Flipped Pyramid Area Entrance" }
65	}	65	}
66	connections {	66	connections {
		67	from_room: "Flipped Pyramid Area"
		68	to_room: "Liberated Entrance Panel"
		69	oneway: true
		70	}
		71	connections {
		72	from_room: "Flipped Pyramid Area"
		73	to_room: "Literate Entrance Panel"
		74	oneway: true
		75	}
		76	connections {
67	from_room: "Right Eye"	77	from_room: "Right Eye"
68	to_room: "Least Blue Last"	78	to_room: "Least Blue Last"
69	door { name: "Red Blue Area Left Door" }	79	door { name: "Red Blue Area Left Door" }
@@ -225,3 +235,13 @@ connections {
225	to_room: "Literate Entrance"	235	to_room: "Literate Entrance"
226	door { name: "Literate Entrance" }	236	door { name: "Literate Entrance" }
227	}	237	}
		238	connections {
		239	from_room: "Liberated Entrance"
		240	to_room: "Liberated Entrance Panel"
		241	oneway: true
		242	}
		243	connections {
		244	from_room: "Literate Entrance"
		245	to_room: "Literate Entrance Panel"
		246	oneway: true
		247	}


diff --git a/data/maps/the_entry/doors.txtpb b/data/maps/the_entry/doors.txtpb index 466f5ce..3f62338 100644 --- a/data/maps/the_entry/doors.txtpb +++ b/data/maps/the_entry/doors.txtpb
@@ -69,20 +69,40 @@ doors {
69	# second_right is vanilla because it's like LOST door.	69	# second_right is vanilla because it's like LOST door.
70	doors {	70	doors {
71	name: "Noon Door"	71	name: "Noon Door"
72	type: STANDARD	72	type: ITEM_ONLY
		73	legacy_location: true
73	receivers: "Components/Doors/second_right5"	74	receivers: "Components/Doors/second_right5"
74	receivers: "Components/Doors/second_right10"	75	receivers: "Components/Doors/second_right10"
75	panels { room: "Red Blue Halls" name: "CENTER DAY" }	76	panels { room: "Red Blue Halls" name: "CENTER DAY" }
76	location_room: "Red Blue Halls"	77	location_room: "Red Blue Halls"
77	}	78	}
78	doors {	79	doors {
		80	name: "Noon Door Panels"
		81	type: LOCATION_ONLY
		82	panels { room: "Red Blue Halls" name: "CENTER" }
		83	panels { room: "Red Blue Halls" name: "DAY" }
		84	panels { room: "Red Blue Halls" name: "CENTER DAY" }
		85	location_room: "Red Blue Halls"
		86	location_name: "CENTER, DAY, CENTER DAY"
		87	}
		88	doors {
79	name: "Scarf Door"	89	name: "Scarf Door"
80	type: STANDARD	90	type: ITEM_ONLY
		91	legacy_location: true
81	receivers: "Components/Doors/second_right6"	92	receivers: "Components/Doors/second_right6"
82	panels { room: "Red Blue Halls" name: "RAIN WOMAN" }	93	panels { room: "Red Blue Halls" name: "RAIN WOMAN" }
83	location_room: "Red Blue Halls"	94	location_room: "Red Blue Halls"
84	}	95	}
85	doors {	96	doors {
		97	name: "Scarf Door Panels"
		98	type: LOCATION_ONLY
		99	panels { room: "Red Blue Halls" name: "RAIN" }
		100	panels { room: "Red Blue Halls" name: "WOMAN" }
		101	panels { room: "Red Blue Halls" name: "RAIN WOMAN" }
		102	location_room: "Red Blue Halls"
		103	location_name: "RAIN, WOMAN, RAIN WOMAN"
		104	}
		105	doors {
86	name: "Blue Alcove Entrance"	106	name: "Blue Alcove Entrance"
87	type: STANDARD	107	type: STANDARD
88	receivers: "Components/Doors/second_right9"	108	receivers: "Components/Doors/second_right9"
@@ -119,7 +139,8 @@ doors {
119	}	139	}
120	doors {	140	doors {
121	name: "Red Blue Area Left Door"	141	name: "Red Blue Area Left Door"
122	type: STANDARD	142	type: ITEM_ONLY
		143	legacy_location: true
123	receivers: "Components/Doors/fourth_right"	144	receivers: "Components/Doors/fourth_right"
124	panels { room: "Right Eye" name: "WANDER" }	145	panels { room: "Right Eye" name: "WANDER" }
125	location_room: "Right Eye"	146	location_room: "Right Eye"
@@ -131,6 +152,31 @@ doors {
131	panels { room: "Right Eye" name: "WANDER" }	152	panels { room: "Right Eye" name: "WANDER" }
132	location_room: "Right Eye"	153	location_room: "Right Eye"
133	}	154	}
		155	doors {
		156	name: "Wander Panels"
		157	type: LOCATION_ONLY
		158	panels { room: "Right Eye" name: "WANDER" }
		159	panels { room: "Red Blue Halls" name: "WANDER" }
		160	panels { room: "Link Area" name: "WANDER" }
		161	panels { room: "Flipped Link Area" name: "WANDER" }
		162	location_room: "Flipped Link Area"
		163	}
		164	doors {
		165	name: "Flipped Right Eye Panels"
		166	type: LOCATION_ONLY
		167	panels { room: "Flipped Right Eye" name: "HERE" }
		168	panels { room: "Flipped Right Eye" name: "WHERE" }
		169	location_room: "Flipped Right Eye"
		170	location_name: "HERE, WHERE"
		171	}
		172	doors {
		173	name: "Big Eyes"
		174	type: LOCATION_ONLY
		175	panels { room: "Starting Room" name: "EYE" }
		176	panels { room: "Right Eye" name: "EYE" }
		177	location_room: "Right Eye"
		178	location_name: "EYE"
		179	}
134	# Components/Doors/back_left_1, _3, _4, _6 are vanilla because they're nothing.	180	# Components/Doors/back_left_1, _3, _4, _6 are vanilla because they're nothing.
135	doors {	181	doors {
136	name: "Orange Door Hider"	182	name: "Orange Door Hider"
@@ -161,6 +207,7 @@ doors {
161	doors {	207	doors {
162	name: "Control Center White Door"	208	name: "Control Center White Door"
163	type: CONTROL_CENTER_COLOR	209	type: CONTROL_CENTER_COLOR
		210	latch: true
164	receivers: "Components/Doors/back_left_7"	211	receivers: "Components/Doors/back_left_7"
165	control_center_color: "white"	212	control_center_color: "white"
166	}	213	}
@@ -211,7 +258,7 @@ doors {
211	name: "Liberated Entrance"	258	name: "Liberated Entrance"
212	type: STANDARD	259	type: STANDARD
213	receivers: "Components/Doors/Entry/entry_proxied_10"	260	receivers: "Components/Doors/Entry/entry_proxied_10"
214	panels { room: "Flipped Pyramid Area" name: "TURN (1)" }	261	panels { room: "Liberated Entrance Panel" name: "TURN (1)" }
215	location_room: "Flipped Pyramid Area"	262	location_room: "Flipped Pyramid Area"
216	}	263	}
217	doors {	264	doors {
@@ -224,7 +271,7 @@ doors {
224	name: "Literate Entrance"	271	name: "Literate Entrance"
225	type: STANDARD	272	type: STANDARD
226	receivers: "Components/Doors/Entry/entry_proxied_11"	273	receivers: "Components/Doors/Entry/entry_proxied_11"
227	panels { room: "Flipped Pyramid Area" name: "TURN (2)" }	274	panels { room: "Literate Entrance Panel" name: "TURN (2)" }
228	location_room: "Flipped Pyramid Area"	275	location_room: "Flipped Pyramid Area"
229	}	276	}
230	doors {	277	doors {
@@ -303,7 +350,6 @@ doors {
303	doors {	350	doors {
304	name: "Red Room Painting"	351	name: "Red Room Painting"
305	type: STANDARD	352	type: STANDARD
306	#move_paintings { room: "Right Eye" name: "PSYCHIC" }
307	receivers: "Components/Paintings/psychic/teleportListener"	353	receivers: "Components/Paintings/psychic/teleportListener"
308	panels { room: "Right Eye" name: "FAINT" }	354	panels { room: "Right Eye" name: "FAINT" }
309	location_room: "Right Eye"	355	location_room: "Right Eye"
@@ -311,8 +357,49 @@ doors {
311	doors {	357	doors {
312	name: "Third Eye Painting"	358	name: "Third Eye Painting"
313	type: LOCATION_ONLY	359	type: LOCATION_ONLY
314	# move_paintings { room: "Eye Room" name: "GALLERY" }
315	# TODO: ummmm	360	# TODO: ummmm
316	panels { room: "Eye Room" name: "I" }	361	panels { room: "Eye Room" name: "I" }
317	location_room: "Eye Room"	362	location_room: "Eye Room"
318	} \ No newline at end of file	363	}
		364	doors {
		365	name: "Gift Maps Entrance"
		366	type: EVENT
		367	receivers: "Components/GiftMapEntrance/PanelTeleporter"
		368	double_letters: true
		369	}
		370	doors {
		371	name: "Least Blue Last"
		372	type: LOCATION_ONLY
		373	panels { room: "Least Blue Last" name: "CAPABLE (1)" }
		374	panels { room: "Least Blue Last" name: "CAPABLE (2)" }
		375	panels { room: "Least Blue Last" name: "LUSTRE" }
		376	panels { room: "Least Blue Last" name: "WANT" }
		377	panels { room: "Least Blue Last" name: "STEALER" }
		378	panels { room: "Least Blue Last" name: "OLD" }
		379	panels { room: "Least Blue Last" name: "TRUST" }
		380	panels { room: "Least Blue Last" name: "LABEL" }
		381	panels { room: "Least Blue Last" name: "AIL" }
		382	location_room: "Least Blue Last"
		383	}
		384	doors {
		385	name: "Control Center White Panel"
		386	type: LOCATION_ONLY
		387	panels { room: "Lime Room" name: "COLOR" }
		388	location_room: "Lime Room"
		389	location_name: "COLOR"
		390	}
		391	doors {
		392	name: "Rabbit Hole Blank Puzzle"
		393	type: LOCATION_ONLY
		394	panels { room: "Rabbit Hole" name: "Blank" }
		395	location_room: "Rabbit Hole"
		396	location_name: "Blank Puzzle"
		397	}
		398	doors {
		399	name: "Wrath Room Puzzles"
		400	type: LOCATION_ONLY
		401	panels { room: "Wrath Room" name: "DICE" }
		402	panels { room: "Wrath Room" name: "WREATH" }
		403	location_room: "Wrath Room"
		404	location_name: "DICE, WRATH"
		405	}


diff --git a/data/maps/the_entry/metadata.txtpb b/data/maps/the_entry/metadata.txtpb index 0eeb29a..da2194b 100644 --- a/data/maps/the_entry/metadata.txtpb +++ b/data/maps/the_entry/metadata.txtpb
@@ -11,3 +11,13 @@ excluded_nodes: "Panels/Back Left/backleft_4_proxied_1"
11	excluded_nodes: "Panels/Back Left/backleft_4_proxied_2"	11	excluded_nodes: "Panels/Back Left/backleft_4_proxied_2"
12	# This is a proxy related to the first panel and it doesn't seem useful.	12	# This is a proxy related to the first panel and it doesn't seem useful.
13	excluded_nodes: "Panels/Entry/entry_proxied_fake"	13	excluded_nodes: "Panels/Entry/entry_proxied_fake"
		14	# The gift map entrance is created by the mod.
		15	custom_nodes: "Components/GiftMapEntrance/GongusPanel"
		16	custom_nodes: "Components/GiftMapEntrance/HatkirbyPanel"
		17	custom_nodes: "Components/GiftMapEntrance/IcelyPanel"
		18	custom_nodes: "Components/GiftMapEntrance/KirbyPanel"
		19	custom_nodes: "Components/GiftMapEntrance/KiwiPanel"
		20	custom_nodes: "Components/GiftMapEntrance/Panel"
		21	custom_nodes: "Components/GiftMapEntrance/QPanel"
		22	custom_nodes: "Components/GiftMapEntrance/SouveyPanel"
		23	custom_nodes: "Components/GiftMapEntrance/StarPanel"


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 @@
1	name: "Flipped Pyramid Area"	1	name: "Flipped Pyramid Area"
2	panel_display_name: "Pyramid Area"	2	panel_display_name: "Pyramid Area"
3	panels {	3	# The fact that the doors here cover up the panels once they open is a problem
4	name: "TURN (1)"	4	# since you're not guaranteed to have access to the lower area if painting
5	path: "Panels/Entry/l_opener_3"	5	# shuffle is a thing. So we need to edit these doors so that they don't cover up
6	clue: "turn"	6	# the panels.
7	answer: "flip"
8	symbols: SUN
9	}
10	panels {
11	name: "TURN (2)"
12	path: "Panels/Entry/l_opener_4"
13	clue: "turn"
14	answer: "spin"
15	symbols: SUN
16	} \ 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 {
5	path: "Components/Warps/worldport9"	5	path: "Components/Warps/worldport9"
6	destination { x: -41 y: 6 z: -17.5 }	6	destination { x: -41 y: 6 z: -17.5 }
7	rotation: 0	7	rotation: 0
8	gravity: Y_PLUS	8	# This isn't actually Y_PLUS gravity! A nearby warp sneakily flips you.
9	}	9	}


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 @@
		1	name: "Liberated Entrance Panel"
		2	panel_display_name: "Pyramid Area"
		3	panels {
		4	name: "TURN (1)"
		5	path: "Panels/Entry/l_opener_3"
		6	clue: "turn"
		7	answer: "flip"
		8	symbols: SUN
		9	}


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 @@
		1	name: "Literate Entrance Panel"
		2	panel_display_name: "Pyramid Area"
		3	panels {
		4	name: "TURN (2)"
		5	path: "Panels/Entry/l_opener_4"
		6	clue: "turn"
		7	answer: "spin"
		8	symbols: SUN
		9	}


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 @@
1	name: "Rabbit Hole"	1	name: "Rabbit Hole"
2	panel_display_name: "Red Blue Area"	2	panel_display_name: "Red Blue Area"
3	panels {	3	panels {
4	name: "PUZZLE"	4	name: "Blank"
5	path: "Panels/Back Right/br_6"	5	path: "Panels/Back Right/br_6"
6	clue: ""	6	clue: ""
7	answer: "down"	7	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 {
6	path: "Components/Warps/worldport7"	6	path: "Components/Warps/worldport7"
7	destination { x: -20 y: 0 z: -16 }	7	destination { x: -20 y: 0 z: -16 }
8	rotation: 180	8	rotation: 180
9	# TODO: this is part of what makes the keyholder dependent connection from CC
10	# safe in vanilla doors
11	no_shuffle: true
12	}	9	}


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 {
46	clue: "than"	46	clue: "than"
47	answer: "than"	47	answer: "than"
48	}	48	}
		49	panels {
		50	name: "Gift Maps"
		51	# TODO: exclude from panelsanity
		52	path: "Components/GiftMapEntrance/Panel"
		53	clue: "player"
		54	answer: ""
		55	# The puzzle solution doesn't matter. We'll change it to the player's name
		56	# for fun.
		57	symbols: QUESTION
		58	proxies { answer: "gongus" path: "Components/GiftMapEntrance/GongusPanel" }
		59	proxies { answer: "hatkirby" path: "Components/GiftMapEntrance/HatkirbyPanel" }
		60	proxies { answer: "icely" path: "Components/GiftMapEntrance/IcelyPanel" }
		61	proxies { answer: "kirby" path: "Components/GiftMapEntrance/KirbyPanel" }
		62	proxies { answer: "kiwi" path: "Components/GiftMapEntrance/KiwiPanel" }
		63	proxies { answer: "q" path: "Components/GiftMapEntrance/QPanel" }
		64	proxies { answer: "souvey" path: "Components/GiftMapEntrance/SouveyPanel" }
		65	proxies { answer: "star" path: "Components/GiftMapEntrance/StarPanel" }
		66	required_door { name: "Gift Maps Entrance" }
		67	}
49	letters {	68	letters {
50	key: "h"	69	key: "h"
51	path: "Components/Collectables/h"	70	path: "Components/Collectables/h"