4 files changed, 20 insertions, 17 deletions

@@ -55,7 +55,7 @@ void AreaPopup::UpdateIndicators() {
     const Location& location = map_area.locations.at(section_id);
 
     if (tracker_panel->IsPanelsMode()) {
-      if (!location.panel) {
+      if (!location.single_panel) {
         continue;
       }
     } else {
@@ -117,12 +117,12 @@ void AreaPopup::UpdateIndicators() {
     if (IsLocationWinCondition(location)) {
       checked = AP_HasReachedGoal();
     } else if (tracker_panel->IsPanelsMode()) {
-      checked = location.panel && std::any_of(
-          location.panels.begin(), location.panels.end(),
-          [tracker_panel](int panel_id) {
-            const Panel& panel = GD_GetPanel(panel_id);
-            return tracker_panel->GetSolvedPanels().contains(panel.nodepath);
-          });
+      const Panel& panel = GD_GetPanel(*location.single_panel);
+      if (panel.non_counting) {
+        checked = AP_HasCheckedGameLocation(location.ap_location_id);
+      } else {
+        checked = tracker_panel->GetSolvedPanels().contains(panel.nodepath);
+      }
     } else {
       checked =
           AP_HasCheckedGameLocation(location.ap_location_id) ||
@@ -570,7 +570,7 @@ struct GameData {
                                     .panels = {panel.id},
                                     .classification = classification,
                                     .hunt = panel.hunt,
-                                    .panel = true});
+                                    .single_panel = panel.id});
       locations_by_name[location_name] = {area_id,
                                           map_area.locations.size() - 1};
     }
@@ -623,7 +623,7 @@ struct GameData {
       for (const Location &location : map_area.locations) {
         map_area.classification |= location.classification;
         map_area.hunt |= location.hunt;
-        map_area.panel |= location.panel;
+        map_area.has_single_panel |= location.single_panel.has_value();
       }
     }
 
@@ -114,7 +114,7 @@ struct Location {
   std::vector<int> panels;
   int classification = 0;
   bool hunt = false;
-  bool panel = false;
+  std::optional<int> single_panel;
 };
 
 struct MapArea {
@@ -126,7 +126,7 @@ struct MapArea {
   int map_y;
   int classification = 0;
   bool hunt = false;
-  bool panel = false;
+  bool has_single_panel = false;
 };
 
 enum class SubwaySunwarpType {
@@ -180,7 +180,7 @@ void TrackerPanel::Redraw() {
   for (AreaIndicator &area : areas_) {
     const MapArea &map_area = GD_GetMapArea(area.area_id);
     if (panels_mode_) {
-      area.active = map_area.panel;
+      area.active = map_area.has_single_panel;
     } else if (!AP_IsLocationVisible(map_area.classification) &&
         !(map_area.hunt && GetTrackerConfig().show_hunt_panels) &&
         !(AP_IsPaintingShuffle() && !map_area.paintings.empty())) {
@@ -200,11 +200,14 @@ void TrackerPanel::Redraw() {
       if (IsLocationWinCondition(section)) {
         has_unchecked = !AP_HasReachedGoal();
       } else if (panels_mode_) {
-        has_unchecked = section.panel && std::any_of(
-            section.panels.begin(), section.panels.end(), [this](int panel_id) {
-              const Panel &panel = GD_GetPanel(panel_id);
-              return !solved_panels_.contains(panel.nodepath);
-            });
+        if (section.single_panel) {
+          const Panel &panel = GD_GetPanel(*section.single_panel);
+          if (panel.non_counting) {
+            has_unchecked = !AP_HasCheckedGameLocation(section.ap_location_id);
+          } else {
+            has_unchecked = !solved_panels_.contains(panel.nodepath);
+          }
+        }
       } else if (AP_IsLocationVisible(section.classification)) {
         has_unchecked = !AP_HasCheckedGameLocation(section.ap_location_id);
       } else if (section.hunt && GetTrackerConfig().show_hunt_panels) {