19 files changed, 118 insertions, 80 deletions

@@ -16,3 +16,6 @@
 [submodule "vendor/vcpkg"]
         path = vendor/vcpkg
         url = https://github.com/Microsoft/vcpkg.git
+[submodule "vendor/websocketpp"]
+        path = vendor/websocketpp
+        url = https://github.com/zaphoyd/websocketpp
@@ -1,5 +1,61 @@
 # lingo-ap-tracker Releases
 
+## v2.0.2 - 2025-05-24
+
+- Fixed issue connecting to the Archipelago 0.6.2 RC server.
+
+Download:
+[lingo-ap-tracker-v2.0.2-win64.zip](https://files.fourisland.com/releases/lingo-ap-tracker/lingo-ap-tracker-v2.0.2-win64.zip)<br/>
+Source: [v2.0.2](https://code.fourisland.com/lingo-ap-tracker/tag/?h=v2.0.2)
+
+## v2.0.1 - 2025-04-06
+
+- The tracker now assumes postgame shuffle is enabled when the flag is not
+  present in slot data (as is the case with Archipelago 0.6.1 and earlier).
+  Players who have postgame shuffle disabled will unfortunately see locations
+  that are not in their world, until this problem can be fixed.
+
+Download:
+[lingo-ap-tracker-v2.0.1-win64.zip](https://files.fourisland.com/releases/lingo-ap-tracker/lingo-ap-tracker-v2.0.1-win64.zip)<br/>
+Source: [v2.0.1](https://code.fourisland.com/lingo-ap-tracker/tag/?h=v2.0.1)
+
+## v2.0.0 - 2025-04-01
+
+- Compatibility update for Archipelago 0.6.0.
+
+Download:
+[lingo-ap-tracker-v2.0.0-win64.zip](https://files.fourisland.com/releases/lingo-ap-tracker/lingo-ap-tracker-v2.0.0-win64.zip)<br/>
+Source: [v2.0.0](https://code.fourisland.com/lingo-ap-tracker/tag/?h=v2.0.0)
+
+## v1.0.0 - 2025-03-21
+
+After almost two years of development, we have finally hit version 1!
+
+- The subway map now uses Kinrah's updated map image, including fully separated
+  paintings for places like The Wondrous and Orange Tower Sixth Floor, as well
+  as indicators for the color items.
+- Paintings have friendly names now instead of the internal game IDs. They are
+  also distinguished from regular checks by using an owl icon instead of an eye.
+- The tracker is now able to read your solved panel state from the multiworld
+  (requires v5.3.0 of the client). This obsoletes save file parsing and
+  receiving panel solves by connecting to the game.
+- Numerous optimizations to reachability detection and rendering.
+- Added a pane that shows all items received, similar to the web tracker.
+- Added a pane that shows your currently revealed painting mapping, as well as a
+  button that reveals it all immediately.
+- Added a pane that shows your slot options.
+- Postgame shuffle being disabled is handled properly now, and removed locations
+  are no longer shown.
+- Improved support for high-DPI screens. The tracker should no longer appear
+  "blurry" on a high-DPI screen, and should also be able to react properly to
+  being moved between screens with different DPIs.
+- The update checker is now able to download and install tracker updates in
+  place.
+
+Download:
+[lingo-ap-tracker-v1.0.0-win64.zip](https://files.fourisland.com/releases/lingo-ap-tracker/lingo-ap-tracker-v1.0.0-win64.zip)<br/>
+Source: [v1.0.0](https://code.fourisland.com/lingo-ap-tracker/tag/?h=v1.0.0)
+
 ## v0.12.3 - 2025-03-03
 
 - Fixed issue with non-ASCII connection details.
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.1)
+cmake_minimum_required (VERSION 3.20)
 project (lingo_ap_tracker)
 
 if (MSVC)
@@ -10,7 +10,6 @@ endif(MSVC)
 find_package(wxWidgets CONFIG REQUIRED)
 find_package(OpenSSL REQUIRED)
 find_package(yaml-cpp REQUIRED)
-find_package(websocketpp REQUIRED)
 find_package(fmt REQUIRED)
 
 include_directories(
@@ -19,7 +18,7 @@ include_directories(
   vendor/asio/asio/include
   vendor/nlohmann
   vendor/valijson/include
-  ${websocketpp_INCLUDE_DIRS}
+  vendor/websocketpp
   vendor/wswrap/include
   ${yaml-cpp_INCLUDE_DIRS}
   ${OpenSSL_INCLUDE_DIRS}
@@ -68,7 +67,7 @@ endif(MSVC)
 add_executable(lingo_ap_tracker ${SOURCE_FILES})
 set_property(TARGET lingo_ap_tracker PROPERTY CXX_STANDARD 20)
 set_property(TARGET lingo_ap_tracker PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(lingo_ap_tracker PRIVATE fmt::fmt OpenSSL::SSL OpenSSL::Crypto websocketpp::websocketpp wx::core wx::base wx::net yaml-cpp::yaml-cpp)
+target_link_libraries(lingo_ap_tracker PRIVATE fmt::fmt OpenSSL::SSL OpenSSL::Crypto wx::core wx::base wx::net yaml-cpp::yaml-cpp)
 
 set(SRC_DIR "${CMAKE_SOURCE_DIR}/assets")
 set(DST_DIR "${CMAKE_BINARY_DIR}/$<CONFIG>/assets")
@@ -1 +1 @@
-v0.12.3
\ No newline at end of file
+v2.0.2
\ No newline at end of file
@@ -1,8 +1,8 @@
-version: v0.12.3
+version: v2.0.2
 packages:
   win64:
-    url: "https://files.fourisland.com/releases/lingo-ap-tracker/lingo-ap-tracker-v0.12.3-win64.zip"
-    checksum: "0c0d8310d1ecae4f1b8de933661ba14f63aac011cd2b22947aff7085d997f0db"
+    url: "https://files.fourisland.com/releases/lingo-ap-tracker/lingo-ap-tracker-v2.0.2-win64.zip"
+    checksum: "dfb2fce2f5b14c09f4af7e7fcf6478e420a070db9fb23f9f9ad196f2db4b7518"
     files:
       - fmt.dll
       - jpeg62.dll
@@ -20,7 +20,7 @@ packages:
       - zlib1.dll
       - assets/areas.yaml
       - assets/checked.png
-      # TODO: next release will contain the checked owl
+      - assets/checked_owl.png
       - assets/ids.yaml
       - assets/lingo_map.png
       - assets/LL1.yaml
@@ -279,6 +279,8 @@
     map: [1368, 2103]

   Art Gallery:

     map: [2474, 1366]

+  Art Gallery (First Floor):

+    fold_into: Art Gallery

   Art Gallery (Second Floor):

     fold_into: Art Gallery

   Art Gallery (Third Floor):

@@ -29,8 +29,8 @@
 #include "tracker_state.h"
 
 constexpr int AP_MAJOR = 0;
-constexpr int AP_MINOR = 4;
-constexpr int AP_REVISION = 5;
+constexpr int AP_MINOR = 6;
+constexpr int AP_REVISION = 1;
 
 constexpr const char* CERT_STORE_PATH = "cacert.pem";
 constexpr int ITEM_HANDLING = 7;  // <- all
@@ -503,8 +503,9 @@ struct APState {
                            : kSUNWARP_ACCESS_NORMAL;
       sunwarp_shuffle = slot_data.contains("shuffle_sunwarps") &&
                         slot_data["shuffle_sunwarps"].get<int>() == 1;
-      postgame_shuffle = slot_data.contains("shuffle_postgame") &&
-                         slot_data["shuffle_postgame"].get<int>() == 1;
+      postgame_shuffle = slot_data.contains("shuffle_postgame")
+                             ? (slot_data["shuffle_postgame"].get<int>() == 1)
+                             : true;
 
       if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) {
         painting_mapping.clear();
@@ -50,11 +50,8 @@ void AreaPopup::ResetIndicators() {
   for (int section_id = 0; section_id < map_area.locations.size();
        section_id++) {
     const Location& location = map_area.locations.at(section_id);
-    if (IsLocationPostgame(location.ap_location_id)) {
-      continue;
-    }
-
-    if (!AP_IsLocationVisible(location.classification) &&
+    if ((!AP_IsLocationVisible(location.classification) ||
+         IsLocationPostgame(location.ap_location_id)) &&
         !(location.hunt &&
           GetTrackerConfig().visible_panels == TrackerConfig::kHUNT_PANELS) &&
         !(location.single_panel &&
@@ -29,7 +29,6 @@ struct GameData {
   std::map<std::string, int> painting_by_id_;
 
   std::vector<int> door_definition_order_;
-  std::vector<int> room_definition_order_;
 
   std::map<std::string, int> room_by_painting_;
   std::map<int, int> room_by_sunwarp_;
@@ -92,7 +91,6 @@ struct GameData {
 
     for (const auto &room_it : lingo_config) {
       int room_id = AddOrGetRoom(room_it.first.as<std::string>());
-      room_definition_order_.push_back(room_id);
 
       for (const auto &entrance_it : room_it.second["entrances"]) {
         int from_room_id = AddOrGetRoom(entrance_it.first.as<std::string>());
@@ -129,6 +127,10 @@ struct GameData {
                 exit_obj.type = EntranceType::kCrossroadsRoofAccess;
               }
 
+              if (option["static_painting"] && option["static_painting"].as<bool>()) {
+                exit_obj.type = EntranceType::kStaticPainting;
+              }
+
               rooms_[from_room_id].exits.push_back(exit_obj);
             };
 
@@ -780,31 +782,6 @@ struct GameData {
       }
     }
 
-    // As a workaround for a generator bug in 0.5.1, we are going to remove the
-    // panel door requirement on panels that are defined earlier in the file than
-    // the panel door is. This results in logic that matches the generator, even
-    // if it is not true to how the game should work. This will be reverted once
-    // the logic bug is fixed and released.
-    // See: https://github.com/ArchipelagoMW/Archipelago/pull/4342
-    for (Panel& panel : panels_) {
-      if (panel.panel_door == -1) {
-        continue;
-      }
-      const PanelDoor &panel_door = panel_doors_[panel.panel_door];
-      for (int room_id : room_definition_order_) {
-        if (room_id == panel_door.room) {
-          // The panel door was defined first (or at the same time as the panel),
-          // so we're good.
-          break;
-        } else if (room_id == panel.room) {
-          // The panel was defined first, so we have to pretend the panel door is
-          // not required for this panel.
-          panel.panel_door = -1;
-          break;
-        }
-      }
-    }
-
     // Report errors.
     for (const std::string &area : malconfigured_areas_) {
       TrackerLog(fmt::format("Area data not found for: {}", area));
@@ -937,7 +914,7 @@ struct GameData {
     if (!panel_doors_by_id_.count(full_name)) {
       int panel_door_id = panel_doors_.size();
       panel_doors_by_id_[full_name] = panel_door_id;
-      panel_doors_.push_back({.room = AddOrGetRoom(room)});
+      panel_doors_.push_back({});
     }
 
     return panel_doors_by_id_[full_name];
@@ -31,6 +31,7 @@ enum class EntranceType {
   kWarp,
   kPilgrimage,
   kCrossroadsRoofAccess,
+  kStaticPainting,
 };
 
 enum class DoorType {
@@ -86,7 +87,6 @@ struct Door {
 };
 
 struct PanelDoor {
-  int room;
   int ap_item_id = -1;
   int group_ap_item_id = -1;
   std::vector<ProgressiveRequirement> progressives;
@@ -10,7 +10,7 @@
 
 class TrackerApp : public wxApp {
  public:
-  virtual bool OnInit() {
+  virtual bool OnInit() override {
     GetTrackerConfig().Load();
 
     TrackerFrame *frame = new TrackerFrame();
@@ -55,15 +55,13 @@ void TrackerPanel::UpdateIndicators(bool reset) {
     for (AreaIndicator &area : areas_) {
       const MapArea &map_area = GD_GetMapArea(area.area_id);
 
-      if (IsAreaPostgame(area.area_id)) {
-        area.active = false;
-      } else if (!AP_IsLocationVisible(map_area.classification) &&
-                 !(map_area.hunt && GetTrackerConfig().visible_panels ==
-                                        TrackerConfig::kHUNT_PANELS) &&
-                 !(map_area.has_single_panel &&
-                   GetTrackerConfig().visible_panels ==
-                       TrackerConfig::kALL_PANELS) &&
-                 !(AP_IsPaintingShuffle() && !map_area.paintings.empty())) {
+      if ((!AP_IsLocationVisible(map_area.classification) ||
+           IsAreaPostgame(area.area_id)) &&
+          !(map_area.hunt &&
+            GetTrackerConfig().visible_panels == TrackerConfig::kHUNT_PANELS) &&
+          !(map_area.has_single_panel &&
+            GetTrackerConfig().visible_panels == TrackerConfig::kALL_PANELS) &&
+          !(AP_IsPaintingShuffle() && !map_area.paintings.empty())) {
         area.active = false;
       } else {
         area.active = true;
@@ -233,11 +231,10 @@ void TrackerPanel::Redraw() {
     bool has_unreachable_unchecked = false;
     for (const Location &section : map_area.locations) {
       bool has_unchecked = false;
-      if (IsLocationPostgame(section.ap_location_id)) {
-        // Nope.
-      } else if (IsLocationWinCondition(section)) {
+      if (IsLocationWinCondition(section)) {
         has_unchecked = !AP_HasReachedGoal();
-      } else if (AP_IsLocationVisible(section.classification)) {
+      } else if (AP_IsLocationVisible(section.classification) &&
+                 !IsLocationPostgame(section.ap_location_id)) {
         has_unchecked = !AP_HasCheckedGameLocation(section.ap_location_id);
       } else if ((section.hunt && GetTrackerConfig().visible_panels ==
                                       TrackerConfig::kHUNT_PANELS) ||
@@ -342,7 +342,7 @@ class StateCalculator {
             new_boundary.push_back(
                 {.source_room = room_exit.destination_room,
                  .destination_room = GD_GetRoomByName("Color Hallways"),
-                 .type = EntranceType::kPainting});
+                 .type = EntranceType::kStaticPainting});
           }
 
           if (AP_IsPilgrimageEnabled()) {
@@ -368,7 +368,7 @@ class StateCalculator {
                    .destination_room = GD_GetRoomByName("Pilgrim Antechamber"),
                    .door =
                        GD_GetDoorByName("Pilgrim Antechamber - Sun Painting"),
-                   .type = EntranceType::kPainting});
+                   .type = EntranceType::kStaticPainting});
             }
           }
 
@@ -650,7 +650,8 @@ class StateCalculator {
           !AP_DoesPilgrimageAllowRoofAccess()) {
         return kNo;
       }
-      if (room_exit.type == EntranceType::kPainting &&
+      if ((room_exit.type == EntranceType::kPainting ||
+           room_exit.type == EntranceType::kStaticPainting) &&
           !AP_DoesPilgrimageAllowPaintings()) {
         return kNo;
       }
@@ -36,7 +36,7 @@ std::string CalculateStringSha256(const wxString& data) {
 
   char output[65] = {0};
   for (int i = 0; i < SHA256_DIGEST_LENGTH; i++) {
-    sprintf(output + (i * 2), "%02x", hash[i]);
+    snprintf(output + (i * 2), 3, "%02x", hash[i]);
   }
 
   return std::string(output);
@@ -172,26 +172,33 @@ void Updater::InstallUpdate(std::string url, std::string checksum,
     return;
   }
 
-  package_path_.clear();
-  package_path_.resize(L_tmpnam + 1);
-  tmpnam_s(package_path_.data(), L_tmpnam);
+  bool download_issue = false;
 
-  {
-    wxFileOutputStream writeOut(package_path_);
+  wxFileName package_path;
+  package_path.AssignTempFileName("");
+
+  if (!package_path.IsOk()) {
+    download_issue = true;
+  } else {
+    wxFileOutputStream writeOut(package_path.GetFullPath());
     wxString fileData = packageRequest.GetResponse().AsString();
     writeOut.WriteAll(fileData.c_str(), fileData.length());
 
     std::string downloadedChecksum = CalculateStringSha256(fileData);
     if (downloadedChecksum != checksum) {
-      if (wxMessageBox("There was an issue downloading the update. Would you "
-                       "like to manually download it instead?",
-                       "Error", wxYES_NO | wxICON_ERROR) == wxID_YES) {
-        wxLaunchDefaultBrowser(kChangelogUrl);
-      }
-      return;
+      download_issue = true;
     }
   }
 
+  if (download_issue) {
+    if (wxMessageBox("There was an issue downloading the update. Would you "
+                     "like to manually download it instead?",
+                     "Error", wxYES_NO | wxICON_ERROR) == wxID_YES) {
+      wxLaunchDefaultBrowser(kChangelogUrl);
+    }
+    return;
+  }
+
   std::filesystem::path newArea = GetExecutableDirectory();
   std::filesystem::path oldArea = newArea / "old";
   std::set<std::filesystem::path> folders;
@@ -241,7 +248,7 @@ void Updater::InstallUpdate(std::string url, std::string checksum,
     }
   }
 
-  wxFileInputStream fileInputStream(package_path_);
+  wxFileInputStream fileInputStream(package_path.GetFullPath());
   wxZipInputStream zipStream(fileInputStream);
   std::unique_ptr<wxZipEntry> zipEntry;
   while ((zipEntry = std::unique_ptr<wxZipEntry>(zipStream.GetNextEntry())) !=
@@ -41,7 +41,6 @@ class Updater : public wxEvtHandler {
 
   wxFrame* parent_;
   UpdateState update_state_ = UpdateState::GetVersionInvisible;
-  std::string package_path_;
 };
 
 #endif /* end of include guard: UPDATER_H_809E7381 */
@@ -36,6 +36,6 @@ struct Version {
   }
 };
 
-constexpr const Version kTrackerVersion = Version(1, 0, 0);
+constexpr const Version kTrackerVersion = Version(2, 0, 2);
 
 #endif /* end of include guard: VERSION_H_C757E53C */
\ No newline at end of file
@@ -1,6 +1,5 @@
 {
   "dependencies": [
-    "websocketpp",
     "wxwidgets",
     "openssl",
     "yaml-cpp",
-Subproject 3dd44b931481d7a8e9ba412621fa810232b6628
+Subproject df8bfe519564ae001903e5cdd32af0999531ef7
+Subproject 1b11fd301531e6df35a6107c1e8665b1e77a2d8