Merge branch 'main' into panels

1 files changed, 13 insertions, 0 deletions

@@ -166,6 +166,7 @@ struct TrackerState {
   std::mutex reachability_mutex;
   RequirementCalculator requirements;
   std::map<int, std::map<std::string, bool>> door_reports;
+  bool pilgrimage_doable = false;
 };
 
 enum Decision { kYes, kNo, kMaybe };
@@ -375,6 +376,8 @@ class StateCalculator {
     return door_report_;
   }
 
+  bool IsPilgrimageDoable() const { return pilgrimage_doable_; }
+
   std::string GetPathToRoom(int room_id) const {
     if (!paths_.count(room_id)) {
       return "";
@@ -601,6 +604,8 @@ class StateCalculator {
         }
       }
 
+      pilgrimage_doable_ = true;
+
       return kYes;
     }
 
@@ -641,6 +646,7 @@ class StateCalculator {
   std::set<int> solveable_panels_;
   std::set<int> reachable_paintings_;
   std::map<int, std::map<std::string, bool>> door_report_;
+  bool pilgrimage_doable_ = false;
 
   std::map<int, std::list<int>> paths_;
 };
@@ -692,6 +698,7 @@ void RecalculateReachability() {
   std::swap(GetState().reachable_doors, new_reachable_doors);
   std::swap(GetState().reachable_paintings, reachable_paintings);
   std::swap(GetState().door_reports, door_reports);
+  GetState().pilgrimage_doable = state_calculator.IsPilgrimageDoable();
 }
 
 bool IsLocationReachable(int location_id) {
@@ -721,3 +728,9 @@ const std::map<std::string, bool>& GetDoorRequirements(int door_id) {
 
   return GetState().door_reports[door_id];
 }
+
+bool IsPilgrimageDoable() {
+  std::lock_guard reachability_guard(GetState().reachability_mutex);
+
+  return GetState().pilgrimage_doable;
+}