Fix suggested changes

src/buttonEvents/Sacrifice.ts

@@ -23,6 +23,7 @@ export default class Sacrifice extends ButtonEvent {
     private async confirm(interaction: ButtonInteraction) {
         const userId = interaction.customId.split(" ")[2];
         const cardNumber = interaction.customId.split(" ")[3];
+        const quantity = Number(interaction.customId.split(" ")[4]) || 1;
 
         if (userId != interaction.user.id) {
             await interaction.reply("Only the user who created this sacrifice can confirm it.");
@@ -31,11 +32,16 @@ export default class Sacrifice extends ButtonEvent {
 
         const cardInInventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber);
 
-        if (!cardInInventory) {
+        if (!cardInInventory || cardInInventory.Quantity == 0) {
             await interaction.reply("Unable to find card in inventory.");
             return;
         }
 
+        if (cardInInventory.Quantity < quantity) {
+            await interaction.reply("You can only sacrifice what you own.");
+            return;
+        }
+
         const cardData = CardDropHelperMetadata.GetCardByCardNumber(cardNumber);
 
         if (!cardData) {
@@ -50,11 +56,11 @@ export default class Sacrifice extends ButtonEvent {
             return;
         }
 
-        cardInInventory.RemoveQuantity(1);
+        cardInInventory.RemoveQuantity(quantity);
 
         await cardInInventory.Save(Inventory, cardInInventory);
 
-        const cardValue = GetSacrificeAmount(cardData.card.type);
+        const cardValue = GetSacrificeAmount(cardData.card.type) * quantity;
         const cardRarityString = CardRarityToString(cardData.card.type);
 
         user.AddCurrency(cardValue);
@@ -66,6 +72,7 @@ export default class Sacrifice extends ButtonEvent {
             `Series: ${cardData.series.name}`,
             `Rarity: ${cardRarityString}`,
             `Quantity Owned: ${cardInInventory.Quantity}`,
+            `Quantity To Sacrifice: ${quantity}`,
             `Sacrifice Amount: ${cardValue}`,
         ];
 
@@ -98,6 +105,7 @@ export default class Sacrifice extends ButtonEvent {
     private async cancel(interaction: ButtonInteraction) {
         const userId = interaction.customId.split(" ")[2];
         const cardNumber = interaction.customId.split(" ")[3];
+        const quantity = Number(interaction.customId.split(" ")[4]) || 1;
 
         if (userId != interaction.user.id) {
             await interaction.reply("Only the user who created this sacrifice can cancel it.");
@@ -106,11 +114,16 @@ export default class Sacrifice extends ButtonEvent {
 
         const cardInInventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber);
 
-        if (!cardInInventory) {
+        if (!cardInInventory || cardInInventory.Quantity == 0) {
             await interaction.reply("Unable to find card in inventory.");
             return;
         }
 
+        if (cardInInventory.Quantity < quantity) {
+            await interaction.reply("You can only sacrifice what you own.");
+            return;
+        }
+
         const cardData = CardDropHelperMetadata.GetCardByCardNumber(cardNumber);
 
         if (!cardData) {
@@ -118,7 +131,7 @@ export default class Sacrifice extends ButtonEvent {
             return;
         }
 
-        const cardValue = GetSacrificeAmount(cardData.card.type);
+        const cardValue = GetSacrificeAmount(cardData.card.type) * quantity;
         const cardRarityString = CardRarityToString(cardData.card.type);
 
         const description = [
@@ -126,6 +139,7 @@ export default class Sacrifice extends ButtonEvent {
             `Series: ${cardData.series.name}`,
             `Rarity: ${cardRarityString}`,
             `Quantity Owned: ${cardInInventory.Quantity}`,
+            `Quantity To Sacrifice: ${quantity}`,
             `Sacrifice Amount: ${cardValue}`,
         ];
 

src/commands/sacrifice.ts

@@ -16,11 +16,18 @@ export default class Sacrifice extends Command {
                 x
                     .setName("cardnumber")
                     .setDescription("The card to sacrifice from your inventory")
-                    .setRequired(true));
+                    .setRequired(true))
+            .addNumberOption(x =>
+                x
+                    .setName("quantity")
+                    .setDescription("The amount to sacrifice (default 1)"));
     }
 
     public override async execute(interaction: CommandInteraction<CacheType>): Promise<void> {
         const cardnumber = interaction.options.get("cardnumber", true);
+        const quantityInput = interaction.options.get("quantity")?.value ?? 1;
+
+        const quantity = Number(quantityInput) || 1;
 
         const cardInInventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, cardnumber.value! as string);
 
@@ -29,6 +36,11 @@ export default class Sacrifice extends Command {
             return;
         }
 
+        if (cardInInventory.Quantity < quantity) {
+            await interaction.reply(`You can only sacrifice what you own! You have ${cardInInventory.Quantity} of this card`);
+            return;
+        }
+
         const cardData = CardDropHelperMetadata.GetCardByCardNumber(cardnumber.value! as string);
 
         if (!cardData) {
@@ -36,7 +48,7 @@ export default class Sacrifice extends Command {
             return;
         }
 
-        const cardValue = GetSacrificeAmount(cardData.card.type);
+        const cardValue = GetSacrificeAmount(cardData.card.type) * quantity;
         const cardRarityString = CardRarityToString(cardData.card.type);
 
         const description = [
@@ -44,6 +56,7 @@ export default class Sacrifice extends Command {
             `Series: ${cardData.series.name}`,
             `Rarity: ${cardRarityString}`,
             `Quantity Owned: ${cardInInventory.Quantity}`,
+            `Quantity To Sacrifice: ${quantity}`,
             `Sacrifice Amount: ${cardValue}`,
         ];
 
@@ -56,11 +69,11 @@ export default class Sacrifice extends Command {
         const row = new ActionRowBuilder<ButtonBuilder>()
             .addComponents([
                 new ButtonBuilder()
-                    .setCustomId(`sacrifice confirm ${interaction.user.id} ${cardnumber.value!}`)
+                    .setCustomId(`sacrifice confirm ${interaction.user.id} ${cardnumber.value!} ${quantity}`)
                     .setLabel("Confirm")
                     .setStyle(ButtonStyle.Success),
                 new ButtonBuilder()
-                    .setCustomId(`sacrifice cancel ${interaction.user.id} ${cardnumber.value!}`)
+                    .setCustomId(`sacrifice cancel ${interaction.user.id} ${cardnumber.value!} ${quantity}`)
                     .setLabel("Cancel")
                     .setStyle(ButtonStyle.Secondary),
             ]);