Merge branch 'main' into panels panels

10 files changed, 75 insertions, 24 deletions

@@ -55,7 +55,7 @@ void AreaPopup::UpdateIndicators() {
     const Location& location = map_area.locations.at(section_id);
 
     if (tracker_panel->IsPanelsMode()) {
-      if (!location.panel) {
+      if (!location.single_panel) {
         continue;
       }
     } else {
@@ -117,12 +117,12 @@ void AreaPopup::UpdateIndicators() {
     if (IsLocationWinCondition(location)) {
       checked = AP_HasReachedGoal();
     } else if (tracker_panel->IsPanelsMode()) {
-      checked = location.panel && std::any_of(
-          location.panels.begin(), location.panels.end(),
-          [tracker_panel](int panel_id) {
-            const Panel& panel = GD_GetPanel(panel_id);
-            return tracker_panel->GetSolvedPanels().contains(panel.nodepath);
-          });
+      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) ||
@@ -645,7 +645,7 @@ struct GameData {
                                     .panels = {panel.id},
                                     .classification = classification,
                                     .hunt = panel.hunt,
-                                    .panel = true});
+                                    .single_panel = panel.id});
       locations_by_name[location_name] = {area_id,
                                           map_area.locations.size() - 1};
     }
@@ -698,7 +698,7 @@ struct GameData {
       for (const Location &location : map_area.locations) {
         map_area.classification |= location.classification;
         map_area.hunt |= location.hunt;
-        map_area.panel |= location.panel;
+        map_area.has_single_panel |= location.single_panel.has_value();
       }
     }
 
@@ -121,7 +121,7 @@ struct Location {
   std::vector<int> panels;
   int classification = 0;
   bool hunt = false;
-  bool panel = false;
+  std::optional<int> single_panel;
 };
 
 struct MapArea {
@@ -133,7 +133,7 @@ struct MapArea {
   int map_y;
   int classification = 0;
   bool hunt = false;
-  bool panel = false;
+  bool has_single_panel = false;
 };
 
 enum class SubwaySunwarpType {
@@ -21,6 +21,19 @@ void NetworkSet::AddLink(int id1, int id2) {
   network_by_item_[id2].insert({id1, id2});
 }
 
+void NetworkSet::AddLinkToNetwork(int network_id, int id1, int id2) {
+  if (id2 > id1) {
+    // Make sure id1 < id2
+    std::swap(id1, id2);
+  }
+
+  if (!network_by_item_.count(network_id)) {
+    network_by_item_[network_id] = {};
+  }
+
+  network_by_item_[network_id].insert({id1, id2});
+}
+
 bool NetworkSet::IsItemInNetwork(int id) const {
   return network_by_item_.count(id);
 }
@@ -13,6 +13,8 @@ class NetworkSet {
 
   void AddLink(int id1, int id2);
 
+  void AddLinkToNetwork(int network_id, int id1, int id2);
+
   bool IsItemInNetwork(int id) const;
 
   const std::set<std::pair<int, int>>& GetNetworkGraph(int id) const;
@@ -107,7 +107,7 @@ void SubwayMap::OnConnect() {
 
     if (!AP_IsSunwarpShuffle() && subway_item.sunwarp &&
         subway_item.sunwarp->type != SubwaySunwarpType::kFinal) {
-      std::string tag = fmt::format("subway{}", subway_item.sunwarp->dots);
+      std::string tag = fmt::format("sunwarp{}", subway_item.sunwarp->dots);
       tagged[tag].push_back(subway_item.id);
     }
 
@@ -119,6 +119,9 @@ void SubwayMap::OnConnect() {
   }
 
   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);
 
@@ -142,6 +145,11 @@ void SubwayMap::OnConnect() {
 
       tagged[tag].push_back(GD_GetSubwayItemForSunwarp(fromWarp));
       tagged[tag].push_back(GD_GetSubwayItemForSunwarp(toWarp));
+      
+      networks_.AddLinkToNetwork(
+          final_sunwarp_item, GD_GetSubwayItemForSunwarp(fromWarp),
+          mapping.dots == 6 ? final_sunwarp_item
+                            : GD_GetSubwayItemForSunwarp(toWarp));
     }
   }
 
@@ -555,6 +563,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") {
@@ -570,6 +579,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;
@@ -606,10 +625,10 @@ void SubwayMap::Redraw() {
       } else if (!subway_item.tags.empty()) {
         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;
@@ -180,7 +180,7 @@ void TrackerPanel::Redraw() {
   for (AreaIndicator &area : areas_) {
     const MapArea &map_area = GD_GetMapArea(area.area_id);
     if (panels_mode_) {
-      area.active = map_area.panel;
+      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())) {
@@ -200,11 +200,14 @@ void TrackerPanel::Redraw() {
       if (IsLocationWinCondition(section)) {
         has_unchecked = !AP_HasReachedGoal();
       } else if (panels_mode_) {
-        has_unchecked = section.panel && std::any_of(
-            section.panels.begin(), section.panels.end(), [this](int panel_id) {
-              const Panel &panel = GD_GetPanel(panel_id);
-              return !solved_panels_.contains(panel.nodepath);
-            });
+        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) {
@@ -223,9 +226,8 @@ void TrackerPanel::Redraw() {
     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 {
@@ -166,6 +166,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 };
@@ -375,6 +376,8 @@ class StateCalculator {
     return door_report_;
   }
 
+  bool IsPilgrimageDoable() const { return pilgrimage_doable_; }
+
   std::string GetPathToRoom(int room_id) const {
     if (!paths_.count(room_id)) {
       return "";
@@ -601,6 +604,8 @@ class StateCalculator {
         }
       }
 
+      pilgrimage_doable_ = true;
+
       return kYes;
     }
 
@@ -641,6 +646,7 @@ 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_;
 };
@@ -692,6 +698,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) {
@@ -721,3 +728,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, 11, 0);
+constexpr const Version kTrackerVersion = Version(0, 11, 1);
 
 #endif /* end of include guard: VERSION_H_C757E53C */
\ No newline at end of file