package-lock.json

@@ -18,7 +18,7 @@
         "morgan": "^1.10.0",
         "ncp": "^2.0.0",
         "typescript": "^5.5",
-        "warframe-public-export-plus": "^0.5.66",
+        "warframe-public-export-plus": "^0.5.65",
         "warframe-riven-info": "^0.1.2",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"
@@ -3814,9 +3814,9 @@
       }
     },
     "node_modules/warframe-public-export-plus": {
-      "version": "0.5.66",
+      "version": "0.5.65",
-      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.66.tgz",
+      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.65.tgz",
-      "integrity": "sha512-AU7XQA96OfYrLm2RioCwDjjdI3IrsmUiqebXyE+bpM0iST+4x/NHu8LTRT4Oygfo/2OBtDYhib7G6re0EeAe5g=="
+      "integrity": "sha512-y/HN61lE5g8gx0Giutdl/jzQnQmw1u2uI0BiwKVW341nf42sKWQPsKsCVTL5x9MIDYyRCbFsMU+PazKC7byMdg=="
     },
     "node_modules/warframe-riven-info": {
       "version": "0.1.2",

package.json

@@ -25,7 +25,7 @@
     "morgan": "^1.10.0",
     "ncp": "^2.0.0",
     "typescript": "^5.5",
-    "warframe-public-export-plus": "^0.5.66",
+    "warframe-public-export-plus": "^0.5.65",
     "warframe-riven-info": "^0.1.2",
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0"

src/controllers/api/syndicateSacrificeController.ts

@@ -3,7 +3,7 @@ import { RequestHandler } from "express";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { ExportSyndicates, ISyndicateSacrifice } from "warframe-public-export-plus";
 import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
-import { addMiscItem, combineInventoryChanges, getInventory, updateCurrency } from "@/src/services/inventoryService";
+import { addMiscItems, combineInventoryChanges, getInventory, updateCurrency } from "@/src/services/inventoryService";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
 import { toStoreItem } from "@/src/services/itemDataService";
 import { logger } from "@/src/utils/logger";
@@ -18,83 +18,80 @@ export const syndicateSacrificeController: RequestHandler = async (request, resp
         syndicate = inventory.Affiliations[inventory.Affiliations.push({ Tag: data.AffiliationTag, Standing: 0 }) - 1];
     }
 
-    const oldLevel = syndicate.Title ?? 0;
+    const level = data.SacrificeLevel - (syndicate.Title ?? 0);
-    const levelIncrease = data.SacrificeLevel - oldLevel;
-    if (levelIncrease < 1) {
-        throw new Error(`syndicate sacrifice needs an increase of at least 1`);
-    }
-    if (levelIncrease > 1 && !data.AllowMultiple) {
-        throw new Error(`desired syndicate level is an increase of ${levelIncrease}, max. allowed increase is 1`);
-    }
-
     const res: ISyndicateSacrificeResponse = {
         AffiliationTag: data.AffiliationTag,
         InventoryChanges: {},
         Level: data.SacrificeLevel,
-        LevelIncrease: levelIncrease,
+        LevelIncrease: level <= 0 ? 1 : level,
         NewEpisodeReward: false
     };
 
-    // Process sacrifices and rewards for every level we're reaching
     const manifest = ExportSyndicates[data.AffiliationTag];
-    for (let level = oldLevel + 1; level <= data.SacrificeLevel; ++level) {
+    let sacrifice: ISyndicateSacrifice | undefined;
-        let sacrifice: ISyndicateSacrifice | undefined;
+    let reward: string | undefined;
-        if (level == 0) {
+    if (data.SacrificeLevel == 0) {
-            sacrifice = manifest.initiationSacrifice;
+        sacrifice = manifest.initiationSacrifice;
-            if (manifest.initiationReward) {
+        reward = manifest.initiationReward;
-                combineInventoryChanges(
+        syndicate.Initiated = true;
-                    res.InventoryChanges,
+    } else {
-                    (await handleStoreItemAcquisition(manifest.initiationReward, inventory)).InventoryChanges
+        sacrifice = manifest.titles?.find(x => x.level == data.SacrificeLevel)?.sacrifice;
-                );
+    }
+
+    if (sacrifice) {
+        res.InventoryChanges = { ...updateCurrency(inventory, sacrifice.credits, false) };
+
+        const miscItemChanges = sacrifice.items.map(x => ({
+            ItemType: x.ItemType,
+            ItemCount: x.ItemCount * -1
+        }));
+        addMiscItems(inventory, miscItemChanges);
+        res.InventoryChanges.MiscItems = miscItemChanges;
+    }
+
+    syndicate.Title ??= 0;
+    syndicate.Title += 1;
+
+    if (reward) {
+        combineInventoryChanges(
+            res.InventoryChanges,
+            (await handleStoreItemAcquisition(reward, inventory)).InventoryChanges
+        );
+    }
+
+    // Quacks like a nightwave syndicate?
+    if (manifest.dailyChallenges) {
+        const title = manifest.titles!.find(x => x.level == syndicate.Title);
+        if (title) {
+            res.NewEpisodeReward = true;
+            let rewardType: string;
+            let rewardCount: number;
+            if (title.storeItemReward) {
+                rewardType = title.storeItemReward;
+                rewardCount = 1;
+            } else {
+                rewardType = toStoreItem(title.reward!.ItemType);
+                rewardCount = title.reward!.ItemCount;
             }
-            syndicate.Initiated = true;
+            const rewardInventoryChanges = (await handleStoreItemAcquisition(rewardType, inventory, rewardCount))
-        } else {
+                .InventoryChanges;
-            sacrifice = manifest.titles?.find(x => x.level == level)?.sacrifice;
+            if (Object.keys(rewardInventoryChanges).length == 0) {
+                logger.debug(`nightwave rank up reward did not seem to get added, giving 50 creds instead`);
+                const nightwaveCredsItemType = manifest.titles![0].reward!.ItemType;
+                rewardInventoryChanges.MiscItems = [{ ItemType: nightwaveCredsItemType, ItemCount: 50 }];
+                addMiscItems(inventory, rewardInventoryChanges.MiscItems);
+            }
+            combineInventoryChanges(res.InventoryChanges, rewardInventoryChanges);
         }
-
+    } else {
-        if (sacrifice) {
+        if (syndicate.Title > 0 && manifest.favours.find(x => x.rankUpReward && x.requiredLevel == syndicate.Title)) {
-            updateCurrency(inventory, sacrifice.credits, false, res.InventoryChanges);
+            syndicate.FreeFavorsEarned ??= [];
-
+            if (!syndicate.FreeFavorsEarned.includes(syndicate.Title)) {
-            for (const item of sacrifice.items) {
+                syndicate.FreeFavorsEarned.push(syndicate.Title);
-                addMiscItem(inventory, item.ItemType, item.ItemCount * -1, res.InventoryChanges);
-            }
-        }
-
-        // Quacks like a nightwave syndicate?
-        if (manifest.dailyChallenges) {
-            const title = manifest.titles!.find(x => x.level == level);
-            if (title) {
-                res.NewEpisodeReward = true;
-                let rewardType: string;
-                let rewardCount: number;
-                if (title.storeItemReward) {
-                    rewardType = title.storeItemReward;
-                    rewardCount = 1;
-                } else {
-                    rewardType = toStoreItem(title.reward!.ItemType);
-                    rewardCount = title.reward!.ItemCount;
-                }
-                const rewardInventoryChanges = (await handleStoreItemAcquisition(rewardType, inventory, rewardCount))
-                    .InventoryChanges;
-                if (Object.keys(rewardInventoryChanges).length == 0) {
-                    logger.debug(`nightwave rank up reward did not seem to get added, giving 50 creds instead`);
-                    const nightwaveCredsItemType = manifest.titles![0].reward!.ItemType;
-                    addMiscItem(inventory, nightwaveCredsItemType, 50, rewardInventoryChanges);
-                }
-                combineInventoryChanges(res.InventoryChanges, rewardInventoryChanges);
-            }
-        } else {
-            if (level > 0 && manifest.favours.find(x => x.rankUpReward && x.requiredLevel == level)) {
-                syndicate.FreeFavorsEarned ??= [];
-                if (!syndicate.FreeFavorsEarned.includes(level)) {
-                    syndicate.FreeFavorsEarned.push(level);
-                }
             }
         }
     }
 
-    // Commit
-    syndicate.Title = data.SacrificeLevel;
     await inventory.save();
 
     response.json(res);

src/controllers/api/trainingResultController.ts

@@ -35,17 +35,6 @@ const trainingResultController: RequestHandler = async (req, res): Promise<void>
         inventory.PlayerLevel += 1;
         inventory.TradesRemaining += 1;
 
-        if (inventory.PlayerLevel == 2) {
-            await createMessage(accountId, [
-                {
-                    sndr: "/Lotus/Language/Game/Maroo",
-                    msg: "/Lotus/Language/Clan/MarooClanSearchDesc",
-                    sub: "/Lotus/Language/Clan/MarooClanSearchTitle",
-                    icon: "/Lotus/Interface/Icons/Npcs/Maroo.png"
-                }
-            ]);
-        }
-
         await createMessage(accountId, [
             {
                 sndr: "/Lotus/Language/Menu/Mailbox_WarframeSender",