diff --git a/.dev.env b/.dev.env index a8694e6..ca791ba 100644 --- a/.dev.env +++ b/.dev.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.1.7 DEV +BOT_VER=0.1.4 DEV BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=682942374040961060 diff --git a/.prod.env b/.prod.env index 6779d7e..f1a644e 100644 --- a/.prod.env +++ b/.prod.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.1.7 +BOT_VER=0.1.4 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1093810443589529631 diff --git a/.stage.env b/.stage.env index d921e7b..60a01fc 100644 --- a/.stage.env +++ b/.stage.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.1.7 BETA +BOT_VER=0.1.4 BETA BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1147976642942214235 diff --git a/package.json b/package.json index 4c16d7a..650b239 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "card-drop", - "version": "0.1.7", + "version": "0.1.6", "main": "./dist/bot.js", "typings": "./dist", "scripts": { diff --git a/src/Functions/CardSetupFunction.ts b/src/Functions/CardSetupFunction.ts index 3fd705b..d3c6883 100644 --- a/src/Functions/CardSetupFunction.ts +++ b/src/Functions/CardSetupFunction.ts @@ -3,7 +3,7 @@ import CardDataSource from "../database/dataSources/cardDataSource"; import Card from "../database/entities/card/Card"; import Series from "../database/entities/card/Series"; import path from "path"; -import { CardRarity, CardRarityToString } from "../constants/CardRarity"; +import { CardRarity } from "../constants/CardRarity"; export default class CardSetupFunction { public async Execute() { @@ -49,47 +49,63 @@ export default class CardSetupFunction { const cardsToSave: Card[] = []; for (let series of loadedSeries) { - const cardDirBronze = this.GetCardFiles(CardRarity.Bronze, series); - const cardDirGold = this.GetCardFiles(CardRarity.Gold, series); - const cardDirLegendary = this.GetCardFiles(CardRarity.Legendary, series); - const cardDirSilver = this.GetCardFiles(CardRarity.Silver, series); - const cardDirManga = this.GetCardFiles(CardRarity.Manga, series); + const bronzeExists = existsSync(path.join(process.cwd(), 'cards', series.Path, 'BRONZE')); + const goldExists = existsSync(path.join(process.cwd(), 'cards', series.Path, 'GOLD')); + const legendaryExists = existsSync(path.join(process.cwd(), 'cards', series.Path, 'LEGENDARY')); + const silverExists = existsSync(path.join(process.cwd(), 'cards', series.Path, 'SILVER')); - cardsToSave.push( - ...this.GenerateCardData(cardDirBronze, CardRarity.Bronze, series), - ...this.GenerateCardData(cardDirGold, CardRarity.Gold, series), - ...this.GenerateCardData(cardDirLegendary, CardRarity.Legendary, series), - ...this.GenerateCardData(cardDirSilver, CardRarity.Silver, series), - ...this.GenerateCardData(cardDirManga, CardRarity.Manga, series) - ); + const cardDirBronze = bronzeExists ? readdirSync(path.join(process.cwd(), 'cards', series.Path, 'BRONZE')) : []; + const cardDirGold = goldExists ? readdirSync(path.join(process.cwd(), 'cards', series.Path, 'GOLD')) : []; + const cardDirLegendary = legendaryExists ? readdirSync(path.join(process.cwd(), 'cards', series.Path, 'LEGENDARY')) : []; + const cardDirSilver = silverExists ? readdirSync(path.join(process.cwd(), 'cards', series.Path, 'SILVER')) : []; + + for (let file of cardDirBronze.filter(x => !x.startsWith('.') && (x.endsWith('.png') || x.endsWith('.jpg') || x.endsWith('.gif')))) { + const filePart = file.split('.'); + + const cardId = filePart[0]; + const cardName = filePart[0]; + + const card = new Card(cardId, cardName, CardRarity.Bronze, path.join(path.join(process.cwd(), 'cards', series.Path, 'BRONZE', file)), file, series); + + cardsToSave.push(card); + } + + for (let file of cardDirGold.filter(x => !x.startsWith('.') && (x.endsWith('.png') || x.endsWith('.jpg') || x.endsWith('.gif')))) { + const filePart = file.split('.'); + + const cardId = filePart[0]; + const cardName = filePart[0]; + + const card = new Card(cardId, cardName, CardRarity.Gold, path.join(path.join(process.cwd(), 'cards', series.Path, 'GOLD', file)), file, series); + + cardsToSave.push(card); + } + + for (let file of cardDirLegendary.filter(x => !x.startsWith('.') && (x.endsWith('.png') || x.endsWith('.jpg') || x.endsWith('.gif')))) { + const filePart = file.split('.'); + + const cardId = filePart[0]; + const cardName = filePart[0]; + + const card = new Card(cardId, cardName, CardRarity.Legendary, path.join(path.join(process.cwd(), 'cards', series.Path, 'LEGENDARY', file)), file, series); + + cardsToSave.push(card); + } + + for (let file of cardDirSilver.filter(x => !x.startsWith('.') && (x.endsWith('.png') || x.endsWith('.jpg') || x.endsWith('.gif')))) { + const filePart = file.split('.'); + + const cardId = filePart[0]; + const cardName = filePart[0]; + + const card = new Card(cardId, cardName, CardRarity.Silver, path.join(path.join(process.cwd(), 'cards', series.Path, 'SILVER', file)), file, series); + + cardsToSave.push(card); + } } await cardRepository.save(cardsToSave); console.log(`Loaded ${cardsToSave.length} cards to database`); } - - private GenerateCardData(files: string[], rarity: CardRarity, series: Series): Card[] { - const result: Card[] = []; - - for (let file of files.filter(x => !x.startsWith('.') && (x.endsWith('.png') || x.endsWith('.jpg') || x.endsWith('.gif')))) { - const filePart = file.split('.'); - - const cardId = filePart[0]; - const cardName = filePart[0]; - - const card = new Card(cardId, cardName, rarity, path.join(process.cwd(), 'cards', series.Path, CardRarityToString(rarity).toUpperCase(), file), file, series); - - result.push(card); - } - - return result; - } - - private GetCardFiles(rarity: CardRarity, series: Series): string[] { - const folder = path.join(process.cwd(), 'cards', series.Path, CardRarityToString(rarity).toUpperCase()); - const folderExists = existsSync(folder); - - return folderExists ? readdirSync(folder) : []; - } } \ No newline at end of file diff --git a/src/constants/CardRarity.ts b/src/constants/CardRarity.ts index b4a1f9b..92a5141 100644 --- a/src/constants/CardRarity.ts +++ b/src/constants/CardRarity.ts @@ -1,18 +1,14 @@ import EmbedColours from "./EmbedColours"; export enum CardRarity { - Unknown, Bronze, Silver, Gold, - Manga, Legendary, } export function CardRarityToString(rarity: CardRarity): string { switch (rarity) { - case CardRarity.Unknown: - return "Unknown"; case CardRarity.Bronze: return "Bronze"; case CardRarity.Silver: @@ -21,15 +17,11 @@ export function CardRarityToString(rarity: CardRarity): string { return "Gold"; case CardRarity.Legendary: return "Legendary"; - case CardRarity.Manga: - return "Manga"; } } export function CardRarityToColour(rarity: CardRarity): number { switch (rarity) { - case CardRarity.Unknown: - return EmbedColours.Grey; case CardRarity.Bronze: return EmbedColours.BronzeCard; case CardRarity.Silver: @@ -38,7 +30,5 @@ export function CardRarityToColour(rarity: CardRarity): number { return EmbedColours.GoldCard; case CardRarity.Legendary: return EmbedColours.LegendaryCard; - case CardRarity.Manga: - return EmbedColours.MangaCard; } } \ No newline at end of file diff --git a/src/constants/CardRarityChances.ts b/src/constants/CardRarityChances.ts deleted file mode 100644 index 5f706bb..0000000 --- a/src/constants/CardRarityChances.ts +++ /dev/null @@ -1,7 +0,0 @@ -export default class CardRarityChances { - public static readonly Bronze = 62; - public static readonly Silver = 31; - public static readonly Gold = 4.4; - public static readonly Manga = 2; - // Legendary therefore = 0.6; -} \ No newline at end of file diff --git a/src/constants/EmbedColours.ts b/src/constants/EmbedColours.ts index 6094dbf..d889f5d 100644 --- a/src/constants/EmbedColours.ts +++ b/src/constants/EmbedColours.ts @@ -1,9 +1,7 @@ export default class EmbedColours { public static readonly Ok = 0x3050ba; - public static readonly Grey = 0xd3d3d3; public static readonly BronzeCard = 0xcd7f32; public static readonly SilverCard = 0xc0c0c0; public static readonly GoldCard = 0xffd700; public static readonly LegendaryCard = 0x50c878; - public static readonly MangaCard = 0xffffff; } \ No newline at end of file diff --git a/src/helpers/CardDropHelper.ts b/src/helpers/CardDropHelper.ts index 38819f2..d5d8743 100644 --- a/src/helpers/CardDropHelper.ts +++ b/src/helpers/CardDropHelper.ts @@ -1,5 +1,4 @@ import { CardRarity } from "../constants/CardRarity"; -import CardRarityChances from "../constants/CardRarityChances"; import Card from "../database/entities/card/Card"; import Series from "../database/entities/card/Series"; @@ -9,15 +8,13 @@ export default class CardDropHelper { let cardRarity: CardRarity; - const bronzeChance = CardRarityChances.Bronze; - const silverChance = bronzeChance + CardRarityChances.Silver; - const goldChance = silverChance + CardRarityChances.Gold; - const mangaChance = goldChance + CardRarityChances.Manga; + const bronzeChance = 62; + const silverChance = bronzeChance + 31; + const goldChance = silverChance + 6.4; if (randomRarity < bronzeChance) cardRarity = CardRarity.Bronze; else if (randomRarity < silverChance) cardRarity = CardRarity.Silver; else if (randomRarity < goldChance) cardRarity = CardRarity.Gold; - else if (randomRarity < mangaChance) cardRarity = CardRarity.Manga; else cardRarity = CardRarity.Legendary; const allSeries = await Series.FetchAll(Series, [ "Cards", "Cards.Series" ]);