handle KeyToRemove in EOM upload

package-lock.json

@@ -18,7 +18,7 @@
         "morgan": "^1.10.0",
         "ncp": "^2.0.0",
         "typescript": ">=5.5 <5.6.0",
-        "warframe-public-export-plus": "^0.5.52",
+        "warframe-public-export-plus": "^0.5.50",
         "warframe-riven-info": "^0.1.2",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"
@@ -3789,9 +3789,9 @@
       }
     },
     "node_modules/warframe-public-export-plus": {
-      "version": "0.5.52",
-      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.52.tgz",
-      "integrity": "sha512-mJyQbTFMDwgBSkhUYJzcfJg9qrMTrL1pyZuAxV/Dov68xUikK5zigQSYM3ZkKYbhwBtg0Bx/+7q9GAmPzGaRhA=="
+      "version": "0.5.50",
+      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.50.tgz",
+      "integrity": "sha512-KlhdY/Q5sRAIn/RhmdviKBoX3gk+Jtuen0cWnFB2zqK7eKYMDtd79bKOtTPtnK9zCNzh6gFug2wEeDVam3Bwlw=="
     },
     "node_modules/warframe-riven-info": {
       "version": "0.1.2",

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "start": "node --import ./build/src/pathman.js build/src/index.js",
     "dev": "ts-node-dev --openssl-legacy-provider -r tsconfig-paths/register src/index.ts ",
-    "build": "tsc --incremental --sourceMap && ncp static/webui build/static/webui",
+    "build": "tsc --incremental && ncp static/webui build/static/webui",
     "verify": "tsgo --noEmit",
     "lint": "eslint --ext .ts .",
     "lint:fix": "eslint --fix --ext .ts .",
@@ -24,7 +24,7 @@
     "morgan": "^1.10.0",
     "ncp": "^2.0.0",
     "typescript": ">=5.5 <5.6.0",
-    "warframe-public-export-plus": "^0.5.52",
+    "warframe-public-export-plus": "^0.5.50",
     "warframe-riven-info": "^0.1.2",
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0"

src/controllers/api/placeDecoInComponentController.ts

@@ -77,8 +77,8 @@ export const placeDecoInComponentController: RequestHandler = async (req, res) =
                     }
                 }
                 if (enoughMiscItems) {
-                    guild.VaultRegularCredits -= scaleRequiredCount(guild.Tier, meta.price);
-                    deco.RegularCredits = scaleRequiredCount(guild.Tier, meta.price);
+                    guild.VaultRegularCredits -= meta.price;
+                    deco.RegularCredits = meta.price;
 
                     deco.MiscItems = [];
                     for (const ingredient of meta.ingredients) {

src/controllers/api/trainingResultController.ts

@@ -23,7 +23,7 @@ const trainingResultController: RequestHandler = async (req, res): Promise<void>
 
     const trainingResults = getJSONfromString<ITrainingResultsRequest>(String(req.body));
 
-    const inventory = await getInventory(accountId, "TrainingDate PlayerLevel TradesRemaining");
+    const inventory = await getInventory(accountId);
 
     if (trainingResults.numLevelsGained == 1) {
         let time = Date.now();
@@ -33,7 +33,6 @@ const trainingResultController: RequestHandler = async (req, res): Promise<void>
         inventory.TrainingDate = new Date(time);
 
         inventory.PlayerLevel += 1;
-        inventory.TradesRemaining += 1;
 
         await createMessage(accountId, [
             {

src/services/guildService.ts

@@ -95,6 +95,7 @@ export const getGuildClient = async (guild: TGuildDatabaseDocument, accountId: s
         LongMOTD: guild.LongMOTD,
         Members: members,
         Ranks: guild.Ranks,
+        TradeTax: guild.TradeTax,
         Tier: guild.Tier,
         Vault: getGuildVault(guild),
         ActiveDojoColorResearch: guild.ActiveDojoColorResearch,
@@ -103,7 +104,6 @@ export const getGuildClient = async (guild: TGuildDatabaseDocument, accountId: s
         IsContributor: !!guild.CeremonyContributors?.find(x => x.equals(accountId)),
         NumContributors: guild.CeremonyContributors?.length ?? 0,
         CeremonyResetDate: guild.CeremonyResetDate ? toMongoDate(guild.CeremonyResetDate) : undefined,
-        AutoContributeFromVault: guild.AutoContributeFromVault,
         AllianceId: guild.AllianceId ? toOid(guild.AllianceId) : undefined
     };
 };
@@ -126,11 +126,7 @@ export const getDojoClient = async (
     const dojo: IDojoClient = {
         _id: { $oid: guild._id.toString() },
         Name: guild.Name,
-        Tier: guild.Tier,
-        GuildEmblem: guild.Emblem,
-        TradeTax: guild.TradeTax,
-        NumContributors: guild.CeremonyContributors?.length ?? 0,
-        CeremonyResetDate: guild.CeremonyResetDate ? toMongoDate(guild.CeremonyResetDate) : undefined,
+        Tier: 1,
         FixedContributions: true,
         DojoRevision: 1,
         Vault: getGuildVault(guild),

src/services/inventoryService.ts

@@ -538,15 +538,9 @@ export const addItem = async (
             if (!key) return {};
             return { QuestKeys: [key] };
         } else {
-            const key = { ItemType: typeName, ItemCount: quantity };
-
-            const index = inventory.LevelKeys.findIndex(levelKey => levelKey.ItemType == typeName);
-            if (index != -1) {
-                inventory.LevelKeys[index].ItemCount += quantity;
-            } else {
-                inventory.LevelKeys.push(key);
-            }
-            return { LevelKeys: [key] };
+            const levelKeyChanges = [{ ItemType: typeName, ItemCount: quantity }];
+            addLevelKeys(inventory, levelKeyChanges);
+            return { LevelKeys: levelKeyChanges };
         }
     }
     if (typeName in ExportDrones) {
@@ -1240,6 +1234,10 @@ export const addRecipes = (inventory: TInventoryDatabaseDocument, itemsArray: IT
     applyArrayChanges(inventory.Recipes, itemsArray);
 };
 
+export const addLevelKeys = (inventory: TInventoryDatabaseDocument, itemsArray: ITypeCount[]): void => {
+    applyArrayChanges(inventory.LevelKeys, itemsArray);
+};
+
 export const addMods = (inventory: TInventoryDatabaseDocument, itemsArray: IRawUpgrade[]): void => {
     const { RawUpgrades } = inventory;
 

src/services/missionInventoryUpdateService.ts

@@ -22,6 +22,7 @@ import {
     addFusionTreasures,
     addGearExpByCategory,
     addItem,
+    addLevelKeys,
     addMiscItems,
     addMissionComplete,
     addMods,
@@ -77,11 +78,8 @@ export const addMissionInventoryUpdates = async (
     inventoryUpdates: IMissionInventoryUpdateRequest
 ): Promise<IInventoryChanges> => {
     const inventoryChanges: IInventoryChanges = {};
-    if (
-        inventoryUpdates.EndOfMatchUpload &&
-        inventoryUpdates.Missions &&
-        inventoryUpdates.Missions.Tag in ExportRegions
-    ) {
+    if (inventoryUpdates.EndOfMatchUpload) {
+        if (inventoryUpdates.Missions && inventoryUpdates.Missions.Tag in ExportRegions) {
             const node = ExportRegions[inventoryUpdates.Missions.Tag];
             if (node.miscItemFee) {
                 addMiscItems(inventory, [
@@ -92,28 +90,19 @@ export const addMissionInventoryUpdates = async (
                 ]);
             }
         }
-    if (inventoryUpdates.RewardInfo) {
-        if (inventoryUpdates.RewardInfo.periodicMissionTag) {
-            const tag = inventoryUpdates.RewardInfo.periodicMissionTag;
-            const existingCompletion = inventory.PeriodicMissionCompletions.find(completion => completion.tag === tag);
-
-            if (existingCompletion) {
-                existingCompletion.date = new Date();
-            } else {
-                inventory.PeriodicMissionCompletions.push({
-                    tag: tag,
-                    date: new Date()
-                });
+        if (inventoryUpdates.KeyToRemove) {
+            if (!inventoryUpdates.KeyOwner || inventory.accountOwnerId.equals(inventoryUpdates.KeyOwner)) {
+                addLevelKeys(inventory, [
+                    {
+                        ItemType: inventoryUpdates.KeyToRemove,
+                        ItemCount: -1
                     }
-        }
-        if (inventoryUpdates.RewardInfo.NemesisAbandonedRewards) {
-            inventory.NemesisAbandonedRewards = inventoryUpdates.RewardInfo.NemesisAbandonedRewards;
+                ]);
             }
         }
         if (
             inventoryUpdates.MissionFailed &&
             inventoryUpdates.MissionStatus == "GS_FAILURE" &&
-        inventoryUpdates.EndOfMatchUpload &&
             inventoryUpdates.ObjectiveReached &&
             !inventoryUpdates.LockedWeaponGroup
         ) {
@@ -136,6 +125,25 @@ export const addMissionInventoryUpdates = async (
                 ]);
             }
         }
+    }
+    if (inventoryUpdates.RewardInfo) {
+        if (inventoryUpdates.RewardInfo.periodicMissionTag) {
+            const tag = inventoryUpdates.RewardInfo.periodicMissionTag;
+            const existingCompletion = inventory.PeriodicMissionCompletions.find(completion => completion.tag === tag);
+
+            if (existingCompletion) {
+                existingCompletion.date = new Date();
+            } else {
+                inventory.PeriodicMissionCompletions.push({
+                    tag: tag,
+                    date: new Date()
+                });
+            }
+        }
+        if (inventoryUpdates.RewardInfo.NemesisAbandonedRewards) {
+            inventory.NemesisAbandonedRewards = inventoryUpdates.RewardInfo.NemesisAbandonedRewards;
+        }
+    }
     for (const [key, value] of getEntriesUnsafe(inventoryUpdates)) {
         if (value === undefined) {
             logger.error(`Inventory update key ${key} has no value `);
@@ -441,12 +449,7 @@ export const addMissionInventoryUpdates = async (
                                 _id: new Types.ObjectId(ItemId.$oid),
                                 ...loadoutConfigItemIdRemoved
                             };
-                            const dbConfig = loadout.NORMAL.id(loadoutId);
-                            if (dbConfig) {
-                                dbConfig.overwrite(loadoutConfigDatabase);
-                            } else {
-                                logger.warn(`couldn't update loadout because there's no config with id ${loadoutId}`);
-                            }
+                            loadout.NORMAL.id(loadoutId)!.overwrite(loadoutConfigDatabase);
                         }
                         await loadout.save();
                     }
@@ -726,20 +729,6 @@ export const addFixedLevelRewards = (
             MissionRewards.push(item);
         }
     }
-    if (rewards.droptable) {
-        if (rewards.droptable in ExportRewards) {
-            logger.debug(`rolling ${rewards.droptable} for level key rewards`);
-            const reward = getRandomRewardByChance(ExportRewards[rewards.droptable][0]);
-            if (reward) {
-                MissionRewards.push({
-                    StoreItem: reward.type,
-                    ItemCount: reward.itemCount
-                });
-            }
-        } else {
-            logger.error(`unknown droptable ${rewards.droptable}`);
-        }
-    }
     return missionBonusCredits;
 };
 

src/services/questService.ts

@@ -177,22 +177,6 @@ export const completeQuest = async (inventory: TInventoryDatabaseDocument, quest
         await giveKeyChainMissionReward(inventory, { KeyChain: questKey, ChainStage: i });
     }
 
-    if (questKey == "/Lotus/Types/Keys/OrokinMoonQuest/OrokinMoonQuestKeyChain") {
-        void createMessage(inventory.accountOwnerId, [
-            {
-                sndr: "/Lotus/Language/Bosses/Ordis",
-                msg: "/Lotus/Language/G1Quests/SecondDreamFinishInboxMessage",
-                att: [
-                    "/Lotus/Weapons/Tenno/Melee/Swords/StalkerTwo/StalkerTwoSmallSword",
-                    "/Lotus/Upgrades/Skins/Sigils/ScarSigil"
-                ],
-                sub: "/Lotus/Language/G1Quests/SecondDreamFinishInboxTitle",
-                icon: "/Lotus/Interface/Icons/Npcs/Ordis.png",
-                highPriority: true
-            }
-        ]);
-    }
-
     const questCompletionItems = getQuestCompletionItems(questKey);
     logger.debug(`quest completion items`, questCompletionItems);
     if (questCompletionItems) {

src/types/guildTypes.ts

@@ -10,6 +10,7 @@ export interface IGuildClient {
     LongMOTD?: ILongMOTD;
     Members: IGuildMemberClient[];
     Ranks: IGuildRank[];
+    TradeTax: number;
     Tier: number;
     Vault: IGuildVault;
     ActiveDojoColorResearch: string;
@@ -142,7 +143,6 @@ export interface IDojoClient {
     _id: IOid; // ID of the guild
     Name: string;
     Tier: number;
-    TradeTax?: number;
     FixedContributions: boolean;
     DojoRevision: number;
     AllianceId?: IOid;
@@ -155,8 +155,6 @@ export interface IDojoClient {
     ContentURL?: string;
     GuildEmblem?: boolean;
     DojoComponents: IDojoComponentClient[];
-    NumContributors?: number;
-    CeremonyResetDate?: IMongoDate;
 }
 
 export interface IDojoComponentClient {

src/types/requestTypes.ts

@@ -49,6 +49,9 @@ export type IMissionInventoryUpdateRequest = {
     rewardsMultiplier?: number;
     GoalTag: string;
     LevelKeyName: string;
+    KeyOwner?: string;
+    KeyRemovalHash?: string;
+    KeyToRemove?: string;
     ActiveBoosters?: IBooster[];
     RawUpgrades?: IRawUpgrade[];
     FusionTreasures?: IFusionTreasure[];

static/fixed_responses/questCompletionRewards.json

@@ -5,11 +5,5 @@
       "ItemCount": 1
     }
   ],
-  "/Lotus/Types/Keys/InfestedMicroplanetQuest/InfestedMicroplanetQuestKeyChain": [{ "ItemType": "/Lotus/Types/Recipes/WarframeRecipes/BrokenFrameBlueprint", "ItemCount": 1 }],
-  "/Lotus/Types/Keys/OrokinMoonQuest/OrokinMoonQuestKeyChain": [
-    {
-      "ItemType": "/Lotus/Types/Keys/RailJackBuildQuest/RailjackBuildQuestEmailItem",
-      "ItemCount": 1
-    }
-  ]
+  "/Lotus/Types/Keys/InfestedMicroplanetQuest/InfestedMicroplanetQuestKeyChain": [{ "ItemType": "/Lotus/Types/Recipes/WarframeRecipes/BrokenFrameBlueprint", "ItemCount": 1 }]
 }

static/webui/translations/de.js

@@ -132,7 +132,7 @@ dict = {
     cheats_unlockArcanesEverywhere: `Arkana-Adapter überall`,
     cheats_noDailyStandingLimits: `Kein tägliches Ansehenslimit`,
     cheats_noArgonCrystalDecay: `Argon-Kristalle verschwinden niemals`,
-	cheats_noMasteryRankUpCooldown: `Keine Wartezeit beim Meisterschaftsrangaufstieg`,
+    cheats_noMasteryRankUpCooldown: `[UNTRANSLATED] No Mastery Rank Up Cooldown`,
     cheats_noVendorPurchaseLimits: `Keine Kaufbeschränkungen bei Händlern`,
     cheats_instantResourceExtractorDrones: `Sofortige Ressourcen-Extraktor-Drohnen`,
     cheats_noDojoRoomBuildStage: `Kein Dojo-Raum-Bauvorgang`,