1 files changed, 35 insertions, 6 deletions

@@ -6,6 +6,7 @@
 
 #include <hkutil/string.h>
 
+#include <any>
 #include <apclient.hpp>
 #include <apuuid.hpp>
 #include <chrono>
@@ -15,6 +16,7 @@
 #include <memory>
 #include <mutex>
 #include <set>
+#include <sstream>
 #include <thread>
 #include <tuple>
 
@@ -47,10 +49,11 @@ struct APState {
 
   std::string data_storage_prefix;
   std::list<std::string> tracked_data_storage_keys;
+  std::string victory_data_storage_key;
 
   std::map<int64_t, int> inventory;
   std::set<int64_t> checked_locations;
-  std::map<std::string, bool> data_storage;
+  std::map<std::string, std::any> data_storage;
 
   DoorShuffleMode door_shuffle_mode = kNO_DOORS;
   bool color_shuffle = false;
@@ -121,6 +124,7 @@ struct APState {
     inventory.clear();
     checked_locations.clear();
     data_storage.clear();
+    victory_data_storage_key.clear();
     door_shuffle_mode = kNO_DOORS;
     color_shuffle = false;
     painting_shuffle = false;
@@ -191,6 +195,10 @@ struct APState {
               data_storage[key] = value.get<bool>();
               TrackerLog("Data storage " + key + " retrieved as " +
                          (value.get<bool>() ? "true" : "false"));
+            } else if (value.is_number()) {
+              data_storage[key] = value.get<int>();
+              TrackerLog("Data storage " + key + " retrieved as " +
+                         std::to_string(value.get<int>()));
             }
           }
 
@@ -202,11 +210,15 @@ struct APState {
                                            const nlohmann::json&) {
       if (value.is_boolean()) {
         data_storage[key] = value.get<bool>();
-        TrackerLog("Data storage " + key + " set to " +
+        TrackerLog("Data storage " + key + " retrieved as " +
                    (value.get<bool>() ? "true" : "false"));
-
-        RefreshTracker();
+      } else if (value.is_number()) {
+        data_storage[key] = value.get<int>();
+        TrackerLog("Data storage " + key + " retrieved as " +
+                   std::to_string(value.get<int>()));
       }
+
+      RefreshTracker();
     });
 
     apclient->set_slot_connected_handler([this](
@@ -249,6 +261,15 @@ struct APState {
         corrected_keys.push_back(data_storage_prefix + key);
       }
 
+      {
+        std::ostringstream vdsks;
+        vdsks << "_read_client_status_" << apclient->get_team_number() << "_"
+              << apclient->get_player_number();
+        victory_data_storage_key = vdsks.str();
+      }
+
+      corrected_keys.push_back(victory_data_storage_key);
+
       apclient->Get(corrected_keys);
       apclient->SetNotify(corrected_keys);
     });
@@ -328,7 +349,7 @@ struct APState {
   bool HasCheckedHuntPanel(int location_id) {
     std::string key =
         data_storage_prefix + "Hunt|" + std::to_string(location_id);
-    return data_storage.count(key) && data_storage.at(key);
+    return data_storage.count(key) && std::any_cast<bool>(data_storage.at(key));
   }
 
   bool HasItem(int item_id, int quantity) {
@@ -337,7 +358,7 @@ struct APState {
 
   bool HasAchievement(const std::string& name) {
     std::string key = data_storage_prefix + "Achievement|" + name;
-    return data_storage.count(key) && data_storage.at(key);
+    return data_storage.count(key) && std::any_cast<bool>(data_storage.at(key));
   }
 
   void RefreshTracker() {
@@ -356,6 +377,12 @@ struct APState {
     return ap_id;
   }
 
+  bool HasReachedGoal() {
+    return data_storage.count(victory_data_storage_key) &&
+           std::any_cast<int>(data_storage.at(victory_data_storage_key)) ==
+               30;  // CLIENT_GOAL
+  }
+
   void DestroyClient() {
     client_active = false;
     apclient->reset();
@@ -428,3 +455,5 @@ bool AP_HasEarlyColorHallways() { return GetState().early_color_hallways; }
 bool AP_IsPilgrimageEnabled() { return GetState().pilgrimage_enabled; }
 
 SunwarpAccess AP_GetSunwarpAccess() { return GetState().sunwarp_access; }
+
+bool AP_HasReachedGoal() { return GetState().HasReachedGoal(); }