Merge branch 'main' into panels

1 files changed, 24 insertions, 14 deletions

@@ -27,7 +27,7 @@ TrackerState& GetState() {
 class StateCalculator;
 
 struct StateCalculatorOptions {
-  std::string start = "Menu";
+  int start;
   bool pilgrimage = false;
   StateCalculator* parent = nullptr;
 };
@@ -42,8 +42,7 @@ class StateCalculator {
   void Calculate() {
     std::list<int> panel_boundary;
     std::list<Exit> flood_boundary;
-    flood_boundary.push_back(
-        {.destination_room = GD_GetRoomByName(options_.start)});
+    flood_boundary.push_back({.destination_room = options_.start});
 
     bool reachable_changed = true;
     while (reachable_changed) {
@@ -350,21 +349,32 @@ class StateCalculator {
         }
       }
 
-      static const std::vector<std::tuple<std::string, std::string>>
-          pilgrimage_pairs = {
-              {"Crossroads", "Hot Crusts Area"},
-              // {"Orange Tower Third Floor", "Orange Tower Third Floor"},
-              {"Outside The Initiated", "Orange Tower First Floor"},
-              {"Outside The Undeterred", "Orange Tower Fourth Floor"},
-              {"Color Hunt", "Outside The Agreeable"}};
+      std::vector<std::tuple<int, int>> pilgrimage_pairs;
+      if (AP_IsSunwarpShuffle()) {
+        pilgrimage_pairs = std::vector<std::tuple<int, int>>(5);
 
-      for (const auto& [from_room, to_room] : pilgrimage_pairs) {
+        for (const auto& [start_index, mapping] : AP_GetSunwarpMapping()) {
+          if (mapping.dots > 1) {
+            std::get<1>(pilgrimage_pairs[mapping.dots - 2]) = start_index;
+          }
+          if (mapping.dots < 6) {
+            std::get<0>(pilgrimage_pairs[mapping.dots - 1]) =
+                mapping.exit_index;
+          }
+        }
+      } else {
+        pilgrimage_pairs = {{6, 1}, {8, 3}, {9, 4}, {10, 5}};
+      }
+
+      for (const auto& [from_sunwarp, to_sunwarp] : pilgrimage_pairs) {
         StateCalculator pilgrimage_calculator(
-            {.start = from_room, .pilgrimage = true, .parent = this});
+            {.start = GD_GetRoomForSunwarp(from_sunwarp),
+             .pilgrimage = true,
+             .parent = this});
         pilgrimage_calculator.Calculate();
 
         if (!pilgrimage_calculator.GetReachableRooms().count(
-                GD_GetRoomByName(to_room))) {
+                GD_GetRoomForSunwarp(to_sunwarp))) {
           return kMaybe;
         }
       }
@@ -412,7 +422,7 @@ class StateCalculator {
 }  // namespace
 
 void RecalculateReachability() {
-  StateCalculator state_calculator;
+  StateCalculator state_calculator({.start = GD_GetRoomByName("Menu")});
   state_calculator.Calculate();
 
   const std::set<int>& reachable_rooms = state_calculator.GetReachableRooms();