diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts index 2ab822e6..1cc12c5b 100644 --- a/src/services/inventoryService.ts +++ b/src/services/inventoryService.ts @@ -39,6 +39,7 @@ import { ExportArcanes, ExportCustoms, ExportFlavour, + ExportFusionBundles, ExportGear, ExportKeys, ExportRecipes, @@ -50,7 +51,7 @@ import { TStandingLimitBin } from "warframe-public-export-plus"; import { createShip } from "./shipService"; -import { creditBundles, fusionBundles } from "@/src/services/missionInventoryUpdateService"; +import { creditBundles } from "@/src/services/missionInventoryUpdateService"; import { IKeyChainRequest } from "@/src/controllers/api/giveKeyChainTriggeredItemsController"; import { toOid } from "../helpers/inventoryHelpers"; import { generateRewardSeed } from "@/src/controllers/api/getNewRewardSeedController"; @@ -313,8 +314,8 @@ export const addItem = async ( } }; } - if (typeName in fusionBundles) { - const fusionPointsTotal = fusionBundles[typeName] * quantity; + if (typeName in ExportFusionBundles) { + const fusionPointsTotal = ExportFusionBundles[typeName].fusionPoints * quantity; inventory.FusionPoints += fusionPointsTotal; return { InventoryChanges: { diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts index 766518e2..759bd4fd 100644 --- a/src/services/missionInventoryUpdateService.ts +++ b/src/services/missionInventoryUpdateService.ts @@ -1,4 +1,4 @@ -import { ExportRegions, ExportRewards, IReward } from "warframe-public-export-plus"; +import { ExportFusionBundles, ExportRegions, ExportRewards, IReward } from "warframe-public-export-plus"; import { IMissionInventoryUpdateRequest, IRewardInfo } from "../types/requestTypes"; import { logger } from "@/src/utils/logger"; import { IRngResult, getRandomReward } from "@/src/services/rngService"; @@ -65,12 +65,6 @@ export const creditBundles: Record = { "/Lotus/Types/StoreItems/CreditBundles/Zariman/TableACreditsUncommon": 30000 }; -export const fusionBundles: Record = { - "/Lotus/Upgrades/Mods/FusionBundles/CommonFusionBundle": 15, - "/Lotus/Upgrades/Mods/FusionBundles/UncommonFusionBundle": 50, - "/Lotus/Upgrades/Mods/FusionBundles/RareFusionBundle": 80 -}; - //type TMissionInventoryUpdateKeys = keyof IMissionInventoryUpdateRequest; //const ignoredInventoryUpdateKeys = ["FpsAvg", "FpsMax", "FpsMin", "FpsSamples"] satisfies TMissionInventoryUpdateKeys[]; // for keys with no meaning for this server //type TignoredInventoryUpdateKeys = (typeof ignoredInventoryUpdateKeys)[number]; @@ -163,7 +157,8 @@ export const addMissionInventoryUpdates = ( case "FusionBundles": { let fusionPoints = 0; for (const fusionBundle of value) { - const fusionPointsTotal = fusionBundles[fusionBundle.ItemType] * fusionBundle.ItemCount; + const fusionPointsTotal = + ExportFusionBundles[fusionBundle.ItemType].fusionPoints * fusionBundle.ItemCount; inventory.FusionPoints += fusionPointsTotal; fusionPoints += fusionPointsTotal; }