1 files changed, 24 insertions, 2 deletions

@@ -199,7 +199,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;
       }
@@ -211,7 +211,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 {
@@ -309,6 +309,28 @@ class StateCalculator {
       }
     }
 
+    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;
   }