50 files changed, 4681 insertions, 965 deletions

@@ -8,23 +8,24 @@ AchievementsPane::AchievementsPane(wxWindow* parent)
   AppendColumn("Achievement");
 
   for (int panel_id : GD_GetAchievementPanels()) {
-    achievement_names_.push_back(GD_GetPanel(panel_id).achievement_name);
+    const Panel& panel = GD_GetPanel(panel_id);
+    achievements_.emplace_back(panel.achievement_name, panel.solve_index);
   }
 
-  std::sort(std::begin(achievement_names_), std::end(achievement_names_));
+  std::sort(std::begin(achievements_), std::end(achievements_));
 
-  for (int i = 0; i < achievement_names_.size(); i++) {
-    InsertItem(i, achievement_names_.at(i));
+  for (int i = 0; i < achievements_.size(); i++) {
+    InsertItem(i, std::get<0>(achievements_.at(i)));
   }
 
-  SetColumnWidth(0, wxLIST_AUTOSIZE);
+  SetColumnWidth(0, wxLIST_AUTOSIZE_USEHEADER);
 
   UpdateIndicators();
 }
 
 void AchievementsPane::UpdateIndicators() {
-  for (int i = 0; i < achievement_names_.size(); i++) {
-    if (AP_HasAchievement(achievement_names_.at(i))) {
+  for (int i = 0; i < achievements_.size(); i++) {
+    if (AP_IsPanelSolved(std::get<1>(achievements_.at(i)))) {
       SetItemTextColour(i, *wxBLACK);
     } else {
       SetItemTextColour(i, *wxRED);
@@ -9,6 +9,10 @@
 
 #include <wx/listctrl.h>
 
+#include <string>
+#include <tuple>
+#include <vector>
+
 class AchievementsPane : public wxListView {
  public:
   explicit AchievementsPane(wxWindow* parent);
@@ -16,7 +20,7 @@ class AchievementsPane : public wxListView {
   void UpdateIndicators();
 
  private:
-  std::vector<std::string> achievement_names_;
+  std::vector<std::tuple<std::string, int>> achievements_; // name, solve index
 };
 
 #endif /* end of include guard: ACHIEVEMENTS_PANE_H_C320D0B8 */
\ No newline at end of file
@@ -4,11 +4,13 @@
 #define _WEBSOCKETPP_CPP11_STRICT_
 #pragma comment(lib, "crypt32")
 
+#include <fmt/core.h>
 #include <hkutil/string.h>
 
 #include <any>
 #include <apclient.hpp>
 #include <apuuid.hpp>
+#include <bitset>
 #include <chrono>
 #include <exception>
 #include <filesystem>
@@ -21,42 +23,73 @@
 #include <tuple>
 
 #include "game_data.h"
+#include "ipc_state.h"
+#include "logger.h"
 #include "tracker_frame.h"
 #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
 
+constexpr int CONNECTION_TIMEOUT = 50000;  // 50 seconds
+constexpr int CONNECTION_BACKOFF_INTERVAL = 100;
+
+constexpr int PANEL_COUNT = 803;
+constexpr int PANEL_BITFIELD_LENGTH = 48;
+constexpr int PANEL_BITFIELDS = 17;
+
 namespace {
 
-struct APState {
-  std::unique_ptr<APClient> apclient;
+const std::set<long> kNonProgressionItems = {
+    444409,  // :)
+    444575,  // The Feeling of Being Lost
+    444576,  // Wanderlust
+    444577,  // Empty White Hallways
+    444410,  // Slowness Trap
+    444411,  // Iceland Trap
+    444412,  // Atbash Trap
+    444413,  // Puzzle Skip
+    444680,  // Speed Boost
+};
 
+struct APState {
+  // Initialized on main thread
   bool initialized = false;
-
   TrackerFrame* tracker_frame = nullptr;
+  std::list<std::string> tracked_data_storage_keys;
 
-  bool client_active = false;
+  // Client
   std::mutex client_mutex;
+  std::unique_ptr<APClient> apclient;
+
+  // Protected state
+  std::mutex state_mutex;
+
+  std::string status_message = "Not connected to Archipelago.";
 
   bool connected = false;
-  bool has_connection_result = false;
+  std::string connection_failure;
+  int remaining_loops = 0;
 
   std::string data_storage_prefix;
-  std::list<std::string> tracked_data_storage_keys;
   std::string victory_data_storage_key;
 
+  std::string save_name;
+
   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;
+  std::bitset<PANEL_COUNT> solved_panels;
 
   DoorShuffleMode door_shuffle_mode = kNO_DOORS;
+  bool group_doors = false;
   bool color_shuffle = false;
+  PanelShuffleMode panel_shuffle_mode = kNO_PANELS;
   bool painting_shuffle = false;
   int mastery_requirement = 21;
   int level_2_requirement = 223;
@@ -68,37 +101,197 @@ struct APState {
   bool pilgrimage_allows_paintings = false;
   SunwarpAccess sunwarp_access = kSUNWARP_ACCESS_NORMAL;
   bool sunwarp_shuffle = false;
+  bool postgame_shuffle = true;
 
   std::map<std::string, std::string> painting_mapping;
+  std::set<std::string> painting_codomain;
   std::map<int, SunwarpMapping> sunwarp_mapping;
 
   void Connect(std::string server, std::string player, std::string password) {
-    if (!initialized) {
-      wxLogVerbose("Initializing APState...");
+    Initialize();
 
-      std::thread([this]() {
-        for (;;) {
-          {
-            std::lock_guard client_guard(client_mutex);
-            if (apclient) {
-              apclient->poll();
-            }
-          }
+    {
+      std::lock_guard state_guard(state_mutex);
+      SetStatusMessage("Connecting to Archipelago server....");
+    }
+    TrackerLog(fmt::format("Connecting to Archipelago server ({})...", server));
 
-          std::this_thread::sleep_for(std::chrono::milliseconds(100));
-        }
-      }).detach();
+    // Creating and setting up the client has to all be done while holding the
+    // client mutex, so that the other thread doesn't try to poll before we add
+    // handlers, etc.
+    {
+      TrackerLog("Destroying old AP client...");
+
+      std::lock_guard client_guard(client_mutex);
 
-      for (int panel_id : GD_GetAchievementPanels()) {
-        tracked_data_storage_keys.push_back(
-            "Achievement|" + GD_GetPanel(panel_id).achievement_name);
+      if (apclient) {
+        DestroyClient();
       }
 
-      for (const MapArea& map_area : GD_GetMapAreas()) {
-        for (const Location& location : map_area.locations) {
-          tracked_data_storage_keys.push_back(
-              "Hunt|" + std::to_string(location.ap_location_id));
-        }
+      std::string cert_store = "";
+      if (std::filesystem::exists(CERT_STORE_PATH)) {
+        cert_store = CERT_STORE_PATH;
+      }
+
+      apclient = std::make_unique<APClient>(ap_get_uuid(""), "Lingo", server,
+                                            cert_store);
+
+      {
+        std::lock_guard state_guard(state_mutex);
+
+        connected = false;
+        connection_failure.clear();
+        remaining_loops = CONNECTION_TIMEOUT / CONNECTION_BACKOFF_INTERVAL;
+
+        save_name.clear();
+        inventory.clear();
+        checked_locations.clear();
+        data_storage.clear();
+        player_pos = std::nullopt;
+        solved_panels.reset();
+        victory_data_storage_key.clear();
+        door_shuffle_mode = kNO_DOORS;
+        group_doors = false;
+        color_shuffle = false;
+        panel_shuffle_mode = kNO_PANELS;
+        painting_shuffle = false;
+        painting_mapping.clear();
+        painting_codomain.clear();
+        mastery_requirement = 21;
+        level_2_requirement = 223;
+        location_checks = kNORMAL_LOCATIONS;
+        victory_condition = kTHE_END;
+        early_color_hallways = false;
+        pilgrimage_enabled = false;
+        pilgrimage_allows_roof_access = false;
+        pilgrimage_allows_paintings = false;
+        sunwarp_access = kSUNWARP_ACCESS_NORMAL;
+        sunwarp_shuffle = false;
+        sunwarp_mapping.clear();
+        postgame_shuffle = true;
+      }
+
+      apclient->set_room_info_handler(
+          [this, player, password]() { OnRoomInfo(player, password); });
+
+      apclient->set_location_checked_handler(
+          [this](const std::list<int64_t>& locations) {
+            OnLocationChecked(locations);
+          });
+
+      apclient->set_slot_disconnected_handler(
+          [this]() { OnSlotDisconnected(); });
+
+      apclient->set_socket_disconnected_handler(
+          [this]() { OnSocketDisconnected(); });
+
+      apclient->set_items_received_handler(
+          [this](const std::list<APClient::NetworkItem>& items) {
+            OnItemsReceived(items);
+          });
+
+      apclient->set_retrieved_handler(
+          [this](const std::map<std::string, nlohmann::json>& data) {
+            OnRetrieved(data);
+          });
+
+      apclient->set_set_reply_handler(
+          [this](const std::string& key, const nlohmann::json& value,
+                 const nlohmann::json&) { OnSetReply(key, value); });
+
+      apclient->set_slot_connected_handler(
+          [this, player, server](const nlohmann::json& slot_data) {
+            OnSlotConnected(player, server, slot_data);
+          });
+
+      apclient->set_slot_refused_handler(
+          [this](const std::list<std::string>& errors) {
+            OnSlotRefused(errors);
+          });
+    }
+  }
+
+  std::string GetStatusMessage() {
+    std::lock_guard state_guard(state_mutex);
+
+    return status_message;
+  }
+
+  bool HasCheckedGameLocation(int location_id) {
+    std::lock_guard state_guard(state_mutex);
+
+    return checked_locations.count(location_id);
+  }
+
+  bool HasItem(int item_id, int quantity) {
+    return inventory.count(item_id) && inventory.at(item_id) >= quantity;
+  }
+
+  bool HasItemSafe(int item_id, int quantity) {
+    std::lock_guard state_guard(state_mutex);
+    return HasItem(item_id, quantity);
+  }
+
+  const std::set<std::string>& GetCheckedPaintings() {
+    std::lock_guard state_guard(state_mutex);
+
+    std::string key = fmt::format("{}Paintings", data_storage_prefix);
+    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));
+  }
+
+  bool IsPaintingChecked(const std::string& painting_id) {
+    const auto& checked_paintings = GetCheckedPaintings();
+
+    std::lock_guard state_guard(state_mutex);
+
+    return checked_paintings.count(painting_id) ||
+           (painting_mapping.count(painting_id) &&
+            checked_paintings.count(painting_mapping.at(painting_id)));
+  }
+
+  void RevealPaintings() {
+    std::lock_guard state_guard(state_mutex);
+
+    std::vector<std::string> paintings;
+    for (const PaintingExit& painting : GD_GetPaintings()) {
+      paintings.push_back(painting.internal_id);
+    }
+
+    APClient::DataStorageOperation operation;
+    operation.operation = "replace";
+    operation.value = paintings;
+
+    apclient->Set(fmt::format("{}Paintings", data_storage_prefix), "", true,
+                  {operation});
+  }
+
+  bool HasReachedGoal() {
+    std::lock_guard state_guard(state_mutex);
+
+    return data_storage.count(victory_data_storage_key) &&
+           std::any_cast<int>(data_storage.at(victory_data_storage_key)) ==
+               30;  // CLIENT_GOAL
+  }
+
+  bool IsPanelSolved(int solve_index) {
+    std::lock_guard state_guard(state_mutex);
+
+    return solved_panels.test(solve_index);
+  }
+
+ private:
+  void Initialize() {
+    if (!initialized) {
+      TrackerLog("Initializing APState...");
+
+      std::thread([this]() { Thread(); }).detach();
+
+      for (int i = 0; i < PANEL_BITFIELDS; i++) {
+        tracked_data_storage_keys.push_back(fmt::format("Panels_{}", i));
       }
 
       tracked_data_storage_keys.push_back("PlayerPos");
@@ -106,125 +299,189 @@ struct APState {
 
       initialized = true;
     }
+  }
 
-    tracker_frame->SetStatusMessage("Connecting to Archipelago server....");
-    wxLogStatus("Connecting to Archipelago server (%s)...", server);
+  void Thread() {
+    std::string display_error;
 
-    {
-      wxLogVerbose("Destroying old AP client...");
+    for (;;) {
+      {
+        std::lock_guard client_guard(client_mutex);
+        if (apclient) {
+          apclient->poll();
 
-      std::lock_guard client_guard(client_mutex);
+          {
+            std::lock_guard state_guard(state_mutex);
 
-      if (apclient) {
-        DestroyClient();
+            if (!connected) {
+              if (!connection_failure.empty()) {
+                TrackerLog(connection_failure);
+
+                display_error = connection_failure;
+                connection_failure.clear();
+
+                DestroyClient();
+              } else {
+                remaining_loops--;
+
+                if (remaining_loops <= 0) {
+                  DestroyClient();
+
+                  SetStatusMessage("Disconnected from Archipelago.");
+                  TrackerLog("Timeout while connecting to Archipelago server.");
+
+                  display_error =
+                      "Timeout while connecting to Archipelago server.";
+                }
+              }
+            }
+          }
+        }
       }
 
-      std::string cert_store = "";
-      if (std::filesystem::exists(CERT_STORE_PATH)) {
-        cert_store = CERT_STORE_PATH;
+      if (!display_error.empty()) {
+        wxMessageBox(display_error, "Connection failed", wxOK | wxICON_ERROR);
+        display_error.clear();
       }
 
-      apclient = std::make_unique<APClient>(ap_get_uuid(""), "Lingo", server,
-                                            cert_store);
+      std::this_thread::sleep_for(std::chrono::milliseconds(100));
     }
+  }
+
+  void OnRoomInfo(std::string player, std::string password) {
+    {
+      std::lock_guard state_guard(state_mutex);
 
-    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;
-    painting_shuffle = false;
-    painting_mapping.clear();
-    mastery_requirement = 21;
-    level_2_requirement = 223;
-    location_checks = kNORMAL_LOCATIONS;
-    victory_condition = kTHE_END;
-    early_color_hallways = false;
-    pilgrimage_enabled = false;
-    pilgrimage_allows_roof_access = false;
-    pilgrimage_allows_paintings = false;
-    sunwarp_access = kSUNWARP_ACCESS_NORMAL;
-    sunwarp_shuffle = false;
-    sunwarp_mapping.clear();
-
-    connected = false;
-    has_connection_result = false;
-
-    apclient->set_room_info_handler([this, player, password]() {
       inventory.clear();
 
-      wxLogStatus("Connected to Archipelago server. Authenticating as %s %s",
-                  player,
-                  (password.empty() ? "without password"
-                                    : "with password " + password));
-      tracker_frame->SetStatusMessage(
-          "Connected to Archipelago server. Authenticating...");
-
-      apclient->ConnectSlot(player, password, ITEM_HANDLING, {"Tracker"},
-                            {AP_MAJOR, AP_MINOR, AP_REVISION});
-    });
-
-    apclient->set_location_checked_handler(
-        [this](const std::list<int64_t>& locations) {
-          for (const int64_t location_id : locations) {
-            checked_locations.insert(location_id);
-            wxLogVerbose("Location: %lld", location_id);
-          }
+      SetStatusMessage("Connected to Archipelago server. Authenticating...");
+    }
 
-          RefreshTracker(false);
-        });
-
-    apclient->set_slot_disconnected_handler([this]() {
-      tracker_frame->SetStatusMessage(
-          "Disconnected from Archipelago. Attempting to reconnect...");
-      wxLogStatus(
-          "Slot disconnected from Archipelago. Attempting to reconnect...");
-    });
-
-    apclient->set_socket_disconnected_handler([this]() {
-      tracker_frame->SetStatusMessage(
-          "Disconnected from Archipelago. Attempting to reconnect...");
-      wxLogStatus(
-          "Socket disconnected from Archipelago. Attempting to reconnect...");
-    });
-
-    apclient->set_items_received_handler(
-        [this](const std::list<APClient::NetworkItem>& items) {
-          for (const APClient::NetworkItem& item : items) {
-            inventory[item.item]++;
-            wxLogVerbose("Item: %lld", item.item);
-          }
+    TrackerLog(fmt::format(
+        "Connected to Archipelago server. Authenticating as {} {}", player,
+        (password.empty() ? "without password" : "with password " + password)));
 
-          RefreshTracker(false);
-        });
+    apclient->ConnectSlot(player, password, ITEM_HANDLING, {"Tracker"},
+                          {AP_MAJOR, AP_MINOR, AP_REVISION});
+  }
 
-    apclient->set_retrieved_handler(
-        [this](const std::map<std::string, nlohmann::json>& data) {
-          for (const auto& [key, value] : data) {
-            HandleDataStorage(key, value);
-          }
+  void OnLocationChecked(const std::list<int64_t>& locations) {
+    {
+      std::lock_guard state_guard(state_mutex);
+
+      for (const int64_t location_id : locations) {
+        checked_locations.insert(location_id);
+        TrackerLog(fmt::format("Location: {}", location_id));
+      }
+    }
+
+    RefreshTracker(StateUpdate{.cleared_locations = true});
+  }
+
+  void OnSlotDisconnected() {
+    std::lock_guard state_guard(state_mutex);
+
+    SetStatusMessage(
+        "Disconnected from Archipelago. Attempting to reconnect...");
+    TrackerLog(
+        "Slot disconnected from Archipelago. Attempting to reconnect...");
+  }
+
+  void OnSocketDisconnected() {
+    std::lock_guard state_guard(state_mutex);
+
+    SetStatusMessage(
+        "Disconnected from Archipelago. Attempting to reconnect...");
+    TrackerLog(
+        "Socket disconnected from Archipelago. Attempting to reconnect...");
+  }
+
+  void OnItemsReceived(const std::list<APClient::NetworkItem>& items) {
+    std::vector<ItemState> item_states;
+    bool progression_items = false;
+
+    {
+      std::lock_guard state_guard(state_mutex);
+
+      std::map<int64_t, int> index_by_item;
+
+      for (const APClient::NetworkItem& item : items) {
+        inventory[item.item]++;
+        TrackerLog(fmt::format("Item: {}", item.item));
+
+        index_by_item[item.item] = item.index;
+
+        if (!kNonProgressionItems.count(item.item)) {
+          progression_items = true;
+        }
+      }
+
+      for (const auto& [item_id, item_index] : index_by_item) {
+        item_states.push_back(ItemState{.name = GD_GetItemName(item_id),
+                                        .amount = inventory[item_id],
+                                        .index = item_index});
+      }
+    }
+
+    RefreshTracker(StateUpdate{.items = item_states,
+                               .progression_items = progression_items});
+  }
+
+  void OnRetrieved(const std::map<std::string, nlohmann::json>& data) {
+    StateUpdate state_update;
+
+    {
+      std::lock_guard state_guard(state_mutex);
+
+      for (const auto& [key, value] : data) {
+        HandleDataStorage(key, value, state_update);
+      }
+    }
 
-          RefreshTracker(false);
-        });
+    RefreshTracker(state_update);
+  }
+
+  void OnSetReply(const std::string& key, const nlohmann::json& value) {
+    StateUpdate state_update;
+
+    {
+      std::lock_guard state_guard(state_mutex);
+      HandleDataStorage(key, value, state_update);
+    }
+
+    RefreshTracker(state_update);
+  }
+
+  void OnSlotConnected(std::string player, std::string server,
+                       const nlohmann::json& slot_data) {
+    IPC_SetTrackerSlot(server, player);
+
+    TrackerLog("Connected to Archipelago!");
 
-    apclient->set_set_reply_handler([this](const std::string& key,
-                                           const nlohmann::json& value,
-                                           const nlohmann::json&) {
-      HandleDataStorage(key, value);
-      RefreshTracker(false);
-    });
+    {
+      std::lock_guard state_guard(state_mutex);
 
-    apclient->set_slot_connected_handler([this](
-                                             const nlohmann::json& slot_data) {
-      tracker_frame->SetStatusMessage("Connected to Archipelago!");
-      wxLogStatus("Connected to Archipelago!");
+      SetStatusMessage(
+          fmt::format("Connected to Archipelago! ({}@{}).", player, server));
 
+      save_name = fmt::format("zzAP_{}_{}.save", apclient->get_seed(),
+                              apclient->get_player_number());
       data_storage_prefix =
-          "Lingo_" + std::to_string(apclient->get_player_number()) + "_";
+          fmt::format("Lingo_{}_", apclient->get_player_number());
       door_shuffle_mode = slot_data["shuffle_doors"].get<DoorShuffleMode>();
+      if (slot_data.contains("group_doors")) {
+        group_doors = slot_data.contains("group_doors") &&
+                      slot_data["group_doors"].get<int>() == 1;
+      } else {
+        // If group_doors doesn't exist yet, that means kPANELS_MODE is
+        // actually kSIMPLE_DOORS.
+        if (door_shuffle_mode == kPANELS_MODE) {
+          door_shuffle_mode = kDOORS_MODE;
+          group_doors = true;
+        }
+      }
       color_shuffle = slot_data["shuffle_colors"].get<int>() == 1;
+      panel_shuffle_mode = slot_data["shuffle_panels"].get<PanelShuffleMode>();
       painting_shuffle = slot_data["shuffle_paintings"].get<int>() == 1;
       mastery_requirement = slot_data["mastery_achievements"].get<int>();
       level_2_requirement = slot_data["level_2_requirement"].get<int>();
@@ -246,6 +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)
+                             : true;
 
       if (painting_shuffle && slot_data.contains("painting_entrance_to_exit")) {
         painting_mapping.clear();
@@ -253,6 +513,7 @@ struct APState {
         for (const auto& mapping_it :
              slot_data["painting_entrance_to_exit"].items()) {
           painting_mapping[mapping_it.key()] = mapping_it.value();
+          painting_codomain.insert(mapping_it.value());
         }
       }
 
@@ -268,193 +529,165 @@ struct APState {
         }
       }
 
-      connected = true;
-      has_connection_result = true;
-
-      RefreshTracker(true);
-
       std::list<std::string> corrected_keys;
       for (const std::string& key : tracked_data_storage_keys) {
         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();
-      }
+      victory_data_storage_key =
+          fmt::format("_read_client_status_{}_{}", apclient->get_team_number(),
+                      apclient->get_player_number());
 
       corrected_keys.push_back(victory_data_storage_key);
 
       apclient->Get(corrected_keys);
       apclient->SetNotify(corrected_keys);
-    });
-
-    apclient->set_slot_refused_handler(
-        [this](const std::list<std::string>& errors) {
-          connected = false;
-          has_connection_result = true;
-
-          tracker_frame->SetStatusMessage("Disconnected from Archipelago.");
-
-          std::vector<std::string> error_messages;
-          error_messages.push_back("Could not connect to Archipelago.");
-
-          for (const std::string& error : errors) {
-            if (error == "InvalidSlot") {
-              error_messages.push_back("Invalid player name.");
-            } else if (error == "InvalidGame") {
-              error_messages.push_back(
-                  "The specified player is not playing Lingo.");
-            } else if (error == "IncompatibleVersion") {
-              error_messages.push_back(
-                  "The Archipelago server is not the correct version for this "
-                  "client.");
-            } else if (error == "InvalidPassword") {
-              error_messages.push_back("Incorrect password.");
-            } else if (error == "InvalidItemsHandling") {
-              error_messages.push_back(
-                  "Invalid item handling flag. This is a bug with the tracker. "
-                  "Please report it to the lingo-ap-tracker GitHub.");
-            } else {
-              error_messages.push_back("Unknown error.");
-            }
-          }
-
-          std::string full_message = hatkirby::implode(error_messages, " ");
-          wxLogError(wxString(full_message));
-
-          wxMessageBox(full_message, "Connection failed", wxOK | wxICON_ERROR);
-        });
-
-    client_active = true;
 
-    int timeout = 5000;  // 5 seconds
-    int interval = 100;
-    int remaining_loops = timeout / interval;
-    while (!has_connection_result) {
-      if (interval == 0) {
-        connected = false;
-        has_connection_result = true;
+      connected = true;
+    }
 
-        DestroyClient();
+    ResetReachabilityRequirements();
+    RefreshTracker(std::nullopt);
+  }
 
-        tracker_frame->SetStatusMessage("Disconnected from Archipelago.");
-        wxLogStatus("Timeout while connecting to Archipelago server.");
-        wxMessageBox("Timeout while connecting to Archipelago server.",
-                     "Connection failed", wxOK | wxICON_ERROR);
+  void OnSlotRefused(const std::list<std::string>& errors) {
+    std::vector<std::string> error_messages;
+    error_messages.push_back("Could not connect to Archipelago.");
+
+    for (const std::string& error : errors) {
+      if (error == "InvalidSlot") {
+        error_messages.push_back("Invalid player name.");
+      } else if (error == "InvalidGame") {
+        error_messages.push_back("The specified player is not playing Lingo.");
+      } else if (error == "IncompatibleVersion") {
+        error_messages.push_back(
+            "The Archipelago server is not the correct version for this "
+            "client.");
+      } else if (error == "InvalidPassword") {
+        error_messages.push_back("Incorrect password.");
+      } else if (error == "InvalidItemsHandling") {
+        error_messages.push_back(
+            "Invalid item handling flag. This is a bug with the tracker. "
+            "Please report it to the lingo-ap-tracker GitHub.");
+      } else {
+        error_messages.push_back("Unknown error.");
       }
+    }
 
-      std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    {
+      std::lock_guard state_guard(state_mutex);
+      connection_failure = hatkirby::implode(error_messages, " ");
 
-      interval--;
+      SetStatusMessage("Disconnected from Archipelago.");
     }
+  }
 
-    if (connected) {
-      RefreshTracker(false);
-    } else {
-      client_active = false;
-    }
+  // Assumes state mutex is locked.
+  void SetStatusMessage(std::string msg) {
+    status_message = std::move(msg);
+
+    tracker_frame->UpdateStatusMessage();
   }
 
-  void HandleDataStorage(const std::string& key, const nlohmann::json& value) {
+  // Assumes state mutex is locked.
+  void HandleDataStorage(const std::string& key, const nlohmann::json& value, StateUpdate& state_update) {
     if (value.is_boolean()) {
       data_storage[key] = value.get<bool>();
-      wxLogVerbose("Data storage %s retrieved as %s", key,
-                   (value.get<bool>() ? "true" : "false"));
+      TrackerLog(fmt::format("Data storage {} retrieved as {}", key,
+                             (value.get<bool>() ? "true" : "false")));
+
     } else if (value.is_number()) {
       data_storage[key] = value.get<int>();
-      wxLogVerbose("Data storage %s retrieved as %d", key, value.get<int>());
+      TrackerLog(fmt::format("Data storage {} retrieved as {}", key,
+                             value.get<int>()));
+
+      if (key == victory_data_storage_key) {
+        state_update.cleared_locations = true;
+      } else if (key.find("Panels_") != std::string::npos) {
+        int bitfield_num =
+            std::stoi(key.substr(data_storage_prefix.size() + 7));
+        uint64_t bitfield_value = value.get<uint64_t>();
+        for (int i = 0; i < PANEL_BITFIELD_LENGTH; i++) {
+          if ((bitfield_value & (1LL << i)) != 0) {
+            int solve_index = bitfield_num * PANEL_BITFIELD_LENGTH + i;
+            
+            if (!solved_panels.test(solve_index)) {
+              state_update.panels.insert(solve_index);
+            }
+            
+            solved_panels.set(solve_index);
+          }
+        }
+      }
     } 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"]);
+        state_update.player_position = true;
       } else {
         data_storage[key] = value.get<std::map<std::string, int>>();
       }
 
-      wxLogVerbose("Data storage %s retrieved as dictionary", key);
+      TrackerLog(fmt::format("Data storage {} retrieved as dictionary", key));
     } else if (value.is_null()) {
       if (key.ends_with("PlayerPos")) {
         player_pos = std::nullopt;
+        state_update.player_position = true;
       } else {
         data_storage.erase(key);
       }
 
-      wxLogVerbose("Data storage %s retrieved as null", key);
+      TrackerLog(fmt::format("Data storage {} retrieved as null", key));
     } else if (value.is_array()) {
       auto list_value = value.get<std::vector<std::string>>();
 
       if (key.ends_with("Paintings")) {
         data_storage[key] =
             std::set<std::string>(list_value.begin(), list_value.end());
+        state_update.paintings =
+            std::vector<std::string>(list_value.begin(), list_value.end());
       } else {
         data_storage[key] = list_value;
       }
 
-      wxLogVerbose("Data storage %s retrieved as list: [%s]", key,
-                   hatkirby::implode(list_value, ", "));
+      TrackerLog(fmt::format("Data storage {} retrieved as list: [{}]", key,
+                             hatkirby::implode(list_value, ", ")));
     }
   }
 
-  bool HasCheckedGameLocation(int location_id) {
-    return checked_locations.count(location_id);
-  }
+  // State mutex should NOT be locked.
+  // nullopt state_update indicates a reset.
+  void RefreshTracker(std::optional<StateUpdate> state_update) {
+    TrackerLog("Refreshing display...");
 
-  bool HasCheckedHuntPanel(int location_id) {
-    std::string key =
-        data_storage_prefix + "Hunt|" + std::to_string(location_id);
-    return data_storage.count(key) && std::any_cast<bool>(data_storage.at(key));
-  }
-
-  bool HasItem(int item_id, int quantity) {
-    return inventory.count(item_id) && inventory.at(item_id) >= quantity;
-  }
-
-  bool HasAchievement(const std::string& name) {
-    std::string key = data_storage_prefix + "Achievement|" + name;
-    return data_storage.count(key) && std::any_cast<bool>(data_storage.at(key));
-  }
+    if (!state_update || state_update->progression_items ||
+        !state_update->paintings.empty()) {
+      std::string prev_msg;
+      {
+        std::lock_guard state_guard(state_mutex);
 
-  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>();
-    }
+        prev_msg = status_message;
+        SetStatusMessage(fmt::format("{} Recalculating...", status_message));
+      }
 
-    return std::any_cast<const std::set<std::string>&>(data_storage.at(key));
-  }
+      RecalculateReachability();
 
-  void RefreshTracker(bool reset) {
-    wxLogVerbose("Refreshing display...");
+      {
+        std::lock_guard state_guard(state_mutex);
 
-    RecalculateReachability();
+        SetStatusMessage(prev_msg);
+      }
+    }
+    
 
-    if (reset) {
+    if (!state_update) {
       tracker_frame->ResetIndicators();
     } else {
-      tracker_frame->UpdateIndicators();
+      tracker_frame->UpdateIndicators(*state_update);
     }
   }
 
-  int64_t GetItemId(const std::string& item_name) {
-    int64_t ap_id = apclient->get_item_id(item_name);
-    if (ap_id == APClient::INVALID_NAME_ID) {
-      wxLogError("Could not find AP item ID for %s", item_name);
-    }
-
-    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();
     apclient.reset();
   }
@@ -473,79 +706,179 @@ void AP_Connect(std::string server, std::string player, std::string password) {
   GetState().Connect(server, player, password);
 }
 
-bool AP_HasCheckedGameLocation(int location_id) {
-  return GetState().HasCheckedGameLocation(location_id);
+std::string AP_GetStatusMessage() { return GetState().GetStatusMessage(); }
+
+std::string AP_GetSaveName() {
+  std::lock_guard state_guard(GetState().state_mutex);
+
+  return GetState().save_name;
 }
 
-bool AP_HasCheckedHuntPanel(int location_id) {
-  return GetState().HasCheckedHuntPanel(location_id);
+bool AP_HasCheckedGameLocation(int location_id) {
+  return GetState().HasCheckedGameLocation(location_id);
 }
 
 bool AP_HasItem(int item_id, int quantity) {
   return GetState().HasItem(item_id, quantity);
 }
 
-DoorShuffleMode AP_GetDoorShuffleMode() { return GetState().door_shuffle_mode; }
+bool AP_HasItemSafe(int item_id, int quantity) {
+  return GetState().HasItemSafe(item_id, quantity);
+}
+
+DoorShuffleMode AP_GetDoorShuffleMode() {
+  std::lock_guard state_guard(GetState().state_mutex);
 
-bool AP_IsColorShuffle() { return GetState().color_shuffle; }
+  return GetState().door_shuffle_mode;
+}
+
+bool AP_AreDoorsGrouped() {
+  std::lock_guard state_guard(GetState().state_mutex);
+
+  return GetState().group_doors;
+}
+
+bool AP_IsColorShuffle() {
+  std::lock_guard state_guard(GetState().state_mutex);
 
-bool AP_IsPaintingShuffle() { return GetState().painting_shuffle; }
+  return GetState().color_shuffle;
+}
+
+bool AP_IsPaintingShuffle() {
+  std::lock_guard state_guard(GetState().state_mutex);
+
+  return GetState().painting_shuffle;
+}
+
+std::map<std::string, std::string> AP_GetPaintingMapping() {
+  std::lock_guard state_guard(GetState().state_mutex);
 
-const std::map<std::string, std::string>& AP_GetPaintingMapping() {
   return GetState().painting_mapping;
 }
 
-const std::set<std::string>& AP_GetCheckedPaintings() {
+bool AP_IsPaintingMappedTo(const std::string& painting_id) {
+  std::lock_guard state_guard(GetState().state_mutex);
+
+  return GetState().painting_codomain.count(painting_id);
+}
+
+std::set<std::string> AP_GetCheckedPaintings() {
   return GetState().GetCheckedPaintings();
 }
 
-int AP_GetMasteryRequirement() { return GetState().mastery_requirement; }
+bool AP_IsPaintingChecked(const std::string& painting_id) {
+  return GetState().IsPaintingChecked(painting_id);
+}
+
+void AP_RevealPaintings() { GetState().RevealPaintings(); }
+
+int AP_GetMasteryRequirement() {
+  std::lock_guard state_guard(GetState().state_mutex);
+
+  return GetState().mastery_requirement;
+}
+
+int AP_GetLevel2Requirement() {
+  std::lock_guard state_guard(GetState().state_mutex);
+
+  return GetState().level_2_requirement;
+}
 
-int AP_GetLevel2Requirement() { return GetState().level_2_requirement; }
+LocationChecks AP_GetLocationsChecks() {
+  std::lock_guard state_guard(GetState().state_mutex);
+
+  return GetState().location_checks;
+}
 
 bool AP_IsLocationVisible(int classification) {
+  std::lock_guard state_guard(GetState().state_mutex);
+
+  int world_state = 0;
+
   switch (GetState().location_checks) {
     case kNORMAL_LOCATIONS:
-      return classification & kLOCATION_NORMAL;
+      world_state = kLOCATION_NORMAL;
+      break;
     case kREDUCED_LOCATIONS:
-      return classification & kLOCATION_REDUCED;
+      world_state = kLOCATION_REDUCED;
+      break;
     case kPANELSANITY:
-      return classification & kLOCATION_INSANITY;
+      world_state = kLOCATION_INSANITY;
+      break;
     default:
       return false;
   }
+
+  if (GetState().door_shuffle_mode == kDOORS_MODE &&
+      !GetState().early_color_hallways) {
+    world_state |= kLOCATION_SMALL_SPHERE_ONE;
+  }
+
+  return (world_state & classification);
+}
+
+PanelShuffleMode AP_GetPanelShuffleMode() {
+  std::lock_guard state_guard(GetState().state_mutex);
+
+  return GetState().panel_shuffle_mode;
 }
 
 VictoryCondition AP_GetVictoryCondition() {
+  std::lock_guard state_guard(GetState().state_mutex);
+
   return GetState().victory_condition;
 }
 
-bool AP_HasAchievement(const std::string& achievement_name) {
-  return GetState().HasAchievement(achievement_name);
+bool AP_HasEarlyColorHallways() {
+  std::lock_guard state_guard(GetState().state_mutex);
+
+  return GetState().early_color_hallways;
 }
 
-bool AP_HasEarlyColorHallways() { return GetState().early_color_hallways; }
+bool AP_IsPilgrimageEnabled() {
+  std::lock_guard state_guard(GetState().state_mutex);
 
-bool AP_IsPilgrimageEnabled() { return GetState().pilgrimage_enabled; }
+  return GetState().pilgrimage_enabled;
+}
 
 bool AP_DoesPilgrimageAllowRoofAccess() {
+  std::lock_guard state_guard(GetState().state_mutex);
+
   return GetState().pilgrimage_allows_roof_access;
 }
 
 bool AP_DoesPilgrimageAllowPaintings() {
+  std::lock_guard state_guard(GetState().state_mutex);
+
   return GetState().pilgrimage_allows_paintings;
 }
 
-SunwarpAccess AP_GetSunwarpAccess() { return GetState().sunwarp_access; }
+SunwarpAccess AP_GetSunwarpAccess() {
+  std::lock_guard state_guard(GetState().state_mutex);
 
-bool AP_IsSunwarpShuffle() { return GetState().sunwarp_shuffle; }
+  return GetState().sunwarp_access;
+}
+
+bool AP_IsSunwarpShuffle() {
+  std::lock_guard state_guard(GetState().state_mutex);
+
+  return GetState().sunwarp_shuffle;
+}
 
-const std::map<int, SunwarpMapping>& AP_GetSunwarpMapping() {
+std::map<int, SunwarpMapping> AP_GetSunwarpMapping() {
   return GetState().sunwarp_mapping;
 }
 
+bool AP_IsPostgameShuffle() { return GetState().postgame_shuffle; }
+
 bool AP_HasReachedGoal() { return GetState().HasReachedGoal(); }
 
 std::optional<std::tuple<int, int>> AP_GetPlayerPosition() {
+  std::lock_guard state_guard(GetState().state_mutex);
+
   return GetState().player_pos;
 }
+
+bool AP_IsPanelSolved(int solve_index) {
+  return GetState().IsPanelSolved(solve_index);
+}
@@ -11,7 +11,7 @@
 
 class TrackerFrame;
 
-enum DoorShuffleMode { kNO_DOORS = 0, kSIMPLE_DOORS = 1, kCOMPLEX_DOORS = 2 };
+enum DoorShuffleMode { kNO_DOORS = 0, kPANELS_MODE = 1, kDOORS_MODE = 2 };
 
 enum VictoryCondition {
   kTHE_END = 0,
@@ -26,6 +26,8 @@ enum LocationChecks {
   kPANELSANITY = 2
 };
 
+enum PanelShuffleMode { kNO_PANELS = 0, kREARRANGE_PANELS = 1 };
+
 enum SunwarpAccess {
   kSUNWARP_ACCESS_NORMAL = 0,
   kSUNWARP_ACCESS_DISABLED = 1,
@@ -39,35 +41,57 @@ struct SunwarpMapping {
   int exit_index;
 };
 
+struct ItemState {
+  std::string name;
+  int amount = 0;
+  int index = 0;
+};
+
 void AP_SetTrackerFrame(TrackerFrame* tracker_frame);
 
 void AP_Connect(std::string server, std::string player, std::string password);
 
-bool AP_HasCheckedGameLocation(int location_id);
+std::string AP_GetStatusMessage();
 
-bool AP_HasCheckedHuntPanel(int location_id);
+std::string AP_GetSaveName();
 
+bool AP_HasCheckedGameLocation(int location_id);
+
+// This doesn't lock the state mutex, for speed, so it must ONLY be called from
+// RecalculateReachability, which is only called from the APState thread anyway.
 bool AP_HasItem(int item_id, int quantity = 1);
 
+bool AP_HasItemSafe(int item_id, int quantity = 1);
+
 DoorShuffleMode AP_GetDoorShuffleMode();
 
+bool AP_AreDoorsGrouped();
+
 bool AP_IsColorShuffle();
 
 bool AP_IsPaintingShuffle();
 
-const std::map<std::string, std::string>& AP_GetPaintingMapping();
+std::map<std::string, std::string> AP_GetPaintingMapping();
 
-const std::set<std::string>& AP_GetCheckedPaintings();
+bool AP_IsPaintingMappedTo(const std::string& painting_id);
+
+std::set<std::string> AP_GetCheckedPaintings();
+
+bool AP_IsPaintingChecked(const std::string& painting_id);
+
+void AP_RevealPaintings();
 
 int AP_GetMasteryRequirement();
 
 int AP_GetLevel2Requirement();
 
+LocationChecks AP_GetLocationsChecks();
+
 bool AP_IsLocationVisible(int classification);
 
-VictoryCondition AP_GetVictoryCondition();
+PanelShuffleMode AP_GetPanelShuffleMode();
 
-bool AP_HasAchievement(const std::string& achievement_name);
+VictoryCondition AP_GetVictoryCondition();
 
 bool AP_HasEarlyColorHallways();
 
@@ -81,10 +105,14 @@ SunwarpAccess AP_GetSunwarpAccess();
 
 bool AP_IsSunwarpShuffle();
 
-const std::map<int, SunwarpMapping>& AP_GetSunwarpMapping();
+std::map<int, SunwarpMapping> AP_GetSunwarpMapping();
+
+bool AP_IsPostgameShuffle();
 
 bool AP_HasReachedGoal();
 
 std::optional<std::tuple<int, int>> AP_GetPlayerPosition();
 
+bool AP_IsPanelSolved(int solve_index);
+
 #endif /* end of include guard: AP_STATE_H_664A4180 */
@@ -2,62 +2,68 @@
 
 #include <wx/dcbuffer.h>
 
+#include <algorithm>
+
 #include "ap_state.h"
 #include "game_data.h"
 #include "global.h"
+#include "icons.h"
 #include "tracker_config.h"
+#include "tracker_panel.h"
 #include "tracker_state.h"
 
 AreaPopup::AreaPopup(wxWindow* parent, int area_id)
     : wxScrolledCanvas(parent, wxID_ANY), area_id_(area_id) {
   SetBackgroundStyle(wxBG_STYLE_PAINT);
 
-  unchecked_eye_ =
-      wxBitmap(wxImage(GetAbsolutePath("assets/unchecked.png").c_str(),
-                       wxBITMAP_TYPE_PNG)
-                   .Scale(32, 32));
-  checked_eye_ = wxBitmap(
-      wxImage(GetAbsolutePath("assets/checked.png").c_str(), wxBITMAP_TYPE_PNG)
-          .Scale(32, 32));
+  LoadIcons();
 
+  // TODO: This is slow on high-DPI screens.
   SetScrollRate(5, 5);
 
   SetBackgroundColour(*wxBLACK);
   Hide();
 
   Bind(wxEVT_PAINT, &AreaPopup::OnPaint, this);
+  Bind(wxEVT_DPI_CHANGED, &AreaPopup::OnDPIChanged, this);
 
-  UpdateIndicators();
+  ResetIndicators();
 }
 
-void AreaPopup::UpdateIndicators() {
+void AreaPopup::ResetIndicators() {
+  indicators_.clear();
+
   const MapArea& map_area = GD_GetMapArea(area_id_);
+  wxFont the_font = GetFont().Scale(GetDPIScaleFactor());
+  TrackerPanel* tracker_panel = dynamic_cast<TrackerPanel*>(GetParent());
 
   // Start calculating extents.
   wxMemoryDC mem_dc;
-  mem_dc.SetFont(GetFont().Bold());
-  wxSize header_extent = mem_dc.GetTextExtent(map_area.name);
+  mem_dc.SetFont(the_font.Bold());
+  header_extent_ = mem_dc.GetTextExtent(map_area.name);
 
-  int acc_height = header_extent.GetHeight() + 20;
+  int acc_height = header_extent_.GetHeight() + FromDIP(20);
   int col_width = 0;
 
-  mem_dc.SetFont(GetFont());
-
-  std::vector<int> real_locations;
+  mem_dc.SetFont(the_font);
 
   for (int section_id = 0; section_id < map_area.locations.size();
        section_id++) {
     const Location& location = map_area.locations.at(section_id);
-
-    if (!AP_IsLocationVisible(location.classification) &&
-        !(location.hunt && GetTrackerConfig().show_hunt_panels)) {
+    if ((!AP_IsLocationVisible(location.classification) ||
+         IsLocationPostgame(location.ap_location_id)) &&
+        !(location.hunt &&
+          GetTrackerConfig().visible_panels == TrackerConfig::kHUNT_PANELS) &&
+        !(location.single_panel &&
+          GetTrackerConfig().visible_panels == TrackerConfig::kALL_PANELS)) {
       continue;
     }
 
-    real_locations.push_back(section_id);
+    indicators_.emplace_back(section_id, kLOCATION, acc_height);
 
     wxSize item_extent = mem_dc.GetTextExtent(location.name);
-    int item_height = std::max(32, item_extent.GetHeight()) + 10;
+    int item_height =
+        std::max(FromDIP(32), item_extent.GetHeight()) + FromDIP(10);
     acc_height += item_height;
 
     if (item_extent.GetWidth() > col_width) {
@@ -65,49 +71,107 @@ void AreaPopup::UpdateIndicators() {
     }
   }
 
-  int item_width = col_width + 10 + 32;
-  int full_width = std::max(header_extent.GetWidth(), item_width) + 20;
-
-  Fit();
-  SetVirtualSize(full_width, acc_height);
-
-  rendered_ = wxBitmap(full_width, acc_height);
-  mem_dc.SelectObject(rendered_);
-  mem_dc.SetPen(*wxTRANSPARENT_PEN);
-  mem_dc.SetBrush(*wxBLACK_BRUSH);
-  mem_dc.DrawRectangle({0, 0}, {full_width, acc_height});
+  if (AP_IsPaintingShuffle()) {
+    for (int painting_id : map_area.paintings) {
+      if (IsPaintingPostgame(painting_id)) {
+        continue;
+      }
 
-  mem_dc.SetFont(GetFont().Bold());
-  mem_dc.SetTextForeground(*wxWHITE);
-  mem_dc.DrawText(map_area.name,
-                  {(full_width - header_extent.GetWidth()) / 2, 10});
+      indicators_.emplace_back(painting_id, kPAINTING, acc_height);
 
-  int cur_height = header_extent.GetHeight() + 20;
+      const PaintingExit& painting = GD_GetPaintingExit(painting_id);
+      wxSize item_extent = mem_dc.GetTextExtent(painting.display_name);
+      int item_height =
+          std::max(FromDIP(32), item_extent.GetHeight()) + FromDIP(10);
+      acc_height += item_height;
 
-  mem_dc.SetFont(GetFont());
+      if (item_extent.GetWidth() > col_width) {
+        col_width = item_extent.GetWidth();
+      }
+    }
+  }
 
-  for (int section_id : real_locations) {
-    const Location& location = map_area.locations.at(section_id);
+  int item_width = col_width + FromDIP(10 + 32);
+  full_width_ = std::max(header_extent_.GetWidth(), item_width) + FromDIP(20);
+  full_height_ = acc_height;
 
-    bool checked =
-        AP_HasCheckedGameLocation(location.ap_location_id) ||
-        (location.hunt && AP_HasCheckedHuntPanel(location.ap_location_id)) ||
-        (IsLocationWinCondition(location) && AP_HasReachedGoal());
+  Fit();
+  SetVirtualSize(full_width_, full_height_);
 
-    wxBitmap* eye_ptr = checked ? &checked_eye_ : &unchecked_eye_;
+  UpdateIndicators();
+}
 
-    mem_dc.DrawBitmap(*eye_ptr, {10, cur_height});
+void AreaPopup::UpdateIndicators() {
+  const MapArea& map_area = GD_GetMapArea(area_id_);
+  wxFont the_font = GetFont().Scale(GetDPIScaleFactor());
+  TrackerPanel* tracker_panel = dynamic_cast<TrackerPanel*>(GetParent());
 
-    bool reachable = IsLocationReachable(location.ap_location_id);
-    const wxColour* text_color = reachable ? wxWHITE : wxRED;
-    mem_dc.SetTextForeground(*text_color);
+  rendered_ = wxBitmap(full_width_, full_height_);
 
-    wxSize item_extent = mem_dc.GetTextExtent(location.name);
-    mem_dc.DrawText(
-        location.name,
-        {10 + 32 + 10, cur_height + (32 - mem_dc.GetFontMetrics().height) / 2});
+  wxMemoryDC mem_dc;
+  mem_dc.SelectObject(rendered_);
+  mem_dc.SetPen(*wxTRANSPARENT_PEN);
+  mem_dc.SetBrush(*wxBLACK_BRUSH);
+  mem_dc.DrawRectangle({0, 0}, {full_width_, full_height_});
 
-    cur_height += 10 + 32;
+  mem_dc.SetFont(the_font.Bold());
+  mem_dc.SetTextForeground(*wxWHITE);
+  mem_dc.DrawText(map_area.name,
+                  {(full_width_ - header_extent_.GetWidth()) / 2, FromDIP(10)});
+
+  mem_dc.SetFont(the_font);
+
+  for (const IndicatorInfo& indicator : indicators_) {
+    switch (indicator.type) {
+      case kLOCATION: {
+        const Location& location = map_area.locations.at(indicator.id);
+
+        bool checked = false;
+        if (IsLocationWinCondition(location)) {
+          checked = AP_HasReachedGoal();
+        } else {
+          checked = AP_HasCheckedGameLocation(location.ap_location_id) ||
+                    (location.single_panel &&
+                     AP_IsPanelSolved(
+                         GD_GetPanel(*location.single_panel).solve_index));
+        }
+
+        const wxBitmap* eye_ptr = checked ? checked_eye_ : unchecked_eye_;
+
+        mem_dc.DrawBitmap(*eye_ptr, {FromDIP(10), indicator.y});
+
+        bool reachable = IsLocationReachable(location.ap_location_id);
+        const wxColour* text_color = reachable ? wxWHITE : wxRED;
+        mem_dc.SetTextForeground(*text_color);
+
+        wxSize item_extent = mem_dc.GetTextExtent(location.name);
+        mem_dc.DrawText(
+            location.name,
+            {FromDIP(10 + 32 + 10),
+             indicator.y + (FromDIP(32) - mem_dc.GetFontMetrics().height) / 2});
+
+        break;
+      }
+      case kPAINTING: {
+        const PaintingExit& painting = GD_GetPaintingExit(indicator.id);
+
+        bool reachable = IsPaintingReachable(indicator.id);
+        const wxColour* text_color = reachable ? wxWHITE : wxRED;
+        mem_dc.SetTextForeground(*text_color);
+
+        bool checked = reachable && AP_IsPaintingChecked(painting.internal_id);
+        const wxBitmap* eye_ptr = checked ? checked_owl_ : unchecked_owl_;
+        mem_dc.DrawBitmap(*eye_ptr, {FromDIP(10), indicator.y});
+
+        wxSize item_extent = mem_dc.GetTextExtent(painting.display_name);
+        mem_dc.DrawText(
+            painting.display_name,
+            {FromDIP(10 + 32 + 10),
+             indicator.y + (FromDIP(32) - mem_dc.GetFontMetrics().height) / 2});
+
+        break;
+      }
+    }
   }
 }
 
@@ -118,3 +182,21 @@ void AreaPopup::OnPaint(wxPaintEvent& event) {
 
   event.Skip();
 }
+
+void AreaPopup::OnDPIChanged(wxDPIChangedEvent& event) {
+  LoadIcons();
+  ResetIndicators();
+
+  event.Skip();
+}
+
+void AreaPopup::LoadIcons() {
+  unchecked_eye_ = GetTheIconCache().GetIcon("assets/unchecked.png",
+                                             FromDIP(wxSize{32, 32}));
+  checked_eye_ =
+      GetTheIconCache().GetIcon("assets/checked.png", FromDIP(wxSize{32, 32}));
+  unchecked_owl_ =
+      GetTheIconCache().GetIcon("assets/owl.png", FromDIP(wxSize{32, 32}));
+  checked_owl_ = GetTheIconCache().GetIcon("assets/checked_owl.png",
+                                           FromDIP(wxSize{32, 32}));
+}
@@ -7,19 +7,53 @@
 #include <wx/wx.h>
 #endif
 
+#include <vector>
+
 class AreaPopup : public wxScrolledCanvas {
  public:
   AreaPopup(wxWindow* parent, int area_id);
 
+  void ResetIndicators();
   void UpdateIndicators();
 
+  int GetFullWidth() const { return full_width_; }
+  int GetFullHeight() const { return full_height_; }
+
  private:
+  enum IndicatorType {
+    kLOCATION,
+    kPAINTING,
+  };
+
+  struct IndicatorInfo {
+    // For locations, the id is an index into the map area's locations list.
+    // For paintings, it is a real painting id.
+    int id;
+    IndicatorType type;
+    int y;
+
+    IndicatorInfo(int id, IndicatorType type, int y)
+        : id(id), type(type), y(y) {}
+  };
+
   void OnPaint(wxPaintEvent& event);
+  void OnDPIChanged(wxDPIChangedEvent& event);
+
+  void LoadIcons();
 
   int area_id_;
 
-  wxBitmap unchecked_eye_;
-  wxBitmap checked_eye_;
+  const wxBitmap* unchecked_eye_;
+  const wxBitmap* checked_eye_;
+  const wxBitmap* unchecked_owl_;
+  const wxBitmap* checked_owl_;
+
+  int full_width_ = 0;
+  int full_height_ = 0;
+  wxSize header_extent_;
+
+  std::vector<IndicatorInfo> indicators_;
+
   wxBitmap rendered_;
 };
 
@@ -4,17 +4,21 @@
 
 ConnectionDialog::ConnectionDialog()
     : wxDialog(nullptr, wxID_ANY, "Connect to Archipelago") {
-  server_box_ =
-      new wxTextCtrl(this, -1, GetTrackerConfig().connection_details.ap_server,
-                     wxDefaultPosition, {300, -1});
-  player_box_ =
-      new wxTextCtrl(this, -1, GetTrackerConfig().connection_details.ap_player,
-                     wxDefaultPosition, {300, -1});
+  server_box_ = new wxTextCtrl(
+      this, -1,
+      wxString::FromUTF8(GetTrackerConfig().connection_details.ap_server),
+      wxDefaultPosition, FromDIP(wxSize{300, -1}));
+  player_box_ = new wxTextCtrl(
+      this, -1,
+      wxString::FromUTF8(GetTrackerConfig().connection_details.ap_player),
+      wxDefaultPosition, FromDIP(wxSize{300, -1}));
   password_box_ = new wxTextCtrl(
-      this, -1, GetTrackerConfig().connection_details.ap_password,
-      wxDefaultPosition, {300, -1});
+      this, -1,
+      wxString::FromUTF8(GetTrackerConfig().connection_details.ap_password),
+      wxDefaultPosition, FromDIP(wxSize{300, -1}));
 
-  wxFlexGridSizer* form_sizer = new wxFlexGridSizer(2, 10, 10);
+  wxFlexGridSizer* form_sizer =
+      new wxFlexGridSizer(2, FromDIP(10), FromDIP(10));
 
   form_sizer->Add(
       new wxStaticText(this, -1, "Server:"),
@@ -30,17 +34,19 @@ ConnectionDialog::ConnectionDialog()
   form_sizer->Add(password_box_, wxSizerFlags().Expand());
 
   history_list_ = new wxListBox(this, -1);
-  for (const ConnectionDetails& details : GetTrackerConfig().connection_history) {
+  for (const ConnectionDetails& details :
+       GetTrackerConfig().connection_history) {
     wxString display_text;
-    display_text << details.ap_player;
+    display_text << wxString::FromUTF8(details.ap_player);
     display_text << " (";
-    display_text << details.ap_server;
+    display_text << wxString::FromUTF8(details.ap_server);
     display_text << ")";
 
     history_list_->Append(display_text);
   }
 
-  history_list_->Bind(wxEVT_LISTBOX, &ConnectionDialog::OnOldConnectionChosen, this);
+  history_list_->Bind(wxEVT_LISTBOX, &ConnectionDialog::OnOldConnectionChosen,
+                      this);
 
   wxBoxSizer* mid_sizer = new wxBoxSizer(wxHORIZONTAL);
   mid_sizer->Add(form_sizer, wxSizerFlags().Proportion(3).Expand());
@@ -52,7 +58,8 @@ ConnectionDialog::ConnectionDialog()
                      this, -1, "Enter the details to connect to Archipelago."),
                  wxSizerFlags().Align(wxALIGN_LEFT).DoubleBorder());
   top_sizer->Add(mid_sizer, wxSizerFlags().DoubleBorder().Expand());
-  top_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL), wxSizerFlags().Border().Center());
+  top_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL),
+                 wxSizerFlags().Border().Center());
 
   SetSizerAndFit(top_sizer);
 
@@ -62,9 +69,10 @@ ConnectionDialog::ConnectionDialog()
 
 void ConnectionDialog::OnOldConnectionChosen(wxCommandEvent& e) {
   if (e.IsSelection()) {
-    const ConnectionDetails& details = GetTrackerConfig().connection_history.at(e.GetSelection());
-    server_box_->SetValue(details.ap_server);
-    player_box_->SetValue(details.ap_player);
-    password_box_->SetValue(details.ap_password);
+    const ConnectionDetails& details =
+        GetTrackerConfig().connection_history.at(e.GetSelection());
+    server_box_->SetValue(wxString::FromUTF8(details.ap_server));
+    player_box_->SetValue(wxString::FromUTF8(details.ap_player));
+    password_box_->SetValue(wxString::FromUTF8(details.ap_password));
   }
 }
@@ -14,12 +14,12 @@ class ConnectionDialog : public wxDialog {
  public:
   ConnectionDialog();
 
-  std::string GetServerValue() { return server_box_->GetValue().ToStdString(); }
+  std::string GetServerValue() { return server_box_->GetValue().utf8_string(); }
 
-  std::string GetPlayerValue() { return player_box_->GetValue().ToStdString(); }
+  std::string GetPlayerValue() { return player_box_->GetValue().utf8_string(); }
 
   std::string GetPasswordValue() {
-    return password_box_->GetValue().ToStdString();
+    return password_box_->GetValue().utf8_string();
   }
 
  private:
@@ -1,11 +1,6 @@
 #include "game_data.h"
 
-#include <wx/wxprec.h>
-
-#ifndef WX_PRECOMP
-#include <wx/wx.h>
-#endif
-
+#include <fmt/core.h>
 #include <hkutil/string.h>
 #include <yaml-cpp/yaml.h>
 
@@ -13,51 +8,31 @@
 #include <sstream>
 
 #include "global.h"
+#include "logger.h"
 
 namespace {
 
-LingoColor GetColorForString(const std::string &str) {
-  if (str == "black") {
-    return LingoColor::kBlack;
-  } else if (str == "red") {
-    return LingoColor::kRed;
-  } else if (str == "blue") {
-    return LingoColor::kBlue;
-  } else if (str == "yellow") {
-    return LingoColor::kYellow;
-  } else if (str == "orange") {
-    return LingoColor::kOrange;
-  } else if (str == "green") {
-    return LingoColor::kGreen;
-  } else if (str == "gray") {
-    return LingoColor::kGray;
-  } else if (str == "brown") {
-    return LingoColor::kBrown;
-  } else if (str == "purple") {
-    return LingoColor::kPurple;
-  } else {
-    wxLogError("Invalid color: %s", str);
-
-    return LingoColor::kNone;
-  }
-}
-
 struct GameData {
   std::vector<Room> rooms_;
   std::vector<Door> doors_;
   std::vector<Panel> panels_;
+  std::vector<PanelDoor> panel_doors_;
   std::vector<MapArea> map_areas_;
   std::vector<SubwayItem> subway_items_;
+  std::vector<PaintingExit> paintings_;
 
   std::map<std::string, int> room_by_id_;
   std::map<std::string, int> door_by_id_;
   std::map<std::string, int> panel_by_id_;
+  std::map<std::string, int> panel_doors_by_id_;
   std::map<std::string, int> area_by_id_;
+  std::map<std::string, int> painting_by_id_;
 
   std::vector<int> door_definition_order_;
 
   std::map<std::string, int> room_by_painting_;
   std::map<int, int> room_by_sunwarp_;
+  std::map<int, int> panel_by_solve_index_;
 
   std::vector<int> achievement_panels_;
 
@@ -68,6 +43,8 @@ struct GameData {
   std::map<std::string, int> subway_item_by_painting_;
   std::map<SubwaySunwarp, int> subway_item_by_sunwarp_;
 
+  std::map<int, std::string> item_by_ap_id_;
+
   bool loaded_area_data_ = false;
   std::set<std::string> malconfigured_areas_;
 
@@ -83,10 +60,10 @@ struct GameData {
           ids_config["special_items"][color_name]) {
         std::string input_name = color_name;
         input_name[0] = std::tolower(input_name[0]);
-        ap_id_by_color_[GetColorForString(input_name)] =
+        ap_id_by_color_[GetLingoColorForString(input_name)] =
             ids_config["special_items"][color_name].as<int>();
       } else {
-        wxLogError("Missing AP item ID for color %s", color_name);
+        TrackerLog(fmt::format("Missing AP item ID for color {}", color_name));
       }
     };
 
@@ -100,8 +77,18 @@ struct GameData {
     init_color_id("Brown");
     init_color_id("Gray");
 
+    if (ids_config["special_items"]) {
+      for (const auto& special_item_it : ids_config["special_items"])
+      {
+        item_by_ap_id_[special_item_it.second.as<int>()] =
+            special_item_it.first.as<std::string>();
+      }
+    }
+
     rooms_.reserve(lingo_config.size() * 2);
 
+    std::vector<int> panel_location_ids;
+
     for (const auto &room_it : lingo_config) {
       int room_id = AddOrGetRoom(room_it.first.as<std::string>());
 
@@ -111,6 +98,7 @@ struct GameData {
         auto process_single_entrance =
             [this, room_id, from_room_id](const YAML::Node &option) {
               Exit exit_obj;
+              exit_obj.source_room = from_room_id; 
               exit_obj.destination_room = room_id;
 
               if (option["door"]) {
@@ -139,13 +127,17 @@ 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);
             };
 
         switch (entrance_it.second.Type()) {
           case YAML::NodeType::Scalar: {
             // This is just "true".
-            rooms_[from_room_id].exits.push_back({.destination_room = room_id});
+            rooms_[from_room_id].exits.push_back({.source_room = from_room_id, .destination_room = room_id});
             break;
           }
           case YAML::NodeType::Map: {
@@ -163,7 +155,8 @@ struct GameData {
             // This shouldn't happen.
             std::ostringstream formatted;
             formatted << entrance_it;
-            wxLogError("Error reading game data: %s", formatted.str());
+            TrackerLog(
+                fmt::format("Error reading game data: {}", formatted.str()));
             break;
           }
         }
@@ -177,12 +170,12 @@ struct GameData {
 
           if (panel_it.second["colors"]) {
             if (panel_it.second["colors"].IsScalar()) {
-              panels_[panel_id].colors.push_back(GetColorForString(
+              panels_[panel_id].colors.push_back(GetLingoColorForString(
                   panel_it.second["colors"].as<std::string>()));
             } else {
               for (const auto &color_node : panel_it.second["colors"]) {
                 panels_[panel_id].colors.push_back(
-                    GetColorForString(color_node.as<std::string>()));
+                    GetLingoColorForString(color_node.as<std::string>()));
               }
             }
           }
@@ -260,6 +253,16 @@ struct GameData {
             achievement_panels_.push_back(panel_id);
           }
 
+          if (panel_it.second["location_name"]) {
+            panels_[panel_id].location_name =
+                panel_it.second["location_name"].as<std::string>();
+          }
+
+          if (panel_it.second["id"]) {
+            panels_[panel_id].nodepath =
+                panel_it.second["id"].as<std::string>();
+          }
+
           if (panel_it.second["hunt"]) {
             panels_[panel_id].hunt = panel_it.second["hunt"].as<bool>();
           }
@@ -278,13 +281,15 @@ struct GameData {
               ids_config["panels"][rooms_[room_id].name] &&
               ids_config["panels"][rooms_[room_id].name]
                         [panels_[panel_id].name]) {
-            panels_[panel_id].ap_location_id =
-                ids_config["panels"][rooms_[room_id].name]
-                          [panels_[panel_id].name]
-                              .as<int>();
+            int location_id = ids_config["panels"][rooms_[room_id].name]
+                                        [panels_[panel_id].name]
+                                            .as<int>();
+            panels_[panel_id].ap_location_id = location_id;
+            panel_location_ids.push_back(location_id);
           } else {
-            wxLogError("Missing AP location ID for panel %s - %s",
-                         rooms_[room_id].name, panels_[panel_id].name);
+            TrackerLog(fmt::format("Missing AP location ID for panel {} - {}",
+                                   rooms_[room_id].name,
+                                   panels_[panel_id].name));
           }
         }
       }
@@ -346,9 +351,13 @@ struct GameData {
                   ids_config["doors"][rooms_[room_id].name]
                             [doors_[door_id].name]["item"]
                                 .as<int>();
+
+              item_by_ap_id_[doors_[door_id].ap_item_id] =
+                  doors_[door_id].item_name;
             } else {
-              wxLogError("Missing AP item ID for door %s - %s",
-                           rooms_[room_id].name, doors_[door_id].name);
+              TrackerLog(fmt::format("Missing AP item ID for door {} - {}",
+                                     rooms_[room_id].name,
+                                     doors_[door_id].name));
             }
           }
 
@@ -361,9 +370,12 @@ struct GameData {
               doors_[door_id].group_ap_item_id =
                   ids_config["door_groups"][doors_[door_id].group_name]
                       .as<int>();
+
+              item_by_ap_id_[doors_[door_id].group_ap_item_id] =
+                  doors_[door_id].group_name;
             } else {
-              wxLogError("Missing AP item ID for door group %s",
-                         doors_[door_id].group_name);
+              TrackerLog(fmt::format("Missing AP item ID for door group {}",
+                                     doors_[door_id].group_name));
             }
           }
 
@@ -373,11 +385,11 @@ struct GameData {
           } else if (!door_it.second["skip_location"] &&
                      !door_it.second["event"]) {
             if (has_external_panels) {
-              wxLogError(
-                  "%s - %s has panels from other rooms but does not have an "
+              TrackerLog(fmt::format(
+                  "{} - {} has panels from other rooms but does not have an "
                   "explicit location name and is not marked skip_location or "
                   "event",
-                  rooms_[room_id].name, doors_[door_id].name);
+                  rooms_[room_id].name, doors_[door_id].name));
             }
 
             doors_[door_id].location_name =
@@ -397,8 +409,9 @@ struct GameData {
                             [doors_[door_id].name]["location"]
                                 .as<int>();
             } else {
-              wxLogError("Missing AP location ID for door %s - %s",
-                         rooms_[room_id].name, doors_[door_id].name);
+              TrackerLog(fmt::format("Missing AP location ID for door {} - {}",
+                                     rooms_[room_id].name,
+                                     doors_[door_id].name));
             }
           }
 
@@ -417,14 +430,107 @@ struct GameData {
         }
       }
 
+      if (room_it.second["panel_doors"]) {
+        for (const auto &panel_door_it : room_it.second["panel_doors"]) {
+          std::string panel_door_name = panel_door_it.first.as<std::string>();
+          int panel_door_id =
+              AddOrGetPanelDoor(rooms_[room_id].name, panel_door_name);
+
+          std::map<std::string, std::vector<std::string>> panel_per_room;
+          int num_panels = 0;
+          for (const auto &panel_node : panel_door_it.second["panels"]) {
+            num_panels++;
+
+            int panel_id = -1;
+
+            if (panel_node.IsScalar()) {
+              panel_id = AddOrGetPanel(rooms_[room_id].name,
+                                       panel_node.as<std::string>());
+              
+              panel_per_room[rooms_[room_id].name].push_back(
+                  panel_node.as<std::string>());
+            } else {
+              panel_id = AddOrGetPanel(panel_node["room"].as<std::string>(),
+                                       panel_node["panel"].as<std::string>());
+
+              panel_per_room[panel_node["room"].as<std::string>()].push_back(
+                  panel_node["panel"].as<std::string>());
+            }
+
+            Panel &panel = panels_[panel_id];
+            panel.panel_door = panel_door_id;
+          }
+
+          if (panel_door_it.second["item_name"]) {
+            panel_doors_[panel_door_id].item_name =
+                panel_door_it.second["item_name"].as<std::string>();
+          } else {
+            std::vector<std::string> room_strs;
+            for (const auto &[room_str, panels_str] : panel_per_room) {
+              room_strs.push_back(fmt::format(
+                  "{} - {}", room_str, hatkirby::implode(panels_str, ", ")));
+            }
+
+            if (num_panels == 1) {
+              panel_doors_[panel_door_id].item_name =
+                  fmt::format("{} (Panel)", room_strs[0]);
+            } else {
+              panel_doors_[panel_door_id].item_name = fmt::format(
+                  "{} (Panels)", hatkirby::implode(room_strs, " and "));
+            }
+          }
+
+          if (ids_config["panel_doors"] &&
+              ids_config["panel_doors"][rooms_[room_id].name] &&
+              ids_config["panel_doors"][rooms_[room_id].name]
+                        [panel_door_name]) {
+            panel_doors_[panel_door_id].ap_item_id =
+                ids_config["panel_doors"][rooms_[room_id].name][panel_door_name]
+                    .as<int>();
+
+            item_by_ap_id_[panel_doors_[panel_door_id].ap_item_id] =
+                panel_doors_[panel_door_id].item_name;
+          } else {
+            TrackerLog(fmt::format("Missing AP item ID for panel door {} - {}",
+                                   rooms_[room_id].name, panel_door_name));
+          }
+
+          if (panel_door_it.second["panel_group"]) {
+            std::string panel_group =
+                panel_door_it.second["panel_group"].as<std::string>();
+
+            if (ids_config["panel_groups"] &&
+                ids_config["panel_groups"][panel_group]) {
+              panel_doors_[panel_door_id].group_ap_item_id =
+                  ids_config["panel_groups"][panel_group].as<int>();
+
+              item_by_ap_id_[panel_doors_[panel_door_id].group_ap_item_id] =
+                  panel_group;
+            } else {
+              TrackerLog(fmt::format(
+                  "Missing AP item ID for panel door group {}", panel_group));
+            }
+          }
+        }
+      }
+
       if (room_it.second["paintings"]) {
         for (const auto &painting : room_it.second["paintings"]) {
-          std::string painting_id = painting["id"].as<std::string>();
-          room_by_painting_[painting_id] = room_id;
+          std::string internal_id = painting["id"].as<std::string>();
+          int painting_id = AddOrGetPainting(internal_id);
+          PaintingExit &painting_exit = paintings_[painting_id];
+          painting_exit.room = room_id;
+
+          if (painting["display_name"]) {
+            painting_exit.display_name =
+                painting["display_name"].as<std::string>();
+          } else {
+            painting_exit.display_name = painting_exit.internal_id;
+          }
 
-          if (!painting["exit_only"] || !painting["exit_only"].as<bool>()) {
-            PaintingExit painting_exit;
-            painting_exit.id = painting_id;
+          if ((!painting["exit_only"] || !painting["exit_only"].as<bool>()) &&
+              (!painting["disable"] || !painting["disable"].as<bool>())) {
+            painting_exit.entrance = true;
 
             if (painting["required_door"]) {
               std::string rd_room = rooms_[room_id].name;
@@ -435,9 +541,9 @@ struct GameData {
               painting_exit.door = AddOrGetDoor(
                   rd_room, painting["required_door"]["door"].as<std::string>());
             }
-
-            rooms_[room_id].paintings.push_back(painting_exit);
           }
+
+          rooms_[room_id].paintings.push_back(painting_exit.id);
         }
       }
 
@@ -463,33 +569,74 @@ struct GameData {
               ids_config["progression"][progressive_item_name]) {
             progressive_item_id =
                 ids_config["progression"][progressive_item_name].as<int>();
+
+            item_by_ap_id_[progressive_item_id] = progressive_item_name;
           } else {
-            wxLogError("Missing AP item ID for progressive item %s",
-                       progressive_item_name);
+            TrackerLog(fmt::format("Missing AP item ID for progressive item {}",
+                                   progressive_item_name));
           }
 
-          int index = 1;
-          for (const auto &stage : progression_it.second) {
-            int door_id = -1;
+          if (progression_it.second["doors"]) {
+            int index = 1;
+            for (const auto &stage : progression_it.second["doors"]) {
+              int door_id = -1;
+
+              if (stage.IsScalar()) {
+                door_id =
+                    AddOrGetDoor(rooms_[room_id].name, stage.as<std::string>());
+              } else {
+                door_id = AddOrGetDoor(stage["room"].as<std::string>(),
+                                       stage["door"].as<std::string>());
+              }
 
-            if (stage.IsScalar()) {
-              door_id =
-                  AddOrGetDoor(rooms_[room_id].name, stage.as<std::string>());
-            } else {
-              door_id = AddOrGetDoor(stage["room"].as<std::string>(),
-                                     stage["door"].as<std::string>());
+              doors_[door_id].progressives.push_back(
+                  {.item_name = progressive_item_name,
+                   .ap_item_id = progressive_item_id,
+                   .quantity = index});
+              index++;
             }
+          }
 
-            doors_[door_id].progressives.push_back(
-                {.item_name = progressive_item_name,
-                 .ap_item_id = progressive_item_id,
-                 .quantity = index});
-            index++;
+          if (progression_it.second["panel_doors"]) {
+            int index = 1;
+            for (const auto &stage : progression_it.second["panel_doors"]) {
+              int panel_door_id = -1;
+
+              if (stage.IsScalar()) {
+                panel_door_id = AddOrGetPanelDoor(rooms_[room_id].name,
+                                                  stage.as<std::string>());
+              } else {
+                panel_door_id =
+                    AddOrGetPanelDoor(stage["room"].as<std::string>(),
+                                      stage["panel_door"].as<std::string>());
+              }
+
+              panel_doors_[panel_door_id].progressives.push_back(
+                  {.item_name = progressive_item_name,
+                   .ap_item_id = progressive_item_id,
+                   .quantity = index});
+              index++;
+            }
           }
         }
       }
     }
 
+    // Determine the panel solve indices from the sorted location IDs.
+    std::sort(panel_location_ids.begin(), panel_location_ids.end());
+
+    std::map<int, int> solve_index_by_location_id;
+    for (int i = 0; i < panel_location_ids.size(); i++) {
+      solve_index_by_location_id[panel_location_ids[i]] = i;
+    }
+
+    for (Panel &panel : panels_) {
+      if (panel.ap_location_id != -1) {
+        panel.solve_index = solve_index_by_location_id[panel.ap_location_id];
+        panel_by_solve_index_[panel.solve_index] = panel.id;
+      }
+    }
+
     map_areas_.reserve(areas_config.size());
 
     std::map<std::string, int> fold_areas;
@@ -510,13 +657,28 @@ struct GameData {
     // Only locations for the panels are kept here.
     std::map<std::string, std::tuple<int, int>> locations_by_name;
 
-    for (const Panel &panel : panels_) {
+    for (Panel &panel : panels_) {
       int room_id = panel.room;
       std::string room_name = rooms_[room_id].name;
 
       std::string area_name = room_name;
-      if (fold_areas.count(room_name)) {
-        int fold_area_id = fold_areas[room_name];
+      std::string section_name = panel.name;
+      std::string location_name = room_name + " - " + panel.name;
+
+      if (!panel.location_name.empty()) {
+        location_name = panel.location_name;
+
+        size_t divider_pos = location_name.find(" - ");
+        if (divider_pos != std::string::npos) {
+          area_name = location_name.substr(0, divider_pos);
+          section_name = location_name.substr(divider_pos + 3);
+        }
+      } else {
+        panel.location_name = location_name;
+      }
+
+      if (fold_areas.count(area_name)) {
+        int fold_area_id = fold_areas[area_name];
         area_name = map_areas_[fold_area_id].name;
       }
 
@@ -528,19 +690,23 @@ struct GameData {
         }
       }
 
+      if (room_name == "Starting Room") {
+        classification |= kLOCATION_SMALL_SPHERE_ONE;
+      }
+
       int area_id = AddOrGetArea(area_name);
       MapArea &map_area = map_areas_[area_id];
       // room field should be the original room ID
-      map_area.locations.push_back(
-          {.name = panel.name,
-           .ap_location_name = room_name + " - " + panel.name,
-           .ap_location_id = panel.ap_location_id,
-           .room = panel.room,
-           .panels = {panel.id},
-           .classification = classification,
-           .hunt = panel.hunt});
-      locations_by_name[map_area.locations.back().ap_location_name] = {
-          area_id, map_area.locations.size() - 1};
+      map_area.locations.push_back({.name = section_name,
+                                    .ap_location_name = location_name,
+                                    .ap_location_id = panel.ap_location_id,
+                                    .room = panel.room,
+                                    .panels = {panel.id},
+                                    .classification = classification,
+                                    .hunt = panel.hunt,
+                                    .single_panel = panel.id});
+      locations_by_name[location_name] = {area_id,
+                                          map_area.locations.size() - 1};
     }
 
     for (int door_id : door_definition_order_) {
@@ -591,14 +757,36 @@ struct GameData {
       for (const Location &location : map_area.locations) {
         map_area.classification |= location.classification;
         map_area.hunt |= location.hunt;
+        map_area.has_single_panel |= location.single_panel.has_value();
+      }
+    }
+
+    for (const Room &room : rooms_) {
+      std::string area_name = room.name;
+      if (fold_areas.count(room.name)) {
+        int fold_area_id = fold_areas[room.name];
+        area_name = map_areas_[fold_area_id].name;
+      }
+
+      if (!room.paintings.empty()) {
+        int area_id = AddOrGetArea(area_name);
+        MapArea &map_area = map_areas_[area_id];
+
+        for (int painting_id : room.paintings) {
+          PaintingExit &painting_obj = paintings_.at(painting_id);
+          painting_obj.map_area = area_id;
+          if (painting_obj.entrance) {
+            map_area.paintings.push_back(painting_id);
+          }
+        }
       }
     }
 
     // Report errors.
     for (const std::string &area : malconfigured_areas_) {
-      wxLogError("Area data not found for: %s", area);
+      TrackerLog(fmt::format("Area data not found for: {}", area));
     }
-    
+
     // Read in subway items.
     YAML::Node subway_config =
         YAML::LoadFile(GetAbsolutePath("assets/subway.yaml"));
@@ -613,13 +801,10 @@ struct GameData {
                                         subway_it["door"].as<std::string>());
       }
 
-      if (subway_it["paintings"]) {
-        for (const auto &painting_it : subway_it["paintings"]) {
-          std::string painting_id = painting_it.as<std::string>();
-
-          subway_item.paintings.push_back(painting_id);
-          subway_item_by_painting_[painting_id] = subway_item.id;
-        }
+      if (subway_it["painting"]) {
+        std::string painting_id = subway_it["painting"].as<std::string>();
+        subway_item.painting = painting_id;
+        subway_item_by_painting_[painting_id] = subway_item.id;
       }
 
       if (subway_it["tags"]) {
@@ -628,6 +813,18 @@ struct GameData {
         }
       }
 
+      if (subway_it["entrances"]) {
+        for (const auto &entrance_it : subway_it["entrances"]) {
+          subway_item.entrances.push_back(entrance_it.as<std::string>());
+        }
+      }
+
+      if (subway_it["exits"]) {
+        for (const auto &exit_it : subway_it["exits"]) {
+          subway_item.exits.push_back(exit_it.as<std::string>());
+        }
+      }
+
       if (subway_it["sunwarp"]) {
         SubwaySunwarp sunwarp;
         sunwarp.dots = subway_it["sunwarp"]["dots"].as<int>();
@@ -654,6 +851,10 @@ struct GameData {
         subway_item.special = subway_it["special"].as<std::string>();
       }
 
+      if (subway_it["tilted"]) {
+        subway_item.tilted = subway_it["tilted"].as<bool>();
+      }
+
       subway_items_.push_back(subway_item);
     }
 
@@ -667,7 +868,7 @@ struct GameData {
 
     for (const auto &[tag, items] : subway_tags) {
       if (items.size() == 1) {
-        wxLogWarning("Singleton subway item tag: %s", tag);
+        TrackerLog(fmt::format("Singleton subway item tag: {}", tag));
       }
     }
   }
@@ -687,7 +888,8 @@ struct GameData {
     if (!door_by_id_.count(full_name)) {
       int door_id = doors_.size();
       door_by_id_[full_name] = doors_.size();
-      doors_.push_back({.id = door_id, .room = AddOrGetRoom(room), .name = door});
+      doors_.push_back(
+          {.id = door_id, .room = AddOrGetRoom(room), .name = door});
     }
 
     return door_by_id_[full_name];
@@ -706,6 +908,18 @@ struct GameData {
     return panel_by_id_[full_name];
   }
 
+  int AddOrGetPanelDoor(std::string room, std::string panel) {
+    std::string full_name = room + " - " + panel;
+
+    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({});
+    }
+
+    return panel_doors_by_id_[full_name];
+  }
+
   int AddOrGetArea(std::string area) {
     if (!area_by_id_.count(area)) {
       if (loaded_area_data_) {
@@ -719,6 +933,16 @@ struct GameData {
 
     return area_by_id_[area];
   }
+
+  int AddOrGetPainting(std::string internal_id) {
+    if (!painting_by_id_.count(internal_id)) {
+      int painting_id = paintings_.size();
+      painting_by_id_[internal_id] = painting_id;
+      paintings_.push_back({.id = painting_id, .internal_id = internal_id});
+    }
+
+    return painting_by_id_[internal_id];
+  }
 };
 
 GameData &GetState() {
@@ -728,7 +952,12 @@ GameData &GetState() {
 
 }  // namespace
 
-bool SubwaySunwarp::operator<(const SubwaySunwarp& rhs) const {
+bool SubwayItem::HasWarps() const {
+  return !(this->tags.empty() && this->entrances.empty() &&
+           this->exits.empty());
+}
+
+bool SubwaySunwarp::operator<(const SubwaySunwarp &rhs) const {
   return std::tie(dots, type) < std::tie(rhs.dots, rhs.type);
 }
 
@@ -746,6 +975,10 @@ const std::vector<Door> &GD_GetDoors() { return GetState().doors_; }
 
 const Door &GD_GetDoor(int door_id) { return GetState().doors_.at(door_id); }
 
+const PanelDoor &GD_GetPanelDoor(int panel_door_id) {
+  return GetState().panel_doors_.at(panel_door_id);
+}
+
 int GD_GetDoorByName(const std::string &name) {
   return GetState().door_by_id_.at(name);
 }
@@ -754,8 +987,20 @@ const Panel &GD_GetPanel(int panel_id) {
   return GetState().panels_.at(panel_id);
 }
 
-int GD_GetRoomForPainting(const std::string &painting_id) {
-  return GetState().room_by_painting_.at(painting_id);
+int GD_GetPanelBySolveIndex(int solve_index) {
+  return GetState().panel_by_solve_index_.at(solve_index);
+}
+
+const std::vector<PaintingExit> &GD_GetPaintings() {
+  return GetState().paintings_;
+}
+
+const PaintingExit &GD_GetPaintingExit(int painting_id) {
+  return GetState().paintings_.at(painting_id);
+}
+
+int GD_GetPaintingByName(const std::string &name) {
+  return GetState().painting_by_id_.at(name);
 }
 
 const std::vector<int> &GD_GetAchievementPanels() {
@@ -782,15 +1027,48 @@ const SubwayItem &GD_GetSubwayItem(int id) {
   return GetState().subway_items_.at(id);
 }
 
-int GD_GetSubwayItemForPainting(const std::string& painting_id) {
-#ifndef NDEBUG
-  if (!GetState().subway_item_by_painting_.count(painting_id)) {
-    wxLogError("No subway item for painting %s", painting_id);
+std::optional<int> GD_GetSubwayItemForPainting(const std::string &painting_id) {
+  if (GetState().subway_item_by_painting_.count(painting_id)) {
+    return GetState().subway_item_by_painting_.at(painting_id);
   }
-#endif
-  return GetState().subway_item_by_painting_.at(painting_id);
+  return std::nullopt;
 }
 
 int GD_GetSubwayItemForSunwarp(const SubwaySunwarp &sunwarp) {
   return GetState().subway_item_by_sunwarp_.at(sunwarp);
 }
+
+std::string GD_GetItemName(int id) {
+  auto it = GetState().item_by_ap_id_.find(id);
+  if (it != GetState().item_by_ap_id_.end()) {
+    return it->second;
+  } else {
+    return "Unknown";
+  }
+}
+
+LingoColor GetLingoColorForString(const std::string &str) {
+  if (str == "black") {
+    return LingoColor::kBlack;
+  } else if (str == "red") {
+    return LingoColor::kRed;
+  } else if (str == "blue") {
+    return LingoColor::kBlue;
+  } else if (str == "yellow") {
+    return LingoColor::kYellow;
+  } else if (str == "orange") {
+    return LingoColor::kOrange;
+  } else if (str == "green") {
+    return LingoColor::kGreen;
+  } else if (str == "gray") {
+    return LingoColor::kGray;
+  } else if (str == "brown") {
+    return LingoColor::kBrown;
+  } else if (str == "purple") {
+    return LingoColor::kPurple;
+  } else {
+    TrackerLog(fmt::format("Invalid color: {}", str));
+
+    return LingoColor::kNone;
+  }
+}
@@ -22,6 +22,7 @@ enum class LingoColor {
 constexpr int kLOCATION_NORMAL = 1;
 constexpr int kLOCATION_REDUCED = 2;
 constexpr int kLOCATION_INSANITY = 4;
+constexpr int kLOCATION_SMALL_SPHERE_ONE = 8;
 
 enum class EntranceType {
   kNormal,
@@ -30,6 +31,7 @@ enum class EntranceType {
   kWarp,
   kPilgrimage,
   kCrossroadsRoofAccess,
+  kStaticPainting,
 };
 
 enum class DoorType {
@@ -42,6 +44,7 @@ struct Panel {
   int id;
   int room;
   std::string name;
+  std::string nodepath;
   std::vector<LingoColor> colors;
   std::vector<int> required_rooms;
   std::vector<int> required_doors;
@@ -50,9 +53,12 @@ struct Panel {
   bool exclude_reduce = false;
   bool achievement = false;
   std::string achievement_name;
+  std::string location_name;
   bool non_counting = false;
   int ap_location_id = -1;
   bool hunt = false;
+  int panel_door = -1;
+  int solve_index = -1;
 };
 
 struct ProgressiveRequirement {
@@ -80,21 +86,34 @@ struct Door {
   DoorType type = DoorType::kNormal;
 };
 
+struct PanelDoor {
+  int ap_item_id = -1;
+  int group_ap_item_id = -1;
+  std::vector<ProgressiveRequirement> progressives;
+  std::string item_name;
+};
+
 struct Exit {
+  int source_room;
   int destination_room;
   std::optional<int> door;
   EntranceType type = EntranceType::kNormal;
 };
 
 struct PaintingExit {
-  std::string id;
+  int id;
+  int room;
+  std::string internal_id;
+  std::string display_name;
   std::optional<int> door;
+  bool entrance = false;
+  int map_area;
 };
 
 struct Room {
   std::string name;
   std::vector<Exit> exits;
-  std::vector<PaintingExit> paintings;
+  std::vector<int> paintings;
   std::vector<int> sunwarps;
   std::vector<int> panels;
 };
@@ -107,16 +126,19 @@ struct Location {
   std::vector<int> panels;
   int classification = 0;
   bool hunt = false;
+  std::optional<int> single_panel;
 };
 
 struct MapArea {
   int id;
   std::string name;
   std::vector<Location> locations;
+  std::vector<int> paintings;
   int map_x;
   int map_y;
   int classification = 0;
   bool hunt = false;
+  bool has_single_panel = false;
 };
 
 enum class SubwaySunwarpType {
@@ -136,11 +158,16 @@ struct SubwayItem {
   int id;
   int x;
   int y;
+  bool tilted = false;
   std::optional<int> door;
-  std::vector<std::string> paintings;
-  std::vector<std::string> tags;
+  std::optional<std::string> painting;
+  std::vector<std::string> tags; // 2-way teleports
+  std::vector<std::string> entrances; // teleport entrances
+  std::vector<std::string> exits; // teleport exits
   std::optional<SubwaySunwarp> sunwarp;
   std::optional<std::string> special;
+
+  bool HasWarps() const;
 };
 
 const std::vector<MapArea>& GD_GetMapAreas();
@@ -151,14 +178,21 @@ const std::vector<Door>& GD_GetDoors();
 const Door& GD_GetDoor(int door_id);
 int GD_GetDoorByName(const std::string& name);
 const Panel& GD_GetPanel(int panel_id);
-int GD_GetRoomForPainting(const std::string& painting_id);
+int GD_GetPanelBySolveIndex(int solve_index);
+const PanelDoor& GD_GetPanelDoor(int panel_door_id);
+const std::vector<PaintingExit>& GD_GetPaintings();
+const PaintingExit& GD_GetPaintingExit(int painting_id);
+int GD_GetPaintingByName(const std::string& name);
 const std::vector<int>& GD_GetAchievementPanels();
 int GD_GetItemIdForColor(LingoColor color);
 const std::vector<int>& GD_GetSunwarpDoors();
 int GD_GetRoomForSunwarp(int index);
 const std::vector<SubwayItem>& GD_GetSubwayItems();
 const SubwayItem& GD_GetSubwayItem(int id);
-int GD_GetSubwayItemForPainting(const std::string& painting_id);
+std::optional<int> GD_GetSubwayItemForPainting(const std::string& painting_id);
 int GD_GetSubwayItemForSunwarp(const SubwaySunwarp& sunwarp);
+std::string GD_GetItemName(int id);
+
+LingoColor GetLingoColorForString(const std::string& str);
 
 #endif /* end of include guard: GAME_DATA_H_9C42AC51 */
@@ -26,17 +26,19 @@ std::string GetAbsolutePath(std::string_view path) {
   return (GetExecutableDirectory() / path).string();
 }
 
-bool IsLocationWinCondition(const Location& location) {
+std::string GetWinCondition() {
   switch (AP_GetVictoryCondition()) {
     case kTHE_END:
-      return location.ap_location_name ==
-             "Orange Tower Seventh Floor - THE END";
+      return "Orange Tower Seventh Floor - THE END";
     case kTHE_MASTER:
-      return location.ap_location_name ==
-             "Orange Tower Seventh Floor - THE MASTER";
+      return "Orange Tower Seventh Floor - THE MASTER";
     case kLEVEL_2:
-      return location.ap_location_name == "Second Room - LEVEL 2";
+      return "Second Room - LEVEL 2";
     case kPILGRIMAGE:
-      return location.ap_location_name == "Pilgrim Antechamber - PILGRIM";
+      return "Pilgrim Antechamber - PILGRIM";
   }
 }
+
+bool IsLocationWinCondition(const Location& location) {
+  return location.ap_location_name == GetWinCondition();
+}
@@ -10,6 +10,8 @@ const std::filesystem::path& GetExecutableDirectory();
 
 std::string GetAbsolutePath(std::string_view path);
 
+std::string GetWinCondition();
+
 bool IsLocationWinCondition(const Location& location);
 
 #endif /* end of include guard: GLOBAL_H_44945DBA */
@@ -0,0 +1,22 @@
+#include "icons.h"
+
+#include "global.h"
+
+const wxBitmap* IconCache::GetIcon(const std::string& filename, wxSize size) {
+  std::tuple<std::string, int, int> key = {filename, size.x, size.y};
+
+  if (!icons_.count(key)) {
+    icons_[key] =
+        wxBitmap(wxImage(GetAbsolutePath(filename).c_str(),
+                         wxBITMAP_TYPE_PNG)
+                     .Scale(size.x, size.y));
+  }
+
+  return &icons_.at(key);
+}
+
+static IconCache* ICON_CACHE_INSTANCE = nullptr;
+
+void SetTheIconCache(IconCache* instance) { ICON_CACHE_INSTANCE = instance; }
+
+IconCache& GetTheIconCache() { return *ICON_CACHE_INSTANCE; }
@@ -0,0 +1,25 @@
+#ifndef ICONS_H_B95159A6
+#define ICONS_H_B95159A6
+
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+#include <map>
+#include <string>
+#include <tuple>
+
+class IconCache {
+ public:
+  const wxBitmap* GetIcon(const std::string& filename, wxSize size);
+
+ private:
+  std::map<std::tuple<std::string, int, int>, wxBitmap> icons_;
+};
+
+void SetTheIconCache(IconCache* instance);
+IconCache& GetTheIconCache();
+
+#endif /* end of include guard: ICONS_H_B95159A6 */
@@ -0,0 +1,54 @@
+#include "ipc_dialog.h"
+
+#include "tracker_config.h"
+
+constexpr const char* kDefaultIpcAddress = "ws://127.0.0.1:41253";
+
+IpcDialog::IpcDialog() : wxDialog(nullptr, wxID_ANY, "Connect to game") {
+  std::string address_value;
+  if (GetTrackerConfig().ipc_address.empty()) {
+    address_value = kDefaultIpcAddress;
+  } else {
+    address_value = GetTrackerConfig().ipc_address;
+  }
+
+  address_box_ = new wxTextCtrl(this, -1, wxString::FromUTF8(address_value),
+                                wxDefaultPosition, FromDIP(wxSize{300, -1}));
+
+  wxButton* reset_button = new wxButton(this, -1, "Use Default");
+  reset_button->Bind(wxEVT_BUTTON, &IpcDialog::OnResetClicked, this);
+
+  wxFlexGridSizer* form_sizer =
+      new wxFlexGridSizer(3, FromDIP(10), FromDIP(10));
+  form_sizer->Add(
+      new wxStaticText(this, -1, "Address:"),
+      wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
+  form_sizer->Add(address_box_, wxSizerFlags().Expand());
+  form_sizer->Add(reset_button);
+
+  wxBoxSizer* top_sizer = new wxBoxSizer(wxVERTICAL);
+  wxStaticText* top_text = new wxStaticText(this, -1, "");
+  top_sizer->Add(top_text, wxSizerFlags().Align(wxALIGN_LEFT).DoubleBorder().Expand());
+  top_sizer->Add(form_sizer, wxSizerFlags().DoubleBorder().Expand());
+  top_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL),
+                 wxSizerFlags().Border().Center());
+
+  SetSizer(top_sizer);
+  Layout();
+  Fit();
+
+  int width = top_text->GetClientSize().GetWidth();
+  top_text->SetLabel(
+      "This allows you to connect to a running Lingo game and track non-multiworld "
+      "state, such as the player's position and what panels are solved. Unless "
+      "you are doing something weird, the default value for the address is "
+      "probably correct.");
+  top_text->Wrap(width);
+
+  Fit();
+  Center();
+}
+
+void IpcDialog::OnResetClicked(wxCommandEvent& event) {
+  address_box_->SetValue(kDefaultIpcAddress);
+}
@@ -0,0 +1,24 @@
+#ifndef IPC_DIALOG_H_F4C5680C
+#define IPC_DIALOG_H_F4C5680C
+
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+#include <string>
+
+class IpcDialog : public wxDialog {
+ public:
+  IpcDialog();
+
+  std::string GetIpcAddress() { return address_box_->GetValue().utf8_string(); }
+
+ private:
+  void OnResetClicked(wxCommandEvent& event);
+
+  wxTextCtrl* address_box_;
+};
+
+#endif /* end of include guard: IPC_DIALOG_H_F4C5680C */
@@ -0,0 +1,367 @@
+#include "ipc_state.h"
+
+#define _WEBSOCKETPP_CPP11_STRICT_
+
+#include <fmt/core.h>
+
+#include <chrono>
+#include <memory>
+#include <mutex>
+#include <nlohmann/json.hpp>
+#include <optional>
+#include <set>
+#include <string>
+#include <thread>
+#include <tuple>
+#include <wswrap.hpp>
+
+#include "ap_state.h"
+#include "logger.h"
+#include "tracker_frame.h"
+
+namespace {
+
+struct IPCState {
+  std::mutex state_mutex;
+  TrackerFrame* tracker_frame = nullptr;
+
+  // Protected state
+  bool initialized = false;
+  std::string address;
+  bool should_disconnect = false;
+
+  std::optional<std::string> status_message;
+
+  bool slot_matches = false;
+  std::string tracker_ap_server;
+  std::string tracker_ap_user;
+  std::string game_ap_server;
+  std::string game_ap_user;
+
+  std::optional<std::tuple<int, int>> player_position;
+
+  // Thread state
+  std::unique_ptr<wswrap::WS> ws;
+  bool connected = false;
+
+  void SetTrackerFrame(TrackerFrame* frame) { tracker_frame = frame; }
+
+  void Connect(std::string a) {
+    // This is the main concurrency concern, as it mutates protected state in an
+    // important way. Thread() is documented with how it interacts with this
+    // function.
+    std::lock_guard state_guard(state_mutex);
+
+    if (!initialized) {
+      std::thread([this]() { Thread(); }).detach();
+
+      initialized = true;
+    } else if (address != a) {
+      should_disconnect = true;
+    }
+
+    address = a;
+  }
+
+  std::optional<std::string> GetStatusMessage() {
+    std::lock_guard state_guard(state_mutex);
+
+    return status_message;
+  }
+
+  void SetTrackerSlot(std::string server, std::string user) {
+    // This function is called from the APState thread, not the main thread, and
+    // it mutates protected state. It only really competes with OnMessage(), when
+    // a "Connect" message is received. If this is called right before, and the
+    // tracker slot does not match the old game slot, it will initiate a
+    // disconnect, and then the OnMessage() handler will see should_disconnect
+    // and stop processing the "Connect" message. If this is called right after
+    // and the slot does not match, IPC will disconnect, which is tolerable.
+    std::lock_guard state_guard(state_mutex);
+
+    tracker_ap_server = std::move(server);
+    tracker_ap_user = std::move(user);
+
+    CheckIfSlotMatches();
+
+    if (!slot_matches) {
+      should_disconnect = true;
+      address.clear();
+    }
+  }
+
+  bool IsConnected() {
+    std::lock_guard state_guard(state_mutex);
+
+    return slot_matches;
+  }
+
+  std::optional<std::tuple<int, int>> GetPlayerPosition() {
+    std::lock_guard state_guard(state_mutex);
+
+    return player_position;
+  }
+
+ private:
+  void Thread() {
+    for (;;) {
+      // initialized is definitely true because it is set to true when the thread
+      // is created and only set to false within this block, when the thread is
+      // killed. Thus, a call to Connect would always at most set
+      // should_disconnect and address. If this happens before this block, it is
+      // as if we are starting from a new thread anyway because should_disconnect
+      // is immediately reset. If a call to Connect happens after this block,
+      // then a connection attempt will be made to the wrong address, but the
+      // thread will grab the mutex right after this and back out the wrong
+      // connection.
+      std::string ipc_address;
+      {
+        std::lock_guard state_guard(state_mutex);
+
+        SetStatusMessage("Disconnected from game.");
+
+        should_disconnect = false;
+
+        slot_matches = false;
+        game_ap_server.clear();
+        game_ap_user.clear();
+
+        player_position = std::nullopt;
+
+        if (address.empty()) {
+          initialized = false;
+          return;
+        }
+
+        ipc_address = address;
+
+        SetStatusMessage("Connecting to game...");
+      }
+
+      int backoff_amount = 0;
+
+      TrackerLog(fmt::format("Looking for game over IPC ({})...", ipc_address));
+
+      while (!connected) {
+        if (TryConnect(ipc_address)) {
+          int backoff_limit = (backoff_amount + 1) * 10;
+
+          for (int i = 0; i < backoff_limit && !connected; i++) {
+            // If Connect is called right before this block, we will see and
+            // handle should_disconnect. If it is called right after, we will do
+            // one bad poll, one sleep, and then grab the mutex again right
+            // after.
+            {
+              std::lock_guard state_guard(state_mutex);
+              if (should_disconnect) {
+                break;
+              }
+            }
+
+            ws->poll();
+
+            // Back off
+            std::this_thread::sleep_for(std::chrono::milliseconds(100));
+          }
+
+          backoff_amount++;
+        } else {
+          std::lock_guard state_guard(state_mutex);
+
+          if (!should_disconnect) {
+            should_disconnect = true;
+            address.clear();
+
+            SetStatusMessage("Disconnected from game.");
+          }
+
+          break;
+        }
+
+        // If Connect is called right before this block, we will see and handle
+        // should_disconnect. If it is called right after, and the connection
+        // was unsuccessful, we will grab the mutex after one bad connection
+        // attempt. If the connection was successful, we grab the mutex right
+        // after exiting the loop.
+        bool show_error = false;
+        {
+          std::lock_guard state_guard(state_mutex);
+
+          if (should_disconnect) {
+            break;
+          } else if (!connected) {
+            if (backoff_amount >= 10) {
+              should_disconnect = true;
+              address.clear();
+
+              SetStatusMessage("Disconnected from game.");
+
+              show_error = true;
+            } else {
+              TrackerLog(fmt::format("Retrying IPC in {} second(s)...",
+                                     backoff_amount + 1));
+            }
+          }
+        }
+
+        // We do this after giving up the mutex because otherwise we could
+        // deadlock with the main thread.
+        if (show_error) {
+          TrackerLog("Giving up on IPC.");
+
+          wxMessageBox("Connection to Lingo timed out.", "Connection failed",
+                       wxOK | wxICON_ERROR);
+          break;
+        }
+      }
+
+      // Pretty much every lock guard in the thread is the same. We check for
+      // should_disconnect, and if it gets set directly after the block, we do
+      // minimal bad work before checking for it again.
+      {
+        std::lock_guard state_guard(state_mutex);
+        if (should_disconnect) {
+          ws.reset();
+          continue;
+        }
+      }
+
+      while (connected) {
+        ws->poll();
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+        {
+          std::lock_guard state_guard(state_mutex);
+          if (should_disconnect) {
+            ws.reset();
+            break;
+          }
+        }
+      }
+    }
+  }
+
+  bool TryConnect(std::string ipc_address) {
+    try {
+      ws = std::make_unique<wswrap::WS>(
+          ipc_address, [this]() { OnConnect(); }, [this]() { OnClose(); },
+          [this](const std::string& s) { OnMessage(s); },
+          [this](const std::string& s) { OnError(s); });
+      return true;
+    } catch (const std::exception& ex) {
+      TrackerLog(fmt::format("Error connecting to Lingo: {}", ex.what()));
+      wxMessageBox(ex.what(), "Error connecting to Lingo", wxOK | wxICON_ERROR);
+      ws.reset();
+      return false;
+    }
+  }
+
+  void OnConnect() {
+    connected = true;
+
+    {
+      std::lock_guard state_guard(state_mutex);
+
+      slot_matches = false;
+      player_position = std::nullopt;
+    }
+  }
+
+  void OnClose() {
+    connected = false;
+
+    {
+      std::lock_guard state_guard(state_mutex);
+
+      slot_matches = false;
+    }
+  }
+
+  void OnMessage(const std::string& s) {
+    TrackerLog(s);
+
+    auto msg = nlohmann::json::parse(s);
+
+    if (msg["cmd"] == "Connect") {
+      std::lock_guard state_guard(state_mutex);
+      if (should_disconnect) {
+        return;
+      }
+
+      game_ap_server = msg["slot"]["server"];
+      game_ap_user = msg["slot"]["player"];
+
+      CheckIfSlotMatches();
+
+      if (!slot_matches) {
+        tracker_frame->ConnectToAp(game_ap_server, game_ap_user,
+                                   msg["slot"]["password"]);
+      }
+    } else if (msg["cmd"] == "UpdatePosition") {
+      std::lock_guard state_guard(state_mutex);
+
+      player_position =
+          std::make_tuple<int, int>(msg["position"]["x"], msg["position"]["z"]);
+
+      tracker_frame->UpdateIndicators(StateUpdate{.player_position = true});
+    }
+  }
+
+  void OnError(const std::string& s) {}
+
+  // Assumes mutex is locked.
+  void CheckIfSlotMatches() {
+    slot_matches = (tracker_ap_server == game_ap_server &&
+                    tracker_ap_user == game_ap_user);
+
+    if (slot_matches) {
+      SetStatusMessage("Connected to game.");
+
+      Sync();
+    } else if (connected) {
+      SetStatusMessage("Local game doesn't match AP slot.");
+    }
+  }
+
+  // Assumes mutex is locked.
+  void SetStatusMessage(std::optional<std::string> msg) {
+    status_message = msg;
+
+    tracker_frame->UpdateStatusMessage();
+  }
+
+  void Sync() {
+    nlohmann::json msg;
+    msg["cmd"] = "Sync";
+
+    ws->send_text(msg.dump());
+  }
+};
+
+IPCState& GetState() {
+  static IPCState* instance = new IPCState();
+  return *instance;
+}
+
+}  // namespace
+
+void IPC_SetTrackerFrame(TrackerFrame* tracker_frame) {
+  GetState().SetTrackerFrame(tracker_frame);
+}
+
+void IPC_Connect(std::string address) { GetState().Connect(address); }
+
+std::optional<std::string> IPC_GetStatusMessage() {
+  return GetState().GetStatusMessage();
+}
+
+void IPC_SetTrackerSlot(std::string server, std::string user) {
+  GetState().SetTrackerSlot(server, user);
+}
+
+bool IPC_IsConnected() { return GetState().IsConnected(); }
+
+std::optional<std::tuple<int, int>> IPC_GetPlayerPosition() {
+  return GetState().GetPlayerPosition();
+}
@@ -0,0 +1,23 @@
+#ifndef IPC_STATE_H_6B3B0958
+#define IPC_STATE_H_6B3B0958
+
+#include <optional>
+#include <set>
+#include <string>
+#include <tuple>
+
+class TrackerFrame;
+
+void IPC_SetTrackerFrame(TrackerFrame* tracker_frame);
+
+void IPC_Connect(std::string address);
+
+std::optional<std::string> IPC_GetStatusMessage();
+
+void IPC_SetTrackerSlot(std::string server, std::string user);
+
+bool IPC_IsConnected();
+
+std::optional<std::tuple<int, int>> IPC_GetPlayerPosition();
+
+#endif /* end of include guard: IPC_STATE_H_6B3B0958 */
@@ -0,0 +1,145 @@
+#include "items_pane.h"
+
+#include <map>
+
+namespace {
+
+enum SortInstruction {
+  SI_NONE = 0,
+  SI_ASC = 1 << 0,
+  SI_DESC = 1 << 1,
+  SI_NAME = 1 << 2,
+  SI_AMOUNT = 1 << 3,
+  SI_ORDER = 1 << 4,
+};
+
+inline SortInstruction operator|(SortInstruction lhs, SortInstruction rhs) {
+  return static_cast<SortInstruction>(static_cast<int>(lhs) |
+                                      static_cast<int>(rhs));
+}
+
+template <typename T>
+int ItemCompare(const T& lhs, const T& rhs, bool ascending) {
+  if (lhs < rhs) {
+    return ascending ? -1 : 1;
+  } else if (lhs > rhs) {
+    return ascending ? 1 : -1;
+  } else {
+    return 0;
+  }
+}
+
+int wxCALLBACK RowCompare(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData) {
+  const ItemState& lhs = *reinterpret_cast<const ItemState*>(item1);
+  const ItemState& rhs = *reinterpret_cast<const ItemState*>(item2);
+  SortInstruction instruction = static_cast<SortInstruction>(sortData);
+
+  bool ascending = (instruction & SI_ASC) != 0;
+  if ((instruction & SI_NAME) != 0) {
+    return ItemCompare(lhs.name, rhs.name, ascending);
+  } else if ((instruction & SI_AMOUNT) != 0) {
+    return ItemCompare(lhs.amount, rhs.amount, ascending);
+  } else if ((instruction & SI_ORDER) != 0) {
+    return ItemCompare(lhs.index, rhs.index, ascending);
+  } else {
+    return 0;
+  }
+}
+
+}  // namespace
+
+ItemsPane::ItemsPane(wxWindow* parent)
+    : wxListView(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                 wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_HRULES) {
+  AppendColumn("Item", wxLIST_FORMAT_LEFT, wxLIST_AUTOSIZE_USEHEADER);
+  AppendColumn("Amount", wxLIST_FORMAT_LEFT, wxLIST_AUTOSIZE_USEHEADER);
+  AppendColumn("Order", wxLIST_FORMAT_LEFT, wxLIST_AUTOSIZE_USEHEADER);
+
+  Bind(wxEVT_LIST_COL_CLICK, &ItemsPane::OnColClick, this);
+  Bind(wxEVT_DPI_CHANGED, &ItemsPane::OnDPIChanged, this);
+}
+
+void ItemsPane::ResetIndicators() {
+  DeleteAllItems();
+  items_.clear();
+}
+
+void ItemsPane::UpdateIndicators(const std::vector<ItemState>& items) {
+  std::map<std::string, ItemState> items_by_name;
+
+  for (const ItemState& item : items) {
+    items_by_name[item.name] = item;
+  }
+
+  for (int i = 0; i < GetItemCount(); i++) {
+    std::string item_name = GetItemText(i).utf8_string();
+    auto it = items_by_name.find(item_name);
+
+    if (it != items_by_name.end()) {
+      SetItem(i, 1, std::to_string(it->second.amount));
+      SetItem(i, 2, std::to_string(it->second.index));
+
+      *reinterpret_cast<ItemState*>(GetItemData(i)) = it->second;
+
+      items_by_name.erase(item_name);
+    }
+  }
+
+  for (const auto& [name, item] : items_by_name) {
+    int i = InsertItem(GetItemCount(), name);
+    SetItem(i, 1, std::to_string(item.amount));
+    SetItem(i, 2, std::to_string(item.index));
+
+    auto item_ptr = std::make_unique<ItemState>(item);
+    SetItemPtrData(i, reinterpret_cast<wxUIntPtr>(item_ptr.get()));
+    items_.push_back(std::move(item_ptr));
+  }
+
+  SetColumnWidth(0, wxLIST_AUTOSIZE);
+  SetColumnWidth(1, wxLIST_AUTOSIZE_USEHEADER);
+  SetColumnWidth(2, wxLIST_AUTOSIZE_USEHEADER);
+
+  if (GetSortIndicator() != -1) {
+    DoSort(GetSortIndicator(), IsAscendingSortIndicator());
+  }
+}
+
+void ItemsPane::OnColClick(wxListEvent& event) {
+  int col = event.GetColumn();
+  if (col == -1) {
+    return;
+  }
+
+  bool ascending = GetUpdatedAscendingSortIndicator(col);
+
+  DoSort(col, ascending);
+}
+
+void ItemsPane::OnDPIChanged(wxDPIChangedEvent& event) {
+  SetColumnWidth(0, wxLIST_AUTOSIZE);
+  SetColumnWidth(1, wxLIST_AUTOSIZE_USEHEADER);
+  SetColumnWidth(2, wxLIST_AUTOSIZE_USEHEADER);
+
+  event.Skip();
+}
+
+void ItemsPane::DoSort(int col, bool ascending) {
+  SortInstruction instruction = SI_NONE;
+  if (ascending) {
+    instruction = instruction | SI_ASC;
+  } else {
+    instruction = instruction | SI_DESC;
+  }
+
+  if (col == 0) {
+    instruction = instruction | SI_NAME;
+  } else if (col == 1) {
+    instruction = instruction | SI_AMOUNT;
+  } else if (col == 2) {
+    instruction = instruction | SI_ORDER;
+  }
+
+  if (SortItems(RowCompare, instruction)) {
+    ShowSortIndicator(col, ascending);
+  }
+}
@@ -0,0 +1,33 @@
+#ifndef ITEMS_PANE_H_EB637EE3
+#define ITEMS_PANE_H_EB637EE3
+
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+#include <wx/listctrl.h>
+
+#include <memory>
+#include <vector>
+
+#include "ap_state.h"
+
+class ItemsPane : public wxListView {
+ public:
+  explicit ItemsPane(wxWindow* parent);
+
+  void ResetIndicators();
+  void UpdateIndicators(const std::vector<ItemState>& items);
+
+ private:
+  void OnColClick(wxListEvent& event);
+  void OnDPIChanged(wxDPIChangedEvent& event);
+
+  void DoSort(int col, bool ascending);
+
+  std::vector<std::unique_ptr<ItemState>> items_;
+};
+
+#endif /* end of include guard: ITEMS_PANE_H_EB637EE3 */
@@ -0,0 +1,37 @@
+#include "log_dialog.h"
+
+#include "logger.h"
+
+wxDEFINE_EVENT(LOG_MESSAGE, wxCommandEvent);
+
+LogDialog::LogDialog(wxWindow* parent)
+    : wxDialog(parent, wxID_ANY, "Debug Log", wxDefaultPosition, wxDefaultSize,
+               wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) {
+  SetSize(FromDIP(wxSize{512, 280}));
+
+  text_area_ =
+      new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize,
+                     wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP);
+  text_area_->SetValue(TrackerReadPastLog());
+
+  wxBoxSizer* top_sizer = new wxBoxSizer(wxVERTICAL);
+  top_sizer->Add(text_area_,
+                 wxSizerFlags().DoubleBorder().Expand().Proportion(1));
+
+  SetSizer(top_sizer);
+
+  Bind(LOG_MESSAGE, &LogDialog::OnLogMessage, this);
+}
+
+void LogDialog::LogMessage(const std::string& message) {
+  wxCommandEvent* event = new wxCommandEvent(LOG_MESSAGE);
+  event->SetString(message);
+  QueueEvent(event);
+}
+
+void LogDialog::OnLogMessage(wxCommandEvent& event) {
+  if (!text_area_->IsEmpty()) {
+    text_area_->AppendText("\n");
+  }
+  text_area_->AppendText(event.GetString());
+}
@@ -0,0 +1,24 @@
+#ifndef LOG_DIALOG_H_EEFD45B6
+#define LOG_DIALOG_H_EEFD45B6
+
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+wxDECLARE_EVENT(LOG_MESSAGE, wxCommandEvent);
+
+class LogDialog : public wxDialog {
+ public:
+  explicit LogDialog(wxWindow* parent);
+
+  void LogMessage(const std::string& message);
+
+ private:
+  void OnLogMessage(wxCommandEvent& event);
+
+  wxTextCtrl* text_area_;
+};
+
+#endif /* end of include guard: LOG_DIALOG_H_EEFD45B6 */
@@ -0,0 +1,64 @@
+#include "logger.h"
+
+#include <chrono>
+#include <fstream>
+#include <mutex>
+#include <sstream>
+
+#include "global.h"
+#include "log_dialog.h"
+
+namespace {
+
+class Logger {
+ public:
+  Logger() : logfile_(GetAbsolutePath("debug.log")) {}
+
+  void LogLine(const std::string& text) {
+    std::lock_guard guard(file_mutex_);
+    std::ostringstream line;
+    line << "[" << std::chrono::system_clock::now() << "] " << text;
+
+    logfile_ << line.str() << std::endl;
+    logfile_.flush();
+
+    if (log_dialog_ != nullptr) {
+      log_dialog_->LogMessage(line.str());
+    }
+  }
+
+  std::string GetContents() {
+    std::lock_guard guard(file_mutex_);
+
+    std::ifstream file_in(GetAbsolutePath("debug.log"));
+    std::ostringstream buffer;
+    buffer << file_in.rdbuf();
+
+    return buffer.str();
+  }
+
+  void SetLogDialog(LogDialog* log_dialog) {
+    std::lock_guard guard(file_mutex_);
+    log_dialog_ = log_dialog;
+  }
+
+ private:
+  std::ofstream logfile_;
+  std::mutex file_mutex_;
+  LogDialog* log_dialog_ = nullptr;
+};
+
+Logger& GetLogger() {
+  static Logger* instance = new Logger();
+  return *instance;
+}
+
+}  // namespace
+
+void TrackerLog(std::string text) { GetLogger().LogLine(text); }
+
+std::string TrackerReadPastLog() { return GetLogger().GetContents(); }
+
+void TrackerSetLogDialog(LogDialog* log_dialog) {
+  GetLogger().SetLogDialog(log_dialog);
+}
@@ -0,0 +1,14 @@
+#ifndef LOGGER_H_9BDD07EA
+#define LOGGER_H_9BDD07EA
+
+#include <string>
+
+class LogDialog;
+
+void TrackerLog(std::string message);
+
+std::string TrackerReadPastLog();
+
+void TrackerSetLogDialog(LogDialog* log_dialog);
+
+#endif /* end of include guard: LOGGER_H_9BDD07EA */
@@ -4,31 +4,29 @@
 #include <wx/wx.h>
 #endif
 
-#include <fstream>
-
 #include "global.h"
 #include "tracker_config.h"
 #include "tracker_frame.h"
 
-static std::ofstream* logfile;
-
 class TrackerApp : public wxApp {
  public:
-  virtual bool OnInit() {
-    logfile = new std::ofstream(GetAbsolutePath("debug.log"));
-    wxLog::SetActiveTarget(new wxLogStream(logfile));
-
-#ifndef NDEBUG
-    wxLog::SetVerbose(true);
-    wxLog::SetActiveTarget(new wxLogWindow(nullptr, "Debug Log"));
-#endif
-
+  virtual bool OnInit() override {
     GetTrackerConfig().Load();
 
     TrackerFrame *frame = new TrackerFrame();
     frame->Show(true);
     return true;
   }
+
+  bool OnExceptionInMainLoop() override {
+    try {
+      throw;
+    } catch (const std::exception& ex) {
+      wxLogError(ex.what());
+    }
+
+    return false;
+  }
 };
 
 wxIMPLEMENT_APP(TrackerApp);
@@ -4,9 +4,8 @@ void NetworkSet::Clear() {
   network_by_item_.clear();
 }
 
-void NetworkSet::AddLink(int id1, int id2) {
-  if (id2 > id1) {
-    // Make sure id1 < id2
+void NetworkSet::AddLink(int id1, int id2, bool two_way) {
+  if (two_way && id2 > id1) {
     std::swap(id1, id2);
   }
 
@@ -17,14 +16,37 @@ void NetworkSet::AddLink(int id1, int id2) {
     network_by_item_[id2] = {};
   }
 
-  network_by_item_[id1].insert({id1, id2});
-  network_by_item_[id2].insert({id1, id2});
+  NetworkNode node = {id1, id2, two_way};
+
+  network_by_item_[id1].insert(node);
+  network_by_item_[id2].insert(node);
+}
+
+void NetworkSet::AddLinkToNetwork(int network_id, int id1, int id2, bool two_way) {
+  if (two_way && id2 > id1) {
+    std::swap(id1, id2);
+  }
+
+  if (!network_by_item_.count(network_id)) {
+    network_by_item_[network_id] = {};
+  }
+
+  NetworkNode node = {id1, id2, two_way};
+
+  network_by_item_[network_id].insert(node);
 }
 
 bool NetworkSet::IsItemInNetwork(int id) const {
   return network_by_item_.count(id);
 }
 
-const std::set<std::pair<int, int>>& NetworkSet::GetNetworkGraph(int id) const {
+const std::set<NetworkNode>& NetworkSet::GetNetworkGraph(int id) const {
   return network_by_item_.at(id);
 }
+
+bool NetworkNode::operator<(const NetworkNode& rhs) const {
+  if (entry != rhs.entry) return entry < rhs.entry;
+  if (exit != rhs.exit) return exit < rhs.exit;
+  if (two_way != rhs.two_way) return two_way < rhs.two_way;
+  return false;
+}
@@ -7,19 +7,29 @@
 #include <utility>
 #include <vector>
 
+struct NetworkNode {
+  int entry;
+  int exit;
+  bool two_way;
+
+  bool operator<(const NetworkNode& rhs) const;
+};
+
 class NetworkSet {
  public:
   void Clear();
 
-  void AddLink(int id1, int id2);
+  void AddLink(int id1, int id2, bool two_way);
+
+  void AddLinkToNetwork(int network_id, int id1, int id2, bool two_way);
 
   bool IsItemInNetwork(int id) const;
 
-  const std::set<std::pair<int, int>>& GetNetworkGraph(int id) const;
+  const std::set<NetworkNode>& GetNetworkGraph(int id) const;
 
  private:
 
-  std::map<int, std::set<std::pair<int, int>>> network_by_item_;
+  std::map<int, std::set<NetworkNode>> network_by_item_;
 };
 
 #endif /* end of include guard: NETWORK_SET_H_3036B8E3 */
@@ -0,0 +1,71 @@
+#include "options_pane.h"
+
+#include "ap_state.h"
+
+namespace {
+
+const char* kDoorShuffleLabels[] = {"None", "Panels", "Doors"};
+const char* kLocationChecksLabels[] = {"Normal", "Reduced", "Insanity"};
+const char* kPanelShuffleLabels[] = {"None", "Rearrange"};
+const char* kVictoryConditionLabels[] = {"The End", "The Master", "Level 2",
+                                         "Pilgrimage"};
+const char* kSunwarpAccessLabels[] = {"Normal", "Disabled", "Unlock",
+                                      "Individual", "Progressive"};
+
+void AddRow(wxDataViewListCtrl* list, const std::string& text) {
+  wxVector<wxVariant> data;
+  data.push_back(wxVariant{text + ": "});
+  data.push_back(wxVariant{""});
+  list->AppendItem(data);
+}
+
+}  // namespace
+
+OptionsPane::OptionsPane(wxWindow* parent)
+    : wxDataViewListCtrl(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                         wxDV_ROW_LINES) {
+  AppendTextColumn("Name", wxDATAVIEW_CELL_INERT, wxCOL_WIDTH_AUTOSIZE);
+  AppendTextColumn("Value");
+  AddRow(this, "Shuffle Doors");
+  AddRow(this, "Group Doors");
+  AddRow(this, "Location Checks");
+  AddRow(this, "Shuffle Colors");
+  AddRow(this, "Shuffle Panels");
+  AddRow(this, "Shuffle Paintings");
+  AddRow(this, "Victory Condition");
+  AddRow(this, "Early Color Hallways");
+  AddRow(this, "Shuffle Postgame");
+  AddRow(this, "Enable Pilgrimage");
+  AddRow(this, "Pilgrimage Roof Access");
+  AddRow(this, "Pilgrimage Paintings");
+  AddRow(this, "Sunwarp Access");
+  AddRow(this, "Shuffle Sunwarps");
+  AddRow(this, "Mastery Achievements");
+  AddRow(this, "Level 2 Requirement");
+}
+
+void OptionsPane::OnConnect() {
+  SetTextValue(kDoorShuffleLabels[static_cast<size_t>(AP_GetDoorShuffleMode())],
+               0, 1);
+  SetTextValue(AP_AreDoorsGrouped() ? "Yes" : "No", 1, 1);
+  SetTextValue(
+      kLocationChecksLabels[static_cast<size_t>(AP_GetLocationsChecks())], 2,
+      1);
+  SetTextValue(AP_IsColorShuffle() ? "Yes" : "No", 3, 1);
+  SetTextValue(
+      kPanelShuffleLabels[static_cast<size_t>(AP_GetPanelShuffleMode())], 4, 1);
+  SetTextValue(AP_IsPaintingShuffle() ? "Yes" : "No", 5, 1);
+  SetTextValue(
+      kVictoryConditionLabels[static_cast<size_t>(AP_GetVictoryCondition())], 6,
+      1);
+  SetTextValue(AP_HasEarlyColorHallways() ? "Yes" : "No", 7, 1);
+  SetTextValue(AP_IsPostgameShuffle() ? "Yes" : "No", 8, 1);
+  SetTextValue(AP_IsPilgrimageEnabled() ? "Yes" : "No", 9, 1);
+  SetTextValue(AP_DoesPilgrimageAllowRoofAccess() ? "Yes" : "No", 10, 1);
+  SetTextValue(AP_DoesPilgrimageAllowPaintings() ? "Yes" : "No", 11, 1);
+  SetTextValue(kSunwarpAccessLabels[static_cast<size_t>(AP_GetSunwarpAccess())],
+               12, 1);
+  SetTextValue(AP_IsSunwarpShuffle() ? "Yes" : "No", 13, 1);
+  SetTextValue(std::to_string(AP_GetMasteryRequirement()), 14, 1);
+  SetTextValue(std::to_string(AP_GetLevel2Requirement()), 15, 1);
+}
@@ -0,0 +1,19 @@
+#ifndef OPTIONS_PANE_H_026A0EC0
+#define OPTIONS_PANE_H_026A0EC0
+
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+#include <wx/dataview.h>
+
+class OptionsPane : public wxDataViewListCtrl {
+ public:
+  explicit OptionsPane(wxWindow* parent);
+
+  void OnConnect();
+};
+
+#endif /* end of include guard: OPTIONS_PANE_H_026A0EC0 */
@@ -0,0 +1,86 @@
+#include "paintings_pane.h"
+
+#include <fmt/core.h>
+#include <wx/dataview.h>
+
+#include <map>
+#include <set>
+
+#include "ap_state.h"
+#include "game_data.h"
+#include "tracker_state.h"
+
+namespace {
+
+std::string GetPaintingDisplayName(const std::string& id) {
+  const PaintingExit& painting = GD_GetPaintingExit(GD_GetPaintingByName(id));
+  const MapArea& map_area = GD_GetMapArea(painting.map_area);
+
+  return fmt::format("{} - {}", map_area.name, painting.display_name);
+}
+
+}  // namespace
+
+PaintingsPane::PaintingsPane(wxWindow* parent) : wxPanel(parent, wxID_ANY) {
+  wxStaticText* label = new wxStaticText(
+      this, wxID_ANY, "Shuffled paintings grouped by destination:");
+  tree_ctrl_ = new wxDataViewTreeCtrl(this, wxID_ANY);
+
+  reveal_btn_ = new wxButton(this, wxID_ANY, "Reveal shuffled paintings");
+  reveal_btn_->Disable();
+
+  wxBoxSizer* top_sizer = new wxBoxSizer(wxVERTICAL);
+  top_sizer->Add(label, wxSizerFlags().Border());
+  top_sizer->Add(tree_ctrl_, wxSizerFlags().Expand().Proportion(1));
+  top_sizer->Add(reveal_btn_, wxSizerFlags().Border().Expand());
+
+  SetSizerAndFit(top_sizer);
+
+  tree_ctrl_->Bind(wxEVT_DATAVIEW_ITEM_START_EDITING,
+                   &PaintingsPane::OnStartEditingCell, this);
+  reveal_btn_->Bind(wxEVT_BUTTON, &PaintingsPane::OnClickRevealPaintings, this);
+}
+
+void PaintingsPane::ResetIndicators() {
+  tree_ctrl_->DeleteAllItems();
+  reveal_btn_->Enable(AP_IsPaintingShuffle());
+}
+
+void PaintingsPane::UpdateIndicators(const std::vector<std::string>&) {
+  // TODO: Optimize this by using the paintings delta.
+
+  tree_ctrl_->DeleteAllItems();
+
+  std::map<std::string, std::set<std::string>> grouped_paintings;
+
+  for (const auto& [from, to] : AP_GetPaintingMapping()) {
+    if (IsPaintingReachable(GD_GetPaintingByName(from)) &&
+        AP_IsPaintingChecked(from)) {
+      grouped_paintings[GetPaintingDisplayName(to)].insert(
+          GetPaintingDisplayName(from));
+    }
+  }
+
+  for (const auto& [to, froms] : grouped_paintings) {
+    wxDataViewItem tree_branch =
+        tree_ctrl_->AppendContainer(wxDataViewItem(0), to);
+
+    for (const std::string& from : froms) {
+      tree_ctrl_->AppendItem(tree_branch, from);
+    }
+  }
+}
+
+void PaintingsPane::OnClickRevealPaintings(wxCommandEvent& event) {
+  if (wxMessageBox("Clicking yes will reveal the mapping between all shuffled "
+                   "paintings. This is usually considered a spoiler, and is "
+                   "likely not allowed during competitions. This action is not "
+                   "reversible. Are you sure you want to proceed?",
+                   "Warning", wxYES_NO | wxICON_WARNING) == wxNO) {
+    return;
+  }
+
+  AP_RevealPaintings();
+}
+
+void PaintingsPane::OnStartEditingCell(wxDataViewEvent& event) { event.Veto(); }
@@ -0,0 +1,28 @@
+#ifndef PAINTINGS_PANE_H_815370D2
+#define PAINTINGS_PANE_H_815370D2
+
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+class wxDataViewEvent;
+class wxDataViewTreeCtrl;
+
+class PaintingsPane : public wxPanel {
+ public:
+  explicit PaintingsPane(wxWindow* parent);
+
+  void ResetIndicators();
+  void UpdateIndicators(const std::vector<std::string>& paintings);
+
+ private:
+  void OnClickRevealPaintings(wxCommandEvent& event);
+  void OnStartEditingCell(wxDataViewEvent& event);
+
+  wxDataViewTreeCtrl* tree_ctrl_;
+  wxButton* reveal_btn_;
+};
+
+#endif /* end of include guard: PAINTINGS_PANE_H_815370D2 */
@@ -0,0 +1,131 @@
+#include "report_popup.h"
+
+#include <wx/dcbuffer.h>
+
+#include <map>
+#include <string>
+
+#include "global.h"
+#include "icons.h"
+#include "tracker_state.h"
+
+ReportPopup::ReportPopup(wxWindow* parent)
+    : wxScrolledCanvas(parent, wxID_ANY) {
+  SetBackgroundStyle(wxBG_STYLE_PAINT);
+
+  LoadIcons();
+
+  // TODO: This is slow on high-DPI screens.
+  SetScrollRate(5, 5);
+
+  SetBackgroundColour(*wxBLACK);
+  Hide();
+
+  Bind(wxEVT_PAINT, &ReportPopup::OnPaint, this);
+  Bind(wxEVT_DPI_CHANGED, &ReportPopup::OnDPIChanged, this);
+}
+
+void ReportPopup::SetDoorId(int door_id) {
+  door_id_ = door_id;
+
+  ResetIndicators();
+}
+
+void ReportPopup::Reset() {
+  door_id_ = -1;
+}
+
+void ReportPopup::ResetIndicators() {
+  if (door_id_ == -1) {
+    return;
+  }
+
+  wxFont the_font = GetFont().Scale(GetDPIScaleFactor());
+  const std::map<std::string, bool>& report = GetDoorRequirements(door_id_);
+
+  wxMemoryDC mem_dc;
+  mem_dc.SetFont(the_font);
+
+  int acc_height = FromDIP(10);
+  int col_width = 0;
+
+  for (const auto& [text, obtained] : report) {
+    wxSize item_extent = mem_dc.GetTextExtent(text);
+    int item_height =
+        std::max(FromDIP(32), item_extent.GetHeight()) + FromDIP(10);
+    acc_height += item_height;
+
+    if (item_extent.GetWidth() > col_width) {
+      col_width = item_extent.GetWidth();
+    }
+  }
+
+  int item_width = col_width + FromDIP(10 + 32);
+  full_width_ = item_width + FromDIP(20);
+  full_height_ = acc_height;
+
+  Fit();
+  SetVirtualSize(full_width_, full_height_);
+
+  UpdateIndicators();
+}
+
+void ReportPopup::UpdateIndicators() {
+  if (door_id_ == -1) {
+    return;
+  }
+
+  wxFont the_font = GetFont().Scale(GetDPIScaleFactor());
+  const std::map<std::string, bool>& report = GetDoorRequirements(door_id_);
+
+  rendered_ = wxBitmap(full_width_, full_height_);
+
+  wxMemoryDC mem_dc;
+  mem_dc.SelectObject(rendered_);
+  mem_dc.SetPen(*wxTRANSPARENT_PEN);
+  mem_dc.SetBrush(*wxBLACK_BRUSH);
+  mem_dc.DrawRectangle({0, 0}, {full_width_, full_height_});
+
+  mem_dc.SetFont(the_font);
+
+  int cur_height = FromDIP(10);
+
+  for (const auto& [text, obtained] : report) {
+    const wxBitmap* eye_ptr = obtained ? checked_eye_ : unchecked_eye_;
+
+    mem_dc.DrawBitmap(*eye_ptr, wxPoint{FromDIP(10), cur_height});
+
+    mem_dc.SetTextForeground(obtained ? *wxWHITE : *wxRED);
+    wxSize item_extent = mem_dc.GetTextExtent(text);
+    mem_dc.DrawText(
+        text, wxPoint{FromDIP(10 + 32 + 10),
+                      cur_height +
+                          (FromDIP(32) - mem_dc.GetFontMetrics().height) / 2});
+
+    cur_height += FromDIP(10 + 32);
+  }
+}
+
+void ReportPopup::OnPaint(wxPaintEvent& event) {
+  if (door_id_ != -1) {
+    wxBufferedPaintDC dc(this);
+    PrepareDC(dc);
+    dc.DrawBitmap(rendered_, 0, 0);
+  }
+
+  event.Skip();
+}
+
+void ReportPopup::OnDPIChanged(wxDPIChangedEvent& event) {
+  LoadIcons();
+  ResetIndicators();
+
+  event.Skip();
+}
+
+void ReportPopup::LoadIcons() {
+  unchecked_eye_ = GetTheIconCache().GetIcon("assets/unchecked.png",
+                                             FromDIP(wxSize{32, 32}));
+  checked_eye_ =
+      GetTheIconCache().GetIcon("assets/checked.png", FromDIP(wxSize{32, 32}));
+}
@@ -0,0 +1,38 @@
+#ifndef REPORT_POPUP_H_E065BED4
+#define REPORT_POPUP_H_E065BED4
+
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+class ReportPopup : public wxScrolledCanvas {
+ public:
+  explicit ReportPopup(wxWindow* parent);
+
+  void SetDoorId(int door_id);
+
+  void Reset();
+
+  void ResetIndicators();
+  void UpdateIndicators();
+
+ private:
+  void OnPaint(wxPaintEvent& event);
+  void OnDPIChanged(wxDPIChangedEvent& event);
+
+  void LoadIcons();
+
+  int door_id_ = -1;
+
+  const wxBitmap* unchecked_eye_;
+  const wxBitmap* checked_eye_;
+
+  int full_width_ = 0;
+  int full_height_ = 0;
+
+  wxBitmap rendered_;
+};
+
+#endif /* end of include guard: REPORT_POPUP_H_E065BED4 */
@@ -3,30 +3,43 @@
 #include "tracker_config.h"
 
 SettingsDialog::SettingsDialog() : wxDialog(nullptr, wxID_ANY, "Settings") {
-  should_check_for_updates_box_ = new wxCheckBox(
-      this, wxID_ANY, "Check for updates when the tracker opens");
+  wxStaticBoxSizer* main_box =
+      new wxStaticBoxSizer(wxVERTICAL, this, "General settings");
+
+  should_check_for_updates_box_ =
+      new wxCheckBox(main_box->GetStaticBox(), wxID_ANY,
+                     "Check for updates when the tracker opens");
   hybrid_areas_box_ = new wxCheckBox(
-      this, wxID_ANY,
+      main_box->GetStaticBox(), wxID_ANY,
       "Use two colors to show that an area has partial availability");
-  show_hunt_panels_box_ = new wxCheckBox(this, wxID_ANY, "Show hunt panels");
+  track_position_box_ = new wxCheckBox(main_box->GetStaticBox(), wxID_ANY,
+                                       "Track player position");
 
   should_check_for_updates_box_->SetValue(
       GetTrackerConfig().should_check_for_updates);
   hybrid_areas_box_->SetValue(GetTrackerConfig().hybrid_areas);
-  show_hunt_panels_box_->SetValue(GetTrackerConfig().show_hunt_panels);
+  track_position_box_->SetValue(GetTrackerConfig().track_position);
+
+  main_box->Add(should_check_for_updates_box_, wxSizerFlags().Border());
+  main_box->AddSpacer(2);
+  main_box->Add(hybrid_areas_box_, wxSizerFlags().Border());
+  main_box->AddSpacer(2);
+  main_box->Add(track_position_box_, wxSizerFlags().Border());
+
+  const wxString visible_panels_choices[] = {"Only show locations",
+                                             "Show locations and hunt panels",
+                                             "Show all panels"};
+  visible_panels_box_ =
+      new wxRadioBox(this, wxID_ANY, "Visible panels", wxDefaultPosition,
+                     wxDefaultSize, 3, visible_panels_choices, 1);
+  visible_panels_box_->SetSelection(
+      static_cast<int>(GetTrackerConfig().visible_panels));
 
   wxBoxSizer* form_sizer = new wxBoxSizer(wxVERTICAL);
-
-  form_sizer->Add(should_check_for_updates_box_, wxSizerFlags().HorzBorder());
-  form_sizer->AddSpacer(2);
-
-  form_sizer->Add(hybrid_areas_box_, wxSizerFlags().HorzBorder());
-  form_sizer->AddSpacer(2);
-
-  form_sizer->Add(show_hunt_panels_box_, wxSizerFlags().HorzBorder());
-  form_sizer->AddSpacer(2);
-
-  form_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL), wxSizerFlags().Center());
+  form_sizer->Add(main_box, wxSizerFlags().Border().Expand());
+  form_sizer->Add(visible_panels_box_, wxSizerFlags().Border().Expand());
+  form_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL),
+                  wxSizerFlags().Center().Border());
 
   SetSizerAndFit(form_sizer);
 
@@ -7,6 +7,10 @@
 #include <wx/wx.h>
 #endif
 
+#include <wx/radiobox.h>
+
+#include "tracker_config.h"
+
 class SettingsDialog : public wxDialog {
  public:
   SettingsDialog();
@@ -15,12 +19,17 @@ class SettingsDialog : public wxDialog {
     return should_check_for_updates_box_->GetValue();
   }
   bool GetHybridAreas() const { return hybrid_areas_box_->GetValue(); }
-  bool GetShowHuntPanels() const { return show_hunt_panels_box_->GetValue(); }
+  TrackerConfig::VisiblePanels GetVisiblePanels() const {
+    return static_cast<TrackerConfig::VisiblePanels>(
+        visible_panels_box_->GetSelection());
+  }
+  bool GetTrackPosition() const { return track_position_box_->GetValue(); }
 
  private:
   wxCheckBox* should_check_for_updates_box_;
   wxCheckBox* hybrid_areas_box_;
-  wxCheckBox* show_hunt_panels_box_;
+  wxRadioBox* visible_panels_box_;
+  wxCheckBox* track_position_box_;
 };
 
 #endif /* end of include guard: SETTINGS_DIALOG_H_D8635719 */
@@ -1,22 +1,36 @@
 #include "subway_map.h"
 
+#include <fmt/core.h>
 #include <wx/dcbuffer.h>
+#include <wx/dcgraph.h>
 
 #include <sstream>
 
 #include "ap_state.h"
 #include "game_data.h"
 #include "global.h"
+#include "report_popup.h"
 #include "tracker_state.h"
 
 constexpr int AREA_ACTUAL_SIZE = 21;
 constexpr int OWL_ACTUAL_SIZE = 32;
+constexpr int PAINTING_RADIUS = 9; // the actual circles on the map are radius 11
+constexpr int PAINTING_EXIT_RADIUS = 6;
 
-enum class ItemDrawType {
-  kNone,
-  kBox,
-  kOwl
-};
+enum class ItemDrawType { kNone, kBox, kOwl, kOwlExit };
+
+namespace {
+
+wxPoint GetSubwayItemMapCenter(const SubwayItem &subway_item) {
+  if (subway_item.painting) {
+    return {subway_item.x, subway_item.y};
+  } else {
+    return {subway_item.x + AREA_ACTUAL_SIZE / 2,
+            subway_item.y + AREA_ACTUAL_SIZE / 2};
+  }
+}
+
+}  // namespace
 
 SubwayMap::SubwayMap(wxWindow *parent) : wxPanel(parent, wxID_ANY) {
   SetBackgroundStyle(wxBG_STYLE_PAINT);
@@ -42,28 +56,109 @@ SubwayMap::SubwayMap(wxWindow *parent) : wxPanel(parent, wxID_ANY) {
 
   Redraw();
 
+  scroll_timer_ = new wxTimer(this);
+
   Bind(wxEVT_PAINT, &SubwayMap::OnPaint, this);
   Bind(wxEVT_MOTION, &SubwayMap::OnMouseMove, this);
+  Bind(wxEVT_MOUSEWHEEL, &SubwayMap::OnMouseScroll, this);
+  Bind(wxEVT_LEAVE_WINDOW, &SubwayMap::OnMouseLeave, this);
+  Bind(wxEVT_LEFT_DOWN, &SubwayMap::OnMouseClick, this);
+  Bind(wxEVT_TIMER, &SubwayMap::OnTimer, this);
+
+  zoom_slider_ = new wxSlider(this, wxID_ANY, 0, 0, 8, FromDIP(wxPoint{15, 15}));
+  zoom_slider_->Bind(wxEVT_SLIDER, &SubwayMap::OnZoomSlide, this);
+
+  help_button_ = new wxButton(this, wxID_ANY, "Help");
+  help_button_->Bind(wxEVT_BUTTON, &SubwayMap::OnClickHelp, this);
+  SetUpHelpButton();
+
+  report_popup_ = new ReportPopup(this);
 }
 
 void SubwayMap::OnConnect() {
   networks_.Clear();
 
   std::map<std::string, std::vector<int>> tagged;
+  std::map<std::string, std::vector<int>> entrances;
+  std::map<std::string, std::vector<int>> exits;
   for (const SubwayItem &subway_item : GD_GetSubwayItems()) {
-    if (AP_IsPaintingShuffle() && !subway_item.paintings.empty()) {
+    if (AP_HasEarlyColorHallways() &&
+        subway_item.special == "early_color_hallways") {
+      entrances["early_ch"].push_back(subway_item.id);
+    }
+
+    if (AP_IsPaintingShuffle() && subway_item.painting) {
       continue;
     }
 
     for (const std::string &tag : subway_item.tags) {
       tagged[tag].push_back(subway_item.id);
     }
+    for (const std::string &tag : subway_item.entrances) {
+      entrances[tag].push_back(subway_item.id);
+    }
+    for (const std::string &tag : subway_item.exits) {
+      exits[tag].push_back(subway_item.id);
+    }
 
-    if (!AP_IsSunwarpShuffle() && subway_item.sunwarp && subway_item.sunwarp->type != SubwaySunwarpType::kFinal) {
-      std::ostringstream tag;
-      tag << "sunwarp" << subway_item.sunwarp->dots;
+    if (!AP_IsSunwarpShuffle() && subway_item.sunwarp) {
+      std::string tag = fmt::format("sunwarp{}", subway_item.sunwarp->dots);
+      switch (subway_item.sunwarp->type) {
+        case SubwaySunwarpType::kEnter:
+          entrances[tag].push_back(subway_item.id);
+          break;
+        case SubwaySunwarpType::kExit:
+          exits[tag].push_back(subway_item.id);
+          break;
+        default:
+          break;
+      }
+    }
 
-      tagged[tag.str()].push_back(subway_item.id);
+    if (!AP_IsPilgrimageEnabled()) {
+      if (subway_item.special == "sun_painting") {
+        entrances["sun_painting"].push_back(subway_item.id);
+      } else if (subway_item.special == "sun_painting_exit") {
+        exits["sun_painting"].push_back(subway_item.id);
+      }
+    }
+  }
+
+  if (AP_IsSunwarpShuffle()) {
+    sunwarp_mapping_ = AP_GetSunwarpMapping();
+
+    SubwaySunwarp final_sunwarp{.dots = 6, .type = SubwaySunwarpType::kFinal};
+    int final_sunwarp_item = GD_GetSubwayItemForSunwarp(final_sunwarp);
+
+    for (const auto &[index, mapping] : sunwarp_mapping_) {
+      std::string tag = fmt::format("sunwarp{}", mapping.dots);
+
+      SubwaySunwarp fromWarp;
+      if (index < 6) {
+        fromWarp.dots = index + 1;
+        fromWarp.type = SubwaySunwarpType::kEnter;
+      } else {
+        fromWarp.dots = index - 5;
+        fromWarp.type = SubwaySunwarpType::kExit;
+      }
+
+      SubwaySunwarp toWarp;
+      if (mapping.exit_index < 6) {
+        toWarp.dots = mapping.exit_index + 1;
+        toWarp.type = SubwaySunwarpType::kEnter;
+      } else {
+        toWarp.dots = mapping.exit_index - 5;
+        toWarp.type = SubwaySunwarpType::kExit;
+      }
+
+      entrances[tag].push_back(GD_GetSubwayItemForSunwarp(fromWarp));
+      exits[tag].push_back(GD_GetSubwayItemForSunwarp(toWarp));
+
+      networks_.AddLinkToNetwork(
+          final_sunwarp_item, GD_GetSubwayItemForSunwarp(fromWarp),
+          mapping.dots == 6 ? final_sunwarp_item
+                            : GD_GetSubwayItemForSunwarp(toWarp),
+          false);
     }
   }
 
@@ -73,115 +168,243 @@ void SubwayMap::OnConnect() {
          tag_it1++) {
       for (auto tag_it2 = std::next(tag_it1); tag_it2 != items.end();
            tag_it2++) {
-        networks_.AddLink(*tag_it1, *tag_it2);
+        // two links because tags are bi-directional
+        networks_.AddLink(*tag_it1, *tag_it2, true);
+      }
+    }
+  }
+
+  for (const auto &[tag, items] : entrances) {
+    if (!exits.contains(tag)) continue;
+    for (auto exit : exits[tag]) {
+      for (auto entrance : items) {
+        networks_.AddLink(entrance, exit, false);
       }
     }
   }
 
   checked_paintings_.clear();
+
+  UpdateIndicators();
 }
 
 void SubwayMap::UpdateIndicators() {
+  if (AP_IsSunwarpShuffle()) {
+    sunwarp_mapping_ = AP_GetSunwarpMapping();
+  }
+
   if (AP_IsPaintingShuffle()) {
-    for (const std::string &painting_id : AP_GetCheckedPaintings()) {
+    std::map<std::string, std::string> painting_mapping =
+        AP_GetPaintingMapping();
+    std::set<std::string> remote_checked_paintings = AP_GetCheckedPaintings();
+
+    for (const std::string &painting_id : remote_checked_paintings) {
       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)));
+        if (painting_mapping.count(painting_id)) {
+          std::optional<int> from_id = GD_GetSubwayItemForPainting(painting_id);
+          std::optional<int> to_id = GD_GetSubwayItemForPainting(painting_mapping.at(painting_id));
+
+          if (from_id && to_id) {
+            networks_.AddLink(*from_id, *to_id, false);
+          }
         }
       }
     }
   }
 
+  report_popup_->UpdateIndicators();
+
   Redraw();
 }
 
 void SubwayMap::UpdateSunwarp(SubwaySunwarp from_sunwarp,
-  SubwaySunwarp to_sunwarp) {
+                              SubwaySunwarp to_sunwarp) {
   networks_.AddLink(GD_GetSubwayItemForSunwarp(from_sunwarp),
-                    GD_GetSubwayItemForSunwarp(to_sunwarp));
+                    GD_GetSubwayItemForSunwarp(to_sunwarp), false);
+}
+
+void SubwayMap::Zoom(bool in) {
+  wxPoint focus_point;
+
+  if (mouse_position_) {
+    focus_point = *mouse_position_;
+  } else {
+    focus_point = {GetSize().GetWidth() / 2, GetSize().GetHeight() / 2};
+  }
+
+  if (in) {
+    if (zoom_ < 3.0) {
+      SetZoom(zoom_ + 0.25, focus_point);
+    }
+  } else {
+    if (zoom_ > 1.0) {
+      SetZoom(zoom_ - 0.25, focus_point);
+    }
+  }
 }
 
 void SubwayMap::OnPaint(wxPaintEvent &event) {
   if (GetSize() != rendered_.GetSize()) {
-    Redraw();
-  }
+    wxSize panel_size = GetSize();
+    wxSize image_size = map_image_.GetSize();
+
+    render_x_ = 0;
+    render_y_ = 0;
+    render_width_ = panel_size.GetWidth();
+    render_height_ = panel_size.GetHeight();
+
+    if (image_size.GetWidth() * panel_size.GetHeight() >
+        panel_size.GetWidth() * image_size.GetHeight()) {
+      render_height_ = (panel_size.GetWidth() * image_size.GetHeight()) /
+                       image_size.GetWidth();
+      render_y_ = (panel_size.GetHeight() - render_height_) / 2;
+    } else {
+      render_width_ = (image_size.GetWidth() * panel_size.GetHeight()) /
+                      image_size.GetHeight();
+      render_x_ = (panel_size.GetWidth() - render_width_) / 2;
+    }
 
-  wxBufferedPaintDC dc(this);
-  dc.DrawBitmap(rendered_, 0, 0);
+    SetZoomPos({zoom_x_, zoom_y_});
 
-  if (hovered_item_ && networks_.IsItemInNetwork(*hovered_item_)) {
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    SetUpHelpButton();
 
-    for (const auto &[item_id1, item_id2] :
-         networks_.GetNetworkGraph(*hovered_item_)) {
-      const SubwayItem &item1 = GD_GetSubwayItem(item_id1);
-      const SubwayItem &item2 = GD_GetSubwayItem(item_id2);
+    zoom_slider_->SetSize(FromDIP(15), FromDIP(15), wxDefaultCoord,
+                          wxDefaultCoord, wxSIZE_AUTO);
+  }
 
-      int item1_x = (item1.x + AREA_ACTUAL_SIZE / 2) * render_width_ / map_image_.GetWidth() + render_x_;
-      int item1_y = (item1.y + AREA_ACTUAL_SIZE / 2) * render_width_ / map_image_.GetWidth() + render_y_;
+  wxBufferedPaintDC dc(this);
+  dc.SetBackground(*wxWHITE_BRUSH);
+  dc.Clear();
+
+  {
+    wxMemoryDC rendered_dc;
+    rendered_dc.SelectObject(rendered_);
+
+    int dst_x;
+    int dst_y;
+    int dst_w;
+    int dst_h;
+    int src_x;
+    int src_y;
+    int src_w;
+    int src_h;
+
+    int zoomed_width = render_width_ * zoom_;
+    int zoomed_height = render_height_ * zoom_;
+
+    if (zoomed_width <= GetSize().GetWidth()) {
+      dst_x = (GetSize().GetWidth() - zoomed_width) / 2;
+      dst_w = zoomed_width;
+      src_x = 0;
+      src_w = map_image_.GetWidth();
+    } else {
+      dst_x = 0;
+      dst_w = GetSize().GetWidth();
+      src_x = -zoom_x_ * map_image_.GetWidth() / render_width_ / zoom_;
+      src_w =
+          GetSize().GetWidth() * map_image_.GetWidth() / render_width_ / zoom_;
+    }
 
-      int item2_x = (item2.x + AREA_ACTUAL_SIZE / 2) * render_width_ / map_image_.GetWidth() + render_x_;
-      int item2_y = (item2.y + AREA_ACTUAL_SIZE / 2) * render_width_ / map_image_.GetWidth() + render_y_;
+    if (zoomed_height <= GetSize().GetHeight()) {
+      dst_y = (GetSize().GetHeight() - zoomed_height) / 2;
+      dst_h = zoomed_height;
+      src_y = 0;
+      src_h = map_image_.GetHeight();
+    } else {
+      dst_y = 0;
+      dst_h = GetSize().GetHeight();
+      src_y = -zoom_y_ * map_image_.GetWidth() / render_width_ / zoom_;
+      src_h =
+          GetSize().GetHeight() * map_image_.GetWidth() / render_width_ / zoom_;
+    }
 
-      int left = std::min(item1_x, item2_x);
-      int top = std::min(item1_y, item2_y);
-      int right = std::max(item1_x, item2_x);
-      int bottom = std::max(item1_y, item2_y);
+    wxGCDC gcdc(dc);
+    gcdc.GetGraphicsContext()->SetInterpolationQuality(wxINTERPOLATION_GOOD);
+    gcdc.StretchBlit(dst_x, dst_y, dst_w, dst_h, &rendered_dc, src_x, src_y,
+                     src_w, src_h);
+  }
 
-      int halfwidth = right - left;
-      int halfheight = bottom - top;
+  if (hovered_item_) {
+    if (networks_.IsItemInNetwork(*hovered_item_)) {
+      dc.SetBrush(*wxTRANSPARENT_BRUSH);
+
+      for (const auto node : networks_.GetNetworkGraph(*hovered_item_)) {
+        const SubwayItem &item1 = GD_GetSubwayItem(node.entry);
+        const SubwayItem &item2 = GD_GetSubwayItem(node.exit);
+
+        wxPoint item1_pos = MapPosToRenderPos(GetSubwayItemMapCenter(item1));
+        wxPoint item2_pos = MapPosToRenderPos(GetSubwayItemMapCenter(item2));
+
+        int left = std::min(item1_pos.x, item2_pos.x);
+        int top = std::min(item1_pos.y, item2_pos.y);
+        int right = std::max(item1_pos.x, item2_pos.x);
+        int bottom = std::max(item1_pos.y, item2_pos.y);
+
+        int halfwidth = right - left;
+        int halfheight = bottom - top;
+
+        if (halfwidth < 4 || halfheight < 4) {
+          dc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 4));
+          dc.DrawLine(item1_pos, item2_pos);
+          dc.SetPen(*wxThePenList->FindOrCreatePen(*wxCYAN, 2));
+          dc.DrawLine(item1_pos, item2_pos);
+          if (!node.two_way) {
+            dc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 2));
+            dc.SetBrush(*wxCYAN_BRUSH);
+            dc.DrawCircle(item2_pos, 4);
+            dc.SetBrush(*wxTRANSPARENT_BRUSH);
+          }
+        } else {
+          int ellipse_x;
+          int ellipse_y;
+          double start;
+          double end;
 
-      if (halfwidth < 4 || halfheight < 4) {
-        dc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 4));
-        dc.DrawLine(item1_x, item1_y, item2_x, item2_y);
-        dc.SetPen(*wxThePenList->FindOrCreatePen(*wxCYAN, 2));
-        dc.DrawLine(item1_x, item1_y, item2_x, item2_y);
-      } else {
-        int ellipse_x;
-        int ellipse_y;
-        double start;
-        double end;
+          if (item1_pos.x > item2_pos.x) {
+            ellipse_y = top;
 
-        if (item1_x > item2_x) {
-          ellipse_y = top;
+            if (item1_pos.y > item2_pos.y) {
+              ellipse_x = left - halfwidth;
 
-          if (item1_y > item2_y) {
-            ellipse_x = left - halfwidth;
+              start = 0;
+              end = 90;
+            } else {
+              ellipse_x = left;
 
-            start = 0;
-            end = 90;
+              start = 90;
+              end = 180;
+            }
           } else {
-            ellipse_x = left;
+            ellipse_y = top - halfheight;
 
-            start = 90;
-            end = 180;
-          }
-        } else {
-          ellipse_y = top - halfheight;
+            if (item1_pos.y > item2_pos.y) {
+              ellipse_x = left - halfwidth;
 
-          if (item1_y > item2_y) {
-            ellipse_x = left - halfwidth;
+              start = 270;
+              end = 360;
+            } else {
+              ellipse_x = left;
 
-            start = 270;
-            end = 360;
-          } else {
-            ellipse_x = left;
+              start = 180;
+              end = 270;
+            }
+          }
 
-            start = 180;
-            end = 270;
+          dc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 4));
+          dc.DrawEllipticArc(ellipse_x, ellipse_y, halfwidth * 2,
+                             halfheight * 2, start, end);
+          dc.SetPen(*wxThePenList->FindOrCreatePen(*wxCYAN, 2));
+          dc.DrawEllipticArc(ellipse_x, ellipse_y, halfwidth * 2,
+                             halfheight * 2, start, end);
+          if (!node.two_way) {
+            dc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 2));
+            dc.SetBrush(*wxCYAN_BRUSH);
+            dc.DrawCircle(item2_pos, 4);
+            dc.SetBrush(*wxTRANSPARENT_BRUSH);
           }
         }
-
-        dc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 4));
-        dc.DrawEllipticArc(ellipse_x, ellipse_y, halfwidth * 2, halfheight * 2,
-                           start, end);
-        dc.SetPen(*wxThePenList->FindOrCreatePen(*wxCYAN, 2));
-        dc.DrawEllipticArc(ellipse_x, ellipse_y, halfwidth * 2, halfheight * 2,
-                           start, end);
       }
     }
   }
@@ -190,137 +413,426 @@ void SubwayMap::OnPaint(wxPaintEvent &event) {
 }
 
 void SubwayMap::OnMouseMove(wxMouseEvent &event) {
-  int mouse_x = std::clamp(
-      (event.GetX() - render_x_) * map_image_.GetWidth() / render_width_,
-      0, map_image_.GetWidth() - 1);
-  int mouse_y = std::clamp(
-      (event.GetY() - render_y_) * map_image_.GetWidth() / render_width_,
-      0, map_image_.GetHeight() - 1);
+  wxPoint mouse_pos = RenderPosToMapPos(event.GetPosition());
 
   std::vector<int> hovered = tree_->query(
-      {static_cast<float>(mouse_x), static_cast<float>(mouse_y), 2, 2});
-  std::optional<int> new_hovered_item;
+      {static_cast<float>(mouse_pos.x), static_cast<float>(mouse_pos.y), 2, 2});
   if (!hovered.empty()) {
-    new_hovered_item = hovered[0];
+    actual_hover_ = hovered[0];
+  } else {
+    actual_hover_ = std::nullopt;
   }
 
-  if (new_hovered_item != hovered_item_) {
-    hovered_item_ = new_hovered_item;
+  if (!sticky_hover_ && actual_hover_ != hovered_item_) {
+    EvaluateHover();
+  }
 
-    Refresh();
+  if (scroll_mode_) {
+    EvaluateScroll(event.GetPosition());
   }
 
+  mouse_position_ = event.GetPosition();
+
   event.Skip();
 }
 
-void SubwayMap::Redraw() {
-  wxSize panel_size = GetSize();
-  wxSize image_size = map_image_.GetSize();
-
-  render_x_ = 0;
-  render_y_ = 0;
-  render_width_ = panel_size.GetWidth();
-  render_height_ = panel_size.GetHeight();
-
-  if (image_size.GetWidth() * panel_size.GetHeight() >
-      panel_size.GetWidth() * image_size.GetHeight()) {
-    render_height_ = (panel_size.GetWidth() * image_size.GetHeight()) /
-                     image_size.GetWidth();
-    render_y_ = (panel_size.GetHeight() - render_height_) / 2;
+void SubwayMap::OnMouseScroll(wxMouseEvent &event) {
+  double new_zoom = zoom_;
+  if (event.GetWheelRotation() > 0) {
+    new_zoom = std::min(3.0, zoom_ + 0.25);
   } else {
-    render_width_ = (image_size.GetWidth() * panel_size.GetHeight()) /
-                    image_size.GetHeight();
-    render_x_ = (panel_size.GetWidth() - render_width_) / 2;
+    new_zoom = std::max(1.0, zoom_ - 0.25);
+  }
+
+  if (zoom_ != new_zoom) {
+    SetZoom(new_zoom, event.GetPosition());
+  }
+
+  event.Skip();
+}
+
+void SubwayMap::OnMouseLeave(wxMouseEvent &event) {
+  SetScrollSpeed(0, 0);
+  mouse_position_ = std::nullopt;
+}
+
+void SubwayMap::OnMouseClick(wxMouseEvent &event) {
+  bool finished = false;
+
+  if (actual_hover_) {
+    const SubwayItem &subway_item = GD_GetSubwayItem(*actual_hover_);
+    std::optional<int> subway_door = GetRealSubwayDoor(subway_item);
+
+    if ((subway_door && !GetDoorRequirements(*subway_door).empty()) ||
+        networks_.IsItemInNetwork(*hovered_item_)) {
+      if (actual_hover_ != hovered_item_) {
+        EvaluateHover();
+
+        if (!hovered_item_) {
+          sticky_hover_ = false;
+        }
+      } else {
+        sticky_hover_ = !sticky_hover_;
+      }
+
+      finished = true;
+    }
+  }
+
+  if (!finished) {
+    if (scroll_mode_) {
+      scroll_mode_ = false;
+
+      SetScrollSpeed(0, 0);
+
+      SetCursor(wxCURSOR_ARROW);
+    } else if (event.GetPosition().x < GetSize().GetWidth() / 6 ||
+               event.GetPosition().x > 5 * GetSize().GetWidth() / 6 ||
+               event.GetPosition().y < GetSize().GetHeight() / 6 ||
+               event.GetPosition().y > 5 * GetSize().GetHeight() / 6) {
+      scroll_mode_ = true;
+
+      EvaluateScroll(event.GetPosition());
+
+      SetCursor(wxCURSOR_CROSS);
+    } else {
+      sticky_hover_ = false;
+    }
+  }
+}
+
+void SubwayMap::OnTimer(wxTimerEvent &event) {
+  SetZoomPos({zoom_x_ + scroll_x_, zoom_y_ + scroll_y_});
+  Refresh();
+}
+
+void SubwayMap::OnZoomSlide(wxCommandEvent &event) {
+  double new_zoom = 1.0 + 0.25 * zoom_slider_->GetValue();
+
+  if (new_zoom != zoom_) {
+    SetZoom(new_zoom, {GetSize().GetWidth() / 2, GetSize().GetHeight() / 2});
   }
+}
 
-  rendered_ = wxBitmap(
-      map_image_
-          .Scale(render_width_, render_height_, wxIMAGE_QUALITY_BILINEAR)
-          .Size(panel_size, {render_x_, render_y_}, 255, 255, 255));
+void SubwayMap::OnClickHelp(wxCommandEvent &event) {
+  wxMessageBox(
+      "Zoom in/out using the mouse wheel, Ctrl +/-, or the slider in the "
+      "corner.\nClick on a side of the screen to start panning. It will follow "
+      "your mouse. Click again to stop.\nHover over a door to see the "
+      "requirements to open it.\nHover over a warp or active painting to see "
+      "what it is connected to.\nFor one-way connections, there will be a "
+      "circle at the exit.\nCircles represent paintings.\nA red circle means "
+      "that the painting is locked by a door.\nA blue circle means painting "
+      "shuffle is enabled and the painting has not been checked yet.\nA black "
+      "circle means the painting is not a warp.\nA green circle means that the "
+      "painting is a warp.\nPainting exits will be indicated with an X.\nClick "
+      "on a door or warp to make the popup stick until you click again.",
+      "Subway Map Help");
+}
+
+void SubwayMap::Redraw() {
+  rendered_ = wxBitmap(map_image_);
 
   wxMemoryDC dc;
   dc.SelectObject(rendered_);
 
+  wxGCDC gcdc(dc);
+
+  std::map<std::string, std::string> painting_mapping = AP_GetPaintingMapping();
+
   for (const SubwayItem &subway_item : GD_GetSubwayItems()) {
     ItemDrawType draw_type = ItemDrawType::kNone;
     const wxBrush *brush_color = wxGREY_BRUSH;
-    std::optional<wxColour> shade_color;
+    std::optional<int> subway_door = GetRealSubwayDoor(subway_item);
+
+    if (AP_HasEarlyColorHallways() &&
+        subway_item.special == "early_color_hallways") {
+      draw_type = ItemDrawType::kOwl;
+      brush_color = wxGREEN_BRUSH;
+    } else if (subway_item.special == "starting_room_overhead") {
+      // Do not draw.
+    } else if (AP_IsColorShuffle() && subway_item.special &&
+               subway_item.special->starts_with("color_")) {
+      std::string color_name = subway_item.special->substr(6);
+      LingoColor lingo_color = GetLingoColorForString(color_name);
+      int color_item_id = GD_GetItemIdForColor(lingo_color);
 
-    if (subway_item.door) {
       draw_type = ItemDrawType::kBox;
-
-      if (IsDoorOpen(*subway_item.door)) {
-        if (!subway_item.paintings.empty()) {
-          draw_type = ItemDrawType::kOwl;
-        } else {
+      if (AP_HasItemSafe(color_item_id)) {
+        brush_color = wxGREEN_BRUSH;
+      } else {
+        brush_color = wxRED_BRUSH;
+      }
+    } else if (subway_item.special == "sun_painting") {
+      if (!AP_IsPilgrimageEnabled()) {
+        draw_type = ItemDrawType::kOwl;
+        if (IsDoorOpen(*subway_item.door)) {
           brush_color = wxGREEN_BRUSH;
+        } else {
+          brush_color = wxRED_BRUSH;
         }
+      }
+    } else if (subway_item.sunwarp &&
+               subway_item.sunwarp->type == SubwaySunwarpType::kFinal &&
+               AP_IsPilgrimageEnabled()) {
+      draw_type = ItemDrawType::kBox;
+
+      if (IsPilgrimageDoable()) {
+        brush_color = wxGREEN_BRUSH;
       } else {
         brush_color = wxRED_BRUSH;
       }
-    } else if (!subway_item.paintings.empty()) {
-      if (AP_IsPaintingShuffle()) {
-        bool has_checked_painting = false;
-        bool has_unchecked_painting = false;
-        bool has_mapped_painting = false;
-
-        for (const std::string &painting_id : subway_item.paintings) {
-          if (checked_paintings_.count(painting_id)) {
-            has_checked_painting = true;
-
-            if (AP_GetPaintingMapping().count(painting_id)) {
-              has_mapped_painting = true;
-            }
-          } else {
-            has_unchecked_painting = true;
-          }
+    } else if (subway_item.painting) {
+      if (subway_door && !IsDoorOpen(*subway_door)) {
+        draw_type = ItemDrawType::kOwl;
+        brush_color = wxRED_BRUSH;
+      } else if (AP_IsPaintingShuffle()) {
+        if (!checked_paintings_.count(*subway_item.painting)) {
+          draw_type = ItemDrawType::kOwl;
+          brush_color = wxBLUE_BRUSH;
+        } else if (painting_mapping.count(*subway_item.painting)) {
+          draw_type = ItemDrawType::kOwl;
+          brush_color = wxGREEN_BRUSH;
+        } else if (AP_IsPaintingMappedTo(*subway_item.painting)) {
+          draw_type = ItemDrawType::kOwlExit;
+          brush_color = wxGREEN_BRUSH;
         }
-
-        if (has_unchecked_painting || has_mapped_painting) {
+      } else if (subway_item.HasWarps()) {
+        brush_color = wxGREEN_BRUSH;
+        if (!subway_item.exits.empty()) {
+          draw_type = ItemDrawType::kOwlExit;
+        } else {
           draw_type = ItemDrawType::kOwl;
-
-          if (has_unchecked_painting) {
-            if (has_checked_painting) {
-              shade_color = wxColour(255, 255, 0, 100);
-            } else {
-              shade_color = wxColour(100, 100, 100, 100);
-            }
-          }
         }
-      } else if (!subway_item.tags.empty()) {
-        draw_type = ItemDrawType::kOwl;
+      }
+    } else if (subway_door) {
+      draw_type = ItemDrawType::kBox;
+
+      if (IsDoorOpen(*subway_door)) {
+        brush_color = wxGREEN_BRUSH;
+      } else {
+        brush_color = wxRED_BRUSH;
       }
     }
 
-    int real_area_x =
-        render_x_ + subway_item.x * render_width_ / image_size.GetWidth();
-    int real_area_y =
-        render_y_ + subway_item.y * render_width_ / image_size.GetWidth();
+    wxPoint real_area_pos = {subway_item.x, subway_item.y};
 
     int real_area_size =
-        render_width_ *
-        (draw_type == ItemDrawType::kOwl ? OWL_ACTUAL_SIZE : AREA_ACTUAL_SIZE) /
-        image_size.GetWidth();
-    if (real_area_size == 0) {
-      real_area_size = 1;
-    }
+        (draw_type == ItemDrawType::kOwl ? OWL_ACTUAL_SIZE : AREA_ACTUAL_SIZE);
 
     if (draw_type == ItemDrawType::kBox) {
-      dc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 1));
-      dc.SetBrush(*brush_color);
-      dc.DrawRectangle({real_area_x, real_area_y},
-                       {real_area_size, real_area_size});
-    } else if (draw_type == ItemDrawType::kOwl) {
-      wxBitmap owl_bitmap = wxBitmap(
-          owl_image_.Scale(real_area_size, real_area_size,
-                           wxIMAGE_QUALITY_BILINEAR));
-      dc.DrawBitmap(owl_bitmap, {real_area_x, real_area_y});
+      gcdc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 1));
+      gcdc.SetBrush(*brush_color);
+
+      if (subway_item.tilted) {
+        constexpr int AREA_TILTED_SIDE =
+            static_cast<int>(AREA_ACTUAL_SIZE / 1.41421356237);
+        const wxPoint poly_points[] = {{AREA_TILTED_SIDE, 0},
+                                       {2 * AREA_TILTED_SIDE, AREA_TILTED_SIDE},
+                                       {AREA_TILTED_SIDE, 2 * AREA_TILTED_SIDE},
+                                       {0, AREA_TILTED_SIDE}};
+        gcdc.DrawPolygon(4, poly_points, subway_item.x, subway_item.y);
+      } else {
+        gcdc.DrawRectangle(real_area_pos, {real_area_size, real_area_size});
+      }
+    } else if (draw_type == ItemDrawType::kOwl || draw_type == ItemDrawType::kOwlExit) {
+      gcdc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 1));
+      gcdc.SetBrush(*brush_color);
+      gcdc.DrawCircle(real_area_pos, PAINTING_RADIUS);
+
+      if (draw_type == ItemDrawType::kOwlExit) {
+        gcdc.DrawLine(subway_item.x - PAINTING_EXIT_RADIUS,
+                      subway_item.y - PAINTING_EXIT_RADIUS,
+                      subway_item.x + PAINTING_EXIT_RADIUS,
+                      subway_item.y + PAINTING_EXIT_RADIUS);
+        gcdc.DrawLine(subway_item.x + PAINTING_EXIT_RADIUS,
+                      subway_item.y - PAINTING_EXIT_RADIUS,
+                      subway_item.x - PAINTING_EXIT_RADIUS,
+                      subway_item.y + PAINTING_EXIT_RADIUS);
+      }
     }
   }
 }
 
-quadtree::Box<float> SubwayMap::GetItemBox::operator()(const int& id) const {
+void SubwayMap::SetUpHelpButton() {
+  help_button_->SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord,
+                        wxDefaultCoord, wxSIZE_AUTO);
+  help_button_->SetPosition({
+      GetSize().GetWidth() - help_button_->GetSize().GetWidth() - 15,
+      15,
+  });
+}
+
+void SubwayMap::EvaluateScroll(wxPoint pos) {
+  int scroll_x;
+  int scroll_y;
+  if (pos.x < GetSize().GetWidth() / 9) {
+    scroll_x = 20;
+  } else if (pos.x < GetSize().GetWidth() / 6) {
+    scroll_x = 5;
+  } else if (pos.x > 8 * GetSize().GetWidth() / 9) {
+    scroll_x = -20;
+  } else if (pos.x > 5 * GetSize().GetWidth() / 6) {
+    scroll_x = -5;
+  } else {
+    scroll_x = 0;
+  }
+  if (pos.y < GetSize().GetHeight() / 9) {
+    scroll_y = 20;
+  } else if (pos.y < GetSize().GetHeight() / 6) {
+    scroll_y = 5;
+  } else if (pos.y > 8 * GetSize().GetHeight() / 9) {
+    scroll_y = -20;
+  } else if (pos.y > 5 * GetSize().GetHeight() / 6) {
+    scroll_y = -5;
+  } else {
+    scroll_y = 0;
+  }
+
+  SetScrollSpeed(scroll_x, scroll_y);
+}
+
+void SubwayMap::EvaluateHover() {
+  hovered_item_ = actual_hover_;
+
+  if (hovered_item_) {
+    // Note that these requirements are duplicated on OnMouseClick so that it
+    // knows when an item has a hover effect.
+    const SubwayItem &subway_item = GD_GetSubwayItem(*hovered_item_);
+    std::optional<int> subway_door = GetRealSubwayDoor(subway_item);
+
+    if (subway_door && !GetDoorRequirements(*subway_door).empty()) {
+      report_popup_->SetDoorId(*subway_door);
+
+      wxPoint popupPos =
+          MapPosToRenderPos({subway_item.x + AREA_ACTUAL_SIZE / 2,
+                             subway_item.y + AREA_ACTUAL_SIZE / 2});
+
+      report_popup_->SetClientSize(
+          report_popup_->GetVirtualSize().GetWidth(),
+          std::min(GetSize().GetHeight(),
+                   report_popup_->GetVirtualSize().GetHeight()));
+
+      if (popupPos.x + report_popup_->GetSize().GetWidth() >
+          GetSize().GetWidth()) {
+        popupPos.x = GetSize().GetWidth() - report_popup_->GetSize().GetWidth();
+      }
+      if (popupPos.y + report_popup_->GetSize().GetHeight() >
+          GetSize().GetHeight()) {
+        popupPos.y =
+            GetSize().GetHeight() - report_popup_->GetSize().GetHeight();
+      }
+      report_popup_->SetPosition(popupPos);
+
+      report_popup_->Show();
+    } else {
+      report_popup_->Reset();
+      report_popup_->Hide();
+    }
+  } else {
+    report_popup_->Reset();
+    report_popup_->Hide();
+  }
+
+  Refresh();
+}
+
+wxPoint SubwayMap::MapPosToRenderPos(wxPoint pos) const {
+  return {static_cast<int>(pos.x * render_width_ * zoom_ /
+                               map_image_.GetSize().GetWidth() +
+                           zoom_x_),
+          static_cast<int>(pos.y * render_width_ * zoom_ /
+                               map_image_.GetSize().GetWidth() +
+                           zoom_y_)};
+}
+
+wxPoint SubwayMap::MapPosToVirtualPos(wxPoint pos) const {
+  return {static_cast<int>(pos.x * render_width_ * zoom_ /
+                           map_image_.GetSize().GetWidth()),
+          static_cast<int>(pos.y * render_width_ * zoom_ /
+                           map_image_.GetSize().GetWidth())};
+}
+
+wxPoint SubwayMap::RenderPosToMapPos(wxPoint pos) const {
+  return {
+      std::clamp(static_cast<int>((pos.x - zoom_x_) * map_image_.GetWidth() /
+                                  render_width_ / zoom_),
+                 0, map_image_.GetWidth() - 1),
+      std::clamp(static_cast<int>((pos.y - zoom_y_) * map_image_.GetWidth() /
+                                  render_width_ / zoom_),
+                 0, map_image_.GetHeight() - 1)};
+}
+
+void SubwayMap::SetZoomPos(wxPoint pos) {
+  if (render_width_ * zoom_ <= GetSize().GetWidth()) {
+    zoom_x_ = (GetSize().GetWidth() - render_width_ * zoom_) / 2;
+  } else {
+    zoom_x_ = std::clamp(
+        pos.x, GetSize().GetWidth() - static_cast<int>(render_width_ * zoom_),
+        0);
+  }
+  if (render_height_ * zoom_ <= GetSize().GetHeight()) {
+    zoom_y_ = (GetSize().GetHeight() - render_height_ * zoom_) / 2;
+  } else {
+    zoom_y_ = std::clamp(
+        pos.y, GetSize().GetHeight() - static_cast<int>(render_height_ * zoom_),
+        0);
+  }
+}
+
+void SubwayMap::SetScrollSpeed(int scroll_x, int scroll_y) {
+  bool should_timer = (scroll_x != 0 || scroll_y != 0);
+  if (should_timer != scroll_timer_->IsRunning()) {
+    if (should_timer) {
+      scroll_timer_->Start(1000 / 60);
+    } else {
+      scroll_timer_->Stop();
+    }
+  }
+
+  scroll_x_ = scroll_x;
+  scroll_y_ = scroll_y;
+}
+
+void SubwayMap::SetZoom(double zoom, wxPoint static_point) {
+  wxPoint map_pos = RenderPosToMapPos(static_point);
+  zoom_ = zoom;
+
+  wxPoint virtual_pos = MapPosToVirtualPos(map_pos);
+  SetZoomPos(-(virtual_pos - static_point));
+
+  Refresh();
+
+  zoom_slider_->SetValue((zoom - 1.0) / 0.25);
+}
+
+std::optional<int> SubwayMap::GetRealSubwayDoor(const SubwayItem subway_item) {
+  if (AP_IsSunwarpShuffle() && subway_item.sunwarp &&
+      subway_item.sunwarp->type != SubwaySunwarpType::kFinal) {
+    int sunwarp_index = subway_item.sunwarp->dots - 1;
+    if (subway_item.sunwarp->type == SubwaySunwarpType::kExit) {
+      sunwarp_index += 6;
+    }
+
+    for (const auto &[start_index, mapping] : sunwarp_mapping_) {
+      if (start_index == sunwarp_index || mapping.exit_index == sunwarp_index) {
+        return GD_GetSunwarpDoors().at(mapping.dots - 1);
+      }
+    }
+  }
+
+  return subway_item.door;
+}
+
+quadtree::Box<float> SubwayMap::GetItemBox::operator()(const int &id) const {
   const SubwayItem &subway_item = GD_GetSubwayItem(id);
-  return {static_cast<float>(subway_item.x), static_cast<float>(subway_item.y),
-          AREA_ACTUAL_SIZE, AREA_ACTUAL_SIZE};
+  if (subway_item.painting) {
+    return {static_cast<float>(subway_item.x) - PAINTING_RADIUS,
+            static_cast<float>(subway_item.y) - PAINTING_RADIUS,
+            PAINTING_RADIUS * 2, PAINTING_RADIUS * 2};
+  } else {
+    return {static_cast<float>(subway_item.x),
+            static_cast<float>(subway_item.y), AREA_ACTUAL_SIZE,
+            AREA_ACTUAL_SIZE};
+  }
 }
@@ -15,9 +15,12 @@
 
 #include <quadtree/Quadtree.h>
 
+#include "ap_state.h"
 #include "game_data.h"
 #include "network_set.h"
 
+class ReportPopup;
+
 class SubwayMap : public wxPanel {
  public:
   SubwayMap(wxWindow *parent);
@@ -25,12 +28,33 @@ class SubwayMap : public wxPanel {
   void OnConnect();
   void UpdateIndicators();
   void UpdateSunwarp(SubwaySunwarp from_sunwarp, SubwaySunwarp to_sunwarp);
+  void Zoom(bool in);
 
  private:
   void OnPaint(wxPaintEvent &event);
   void OnMouseMove(wxMouseEvent &event);
+  void OnMouseScroll(wxMouseEvent &event);
+  void OnMouseLeave(wxMouseEvent &event);
+  void OnMouseClick(wxMouseEvent &event);
+  void OnTimer(wxTimerEvent &event);
+  void OnZoomSlide(wxCommandEvent &event);
+  void OnClickHelp(wxCommandEvent &event);
 
   void Redraw();
+  void SetUpHelpButton();
+
+  wxPoint MapPosToRenderPos(wxPoint pos) const;
+  wxPoint MapPosToVirtualPos(wxPoint pos) const;
+  wxPoint RenderPosToMapPos(wxPoint pos) const;
+
+  void EvaluateScroll(wxPoint pos);
+  void EvaluateHover();
+
+  void SetZoomPos(wxPoint pos);
+  void SetScrollSpeed(int scroll_x, int scroll_y);
+  void SetZoom(double zoom, wxPoint static_point);
+
+  std::optional<int> GetRealSubwayDoor(const SubwayItem subway_item);
 
   wxImage map_image_;
   wxImage owl_image_;
@@ -38,8 +62,23 @@ class SubwayMap : public wxPanel {
   wxBitmap rendered_;
   int render_x_ = 0;
   int render_y_ = 0;
-  int render_width_ = 0;
-  int render_height_ = 0;
+  int render_width_ = 1;
+  int render_height_ = 1;
+
+  double zoom_ = 1.0;
+  int zoom_x_ = 0; // in render space
+  int zoom_y_ = 0;
+
+  bool scroll_mode_ = false;
+  wxTimer* scroll_timer_;
+  int scroll_x_ = 0;
+  int scroll_y_ = 0;
+
+  wxSlider *zoom_slider_;
+
+  wxButton *help_button_;
+
+  std::optional<wxPoint> mouse_position_;
 
   struct GetItemBox {
     quadtree::Box<float> operator()(const int &id) const;
@@ -47,9 +86,16 @@ class SubwayMap : public wxPanel {
   
   std::unique_ptr<quadtree::Quadtree<int, GetItemBox>> tree_;
   std::optional<int> hovered_item_;
+  std::optional<int> actual_hover_;
+  bool sticky_hover_ = false;
+
+  ReportPopup *report_popup_;
 
   NetworkSet networks_;
   std::set<std::string> checked_paintings_;
+
+  // Cached from APState.
+  std::map<int, SunwarpMapping> sunwarp_mapping_;
 };
 
 #endif /* end of include guard: SUBWAY_MAP_H_BD2D843E */
@@ -16,7 +16,9 @@ void TrackerConfig::Load() {
     asked_to_check_for_updates = file["asked_to_check_for_updates"].as<bool>();
     should_check_for_updates = file["should_check_for_updates"].as<bool>();
     hybrid_areas = file["hybrid_areas"].as<bool>();
-    show_hunt_panels = file["show_hunt_panels"].as<bool>();
+    if (file["show_hunt_panels"] && file["show_hunt_panels"].as<bool>()) {
+      visible_panels = kHUNT_PANELS;
+    }
 
     if (file["connection_history"]) {
       for (const auto& connection : file["connection_history"]) {
@@ -27,6 +29,11 @@ void TrackerConfig::Load() {
         });
       }
     }
+
+    ipc_address = file["ipc_address"].as<std::string>();
+    track_position = file["track_position"].as<bool>();
+    visible_panels =
+        static_cast<VisiblePanels>(file["visible_panels"].as<int>());
   } catch (const std::exception&) {
     // It's fine if the file can't be loaded.
   }
@@ -40,7 +47,6 @@ void TrackerConfig::Save() {
   output["asked_to_check_for_updates"] = asked_to_check_for_updates;
   output["should_check_for_updates"] = should_check_for_updates;
   output["hybrid_areas"] = hybrid_areas;
-  output["show_hunt_panels"] = show_hunt_panels;
   
   output.remove("connection_history");
   for (const ConnectionDetails& details : connection_history) {
@@ -52,6 +58,10 @@ void TrackerConfig::Save() {
     output["connection_history"].push_back(connection);
   }
 
+  output["ipc_address"] = ipc_address;
+  output["track_position"] = track_position;
+  output["visible_panels"] = static_cast<int>(visible_panels);
+
   std::ofstream filewriter(filename_);
   filewriter << output;
 }
@@ -23,12 +23,20 @@ class TrackerConfig {
 
   void Save();
 
+  enum VisiblePanels {
+    kLOCATIONS_ONLY,
+    kHUNT_PANELS,
+    kALL_PANELS,
+  };
+
   ConnectionDetails connection_details;
   bool asked_to_check_for_updates = false;
   bool should_check_for_updates = false;
   bool hybrid_areas = false;
-  bool show_hunt_panels = false;
   std::deque<ConnectionDetails> connection_history;
+  std::string ipc_address;
+  bool track_position = true;
+  VisiblePanels visible_panels = kLOCATIONS_ONLY;
 
  private:
   std::string filename_;
@@ -1,30 +1,64 @@
 #include "tracker_frame.h"
 
+#include <fmt/core.h>
 #include <wx/aboutdlg.h>
 #include <wx/choicebk.h>
+#include <wx/filedlg.h>
+#include <wx/notebook.h>
+#include <wx/splitter.h>
+#include <wx/stdpaths.h>
 #include <wx/webrequest.h>
 
+#include <algorithm>
 #include <nlohmann/json.hpp>
 #include <sstream>
 
 #include "achievements_pane.h"
 #include "ap_state.h"
 #include "connection_dialog.h"
+#include "ipc_dialog.h"
+#include "ipc_state.h"
+#include "items_pane.h"
+#include "log_dialog.h"
+#include "logger.h"
+#include "options_pane.h"
+#include "paintings_pane.h"
 #include "settings_dialog.h"
 #include "subway_map.h"
 #include "tracker_config.h"
 #include "tracker_panel.h"
 #include "version.h"
 
+namespace {
+
+std::string GetStatusMessage() {
+  std::string msg = AP_GetStatusMessage();
+
+  std::optional<std::string> ipc_msg = IPC_GetStatusMessage();
+  if (ipc_msg) {
+    msg += " ";
+    msg += *ipc_msg;
+  }
+
+  return msg;
+}
+
+}  // namespace
+
 enum TrackerFrameIds {
-  ID_CONNECT = 1,
+  ID_AP_CONNECT = 1,
   ID_CHECK_FOR_UPDATES = 2,
-  ID_SETTINGS = 3
+  ID_SETTINGS = 3,
+  ID_ZOOM_IN = 4,
+  ID_ZOOM_OUT = 5,
+  ID_IPC_CONNECT = 7,
+  ID_LOG_DIALOG = 8,
 };
 
 wxDEFINE_EVENT(STATE_RESET, wxCommandEvent);
-wxDEFINE_EVENT(STATE_CHANGED, wxCommandEvent);
+wxDEFINE_EVENT(STATE_CHANGED, StateChangedEvent);
 wxDEFINE_EVENT(STATUS_CHANGED, wxCommandEvent);
+wxDEFINE_EVENT(CONNECT_TO_AP, ApConnectEvent);
 
 TrackerFrame::TrackerFrame()
     : wxFrame(nullptr, wxID_ANY, "Lingo Archipelago Tracker", wxDefaultPosition,
@@ -32,52 +66,87 @@ TrackerFrame::TrackerFrame()
   ::wxInitAllImageHandlers();
 
   AP_SetTrackerFrame(this);
+  IPC_SetTrackerFrame(this);
+
+  SetTheIconCache(&icons_);
+
+  updater_ = std::make_unique<Updater>(this);
+  updater_->Cleanup();
 
   wxMenu *menuFile = new wxMenu();
-  menuFile->Append(ID_CONNECT, "&Connect");
+  menuFile->Append(ID_AP_CONNECT, "&Connect to Archipelago");
+  menuFile->Append(ID_IPC_CONNECT, "&Connect to Lingo");
   menuFile->Append(ID_SETTINGS, "&Settings");
   menuFile->Append(wxID_EXIT);
 
+  wxMenu *menuView = new wxMenu();
+  zoom_in_menu_item_ = menuView->Append(ID_ZOOM_IN, "Zoom In\tCtrl-+");
+  zoom_out_menu_item_ = menuView->Append(ID_ZOOM_OUT, "Zoom Out\tCtrl--");
+  menuView->AppendSeparator();
+  menuView->Append(ID_LOG_DIALOG, "Show Log Window\tCtrl-L");
+
+  zoom_in_menu_item_->Enable(false);
+  zoom_out_menu_item_->Enable(false);
+
   wxMenu *menuHelp = new wxMenu();
   menuHelp->Append(wxID_ABOUT);
   menuHelp->Append(ID_CHECK_FOR_UPDATES, "Check for Updates");
 
   wxMenuBar *menuBar = new wxMenuBar();
   menuBar->Append(menuFile, "&File");
+  menuBar->Append(menuView, "&View");
   menuBar->Append(menuHelp, "&Help");
 
   SetMenuBar(menuBar);
 
   CreateStatusBar();
-  SetStatusText("Not connected to Archipelago.");
 
   Bind(wxEVT_MENU, &TrackerFrame::OnAbout, this, wxID_ABOUT);
   Bind(wxEVT_MENU, &TrackerFrame::OnExit, this, wxID_EXIT);
-  Bind(wxEVT_MENU, &TrackerFrame::OnConnect, this, ID_CONNECT);
+  Bind(wxEVT_MENU, &TrackerFrame::OnApConnect, this, ID_AP_CONNECT);
+  Bind(wxEVT_MENU, &TrackerFrame::OnIpcConnect, this, ID_IPC_CONNECT);
   Bind(wxEVT_MENU, &TrackerFrame::OnSettings, this, ID_SETTINGS);
   Bind(wxEVT_MENU, &TrackerFrame::OnCheckForUpdates, this,
        ID_CHECK_FOR_UPDATES);
+  Bind(wxEVT_MENU, &TrackerFrame::OnZoomIn, this, ID_ZOOM_IN);
+  Bind(wxEVT_MENU, &TrackerFrame::OnZoomOut, this, ID_ZOOM_OUT);
+  Bind(wxEVT_MENU, &TrackerFrame::OnOpenLogWindow, this, ID_LOG_DIALOG);
+  Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, &TrackerFrame::OnChangePage, this);
+  Bind(wxEVT_SPLITTER_SASH_POS_CHANGED, &TrackerFrame::OnSashPositionChanged,
+       this);
   Bind(STATE_RESET, &TrackerFrame::OnStateReset, this);
   Bind(STATE_CHANGED, &TrackerFrame::OnStateChanged, this);
   Bind(STATUS_CHANGED, &TrackerFrame::OnStatusChanged, this);
+  Bind(CONNECT_TO_AP, &TrackerFrame::OnConnectToAp, this);
+
+  wxSize logicalSize = FromDIP(wxSize(1280, 728));
 
-  achievements_pane_ = new AchievementsPane(this);
+  splitter_window_ = new wxSplitterWindow(this, wxID_ANY);
+  splitter_window_->SetMinimumPaneSize(logicalSize.x / 5);
 
-  wxChoicebook *choicebook = new wxChoicebook(this, wxID_ANY);
+  wxChoicebook *choicebook = new wxChoicebook(splitter_window_, wxID_ANY);
+
+  achievements_pane_ = new AchievementsPane(choicebook);
   choicebook->AddPage(achievements_pane_, "Achievements");
 
-  wxNotebook *rightpane = new wxNotebook(this, wxID_ANY);
-  tracker_panel_ = new TrackerPanel(rightpane);
-  subway_map_ = new SubwayMap(rightpane);
-  rightpane->AddPage(tracker_panel_, "Map");
-  rightpane->AddPage(subway_map_, "Subway");
+  items_pane_ = new ItemsPane(choicebook);
+  choicebook->AddPage(items_pane_, "Items");
+
+  options_pane_ = new OptionsPane(choicebook);
+  choicebook->AddPage(options_pane_, "Options");
+
+  paintings_pane_ = new PaintingsPane(choicebook);
+  choicebook->AddPage(paintings_pane_, "Paintings");
 
-  wxBoxSizer *top_sizer = new wxBoxSizer(wxHORIZONTAL);
-  top_sizer->Add(choicebook, wxSizerFlags().Expand().Proportion(1));
-  top_sizer->Add(rightpane, wxSizerFlags().Expand().Proportion(3));
+  notebook_ = new wxNotebook(splitter_window_, wxID_ANY);
+  tracker_panel_ = new TrackerPanel(notebook_);
+  subway_map_ = new SubwayMap(notebook_);
+  notebook_->AddPage(tracker_panel_, "Map");
+  notebook_->AddPage(subway_map_, "Subway");
 
-  SetSizerAndFit(top_sizer);
-  SetSize(1280, 728);
+  splitter_window_->SplitVertically(choicebook, notebook_, logicalSize.x / 4);
+
+  SetSize(logicalSize);
 
   if (!GetTrackerConfig().asked_to_check_for_updates) {
     GetTrackerConfig().asked_to_check_for_updates = true;
@@ -94,23 +163,28 @@ TrackerFrame::TrackerFrame()
   }
 
   if (GetTrackerConfig().should_check_for_updates) {
-    CheckForUpdates(/*manual=*/false);
+    updater_->CheckForUpdates(/*invisible=*/true);
   }
+
+  SetStatusText(GetStatusMessage());
 }
 
-void TrackerFrame::SetStatusMessage(std::string message) {
-  wxCommandEvent *event = new wxCommandEvent(STATUS_CHANGED);
-  event->SetString(message.c_str());
+void TrackerFrame::ConnectToAp(std::string server, std::string user,
+                               std::string pass) {
+  QueueEvent(new ApConnectEvent(CONNECT_TO_AP, GetId(), std::move(server),
+                                std::move(user), std::move(pass)));
+}
 
-  QueueEvent(event);
+void TrackerFrame::UpdateStatusMessage() {
+  QueueEvent(new wxCommandEvent(STATUS_CHANGED));
 }
 
 void TrackerFrame::ResetIndicators() {
   QueueEvent(new wxCommandEvent(STATE_RESET));
 }
 
-void TrackerFrame::UpdateIndicators() {
-  QueueEvent(new wxCommandEvent(STATE_CHANGED));
+void TrackerFrame::UpdateIndicators(StateUpdate state) {
+  QueueEvent(new StateChangedEvent(STATE_CHANGED, GetId(), std::move(state)));
 }
 
 void TrackerFrame::OnAbout(wxCommandEvent &event) {
@@ -118,6 +192,7 @@ void TrackerFrame::OnAbout(wxCommandEvent &event) {
   about_info.SetName("Lingo Archipelago Tracker");
   about_info.SetVersion(kTrackerVersion.ToString());
   about_info.AddDeveloper("hatkirby");
+  about_info.AddDeveloper("art0007i");
   about_info.AddArtist("Brenton Wildes");
   about_info.AddArtist("kinrah");
 
@@ -126,7 +201,7 @@ void TrackerFrame::OnAbout(wxCommandEvent &event) {
 
 void TrackerFrame::OnExit(wxCommandEvent &event) { Close(true); }
 
-void TrackerFrame::OnConnect(wxCommandEvent &event) {
+void TrackerFrame::OnApConnect(wxCommandEvent &event) {
   ConnectionDialog dlg;
 
   if (dlg.ShowModal() == wxID_OK) {
@@ -144,7 +219,7 @@ void TrackerFrame::OnConnect(wxCommandEvent &event) {
       }
     }
 
-    while (new_history.size() > 5) {
+    while (new_history.size() > 10) {
       new_history.pop_back();
     }
 
@@ -156,6 +231,17 @@ void TrackerFrame::OnConnect(wxCommandEvent &event) {
   }
 }
 
+void TrackerFrame::OnIpcConnect(wxCommandEvent &event) {
+  IpcDialog dlg;
+
+  if (dlg.ShowModal() == wxID_OK) {
+    GetTrackerConfig().ipc_address = dlg.GetIpcAddress();
+    GetTrackerConfig().Save();
+
+    IPC_Connect(dlg.GetIpcAddress());
+  }
+}
+
 void TrackerFrame::OnSettings(wxCommandEvent &event) {
   SettingsDialog dlg;
 
@@ -163,83 +249,119 @@ void TrackerFrame::OnSettings(wxCommandEvent &event) {
     GetTrackerConfig().should_check_for_updates =
         dlg.GetShouldCheckForUpdates();
     GetTrackerConfig().hybrid_areas = dlg.GetHybridAreas();
-    GetTrackerConfig().show_hunt_panels = dlg.GetShowHuntPanels();
+    GetTrackerConfig().visible_panels = dlg.GetVisiblePanels();
+    GetTrackerConfig().track_position = dlg.GetTrackPosition();
     GetTrackerConfig().Save();
 
-    UpdateIndicators();
+    UpdateIndicators(StateUpdate{.cleared_locations = true,
+                                 .player_position = true,
+                                 .changed_settings = true});
   }
 }
 
 void TrackerFrame::OnCheckForUpdates(wxCommandEvent &event) {
-  CheckForUpdates(/*manual=*/true);
+  updater_->CheckForUpdates(/*invisible=*/false);
 }
 
-void TrackerFrame::OnStateReset(wxCommandEvent& event) {
-  tracker_panel_->UpdateIndicators();
-  achievements_pane_->UpdateIndicators();
-  subway_map_->OnConnect();
-  Refresh();
+void TrackerFrame::OnZoomIn(wxCommandEvent &event) {
+  if (notebook_->GetSelection() == 1) {
+    subway_map_->Zoom(true);
+  }
 }
 
-void TrackerFrame::OnStateChanged(wxCommandEvent &event) {
-  tracker_panel_->UpdateIndicators();
-  achievements_pane_->UpdateIndicators();
-  subway_map_->UpdateIndicators();
-  Refresh();
+void TrackerFrame::OnZoomOut(wxCommandEvent &event) {
+  if (notebook_->GetSelection() == 1) {
+    subway_map_->Zoom(false);
+  }
 }
 
-void TrackerFrame::OnStatusChanged(wxCommandEvent &event) {
-  SetStatusText(event.GetString());
+void TrackerFrame::OnOpenLogWindow(wxCommandEvent &event) {
+  if (log_dialog_ == nullptr) {
+    log_dialog_ = new LogDialog(this);
+    log_dialog_->Show();
+    TrackerSetLogDialog(log_dialog_);
+
+    log_dialog_->Bind(wxEVT_CLOSE_WINDOW, &TrackerFrame::OnCloseLogWindow,
+                      this);
+  } else {
+    log_dialog_->SetFocus();
+  }
 }
 
-void TrackerFrame::CheckForUpdates(bool manual) {
-  wxWebRequest request = wxWebSession::GetDefault().CreateRequest(
-      this, "https://code.fourisland.com/lingo-ap-tracker/plain/VERSION");
+void TrackerFrame::OnCloseLogWindow(wxCloseEvent& event) {
+  TrackerSetLogDialog(nullptr);
+  log_dialog_ = nullptr;
 
-  if (!request.IsOk()) {
-    if (manual) {
-      wxMessageBox("Could not check for updates.", "Error",
-                   wxOK | wxICON_ERROR);
-    } else {
-      SetStatusText("Could not check for updates.");
+  event.Skip();
+}
+
+void TrackerFrame::OnChangePage(wxBookCtrlEvent &event) {
+  zoom_in_menu_item_->Enable(event.GetSelection() == 1);
+  zoom_out_menu_item_->Enable(event.GetSelection() == 1);
+}
+
+void TrackerFrame::OnSashPositionChanged(wxSplitterEvent& event) {
+  notebook_->Refresh();
+}
+
+void TrackerFrame::OnStateReset(wxCommandEvent &event) {
+  tracker_panel_->UpdateIndicators(/*reset=*/true);
+  achievements_pane_->UpdateIndicators();
+  items_pane_->ResetIndicators();
+  options_pane_->OnConnect();
+  paintings_pane_->ResetIndicators();
+  subway_map_->OnConnect();
+  Refresh();
+}
+
+void TrackerFrame::OnStateChanged(StateChangedEvent &event) {
+  const StateUpdate &state = event.GetState();
+
+  bool hunt_panels = false;
+  if (GetTrackerConfig().visible_panels == TrackerConfig::kHUNT_PANELS) {
+    hunt_panels = std::any_of(
+        state.panels.begin(), state.panels.end(), [](int solve_index) {
+          return GD_GetPanel(GD_GetPanelBySolveIndex(solve_index)).hunt;
+        });
+  } else if (GetTrackerConfig().visible_panels == TrackerConfig::kALL_PANELS) {
+    hunt_panels = true;
+  }
+  
+  if (!state.items.empty() || !state.paintings.empty() ||
+      state.cleared_locations || hunt_panels) {
+    // TODO: The only real reason to reset tracker_panel during an active
+    // connection is if the hunt panels setting changes. If we remove hunt
+    // panels later, we can get rid of this.
+    tracker_panel_->UpdateIndicators(/*reset=*/state.changed_settings);
+    subway_map_->UpdateIndicators();
+    Refresh();
+  } else if (state.player_position && GetTrackerConfig().track_position) {
+    if (notebook_->GetSelection() == 0) {
+      tracker_panel_->Refresh();
     }
+  }
 
-    return;
+  if (std::any_of(state.panels.begin(), state.panels.end(),
+                  [](int solve_index) {
+                    return GD_GetPanel(GD_GetPanelBySolveIndex(solve_index))
+                        .achievement;
+                  })) {
+    achievements_pane_->UpdateIndicators();
   }
 
-  Bind(wxEVT_WEBREQUEST_STATE, [this, manual](wxWebRequestEvent &evt) {
-    if (evt.GetState() == wxWebRequest::State_Completed) {
-      std::string response = evt.GetResponse().AsString().ToStdString();
-
-      Version latest_version(response);
-      if (kTrackerVersion < latest_version) {
-        std::ostringstream message_text;
-        message_text << "There is a newer version of Lingo AP Tracker "
-                        "available. You have "
-                     << kTrackerVersion.ToString()
-                     << ", and the latest version is "
-                     << latest_version.ToString()
-                     << ". Would you like to update?";
-
-        if (wxMessageBox(message_text.str(), "Update available", wxYES_NO) ==
-            wxYES) {
-          wxLaunchDefaultBrowser(
-              "https://code.fourisland.com/lingo-ap-tracker/about/"
-              "CHANGELOG.md");
-        }
-      } else if (manual) {
-        wxMessageBox("Lingo AP Tracker is up to date!", "Lingo AP Tracker",
-                     wxOK);
-      }
-    } else if (evt.GetState() == wxWebRequest::State_Failed) {
-      if (manual) {
-        wxMessageBox("Could not check for updates.", "Error",
-                     wxOK | wxICON_ERROR);
-      } else {
-        SetStatusText("Could not check for updates.");
-      }
-    }
-  });
+  if (!state.items.empty()) {
+    items_pane_->UpdateIndicators(state.items);
+  }
+
+  if (!state.paintings.empty()) {
+    paintings_pane_->UpdateIndicators(state.paintings);
+  }
+}
+
+void TrackerFrame::OnStatusChanged(wxCommandEvent &event) {
+  SetStatusText(wxString::FromUTF8(GetStatusMessage()));
+}
 
-  request.Start();
+void TrackerFrame::OnConnectToAp(ApConnectEvent &event) {
+  AP_Connect(event.GetServer(), event.GetUser(), event.GetPass());
 }
@@ -7,39 +7,121 @@
 #include <wx/wx.h>
 #endif
 
+#include <memory>
+#include <set>
+
+#include "ap_state.h"
+#include "icons.h"
+#include "updater.h"
+
 class AchievementsPane;
+class ItemsPane;
+class LogDialog;
+class OptionsPane;
+class PaintingsPane;
 class SubwayMap;
 class TrackerPanel;
+class wxBookCtrlEvent;
+class wxNotebook;
+class wxSplitterEvent;
+class wxSplitterWindow;
+
+class ApConnectEvent : public wxEvent {
+ public:
+  ApConnectEvent(wxEventType eventType, int winid, std::string server,
+                 std::string user, std::string pass)
+      : wxEvent(winid, eventType),
+        ap_server_(std::move(server)),
+        ap_user_(std::move(user)),
+        ap_pass_(std::move(pass)) {}
+
+  const std::string &GetServer() const { return ap_server_; }
+
+  const std::string &GetUser() const { return ap_user_; }
+
+  const std::string &GetPass() const { return ap_pass_; }
+
+  virtual wxEvent *Clone() const { return new ApConnectEvent(*this); }
+
+ private:
+  std::string ap_server_;
+  std::string ap_user_;
+  std::string ap_pass_;
+};
+
+struct StateUpdate {
+  std::vector<ItemState> items;
+  bool progression_items = false;
+  std::vector<std::string> paintings;
+  bool cleared_locations = false;
+  std::set<int> panels;
+  bool player_position = false;
+  bool changed_settings = false;
+};
+
+class StateChangedEvent : public wxEvent {
+ public:
+  StateChangedEvent(wxEventType eventType, int winid, StateUpdate state)
+      : wxEvent(winid, eventType), state_(std::move(state)) {}
+
+  const StateUpdate &GetState() const { return state_; }
+
+  virtual wxEvent *Clone() const { return new StateChangedEvent(*this); }
+
+ private:
+  StateUpdate state_;
+};
 
 wxDECLARE_EVENT(STATE_RESET, wxCommandEvent);
-wxDECLARE_EVENT(STATE_CHANGED, wxCommandEvent);
+wxDECLARE_EVENT(STATE_CHANGED, StateChangedEvent);
 wxDECLARE_EVENT(STATUS_CHANGED, wxCommandEvent);
+wxDECLARE_EVENT(CONNECT_TO_AP, ApConnectEvent);
 
 class TrackerFrame : public wxFrame {
  public:
   TrackerFrame();
 
-  void SetStatusMessage(std::string message);
+  void ConnectToAp(std::string server, std::string user, std::string pass);
+  void UpdateStatusMessage();
 
   void ResetIndicators();
-  void UpdateIndicators();
+  void UpdateIndicators(StateUpdate state);
 
  private:
   void OnExit(wxCommandEvent &event);
   void OnAbout(wxCommandEvent &event);
-  void OnConnect(wxCommandEvent &event);
+  void OnApConnect(wxCommandEvent &event);
+  void OnIpcConnect(wxCommandEvent &event);
   void OnSettings(wxCommandEvent &event);
   void OnCheckForUpdates(wxCommandEvent &event);
+  void OnZoomIn(wxCommandEvent &event);
+  void OnZoomOut(wxCommandEvent &event);
+  void OnOpenLogWindow(wxCommandEvent &event);
+  void OnCloseLogWindow(wxCloseEvent &event);
+  void OnChangePage(wxBookCtrlEvent &event);
+  void OnSashPositionChanged(wxSplitterEvent &event);
 
   void OnStateReset(wxCommandEvent &event);
-  void OnStateChanged(wxCommandEvent &event);
+  void OnStateChanged(StateChangedEvent &event);
   void OnStatusChanged(wxCommandEvent &event);
+  void OnConnectToAp(ApConnectEvent &event);
+  
+  std::unique_ptr<Updater> updater_;
 
-  void CheckForUpdates(bool manual);
-
+  wxSplitterWindow *splitter_window_;
+  wxNotebook *notebook_;
   TrackerPanel *tracker_panel_;
   AchievementsPane *achievements_pane_;
+  ItemsPane *items_pane_;
+  OptionsPane *options_pane_;
+  PaintingsPane *paintings_pane_;
   SubwayMap *subway_map_;
+  LogDialog *log_dialog_ = nullptr;
+
+  wxMenuItem *zoom_in_menu_item_;
+  wxMenuItem *zoom_out_menu_item_;
+
+  IconCache icons_;
 };
 
 #endif /* end of include guard: TRACKER_FRAME_H_86BD8DFB */
@@ -1,11 +1,15 @@
 #include "tracker_panel.h"
 
+#include <fmt/core.h>
 #include <wx/dcbuffer.h>
 
+#include <algorithm>
+
 #include "ap_state.h"
 #include "area_popup.h"
 #include "game_data.h"
 #include "global.h"
+#include "ipc_state.h"
 #include "tracker_config.h"
 #include "tracker_state.h"
 
@@ -39,15 +43,38 @@ TrackerPanel::TrackerPanel(wxWindow *parent) : wxPanel(parent, wxID_ANY) {
     areas_.push_back(area);
   }
 
+  Resize();
   Redraw();
 
   Bind(wxEVT_PAINT, &TrackerPanel::OnPaint, this);
   Bind(wxEVT_MOTION, &TrackerPanel::OnMouseMove, this);
 }
 
-void TrackerPanel::UpdateIndicators() {
-  for (AreaIndicator &area : areas_) {
-    area.popup->UpdateIndicators();
+void TrackerPanel::UpdateIndicators(bool reset) {
+  if (reset) {
+    for (AreaIndicator &area : areas_) {
+      const MapArea &map_area = GD_GetMapArea(area.area_id);
+
+      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;
+      }
+
+      area.popup->ResetIndicators();
+    }
+
+    Resize();
+  } else {
+    for (AreaIndicator &area : areas_) {
+      area.popup->UpdateIndicators();
+    }
   }
 
   Redraw();
@@ -55,22 +82,35 @@ void TrackerPanel::UpdateIndicators() {
 
 void TrackerPanel::OnPaint(wxPaintEvent &event) {
   if (GetSize() != rendered_.GetSize()) {
+    Resize();
     Redraw();
   }
 
   wxBufferedPaintDC dc(this);
   dc.DrawBitmap(rendered_, 0, 0);
 
-  if (AP_GetPlayerPosition().has_value()) {
+  std::optional<std::tuple<int, int>> player_position;
+  if (GetTrackerConfig().track_position)
+  {
+    if (IPC_IsConnected()) {
+      player_position = IPC_GetPlayerPosition();
+    } else {
+      player_position = AP_GetPlayerPosition();
+    }
+  }
+
+  if (player_position.has_value()) {
     // 1588, 1194
     // 14x14 -> 154x154
     double intended_x =
-        1588.0 + (std::get<0>(*AP_GetPlayerPosition()) * (154.0 / 14.0));
+        1588.0 + (std::get<0>(*player_position) * (154.0 / 14.0));
     double intended_y =
-        1194.0 + (std::get<1>(*AP_GetPlayerPosition()) * (154.0 / 14.0));
+        1194.0 + (std::get<1>(*player_position) * (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;
+    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);
   }
@@ -92,8 +132,8 @@ void TrackerPanel::OnMouseMove(wxMouseEvent &event) {
   event.Skip();
 }
 
-void TrackerPanel::Redraw() {
-  wxSize panel_size = GetSize();
+void TrackerPanel::Resize() {
+  wxSize panel_size = GetClientSize();
   wxSize image_size = map_image_.GetSize();
 
   int final_x = 0;
@@ -112,7 +152,7 @@ void TrackerPanel::Redraw() {
     final_x = (panel_size.GetWidth() - final_width) / 2;
   }
 
-  rendered_ = wxBitmap(
+  scaled_map_ = wxBitmap(
       map_image_.Scale(final_width, final_height, wxIMAGE_QUALITY_NORMAL)
           .Size(panel_size, {final_x, final_y}, 0, 0, 0));
 
@@ -127,27 +167,64 @@ void TrackerPanel::Redraw() {
       wxBitmap(player_image_.Scale(player_width > 0 ? player_width : 1,
                                    player_height > 0 ? player_height : 1));
 
+  real_area_size_ = final_width * AREA_EFFECTIVE_SIZE / image_size.GetWidth();
+
+  for (AreaIndicator &area : areas_) {
+    const MapArea &map_area = GD_GetMapArea(area.area_id);
+
+    int real_area_x = final_x + (map_area.map_x - (AREA_EFFECTIVE_SIZE / 2)) *
+                                    final_width / image_size.GetWidth();
+    int real_area_y = final_y + (map_area.map_y - (AREA_EFFECTIVE_SIZE / 2)) *
+                                    final_width / image_size.GetWidth();
+
+    area.real_x1 = real_area_x;
+    area.real_x2 = real_area_x + real_area_size_;
+    area.real_y1 = real_area_y;
+    area.real_y2 = real_area_y + real_area_size_;
+
+    int popup_x =
+        final_x + map_area.map_x * final_width / image_size.GetWidth();
+    int popup_y =
+        final_y + map_area.map_y * final_width / image_size.GetWidth();
+
+    area.popup->SetClientSize(
+        area.popup->GetFullWidth(),
+        std::min(panel_size.GetHeight(), area.popup->GetFullHeight()));
+
+    if (area.popup->GetSize().GetHeight() > panel_size.GetHeight()) {
+      area.popup->SetSize(area.popup->GetSize().GetWidth(),
+                          panel_size.GetHeight());
+    } 
+
+    if (popup_x + area.popup->GetSize().GetWidth() > panel_size.GetWidth()) {
+      popup_x = panel_size.GetWidth() - area.popup->GetSize().GetWidth();
+    }
+    if (popup_y + area.popup->GetSize().GetHeight() > panel_size.GetHeight()) {
+      popup_y = panel_size.GetHeight() - area.popup->GetSize().GetHeight();
+    }
+    area.popup->SetPosition({popup_x, popup_y});
+  }
+}
+
+void TrackerPanel::Redraw() {
+  rendered_ = scaled_map_;
+
   wxMemoryDC dc;
   dc.SelectObject(rendered_);
 
-  int real_area_size =
-      final_width * AREA_EFFECTIVE_SIZE / image_size.GetWidth();
   int actual_border_size =
-      real_area_size * AREA_BORDER_SIZE / AREA_EFFECTIVE_SIZE;
+      real_area_size_ * AREA_BORDER_SIZE / AREA_EFFECTIVE_SIZE;
   const wxPoint upper_left_triangle[] = {
-      {0, 0}, {0, real_area_size}, {real_area_size, 0}};
-  const wxPoint lower_right_triangle[] = {{0, real_area_size - 1},
-                                          {real_area_size - 1, 0},
-                                          {real_area_size, real_area_size}};
+      {0, 0}, {0, real_area_size_}, {real_area_size_, 0}};
+  const wxPoint lower_right_triangle[] = {{0, real_area_size_ - 1},
+                                          {real_area_size_ - 1, 0},
+                                          {real_area_size_, real_area_size_}};
 
   for (AreaIndicator &area : areas_) {
     const MapArea &map_area = GD_GetMapArea(area.area_id);
-    if (!AP_IsLocationVisible(map_area.classification) &&
-        !(map_area.hunt && GetTrackerConfig().show_hunt_panels)) {
-      area.active = false;
+
+    if (!area.active) {
       continue;
-    } else {
-      area.active = true;
     }
 
     bool has_reachable_unchecked = false;
@@ -156,10 +233,15 @@ void TrackerPanel::Redraw() {
       bool has_unchecked = false;
       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().show_hunt_panels) {
-        has_unchecked = !AP_HasCheckedHuntPanel(section.ap_location_id);
+      } else if ((section.hunt && GetTrackerConfig().visible_panels ==
+                                      TrackerConfig::kHUNT_PANELS) ||
+                 (section.single_panel && GetTrackerConfig().visible_panels ==
+                                              TrackerConfig::kALL_PANELS)) {
+        has_unchecked =
+            !AP_IsPanelSolved(GD_GetPanel(*section.single_panel).solve_index);
       }
 
       if (has_unchecked) {
@@ -171,10 +253,26 @@ void TrackerPanel::Redraw() {
       }
     }
 
-    int real_area_x = final_x + (map_area.map_x - (AREA_EFFECTIVE_SIZE / 2)) *
-                                    final_width / image_size.GetWidth();
-    int real_area_y = final_y + (map_area.map_y - (AREA_EFFECTIVE_SIZE / 2)) *
-                                    final_width / image_size.GetWidth();
+    if (AP_IsPaintingShuffle()) {
+      for (int painting_id : map_area.paintings) {
+        if (IsPaintingPostgame(painting_id)) {
+          continue;
+        }
+
+        const PaintingExit &painting = GD_GetPaintingExit(painting_id);
+        bool reachable = IsPaintingReachable(painting_id);
+        if (!reachable || !AP_IsPaintingChecked(painting.internal_id)) {
+          if (reachable) {
+            has_reachable_unchecked = true;
+          } else {
+            has_unreachable_unchecked = true;
+          }
+        }
+      }
+    }
+
+    int real_area_x = area.real_x1;
+    int real_area_y = area.real_y1;
 
     if (has_reachable_unchecked && has_unreachable_unchecked &&
         GetTrackerConfig().hybrid_areas) {
@@ -188,7 +286,7 @@ void TrackerPanel::Redraw() {
       dc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, actual_border_size));
       dc.SetBrush(*wxTRANSPARENT_BRUSH);
       dc.DrawRectangle({real_area_x, real_area_y},
-                       {real_area_size, real_area_size});
+                       {real_area_size_, real_area_size_});
 
     } else {
       const wxBrush *brush_color = wxGREY_BRUSH;
@@ -203,30 +301,7 @@ void TrackerPanel::Redraw() {
       dc.SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, actual_border_size));
       dc.SetBrush(*brush_color);
       dc.DrawRectangle({real_area_x, real_area_y},
-                       {real_area_size, real_area_size});
+                       {real_area_size_, real_area_size_});
     }
-
-    area.real_x1 = real_area_x;
-    area.real_x2 = real_area_x + real_area_size;
-    area.real_y1 = real_area_y;
-    area.real_y2 = real_area_y + real_area_size;
-
-    int popup_x =
-        final_x + map_area.map_x * final_width / image_size.GetWidth();
-    int popup_y =
-        final_y + map_area.map_y * final_width / image_size.GetWidth();
-
-    area.popup->SetClientSize(
-        area.popup->GetVirtualSize().GetWidth(),
-        std::min(panel_size.GetHeight(),
-                 area.popup->GetVirtualSize().GetHeight()));
-
-    if (popup_x + area.popup->GetSize().GetWidth() > panel_size.GetWidth()) {
-      popup_x = panel_size.GetWidth() - area.popup->GetSize().GetWidth();
-    }
-    if (popup_y + area.popup->GetSize().GetHeight() > panel_size.GetHeight()) {
-      popup_y = panel_size.GetHeight() - area.popup->GetSize().GetHeight();
-    }
-    area.popup->SetPosition({popup_x, popup_y});
   }
 }
@@ -7,13 +7,17 @@
 #include <wx/wx.h>
 #endif
 
+#include <optional>
+#include <set>
+#include <string>
+
 class AreaPopup;
 
 class TrackerPanel : public wxPanel {
  public:
   TrackerPanel(wxWindow *parent);
 
-  void UpdateIndicators();
+  void UpdateIndicators(bool reset);
 
  private:
   struct AreaIndicator {
@@ -29,10 +33,12 @@ class TrackerPanel : public wxPanel {
   void OnPaint(wxPaintEvent &event);
   void OnMouseMove(wxMouseEvent &event);
 
+  void Resize();
   void Redraw();
 
   wxImage map_image_;
   wxImage player_image_;
+  wxBitmap scaled_map_;
   wxBitmap rendered_;
   wxBitmap scaled_player_;
 
@@ -40,6 +46,7 @@ class TrackerPanel : public wxPanel {
   int offset_y_ = 0;
   double scale_x_ = 0;
   double scale_y_ = 0;
+  int real_area_size_ = 0;
 
   std::vector<AreaIndicator> areas_;
 };
@@ -1,5 +1,8 @@
 #include "tracker_state.h"
 
+#include <fmt/core.h>
+#include <hkutil/string.h>
+
 #include <list>
 #include <map>
 #include <mutex>
@@ -9,13 +12,172 @@
 
 #include "ap_state.h"
 #include "game_data.h"
+#include "global.h"
+#include "logger.h"
 
 namespace {
 
+struct Requirements {
+  bool disabled = false;
+
+  std::set<int> doors;       // non-grouped, handles progressive
+  std::set<int> panel_doors; // non-grouped, handles progressive
+  std::set<int> items;       // all other items
+  std::set<int> rooms;       // maybe
+  bool mastery = false;      // maybe
+  bool panel_hunt = false;   // maybe
+  bool postgame = false;
+
+  void Merge(const Requirements& rhs) {
+    if (rhs.disabled) {
+      return;
+    }
+
+    for (int id : rhs.doors) {
+      doors.insert(id);
+    }
+    for (int id : rhs.panel_doors) {
+      panel_doors.insert(id);
+    }
+    for (int id : rhs.items) {
+      items.insert(id);
+    }
+    for (int id : rhs.rooms) {
+      rooms.insert(id);
+    }
+    mastery = mastery || rhs.mastery;
+    panel_hunt = panel_hunt || rhs.panel_hunt;
+    postgame = postgame || rhs.postgame;
+  }
+};
+
+class RequirementCalculator {
+ public:
+  void Reset() {
+    doors_.clear();
+    panels_.clear();
+  }
+
+  const Requirements& GetDoor(int door_id) {
+    if (!doors_.count(door_id)) {
+      Requirements requirements;
+      const Door& door_obj = GD_GetDoor(door_id);
+
+      if (door_obj.type == DoorType::kSunPainting) {
+        if (!AP_IsPilgrimageEnabled()) {
+          requirements.items.insert(door_obj.ap_item_id);
+        } else {
+          requirements.disabled = true;
+        }
+      } else if (door_obj.type == DoorType::kSunwarp) {
+        switch (AP_GetSunwarpAccess()) {
+          case kSUNWARP_ACCESS_NORMAL:
+            // Do nothing.
+            break;
+          case kSUNWARP_ACCESS_DISABLED:
+            requirements.disabled = true;
+            break;
+          case kSUNWARP_ACCESS_UNLOCK:
+            requirements.items.insert(door_obj.group_ap_item_id);
+            break;
+          case kSUNWARP_ACCESS_INDIVIDUAL:
+          case kSUNWARP_ACCESS_PROGRESSIVE:
+            requirements.doors.insert(door_obj.id);
+            break;
+        }
+      } else if (AP_GetDoorShuffleMode() != kDOORS_MODE || door_obj.skip_item) {
+        for (int panel_id : door_obj.panels) {
+          const Requirements& panel_reqs = GetPanel(panel_id);
+          requirements.Merge(panel_reqs);
+        }
+      } else if (AP_AreDoorsGrouped() && !door_obj.group_name.empty()) {
+        requirements.items.insert(door_obj.group_ap_item_id);
+      } else {
+        requirements.doors.insert(door_obj.id);
+      }
+
+      doors_[door_id] = requirements;
+    }
+
+    return doors_[door_id];
+  }
+
+  const Requirements& GetPanel(int panel_id) {
+    if (!panels_.count(panel_id)) {
+      Requirements requirements;
+      const Panel& panel_obj = GD_GetPanel(panel_id);
+
+      requirements.rooms.insert(panel_obj.room);
+
+      if (panel_obj.name == "THE MASTER") {
+        requirements.mastery = true;
+      }
+
+      if ((panel_obj.name == "ANOTHER TRY" || panel_obj.name == "LEVEL 2") &&
+          AP_GetLevel2Requirement() > 1) {
+        requirements.panel_hunt = true;
+      }
+
+      for (int room_id : panel_obj.required_rooms) {
+        requirements.rooms.insert(room_id);
+      }
+
+      for (int door_id : panel_obj.required_doors) {
+        const Requirements& door_reqs = GetDoor(door_id);
+        requirements.Merge(door_reqs);
+      }
+
+      for (int panel_id : panel_obj.required_panels) {
+        const Requirements& panel_reqs = GetPanel(panel_id);
+        requirements.Merge(panel_reqs);
+      }
+
+      if (AP_IsColorShuffle()) {
+        for (LingoColor color : panel_obj.colors) {
+          requirements.items.insert(GD_GetItemIdForColor(color));
+        }
+      }
+      
+      if (panel_obj.panel_door != -1 &&
+          AP_GetDoorShuffleMode() == kPANELS_MODE) {
+        const PanelDoor& panel_door_obj = GD_GetPanelDoor(panel_obj.panel_door);
+
+        if (panel_door_obj.group_ap_item_id != -1 && AP_AreDoorsGrouped()) {
+          requirements.items.insert(panel_door_obj.group_ap_item_id);
+        } else {
+          requirements.panel_doors.insert(panel_obj.panel_door);
+        }
+      }
+
+      if (panel_obj.location_name == GetWinCondition()) {
+        requirements.postgame = true;
+      }
+
+      panels_[panel_id] = requirements;
+    }
+
+    return panels_[panel_id];
+  }
+
+ private:
+  std::map<int, Requirements> doors_;
+  std::map<int, Requirements> panels_;
+};
+
 struct TrackerState {
   std::map<int, bool> reachability;
   std::set<int> reachable_doors;
+  std::set<int> solveable_panels;
+  std::set<int> reachable_paintings;
   std::mutex reachability_mutex;
+  RequirementCalculator requirements;
+  std::map<int, std::map<std::string, bool>> door_reports;
+  bool pilgrimage_doable = false;
+
+  // If these are empty, it actually means everything is non-postgame.
+  std::set<int> non_postgame_areas;
+  std::set<int> non_postgame_locations;
+  std::set<int> non_postgame_paintings;
 };
 
 enum Decision { kYes, kNo, kMaybe };
@@ -30,6 +192,11 @@ class StateCalculator;
 struct StateCalculatorOptions {
   int start;
   bool pilgrimage = false;
+
+  // Treats all items as collected and all paintings as checked, but postgame
+  // areas cannot be reached.
+  bool postgame_detection = false;
+
   StateCalculator* parent = nullptr;
 };
 
@@ -40,15 +207,33 @@ class StateCalculator {
   explicit StateCalculator(StateCalculatorOptions options)
       : options_(options) {}
 
+  void PreloadPanels(const std::set<int>& panels) {
+    solveable_panels_ = panels;
+  }
+
+  void PreloadDoors(const std::set<int>& doors) {
+    for (int door_id : doors) {
+      door_decisions_[door_id] = kYes;
+    }
+  }
+
   void Calculate() {
+    painting_mapping_ = AP_GetPaintingMapping();
+    checked_paintings_ = AP_GetCheckedPaintings();
+    sunwarp_mapping_ = AP_GetSunwarpMapping();
+
     std::list<int> panel_boundary;
+    std::list<int> painting_boundary;
     std::list<Exit> flood_boundary;
-    flood_boundary.push_back({.destination_room = options_.start});
+    flood_boundary.push_back(
+        {.source_room = -1, .destination_room = options_.start});
 
     bool reachable_changed = true;
     while (reachable_changed) {
       reachable_changed = false;
 
+      std::list<Exit> new_boundary;
+
       std::list<int> new_panel_boundary;
       for (int panel_id : panel_boundary) {
         if (solveable_panels_.count(panel_id)) {
@@ -64,7 +249,36 @@ class StateCalculator {
         }
       }
 
-      std::list<Exit> new_boundary;
+      std::list<int> new_painting_boundary;
+      for (int painting_id : painting_boundary) {
+        if (reachable_paintings_.count(painting_id)) {
+          continue;
+        }
+
+        Decision painting_reachable = IsPaintingReachable(painting_id);
+        if (painting_reachable == kYes) {
+          reachable_paintings_.insert(painting_id);
+          reachable_changed = true;
+
+          PaintingExit cur_painting = GD_GetPaintingExit(painting_id);
+          if (painting_mapping_.count(cur_painting.internal_id) &&
+              (checked_paintings_.count(cur_painting.internal_id) ||
+               options_.postgame_detection)) {
+            Exit painting_exit;
+            PaintingExit target_painting =
+                GD_GetPaintingExit(GD_GetPaintingByName(
+                    painting_mapping_.at(cur_painting.internal_id)));
+            painting_exit.source_room = cur_painting.room;
+            painting_exit.destination_room = target_painting.room;
+            painting_exit.type = EntranceType::kPainting;
+
+            new_boundary.push_back(painting_exit);
+          }
+        } else if (painting_reachable == kMaybe) {
+          new_painting_boundary.push_back(painting_id);
+        }
+      }
+
       for (const Exit& room_exit : flood_boundary) {
         if (reachable_rooms_.count(room_exit.destination_room)) {
           continue;
@@ -83,6 +297,12 @@ class StateCalculator {
           reachable_rooms_.insert(room_exit.destination_room);
           reachable_changed = true;
 
+#ifndef NDEBUG
+          std::list<int> room_path = paths_[room_exit.source_room];
+          room_path.push_back(room_exit.destination_room);
+          paths_[room_exit.destination_room] = room_path;
+#endif
+
           const Room& room_obj = GD_GetRoom(room_exit.destination_room);
           for (const Exit& out_edge : room_obj.exits) {
             if (out_edge.type == EntranceType::kPainting &&
@@ -99,52 +319,56 @@ class StateCalculator {
           }
 
           if (AP_IsPaintingShuffle()) {
-            for (const PaintingExit& out_edge : room_obj.paintings) {
-              if (AP_GetPaintingMapping().count(out_edge.id)) {
-                Exit painting_exit;
-                painting_exit.destination_room = GD_GetRoomForPainting(
-                    AP_GetPaintingMapping().at(out_edge.id));
-                painting_exit.door = out_edge.door;
-
-                new_boundary.push_back(painting_exit);
-              }
+            for (int out_edge : room_obj.paintings) {
+              new_painting_boundary.push_back(out_edge);
             }
           }
 
           if (AP_IsSunwarpShuffle()) {
             for (int index : room_obj.sunwarps) {
-              if (AP_GetSunwarpMapping().count(index)) {
-                const SunwarpMapping& sm = AP_GetSunwarpMapping().at(index);
-
-                Exit sunwarp_exit;
-                sunwarp_exit.destination_room =
-                    GD_GetRoomForSunwarp(sm.exit_index);
-                sunwarp_exit.door = GD_GetSunwarpDoors().at(sm.dots - 1);
-
-                new_boundary.push_back(sunwarp_exit);
+              if (sunwarp_mapping_.count(index)) {
+                const SunwarpMapping& sm = sunwarp_mapping_.at(index);
+
+                new_boundary.push_back(
+                    {.source_room = room_exit.destination_room,
+                     .destination_room = GD_GetRoomForSunwarp(sm.exit_index),
+                     .door = GD_GetSunwarpDoors().at(sm.dots - 1),
+                     .type = EntranceType::kSunwarp});
               }
             }
           }
 
           if (AP_HasEarlyColorHallways() && room_obj.name == "Starting Room") {
             new_boundary.push_back(
-                {.destination_room = GD_GetRoomByName("Outside The Undeterred"),
-                 .type = EntranceType::kPainting});
+                {.source_room = room_exit.destination_room,
+                 .destination_room = GD_GetRoomByName("Color Hallways"),
+                 .type = EntranceType::kStaticPainting});
           }
 
           if (AP_IsPilgrimageEnabled()) {
-            if (room_obj.name == "Hub Room") {
+            int pilgrimage_start_id = GD_GetRoomByName("Hub Room");
+            if (AP_IsSunwarpShuffle()) {
+              for (const auto& [start_index, mapping] : sunwarp_mapping_) {
+                if (mapping.dots == 1) {
+                  pilgrimage_start_id = GD_GetRoomForSunwarp(start_index);
+                }
+              }
+            }
+
+            if (room_exit.destination_room == pilgrimage_start_id) {
               new_boundary.push_back(
-                  {.destination_room = GD_GetRoomByName("Pilgrim Antechamber"),
+                  {.source_room = room_exit.destination_room,
+                   .destination_room = GD_GetRoomByName("Pilgrim Antechamber"),
                    .type = EntranceType::kPilgrimage});
             }
           } else {
             if (room_obj.name == "Starting Room") {
               new_boundary.push_back(
-                  {.destination_room = GD_GetRoomByName("Pilgrim Antechamber"),
+                  {.source_room = room_exit.destination_room,
+                   .destination_room = GD_GetRoomByName("Pilgrim Antechamber"),
                    .door =
                        GD_GetDoorByName("Pilgrim Antechamber - Sun Painting"),
-                   .type = EntranceType::kPainting});
+                   .type = EntranceType::kStaticPainting});
             }
           }
 
@@ -156,11 +380,17 @@ class StateCalculator {
 
       flood_boundary = new_boundary;
       panel_boundary = new_panel_boundary;
+      painting_boundary = new_painting_boundary;
     }
 
-    // Now that we know the full reachable area, let's make sure all doors are evaluated.
+    // Now that we know the full reachable area, let's make sure all doors are
+    // evaluated.
     for (const Door& door : GD_GetDoors()) {
       int discard = IsDoorReachable(door.id);
+
+      door_report_[door.id] = {};
+      discard = AreRequirementsSatisfied(
+          GetState().requirements.GetDoor(door.id), &door_report_[door.id]);
     }
   }
 
@@ -172,8 +402,32 @@ class StateCalculator {
 
   const std::set<int>& GetSolveablePanels() const { return solveable_panels_; }
 
+  const std::set<int>& GetReachablePaintings() const {
+    return reachable_paintings_;
+  }
+
+  const std::map<int, std::map<std::string, bool>>& GetDoorReports() const {
+    return door_report_;
+  }
+
+  bool IsPilgrimageDoable() const { return pilgrimage_doable_; }
+
+  std::string GetPathToRoom(int room_id) const {
+    if (!paths_.count(room_id)) {
+      return "";
+    }
+
+    const std::list<int>& path = paths_.at(room_id);
+    std::vector<std::string> room_names;
+    for (int room_id : path) {
+      room_names.push_back(GD_GetRoom(room_id).name);
+    }
+    return hatkirby::implode(room_names, " -> ");
+  }
+
  private:
-  Decision IsNonGroupedDoorReachable(const Door& door_obj) {
+  template <typename T>
+  Decision IsNonGroupedDoorReachable(const T& door_obj) {
     bool has_item = AP_HasItem(door_obj.ap_item_id);
 
     if (!has_item) {
@@ -188,68 +442,71 @@ class StateCalculator {
     return has_item ? kYes : kNo;
   }
 
-  Decision IsDoorReachable_Helper(int door_id) {
-    const Door& door_obj = GD_GetDoor(door_id);
-
-    if (!AP_IsPilgrimageEnabled() && door_obj.type == DoorType::kSunPainting) {
-      return AP_HasItem(door_obj.ap_item_id) ? kYes : kNo;
-    } else if (door_obj.type == DoorType::kSunwarp) {
-      switch (AP_GetSunwarpAccess()) {
-        case kSUNWARP_ACCESS_NORMAL:
-          return kYes;
-        case kSUNWARP_ACCESS_DISABLED:
-          return kNo;
-        case kSUNWARP_ACCESS_UNLOCK:
-          return AP_HasItem(door_obj.group_ap_item_id) ? kYes : kNo;
-        case kSUNWARP_ACCESS_INDIVIDUAL:
-        case kSUNWARP_ACCESS_PROGRESSIVE:
-          return IsNonGroupedDoorReachable(door_obj);
-      }
-    } else if (AP_GetDoorShuffleMode() == kNO_DOORS || door_obj.skip_item) {
-      if (!reachable_rooms_.count(door_obj.room)) {
-        return kMaybe;
-      }
-
-      for (int panel_id : door_obj.panels) {
-        if (!solveable_panels_.count(panel_id)) {
-          return kMaybe;
+  Decision AreRequirementsSatisfied(
+      const Requirements& reqs, std::map<std::string, bool>* report = nullptr) {
+    if (reqs.disabled) {
+      return kNo;
+    }
+
+    if (reqs.postgame && options_.postgame_detection) {
+      return kNo;
+    }
+
+    Decision final_decision = kYes;
+
+    if (!options_.postgame_detection) {
+      for (int door_id : reqs.doors) {
+        const Door& door_obj = GD_GetDoor(door_id);
+        Decision decision = IsNonGroupedDoorReachable(door_obj);
+
+        if (report) {
+          (*report)[door_obj.item_name] = (decision == kYes);
+        }
+
+        if (decision != kYes) {
+          final_decision = decision;
         }
       }
 
-      return kYes;
-    } else if (AP_GetDoorShuffleMode() == kSIMPLE_DOORS &&
-               !door_obj.group_name.empty()) {
-      return AP_HasItem(door_obj.group_ap_item_id) ? kYes : kNo;
-    } else {
-      return IsNonGroupedDoorReachable(door_obj);
-    }
-  }
+      for (int panel_door_id : reqs.panel_doors) {
+        const PanelDoor& panel_door_obj = GD_GetPanelDoor(panel_door_id);
+        Decision decision = IsNonGroupedDoorReachable(panel_door_obj);
 
-  Decision IsDoorReachable(int door_id) {
-    if (options_.parent) {
-      return options_.parent->IsDoorReachable(door_id);
-    }
+        if (report) {
+          (*report)[panel_door_obj.item_name] = (decision == kYes);
+        }
 
-    if (door_decisions_.count(door_id)) {
-      return door_decisions_.at(door_id);
-    }
+        if (decision != kYes) {
+          final_decision = decision;
+        }
+      }
 
-    Decision result = IsDoorReachable_Helper(door_id);
-    if (result != kMaybe) {
-      door_decisions_[door_id] = result;
+      for (int item_id : reqs.items) {
+        bool has_item = AP_HasItem(item_id);
+        if (report) {
+          (*report)[GD_GetItemName(item_id)] = has_item;
+        }
+
+        if (!has_item) {
+          final_decision = kNo;
+        }
+      }
     }
 
-    return result;
-  }
+    for (int room_id : reqs.rooms) {
+      bool reachable = reachable_rooms_.count(room_id);
 
-  Decision IsPanelReachable(int panel_id) {
-    const Panel& panel_obj = GD_GetPanel(panel_id);
+      if (report) {
+        std::string report_name = "Reach \"" + GD_GetRoom(room_id).name + "\"";
+        (*report)[report_name] = reachable;
+      }
 
-    if (!reachable_rooms_.count(panel_obj.room)) {
-      return kMaybe;
+      if (!reachable && final_decision != kNo) {
+        final_decision = kMaybe;
+      }
     }
 
-    if (panel_obj.name == "THE MASTER") {
+    if (reqs.mastery) {
       int achievements_accessible = 0;
 
       for (int achieve_id : GD_GetAchievementPanels()) {
@@ -262,12 +519,18 @@ class StateCalculator {
         }
       }
 
-      return (achievements_accessible >= AP_GetMasteryRequirement()) ? kYes
-                                                                     : kMaybe;
+      bool can_mastery =
+          (achievements_accessible >= AP_GetMasteryRequirement());
+      if (report) {
+        (*report)["Mastery"] = can_mastery;
+      }
+
+      if (!can_mastery && final_decision != kNo) {
+        final_decision = kMaybe;
+      }
     }
 
-    if ((panel_obj.name == "ANOTHER TRY" || panel_obj.name == "LEVEL 2") &&
-        AP_GetLevel2Requirement() > 1) {
+    if (reqs.panel_hunt) {
       int counting_panels_accessible = 0;
 
       for (int solved_panel_id : solveable_panels_) {
@@ -278,41 +541,51 @@ class StateCalculator {
         }
       }
 
-      return (counting_panels_accessible >= AP_GetLevel2Requirement() - 1)
-                 ? kYes
-                 : kMaybe;
-    }
+      bool can_level2 =
+          (counting_panels_accessible >= AP_GetLevel2Requirement() - 1);
+      if (report) {
+        std::string report_name =
+            std::to_string(AP_GetLevel2Requirement()) + " Panels";
+        (*report)[report_name] = can_level2;
+      }
 
-    for (int room_id : panel_obj.required_rooms) {
-      if (!reachable_rooms_.count(room_id)) {
-        return kMaybe;
+      if (!can_level2 && final_decision != kNo) {
+        final_decision = kMaybe;
       }
     }
 
-    for (int door_id : panel_obj.required_doors) {
-      Decision door_reachable = IsDoorReachable(door_id);
-      if (door_reachable == kNo) {
-        const Door& door_obj = GD_GetDoor(door_id);
-        return (door_obj.is_event || AP_GetDoorShuffleMode() == kNO_DOORS)
-                   ? kMaybe
-                   : kNo;
-      } else if (door_reachable == kMaybe) {
-        return kMaybe;
-      }
+    return final_decision;
+  }
+
+  Decision IsDoorReachable_Helper(int door_id) {
+    return AreRequirementsSatisfied(GetState().requirements.GetDoor(door_id));
+  }
+
+  Decision IsDoorReachable(int door_id) {
+    if (options_.parent) {
+      return options_.parent->IsDoorReachable(door_id);
     }
 
-    for (int panel_id : panel_obj.required_panels) {
-      if (!solveable_panels_.count(panel_id)) {
-        return kMaybe;
-      }
+    if (door_decisions_.count(door_id)) {
+      return door_decisions_.at(door_id);
     }
 
-    if (AP_IsColorShuffle()) {
-      for (LingoColor color : panel_obj.colors) {
-        if (!AP_HasItem(GD_GetItemIdForColor(color))) {
-          return kNo;
-        }
-      }
+    Decision result = IsDoorReachable_Helper(door_id);
+    if (result != kMaybe) {
+      door_decisions_[door_id] = result;
+    }
+
+    return result;
+  }
+
+  Decision IsPanelReachable(int panel_id) {
+    return AreRequirementsSatisfied(GetState().requirements.GetPanel(panel_id));
+  }
+
+  Decision IsPaintingReachable(int painting_id) {
+    const PaintingExit& painting = GD_GetPaintingExit(painting_id);
+    if (painting.door) {
+      return IsDoorReachable(*painting.door);
     }
 
     return kYes;
@@ -337,7 +610,7 @@ class StateCalculator {
       if (AP_IsSunwarpShuffle()) {
         pilgrimage_pairs = std::vector<std::tuple<int, int>>(5);
 
-        for (const auto& [start_index, mapping] : AP_GetSunwarpMapping()) {
+        for (const auto& [start_index, mapping] : sunwarp_mapping_) {
           if (mapping.dots > 1) {
             std::get<1>(pilgrimage_pairs[mapping.dots - 2]) = start_index;
           }
@@ -363,6 +636,8 @@ class StateCalculator {
         }
       }
 
+      pilgrimage_doable_ = true;
+
       return kYes;
     }
 
@@ -375,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;
       }
@@ -401,16 +677,99 @@ class StateCalculator {
   std::set<int> reachable_rooms_;
   std::map<int, Decision> door_decisions_;
   std::set<int> solveable_panels_;
+  std::set<int> reachable_paintings_;
+  std::map<int, std::map<std::string, bool>> door_report_;
+  bool pilgrimage_doable_ = false;
+
+  std::map<int, std::list<int>> paths_;
+
+  std::map<std::string, std::string> painting_mapping_;
+  std::set<std::string> checked_paintings_;
+  std::map<int, SunwarpMapping> sunwarp_mapping_;
 };
 
 }  // namespace
 
+void ResetReachabilityRequirements() {
+  TrackerLog("Resetting tracker state...");
+
+  std::lock_guard reachability_guard(GetState().reachability_mutex);
+  GetState().requirements.Reset();
+  GetState().reachable_doors.clear();
+  GetState().solveable_panels.clear();
+
+  if (AP_IsPostgameShuffle()) {
+    GetState().non_postgame_areas.clear();
+    GetState().non_postgame_locations.clear();
+    GetState().non_postgame_paintings.clear();
+  } else {
+    StateCalculator postgame_calculator(
+        {.start = GD_GetRoomByName("Menu"), .postgame_detection = true});
+    postgame_calculator.Calculate();
+
+    std::set<int>& non_postgame_areas = GetState().non_postgame_areas;
+    non_postgame_areas.clear();
+
+    std::set<int>& non_postgame_locations = GetState().non_postgame_locations;
+    non_postgame_locations.clear();
+
+    const std::set<int>& reachable_rooms =
+        postgame_calculator.GetReachableRooms();
+    const std::set<int>& solveable_panels =
+        postgame_calculator.GetSolveablePanels();
+
+    for (const MapArea& map_area : GD_GetMapAreas()) {
+      bool area_reachable = false;
+
+      for (const Location& location_section : map_area.locations) {
+        bool reachable = reachable_rooms.count(location_section.room);
+        if (reachable) {
+          for (int panel_id : location_section.panels) {
+            reachable &= (solveable_panels.count(panel_id) == 1);
+          }
+        }
+
+        if (!reachable && IsLocationWinCondition(location_section)) {
+          reachable = true;
+        }
+
+        if (reachable) {
+          non_postgame_locations.insert(location_section.ap_location_id);
+          area_reachable = true;
+        }
+      }
+
+      for (int painting_id : map_area.paintings) {
+        if (postgame_calculator.GetReachablePaintings().count(painting_id)) {
+          area_reachable = true;
+        }
+      }
+
+      if (area_reachable) {
+        non_postgame_areas.insert(map_area.id);
+      }
+    }
+
+    GetState().non_postgame_paintings =
+        postgame_calculator.GetReachablePaintings();
+  }
+}
+
 void RecalculateReachability() {
+  TrackerLog("Calculating reachability...");
+
+  std::lock_guard reachability_guard(GetState().reachability_mutex);
+
+  // Receiving items and checking paintings should never remove access to doors
+  // or panels, so we can preload any doors and panels we already know are
+  // accessible from previous runs, in order to reduce the work.
   StateCalculator state_calculator({.start = GD_GetRoomByName("Menu")});
+  state_calculator.PreloadDoors(GetState().reachable_doors);
+  state_calculator.PreloadPanels(GetState().solveable_panels);
   state_calculator.Calculate();
 
   const std::set<int>& reachable_rooms = state_calculator.GetReachableRooms();
-  const std::set<int>& solveable_panels = state_calculator.GetSolveablePanels();
+  std::set<int> solveable_panels = state_calculator.GetSolveablePanels();
 
   std::map<int, bool> new_reachability;
   for (const MapArea& map_area : GD_GetMapAreas()) {
@@ -435,11 +794,16 @@ void RecalculateReachability() {
     }
   }
 
-  {
-    std::lock_guard reachability_guard(GetState().reachability_mutex);
-    std::swap(GetState().reachability, new_reachability);
-    std::swap(GetState().reachable_doors, new_reachable_doors);
-  }
+  std::set<int> reachable_paintings = state_calculator.GetReachablePaintings();
+  std::map<int, std::map<std::string, bool>> door_reports =
+      state_calculator.GetDoorReports();
+  
+  std::swap(GetState().reachability, new_reachability);
+  std::swap(GetState().reachable_doors, new_reachable_doors);
+  std::swap(GetState().solveable_panels, solveable_panels);
+  std::swap(GetState().reachable_paintings, reachable_paintings);
+  std::swap(GetState().door_reports, door_reports);
+  GetState().pilgrimage_doable = state_calculator.IsPilgrimageDoable();
 }
 
 bool IsLocationReachable(int location_id) {
@@ -457,3 +821,51 @@ bool IsDoorOpen(int door_id) {
 
   return GetState().reachable_doors.count(door_id);
 }
+
+bool IsPaintingReachable(int painting_id) {
+  std::lock_guard reachability_guard(GetState().reachability_mutex);
+
+  return GetState().reachable_paintings.count(painting_id);
+}
+
+const std::map<std::string, bool>& GetDoorRequirements(int door_id) {
+  std::lock_guard reachability_guard(GetState().reachability_mutex);
+
+  return GetState().door_reports[door_id];
+}
+
+bool IsPilgrimageDoable() {
+  std::lock_guard reachability_guard(GetState().reachability_mutex);
+
+  return GetState().pilgrimage_doable;
+}
+
+bool IsAreaPostgame(int area_id) {
+  std::lock_guard reachability_guard(GetState().reachability_mutex);
+
+  if (GetState().non_postgame_areas.empty()) {
+    return false;
+  } else {
+    return !GetState().non_postgame_areas.count(area_id);
+  }
+}
+
+bool IsLocationPostgame(int location_id) {
+  std::lock_guard reachability_guard(GetState().reachability_mutex);
+
+  if (GetState().non_postgame_locations.empty()) {
+    return false;
+  } else {
+    return !GetState().non_postgame_locations.count(location_id);
+  }
+}
+
+bool IsPaintingPostgame(int painting_id) {
+  std::lock_guard reachability_guard(GetState().reachability_mutex);
+
+  if (GetState().non_postgame_paintings.empty()) {
+    return false;
+  } else {
+    return !GetState().non_postgame_paintings.count(painting_id);
+  }
+}
@@ -1,10 +1,27 @@
 #ifndef TRACKER_STATE_H_8639BC90
 #define TRACKER_STATE_H_8639BC90
 
+#include <map>
+#include <string>
+
+void ResetReachabilityRequirements();
+
 void RecalculateReachability();
 
 bool IsLocationReachable(int location_id);
 
 bool IsDoorOpen(int door_id);
 
+bool IsPaintingReachable(int painting_id);
+
+const std::map<std::string, bool>& GetDoorRequirements(int door_id);
+
+bool IsPilgrimageDoable();
+
+bool IsAreaPostgame(int area_id);
+
+bool IsLocationPostgame(int location_id);
+
+bool IsPaintingPostgame(int painting_id);
+
 #endif /* end of include guard: TRACKER_STATE_H_8639BC90 */
@@ -0,0 +1,309 @@
+#include "updater.h"
+
+#include <fmt/core.h>
+#include <openssl/evp.h>
+#include <openssl/sha.h>
+#include <wx/evtloop.h>
+#include <wx/progdlg.h>
+#include <wx/webrequest.h>
+#include <wx/wfstream.h>
+#include <wx/zipstrm.h>
+#include <yaml-cpp/yaml.h>
+
+#include <cstdio>
+#include <deque>
+#include <filesystem>
+#include <fstream>
+
+#include "global.h"
+#include "logger.h"
+#include "version.h"
+
+constexpr const char* kVersionFileUrl =
+    "https://code.fourisland.com/lingo-ap-tracker/plain/VERSION.yaml";
+constexpr const char* kChangelogUrl =
+    "https://code.fourisland.com/lingo-ap-tracker/about/CHANGELOG.md";
+
+namespace {
+
+std::string CalculateStringSha256(const wxString& data) {
+  unsigned char hash[SHA256_DIGEST_LENGTH];
+  EVP_MD_CTX* sha256 = EVP_MD_CTX_new();
+  EVP_DigestInit(sha256, EVP_sha256());
+  EVP_DigestUpdate(sha256, data.c_str(), data.length());
+  EVP_DigestFinal_ex(sha256, hash, nullptr);
+  EVP_MD_CTX_free(sha256);
+
+  char output[65] = {0};
+  for (int i = 0; i < SHA256_DIGEST_LENGTH; i++) {
+    snprintf(output + (i * 2), 3, "%02x", hash[i]);
+  }
+
+  return std::string(output);
+}
+
+}  // namespace
+
+Updater::Updater(wxFrame* parent) : parent_(parent) {
+  Bind(wxEVT_WEBREQUEST_STATE, &Updater::OnWebRequestState, this);
+}
+
+void Updater::Cleanup() {
+  std::filesystem::path oldDir = GetExecutableDirectory() / "old";
+  if (std::filesystem::is_directory(oldDir)) {
+    std::filesystem::remove_all(oldDir);
+  }
+}
+
+void Updater::CheckForUpdates(bool invisible) {
+  wxWebRequest versionRequest =
+      wxWebSession::GetDefault().CreateRequest(this, kVersionFileUrl);
+
+  if (invisible) {
+    update_state_ = UpdateState::GetVersionInvisible;
+
+    versionRequest.Start();
+  } else {
+    update_state_ = UpdateState::GetVersionManual;
+
+    if (DownloadWithProgress(versionRequest)) {
+      if (versionRequest.GetState() == wxWebRequest::State_Failed) {
+        wxMessageBox("Could not check for updates.", "Error",
+                     wxOK | wxICON_ERROR);
+      } else if (versionRequest.GetState() == wxWebRequest::State_Completed) {
+        ProcessVersionFile(
+            versionRequest.GetResponse().AsString().utf8_string());
+      }
+    }
+  }
+}
+
+void Updater::OnWebRequestState(wxWebRequestEvent& evt) {
+  if (update_state_ == UpdateState::GetVersionInvisible) {
+    if (evt.GetState() == wxWebRequest::State_Completed) {
+      ProcessVersionFile(evt.GetResponse().AsString().utf8_string());
+    } else if (evt.GetState() == wxWebRequest::State_Failed) {
+      parent_->SetStatusText("Could not check for updates.");
+    }
+  }
+}
+
+void Updater::ProcessVersionFile(std::string data) {
+  try {
+    YAML::Node versionInfo = YAML::Load(data);
+    Version latestVersion(versionInfo["version"].as<std::string>());
+
+    if (kTrackerVersion < latestVersion) {
+      if (versionInfo["packages"]) {
+        std::string platformIdentifier;
+
+        if (wxPlatformInfo::Get().GetOperatingSystemId() == wxOS_WINDOWS_NT) {
+          platformIdentifier = "win64";
+        }
+
+        if (!platformIdentifier.empty() &&
+            versionInfo["packages"][platformIdentifier]) {
+          wxMessageDialog dialog(
+              nullptr,
+              fmt::format("There is a newer version of Lingo AP Tracker "
+                          "available. You have {}, and the latest version is "
+                          "{}. Would you like to update?",
+                          kTrackerVersion.ToString(), latestVersion.ToString()),
+              "Update available", wxYES_NO | wxCANCEL);
+          dialog.SetYesNoLabels("Install update", "Open changelog");
+
+          int dlgResult = dialog.ShowModal();
+          if (dlgResult == wxID_YES) {
+            const YAML::Node& packageInfo =
+                versionInfo["packages"][platformIdentifier];
+            std::string packageUrl = packageInfo["url"].as<std::string>();
+            std::string packageChecksum =
+                packageInfo["checksum"].as<std::string>();
+
+            std::vector<std::filesystem::path> packageFiles;
+            if (packageInfo["files"]) {
+              for (const YAML::Node& filename : packageInfo["files"]) {
+                packageFiles.push_back(filename.as<std::string>());
+              }
+            }
+
+            std::vector<std::filesystem::path> deletedFiles;
+            if (packageInfo["deleted_files"]) {
+              for (const YAML::Node& filename : packageInfo["deleted_files"]) {
+                deletedFiles.push_back(filename.as<std::string>());
+              }
+            }
+
+            InstallUpdate(packageUrl, packageChecksum, packageFiles,
+                          deletedFiles);
+          } else if (dlgResult == wxID_NO) {
+            wxLaunchDefaultBrowser(kChangelogUrl);
+          }
+
+          return;
+        }
+      }
+
+      if (wxMessageBox(
+              fmt::format("There is a newer version of Lingo AP Tracker "
+                          "available. You have {}, and the latest version is "
+                          "{}. Would you like to update?",
+                          kTrackerVersion.ToString(), latestVersion.ToString()),
+              "Update available", wxYES_NO) == wxYES) {
+        wxLaunchDefaultBrowser(kChangelogUrl);
+      }
+    } else if (update_state_ == UpdateState::GetVersionManual) {
+      wxMessageBox("Lingo AP Tracker is up to date!", "Lingo AP Tracker", wxOK);
+    }
+  } catch (const std::exception& ex) {
+    wxMessageBox("Could not check for updates.", "Error", wxOK | wxICON_ERROR);
+  }
+}
+
+void Updater::InstallUpdate(std::string url, std::string checksum,
+                            std::vector<std::filesystem::path> files,
+                            std::vector<std::filesystem::path> deletedFiles) {
+  update_state_ = UpdateState::GetPackage;
+
+  wxWebRequest packageRequest =
+      wxWebSession::GetDefault().CreateRequest(this, url);
+
+  if (!DownloadWithProgress(packageRequest)) {
+    return;
+  }
+
+  bool download_issue = false;
+
+  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) {
+      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;
+  std::set<std::filesystem::path> filesToMove;
+  for (const std::filesystem::path& existingFile : files) {
+    std::filesystem::path movedPath = oldArea / existingFile;
+    std::filesystem::path movedDir = movedPath;
+    movedDir.remove_filename();
+    folders.insert(movedDir);
+    filesToMove.insert(existingFile);
+  }
+  for (const std::filesystem::path& existingFile : deletedFiles) {
+    std::filesystem::path movedPath = oldArea / existingFile;
+    std::filesystem::path movedDir = movedPath;
+    movedDir.remove_filename();
+    folders.insert(movedDir);
+  }
+
+  for (const std::filesystem::path& newFolder : folders) {
+    TrackerLog(fmt::format("Creating directory {}", newFolder.string()));
+
+    std::filesystem::create_directories(newFolder);
+  }
+
+  for (const std::filesystem::path& existingFile : files) {
+    std::filesystem::path existingPath = newArea / existingFile;
+
+    if (std::filesystem::is_regular_file(existingPath)) {
+      std::filesystem::path movedPath = oldArea / existingFile;
+
+      TrackerLog(fmt::format("Moving {} -> {}", existingPath.string(),
+                             movedPath.string()));
+
+      std::filesystem::rename(existingPath, movedPath);
+    }
+  }
+  for (const std::filesystem::path& existingFile : deletedFiles) {
+    std::filesystem::path existingPath = newArea / existingFile;
+
+    if (std::filesystem::is_regular_file(existingPath)) {
+      std::filesystem::path movedPath = oldArea / existingFile;
+
+      TrackerLog(fmt::format("Moving {} -> {}", existingPath.string(),
+                             movedPath.string()));
+
+      std::filesystem::rename(existingPath, movedPath);
+    }
+  }
+
+  wxFileInputStream fileInputStream(package_path.GetFullPath());
+  wxZipInputStream zipStream(fileInputStream);
+  std::unique_ptr<wxZipEntry> zipEntry;
+  while ((zipEntry = std::unique_ptr<wxZipEntry>(zipStream.GetNextEntry())) !=
+         nullptr) {
+    if (zipEntry->IsDir()) {
+      continue;
+    }
+
+    std::filesystem::path archivePath = zipEntry->GetName().utf8_string();
+
+    TrackerLog(fmt::format("Found {} in archive", archivePath.string()));
+
+    // Cut off the root folder name
+    std::filesystem::path subPath;
+    for (auto it = std::next(archivePath.begin()); it != archivePath.end();
+         it++) {
+      subPath /= *it;
+    }
+
+    std::filesystem::path pastePath = newArea / subPath;
+
+    wxFileOutputStream fileOutput(pastePath.string());
+    zipStream.Read(fileOutput);
+  }
+
+  if (wxMessageBox(
+      "Update installed! The tracker must be restarted for the changes to take "
+      "effect. Do you want to close the tracker?",
+                   "Update installed", wxYES_NO) == wxYES) {
+    wxExit();
+  }
+}
+
+bool Updater::DownloadWithProgress(wxWebRequest& request) {
+  request.Start();
+
+  wxProgressDialog dialog("Checking for updates...", "Checking for updates...",
+                          100, nullptr,
+                          wxPD_APP_MODAL | wxPD_AUTO_HIDE | wxPD_CAN_ABORT |
+                              wxPD_ELAPSED_TIME | wxPD_REMAINING_TIME);
+  while (request.GetState() != wxWebRequest::State_Completed &&
+         request.GetState() != wxWebRequest::State_Failed) {
+    if (request.GetBytesExpectedToReceive() == -1) {
+      if (!dialog.Pulse()) {
+        request.Cancel();
+        return false;
+      }
+    } else {
+      dialog.SetRange(request.GetBytesExpectedToReceive());
+      if (!dialog.Update(request.GetBytesReceived())) {
+        request.Cancel();
+        return false;
+      }
+    }
+  }
+
+  return true;
+}
@@ -0,0 +1,46 @@
+#ifndef UPDATER_H_809E7381
+#define UPDATER_H_809E7381
+
+#include <filesystem>
+#include <set>
+#include <string>
+
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+class wxWebRequest;
+class wxWebRequestEvent;
+
+class Updater : public wxEvtHandler {
+ public:
+  explicit Updater(wxFrame* parent);
+
+  void Cleanup();
+
+  void CheckForUpdates(bool invisible);
+
+ private:
+  enum class UpdateState {
+    GetVersionInvisible,
+    GetVersionManual,
+    GetPackage,
+  };
+
+  void OnWebRequestState(wxWebRequestEvent& event);
+
+  void ProcessVersionFile(std::string data);
+
+  void InstallUpdate(std::string url, std::string checksum,
+                     std::vector<std::filesystem::path> files,
+                     std::vector<std::filesystem::path> deletedFiles);
+
+  bool DownloadWithProgress(wxWebRequest& request);
+
+  wxFrame* parent_;
+  UpdateState update_state_ = UpdateState::GetVersionInvisible;
+};
+
+#endif /* end of include guard: UPDATER_H_809E7381 */
@@ -0,0 +1,5 @@
+#include "version.h"
+
+std::ostream& operator<<(std::ostream& out, const Version& ver) {
+  return out << "v" << ver.major << "." << ver.minor << "." << ver.revision;
+}
@@ -1,9 +1,10 @@
 #ifndef VERSION_H_C757E53C
 #define VERSION_H_C757E53C
 
-#include <sstream>
 #include <regex>
 
+#include <fmt/core.h>
+
 struct Version {
   int major = 0;
   int minor = 0;
@@ -24,9 +25,7 @@ struct Version {
   }
 
   std::string ToString() const {
-    std::ostringstream output;
-    output << "v" << major << "." << minor << "." << revision;
-    return output.str();
+    return fmt::format("v{}.{}.{}", major, minor, revision);
   }
 
   bool operator<(const Version& rhs) const {
@@ -37,6 +36,6 @@ struct Version {
   }
 };
 
-constexpr const Version kTrackerVersion = Version(0, 9, 0);
+constexpr const Version kTrackerVersion = Version(2, 0, 2);
 
 #endif /* end of include guard: VERSION_H_C757E53C */
\ No newline at end of file
@@ -0,0 +1,3 @@
+#define wxUSE_RC_MANIFEST 1
+#define wxUSE_DPI_AWARE_MANIFEST 2
+#include "wx/msw/wx.rc"