From f98f15b06a9068cef734cbd0ff5bfb4bfea47e10 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Fri, 4 Apr 2025 18:56:13 +0100
Subject: [PATCH] Update drop mechanic to take currency on drop instead of
 claim

---
 src/buttonEvents/Claim.ts                  |  7 -------
 src/buttonEvents/Reroll.ts                 |  4 +++-
 src/commands/drop.ts                       |  4 +++-
 src/helpers/DropHelpers/DropEmbedHelper.ts | 14 +++++++++-----
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/buttonEvents/Claim.ts b/src/buttonEvents/Claim.ts
index 97ee54d..df377f3 100644
--- a/src/buttonEvents/Claim.ts
+++ b/src/buttonEvents/Claim.ts
@@ -36,11 +36,6 @@ export default class Claim extends ButtonEvent {
 
         AppLogger.LogSilly("Button/Claim", `${user.Id} has ${user.Currency} currency`);
 
-        if (!user.RemoveCurrency(CardConstants.ClaimCost)) {
-            await interaction.channel.send(`${interaction.user}, Not enough currency! You need ${CardConstants.ClaimCost} currency, you have ${user.Currency}!`);
-            return;
-        }
-
         const claimed = await eClaim.FetchOneByClaimId(claimId);
 
         if (claimed) {
@@ -53,8 +48,6 @@ export default class Claim extends ButtonEvent {
             return;
         }
 
-        await user.Save(User, user);
-
         let inventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber);
 
         if (!inventory) {
diff --git a/src/buttonEvents/Reroll.ts b/src/buttonEvents/Reroll.ts
index e25e474..b1ac12c 100644
--- a/src/buttonEvents/Reroll.ts
+++ b/src/buttonEvents/Reroll.ts
@@ -35,11 +35,13 @@ export default class Reroll extends ButtonEvent {
             AppLogger.LogInfo("Commands/Drop", `New user (${interaction.user.id}) saved to the database`);
         }
 
-        if (user.Currency < CardConstants.ClaimCost) {
+        if (!user.RemoveCurrency(CardConstants.ClaimCost)) {
             await interaction.reply(`Not enough currency! You need ${CardConstants.ClaimCost} currency, you have ${user.Currency}!`);
             return;
         }
 
+        await user.Save(User, user);
+
         const randomCard = await GetCardsHelper.FetchCard(interaction.user.id);
 
         if (!randomCard) {
diff --git a/src/commands/drop.ts b/src/commands/drop.ts
index 6c93af6..57a2123 100644
--- a/src/commands/drop.ts
+++ b/src/commands/drop.ts
@@ -43,11 +43,13 @@ export default class Drop extends Command {
             AppLogger.LogInfo("Commands/Drop", `New user (${interaction.user.id}) saved to the database`);
         }
 
-        if (user.Currency < CardConstants.ClaimCost) {
+        if (!user.RemoveCurrency(CardConstants.ClaimCost)) {
             await interaction.reply(ErrorMessages.NotEnoughCurrency(CardConstants.ClaimCost, user.Currency));
             return;
         }
 
+        await user.Save(User, user);
+
         const randomCard = await GetCardsHelper.FetchCard(interaction.user.id);
 
         if (!randomCard) {
diff --git a/src/helpers/DropHelpers/DropEmbedHelper.ts b/src/helpers/DropHelpers/DropEmbedHelper.ts
index c739de7..a50d2e9 100644
--- a/src/helpers/DropHelpers/DropEmbedHelper.ts
+++ b/src/helpers/DropHelpers/DropEmbedHelper.ts
@@ -1,7 +1,7 @@
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js";
 import { DropResult } from "../../contracts/SeriesMetadata";
 import AppLogger from "../../client/appLogger";
-import { CardRarityToColour, CardRarityToString } from "../../constants/CardRarity";
+import { CardRarityToColour, CardRarityToString, GetSacrificeAmount } from "../../constants/CardRarity";
 import StringTools from "../StringTools";
 import CardConstants from "../../constants/CardConstants";
 
@@ -74,12 +74,16 @@ export default class DropEmbedHelper {
             .addComponents(
                 new ButtonBuilder()
                     .setCustomId(`claim ${drop.card.id} ${claimId} ${userId}`)
-                    .setLabel(`Claim (${CardConstants.ClaimCost} 🪙)`)
-                    .setStyle(ButtonStyle.Primary)
+                    .setLabel("Claim")
+                    .setStyle(ButtonStyle.Success)
                     .setDisabled(disabled),
+                new ButtonBuilder()
+                    .setCustomId(`sacrifice confirm ${userId} ${drop.card.id} 1`)
+                    .setLabel(`Sacrifice`)
+                    .setStyle(ButtonStyle.Danger),
                 new ButtonBuilder()
                     .setCustomId("reroll")
-                    .setLabel("Reroll")
-                    .setStyle(ButtonStyle.Secondary));
+                    .setEmoji("🔁")
+                    .setStyle(ButtonStyle.Primary),);
     }
 }
\ No newline at end of file