1 files changed, 35 insertions, 2 deletions

@@ -182,13 +182,46 @@ void RecalculateReachability() {
 
       bool valid_transition = false;
       if (room_exit.door.has_value()) {
-        Decision door_reachable = IsDoorReachable_Helper(
-            *room_exit.door, reachable_rooms, solveable_panels);
+        Decision door_reachable = kMaybe;
+        if (room_exit.sunwarp) {
+          if (AP_GetSunwarpAccess() == kSUNWARP_ACCESS_NORMAL) {
+            door_reachable = kYes;
+          } else if (AP_GetSunwarpAccess() == kSUNWARP_ACCESS_DISABLED) {
+            door_reachable = kNo;
+          } else {
+            door_reachable = IsDoorReachable_Helper(
+                *room_exit.door, reachable_rooms, solveable_panels);
+          }
+        } else {
+          door_reachable = IsDoorReachable_Helper(
+              *room_exit.door, reachable_rooms, solveable_panels);
+        }
         if (door_reachable == kYes) {
           valid_transition = true;
         } else if (door_reachable == kMaybe) {
           new_boundary.push_back(room_exit);
         }
+      } else if (room_exit.pilgrimage) {
+        Decision pilgrimage_reachable = kYes;
+        if (AP_GetSunwarpAccess() == kSUNWARP_ACCESS_DISABLED) {
+          pilgrimage_reachable = kNo;
+        }
+        if (pilgrimage_reachable == kYes) {
+          for (int door_id : GD_GetPilgrimageDoors(
+                   AP_GetSunwarpAccess() == kSUNWARP_ACCESS_UNLOCK ||
+                   AP_GetSunwarpAccess() == kSUNWARP_ACCESS_PROGRESSIVE)) {
+            pilgrimage_reachable = IsDoorReachable_Helper(
+                door_id, reachable_rooms, solveable_panels);
+            if (pilgrimage_reachable != kYes) {
+              break;
+            }
+          }
+        }
+        if (pilgrimage_reachable == kYes) {
+          valid_transition = true;
+        } else if (pilgrimage_reachable == kMaybe) {
+          new_boundary.push_back(room_exit);
+        }
       } else {
         valid_transition = true;
       }