3 files changed, 43 insertions, 7 deletions
diff --git a/data/maps/the_repetitive/doors.txtpb b/data/maps/the_repetitive/doors.txtpb
index d964928..95d189f 100644
--- a/data/maps/the_repetitive/doors.txtpb
+++ b/data/maps/the_repetitive/doors.txtpb

@@ -20,12 +20,21 @@ doors {
 }
 doors {
  name: "Dot Area Entrance"
-  type: STANDARD
+  type: ITEM_ONLY
+  legacy_location: true
  receivers: "Components/Doors/Door8"
  panels { room: "Main Room" name: "HOTS (2)" }
  location_room: "Main Room"
 }
 doors {
+  name: "Hots Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Room" name: "HOTS (1)" }
+  panels { room: "Main Room" name: "HOTS (2)" }
+  location_room: "Main Room"
+  location_name: "HOTS (1), HOTS (2)"
+}
+doors {
  name: "Lime Door"
  type: STANDARD
  receivers: "Components/Doors/Door9"
@@ -200,3 +209,35 @@ doors {
  senders: "Components/Collectables/anticollectable"
  location_room: "Anti Room"
 }
+doors {
+  name: "H2 Room Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Main Room" name: "HEIGHT (1)" }
+  panels { room: "Main Room" name: "HEIGHT (2)" }
+  panels { room: "Main Room" name: "HEIGHT (3)" }
+  panels { room: "Main Room" name: "HEIGHT (4)" }
+  panels { room: "Main Room" name: "HEIGHT (5)" }
+  panels { room: "Main Room" name: "HEIGHT (6)" }
+  panels { room: "Main Room" name: "QUESTION" }
+  panels { room: "Main Room" name: "INTUITION" }
+  panels { room: "Main Room" name: "?" }
+  panels { room: "Main Room" name: "HAND" }
+  panels { room: "Main Room" name: "? HAND" }
+  panels { room: "Main Room" name: "RICHES" }
+  panels { room: "Main Room" name: "? RICHES" }
+  panels { room: "Main Room" name: "MISHMASH" }
+  location_room: "Main Room"
+}
+doors {
+  name: "Anti-Collectable Room Panels"
+  type: LOCATION_ONLY
+  panels { room: "Anti Room" name: "EYE (1)" }
+  panels { room: "Anti Room" name: "EYE (2)" }
+  panels { room: "Anti Room" name: "HA (1)" }
+  panels { room: "Anti Room" name: "HA (2)" }
+  panels { room: "Anti Room" name: "HA (3)" }
+  panels { room: "Anti Room" name: "HA (4)" }
+  panels { room: "Anti Room" name: "HA (5)" }
+  panels { room: "Anti Room" name: "TWO" }
+  location_room: "Anti Room"
+}
diff --git a/data/maps/the_repetitive/rooms/Entry Connector.txtpb b/data/maps/the_repetitive/rooms/Entry Connector.txtpb
index 16dc116..1508145 100644
--- a/data/maps/the_repetitive/rooms/Entry Connector.txtpb
+++ b/data/maps/the_repetitive/rooms/Entry Connector.txtpb

@@ -4,8 +4,5 @@ ports {
  display_name: "Northwest Worldport"
  path: "Components/Warps/worldport2"
  destination { x: -11 y: 0 z: 13 }
-  rotation: 0
+  rotation: 90
-  # TODO: this is part of what makes the keyholder dependent connection form CC
-  # safe in vanilla doors
-  no_shuffle: true
 }
diff --git a/data/maps/the_repetitive/rooms/Main Room.txtpb b/data/maps/the_repetitive/rooms/Main Room.txtpb
index 3e624a7..623204c 100644
--- a/data/maps/the_repetitive/rooms/Main Room.txtpb
+++ b/data/maps/the_repetitive/rooms/Main Room.txtpb

@@ -142,6 +142,4 @@ ports {
  path: "Components/Warps/worldport3"
  destination { x: -5.5 y: 0 z: 56 }
  rotation: 90
-  # TODO: shuffle entrances with dependent keyholders
-  no_shuffle: true
 }

