1 files changed, 28 insertions, 0 deletions

@@ -98,6 +98,34 @@ void SubwayMap::OnConnect() {
     }
   }
 
+  if (AP_IsSunwarpShuffle()) {
+    for (const auto &[index, mapping] : AP_GetSunwarpMapping()) {
+      std::ostringstream tag;
+      tag << "sunwarp" << mapping.dots;
+
+      SubwaySunwarp fromWarp;
+      if (index < 6) {
+        fromWarp.dots = index + 1;
+        fromWarp.type = SubwaySunwarpType::kEnter;
+      } else {
+        fromWarp.dots = index - 5;
+        fromWarp.type = SubwaySunwarpType::kExit;
+      }
+
+      SubwaySunwarp toWarp;
+      if (mapping.exit_index < 6) {
+        toWarp.dots = mapping.exit_index + 1;
+        toWarp.type = SubwaySunwarpType::kEnter;
+      } else {
+        toWarp.dots = mapping.exit_index - 5;
+        toWarp.type = SubwaySunwarpType::kExit;
+      }
+
+      tagged[tag.str()].push_back(GD_GetSubwayItemForSunwarp(fromWarp));
+      tagged[tag.str()].push_back(GD_GetSubwayItemForSunwarp(toWarp));
+    }
+  }
+
   for (const auto &[tag, items] : tagged) {
     // Pairwise connect all items with the same tag.
     for (auto tag_it1 = items.begin(); std::next(tag_it1) != items.end();