sekai-calculator 0.6.6 → 0.6.7

package/dist/index.cjs

@@ -625,16 +625,22 @@ class BaseDeckRecommend {
         }
         return false;
     }
-    static filterCard(cardDetails) {
-        let afterFilter = cardDetails;
+    static filterCard(cardDetails, preMinBonus = 65) {
         for (const minBonus of [55, 50, 45, 40, 30, 25, 15, 5, 0]) {
+            if (minBonus >= preMinBonus)
+                continue;
             const bonusFilter = cardDetails.filter(cardDetail => !(cardDetail.eventBonus !== undefined && cardDetail.eventBonus < minBonus));
             if (this.canMakeEventDeck(bonusFilter)) {
-                afterFilter = bonusFilter;
-                break;
+                return {
+                    minBonus,
+                    cards: bonusFilter
+                };
             }
         }
-        return afterFilter;
+        return {
+            minBonus: 0,
+            cards: cardDetails
+        };
     }
     static findBestCards(cardDetails, scoreFunc, limit = 1, isChallengeLive = false, member = 5, honorBonus = 0, deckCards = [], deckCharacters = []) {
         if (deckCards.length === member) {
@@ -674,16 +680,26 @@ class BaseDeckRecommend {
             if (ans.length > limit)
                 ans = ans.slice(0, limit);
         }
-        if (deckCards.length === 0 && ans.length === 0)
-            throw new Error(`Cannot find deck in ${cardDetails.length} cards`);
+        if (deckCards.length === 0 && ans.length === 0) {
+            throw new Error(`Cannot find deck in ${cardDetails.length} cards(${cardDetails.map(it => it.cardId).toString()})`);
+        }
         return ans;
     }
     async recommendHighScoreDeck(userCards, scoreFunc, { musicMeta, limit = 1, member = 5, cardConfig = {} }, eventId = 0, isChallengeLive = false) {
         const cards = await this.cardCalculator.batchGetCardDetail(userCards, cardConfig, eventId);
-        let cardDetails = (isChallengeLive || eventId === 0) ? cards : BaseDeckRecommend.filterCard(cards);
-        cardDetails = cardDetails.sort((a, b) => a.cardId - b.cardId);
         const honorBonus = await this.deckCalculator.getHonorBonusPower();
-        return BaseDeckRecommend.findBestCards(cardDetails, deckCards => scoreFunc(musicMeta, honorBonus, deckCards), limit, isChallengeLive, member, honorBonus);
+        let minBonus = (isChallengeLive || eventId === 0) ? 0 : 65;
+        while (minBonus > 0) {
+            const cardDetails = BaseDeckRecommend.filterCard(cards, minBonus);
+            minBonus = cardDetails.minBonus;
+            try {
+                return BaseDeckRecommend.findBestCards(cardDetails.cards, deckCards => scoreFunc(musicMeta, honorBonus, deckCards), limit, isChallengeLive, member, honorBonus);
+            }
+            catch (e) {
+                console.warn(e);
+            }
+        }
+        return BaseDeckRecommend.findBestCards(cards, deckCards => scoreFunc(musicMeta, honorBonus, deckCards), limit, isChallengeLive, member, honorBonus);
     }
     static getLiveScoreFunction(liveType) {
         return (musicMeta, honorBonus, deckCards) => LiveCalculator.getLiveScoreByDeck(deckCards, honorBonus, musicMeta, liveType);

package/dist/index.mjs

@@ -623,16 +623,22 @@ class BaseDeckRecommend {
         }
         return false;
     }
-    static filterCard(cardDetails) {
-        let afterFilter = cardDetails;
+    static filterCard(cardDetails, preMinBonus = 65) {
         for (const minBonus of [55, 50, 45, 40, 30, 25, 15, 5, 0]) {
+            if (minBonus >= preMinBonus)
+                continue;
             const bonusFilter = cardDetails.filter(cardDetail => !(cardDetail.eventBonus !== undefined && cardDetail.eventBonus < minBonus));
             if (this.canMakeEventDeck(bonusFilter)) {
-                afterFilter = bonusFilter;
-                break;
+                return {
+                    minBonus,
+                    cards: bonusFilter
+                };
             }
         }
-        return afterFilter;
+        return {
+            minBonus: 0,
+            cards: cardDetails
+        };
     }
     static findBestCards(cardDetails, scoreFunc, limit = 1, isChallengeLive = false, member = 5, honorBonus = 0, deckCards = [], deckCharacters = []) {
         if (deckCards.length === member) {
@@ -672,16 +678,26 @@ class BaseDeckRecommend {
             if (ans.length > limit)
                 ans = ans.slice(0, limit);
         }
-        if (deckCards.length === 0 && ans.length === 0)
-            throw new Error(`Cannot find deck in ${cardDetails.length} cards`);
+        if (deckCards.length === 0 && ans.length === 0) {
+            throw new Error(`Cannot find deck in ${cardDetails.length} cards(${cardDetails.map(it => it.cardId).toString()})`);
+        }
         return ans;
     }
     async recommendHighScoreDeck(userCards, scoreFunc, { musicMeta, limit = 1, member = 5, cardConfig = {} }, eventId = 0, isChallengeLive = false) {
         const cards = await this.cardCalculator.batchGetCardDetail(userCards, cardConfig, eventId);
-        let cardDetails = (isChallengeLive || eventId === 0) ? cards : BaseDeckRecommend.filterCard(cards);
-        cardDetails = cardDetails.sort((a, b) => a.cardId - b.cardId);
         const honorBonus = await this.deckCalculator.getHonorBonusPower();
-        return BaseDeckRecommend.findBestCards(cardDetails, deckCards => scoreFunc(musicMeta, honorBonus, deckCards), limit, isChallengeLive, member, honorBonus);
+        let minBonus = (isChallengeLive || eventId === 0) ? 0 : 65;
+        while (minBonus > 0) {
+            const cardDetails = BaseDeckRecommend.filterCard(cards, minBonus);
+            minBonus = cardDetails.minBonus;
+            try {
+                return BaseDeckRecommend.findBestCards(cardDetails.cards, deckCards => scoreFunc(musicMeta, honorBonus, deckCards), limit, isChallengeLive, member, honorBonus);
+            }
+            catch (e) {
+                console.warn(e);
+            }
+        }
+        return BaseDeckRecommend.findBestCards(cards, deckCards => scoreFunc(musicMeta, honorBonus, deckCards), limit, isChallengeLive, member, honorBonus);
     }
     static getLiveScoreFunction(liveType) {
         return (musicMeta, honorBonus, deckCards) => LiveCalculator.getLiveScoreByDeck(deckCards, honorBonus, musicMeta, liveType);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sekai-calculator",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "Project SEKAI Calculator for deck power, live score, event point and more.",
   "type": "module",
   "types": "dist/index.d.ts",