Merge branch 'main' into future

9 files changed, 72 insertions, 10 deletions

@@ -1,5 +1,13 @@
 # lingo-ap-tracker Releases
 
+## Initial Testing: v0.6.5 - 2024-02-18
+
+- Victory condition will now be checked off when the player reaches the goal.
+
+Download:
+[lingo-ap-tracker-v0.6.5-win64.zip](https://files.fourisland.com/releases/lingo-ap-tracker/lingo-ap-tracker-v0.6.5-win64.zip)<br/>
+Source: [v0.6.5](https://code.fourisland.com/lingo-ap-tracker/tag/?h=v0.6.5)
+
 ## Initial Testing: v0.6.4 - 2024-01-27
 
 - Fixed issue where area popups would appear too big.
@@ -1 +1 @@
-v0.6.4
\ No newline at end of file
+v0.6.5
\ No newline at end of file
@@ -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(); }
@@ -50,4 +50,6 @@ bool AP_IsPilgrimageEnabled();
 
 SunwarpAccess AP_GetSunwarpAccess();
 
+bool AP_HasReachedGoal();
+
 #endif /* end of include guard: AP_STATE_H_664A4180 */
@@ -87,7 +87,8 @@ void AreaPopup::UpdateIndicators() {
 
     bool checked =
         AP_HasCheckedGameLocation(location.ap_location_id) ||
-        (location.hunt && AP_HasCheckedHuntPanel(location.ap_location_id));
+        (location.hunt && AP_HasCheckedHuntPanel(location.ap_location_id)) ||
+        (IsLocationWinCondition(location) && AP_HasReachedGoal());
 
     wxBitmap* eye_ptr = checked ? &checked_eye_ : &unchecked_eye_;
 
@@ -6,6 +6,9 @@
 #include <string>
 #include <string_view>
 
+#include "ap_state.h"
+#include "game_data.h"
+
 const std::filesystem::path& GetExecutableDirectory() {
   static const std::filesystem::path* executable_directory = []() {
     int length = wai_getExecutablePath(NULL, 0, NULL);
@@ -22,3 +25,16 @@ const std::filesystem::path& GetExecutableDirectory() {
 std::string GetAbsolutePath(std::string_view path) {
   return (GetExecutableDirectory() / path).string();
 }
+
+bool IsLocationWinCondition(const Location& location) {
+  switch (AP_GetVictoryCondition()) {
+    case kTHE_END:
+      return location.ap_location_name ==
+             "Orange Tower Seventh Floor - THE END";
+    case kTHE_MASTER:
+      return location.ap_location_name ==
+             "Orange Tower Seventh Floor - THE MASTER";
+    case kLEVEL_2:
+      return location.ap_location_name == "Second Room - LEVEL 2";
+  }
+}
@@ -4,8 +4,12 @@
 #include <filesystem>
 #include <string_view>
 
+struct Location;
+
 const std::filesystem::path& GetExecutableDirectory();
 
 std::string GetAbsolutePath(std::string_view path);
 
+bool IsLocationWinCondition(const Location& location);
+
 #endif /* end of include guard: GLOBAL_H_44945DBA */
@@ -118,7 +118,9 @@ void TrackerPanel::Redraw() {
     bool has_unreachable_unchecked = false;
     for (const Location &section : map_area.locations) {
       bool has_unchecked = false;
-      if (AP_IsLocationVisible(section.classification)) {
+      if (IsLocationWinCondition(section)) {
+        has_unchecked = !AP_HasReachedGoal();
+      } else if (AP_IsLocationVisible(section.classification)) {
         has_unchecked = !AP_HasCheckedGameLocation(section.ap_location_id);
       } else if (section.hunt && GetTrackerConfig().show_hunt_panels) {
         has_unchecked = !AP_HasCheckedHuntPanel(section.ap_location_id);
@@ -35,6 +35,6 @@ std::ostream& operator<<(std::ostream& out, const Version& ver) {
   return out << "v" << ver.major << "." << ver.minor << "." << ver.revision;
 }
 
-constexpr const Version kTrackerVersion = Version(0, 6, 4);
+constexpr const Version kTrackerVersion = Version(0, 6, 5);
 
 #endif /* end of include guard: VERSION_H_C757E53C */
\ No newline at end of file