External/card-drop
5
0
Fork 0
Code Issues 46 Pull requests 1 Projects 1 Releases 30 Packages Wiki Activity Actions

Move unclaimed logic to a common function

Browse source
This commit is contained in:
Ethan Lane 2025-01-24 18:04:14 +00:00
parent 1106585f58
commit f221a5dffe
6 changed files with 41 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/buttonEvents/Reroll.ts
View file

@ -40,7 +40,7 @@ export default class Reroll extends ButtonEvent {
return;
}
const randomCard = GetCardsHelper.GetRandomCard();
const randomCard = await GetCardsHelper.FetchCard(interaction.user.id);
if (!randomCard) {
await interaction.reply("Unable to fetch card, please try again.");

13
src/commands/drop.ts
View file

@ -10,9 +10,6 @@ import AppLogger from "../client/appLogger";
import User from "../database/entities/app/User";
import CardConstants from "../constants/CardConstants";
import ErrorMessages from "../constants/ErrorMessages";
import { DropResult } from "../contracts/SeriesMetadata";
import EffectHelper from "../helpers/EffectHelper";
import GetUnclaimedCardsHelper from "../helpers/DropHelpers/GetUnclaimedCardsHelper";
import GetCardsHelper from "../helpers/DropHelpers/GetCardsHelper";
import DropEmbedHelper from "../helpers/DropHelpers/DropEmbedHelper";
@ -51,15 +48,7 @@ export default class Drop extends Command {
return;
}
let randomCard: DropResult | undefined;
const hasChanceUpEffect = await EffectHelper.HasEffect(interaction.user.id, "unclaimed");
if (hasChanceUpEffect && Math.random() <= CardConstants.UnusedChanceUpChance) {
randomCard = await GetUnclaimedCardsHelper.GetRandomCardUnclaimed(interaction.user.id);
} else {
randomCard = GetCardsHelper.GetRandomCard();
}
const randomCard = await GetCardsHelper.FetchCard(interaction.user.id);
if (!randomCard) {
AppLogger.LogWarn("Commands/Drop", ErrorMessages.UnableToFetchCard);

13
src/helpers/DropHelpers/GetCardsHelper.ts
View file

@ -1,10 +1,23 @@
import AppLogger from "../../client/appLogger";
import { CoreClient } from "../../client/client";
import CardConstants from "../../constants/CardConstants";
import { CardRarity } from "../../constants/CardRarity";
import CardRarityChances from "../../constants/CardRarityChances";
import { DropResult } from "../../contracts/SeriesMetadata";
import EffectHelper from "../EffectHelper";
import GetUnclaimedCardsHelper from "./GetUnclaimedCardsHelper";
export default class GetCardsHelper {
public static async FetchCard(userId: string): Promise<DropResult | undefined> {
const hasChanceUpEffect = await EffectHelper.HasEffect(userId, "unclaimed");
if (hasChanceUpEffect && Math.random() <= CardConstants.UnusedChanceUpChance) {
return await GetUnclaimedCardsHelper.GetRandomCardUnclaimed(userId);
}
return this.GetRandomCard();
}
public static GetRandomCard(): DropResult | undefined {
const randomRarity = Math.random() * 100;

6
src/helpers/DropHelpers/GetUnclaimedCardsHelper.ts
View file

@ -25,14 +25,10 @@ export default class GetUnclaimedCardsHelper {
const randomCard = await this.GetRandomCardByRarityUnclaimed(cardRarity, userId);
AppLogger.LogSilly("CardDropHelperMetadata/GetRandomCardUnclaimed", `Random card: ${randomCard?.card.id} ${randomCard?.card.name}`);
return randomCard;
}
public static async GetRandomCardByRarityUnclaimed(rarity: CardRarity, userId: string): Promise<DropResult | undefined> {
AppLogger.LogSilly("CardDropHelperMetadata/GetRandomCardByRarityUnclaimed", `Parameters: rarity=${rarity}, userId=${userId}`);
const claimedCards = await Inventory.FetchAllByUserId(userId);
if (!claimedCards) {
@ -59,8 +55,6 @@ export default class GetUnclaimedCardsHelper {
return undefined;
}
AppLogger.LogSilly("CardDropHelperMetadata/GetRandomCardByRarityUnclaimed", `Random card: ${card.id} ${card.name}`);
return {
series: series,
card: card,