5 files changed, 11 insertions, 4 deletions

@@ -322,10 +322,8 @@ class Lingo2PlayerLogic:
                 if not self.world.options.shuffle_control_center_colors or self.world.options.shuffle_worldports:
                     continue
             elif door_group.type == data_pb2.DoorGroupType.SHUFFLE_GROUP:
-                if door_group.name == "Lavender Cubes" and self.world.options.daedalus_only:
-                    # Always shuffle this if we're in Daed-only mode.
-                    pass
-                elif not self.world.options.shuffle_doors:
+                if (not self.world.options.shuffle_doors and
+                        not (door_group.daedalus_only_always_item and self.world.options.daedalus_only)):
                     continue
             else:
                 continue
@@ -156,6 +156,7 @@ door_groups {
 door_groups {
   name: "Lavender Cubes"
   type: SHUFFLE_GROUP
+  daedalus_only_always_item: true
   doors {
     map: "daedalus"
     name: "C Keyholder Blocker"
@@ -303,6 +303,8 @@ message DoorGroup {
   optional uint64 ap_id = 3;
   optional DoorGroupType type = 4;
   repeated uint64 doors = 5;
+
+  optional bool daedalus_only_always_item = 6;
 }
 
 message AllObjects {
@@ -262,6 +262,8 @@ message HumanDoorGroup {
   optional string name = 1;
   optional DoorGroupType type = 2;
   repeated DoorIdentifier doors = 3;
+
+  optional bool daedalus_only_always_item = 4;
 }
 
 message HumanDoorGroups {
@@ -657,6 +657,10 @@ class DataPacker {
           container_.FindOrAddDoor(di.map(), di.name(), std::nullopt);
       group.add_doors(door_id);
     }
+
+    if (h_group.has_daedalus_only_always_item()) {
+      group.set_daedalus_only_always_item(h_group.daedalus_only_always_item());
+    }
   }
 
   void ProcessGlobalMetadataFile(std::filesystem::path path) {