13 files changed, 69 insertions, 23 deletions
diff --git a/data/maps/the_repetitive/connections.txtpb b/data/maps/the_repetitive/connections.txtpb
index 2b115a9..f4c06f2 100644
--- a/data/maps/the_repetitive/connections.txtpb
+++ b/data/maps/the_repetitive/connections.txtpb

@@ -6,13 +6,13 @@ connections {
 connections {
  from_room: "Main Room"
  to_room: "Plaza Connector"
-  door { name: "Plaza Entrance" }
+  door { name: "Black Hallway" }
-  oneway: true
 }
 connections {
  from_room: "Plaza Connector"
  to_room: "Main Room"
  oneway: true
+  vanilla_only: true
 }
 connections {
  from_room: "Main Room"
diff --git a/data/maps/the_repetitive/doors.txtpb b/data/maps/the_repetitive/doors.txtpb
index 9e63c1d..95d189f 100644
--- a/data/maps/the_repetitive/doors.txtpb
+++ b/data/maps/the_repetitive/doors.txtpb

@@ -6,7 +6,7 @@ doors {
  location_room: "Main Room"
 }
 doors {
-  name: "Plaza Entrance"
+  name: "Black Hallway"
  type: STANDARD
  receivers: "Components/Doors/Door12"
  panels { room: "Main Room" name: "I" }
@@ -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"
@@ -194,3 +203,41 @@ doors {
  panels { room: "Yellow Room" name: "ASSESSES" }
  panels { room: "Yellow Room" name: "TINTING" }
 }
+doors {
+  name: "Anti-Collectable"
+  type: LOCATION_ONLY
+  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/metadata.txtpb b/data/maps/the_repetitive/metadata.txtpb
index 6f5c459..76a0f50 100644
--- a/data/maps/the_repetitive/metadata.txtpb
+++ b/data/maps/the_repetitive/metadata.txtpb

@@ -1,10 +1,6 @@
 display_name: "The Repetitive"
-# The anti-collectable doesn't fit into our system right now so let's ignore it.
-excluded_nodes: "Components/Collectables/anticollectable"
 # These paintings are directly above/behind panels and thus can't be entered.
 excluded_nodes: "Meshes/eyeRed3"
 excluded_nodes: "Meshes/eyeRed4"
-# I do not know what this is.
-excluded_nodes: "Components/Doors/Door3/Hinge/panel_i"
 # This has something to do with the magenta room entrance proxy panel.
 excluded_nodes: "Panels/Eval/panel_26_proxyied_fake"
diff --git a/data/maps/the_repetitive/rooms/Anti Room.txtpb b/data/maps/the_repetitive/rooms/Anti Room.txtpb
index 5451977..65a99ff 100644
--- a/data/maps/the_repetitive/rooms/Anti Room.txtpb
+++ b/data/maps/the_repetitive/rooms/Anti Room.txtpb

@@ -1,6 +1,4 @@
 name: "Anti Room"
-display_name: "Repetitive"
-# Ignore the collectible. The mod should remove it and the back wall too.
 panels {
  name: "HA (1)"
  path: "Panels/Entry/panel_7"
@@ -39,9 +37,17 @@ panels {
  symbols: EXAMPLE
 }
 panels {
-  name: "EYE"
+  name: "EYE (1)"
  path: "Panels/Entry/panel4"
  clue: "eye"
  answer: "iris"
  symbols: BOXES
 }
+panels {
+  # This appears after grabbing the anti-collectable.
+  name: "EYE (2)"
+  path: "Components/Doors/Door3/Hinge/panel_i"
+  clue: "eye"
+  answer: "i"
+  symbols: ZERO
+}
diff --git a/data/maps/the_repetitive/rooms/Cyan Room.txtpb b/data/maps/the_repetitive/rooms/Cyan Room.txtpb
index fb56ac7..d6790f5 100644
--- a/data/maps/the_repetitive/rooms/Cyan Room.txtpb
+++ b/data/maps/the_repetitive/rooms/Cyan Room.txtpb

@@ -1,5 +1,4 @@
 name: "Cyan Room"
-display_name: "Repetitive"
 panels {
  name: "ALFA"
  path: "Panels/Lingo2/panel_3"
diff --git a/data/maps/the_repetitive/rooms/Dot Area.txtpb b/data/maps/the_repetitive/rooms/Dot Area.txtpb
index 63d0395..c4f4583 100644
--- a/data/maps/the_repetitive/rooms/Dot Area.txtpb
+++ b/data/maps/the_repetitive/rooms/Dot Area.txtpb

@@ -1,5 +1,4 @@
 name: "Dot Area"
-display_name: "Repetitive"
 panels {
  name: "TUTU (1)"
  path: "Panels/Lingo2/panel"
diff --git a/data/maps/the_repetitive/rooms/Entry Connector.txtpb b/data/maps/the_repetitive/rooms/Entry Connector.txtpb
index 8addc7f..1508145 100644
--- a/data/maps/the_repetitive/rooms/Entry Connector.txtpb
+++ b/data/maps/the_repetitive/rooms/Entry Connector.txtpb

@@ -1,7 +1,8 @@
 name: "Entry Connector"
-display_name: "Repetitive"
 ports {
  name: "ENTRY"
+  display_name: "Northwest Worldport"
  path: "Components/Warps/worldport2"
-  orientation: "south"
+  destination { x: -11 y: 0 z: 13 }
+  rotation: 90
 }
diff --git a/data/maps/the_repetitive/rooms/Lime Room.txtpb b/data/maps/the_repetitive/rooms/Lime Room.txtpb
index 71e4c2c..37d4937 100644
--- a/data/maps/the_repetitive/rooms/Lime Room.txtpb
+++ b/data/maps/the_repetitive/rooms/Lime Room.txtpb

@@ -1,5 +1,4 @@
 name: "Lime Room"
-display_name: "Repetitive"
 panels {
  name: "RAT"
  path: "Panels/Lingo2/panel_1"
diff --git a/data/maps/the_repetitive/rooms/Magenta Room.txtpb b/data/maps/the_repetitive/rooms/Magenta Room.txtpb
index 827d058..d38e485 100644
--- a/data/maps/the_repetitive/rooms/Magenta Room.txtpb
+++ b/data/maps/the_repetitive/rooms/Magenta Room.txtpb

@@ -1,5 +1,4 @@
 name: "Magenta Room"
-display_name: "Repetitive"
 panels {
  name: "WRITE"
  path: "Panels/Eval/panel_9"
diff --git a/data/maps/the_repetitive/rooms/Main Room.txtpb b/data/maps/the_repetitive/rooms/Main Room.txtpb
index 9fd36d4..623204c 100644
--- a/data/maps/the_repetitive/rooms/Main Room.txtpb
+++ b/data/maps/the_repetitive/rooms/Main Room.txtpb

@@ -1,5 +1,4 @@
 name: "Main Room"
-display_name: "Repetitive"
 panels {
  name: "HOTS (2)"
  path: "Panels/Entry/panel_3"
@@ -139,6 +138,8 @@ paintings {
 }
 ports {
  name: "CC"
+  display_name: "Southwest Worldport"
  path: "Components/Warps/worldport3"
-  orientation: "east"
+  destination { x: -5.5 y: 0 z: 56 }
+  rotation: 90
 }
diff --git a/data/maps/the_repetitive/rooms/Mastery Room.txtpb b/data/maps/the_repetitive/rooms/Mastery Room.txtpb
index 074a825..5e3326c 100644
--- a/data/maps/the_repetitive/rooms/Mastery Room.txtpb
+++ b/data/maps/the_repetitive/rooms/Mastery Room.txtpb

@@ -1,5 +1,4 @@
 name: "Mastery Room"
-display_name: "Repetitive"
 masteries {
  name: "MASTERY"
  path: "Components/Collectables/smiley"
diff --git a/data/maps/the_repetitive/rooms/Plaza Connector.txtpb b/data/maps/the_repetitive/rooms/Plaza Connector.txtpb
index 88f7fc4..b26fdb0 100644
--- a/data/maps/the_repetitive/rooms/Plaza Connector.txtpb
+++ b/data/maps/the_repetitive/rooms/Plaza Connector.txtpb

@@ -1,7 +1,8 @@
 name: "Plaza Connector"
-display_name: "Repetitive"
 ports {
  name: "PLAZA"
+  display_name: "Northeast Worldport"
  path: "Components/Warps/worldport"
-  orientation: "north"
+  destination { x: 15 y: 0 z: 13 }
+  rotation: 0
 }
diff --git a/data/maps/the_repetitive/rooms/Yellow Room.txtpb b/data/maps/the_repetitive/rooms/Yellow Room.txtpb
index 65d665f..9b7d619 100644
--- a/data/maps/the_repetitive/rooms/Yellow Room.txtpb
+++ b/data/maps/the_repetitive/rooms/Yellow Room.txtpb

@@ -1,5 +1,4 @@
 name: "Yellow Room"
-display_name: "Repetitive"
 panels {
  name: "W"
  path: "Panels/Eval/panel_1"