chore: replace fusionBundles map with ExportFusionBundles (#994)
Reviewed-on: OpenWF/SpaceNinjaServer#994 Co-authored-by: Sainan <sainan@calamity.inc> Co-committed-by: Sainan <sainan@calamity.inc>
This commit is contained in:
		
							parent
							
								
									e1af6bd598
								
							
						
					
					
						commit
						3c2d194302
					
				@ -39,6 +39,7 @@ import {
 | 
				
			|||||||
    ExportArcanes,
 | 
					    ExportArcanes,
 | 
				
			||||||
    ExportCustoms,
 | 
					    ExportCustoms,
 | 
				
			||||||
    ExportFlavour,
 | 
					    ExportFlavour,
 | 
				
			||||||
 | 
					    ExportFusionBundles,
 | 
				
			||||||
    ExportGear,
 | 
					    ExportGear,
 | 
				
			||||||
    ExportKeys,
 | 
					    ExportKeys,
 | 
				
			||||||
    ExportRecipes,
 | 
					    ExportRecipes,
 | 
				
			||||||
@ -50,7 +51,7 @@ import {
 | 
				
			|||||||
    TStandingLimitBin
 | 
					    TStandingLimitBin
 | 
				
			||||||
} from "warframe-public-export-plus";
 | 
					} from "warframe-public-export-plus";
 | 
				
			||||||
import { createShip } from "./shipService";
 | 
					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 { IKeyChainRequest } from "@/src/controllers/api/giveKeyChainTriggeredItemsController";
 | 
				
			||||||
import { toOid } from "../helpers/inventoryHelpers";
 | 
					import { toOid } from "../helpers/inventoryHelpers";
 | 
				
			||||||
import { generateRewardSeed } from "@/src/controllers/api/getNewRewardSeedController";
 | 
					import { generateRewardSeed } from "@/src/controllers/api/getNewRewardSeedController";
 | 
				
			||||||
@ -313,8 +314,8 @@ export const addItem = async (
 | 
				
			|||||||
            }
 | 
					            }
 | 
				
			||||||
        };
 | 
					        };
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    if (typeName in fusionBundles) {
 | 
					    if (typeName in ExportFusionBundles) {
 | 
				
			||||||
        const fusionPointsTotal = fusionBundles[typeName] * quantity;
 | 
					        const fusionPointsTotal = ExportFusionBundles[typeName].fusionPoints * quantity;
 | 
				
			||||||
        inventory.FusionPoints += fusionPointsTotal;
 | 
					        inventory.FusionPoints += fusionPointsTotal;
 | 
				
			||||||
        return {
 | 
					        return {
 | 
				
			||||||
            InventoryChanges: {
 | 
					            InventoryChanges: {
 | 
				
			||||||
 | 
				
			|||||||
@ -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 { IMissionInventoryUpdateRequest, IRewardInfo } from "../types/requestTypes";
 | 
				
			||||||
import { logger } from "@/src/utils/logger";
 | 
					import { logger } from "@/src/utils/logger";
 | 
				
			||||||
import { IRngResult, getRandomReward } from "@/src/services/rngService";
 | 
					import { IRngResult, getRandomReward } from "@/src/services/rngService";
 | 
				
			||||||
@ -67,12 +67,6 @@ export const creditBundles: Record<string, number> = {
 | 
				
			|||||||
    "/Lotus/Types/StoreItems/CreditBundles/CreditBundleC": 175000
 | 
					    "/Lotus/Types/StoreItems/CreditBundles/CreditBundleC": 175000
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export const fusionBundles: Record<string, number> = {
 | 
					 | 
				
			||||||
    "/Lotus/Upgrades/Mods/FusionBundles/CommonFusionBundle": 15,
 | 
					 | 
				
			||||||
    "/Lotus/Upgrades/Mods/FusionBundles/UncommonFusionBundle": 50,
 | 
					 | 
				
			||||||
    "/Lotus/Upgrades/Mods/FusionBundles/RareFusionBundle": 80
 | 
					 | 
				
			||||||
};
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
//type TMissionInventoryUpdateKeys = keyof IMissionInventoryUpdateRequest;
 | 
					//type TMissionInventoryUpdateKeys = keyof IMissionInventoryUpdateRequest;
 | 
				
			||||||
//const ignoredInventoryUpdateKeys = ["FpsAvg", "FpsMax", "FpsMin", "FpsSamples"] satisfies TMissionInventoryUpdateKeys[]; // for keys with no meaning for this server
 | 
					//const ignoredInventoryUpdateKeys = ["FpsAvg", "FpsMax", "FpsMin", "FpsSamples"] satisfies TMissionInventoryUpdateKeys[]; // for keys with no meaning for this server
 | 
				
			||||||
//type TignoredInventoryUpdateKeys = (typeof ignoredInventoryUpdateKeys)[number];
 | 
					//type TignoredInventoryUpdateKeys = (typeof ignoredInventoryUpdateKeys)[number];
 | 
				
			||||||
@ -165,7 +159,8 @@ export const addMissionInventoryUpdates = (
 | 
				
			|||||||
            case "FusionBundles": {
 | 
					            case "FusionBundles": {
 | 
				
			||||||
                let fusionPoints = 0;
 | 
					                let fusionPoints = 0;
 | 
				
			||||||
                for (const fusionBundle of value) {
 | 
					                for (const fusionBundle of value) {
 | 
				
			||||||
                    const fusionPointsTotal = fusionBundles[fusionBundle.ItemType] * fusionBundle.ItemCount;
 | 
					                    const fusionPointsTotal =
 | 
				
			||||||
 | 
					                        ExportFusionBundles[fusionBundle.ItemType].fusionPoints * fusionBundle.ItemCount;
 | 
				
			||||||
                    inventory.FusionPoints += fusionPointsTotal;
 | 
					                    inventory.FusionPoints += fusionPointsTotal;
 | 
				
			||||||
                    fusionPoints += fusionPointsTotal;
 | 
					                    fusionPoints += fusionPointsTotal;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user