4 files changed, 41 insertions, 14 deletions

@@ -103,6 +103,7 @@ struct APState {
       }
 
       tracked_data_storage_keys.push_back("PlayerPos");
+      tracked_data_storage_keys.push_back("Paintings");
 
       initialized = true;
     }
@@ -384,6 +385,14 @@ struct APState {
       }
 
       wxLogMessage("Data storage %s retrieved as null", key);
+    } else if (value.is_array()) {
+      if (key.ends_with("Paintings")) {
+        data_storage[key] = value.get<std::set<std::string>>();
+      } else {
+        data_storage[key] = value.get<std::vector<std::string>>();
+      }
+
+      wxLogMessage("Data storage %s retrieved as list", key);
     }
   }
 
@@ -406,6 +415,15 @@ struct APState {
     return data_storage.count(key) && std::any_cast<bool>(data_storage.at(key));
   }
 
+  const std::set<std::string>& GetCheckedPaintings() {
+    std::string key = data_storage_prefix + "Paintings";
+    if (!data_storage.count(key)) {
+      data_storage[key] = std::set<std::string>();
+    }
+
+    return std::any_cast<const std::set<std::string>&>(data_storage.at(key));
+  }
+
   void RefreshTracker(bool reset) {
     wxLogMessage("Refreshing display...");
 
@@ -471,10 +489,14 @@ bool AP_IsColorShuffle() { return GetState().color_shuffle; }
 
 bool AP_IsPaintingShuffle() { return GetState().painting_shuffle; }
 
-const std::map<std::string, std::string> AP_GetPaintingMapping() {
+const std::map<std::string, std::string>& AP_GetPaintingMapping() {
   return GetState().painting_mapping;
 }
 
+const std::set<std::string>& AP_GetCheckedPaintings() {
+  return GetState().GetCheckedPaintings();
+}
+
 int AP_GetMasteryRequirement() { return GetState().mastery_requirement; }
 
 int AP_GetLevel2Requirement() { return GetState().level_2_requirement; }
@@ -3,6 +3,7 @@
 
 #include <map>
 #include <optional>
+#include <set>
 #include <string>
 #include <tuple>
 
@@ -54,7 +55,9 @@ bool AP_IsColorShuffle();
 
 bool AP_IsPaintingShuffle();
 
-const std::map<std::string, std::string> AP_GetPaintingMapping();
+const std::map<std::string, std::string>& AP_GetPaintingMapping();
+
+const std::set<std::string>& AP_GetCheckedPaintings();
 
 int AP_GetMasteryRequirement();
 
@@ -82,17 +82,21 @@ void SubwayMap::OnConnect() {
 }
 
 void SubwayMap::UpdateIndicators() {
-  Redraw();
-}
-
-void SubwayMap::UpdatePainting(std::string from_painting_id,
-                               std::optional<std::string> to_painting_id) {
-  checked_paintings_.insert(from_painting_id);
-
-  if (to_painting_id) {
-    networks_.AddLink(GD_GetSubwayItemForPainting(from_painting_id),
-                      GD_GetSubwayItemForPainting(*to_painting_id));
+  if (AP_IsPaintingShuffle()) {
+    for (const std::string &painting_id : AP_GetCheckedPaintings()) {
+      if (!checked_paintings_.count(painting_id)) {
+        checked_paintings_.insert(painting_id);
+
+        if (AP_GetPaintingMapping().count(painting_id)) {
+          networks_.AddLink(GD_GetSubwayItemForPainting(painting_id),
+                            GD_GetSubwayItemForPainting(
+                                AP_GetPaintingMapping().at(painting_id)));
+        }
+      }
+    }
   }
+
+  Redraw();
 }
 
 void SubwayMap::UpdateSunwarp(SubwaySunwarp from_sunwarp,
@@ -24,8 +24,6 @@ class SubwayMap : public wxPanel {
 
   void OnConnect();
   void UpdateIndicators();
-  void UpdatePainting(std::string from_painting_id,
-                      std::optional<std::string> to_painting_id);
   void UpdateSunwarp(SubwaySunwarp from_sunwarp, SubwaySunwarp to_sunwarp);
 
  private: