6 files changed, 86 insertions, 23 deletions

@@ -27,7 +27,7 @@
 
 constexpr int AP_MAJOR = 0;
 constexpr int AP_MINOR = 4;
-constexpr int AP_REVISION = 0;
+constexpr int AP_REVISION = 5;
 
 constexpr const char* CERT_STORE_PATH = "cacert.pem";
 constexpr int ITEM_HANDLING = 7;  // <- all
@@ -54,6 +54,7 @@ struct APState {
   std::map<int64_t, int> inventory;
   std::set<int64_t> checked_locations;
   std::map<std::string, std::any> data_storage;
+  std::optional<std::tuple<int, int>> player_pos;
 
   DoorShuffleMode door_shuffle_mode = kNO_DOORS;
   bool color_shuffle = false;
@@ -101,6 +102,8 @@ struct APState {
         }
       }
 
+      tracked_data_storage_keys.push_back("PlayerPos");
+
       initialized = true;
     }
 
@@ -128,6 +131,7 @@ struct APState {
     inventory.clear();
     checked_locations.clear();
     data_storage.clear();
+    player_pos = std::nullopt;
     victory_data_storage_key.clear();
     door_shuffle_mode = kNO_DOORS;
     color_shuffle = false;
@@ -199,15 +203,7 @@ struct APState {
     apclient->set_retrieved_handler(
         [this](const std::map<std::string, nlohmann::json>& data) {
           for (const auto& [key, value] : data) {
-            if (value.is_boolean()) {
-              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>()));
-            }
+            HandleDataStorage(key, value);
           }
 
           RefreshTracker();
@@ -216,16 +212,7 @@ struct APState {
     apclient->set_set_reply_handler([this](const std::string& key,
                                            const nlohmann::json& value,
                                            const nlohmann::json&) {
-      if (value.is_boolean()) {
-        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>()));
-      }
-
+      HandleDataStorage(key, value);
       RefreshTracker();
     });
 
@@ -369,6 +356,35 @@ struct APState {
     }
   }
 
+  void HandleDataStorage(const std::string& key, const nlohmann::json& value) {
+    if (value.is_boolean()) {
+      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>()));
+    } else if (value.is_object()) {
+      if (key.ends_with("PlayerPos")) {
+        auto map_value = value.get<std::map<std::string, int>>();
+        player_pos = std::tuple<int, int>(map_value["x"], map_value["z"]);
+      } else {
+        data_storage[key] = value.get<std::map<std::string, int>>();
+      }
+
+      TrackerLog("Data storage " + key + " retrieved as dictionary");
+    } else if (value.is_null()) {
+      if (key.ends_with("PlayerPos")) {
+        player_pos = std::nullopt;
+      } else {
+        data_storage.erase(key);
+      }
+      
+      TrackerLog("Data storage " + key + " retrieved as null");
+    }
+  }
+
   bool HasCheckedGameLocation(int location_id) {
     return checked_locations.count(location_id);
   }
@@ -498,3 +514,7 @@ const std::map<int, SunwarpMapping>& AP_GetSunwarpMapping() {
 }
 
 bool AP_HasReachedGoal() { return GetState().HasReachedGoal(); }
+
+std::optional<std::tuple<int, int>> AP_GetPlayerPosition() {
+  return GetState().player_pos;
+}
@@ -2,7 +2,9 @@
 #define AP_STATE_H_664A4180
 
 #include <map>
+#include <optional>
 #include <string>
+#include <tuple>
 
 #include "game_data.h"
 
@@ -80,4 +82,6 @@ const std::map<int, SunwarpMapping>& AP_GetSunwarpMapping();
 
 bool AP_HasReachedGoal();
 
+std::optional<std::tuple<int, int>> AP_GetPlayerPosition();
+
 #endif /* end of include guard: AP_STATE_H_664A4180 */
@@ -350,9 +350,9 @@ struct GameData {
             }
           }
 
