Merge branch 'main' into panels panels

1 files changed, 22 insertions, 3 deletions

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