sekai-calculator 0.3.1 → 0.3.2

package/dist/index.cjs

@@ -519,11 +519,25 @@ class BaseDeckRecommend {
         this.cardCalculator = new CardCalculator(dataProvider);
         this.deckCalculator = new DeckCalculator(dataProvider);
     }
+    static canMakeEventDeck(cardDetails) {
+        const map = new Map();
+        for (const cardDetail of cardDetails) {
+            computeWithDefault(map, cardDetail.attr, new Set(), it => it.add(cardDetail.characterId));
+            for (const unit of cardDetail.units) {
+                computeWithDefault(map, unit, new Set(), it => it.add(cardDetail.characterId));
+            }
+        }
+        for (const v of map.values()) {
+            if (v.size >= 5)
+                return true;
+        }
+        return false;
+    }
     static filterCard(cardDetails) {
         let afterFilter = cardDetails;
         for (const minBonus of [65, 50, 40, 25, 15, 0]) {
             const bonusFilter = cardDetails.filter(cardDetail => !(cardDetail.eventBonus !== undefined && cardDetail.eventBonus < minBonus));
-            if (bonusFilter.length >= 5) {
+            if (this.canMakeEventDeck(bonusFilter)) {
                 afterFilter = bonusFilter;
                 break;
             }
@@ -532,8 +546,9 @@ class BaseDeckRecommend {
     }
     static findBestCards(cardDetails, scoreFunc, isChallengeLive = false, member = 5, deckCards = [], deckCharacters = []) {
         if (deckCards.length === member) {
+            const score = scoreFunc(deckCards);
             return {
-                score: scoreFunc(deckCards),
+                score,
                 deckCards
             };
         }
@@ -559,10 +574,13 @@ class BaseDeckRecommend {
             if (result.score > ans.score)
                 ans = result;
         }
+        if (deckCards.length === 0 && ans.score === 0)
+            throw new Error(`Cannot find deck in ${cardDetails.length} cards`);
         return ans;
     }
     async recommendHighScoreDeck(userCards, musicMeta, scoreFunc, eventId = 0, isChallengeLive = false, member = 5) {
-        const cardDetails = BaseDeckRecommend.filterCard(await this.cardCalculator.batchGetCardDetail(userCards, eventId));
+        const cards = await this.cardCalculator.batchGetCardDetail(userCards, eventId);
+        const cardDetails = (isChallengeLive || eventId === 0) ? cards : BaseDeckRecommend.filterCard(cards);
         const honorBonus = await this.deckCalculator.getHonorBonusPower();
         const best = BaseDeckRecommend.findBestCards(cardDetails, deckCards => scoreFunc(musicMeta, honorBonus, deckCards), isChallengeLive, member);
         return {

package/dist/index.mjs

@@ -517,11 +517,25 @@ class BaseDeckRecommend {
         this.cardCalculator = new CardCalculator(dataProvider);
         this.deckCalculator = new DeckCalculator(dataProvider);
     }
+    static canMakeEventDeck(cardDetails) {
+        const map = new Map();
+        for (const cardDetail of cardDetails) {
+            computeWithDefault(map, cardDetail.attr, new Set(), it => it.add(cardDetail.characterId));
+            for (const unit of cardDetail.units) {
+                computeWithDefault(map, unit, new Set(), it => it.add(cardDetail.characterId));
+            }
+        }
+        for (const v of map.values()) {
+            if (v.size >= 5)
+                return true;
+        }
+        return false;
+    }
     static filterCard(cardDetails) {
         let afterFilter = cardDetails;
         for (const minBonus of [65, 50, 40, 25, 15, 0]) {
             const bonusFilter = cardDetails.filter(cardDetail => !(cardDetail.eventBonus !== undefined && cardDetail.eventBonus < minBonus));
-            if (bonusFilter.length >= 5) {
+            if (this.canMakeEventDeck(bonusFilter)) {
                 afterFilter = bonusFilter;
                 break;
             }
@@ -530,8 +544,9 @@ class BaseDeckRecommend {
     }
     static findBestCards(cardDetails, scoreFunc, isChallengeLive = false, member = 5, deckCards = [], deckCharacters = []) {
         if (deckCards.length === member) {
+            const score = scoreFunc(deckCards);
             return {
-                score: scoreFunc(deckCards),
+                score,
                 deckCards
             };
         }
@@ -557,10 +572,13 @@ class BaseDeckRecommend {
             if (result.score > ans.score)
                 ans = result;
         }
+        if (deckCards.length === 0 && ans.score === 0)
+            throw new Error(`Cannot find deck in ${cardDetails.length} cards`);
         return ans;
     }
     async recommendHighScoreDeck(userCards, musicMeta, scoreFunc, eventId = 0, isChallengeLive = false, member = 5) {
-        const cardDetails = BaseDeckRecommend.filterCard(await this.cardCalculator.batchGetCardDetail(userCards, eventId));
+        const cards = await this.cardCalculator.batchGetCardDetail(userCards, eventId);
+        const cardDetails = (isChallengeLive || eventId === 0) ? cards : BaseDeckRecommend.filterCard(cards);
         const honorBonus = await this.deckCalculator.getHonorBonusPower();
         const best = BaseDeckRecommend.findBestCards(cardDetails, deckCards => scoreFunc(musicMeta, honorBonus, deckCards), isChallengeLive, member);
         return {

package/package.json

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