-          if (door_it.second["group"]) {
+          if (door_it.second["door_group"]) {
             doors_[door_id].group_name =
-                door_it.second["group"].as<std::string>();
+                door_it.second["door_group"].as<std::string>();
 
             if (ids_config["door_groups"] &&
                 ids_config["door_groups"][doors_[door_id].group_name]) {
@@ -10,6 +10,7 @@
 constexpr int AREA_ACTUAL_SIZE = 64;
 constexpr int AREA_BORDER_SIZE = 5;
 constexpr int AREA_EFFECTIVE_SIZE = AREA_ACTUAL_SIZE + AREA_BORDER_SIZE * 2;
+constexpr int PLAYER_SIZE = 96;
 
 TrackerPanel::TrackerPanel(wxWindow *parent) : wxPanel(parent, wxID_ANY) {
   map_image_ = wxImage(GetAbsolutePath("assets/lingo_map.png").c_str(),
@@ -18,6 +19,12 @@ TrackerPanel::TrackerPanel(wxWindow *parent) : wxPanel(parent, wxID_ANY) {
     return;
   }
 
+  player_image_ =
+      wxImage(GetAbsolutePath("assets/player.png").c_str(), wxBITMAP_TYPE_PNG);
+  if (!player_image_.IsOk()) {
+    return;
+  }
+
   for (const MapArea &map_area : GD_GetMapAreas()) {
     AreaIndicator area;
     area.area_id = map_area.id;
@@ -50,6 +57,20 @@ void TrackerPanel::OnPaint(wxPaintEvent &event) {
   wxPaintDC dc(this);
   dc.DrawBitmap(rendered_, 0, 0);
 
+  if (AP_GetPlayerPosition().has_value()) {
+    // 1588, 1194
+    // 14x14 -> 154x154
+    double intended_x =
+        1588.0 + (std::get<0>(*AP_GetPlayerPosition()) * (154.0 / 14.0));
+    double intended_y =
+        1194.0 + (std::get<1>(*AP_GetPlayerPosition()) * (154.0 / 14.0));
+
+    int real_x = offset_x_ + scale_x_ * intended_x - scaled_player_.GetWidth() / 2;
+    int real_y = offset_y_ + scale_y_ * intended_y - scaled_player_.GetHeight() / 2;
+
+    dc.DrawBitmap(scaled_player_, real_x, real_y);
+  }
+
   event.Skip();
 }
 
@@ -91,6 +112,17 @@ void TrackerPanel::Redraw() {
       map_image_.Scale(final_width, final_height, wxIMAGE_QUALITY_NORMAL)
           .Size(panel_size, {final_x, final_y}, 0, 0, 0));
 
+  offset_x_ = final_x;
+  offset_y_ = final_y;
+  scale_x_ = static_cast<double>(final_width) / image_size.GetWidth();
+  scale_y_ = static_cast<double>(final_height) / image_size.GetHeight();
+
+  int player_width = PLAYER_SIZE * scale_x_;
+  int player_height = PLAYER_SIZE * scale_y_;
+  scaled_player_ =
+      wxBitmap(player_image_.Scale(player_width > 0 ? player_width : 1,
+                                   player_height > 0 ? player_height : 1));
+
   wxMemoryDC dc;
   dc.SelectObject(rendered_);
 
@@ -32,7 +32,14 @@ class TrackerPanel : public wxPanel {
   void Redraw();
 
   wxImage map_image_;
+  wxImage player_image_;
   wxBitmap rendered_;
+  wxBitmap scaled_player_;
+
+  int offset_x_ = 0;
+  int offset_y_ = 0;
+  double scale_x_ = 0;
+  double scale_y_ = 0;
 
   std::vector<AreaIndicator> areas_;
 };
@@ -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, 5);
+constexpr const Version kTrackerVersion = Version(0, 8, 0);
 
 #endif /* end of include guard: VERSION_H_C757E53C */
\ No newline at end of file