diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts index 0b9a16ba..53a75e9c 100644 --- a/src/services/missionInventoryUpdateService.ts +++ b/src/services/missionInventoryUpdateService.ts @@ -252,9 +252,7 @@ export const addMissionRewards = async ( } //TODO: check double reward merging - const MissionRewards = getRandomMissionDrops(rewardInfo).map(drop => { - return { StoreItem: drop.type, ItemCount: drop.itemCount }; - }); + const MissionRewards: IMissionReward[] = getRandomMissionDrops(rewardInfo); logger.debug("random mission drops:", MissionRewards); const inventoryChanges: IInventoryChanges = {}; @@ -389,8 +387,8 @@ function getLevelCreditRewards(nodeName: string): number { //TODO: get dark sektor fixed credit rewards and railjack bonus } -function getRandomMissionDrops(RewardInfo: IRewardInfo): IRngResult[] { - const drops: IRngResult[] = []; +function getRandomMissionDrops(RewardInfo: IRewardInfo): IMissionReward[] { + const drops: IMissionReward[] = []; if (RewardInfo.node in ExportRegions) { const region = ExportRegions[RewardInfo.node]; const rewardManifests = region.rewardManifests; @@ -412,7 +410,7 @@ function getRandomMissionDrops(RewardInfo: IRewardInfo): IRngResult[] { const rotationRewards = table[rotation]; const drop = getRandomRewardByChance(rotationRewards); if (drop) { - drops.push(drop); + drops.push({ StoreItem: drop.type, ItemCount: drop.itemCount }); } } }); @@ -422,7 +420,7 @@ function getRandomMissionDrops(RewardInfo: IRewardInfo): IRngResult[] { for (let rotation = 0; rotation != RewardInfo.EnemyCachesFound; ++rotation) { const drop = getRandomRewardByChance(deck[rotation]); if (drop) { - drops.push(drop); + drops.push({ StoreItem: drop.type, ItemCount: drop.itemCount, FromEnemyCache: true }); } } } @@ -441,7 +439,7 @@ function getRandomMissionDrops(RewardInfo: IRewardInfo): IRngResult[] { const drop = getRandomRewardByChance(deck[rotation]); if (drop) { - drops.push(drop); + drops.push({ StoreItem: drop.type, ItemCount: drop.itemCount }); } } } diff --git a/src/types/missionTypes.ts b/src/types/missionTypes.ts index 8e79e8d8..c8cab373 100644 --- a/src/types/missionTypes.ts +++ b/src/types/missionTypes.ts @@ -8,4 +8,6 @@ export interface IMissionReward { ItemCount: number; TweetText?: string; ProductCategory?: string; + FromEnemyCache?: boolean; + IsStrippedItem?: boolean; }