6 files changed, 17 insertions, 31 deletions

@@ -8,13 +8,14 @@ AchievementsPane::AchievementsPane(wxWindow* parent)
   AppendColumn("Achievement");
 
   for (int panel_id : GD_GetAchievementPanels()) {
-    achievement_names_.push_back(GD_GetPanel(panel_id).achievement_name);
+    const Panel& panel = GD_GetPanel(panel_id);
+    achievements_.emplace_back(panel.achievement_name, panel.solve_index);
   }
 
-  std::sort(std::begin(achievement_names_), std::end(achievement_names_));
+  std::sort(std::begin(achievements_), std::end(achievements_));
 
-  for (int i = 0; i < achievement_names_.size(); i++) {
-    InsertItem(i, achievement_names_.at(i));
+  for (int i = 0; i < achievements_.size(); i++) {
+    InsertItem(i, std::get<0>(achievements_.at(i)));
   }
 
   SetColumnWidth(0, wxLIST_AUTOSIZE_USEHEADER);
@@ -23,8 +24,8 @@ AchievementsPane::AchievementsPane(wxWindow* parent)
 }
 
 void AchievementsPane::UpdateIndicators() {
-  for (int i = 0; i < achievement_names_.size(); i++) {
-    if (AP_HasAchievement(achievement_names_.at(i))) {
+  for (int i = 0; i < achievements_.size(); i++) {
+    if (AP_IsPanelSolved(std::get<1>(achievements_.at(i)))) {
       SetItemTextColour(i, *wxBLACK);
     } else {
       SetItemTextColour(i, *wxRED);
@@ -9,6 +9,10 @@
 
 #include <wx/listctrl.h>
 
+#include <string>
+#include <tuple>
+#include <vector>
+
 class AchievementsPane : public wxListView {
  public:
   explicit AchievementsPane(wxWindow* parent);
@@ -16,7 +20,7 @@ class AchievementsPane : public wxListView {
   void UpdateIndicators();
 
  private:
-  std::vector<std::string> achievement_names_;
+  std::vector<std::tuple<std::string, int>> achievements_; // name, solve index
 };
 
 #endif /* end of include guard: ACHIEVEMENTS_PANE_H_C320D0B8 */
\ No newline at end of file
@@ -232,14 +232,6 @@ struct APState {
     return HasItem(item_id, quantity);
   }
 
-  bool HasAchievement(const std::string& name) {
-    std::lock_guard state_guard(state_mutex);
-
-    std::string key =
-        fmt::format("{}Achievement|{}", data_storage_prefix, name);
-    return data_storage.count(key) && std::any_cast<bool>(data_storage.at(key));
-  }
-
   const std::set<std::string>& GetCheckedPaintings() {
     std::lock_guard state_guard(state_mutex);
 
@@ -298,11 +290,6 @@ struct APState {
 
       std::thread([this]() { Thread(); }).detach();
 
-      for (int panel_id : GD_GetAchievementPanels()) {
-        tracked_data_storage_keys.push_back(fmt::format(
-            "Achievement|{}", GD_GetPanel(panel_id).achievement_name));
-      }
-
       for (int i = 0; i < PANEL_BITFIELDS; i++) {
         tracked_data_storage_keys.push_back(fmt::format("Panels_{}", i));
       }
@@ -608,9 +595,6 @@ struct APState {
       TrackerLog(fmt::format("Data storage {} retrieved as {}", key,
                              (value.get<bool>() ? "true" : "false")));
 
-      if (key.find("Achievement|") != std::string::npos) {
-        state_update.achievements = true;
-      }
     } else if (value.is_number()) {
       data_storage[key] = value.get<int>();
       TrackerLog(fmt::format("Data storage {} retrieved as {}", key,
@@ -844,10 +828,6 @@ VictoryCondition AP_GetVictoryCondition() {
   return GetState().victory_condition;
 }
 
-bool AP_HasAchievement(const std::string& achievement_name) {
-  return GetState().HasAchievement(achievement_name);
-}
-
 bool AP_HasEarlyColorHallways() {
   std::lock_guard state_guard(GetState().state_mutex);
 
@@ -93,8 +93,6 @@ PanelShuffleMode AP_GetPanelShuffleMode();
 
 VictoryCondition AP_GetVictoryCondition();
 
-bool AP_HasAchievement(const std::string& achievement_name);
-
 bool AP_HasEarlyColorHallways();
 
 bool AP_IsPilgrimageEnabled();
@@ -341,7 +341,11 @@ void TrackerFrame::OnStateChanged(StateChangedEvent &event) {
     }
   }
 
-  if (state.achievements) {
+  if (std::any_of(state.panels.begin(), state.panels.end(),
+                  [](int solve_index) {
+                    return GD_GetPanel(GD_GetPanelBySolveIndex(solve_index))
+                        .achievement;
+                  })) {
     achievements_pane_->UpdateIndicators();
   }
 
@@ -53,7 +53,6 @@ struct StateUpdate {
   std::vector<ItemState> items;
   bool progression_items = false;
   std::vector<std::string> paintings;
-  bool achievements = false;
   bool cleared_locations = false;
   std::set<int> panels;
   bool player_position = false;