17 files changed, 527 insertions, 70 deletions

@@ -52,6 +52,8 @@ struct APState {
   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;
@@ -131,6 +133,7 @@ struct APState {
                                             cert_store);
     }
 
+    save_name.clear();
     inventory.clear();
     checked_locations.clear();
     data_storage.clear();
@@ -221,11 +224,15 @@ struct APState {
       RefreshTracker(false);
     });
 
-    apclient->set_slot_connected_handler([this, &connection_mutex](
+    apclient->set_slot_connected_handler([this, player, server,
+                                          &connection_mutex](
                                              const nlohmann::json& slot_data) {
-      tracker_frame->SetStatusMessage("Connected to Archipelago!");
+      tracker_frame->SetStatusMessage(
+          fmt::format("Connected to Archipelago! ({}@{})", player, server));
       TrackerLog("Connected to Archipelago!");
 
+      save_name = fmt::format("zzAP_{}_{}.save", apclient->get_seed(),
+                              apclient->get_player_number());
       data_storage_prefix =
           fmt::format("Lingo_{}_", apclient->get_player_number());
       door_shuffle_mode = slot_data["shuffle_doors"].get<DoorShuffleMode>();
@@ -507,6 +514,8 @@ void AP_Connect(std::string server, std::string player, std::string password) {
   GetState().Connect(server, player, password);
 }
 
+std::string AP_GetSaveName() { return GetState().save_name; }
+
 bool AP_HasCheckedGameLocation(int location_id) {
   return GetState().HasCheckedGameLocation(location_id);
 }
@@ -43,6 +43,8 @@ void AP_SetTrackerFrame(TrackerFrame* tracker_frame);
 
 void AP_Connect(std::string server, std::string player, std::string password);
 
+std::string AP_GetSaveName();
+
 bool AP_HasCheckedGameLocation(int location_id);
 
 bool AP_HasCheckedHuntPanel(int location_id);
@@ -2,10 +2,13 @@
 
 #include <wx/dcbuffer.h>
 
+#include <algorithm>
+
 #include "ap_state.h"
 #include "game_data.h"
 #include "global.h"
 #include "tracker_config.h"
+#include "tracker_panel.h"
 #include "tracker_state.h"
 
 AreaPopup::AreaPopup(wxWindow* parent, int area_id)
@@ -43,15 +46,23 @@ void AreaPopup::UpdateIndicators() {
 
   mem_dc.SetFont(GetFont());
 
+  TrackerPanel* tracker_panel = dynamic_cast<TrackerPanel*>(GetParent());
+
   std::vector<int> real_locations;
 
   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)) {
-      continue;
+    if (tracker_panel->IsPanelsMode()) {
+      if (!location.single_panel) {
+        continue;
+      }
+    } else {
+      if (!AP_IsLocationVisible(location.classification) &&
+          !(location.hunt && GetTrackerConfig().show_hunt_panels)) {
+        continue;
+      }
     }
 
     real_locations.push_back(section_id);
@@ -65,7 +76,7 @@ void AreaPopup::UpdateIndicators() {
     }
   }
 
-  if (AP_IsPaintingShuffle()) {
+  if (AP_IsPaintingShuffle() && !tracker_panel->IsPanelsMode()) {
     for (int painting_id : map_area.paintings) {
       const PaintingExit& painting = GD_GetPaintingExit(painting_id);
       wxSize item_extent = mem_dc.GetTextExtent(painting.internal_id);  // TODO: Replace with a friendly name.
@@ -102,10 +113,21 @@ void AreaPopup::UpdateIndicators() {
   for (int section_id : real_locations) {
     const Location& location = map_area.locations.at(section_id);
 
-    bool checked =
-        AP_HasCheckedGameLocation(location.ap_location_id) ||
-        (location.hunt && AP_HasCheckedHuntPanel(location.ap_location_id)) ||
-        (IsLocationWinCondition(location) && AP_HasReachedGoal());
+    bool checked = false;
+    if (IsLocationWinCondition(location)) {
+      checked = AP_HasReachedGoal();
+    } else if (tracker_panel->IsPanelsMode()) {
+      const Panel& panel = GD_GetPanel(*location.single_panel);
+      if (panel.non_counting) {
+        checked = AP_HasCheckedGameLocation(location.ap_location_id);
+      } else {
+        checked = tracker_panel->GetSolvedPanels().contains(panel.nodepath);
+      }
+    } else {
+      checked =
+          AP_HasCheckedGameLocation(location.ap_location_id) ||
+          (location.hunt && AP_HasCheckedHuntPanel(location.ap_location_id));
+    }
 
     wxBitmap* eye_ptr = checked ? &checked_eye_ : &unchecked_eye_;
 
@@ -123,18 +145,18 @@ void AreaPopup::UpdateIndicators() {
     cur_height += 10 + 32;
   }
 
-  if (AP_IsPaintingShuffle()) {
+  if (AP_IsPaintingShuffle() && !tracker_panel->IsPanelsMode()) {
     for (int painting_id : map_area.paintings) {
       const PaintingExit& painting = GD_GetPaintingExit(painting_id);
-      bool checked = AP_IsPaintingChecked(painting.internal_id);
-      wxBitmap* eye_ptr = checked ? &checked_eye_ : &unchecked_eye_;
-
-      mem_dc.DrawBitmap(*eye_ptr, {10, cur_height});
 
       bool reachable = IsPaintingReachable(painting_id);
       const wxColour* text_color = reachable ? wxWHITE : wxRED;
       mem_dc.SetTextForeground(*text_color);
 
+      bool checked = reachable && AP_IsPaintingChecked(painting.internal_id);
+      wxBitmap* eye_ptr = checked ? &checked_eye_ : &unchecked_eye_;
+      mem_dc.DrawBitmap(*eye_ptr, {10, cur_height});
+
       wxSize item_extent = mem_dc.GetTextExtent(painting.internal_id);  // TODO: Replace with friendly name.
       mem_dc.DrawText(painting.internal_id,
                       {10 + 32 + 10,
@@ -109,6 +109,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"]) {
@@ -143,7 +144,7 @@ struct GameData {
         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: {
@@ -264,6 +265,11 @@ struct GameData {
                 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>();
           }
@@ -563,7 +569,8 @@ struct GameData {
                                     .room = panel.room,
                                     .panels = {panel.id},
                                     .classification = classification,
-                                    .hunt = panel.hunt});
+                                    .hunt = panel.hunt,
+                                    .single_panel = panel.id});
       locations_by_name[location_name] = {area_id,
                                           map_area.locations.size() - 1};
     }
@@ -616,6 +623,7 @@ 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();
       }
     }
 
@@ -673,6 +681,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>();
@@ -784,6 +804,11 @@ GameData &GetState() {
 
 }  // namespace
 
+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);
 }
@@ -43,6 +43,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;
@@ -83,6 +84,7 @@ struct Door {
 };
 
 struct Exit {
+  int source_room;
   int destination_room;
   std::optional<int> door;
   EntranceType type = EntranceType::kNormal;
@@ -112,6 +114,7 @@ struct Location {
   std::vector<int> panels;
   int classification = 0;
   bool hunt = false;
+  std::optional<int> single_panel;
 };
 
 struct MapArea {
@@ -123,6 +126,7 @@ struct MapArea {
   int map_y;
   int classification = 0;
   bool hunt = false;
+  bool has_single_panel = false;
 };
 
 enum class SubwaySunwarpType {
@@ -144,9 +148,13 @@ struct SubwayItem {
   int y;
   std::optional<int> door;
   std::vector<std::string> paintings;
-  std::vector<std::string> tags;
+  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();
@@ -0,0 +1,83 @@
+// Godot save decoder algorithm by Chris Souvey.
+
+#include "godot_variant.h"
+
+#include <algorithm>
+#include <charconv>
+#include <cstddef>
+#include <fstream>
+#include <string>
+#include <tuple>
+#include <variant>
+#include <vector>
+
+namespace {
+
+uint16_t ReadUint16(std::basic_istream<char>& stream) {
+  uint16_t result;
+  stream.read(reinterpret_cast<char*>(&result), 2);
+  return result;
+}
+
+uint32_t ReadUint32(std::basic_istream<char>& stream) {
+  uint32_t result;
+  stream.read(reinterpret_cast<char*>(&result), 4);
+  return result;
+}
+
+GodotVariant ParseVariant(std::basic_istream<char>& stream) {
+  uint16_t type = ReadUint16(stream);
+  stream.ignore(2);
+
+  switch (type) {
+    case 1: {
+      // bool
+      bool boolval = (ReadUint32(stream) == 1);
+      return {boolval};
+    }
+    case 15: {
+      // nodepath
+      uint32_t name_length = ReadUint32(stream) & 0x7fffffff;
+      uint32_t subname_length = ReadUint32(stream) & 0x7fffffff;
+      uint32_t flags = ReadUint32(stream);
+
+      std::vector<std::string> result;
+      for (size_t i = 0; i < name_length + subname_length; i++) {
+        uint32_t char_length = ReadUint32(stream);
+        uint32_t padded_length = (char_length % 4 == 0)
+                                     ? char_length
+                                     : (char_length + 4 - (char_length % 4));
+        std::vector<char> next_bytes(padded_length);
+        stream.read(next_bytes.data(), padded_length);
+        std::string next_piece;
+        std::copy(next_bytes.begin(),
+                  std::next(next_bytes.begin(), char_length),
+                  std::back_inserter(next_piece));
+        result.push_back(next_piece);
+      }
+
+      return {result};
+    }
+    case 19: {
+      // array
+      uint32_t length = ReadUint32(stream) & 0x7fffffff;
+      std::vector<GodotVariant> result;
+      for (size_t i = 0; i < length; i++) {
+        result.push_back(ParseVariant(stream));
+      }
+      return {result};
+    }
+    default: {
+      // eh
+      return {std::monostate{}};
+    }
+  }
+}
+
+}  // namespace
+
+GodotVariant ParseGodotFile(std::string filename) {
+  std::ifstream file_stream(filename, std::ios_base::binary);
+  file_stream.ignore(4);
+  return ParseVariant(file_stream);
+}
@@ -0,0 +1,28 @@
+#ifndef GODOT_VARIANT_H_ED7F2EB6
+#define GODOT_VARIANT_H_ED7F2EB6
+
+#include <string>
+#include <variant>
+#include <vector>
+
+struct GodotVariant {
+  using value_type = std::variant<std::monostate, bool, std::vector<std::string>, std::vector<GodotVariant>>;
+
+  value_type value;
+
+  GodotVariant(value_type v) : value(v) {}
+
+  bool AsBool() const { return std::get<bool>(value); }
+
+  const std::vector<std::string>& AsNodePath() const {
+    return std::get<std::vector<std::string>>(value);
+  }
+
+  const std::vector<GodotVariant>& AsArray() const {
+    return std::get<std::vector<GodotVariant>>(value);
+  }
+};
+
+GodotVariant ParseGodotFile(std::string filename);
+
+#endif /* end of include guard: GODOT_VARIANT_H_ED7F2EB6 */
@@ -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 */
@@ -16,6 +16,28 @@ constexpr int OWL_ACTUAL_SIZE = 32;
 
 enum class ItemDrawType { kNone, kBox, kOwl };
 
+namespace {
+
+std::optional<int> 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] : AP_GetSunwarpMapping()) {
+      if (start_index == sunwarp_index || mapping.exit_index == sunwarp_index) {
+        return GD_GetSunwarpDoors().at(mapping.dots - 1);
+      }
+    }
+  }
+
+  return subway_item.door;
+}
+
+}  // namespace
+
 SubwayMap::SubwayMap(wxWindow *parent) : wxPanel(parent, wxID_ANY) {
   SetBackgroundStyle(wxBG_STYLE_PAINT);
 
@@ -69,10 +91,12 @@ 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_HasEarlyColorHallways() &&
         subway_item.special == "starting_room_paintings") {
-      tagged["early_ch"].push_back(subway_item.id);
+      entrances["early_ch"].push_back(subway_item.id);
     }
 
     if (AP_IsPaintingShuffle() && !subway_item.paintings.empty()) {
@@ -82,21 +106,40 @@ void SubwayMap::OnConnect() {
     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::string tag = fmt::format("subway{}", subway_item.sunwarp->dots);
-      tagged[tag].push_back(subway_item.id);
+    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;
+      }
     }
 
-    if (!AP_IsPilgrimageEnabled() &&
-        (subway_item.special == "sun_painting" ||
-         subway_item.special == "sun_painting_exit")) {
-      tagged["sun_painting"].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()) {
+    SubwaySunwarp final_sunwarp{.dots = 6, .type = SubwaySunwarpType::kFinal};
+    int final_sunwarp_item = GD_GetSubwayItemForSunwarp(final_sunwarp);
+
     for (const auto &[index, mapping] : AP_GetSunwarpMapping()) {
       std::string tag = fmt::format("sunwarp{}", mapping.dots);
 
@@ -118,8 +161,14 @@ void SubwayMap::OnConnect() {
         toWarp.type = SubwaySunwarpType::kExit;
       }
 
-      tagged[tag].push_back(GD_GetSubwayItemForSunwarp(fromWarp));
-      tagged[tag].push_back(GD_GetSubwayItemForSunwarp(toWarp));
+      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);
     }
   }
 
@@ -129,7 +178,17 @@ 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);
       }
     }
   }
@@ -149,7 +208,7 @@ void SubwayMap::UpdateIndicators() {
               AP_GetPaintingMapping().at(painting_id));
 
           if (from_id && to_id) {
-            networks_.AddLink(*from_id, *to_id);
+            networks_.AddLink(*from_id, *to_id, false);
           }
         }
       }
