1 files changed, 17 insertions, 74 deletions

@@ -9,7 +9,6 @@
 #include "area_popup.h"
 #include "game_data.h"
 #include "global.h"
-#include "godot_variant.h"
 #include "ipc_state.h"
 #include "tracker_config.h"
 #include "tracker_state.h"
@@ -52,21 +51,17 @@ TrackerPanel::TrackerPanel(wxWindow *parent) : wxPanel(parent, wxID_ANY) {
 }
 
 void TrackerPanel::UpdateIndicators(bool reset) {
-  if (panels_mode_ && !savedata_path_) {
-    solved_panels_ = IPC_GetSolvedPanels();
-  }
-
   if (reset) {
     for (AreaIndicator &area : areas_) {
       const MapArea &map_area = GD_GetMapArea(area.area_id);
 
-      if (IsAreaPostgame(area.area_id)) {
-        area.active = false;
-      } else if (panels_mode_) {
-        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())) {
+      if ((!AP_IsLocationVisible(map_area.classification) ||
+           IsAreaPostgame(area.area_id)) &&
+          !(map_area.hunt &&
+            GetTrackerConfig().visible_panels == TrackerConfig::kHUNT_PANELS) &&
+          !(map_area.has_single_panel &&
+            GetTrackerConfig().visible_panels == TrackerConfig::kALL_PANELS) &&
+          !(AP_IsPaintingShuffle() && !map_area.paintings.empty())) {
         area.active = false;
       } else {
         area.active = true;
@@ -85,47 +80,10 @@ void TrackerPanel::UpdateIndicators(bool reset) {
   Redraw();
 }
 
-void TrackerPanel::SetPanelsMode() { panels_mode_ = true; }
-
-void TrackerPanel::SetSavedataPath(std::string savedata_path) {
-  if (!savedata_path_) {
-    refresh_button_ = new wxButton(this, wxID_ANY, "Refresh");
-    refresh_button_->Bind(wxEVT_BUTTON, &TrackerPanel::OnRefreshSavedata, this);
-    SetUpRefreshButton();
-  }
-
-  savedata_path_ = savedata_path;
-  panels_mode_ = true;
-
-  UpdateIndicators(/*reset=*/true);
-  RefreshSavedata();
-}
-
-void TrackerPanel::RefreshSavedata() {
-  solved_panels_.clear();
-
-  GodotVariant godot_variant = ParseGodotFile(*savedata_path_);
-  for (const GodotVariant &panel_node : godot_variant.AsArray()) {
-    const std::vector<GodotVariant> &fields = panel_node.AsArray();
-    if (fields[1].AsBool()) {
-      const std::vector<std::string> &nodepath = fields[0].AsNodePath();
-      std::string key = fmt::format("{}/{}", nodepath[3], nodepath[4]);
-      solved_panels_.insert(key);
-    }
-  }
-
-  UpdateIndicators(/*reset=*/false);
-  Refresh();
-}
-
 void TrackerPanel::OnPaint(wxPaintEvent &event) {
   if (GetSize() != rendered_.GetSize()) {
     Resize();
     Redraw();
-
-    if (refresh_button_ != nullptr) {
-      SetUpRefreshButton();
-    }
   }
 
   wxBufferedPaintDC dc(this);
@@ -174,10 +132,6 @@ void TrackerPanel::OnMouseMove(wxMouseEvent &event) {
   event.Skip();
 }
 
-void TrackerPanel::OnRefreshSavedata(wxCommandEvent &event) {
-  RefreshSavedata();
-}
-
 void TrackerPanel::Resize() {
   wxSize panel_size = GetClientSize();
   wxSize image_size = map_image_.GetSize();
@@ -277,23 +231,17 @@ void TrackerPanel::Redraw() {
     bool has_unreachable_unchecked = false;
     for (const Location &section : map_area.locations) {
       bool has_unchecked = false;
-      if (IsLocationPostgame(section.ap_location_id)) {
-        // Nope.
-      } else if (IsLocationWinCondition(section)) {
+      if (IsLocationWinCondition(section)) {
         has_unchecked = !AP_HasReachedGoal();
-      } else if (panels_mode_) {
-        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 = !GetSolvedPanels().contains(panel.nodepath);
-          }
-        }
-      } else if (AP_IsLocationVisible(section.classification)) {
+      } else if (AP_IsLocationVisible(section.classification) &&
+                 !IsLocationPostgame(section.ap_location_id)) {
         has_unchecked = !AP_HasCheckedGameLocation(section.ap_location_id);
-      } else if (section.hunt && GetTrackerConfig().show_hunt_panels) {
-        has_unchecked = !AP_HasCheckedHuntPanel(section.ap_location_id);
+      } else if ((section.hunt && GetTrackerConfig().visible_panels ==
+                                      TrackerConfig::kHUNT_PANELS) ||
+                 (section.single_panel && GetTrackerConfig().visible_panels ==
+                                              TrackerConfig::kALL_PANELS)) {
+        has_unchecked =
+            !AP_IsPanelSolved(GD_GetPanel(*section.single_panel).solve_index);
       }
 
       if (has_unchecked) {
@@ -305,7 +253,7 @@ void TrackerPanel::Redraw() {
       }
     }
 
-    if (AP_IsPaintingShuffle() && !panels_mode_) {
+    if (AP_IsPaintingShuffle()) {
       for (int painting_id : map_area.paintings) {
         if (IsPaintingPostgame(painting_id)) {
           continue;
@@ -357,8 +305,3 @@ void TrackerPanel::Redraw() {
     }
   }
 }
-
-void TrackerPanel::SetUpRefreshButton() {
-  refresh_button_->SetSize(FromDIP(15), FromDIP(15), wxDefaultCoord,
-                           wxDefaultCoord, wxSIZE_AUTO);
-}