Merge branch 'main' into panels

1 files changed, 50 insertions, 27 deletions

@@ -1,5 +1,6 @@
 #include "subway_map.h"
 
+#include <fmt/core.h>
 #include <wx/dcbuffer.h>
 #include <wx/dcgraph.h>
 
@@ -15,6 +16,29 @@ constexpr int OWL_ACTUAL_SIZE = 32;
 
 enum class ItemDrawType { kNone, kBox, kOwl };
 
+namespace {
+
+std::optional<int> GetRealSubwayDoor(const SubwayItem subway_item) {
+  std::optional<int> subway_door = subway_item.door;
+  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) {
+        subway_door = GD_GetSunwarpDoors().at(mapping.dots - 1);
+      }
+    }
+
+    return subway_door;
+  }
+}
+
+}  // namespace
+
 SubwayMap::SubwayMap(wxWindow *parent) : wxPanel(parent, wxID_ANY) {
   SetBackgroundStyle(wxBG_STYLE_PAINT);
 
@@ -70,9 +94,8 @@ void SubwayMap::OnConnect() {
   std::map<std::string, std::vector<int>> tagged;
   for (const SubwayItem &subway_item : GD_GetSubwayItems()) {
     if (AP_HasEarlyColorHallways() &&
-        (subway_item.special == "starting_room_paintings" ||
-         subway_item.special == "early_color_hallways")) {
-      tagged["early_color_hallways"].push_back(subway_item.id);
+        subway_item.special == "starting_room_paintings") {
+      tagged["early_ch"].push_back(subway_item.id);
     }
 
     if (AP_IsPaintingShuffle() && !subway_item.paintings.empty()) {
@@ -85,10 +108,8 @@ void SubwayMap::OnConnect() {
 
     if (!AP_IsSunwarpShuffle() && subway_item.sunwarp &&
         subway_item.sunwarp->type != SubwaySunwarpType::kFinal) {
-      std::ostringstream tag;
-      tag << "sunwarp" << subway_item.sunwarp->dots;
-
-      tagged[tag.str()].push_back(subway_item.id);
+      std::string tag = fmt::format("subway{}", subway_item.sunwarp->dots);
+      tagged[tag].push_back(subway_item.id);
     }
 
     if (!AP_IsPilgrimageEnabled() &&
@@ -100,8 +121,7 @@ void SubwayMap::OnConnect() {
 
   if (AP_IsSunwarpShuffle()) {
     for (const auto &[index, mapping] : AP_GetSunwarpMapping()) {
-      std::ostringstream tag;
-      tag << "sunwarp" << mapping.dots;
+      std::string tag = fmt::format("sunwarp{}", mapping.dots);
 
       SubwaySunwarp fromWarp;
       if (index < 6) {
@@ -121,8 +141,8 @@ void SubwayMap::OnConnect() {
         toWarp.type = SubwaySunwarpType::kExit;
       }
 
-      tagged[tag.str()].push_back(GD_GetSubwayItemForSunwarp(fromWarp));
-      tagged[tag.str()].push_back(GD_GetSubwayItemForSunwarp(toWarp));
+      tagged[tag].push_back(GD_GetSubwayItemForSunwarp(fromWarp));
+      tagged[tag].push_back(GD_GetSubwayItemForSunwarp(toWarp));
     }
   }
 
@@ -147,9 +167,13 @@ void SubwayMap::UpdateIndicators() {
         checked_paintings_.insert(painting_id);
 
         if (AP_GetPaintingMapping().count(painting_id)) {
-          networks_.AddLink(GD_GetSubwayItemForPainting(painting_id),
-                            GD_GetSubwayItemForPainting(
-                                AP_GetPaintingMapping().at(painting_id)));
+          std::optional<int> from_id = GD_GetSubwayItemForPainting(painting_id);
+          std::optional<int> to_id = GD_GetSubwayItemForPainting(
+              AP_GetPaintingMapping().at(painting_id));
+
+          if (from_id && to_id) {
+            networks_.AddLink(*from_id, *to_id);
+          }
         }
       }
     }
@@ -266,9 +290,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;
@@ -404,7 +430,7 @@ void SubwayMap::OnMouseMove(wxMouseEvent &event) {
   std::vector<int> hovered = tree_->query(
       {static_cast<float>(mouse_pos.x), static_cast<float>(mouse_pos.y), 2, 2});
   if (!hovered.empty()) {
-    actual_hover_= hovered[0];
+    actual_hover_ = hovered[0];
   } else {
     actual_hover_ = std::nullopt;
   }
@@ -449,7 +475,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_;
@@ -530,15 +558,9 @@ void SubwayMap::Redraw() {
     std::optional<wxColour> shade_color;
 
     if (AP_HasEarlyColorHallways() &&
-        (subway_item.special == "starting_room_paintings" ||
-         subway_item.special == "early_color_hallways")) {
+        subway_item.special == "starting_room_paintings") {
       draw_type = ItemDrawType::kOwl;
-
-      if (subway_item.special == "starting_room_paintings") {
-        shade_color = wxColour(0, 255, 0, 128);
-      } else {
-        shade_color = wxColour(255, 0, 0, 128);
-      }
+      shade_color = wxColour(0, 255, 0, 128);
     } else if (subway_item.special == "sun_painting") {
       if (!AP_IsPilgrimageEnabled()) {
         if (IsDoorOpen(*subway_item.door)) {
@@ -570,7 +592,8 @@ void SubwayMap::Redraw() {
           }
         }
 
-        if (has_unchecked_painting || has_mapped_painting || has_codomain_painting) {
+        if (has_unchecked_painting || has_mapped_painting ||
+            has_codomain_painting) {
           draw_type = ItemDrawType::kOwl;
 
           if (has_checked_painting) {