13 files changed, 37 insertions, 17 deletions

@@ -205,7 +205,7 @@ class Lingo2PlayerLogic:
         door = self.world.static_logic.objects.doors[door_id]
         reqs = AccessRequirements()
 
-        # TODO: control_center_color, switches
+        # TODO: lavender_cubes, endings
         if not door.HasField("complete_at") or door.complete_at == 0:
             for proxy in door.panels:
                 panel_reqs = self.get_panel_reqs(proxy.panel, proxy.answer if proxy.HasField("answer") else None)
@@ -219,9 +219,14 @@ class Lingo2PlayerLogic:
             pass
 
         if door.HasField("control_center_color"):
+            # TODO: Logic for ensuring two CC states aren't needed at once.
             reqs.rooms.add("Control Center - Main Area")
             reqs.add_solution(door.control_center_color)
 
+        if door.double_letters:
+            # TODO: When letter shuffle is on, change this to require any double letter instead.
+            reqs.rooms.add("The Repetitive - Main Room")
+
         for keyholder_uses in door.keyholders:
             key_name = keyholder_uses.key.upper()
             if key_name not in reqs.letters:
@@ -248,5 +248,5 @@ doors {
   name: "Butterfly Entrance"
   type: ITEM_ONLY
   receivers: "Components/Doors/brown_2"
-  switches: "double_letters"
+  double_letters: true
 }
@@ -1,11 +1,10 @@
 # TODO: gallery painting
 doors {
   name: "Double Letter Panel Blockers"
-  type: ITEM_ONLY
-  receivers: "Panels/Room 1/panel_3/visibilityListener"
-  receivers: "Panels/Room 2/panel_3/visibilityListener"
-  # TODO: honestly idk if this should even exist
-  switches: "double_letters"
+  type: EVENT
+  #receivers: "Panels/Room 1/panel_3/visibilityListener"
+  #receivers: "Panels/Room 2/panel_3/visibilityListener"
+  double_letters: true
 }
 doors {
   name: "Second Room Entrance"
@@ -196,7 +196,7 @@ doors {
   name: "Repetitive Entrance"
   type: ITEM_ONLY
   receivers: "Components/Doors/Entry/entry_proxied_9"
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
   name: "Shop Entrance"
@@ -214,9 +214,9 @@ doors {
 }
 doors {
   name: "Flipped Pyramid Area Entrance"
-  type: ITEM_ONLY
+  type: EVENT
   receivers: "Components/Doors/Entry/entry_proxied_12"
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
   name: "Literate Entrance"
@@ -251,7 +251,7 @@ doors {
   type: ITEM_ONLY
   receivers: "Components/Doors/Entry/d_3"
   receivers: "Components/Doors/Entry/d_4"
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
   name: "D Room Panels"
@@ -19,6 +19,5 @@ doors {
 doors {
   name: "Double Letters"
   type: EVENT
-  switches: "double_letters"
-  # TODO: once again, not sure whether this is how it should work
+  double_letters: true
 }
@@ -226,7 +226,7 @@ doors {
   name: "Tower Entrance"
   type: ITEM_ONLY
   receivers: "Components/Doors/entry_25"
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
   name: "Maze Out/South Door"
@@ -1,7 +1,7 @@
 doors {
   name: "Double Letters"
   type: EVENT
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
   name: "Lavender Cubes"
@@ -21,7 +21,7 @@ doors {
 doors {
   name: "Cyan Doors"
   type: EVENT
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
   name: "Sun Temple Entrance"
@@ -66,7 +66,9 @@ doors {
   name: "Control Center Orange Door"
   type: CONTROL_CENTER_COLOR
   receivers: "Components/Doors/entry_6"
+  receivers: "Components/Doors/entry_13"
   control_center_color: "orange"
+  double_letters: true
 }
 doors {
   name: "W2 Door"
@@ -499,5 +499,5 @@ doors {
 doors {
   name: "Cyan Doors"
   type: EVENT
-  switches: "double_letters"
+  double_letters: true
 }
@@ -105,6 +105,7 @@ message Door {
   repeated uint64 rooms = 14;
   repeated uint64 doors = 15;
   repeated uint64 endings = 16;
+  optional bool double_letters = 18;
 
   optional DoorType type = 8;
 
@@ -87,6 +87,7 @@ message HumanDoor {
   repeated RoomIdentifier rooms = 11;
   repeated DoorIdentifier doors = 12;
   repeated string endings = 13;
+  optional bool double_letters = 15;
 
   optional DoorType type = 4;
   optional string location_room = 5;
@@ -406,6 +406,10 @@ class DataPacker {
     if (h_door.has_location_name()) {
       door.set_location_name(h_door.location_name());
     }
+
+    if (h_door.has_double_letters()) {
+      door.set_double_letters(h_door.double_letters());
+    }
   }
 
   void ProcessConnectionsFile(std::filesystem::path path,
@@ -198,6 +198,15 @@ class Validator {
         std::cout << "Door " << door_identifier.ShortDebugString()
                   << " needs an explicit location name." << std::endl;
       }
+
+      if (h_door.double_letters() &&
+          (h_door.type() == DoorType::STANDARD ||
+           h_door.type() == DoorType::LOCATION_ONLY ||
+           h_door.type() == DoorType::GRAVESTONE)) {
+        std::cout << "Door " << door_identifier.ShortDebugString()
+                  << " is a location that depends on double_letters."
+                  << std::endl;
+      }
     }
   }