Support panels mode door shuffle

1 files changed, 24 insertions, 2 deletions

@@ -29,7 +29,7 @@ Decision IsDoorReachable_Helper(int door_id,
                                 const std::set<int>& solveable_panels) {
   const Door& door_obj = GD_GetDoor(door_id);
 
-  if (AP_GetDoorShuffleMode() == kNO_DOORS || door_obj.skip_item) {
+  if (AP_GetDoorShuffleMode() != kDOORS_MODE || door_obj.skip_item) {
     if (!reachable_rooms.count(door_obj.room)) {
       return kMaybe;
     }
@@ -41,7 +41,7 @@ Decision IsDoorReachable_Helper(int door_id,
     }
 
     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 {
@@ -136,6 +136,28 @@ Decision IsPanelReachable_Helper(int panel_id,
     }
   }
 
+  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;
 }