From 95d88f081ac8c69ab8a099e4a2eac58dadfff200 Mon Sep 17 00:00:00 2001 From: Avior Date: Thu, 12 Aug 2021 21:50:15 +0200 Subject: [PATCH] Removed `set.variants` from Compiler (#15) Signed-off-by: Avior --- utils/cardUtil.ts | 8 ++++---- utils/setUtil.ts | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/cardUtil.ts b/utils/cardUtil.ts index 93228f0..fa26603 100644 --- a/utils/cardUtil.ts +++ b/utils/cardUtil.ts @@ -51,10 +51,10 @@ export async function cardToCardSingle(localId: string, card: Card, lang: Suppor rarity: translate('rarity', card.rarity, lang) as any, set: await setToSetSimple(card.set, lang), variants: { - firstEdition: typeof card.variants?.firstEdition === 'boolean' ? card.variants.firstEdition : typeof card.set.variants?.firstEdition === 'boolean' ? card.set.variants.firstEdition : false, - holo: typeof card.variants?.holo === 'boolean' ? card.variants.holo : typeof card.set.variants?.holo === 'boolean' ? card.set.variants.holo : true, - normal: typeof card.variants?.normal === 'boolean' ? card.variants.normal : typeof card.set.variants?.normal === 'boolean' ? card.set.variants.normal : true, - reverse: typeof card.variants?.reverse === 'boolean' ? card.variants.reverse : typeof card.set.variants?.reverse === 'boolean' ? card.set.variants.reverse : true + firstEdition: typeof card.variants?.firstEdition === 'boolean' ? card.variants.firstEdition : false, + holo: typeof card.variants?.holo === 'boolean' ? card.variants.holo : true, + normal: typeof card.variants?.normal === 'boolean' ? card.variants.normal : true, + reverse: typeof card.variants?.reverse === 'boolean' ? card.variants.reverse : true }, diff --git a/utils/setUtil.ts b/utils/setUtil.ts index 0205a07..68618b0 100644 --- a/utils/setUtil.ts +++ b/utils/setUtil.ts @@ -78,11 +78,11 @@ export async function setToSetSingle(set: Set, lang: SupportedLanguages): Promis const pics = await getSetPictures(set, lang) return { cardCount: { - firstEd: cards.reduce((count, card) => count + (card[1].variants?.firstEdition ?? set.variants?.firstEdition ? 1 : 0), 0), - holo: cards.reduce((count, card) => count + (card[1].variants?.holo ?? set.variants?.holo ? 1 : 0), 0), - normal: cards.reduce((count, card) => count + (card[1].variants?.normal ?? set.variants?.normal ? 1 : 0), 0), + firstEd: cards.reduce((count, card) => count + (card[1].variants?.firstEdition ? 1 : 0), 0), + holo: cards.reduce((count, card) => count + (card[1].variants?.holo ? 1 : 0), 0), + normal: cards.reduce((count, card) => count + (card[1].variants?.normal ? 1 : 0), 0), official: set.cardCount.official, - reverse: cards.reduce((count, card) => count + (card[1].variants?.reverse ?? set.variants?.reverse ? 1 : 0), 0), + reverse: cards.reduce((count, card) => count + (card[1].variants?.reverse ? 1 : 0), 0), total: Math.max(set.cardCount.official, cards.length) }, cards: await Promise.all(cards.map(([id, card]) => cardToCardSimple(id, card, lang))),