@@ -162,7 +221,7 @@ void SubwayMap::UpdateIndicators() {
 void SubwayMap::UpdateSunwarp(SubwaySunwarp from_sunwarp,
                               SubwaySunwarp to_sunwarp) {
   networks_.AddLink(GD_GetSubwayItemForSunwarp(from_sunwarp),
-                    GD_GetSubwayItemForSunwarp(to_sunwarp));
+                    GD_GetSubwayItemForSunwarp(to_sunwarp), false);
 }
 
 void SubwayMap::Zoom(bool in) {
@@ -267,9 +326,11 @@ void SubwayMap::OnPaint(wxPaintEvent &event) {
     // 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_);
-    if (subway_item.door && !GetDoorRequirements(*subway_item.door).empty()) {
+    std::optional<int> subway_door = GetRealSubwayDoor(subway_item);
+
+    if (subway_door && !GetDoorRequirements(*subway_door).empty()) {
       const std::map<std::string, bool> &report =
-          GetDoorRequirements(*subway_item.door);
+          GetDoorRequirements(*subway_door);
 
       int acc_height = 10;
       int col_width = 0;
@@ -326,10 +387,9 @@ void SubwayMap::OnPaint(wxPaintEvent &event) {
     if (networks_.IsItemInNetwork(*hovered_item_)) {
       dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
-      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);
+      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(
             {item1.x + AREA_ACTUAL_SIZE / 2, item1.y + AREA_ACTUAL_SIZE / 2});
@@ -349,6 +409,12 @@ void SubwayMap::OnPaint(wxPaintEvent &event) {
           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;
@@ -391,6 +457,12 @@ void SubwayMap::OnPaint(wxPaintEvent &event) {
           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);
+          }
         }
       }
     }
@@ -450,7 +522,9 @@ void SubwayMap::OnMouseClick(wxMouseEvent &event) {
 
   if (actual_hover_) {
     const SubwayItem &subway_item = GD_GetSubwayItem(*actual_hover_);
-    if ((subway_item.door && !GetDoorRequirements(*subway_item.door).empty()) ||
+    std::optional<int> subway_door = GetRealSubwayDoor(subway_item);
+
+    if ((subway_door && !GetDoorRequirements(*subway_door).empty()) ||
         networks_.IsItemInNetwork(*hovered_item_)) {
       if (actual_hover_ != hovered_item_) {
         hovered_item_ = actual_hover_;
@@ -509,7 +583,8 @@ void SubwayMap::OnClickHelp(wxCommandEvent &event) {
       "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.\nIn painting shuffle, paintings that have not "
+      "what it is connected to.\nFor one-way connections, there will be a "
+      "circle at the exit.\nIn painting shuffle, paintings that have not "
       "yet been checked will not show their connections.\nA green shaded owl "
       "means that there is a painting entrance there.\nA red shaded owl means "
       "that there are only painting exits there.\nClick on a door or "
@@ -529,6 +604,7 @@ void SubwayMap::Redraw() {
     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 == "starting_room_paintings") {
@@ -544,6 +620,16 @@ void SubwayMap::Redraw() {
           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;
@@ -577,13 +663,13 @@ void SubwayMap::Redraw() {
             }
           }
         }
-      } else if (!subway_item.tags.empty()) {
+      } else if (subway_item.HasWarps()) {
         draw_type = ItemDrawType::kOwl;
       }
-    } else if (subway_item.door) {
+    } else if (subway_door) {
       draw_type = ItemDrawType::kBox;
 
-      if (IsDoorOpen(*subway_item.door)) {
+      if (IsDoorOpen(*subway_door)) {
         brush_color = wxGREEN_BRUSH;
       } else {
         brush_color = wxRED_BRUSH;
@@ -2,9 +2,12 @@
 
 #include <wx/aboutdlg.h>
 #include <wx/choicebk.h>
+#include <wx/filedlg.h>
 #include <wx/notebook.h>
+#include <wx/stdpaths.h>
 #include <wx/webrequest.h>
 
+#include <fmt/core.h>
 #include <nlohmann/json.hpp>
 #include <sstream>
 
@@ -23,6 +26,7 @@ enum TrackerFrameIds {
   ID_SETTINGS = 3,
   ID_ZOOM_IN = 4,
   ID_ZOOM_OUT = 5,
+  ID_OPEN_SAVE_FILE = 6,
 };
 
 wxDEFINE_EVENT(STATE_RESET, wxCommandEvent);
@@ -38,6 +42,7 @@ TrackerFrame::TrackerFrame()
 
   wxMenu *menuFile = new wxMenu();
   menuFile->Append(ID_CONNECT, "&Connect");
+  menuFile->Append(ID_OPEN_SAVE_FILE, "&Open Save Data\tCtrl-O");
   menuFile->Append(ID_SETTINGS, "&Settings");
   menuFile->Append(wxID_EXIT);
 
@@ -71,6 +76,7 @@ TrackerFrame::TrackerFrame()
   Bind(wxEVT_MENU, &TrackerFrame::OnZoomIn, this, ID_ZOOM_IN);
   Bind(wxEVT_MENU, &TrackerFrame::OnZoomOut, this, ID_ZOOM_OUT);
   Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, &TrackerFrame::OnChangePage, this);
+  Bind(wxEVT_MENU, &TrackerFrame::OnOpenFile, this, ID_OPEN_SAVE_FILE);
   Bind(STATE_RESET, &TrackerFrame::OnStateReset, this);
   Bind(STATE_CHANGED, &TrackerFrame::OnStateChanged, this);
   Bind(STATUS_CHANGED, &TrackerFrame::OnStatusChanged, this);
@@ -131,6 +137,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");
 
@@ -204,10 +211,36 @@ void TrackerFrame::OnChangePage(wxBookCtrlEvent &event) {
   zoom_out_menu_item_->Enable(event.GetSelection() == 1);
 }
 
+void TrackerFrame::OnOpenFile(wxCommandEvent& event) {
+  wxFileDialog open_file_dialog(
+      this, "Open Lingo Save File",
+      fmt::format("{}\\Godot\\app_userdata\\Lingo\\level1_stable",
+                  wxStandardPaths::Get().GetUserConfigDir().ToStdString()),
+      AP_GetSaveName(), "Lingo save file (*.save)|*.save",
+      wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+  if (open_file_dialog.ShowModal() == wxID_CANCEL) {
+    return;
+  }
+
+  std::string savedata_path = open_file_dialog.GetPath().ToStdString();
+
+  if (panels_panel_ == nullptr) {
+    panels_panel_ = new TrackerPanel(notebook_);
+    notebook_->AddPage(panels_panel_, "Panels");
+  }
+
+  notebook_->SetSelection(notebook_->FindPage(panels_panel_));
+  panels_panel_->SetSavedataPath(savedata_path);
+}
+
 void TrackerFrame::OnStateReset(wxCommandEvent& event) {
   tracker_panel_->UpdateIndicators();
   achievements_pane_->UpdateIndicators();
   subway_map_->OnConnect();
+  if (panels_panel_ != nullptr) {
+    notebook_->DeletePage(notebook_->FindPage(panels_panel_));
+    panels_panel_ = nullptr;
+  }
   Refresh();
 }
 
@@ -215,6 +248,9 @@ void TrackerFrame::OnStateChanged(wxCommandEvent &event) {
   tracker_panel_->UpdateIndicators();
   achievements_pane_->UpdateIndicators();
   subway_map_->UpdateIndicators();
+  if (panels_panel_ != nullptr) {
+    panels_panel_->UpdateIndicators();
+  }
   Refresh();
 }
 
@@ -35,6 +35,7 @@ class TrackerFrame : public wxFrame {
   void OnZoomIn(wxCommandEvent &event);
   void OnZoomOut(wxCommandEvent &event);
   void OnChangePage(wxBookCtrlEvent &event);
+  void OnOpenFile(wxCommandEvent &event);
 
   void OnStateReset(wxCommandEvent &event);
   void OnStateChanged(wxCommandEvent &event);
@@ -46,6 +47,7 @@ class TrackerFrame : public wxFrame {
   TrackerPanel *tracker_panel_;
   AchievementsPane *achievements_pane_;
   SubwayMap *subway_map_;
+  TrackerPanel *panels_panel_ = nullptr;
 
   wxMenuItem *zoom_in_menu_item_;
   wxMenuItem *zoom_out_menu_item_;
@@ -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 "godot_variant.h"
 #include "tracker_config.h"
 #include "tracker_state.h"
 
@@ -53,6 +57,35 @@ void TrackerPanel::UpdateIndicators() {
   Redraw();
 }
 
+void TrackerPanel::SetSavedataPath(std::string savedata_path) {
+  if (!panels_mode_) {
+    wxButton *refresh_button = new wxButton(this, wxID_ANY, "Refresh", {15, 15});
+    refresh_button->Bind(wxEVT_BUTTON, &TrackerPanel::OnRefreshSavedata, this);
+  }
+
+  savedata_path_ = savedata_path;
+  panels_mode_ = true;
+
+  RefreshSavedata();
+}
+
+void TrackerPanel::RefreshSavedata() {
+  solved_panels_.clear();
+
+  GodotVariant godot_variant = ParseGodotFile(*savedata_path_);
+  for (const GodotVariant &panel_node : godot_variant.AsArray()) {
+    const std::vector<GodotVariant> &fields = panel_node.AsArray();
+    if (fields[1].AsBool()) {
+      const std::vector<std::string> &nodepath = fields[0].AsNodePath();
+      std::string key = fmt::format("{}/{}", nodepath[3], nodepath[4]);
+      solved_panels_.insert(key);
+    }
+  }
+
+  UpdateIndicators();
+  Refresh();
+}
+
 void TrackerPanel::OnPaint(wxPaintEvent &event) {
   if (GetSize() != rendered_.GetSize()) {
     Redraw();
@@ -92,6 +125,10 @@ void TrackerPanel::OnMouseMove(wxMouseEvent &event) {
   event.Skip();
 }
 
+void TrackerPanel::OnRefreshSavedata(wxCommandEvent &event) {
+  RefreshSavedata();
+}
+
 void TrackerPanel::Redraw() {
   wxSize panel_size = GetSize();
   wxSize image_size = map_image_.GetSize();
@@ -142,21 +179,35 @@ void TrackerPanel::Redraw() {
 
   for (AreaIndicator &area : areas_) {
     const MapArea &map_area = GD_GetMapArea(area.area_id);
-    if (!AP_IsLocationVisible(map_area.classification) &&
+    if (panels_mode_) {
+      area.active = map_area.has_single_panel;
+    } else if (!AP_IsLocationVisible(map_area.classification) &&
         !(map_area.hunt && GetTrackerConfig().show_hunt_panels) &&
         !(AP_IsPaintingShuffle() && !map_area.paintings.empty())) {
       area.active = false;
-      continue;
     } else {
       area.active = true;
     }
 
+    if (!area.active) {
+      continue;
+    }
+
     bool has_reachable_unchecked = false;
     bool has_unreachable_unchecked = false;
     for (const Location &section : map_area.locations) {
       bool has_unchecked = false;
       if (IsLocationWinCondition(section)) {
         has_unchecked = !AP_HasReachedGoal();
+      } else if (panels_mode_) {
+        if (section.single_panel) {
+          const Panel &panel = GD_GetPanel(*section.single_panel);
+          if (panel.non_counting) {
+            has_unchecked = !AP_HasCheckedGameLocation(section.ap_location_id);
+          } else {
+            has_unchecked = !solved_panels_.contains(panel.nodepath);
+          }
+        }
       } else if (AP_IsLocationVisible(section.classification)) {
         has_unchecked = !AP_HasCheckedGameLocation(section.ap_location_id);
       } else if (section.hunt && GetTrackerConfig().show_hunt_panels) {
@@ -172,12 +223,11 @@ void TrackerPanel::Redraw() {
       }
     }
 
-    if (AP_IsPaintingShuffle()) {
+    if (AP_IsPaintingShuffle() && !panels_mode_) {
       for (int painting_id : map_area.paintings) {
         const PaintingExit &painting = GD_GetPaintingExit(painting_id);
-        if (!AP_IsPaintingChecked(painting.internal_id)) {
-          bool reachable = IsPaintingReachable(painting_id);
-
+        bool reachable = IsPaintingReachable(painting_id);
+        if (!reachable || !AP_IsPaintingChecked(painting.internal_id)) {
           if (reachable) {
             has_reachable_unchecked = true;
           } else {
@@ -7,6 +7,10 @@
 #include <wx/wx.h>
 #endif
 
+#include <optional>
+#include <set>
+#include <string>
+
 class AreaPopup;
 
 class TrackerPanel : public wxPanel {
@@ -15,6 +19,14 @@ class TrackerPanel : public wxPanel {
 
   void UpdateIndicators();
 
+  void SetSavedataPath(std::string savedata_path);
+
+  bool IsPanelsMode() const { return panels_mode_; }
+
+  const std::set<std::string> &GetSolvedPanels() const {
+    return solved_panels_;
+  }
+
  private:
   struct AreaIndicator {
     int area_id = -1;
@@ -28,9 +40,12 @@ class TrackerPanel : public wxPanel {
 
   void OnPaint(wxPaintEvent &event);
   void OnMouseMove(wxMouseEvent &event);
+  void OnRefreshSavedata(wxCommandEvent &event);
 
   void Redraw();
 
+  void RefreshSavedata();
+
   wxImage map_image_;
   wxImage player_image_;
   wxBitmap rendered_;
@@ -42,6 +57,10 @@ class TrackerPanel : public wxPanel {
   double scale_y_ = 0;
 
   std::vector<AreaIndicator> areas_;
+
+  bool panels_mode_ = false;
+  std::optional<std::string> savedata_path_;
+  std::set<std::string> solved_panels_;
 };
 
 #endif /* end of include guard: TRACKER_PANEL_H_D675A54D */
@@ -1,5 +1,8 @@
 #include "tracker_state.h"
 
+#include <fmt/core.h>
+#include <hkutil/string.h>
+
 #include <list>
 #include <map>
 #include <mutex>
@@ -9,6 +12,7 @@
 
 #include "ap_state.h"
 #include "game_data.h"
+#include "logger.h"
 
 namespace {
 
@@ -148,6 +152,7 @@ struct TrackerState {
   std::mutex reachability_mutex;
   RequirementCalculator requirements;
   std::map<int, std::map<std::string, bool>> door_reports;
+  bool pilgrimage_doable = false;
 };
 
 enum Decision { kYes, kNo, kMaybe };
@@ -176,7 +181,8 @@ class StateCalculator {
     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) {
@@ -217,7 +223,9 @@ class StateCalculator {
             PaintingExit target_painting =
                 GD_GetPaintingExit(GD_GetPaintingByName(
                     AP_GetPaintingMapping().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);
           }
@@ -244,6 +252,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 &&
@@ -270,32 +284,44 @@ class StateCalculator {
               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);
+                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("Color Hallways"),
+                {.source_room = room_exit.destination_room,
+                 .destination_room = GD_GetRoomByName("Color Hallways"),
                  .type = EntranceType::kPainting});
           }
 
           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] :
+                   AP_GetSunwarpMapping()) {
+                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});
@@ -336,6 +362,21 @@ class StateCalculator {
     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) {
     bool has_item = AP_HasItem(door_obj.ap_item_id);
@@ -534,6 +575,8 @@ class StateCalculator {
         }
       }
 
+      pilgrimage_doable_ = true;
+
       return kYes;
     }
 
@@ -574,6 +617,9 @@ class StateCalculator {
   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_;
 };
 
 }  // namespace
@@ -623,6 +669,7 @@ void RecalculateReachability() {
   std::swap(GetState().reachable_doors, new_reachable_doors);
   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) {
@@ -652,3 +699,9 @@ const std::map<std::string, bool>& GetDoorRequirements(int door_id) {
 
   return GetState().door_reports[door_id];
 }
+
+bool IsPilgrimageDoable() {
+  std::lock_guard reachability_guard(GetState().reachability_mutex);
+
+  return GetState().pilgrimage_doable;
+}
@@ -16,4 +16,6 @@ bool IsPaintingReachable(int painting_id);
 
 const std::map<std::string, bool>& GetDoorRequirements(int door_id);
 
+bool IsPilgrimageDoable();
+
 #endif /* end of include guard: TRACKER_STATE_H_8639BC90 */
@@ -36,6 +36,6 @@ struct Version {
   }
 };
 
-constexpr const Version kTrackerVersion = Version(0, 10, 5);
+constexpr const Version kTrackerVersion = Version(0, 11, 2);
 
 #endif /* end of include guard: VERSION_H_C757E53C */
\ No newline at end of file