From 3c3381847bc8f1e1fc204091c96ffdcf06f9cef7 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Tue, 19 Dec 2023 16:01:03 +0000 Subject: [PATCH] Update cards per page to be 9 --- src/client/client.ts | 2 +- src/helpers/InventoryHelper.ts | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/client/client.ts b/src/client/client.ts index 18ac69f..5dee253 100644 --- a/src/client/client.ts +++ b/src/client/client.ts @@ -84,7 +84,7 @@ export class CoreClient extends Client { console.log(`Registered Events: ${CoreClient._eventItems.flatMap(x => x.EventType).join(", ")}`); console.log(`Registered Buttons: ${CoreClient._buttonEvents.flatMap(x => x.ButtonId).join(", ")}`); - const page = await InventoryHelper.GenerateInventoryPage('125776189666230272', 11); + const page = await InventoryHelper.GenerateInventoryPage('125776189666230272', 0); console.log(page); diff --git a/src/helpers/InventoryHelper.ts b/src/helpers/InventoryHelper.ts index e0969ff..197a131 100644 --- a/src/helpers/InventoryHelper.ts +++ b/src/helpers/InventoryHelper.ts @@ -21,14 +21,16 @@ interface InventoryPageCards { export default class InventoryHelper { public static async GenerateInventoryPage(userid: string, page: number): Promise<{ embed: EmbedBuilder, row: ActionRowBuilder }> { - const cardsPerPage = 10; + const cardsPerPage = 9; const inventory = await Inventory.FetchAllByUserId(userid); const allSeriesClaimed = CoreClient.Cards .sort((a, b) => a.id - b.id) .filter(x => { - x.cards = x.cards.filter(y => inventory.find(z => z.CardNumber == y.id)); + x.cards = x.cards + .sort((a, b) => b.type - a.type) + .filter(y => inventory.find(z => z.CardNumber == y.id)); return x; }); @@ -36,7 +38,7 @@ export default class InventoryHelper { const pages: InventoryPage[] = []; for (let series of allSeriesClaimed) { - const seriesCards = series.cards.sort((a, b) => b.type - a.type); + const seriesCards = series.cards; for (let i = 0; i < seriesCards.length; i+= cardsPerPage) { const cards = series.cards.slice(i, i + cardsPerPage);