1 files changed, 111 insertions, 25 deletions

@@ -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;