From 79c5f7a67a75034126499655f0015229242e06cf Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Thu, 14 Aug 2025 07:56:45 -0700 Subject: [PATCH] chore: fix cyclic include for slotPurchaseNameToSlotName (#2618) Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/2618 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com> --- src/helpers/purchaseHelpers.ts | 16 ++++++++++++++-- src/services/purchaseService.ts | 16 +--------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/helpers/purchaseHelpers.ts b/src/helpers/purchaseHelpers.ts index 3fbcaf52..0685f457 100644 --- a/src/helpers/purchaseHelpers.ts +++ b/src/helpers/purchaseHelpers.ts @@ -1,5 +1,17 @@ -import { slotPurchaseNameToSlotName } from "@/src/services/purchaseService"; -import { SlotPurchaseName } from "@/src/types/purchaseTypes"; +import { SlotPurchase, SlotPurchaseName } from "@/src/types/purchaseTypes"; + +export const slotPurchaseNameToSlotName: SlotPurchase = { + 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 } +}; export const isSlotPurchaseName = (slotPurchaseName: string): slotPurchaseName is SlotPurchaseName => { return slotPurchaseName in slotPurchaseNameToSlotName; diff --git a/src/services/purchaseService.ts b/src/services/purchaseService.ts index 8f9d8f3f..b0f5427e 100644 --- a/src/services/purchaseService.ts +++ b/src/services/purchaseService.ts @@ -1,4 +1,4 @@ -import { parseSlotPurchaseName } from "@/src/helpers/purchaseHelpers"; +import { parseSlotPurchaseName, slotPurchaseNameToSlotName } from "@/src/helpers/purchaseHelpers"; import { getSubstringFromKeyword } from "@/src/helpers/stringHelpers"; import { addBooster, @@ -14,7 +14,6 @@ import { IMiscItem } from "@/src/types/inventoryTypes/inventoryTypes"; import { IPurchaseRequest, IPurchaseResponse, - SlotPurchase, IInventoryChanges, PurchaseSource, IPurchaseParams @@ -472,19 +471,6 @@ export const handleStoreItemAcquisition = async ( return purchaseResponse; }; -export const slotPurchaseNameToSlotName: SlotPurchase = { - 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) // // new slot above base = extra + 1 and slots +1 // // new frame = slots -1