Don't recalc from non-progression items

2 files changed, 24 insertions, 2 deletions

@@ -39,6 +39,18 @@ constexpr int CONNECTION_BACKOFF_INTERVAL = 100;
 
 namespace {
 
+const std::set<long> kNonProgressionItems = {
+    444409,  // :)
+    444575,  // The Feeling of Being Lost
+    444576,  // Wanderlust
+    444577,  // Empty White Hallways
+    444410,  // Slowness Trap
+    444411,  // Iceland Trap
+    444412,  // Atbash Trap
+    444413,  // Puzzle Skip
+    444680,  // Speed Boost
+};
+
 struct APState {
   // Initialized on main thread
   bool initialized = false;
@@ -394,6 +406,7 @@ struct APState {
 
   void OnItemsReceived(const std::list<APClient::NetworkItem>& items) {
     std::vector<ItemState> item_states;
+    bool progression_items = false;
 
     {
       std::lock_guard state_guard(state_mutex);
@@ -405,6 +418,10 @@ struct APState {
         TrackerLog(fmt::format("Item: {}", item.item));
 
         index_by_item[item.item] = item.index;
+
+        if (!kNonProgressionItems.count(item.item)) {
+          progression_items = true;
+        }
       }
 
       for (const auto& [item_id, item_index] : index_by_item) {
@@ -414,7 +431,8 @@ struct APState {
       }
     }
 
-    RefreshTracker(StateUpdate{.items = item_states});
+    RefreshTracker(StateUpdate{.items = item_states,
+                               .progression_items = progression_items});
   }
 
   void OnRetrieved(const std::map<std::string, nlohmann::json>& data) {
@@ -639,7 +657,7 @@ struct APState {
   void RefreshTracker(std::optional<StateUpdate> state_update) {
     TrackerLog("Refreshing display...");
 
-    if (!state_update || !state_update->items.empty() ||
+    if (!state_update || state_update->progression_items ||
         !state_update->paintings.empty()) {
       std::string prev_msg;
       {
@@ -691,6 +691,8 @@ class StateCalculator {
 }  // namespace
 
 void ResetReachabilityRequirements() {
+  TrackerLog("Resetting tracker state...");
+
   std::lock_guard reachability_guard(GetState().reachability_mutex);
   GetState().requirements.Reset();
   GetState().reachable_doors.clear();
@@ -754,6 +756,8 @@ void ResetReachabilityRequirements() {
 }
 
 void RecalculateReachability() {
+  TrackerLog("Calculating reachability...");
+
   std::lock_guard reachability_guard(GetState().reachability_mutex);
 
   // Receiving items and checking paintings should never remove access to doors