OpenWF/SpaceNinjaServer
28
29
Fork 35
Code Issues 23 Pull Requests 1 Actions Packages Projects Releases Activity

fix: endo pickups #359

Merged
Sainan merged 3 commits from fix-endo into main 2024-06-22 08:56:36 -07:00
Conversation 0 Commits 3 Files Changed 3 +4 -6
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 143b53947a - Show all commits

2
src/controllers/api/missionInventoryUpdateController.ts
View File

@ -66,7 +66,7 @@ const missionInventoryUpdateController: RequestHandler = async (req, res): Promi
TotalCredits, TotalCredits,
CreditsBonus, CreditsBonus,
MissionCredits, MissionCredits,
...(FusionPoints !== undefined && { FusionPoints }) FusionPoints
}); });
} catch (err) { } catch (err) {
console.error("Error parsing JSON data:", err); console.error("Error parsing JSON data:", err);

6
src/services/missionInventoryUpdateService.ts
View File

@ -54,12 +54,10 @@ const combineRewardAndLootInventory = (
const missionCredits = lootInventory.RegularCredits || 0; const missionCredits = lootInventory.RegularCredits || 0;
const creditsBonus = rewardInventory.RegularCredits || 0; const creditsBonus = rewardInventory.RegularCredits || 0;
const totalCredits = missionCredits + creditsBonus; const totalCredits = missionCredits + creditsBonus;
const FusionPoints = (lootInventory.FusionPoints || 0) + (rewardInventory.FusionPoints || 0) || undefined; const FusionPoints = (lootInventory.FusionPoints || 0) + (rewardInventory.FusionPoints || 0);
lootInventory.RegularCredits = totalCredits; lootInventory.RegularCredits = totalCredits;
if (FusionPoints) {
lootInventory.FusionPoints = FusionPoints; lootInventory.FusionPoints = FusionPoints;
}
inventoryFields.forEach((field: IInventoryFieldType) => { inventoryFields.forEach((field: IInventoryFieldType) => {
if (rewardInventory[field] && !lootInventory[field]) { if (rewardInventory[field] && !lootInventory[field]) {
lootInventory[field] = []; lootInventory[field] = [];
@ -72,7 +70,7 @@ const combineRewardAndLootInventory = (
TotalCredits: [totalCredits, totalCredits], TotalCredits: [totalCredits, totalCredits],
CreditsBonus: [creditsBonus, creditsBonus], CreditsBonus: [creditsBonus, creditsBonus],
MissionCredits: [missionCredits, missionCredits], MissionCredits: [missionCredits, missionCredits],
...(FusionPoints !== undefined && { FusionPoints }) FusionPoints: FusionPoints
}; };
}; };