update muffins tracker

[alttp.git] / resources / js / helpers / tracker.js

diff --git a/resources/js/helpers/tracker.js b/resources/js/helpers/tracker.js
index 47a34f135bbd55e7ec3eb31f2efccc7a824eccfe..4f44d3c50d3b4fac23f28a157fe5f662004fd4e9 100644 (file)
--- a/resources/js/helpers/tracker.js
+++ b/resources/js/helpers/tracker.js
@@ -1647,7 +1647,7 @@ export const getCombinedStatus = statuses => {
        if (statuses.filter(s => ['available', 'cleared'].includes(s)).length === statuses.length) {
                return 'available';
        }
-       if (statuses.filter(s => s === 'unavailable').length === statuses.length) {
+       if (statuses.filter(s => ['unavailable', 'cleared'].includes(s)).length === statuses.length) {
                return 'unavailable';
        }
        return 'partial';
@@ -1940,6 +1940,9 @@ export const mergeStates = (autoState, manualState) => {
        next['tr-medallion'] = manualState['tr-medallion'];
        next['gt-crystals'] = manualState['gt-crystals'];
        next['ganon-crystals'] = manualState['ganon-crystals'];
+       next['gt-bot-boss'] = manualState['gt-bot-boss'];
+       next['gt-mid-boss'] = manualState['gt-mid-boss'];
+       next['gt-top-boss'] = manualState['gt-top-boss'];
        //console.log(next);
        return next;
 };