1 files changed, 27 insertions, 6 deletions

@@ -200,7 +200,7 @@ class StateCalculator {
         case kSUNWARP_ACCESS_PROGRESSIVE:
           return IsNonGroupedDoorReachable(door_obj);
       }
-    } else if (AP_GetDoorShuffleMode() == kNO_DOORS || door_obj.skip_item) {
+    } else if (AP_GetDoorShuffleMode() != kDOORS_MODE || door_obj.skip_item) {
       if (!reachable_rooms_.count(door_obj.room)) {
         return kMaybe;
       }
@@ -212,7 +212,7 @@ class StateCalculator {
       }
 
       return kYes;
-    } else if (AP_GetDoorShuffleMode() == kSIMPLE_DOORS &&
+    } else if ((AP_GetDoorShuffleMode() == kDOORS_MODE && AP_AreDoorsGrouped() &&
                !door_obj.group_name.empty()) {
       return AP_HasItem(door_obj.group_ap_item_id) ? kYes : kNo;
     } else {
@@ -302,12 +302,33 @@ class StateCalculator {
       }
     }
 
-    if (AP_IsColorShuffle()) {
-      for (LingoColor color : panel_obj.colors) {
-        if (!AP_HasItem(GD_GetItemIdForColor(color))) {
-          return kNo;
+  if (AP_IsColorShuffle()) {
+    for (LingoColor color : panel_obj.colors) {
+      if (!AP_HasItem(GD_GetItemIdForColor(color))) {
+        return kNo;
+      }
+    }
+  }
+
+  if (panel_obj.panel_door != -1 && AP_GetDoorShuffleMode() == kPANELS_MODE) {
+    const PanelDoor& panel_door_obj = GD_GetPanelDoor(panel_obj.panel_door);
+
+    if (AP_AreDoorsGrouped() && panel_door_obj.group_ap_item_id != -1) {
+      return AP_HasItem(panel_door_obj.group_ap_item_id) ? kYes : kNo;
+    } else {
+      bool has_item = AP_HasItem(panel_door_obj.ap_item_id);
+
+      if (!has_item) {
+        for (const ProgressiveRequirement& prog_req :
+             panel_door_obj.progressives) {
+          if (AP_HasItem(prog_req.ap_item_id, prog_req.quantity)) {
+            has_item = true;
+            break;
+          }
         }
       }
+
+      return has_item ? kYes : kNo;
     }
 
     return kYes;