X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fhelpers%2Ftracker.js;h=4f44d3c50d3b4fac23f28a157fe5f662004fd4e9;hb=4210a67ba2d2f705b001dd9395c3c30688b4dee9;hp=47a34f135bbd55e7ec3eb31f2efccc7a824eccfe;hpb=d2e89b06bd80faa5085c454709c7e48c829cc6f2;p=alttp.git diff --git a/resources/js/helpers/tracker.js b/resources/js/helpers/tracker.js index 47a34f1..4f44d3c 100644 --- 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; };