diff --git a/data/maps/the_repetitive/doors.txtpb b/data/maps/the_repetitive/doors.txtpb index d964928..95d189f 100644 --- a/data/maps/the_repetitive/doors.txtpb +++ b/data/maps/the_repetitive/doors.txtpb
@@ -20,12 +20,21 @@ doors {
20	}	20	}
21	doors {	21	doors {
22	name: "Dot Area Entrance"	22	name: "Dot Area Entrance"
23	type: STANDARD	23	type: ITEM_ONLY
		24	legacy_location: true
24	receivers: "Components/Doors/Door8"	25	receivers: "Components/Doors/Door8"
25	panels { room: "Main Room" name: "HOTS (2)" }	26	panels { room: "Main Room" name: "HOTS (2)" }
26	location_room: "Main Room"	27	location_room: "Main Room"
27	}	28	}
28	doors {	29	doors {
		30	name: "Hots Panels"
		31	type: LOCATION_ONLY
		32	panels { room: "Main Room" name: "HOTS (1)" }
		33	panels { room: "Main Room" name: "HOTS (2)" }
		34	location_room: "Main Room"
		35	location_name: "HOTS (1), HOTS (2)"
		36	}
		37	doors {
29	name: "Lime Door"	38	name: "Lime Door"
30	type: STANDARD	39	type: STANDARD
31	receivers: "Components/Doors/Door9"	40	receivers: "Components/Doors/Door9"
@@ -200,3 +209,35 @@ doors {
200	senders: "Components/Collectables/anticollectable"	209	senders: "Components/Collectables/anticollectable"
201	location_room: "Anti Room"	210	location_room: "Anti Room"
202	}	211	}
		212	doors {
		213	name: "H2 Room Puzzles"
		214	type: LOCATION_ONLY
		215	panels { room: "Main Room" name: "HEIGHT (1)" }
		216	panels { room: "Main Room" name: "HEIGHT (2)" }
		217	panels { room: "Main Room" name: "HEIGHT (3)" }
		218	panels { room: "Main Room" name: "HEIGHT (4)" }
		219	panels { room: "Main Room" name: "HEIGHT (5)" }
		220	panels { room: "Main Room" name: "HEIGHT (6)" }
		221	panels { room: "Main Room" name: "QUESTION" }
		222	panels { room: "Main Room" name: "INTUITION" }
		223	panels { room: "Main Room" name: "?" }
		224	panels { room: "Main Room" name: "HAND" }
		225	panels { room: "Main Room" name: "? HAND" }
		226	panels { room: "Main Room" name: "RICHES" }
		227	panels { room: "Main Room" name: "? RICHES" }
		228	panels { room: "Main Room" name: "MISHMASH" }
		229	location_room: "Main Room"
		230	}
		231	doors {
		232	name: "Anti-Collectable Room Panels"
		233	type: LOCATION_ONLY
		234	panels { room: "Anti Room" name: "EYE (1)" }
		235	panels { room: "Anti Room" name: "EYE (2)" }
		236	panels { room: "Anti Room" name: "HA (1)" }
		237	panels { room: "Anti Room" name: "HA (2)" }
		238	panels { room: "Anti Room" name: "HA (3)" }
		239	panels { room: "Anti Room" name: "HA (4)" }
		240	panels { room: "Anti Room" name: "HA (5)" }
		241	panels { room: "Anti Room" name: "TWO" }
		242	location_room: "Anti Room"
		243	}


diff --git a/data/maps/the_repetitive/rooms/Entry Connector.txtpb b/data/maps/the_repetitive/rooms/Entry Connector.txtpb index 16dc116..1508145 100644 --- a/data/maps/the_repetitive/rooms/Entry Connector.txtpb +++ b/data/maps/the_repetitive/rooms/Entry Connector.txtpb
@@ -4,8 +4,5 @@ ports {
4	display_name: "Northwest Worldport"	4	display_name: "Northwest Worldport"
5	path: "Components/Warps/worldport2"	5	path: "Components/Warps/worldport2"
6	destination { x: -11 y: 0 z: 13 }	6	destination { x: -11 y: 0 z: 13 }
7	rotation: 0	7	rotation: 90
8	# TODO: this is part of what makes the keyholder dependent connection form CC
9	# safe in vanilla doors
10	no_shuffle: true
11	}	8	}


diff --git a/data/maps/the_repetitive/rooms/Main Room.txtpb b/data/maps/the_repetitive/rooms/Main Room.txtpb index 3e624a7..623204c 100644 --- a/data/maps/the_repetitive/rooms/Main Room.txtpb +++ b/data/maps/the_repetitive/rooms/Main Room.txtpb
@@ -142,6 +142,4 @@ ports {
142	path: "Components/Warps/worldport3"	142	path: "Components/Warps/worldport3"
143	destination { x: -5.5 y: 0 z: 56 }	143	destination { x: -5.5 y: 0 z: 56 }
144	rotation: 90	144	rotation: 90
145	# TODO: shuffle entrances with dependent keyholders
146	no_shuffle: true
147	}	145	}