From 4e0494f15d223b52bcc97ae80a43d9b7e3948d45 Mon Sep 17 00:00:00 2001
From: Sainan <sainan@calamity.inc>
Date: Tue, 11 Mar 2025 10:32:44 -0700
Subject: [PATCH] fix: ignore purchaseQuantity when getting slots via a bundle
 (#1151)

Fixes #1149

Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/1151
---
 src/services/purchaseService.ts | 35 +++++++++++++++++++--------------
 src/types/purchaseTypes.ts      |  2 +-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/services/purchaseService.ts b/src/services/purchaseService.ts
index b153c86c8..19e683fe8 100644
--- a/src/services/purchaseService.ts
+++ b/src/services/purchaseService.ts
@@ -256,7 +256,7 @@ export const handleStoreItemAcquisition = async (
                 break;
             }
             case "Types":
-                purchaseResponse = await handleTypesPurchase(internalName, inventory, quantity);
+                purchaseResponse = await handleTypesPurchase(internalName, inventory, quantity, ignorePurchaseQuantity);
                 break;
             case "Boosters":
                 purchaseResponse = handleBoostersPurchase(storeItemName, inventory, durability);
@@ -267,16 +267,16 @@ export const handleStoreItemAcquisition = async (
 };
 
 export const slotPurchaseNameToSlotName: SlotPurchase = {
-    SuitSlotItem: { name: "SuitBin", slotsPerPurchase: 1 },
-    TwoSentinelSlotItem: { name: "SentinelBin", slotsPerPurchase: 2 },
-    TwoWeaponSlotItem: { name: "WeaponBin", slotsPerPurchase: 2 },
-    SpaceSuitSlotItem: { name: "SpaceSuitBin", slotsPerPurchase: 1 },
-    TwoSpaceWeaponSlotItem: { name: "SpaceWeaponBin", slotsPerPurchase: 2 },
-    MechSlotItem: { name: "MechBin", slotsPerPurchase: 1 },
-    TwoOperatorWeaponSlotItem: { name: "OperatorAmpBin", slotsPerPurchase: 2 },
-    RandomModSlotItem: { name: "RandomModBin", slotsPerPurchase: 3 },
-    TwoCrewShipSalvageSlotItem: { name: "CrewShipSalvageBin", slotsPerPurchase: 2 },
-    CrewMemberSlotItem: { name: "CrewMemberBin", slotsPerPurchase: 1 }
+    SuitSlotItem: { name: "SuitBin", purchaseQuantity: 1 },
+    TwoSentinelSlotItem: { name: "SentinelBin", purchaseQuantity: 2 },
+    TwoWeaponSlotItem: { name: "WeaponBin", purchaseQuantity: 2 },
+    SpaceSuitSlotItem: { name: "SpaceSuitBin", purchaseQuantity: 1 },
+    TwoSpaceWeaponSlotItem: { name: "SpaceWeaponBin", purchaseQuantity: 2 },
+    MechSlotItem: { name: "MechBin", purchaseQuantity: 1 },
+    TwoOperatorWeaponSlotItem: { name: "OperatorAmpBin", purchaseQuantity: 2 },
+    RandomModSlotItem: { name: "RandomModBin", purchaseQuantity: 3 },
+    TwoCrewShipSalvageSlotItem: { name: "CrewShipSalvageBin", purchaseQuantity: 2 },
+    CrewMemberSlotItem: { name: "CrewMemberBin", purchaseQuantity: 1 }
 };
 
 // // extra = everything above the base +2 slots (depending on slot type)
@@ -286,7 +286,8 @@ export const slotPurchaseNameToSlotName: SlotPurchase = {
 const handleSlotPurchase = (
     slotPurchaseNameFull: string,
     inventory: TInventoryDatabaseDocument,
-    quantity: number
+    quantity: number,
+    ignorePurchaseQuantity: boolean
 ): IPurchaseResponse => {
     logger.debug(`slot name ${slotPurchaseNameFull}`);
     const slotPurchaseName = parseSlotPurchaseName(
@@ -295,7 +296,10 @@ const handleSlotPurchase = (
     logger.debug(`slot purchase name ${slotPurchaseName}`);
 
     const slotName = slotPurchaseNameToSlotName[slotPurchaseName].name;
-    const slotsPurchased = slotPurchaseNameToSlotName[slotPurchaseName].slotsPerPurchase * quantity;
+    let slotsPurchased = quantity;
+    if (!ignorePurchaseQuantity) {
+        slotsPurchased *= slotPurchaseNameToSlotName[slotPurchaseName].purchaseQuantity;
+    }
 
     updateSlots(inventory, slotName, slotsPurchased, slotsPurchased);
 
@@ -360,7 +364,8 @@ const handleCreditBundlePurchase = async (
 const handleTypesPurchase = async (
     typesName: string,
     inventory: TInventoryDatabaseDocument,
-    quantity: number
+    quantity: number,
+    ignorePurchaseQuantity: boolean
 ): Promise<IPurchaseResponse> => {
     const typeCategory = getStoreItemTypesCategory(typesName);
     logger.debug(`type category ${typeCategory}`);
@@ -370,7 +375,7 @@ const handleTypesPurchase = async (
         case "BoosterPacks":
             return handleBoosterPackPurchase(typesName, inventory, quantity);
         case "SlotItems":
-            return handleSlotPurchase(typesName, inventory, quantity);
+            return handleSlotPurchase(typesName, inventory, quantity, ignorePurchaseQuantity);
         case "CreditBundles":
             return handleCreditBundlePurchase(typesName, inventory);
     }
diff --git a/src/types/purchaseTypes.ts b/src/types/purchaseTypes.ts
index a280787f4..d14f39f5c 100644
--- a/src/types/purchaseTypes.ts
+++ b/src/types/purchaseTypes.ts
@@ -105,5 +105,5 @@ export const slotNames = [
 export type SlotNames = (typeof slotNames)[number];
 
 export type SlotPurchase = {
-    [P in SlotPurchaseName]: { name: SlotNames; slotsPerPurchase: number };
+    [P in SlotPurchaseName]: { name: SlotNames; purchaseQuantity: number };
 };