oopsie

SettlementNode10 was not being excluded

Dockerfile

@@ -5,40 +5,17 @@ ENV APP_MY_ADDRESS=localhost
 ENV APP_HTTP_PORT=80
 ENV APP_HTTPS_PORT=443
 ENV APP_AUTO_CREATE_ACCOUNT=true
-ENV APP_SKIP_TUTORIAL=false
-ENV APP_SKIP_ALL_DIALOGUE=false
-ENV APP_UNLOCK_ALL_SCANS=false
-ENV APP_UNLOCK_ALL_MISSIONS=false
-ENV APP_INFINITE_CREDITS=false
-ENV APP_INFINITE_PLATINUM=false
-ENV APP_INFINITE_ENDO=false
-ENV APP_INFINITE_REGAL_AYA=false
-ENV APP_INFINITE_HELMINTH_MATERIALS=false
-ENV APP_DONT_SUBTRACT_CONSUMABLES=false
-ENV APP_UNLOCK_ALL_SHIP_FEATURES=false
-ENV APP_UNLOCK_ALL_SHIP_DECORATIONS=false
-ENV APP_UNLOCK_ALL_FLAVOUR_ITEMS=false
-ENV APP_UNLOCK_ALL_SKINS=false
-ENV APP_UNLOCK_ALL_CAPTURA_SCENES=false
-ENV APP_UNIVERSAL_POLARITY_EVERYWHERE=false
-ENV APP_UNLOCK_DOUBLE_CAPACITY_POTATOES_EVERYWHERE=false
-ENV APP_UNLOCK_EXILUS_EVERYWHERE=false
-ENV APP_UNLOCK_ARCANES_EVERYWHERE=false
-ENV APP_NO_DAILY_FOCUS_LIMIT=false
-ENV APP_NO_ARGON_CRYSTAL_DECAY=false
-ENV APP_NO_MASTERY_RANK_UP_COOLDOWN=false
-ENV APP_NO_VENDOR_PURCHASE_LIMITS=true
-ENV APP_NO_DEATH_MARKS=false
-ENV APP_NO_KIM_COOLDOWNS=false
-ENV APP_INSTANT_RESOURCE_EXTRACTOR_DRONES=false
-ENV APP_NO_RESOURCE_EXTRACTOR_DRONES_DAMAGE=false
-ENV APP_SKIP_CLAN_KEY_CRAFTING=false
-ENV APP_NO_DOJO_ROOM_BUILD_STAGE=false
-ENV APP_NO_DECO_BUILD_STAGE=false
-ENV APP_FAST_DOJO_ROOM_DESTRUCTION=false
-ENV APP_NO_DOJO_RESEARCH_COSTS=false
-ENV APP_NO_DOJO_RESEARCH_TIME=false
-ENV APP_FAST_CLAN_ASCENSION=false
+ENV APP_SKIP_STORY_MODE_CHOICE=true
+ENV APP_SKIP_TUTORIAL=true
+ENV APP_SKIP_ALL_DIALOGUE=true
+ENV APP_UNLOCK_ALL_SCANS=true
+ENV APP_UNLOCK_ALL_MISSIONS=true
+ENV APP_INFINITE_RESOURCES=true
+ENV APP_UNLOCK_ALL_SHIP_FEATURES=true
+ENV APP_UNLOCK_ALL_SHIP_DECORATIONS=true
+ENV APP_UNLOCK_ALL_FLAVOUR_ITEMS=true
+ENV APP_UNLOCK_ALL_SKINS=true
+ENV APP_UNIVERSAL_POLARITY_EVERYWHERE=true
 ENV APP_SPOOF_MASTERY_RANK=-1
 
 RUN apk add --no-cache bash sed wget jq

UPDATE AND START SERVER.bat

@@ -1,6 +1,7 @@
 @echo off
 
 echo Updating SpaceNinjaServer...
+git config remote.origin.url https://openwf.io/SpaceNinjaServer.git
 git fetch --prune
 git stash
 git reset --hard origin/main

config.json.example

@@ -19,7 +19,6 @@
   "infiniteEndo": false,
   "infiniteRegalAya": false,
   "infiniteHelminthMaterials": false,
-  "dontSubtractConsumables": false,
   "unlockAllShipFeatures": false,
   "unlockAllShipDecorations": false,
   "unlockAllFlavourItems": false,
@@ -38,7 +37,6 @@
   "noKimCooldowns": false,
   "instantResourceExtractorDrones": false,
   "noResourceExtractorDronesDamage": false,
-  "skipClanKeyCrafting": false,
   "noDojoRoomBuildStage": false,
   "noDecoBuildStage": false,
   "fastDojoRoomDestruction": false,

docker-compose.yml

@@ -12,40 +12,19 @@ services:
             # APP_HTTP_PORT: 80
             # APP_HTTPS_PORT: 443
             # APP_AUTO_CREATE_ACCOUNT: true
-            # APP_SKIP_TUTORIAL: false
-            # APP_SKIP_ALL_DIALOGUE: false
-            # APP_UNLOCK_ALL_SCANS: false
-            # APP_UNLOCK_ALL_MISSIONS: false
-            # APP_INFINITE_CREDITS: false
-            # APP_INFINITE_PLATINUM: false
-            # APP_INFINITE_ENDO: false
-            # APP_INFINITE_REGAL_AYA: false
-            # APP_INFINITE_HELMINTH_MATERIALS: false
-            # APP_DONT_SUBTRACT_CONSUMABLES: false
-            # APP_UNLOCK_ALL_SHIP_FEATURES: false
-            # APP_UNLOCK_ALL_SHIP_DECORATIONS: false
-            # APP_UNLOCK_ALL_FLAVOUR_ITEMS: false
-            # APP_UNLOCK_ALL_SKINS: false
-            # APP_UNLOCK_ALL_CAPTURA_SCENES: false
-            # APP_UNIVERSAL_POLARITY_EVERYWHERE: false
-            # APP_UNLOCK_DOUBLE_CAPACITY_POTATOES_EVERYWHERE: false
-            # APP_UNLOCK_EXILUS_EVERYWHERE: false
-            # APP_UNLOCK_ARCANES_EVERYWHERE: false
-            # APP_NO_DAILY_FOCUS_LIMIT: false
-            # APP_NO_ARGON_CRYSTAL_DECAY: false
-            # APP_NO_MASTERY_RANK_UP_COOLDOWN: false
-            # APP_NO_VENDOR_PURCHASE_LIMITS: true
-            # APP_NO_DEATH_MARKS: false
-            # APP_NO_KIM_COOLDOWNS: false
-            # APP_INSTANT_RESOURCE_EXTRACTOR_DRONES: false
-            # APP_NO_RESOURCE_EXTRACTOR_DRONES_DAMAGE: false
-            # APP_SKIP_CLAN_KEY_CRAFTING: false
-            # APP_NO_DOJO_ROOM_BUILD_STAGE: false
-            # APP_NO_DECO_BUILD_STAGE: false
-            # APP_FAST_DOJO_ROOM_DESTRUCTION: false
-            # APP_NO_DOJO_RESEARCH_COSTS: false
-            # APP_NO_DOJO_RESEARCH_TIME: false
-            # APP_FAST_CLAN_ASCENSION: false
+            # APP_SKIP_STORY_MODE_CHOICE: true
+            # APP_SKIP_TUTORIAL: true
+            # APP_SKIP_ALL_DIALOGUE: true
+            # APP_UNLOCK_ALL_SCANS: true
+            # APP_UNLOCK_ALL_MISSIONS: true
+            # APP_UNLOCK_ALL_QUESTS: true
+            # APP_COMPLETE_ALL_QUESTS: true
+            # APP_INFINITE_RESOURCES: true
+            # APP_UNLOCK_ALL_SHIP_FEATURES: true
+            # APP_UNLOCK_ALL_SHIP_DECORATIONS: true
+            # APP_UNLOCK_ALL_FLAVOUR_ITEMS: true
+            # APP_UNLOCK_ALL_SKINS: true
+            # APP_UNIVERSAL_POLARITY_EVERYWHERE: true
             # APP_SPOOF_MASTERY_RANK: -1
         volumes:
             - ./docker-data/static:/app/static/data

docker-entrypoint.sh

@@ -19,6 +19,5 @@ do
   mv config.tmp config.json
 done
 
-npm i --omit=dev
-npm run build
-exec npm run start
+npm install
+exec npm run dev

package-lock.json

@@ -18,7 +18,7 @@
         "morgan": "^1.10.0",
         "ncp": "^2.0.0",
         "typescript": "^5.5",
-        "warframe-public-export-plus": "^0.5.59",
+        "warframe-public-export-plus": "^0.5.56",
         "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.59",
-      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.59.tgz",
-      "integrity": "sha512-/SUCVjngVDBz6gahz7CdVLywtHLODL6O5nmNtQcxFDUwrUGnF1lETcG8/UO+WLeGxBVAy4BDPbq+9ZWlYZM4uQ=="
+      "version": "0.5.56",
+      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.56.tgz",
+      "integrity": "sha512-px+J7tUm6fkSzwKkvL73ySQReDq9oM1UrHSLM3vbYGBvELM892iBgPYG45okIhScCSdwmmXTiWZTf4x/I4qiNQ=="
     },
     "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.59",
+    "warframe-public-export-plus": "^0.5.56",
     "warframe-riven-info": "^0.1.2",
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0"

src/app.ts

@@ -21,13 +21,6 @@ app.use((req, _res, next) => {
     if (req.headers["content-encoding"] == "ezip" || req.headers["content-encoding"] == "e") {
         req.headers["content-encoding"] = undefined;
     }
-
-    // U18 uses application/x-www-form-urlencoded even tho the data is JSON which Express doesn't like.
-    // U17 sets no Content-Type at all, which Express also doesn't like.
-    if (!req.headers["content-type"] || req.headers["content-type"] == "application/x-www-form-urlencoded") {
-        req.headers["content-type"] = "application/octet-stream";
-    }
-
     next();
 });
 

src/constants/timeConstants.ts

@@ -2,18 +2,15 @@ const millisecondsPerSecond = 1000;
 const secondsPerMinute = 60;
 const minutesPerHour = 60;
 const hoursPerDay = 24;
-const daysPerWeek = 7;
 
 const unixSecond = millisecondsPerSecond;
 const unixMinute = secondsPerMinute * millisecondsPerSecond;
 const unixHour = unixMinute * minutesPerHour;
 const unixDay = hoursPerDay * unixHour;
-const unixWeek = daysPerWeek * unixDay;
 
 export const unixTimesInMs = {
     second: unixSecond,
     minute: unixMinute,
     hour: unixHour,
-    day: unixDay,
-    week: unixWeek
+    day: unixDay
 };

src/controllers/api/activateRandomModController.ts

@@ -17,7 +17,7 @@ export const activateRandomModController: RequestHandler = async (req, res) => {
             ItemCount: -1
         }
     ]);
-    const rivenType = getRandomElement(rivenRawToRealWeighted[request.ItemType])!;
+    const rivenType = getRandomElement(rivenRawToRealWeighted[request.ItemType]);
     const fingerprint = createVeiledRivenFingerprint(ExportUpgrades[rivenType]);
     const upgradeIndex =
         inventory.Upgrades.push({

src/controllers/api/artifactTransmutationController.ts

@@ -28,7 +28,7 @@ export const artifactTransmutationController: RequestHandler = async (req, res)
         });
 
         const rawRivenType = getRandomRawRivenType();
-        const rivenType = getRandomElement(rivenRawToRealWeighted[rawRivenType])!;
+        const rivenType = getRandomElement(rivenRawToRealWeighted[rawRivenType]);
         const fingerprint = createVeiledRivenFingerprint(ExportUpgrades[rivenType]);
 
         const upgradeIndex =

src/controllers/api/claimCompletedRecipeController.ts

@@ -133,14 +133,7 @@ export const claimCompletedRecipeController: RequestHandler = async (req, res) =
         if (recipe.secretIngredientAction != "SIA_UNBRAND") {
             InventoryChanges = {
                 ...InventoryChanges,
-                ...(await addItem(
-                    inventory,
-                    recipe.resultType,
-                    recipe.num,
-                    false,
-                    undefined,
-                    pendingRecipe.TargetFingerprint
-                ))
+                ...(await addItem(inventory, recipe.resultType, recipe.num, false))
             };
         }
         await inventory.save();

src/controllers/api/claimLibraryDailyTaskRewardController.ts

@@ -1,4 +1,4 @@
-import { addFusionPoints, getInventory } from "@/src/services/inventoryService";
+import { getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { RequestHandler } from "express";
 
@@ -17,7 +17,7 @@ export const claimLibraryDailyTaskRewardController: RequestHandler = async (req,
     }
     syndicate.Standing += rewardStanding;
 
-    addFusionPoints(inventory, 80 * rewardQuantity);
+    inventory.FusionPoints += 80 * rewardQuantity;
     await inventory.save();
 
     res.json({

src/controllers/api/completeCalendarEventController.ts

@@ -1,41 +0,0 @@
-import { getCalendarProgress, getInventory } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
-import { getWorldState } from "@/src/services/worldStateService";
-import { IInventoryChanges } from "@/src/types/purchaseTypes";
-import { RequestHandler } from "express";
-
-// GET request; query parameters: CompletedEventIdx=0&Iteration=4&Version=19&Season=CST_SUMMER
-export const completeCalendarEventController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId);
-    const calendarProgress = getCalendarProgress(inventory);
-    const currentSeason = getWorldState().KnownCalendarSeasons[0];
-    let inventoryChanges: IInventoryChanges = {};
-    let dayIndex = 0;
-    for (const day of currentSeason.Days) {
-        if (day.events.length == 0 || day.events[0].type != "CET_CHALLENGE") {
-            if (dayIndex == calendarProgress.SeasonProgress.LastCompletedDayIdx) {
-                if (day.events.length != 0) {
-                    const selection = day.events[parseInt(req.query.CompletedEventIdx as string)];
-                    if (selection.type == "CET_REWARD") {
-                        inventoryChanges = (await handleStoreItemAcquisition(selection.reward!, inventory))
-                            .InventoryChanges;
-                    } else if (selection.type == "CET_UPGRADE") {
-                        calendarProgress.YearProgress.Upgrades.push(selection.upgrade!);
-                    } else if (selection.type != "CET_PLOT") {
-                        throw new Error(`unexpected selection type: ${selection.type}`);
-                    }
-                }
-                break;
-            }
-            ++dayIndex;
-        }
-    }
-    calendarProgress.SeasonProgress.LastCompletedDayIdx++;
-    await inventory.save();
-    res.json({
-        InventoryChanges: inventoryChanges,
-        CalendarProgress: inventory.CalendarProgress
-    });
-};

src/controllers/api/confirmGuildInvitationController.ts

@@ -1,14 +1,8 @@
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Guild, GuildMember } from "@/src/models/guildModel";
 import { Account } from "@/src/models/loginModel";
-import {
-    deleteGuild,
-    getGuildClient,
-    giveClanKey,
-    hasGuildPermission,
-    removeDojoKeyItems
-} from "@/src/services/guildService";
-import { getInventory } from "@/src/services/inventoryService";
+import { deleteGuild, getGuildClient, hasGuildPermission, removeDojoKeyItems } from "@/src/services/guildService";
+import { addRecipes, combineInventoryChanges, getInventory } from "@/src/services/inventoryService";
 import { getAccountForRequest, getAccountIdForRequest, getSuffixedName } from "@/src/services/loginService";
 import { GuildPermission } from "@/src/types/guildTypes";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
@@ -47,7 +41,14 @@ export const confirmGuildInvitationGetController: RequestHandler = async (req, r
         // Update inventory of new member
         const inventory = await getInventory(account._id.toString(), "GuildId LevelKeys Recipes");
         inventory.GuildId = new Types.ObjectId(req.query.clanId as string);
-        giveClanKey(inventory, inventoryChanges);
+        const recipeChanges = [
+            {
+                ItemType: "/Lotus/Types/Keys/DojoKeyBlueprint",
+                ItemCount: 1
+            }
+        ];
+        addRecipes(inventory, recipeChanges);
+        combineInventoryChanges(inventoryChanges, { Recipes: recipeChanges });
         await inventory.save();
 
         const guild = (await Guild.findById(req.query.clanId as string))!;
@@ -95,9 +96,14 @@ export const confirmGuildInvitationPostController: RequestHandler = async (req,
         await GuildMember.deleteMany({ accountId: guildMember.accountId, status: 1 });
 
         // Update inventory of new member
-        const inventory = await getInventory(guildMember.accountId.toString(), "GuildId LevelKeys Recipes");
+        const inventory = await getInventory(guildMember.accountId.toString(), "GuildId Recipes");
         inventory.GuildId = new Types.ObjectId(req.query.clanId as string);
-        giveClanKey(inventory);
+        addRecipes(inventory, [
+            {
+                ItemType: "/Lotus/Types/Keys/DojoKeyBlueprint",
+                ItemCount: 1
+            }
+        ]);
         await inventory.save();
 
         // Add join to clan log

src/controllers/api/contributeGuildClassController.ts

@@ -2,7 +2,7 @@ import { toMongoDate } from "@/src/helpers/inventoryHelpers";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Guild } from "@/src/models/guildModel";
 import { checkClanAscensionHasRequiredContributors } from "@/src/services/guildService";
-import { addFusionPoints, getInventory } from "@/src/services/inventoryService";
+import { getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { RequestHandler } from "express";
 import { Types } from "mongoose";
@@ -36,7 +36,7 @@ export const contributeGuildClassController: RequestHandler = async (req, res) =
 
     // Either way, endo is given to the contributor.
     const inventory = await getInventory(accountId, "FusionPoints");
-    addFusionPoints(inventory, guild.CeremonyEndo!);
+    inventory.FusionPoints += guild.CeremonyEndo!;
     await inventory.save();
 
     res.json({

src/controllers/api/createGuildController.ts

@@ -2,9 +2,8 @@ import { RequestHandler } from "express";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Guild, GuildMember } from "@/src/models/guildModel";
-import { createUniqueClanName, getGuildClient, giveClanKey } from "@/src/services/guildService";
-import { getInventory } from "@/src/services/inventoryService";
-import { IInventoryChanges } from "@/src/types/purchaseTypes";
+import { createUniqueClanName, getGuildClient } from "@/src/services/guildService";
+import { addRecipes, getInventory } from "@/src/services/inventoryService";
 
 export const createGuildController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
@@ -27,15 +26,26 @@ export const createGuildController: RequestHandler = async (req, res) => {
         rank: 0
     });
 
-    const inventory = await getInventory(accountId, "GuildId LevelKeys Recipes");
+    const inventory = await getInventory(accountId, "GuildId Recipes");
     inventory.GuildId = guild._id;
-    const inventoryChanges: IInventoryChanges = {};
-    giveClanKey(inventory, inventoryChanges);
+    addRecipes(inventory, [
+        {
+            ItemType: "/Lotus/Types/Keys/DojoKeyBlueprint",
+            ItemCount: 1
+        }
+    ]);
     await inventory.save();
 
     res.json({
         ...(await getGuildClient(guild, accountId)),
-        InventoryChanges: inventoryChanges
+        InventoryChanges: {
+            Recipes: [
+                {
+                    ItemType: "/Lotus/Types/Keys/DojoKeyBlueprint",
+                    ItemCount: 1
+                }
+            ]
+        }
     });
 };
 

src/controllers/api/crewShipIdentifySalvageController.ts

@@ -62,7 +62,14 @@ export const crewShipIdentifySalvageController: RequestHandler = async (req, res
                 } satisfies IInnateDamageFingerprint)
             };
         }
-        addEquipment(inventory, "CrewShipSalvagedWeapons", payload.ItemType, defaultOverwrites, inventoryChanges);
+        addEquipment(
+            inventory,
+            "CrewShipSalvagedWeapons",
+            payload.ItemType,
+            undefined,
+            inventoryChanges,
+            defaultOverwrites
+        );
     }
 
     inventoryChanges.CrewShipRawSalvage = [

src/controllers/api/entratiLabConquestModeController.ts

@@ -21,12 +21,10 @@ export const entratiLabConquestModeController: RequestHandler = async (req, res)
         inventory.EntratiVaultCountResetDate = new Date(weekEnd);
         if (inventory.EntratiLabConquestUnlocked) {
             inventory.EntratiLabConquestUnlocked = 0;
-            inventory.EntratiLabConquestCacheScoreMission = 0;
             inventory.EntratiLabConquestActiveFrameVariants = [];
         }
         if (inventory.EchoesHexConquestUnlocked) {
             inventory.EchoesHexConquestUnlocked = 0;
-            inventory.EchoesHexConquestCacheScoreMission = 0;
             inventory.EchoesHexConquestActiveFrameVariants = [];
             inventory.EchoesHexConquestActiveStickers = [];
         }

src/controllers/api/focusController.ts

@@ -104,14 +104,13 @@ export const focusController: RequestHandler = async (req, res) => {
         }
         case FocusOperation.SentTrainingAmplifier: {
             const request = JSON.parse(String(req.body)) as ISentTrainingAmplifierRequest;
+            const parts: string[] = [
+                "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingGrip",
+                "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingChassis",
+                "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingBarrel"
+            ];
             const inventory = await getInventory(accountId);
-            const inventoryChanges = addEquipment(inventory, "OperatorAmps", request.StartingWeaponType, {
-                ModularParts: [
-                    "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingGrip",
-                    "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingChassis",
-                    "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingBarrel"
-                ]
-            });
+            const inventoryChanges = addEquipment(inventory, "OperatorAmps", request.StartingWeaponType, parts);
             occupySlot(inventory, InventorySlot.AMPS, false);
             await inventory.save();
             res.json((inventoryChanges.OperatorAmps as IEquipmentClient[])[0]);

src/controllers/api/gardeningController.ts

@@ -1,84 +0,0 @@
-import { toMongoDate } from "@/src/helpers/inventoryHelpers";
-import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { addMiscItem, getInventory } from "@/src/services/inventoryService";
-import { toStoreItem } from "@/src/services/itemDataService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { createGarden, getPersonalRooms } from "@/src/services/personalRoomsService";
-import { IMongoDate } from "@/src/types/commonTypes";
-import { IMissionReward } from "@/src/types/missionTypes";
-import { IPersonalRoomsClient } from "@/src/types/personalRoomsTypes";
-import { IInventoryChanges } from "@/src/types/purchaseTypes";
-import { IGardeningClient } from "@/src/types/shipTypes";
-import { RequestHandler } from "express";
-import { dict_en, ExportResources } from "warframe-public-export-plus";
-
-export const gardeningController: RequestHandler = async (req, res) => {
-    const data = getJSONfromString<IGardeningRequest>(String(req.body));
-    if (data.Mode != "HarvestAll") {
-        throw new Error(`unexpected gardening mode: ${data.Mode}`);
-    }
-
-    const accountId = await getAccountIdForRequest(req);
-    const [inventory, personalRooms] = await Promise.all([
-        getInventory(accountId, "MiscItems"),
-        getPersonalRooms(accountId, "Apartment")
-    ]);
-
-    // Harvest plants
-    const inventoryChanges: IInventoryChanges = {};
-    const rewards: Record<string, IMissionReward[][]> = {};
-    for (const planter of personalRooms.Apartment.Gardening.Planters) {
-        rewards[planter.Name] = [];
-        for (const plant of planter.Plants) {
-            const itemType =
-                "/Lotus/Types/Gameplay/Duviri/Resource/DuviriPlantItem" +
-                plant.PlantType.substring(plant.PlantType.length - 1);
-            const itemCount = Math.random() < 0.775 ? 2 : 4;
-
-            addMiscItem(inventory, itemType, itemCount, inventoryChanges);
-
-            rewards[planter.Name].push([
-                {
-                    StoreItem: toStoreItem(itemType),
-                    TypeName: itemType,
-                    ItemCount: itemCount,
-                    DailyCooldown: false,
-                    Rarity: itemCount == 2 ? 0.7743589743589744 : 0.22564102564102564,
-                    TweetText: `${itemCount}x ${dict_en[ExportResources[itemType].name]} (Resource)`,
-                    ProductCategory: "MiscItems"
-                }
-            ]);
-        }
-    }
-
-    // Refresh garden
-    personalRooms.Apartment.Gardening = createGarden();
-
-    await Promise.all([inventory.save(), personalRooms.save()]);
-
-    const planter = personalRooms.Apartment.Gardening.Planters[personalRooms.Apartment.Gardening.Planters.length - 1];
-    const plant = planter.Plants[planter.Plants.length - 1];
-    res.json({
-        GardenTagName: planter.Name,
-        PlantType: plant.PlantType,
-        PlotIndex: plant.PlotIndex,
-        EndTime: toMongoDate(plant.EndTime),
-        InventoryChanges: inventoryChanges,
-        Gardening: personalRooms.toJSON<IPersonalRoomsClient>().Apartment.Gardening,
-        Rewards: rewards
-    } satisfies IGardeningResponse);
-};
-
-interface IGardeningRequest {
-    Mode: string;
-}
-
-interface IGardeningResponse {
-    GardenTagName: string;
-    PlantType: string;
-    PlotIndex: number;
-    EndTime: IMongoDate;
-    InventoryChanges: IInventoryChanges;
-    Gardening: IGardeningClient;
-    Rewards: Record<string, IMissionReward[][]>;
-}

src/controllers/api/getAllianceController.ts

@@ -18,7 +18,6 @@ export const getAllianceController: RequestHandler = async (req, res) => {
     res.end();
 };
 
-// POST request since U27
 /*interface IGetAllianceRequest {
     memberCount: number;
     clanLeaderName: string;

src/controllers/api/getShipController.ts

@@ -2,24 +2,17 @@ import { RequestHandler } from "express";
 import { config } from "@/src/services/configService";
 import allShipFeatures from "@/static/fixed_responses/allShipFeatures.json";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { createGarden, getPersonalRooms } from "@/src/services/personalRoomsService";
+import { getPersonalRooms } from "@/src/services/personalRoomsService";
 import { getShip } from "@/src/services/shipService";
 import { toOid } from "@/src/helpers/inventoryHelpers";
 import { IGetShipResponse } from "@/src/types/shipTypes";
-import { IPersonalRoomsClient } from "@/src/types/personalRoomsTypes";
+import { IPersonalRooms } from "@/src/types/personalRoomsTypes";
 import { getLoadout } from "@/src/services/loadoutService";
 
 export const getShipController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
     const personalRoomsDb = await getPersonalRooms(accountId);
-
-    // Setup gardening if it's missing. Maybe should be done as part of some quest completion in the future.
-    if (personalRoomsDb.Apartment.Gardening.Planters.length == 0) {
-        personalRoomsDb.Apartment.Gardening = createGarden();
-        await personalRoomsDb.save();
-    }
-
-    const personalRooms = personalRoomsDb.toJSON<IPersonalRoomsClient>();
+    const personalRooms = personalRoomsDb.toJSON<IPersonalRooms>();
     const loadout = await getLoadout(accountId);
     const ship = await getShip(personalRoomsDb.activeShipId, "ShipAttachments SkinFlavourItem");
 

src/controllers/api/guildTechController.ts

@@ -441,9 +441,16 @@ const finishComponentRepair = (
     const inventoryChanges = {
         ...(category == "CrewShipWeaponSkins"
             ? addCrewShipWeaponSkin(inventory, salvageItem.ItemType, salvageItem.UpgradeFingerprint)
-            : addEquipment(inventory, category, salvageItem.ItemType, {
-                  UpgradeFingerprint: salvageItem.UpgradeFingerprint
-              })),
+            : addEquipment(
+                  inventory,
+                  category,
+                  salvageItem.ItemType,
+                  undefined,
+                  {},
+                  {
+                      UpgradeFingerprint: salvageItem.UpgradeFingerprint
+                  }
+              )),
         ...occupySlot(inventory, InventorySlot.RJ_COMPONENT_AND_ARMAMENTS, false)
     };
 

src/controllers/api/inboxController.ts

@@ -11,10 +11,8 @@ import {
 import { getAccountForRequest, getAccountFromSuffixedName, getSuffixedName } from "@/src/services/loginService";
 import { addItems, combineInventoryChanges, getInventory } from "@/src/services/inventoryService";
 import { logger } from "@/src/utils/logger";
-import { ExportFlavour } from "warframe-public-export-plus";
+import { ExportFlavour, ExportGear } from "warframe-public-export-plus";
 import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
-import { fromStoreItem, isStoreItem } from "@/src/services/itemDataService";
-import { IOid } from "@/src/types/commonTypes";
 
 export const inboxController: RequestHandler = async (req, res) => {
     const { deleteId, lastMessage: latestClientMessageId, messageId } = req.query;
@@ -29,10 +27,10 @@ export const inboxController: RequestHandler = async (req, res) => {
             return;
         }
 
-        await deleteMessageRead(parseOid(deleteId as string));
+        await deleteMessageRead(deleteId as string);
         res.status(200).end();
     } else if (messageId) {
-        const message = await getMessage(parseOid(messageId as string));
+        const message = await getMessage(messageId as string);
         message.r = true;
         await message.save();
 
@@ -50,8 +48,8 @@ export const inboxController: RequestHandler = async (req, res) => {
             await addItems(
                 inventory,
                 attachmentItems.map(attItem => ({
-                    ItemType: isStoreItem(attItem) ? fromStoreItem(attItem) : attItem,
-                    ItemCount: 1
+                    ItemType: attItem,
+                    ItemCount: attItem in ExportGear ? (ExportGear[attItem].purchaseQuantity ?? 1) : 1
                 })),
                 inventoryChanges
             );
@@ -101,7 +99,7 @@ export const inboxController: RequestHandler = async (req, res) => {
         await createNewEventMessages(req);
         const messages = await Inbox.find({ ownerId: accountId }).sort({ date: 1 });
 
-        const latestClientMessage = messages.find(m => m._id.toString() === parseOid(latestClientMessageId as string));
+        const latestClientMessage = messages.find(m => m._id.toString() === latestClientMessageId);
 
         if (!latestClientMessage) {
             logger.debug(`this should only happen after DeleteAllRead `);
@@ -124,11 +122,3 @@ export const inboxController: RequestHandler = async (req, res) => {
         res.json({ Inbox: inbox });
     }
 };
-
-// 33.6.0 has query arguments like lastMessage={"$oid":"68112baebf192e786d1502bb"} instead of lastMessage=68112baebf192e786d1502bb
-const parseOid = (oid: string): string => {
-    if (oid[0] == "{") {
-        return (JSON.parse(oid) as IOid).$oid;
-    }
-    return oid;
-};

src/controllers/api/inventoryController.ts

@@ -1,5 +1,5 @@
 import { RequestHandler } from "express";
-import { getAccountForRequest } from "@/src/services/loginService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
 import { Inventory, TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
 import { config } from "@/src/services/configService";
 import allDialogue from "@/static/fixed_responses/allDialogue.json";
@@ -18,21 +18,15 @@ import {
     addMiscItems,
     allDailyAffiliationKeys,
     cleanupInventory,
-    createLibraryDailyTask,
-    generateRewardSeed
+    createLibraryDailyTask
 } from "@/src/services/inventoryService";
 import { logger } from "@/src/utils/logger";
 import { catBreadHash } from "@/src/helpers/stringHelpers";
-import { Types } from "mongoose";
-import { isNemesisCompatibleWithVersion } from "@/src/helpers/nemesisHelpers";
-import { version_compare } from "@/src/services/worldStateService";
-import { getPersonalRooms } from "@/src/services/personalRoomsService";
-import { IPersonalRoomsClient } from "@/src/types/personalRoomsTypes";
 
 export const inventoryController: RequestHandler = async (request, response) => {
-    const account = await getAccountForRequest(request);
+    const accountId = await getAccountIdForRequest(request);
 
-    const inventory = await Inventory.findOne({ accountOwnerId: account._id });
+    const inventory = await Inventory.findOne({ accountOwnerId: accountId });
 
     if (!inventory) {
         response.status(400).json({ error: "inventory was undefined" });
@@ -93,7 +87,7 @@ export const inventoryController: RequestHandler = async (request, response) =>
         cleanupInventory(inventory);
 
         inventory.NextRefill = new Date((Math.trunc(Date.now() / 86400000) + 1) * 86400000);
-        //await inventory.save();
+        await inventory.save();
     }
 
     if (
@@ -102,36 +96,15 @@ export const inventoryController: RequestHandler = async (request, response) =>
         new Date() >= inventory.InfestedFoundry.AbilityOverrideUnlockCooldown
     ) {
         handleSubsumeCompletion(inventory);
-        //await inventory.save();
+        await inventory.save();
     }
 
-    if (inventory.LastInventorySync) {
-        const lastSyncDuviriMood = Math.trunc(inventory.LastInventorySync.getTimestamp().getTime() / 7200000);
-        const currentDuviriMood = Math.trunc(Date.now() / 7200000);
-        if (lastSyncDuviriMood != currentDuviriMood) {
-            logger.debug(`refreshing duviri seed`);
-            if (!inventory.DuviriInfo) {
-                inventory.DuviriInfo = {
-                    Seed: generateRewardSeed(),
-                    NumCompletions: 0
-                };
-            } else {
-                inventory.DuviriInfo.Seed = generateRewardSeed();
-            }
-        }
-    }
-    inventory.LastInventorySync = new Types.ObjectId();
-    await inventory.save();
-
-    response.json(
-        await getInventoryResponse(inventory, "xpBasedLevelCapDisabled" in request.query, account.BuildLabel)
-    );
+    response.json(await getInventoryResponse(inventory, "xpBasedLevelCapDisabled" in request.query));
 };
 
 export const getInventoryResponse = async (
     inventory: TInventoryDatabaseDocument,
-    xpBasedLevelCapDisabled: boolean,
-    buildLabel: string | undefined
+    xpBasedLevelCapDisabled: boolean
 ): Promise<IInventoryClient> => {
     const inventoryWithLoadOutPresets = await inventory.populate<{ LoadOutPresets: ILoadoutDatabase }>(
         "LoadOutPresets"
@@ -301,26 +274,11 @@ export const getInventoryResponse = async (
     }
 
     // Omitting this field so opening the navigation resyncs the inventory which is more desirable for typical usage.
-    inventoryResponse.LastInventorySync = undefined;
+    //inventoryResponse.LastInventorySync = toOid(new Types.ObjectId());
 
     // Set 2FA enabled so trading post can be used
     inventoryResponse.HWIDProtectEnabled = true;
 
-    // Fix nemesis for older versions
-    if (
-        inventoryResponse.Nemesis &&
-        buildLabel &&
-        !isNemesisCompatibleWithVersion(inventoryResponse.Nemesis, buildLabel)
-    ) {
-        inventoryResponse.Nemesis = undefined;
-    }
-
-    if (buildLabel && version_compare(buildLabel, "2018.02.22.14.34") < 0) {
-        const personalRoomsDb = await getPersonalRooms(inventory.accountOwnerId.toString());
-        const personalRooms = personalRoomsDb.toJSON<IPersonalRoomsClient>();
-        inventoryResponse.Ship = personalRooms.Ship;
-    }
-
     return inventoryResponse;
 };
 

src/controllers/api/loginController.ts

@@ -7,7 +7,6 @@ import { Account } from "@/src/models/loginModel";
 import { createAccount, isCorrectPassword, isNameTaken } from "@/src/services/loginService";
 import { IDatabaseAccountJson, ILoginRequest, ILoginResponse } from "@/src/types/loginTypes";
 import { logger } from "@/src/utils/logger";
-import { version_compare } from "@/src/services/worldStateService";
 
 export const loginController: RequestHandler = async (request, response) => {
     const loginRequest = JSON.parse(String(request.body)) as ILoginRequest; // parse octet stream of json data to json object
@@ -22,11 +21,7 @@ export const loginController: RequestHandler = async (request, response) => {
 
     const myAddress = request.host.indexOf("warframe.com") == -1 ? request.host : config.myAddress;
 
-    if (
-        !account &&
-        ((config.autoCreateAccount && loginRequest.ClientType != "webui") ||
-            loginRequest.ClientType == "webui-register")
-    ) {
+    if (!account && config.autoCreateAccount && loginRequest.ClientType != "webui") {
         try {
             const nameFromEmail = loginRequest.email.substring(0, loginRequest.email.indexOf("@"));
             let name = nameFromEmail || loginRequest.email.substring(1) || "SpaceNinja";
@@ -41,14 +36,13 @@ export const loginController: RequestHandler = async (request, response) => {
                 email: loginRequest.email,
                 password: loginRequest.password,
                 DisplayName: name,
-                CountryCode: loginRequest.lang?.toUpperCase() ?? "EN",
-                ClientType: loginRequest.ClientType == "webui-register" ? "webui" : loginRequest.ClientType,
+                CountryCode: loginRequest.lang.toUpperCase(),
+                ClientType: loginRequest.ClientType,
                 CrossPlatformAllowed: true,
                 ForceLogoutVersion: 0,
                 ConsentNeeded: false,
                 TrackedSettings: [],
-                Nonce: nonce,
-                BuildLabel: buildLabel
+                Nonce: nonce
             });
             logger.debug("created new account");
             response.json(createLoginResponse(myAddress, newAccount, buildLabel));
@@ -65,11 +59,6 @@ export const loginController: RequestHandler = async (request, response) => {
         return;
     }
 
-    if (loginRequest.ClientType == "webui-register") {
-        response.status(400).json({ error: "account already exists" });
-        return;
-    }
-
     if (!isCorrectPassword(loginRequest.password, account.password)) {
         response.status(400).json({ error: "incorrect login data" });
         return;
@@ -82,17 +71,13 @@ export const loginController: RequestHandler = async (request, response) => {
         }
     } else {
         if (account.Nonce && account.ClientType != "webui" && !account.Dropped && !loginRequest.kick) {
-            // U17 seems to handle "nonce still set" like a login failure.
-            if (version_compare(buildLabel, "2015.12.05.18.07") >= 0) {
-                response.status(400).send({ error: "nonce still set" });
-                return;
-            }
+            response.status(400).json({ error: "nonce still set" });
+            return;
         }
 
         account.ClientType = loginRequest.ClientType;
         account.Nonce = nonce;
-        account.CountryCode = loginRequest.lang?.toUpperCase() ?? "EN";
-        account.BuildLabel = buildLabel;
+        account.CountryCode = loginRequest.lang.toUpperCase();
     }
     await account.save();
 
@@ -100,48 +85,25 @@ export const loginController: RequestHandler = async (request, response) => {
 };
 
 const createLoginResponse = (myAddress: string, account: IDatabaseAccountJson, buildLabel: string): ILoginResponse => {
-    const resp: ILoginResponse = {
+    return {
         id: account.id,
         DisplayName: account.DisplayName,
         CountryCode: account.CountryCode,
+        ClientType: account.ClientType,
+        CrossPlatformAllowed: account.CrossPlatformAllowed,
+        ForceLogoutVersion: account.ForceLogoutVersion,
         AmazonAuthToken: account.AmazonAuthToken,
         AmazonRefreshToken: account.AmazonRefreshToken,
+        ConsentNeeded: account.ConsentNeeded,
+        TrackedSettings: account.TrackedSettings,
         Nonce: account.Nonce,
-        BuildLabel: buildLabel
+        Groups: [],
+        IRC: config.myIrcAddresses ?? [myAddress],
+        platformCDNs: [`https://${myAddress}/`],
+        HUB: `https://${myAddress}/api/`,
+        NRS: config.NRS,
+        DTLS: 99,
+        BuildLabel: buildLabel,
+        MatchmakingBuildId: buildConfig.matchmakingBuildId
     };
-    if (version_compare(buildLabel, "2015.02.13.10.41") >= 0) {
-        resp.NRS = config.NRS;
-    }
-    if (version_compare(buildLabel, "2015.05.14.16.29") >= 0) {
-        // U17 and up
-        resp.IRC = config.myIrcAddresses ?? [myAddress];
-    }
-    if (version_compare(buildLabel, "2018.11.08.14.45") >= 0) {
-        // U24 and up
-        resp.ConsentNeeded = account.ConsentNeeded;
-        resp.TrackedSettings = account.TrackedSettings;
-    }
-    if (version_compare(buildLabel, "2019.08.29.20.01") >= 0) {
-        // U25.7 and up
-        resp.ForceLogoutVersion = account.ForceLogoutVersion;
-    }
-    if (version_compare(buildLabel, "2019.10.31.22.42") >= 0) {
-        // U26 and up
-        resp.Groups = [];
-    }
-    if (version_compare(buildLabel, "2021.04.13.19.58") >= 0) {
-        resp.DTLS = 99;
-    }
-    if (version_compare(buildLabel, "2022.04.29.12.53") >= 0) {
-        resp.ClientType = account.ClientType;
-    }
-    if (version_compare(buildLabel, "2022.09.06.19.24") >= 0) {
-        resp.CrossPlatformAllowed = account.CrossPlatformAllowed;
-        resp.HUB = `https://${myAddress}/api/`;
-        resp.MatchmakingBuildId = buildConfig.matchmakingBuildId;
-    }
-    if (version_compare(buildLabel, "2023.04.25.23.40") >= 0) {
-        resp.platformCDNs = [`https://${myAddress}/`];
-    }
-    return resp;
 };

src/controllers/api/missionInventoryUpdateController.ts

@@ -1,12 +1,11 @@
 import { RequestHandler } from "express";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { getAccountForRequest } from "@/src/services/loginService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
 import { IMissionInventoryUpdateRequest } from "@/src/types/requestTypes";
 import { addMissionInventoryUpdates, addMissionRewards } from "@/src/services/missionInventoryUpdateService";
-import { generateRewardSeed, getInventory } from "@/src/services/inventoryService";
+import { getInventory } from "@/src/services/inventoryService";
 import { getInventoryResponse } from "./inventoryController";
 import { logger } from "@/src/utils/logger";
-import { IMissionInventoryUpdateResponse } from "@/src/types/missionTypes";
 
 /*
 **** INPUT ****
@@ -49,11 +48,11 @@ import { IMissionInventoryUpdateResponse } from "@/src/types/missionTypes";
 */
 //move credit calc in here, return MissionRewards: [] if no reward info
 export const missionInventoryUpdateController: RequestHandler = async (req, res): Promise<void> => {
-    const account = await getAccountForRequest(req);
+    const accountId = await getAccountIdForRequest(req);
     const missionReport = getJSONfromString<IMissionInventoryUpdateRequest>((req.body as string).toString());
     logger.debug("mission report:", missionReport);
 
-    const inventory = await getInventory(account._id.toString());
+    const inventory = await getInventory(accountId);
     const firstCompletion = missionReport.SortieId
         ? inventory.CompletedSorties.indexOf(missionReport.SortieId) == -1
         : false;
@@ -63,11 +62,8 @@ export const missionInventoryUpdateController: RequestHandler = async (req, res)
         missionReport.MissionStatus !== "GS_SUCCESS" &&
         !(missionReport.RewardInfo?.jobId || missionReport.RewardInfo?.challengeMissionId)
     ) {
-        if (missionReport.EndOfMatchUpload) {
-            inventory.RewardSeed = generateRewardSeed();
-        }
         await inventory.save();
-        const inventoryResponse = await getInventoryResponse(inventory, true, account.BuildLabel);
+        const inventoryResponse = await getInventoryResponse(inventory, true);
         res.json({
             InventoryJson: JSON.stringify(inventoryResponse),
             MissionRewards: []
@@ -75,20 +71,11 @@ export const missionInventoryUpdateController: RequestHandler = async (req, res)
         return;
     }
 
-    const {
-        MissionRewards,
-        inventoryChanges,
-        credits,
-        AffiliationMods,
-        SyndicateXPItemReward,
-        ConquestCompletedMissionsCount
-    } = await addMissionRewards(inventory, missionReport, firstCompletion);
+    const { MissionRewards, inventoryChanges, credits, AffiliationMods, SyndicateXPItemReward } =
+        await addMissionRewards(inventory, missionReport, firstCompletion);
 
-    if (missionReport.EndOfMatchUpload) {
-        inventory.RewardSeed = generateRewardSeed();
-    }
     await inventory.save();
-    const inventoryResponse = await getInventoryResponse(inventory, true, account.BuildLabel);
+    const inventoryResponse = await getInventoryResponse(inventory, true);
 
     //TODO: figure out when to send inventory. it is needed for many cases.
     res.json({
@@ -99,9 +86,8 @@ export const missionInventoryUpdateController: RequestHandler = async (req, res)
         ...inventoryUpdates,
         //FusionPoints: inventoryChanges?.FusionPoints, // This in combination with InventoryJson or InventoryChanges seems to just double the number of endo shown, so unsure when this is needed.
         SyndicateXPItemReward,
-        AffiliationMods,
-        ConquestCompletedMissionsCount
-    } satisfies IMissionInventoryUpdateResponse);
+        AffiliationMods
+    });
 };
 
 /*

src/controllers/api/modularWeaponCraftingController.ts

@@ -17,7 +17,7 @@ import { getDefaultUpgrades } from "@/src/services/itemDataService";
 import { modularWeaponTypes } from "@/src/helpers/modularWeaponHelper";
 import { IEquipmentDatabase } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { getRandomInt } from "@/src/services/rngService";
-import { ExportSentinels, ExportWeapons, IDefaultUpgrade } from "warframe-public-export-plus";
+import { ExportSentinels, IDefaultUpgrade } from "warframe-public-export-plus";
 import { Status } from "@/src/types/inventoryTypes/inventoryTypes";
 
 interface IModularCraftRequest {
@@ -36,9 +36,7 @@ export const modularWeaponCraftingController: RequestHandler = async (req, res)
     const inventory = await getInventory(accountId);
 
     let defaultUpgrades: IDefaultUpgrade[] | undefined;
-    const defaultOverwrites: Partial<IEquipmentDatabase> = {
-        ModularParts: data.Parts
-    };
+    const defaultOverwrites: Partial<IEquipmentDatabase> = {};
     const inventoryChanges: IInventoryChanges = {};
     if (category == "KubrowPets") {
         const traits = {
@@ -140,20 +138,8 @@ export const modularWeaponCraftingController: RequestHandler = async (req, res)
     } else {
         defaultUpgrades = getDefaultUpgrades(data.Parts);
     }
-
-    if (category == "MoaPets") {
-        const weapon = ExportSentinels[data.WeaponType].defaultWeapon;
-        if (weapon) {
-            const category = ExportWeapons[weapon].productCategory;
-            addEquipment(inventory, category, weapon, undefined, inventoryChanges);
-            combineInventoryChanges(
-                inventoryChanges,
-                occupySlot(inventory, productCategoryToInventoryBin(category)!, !!data.isWebUi)
-            );
-        }
-    }
     defaultOverwrites.Configs = applyDefaultUpgrades(inventory, defaultUpgrades);
-    addEquipment(inventory, category, data.WeaponType, defaultOverwrites, inventoryChanges);
+    addEquipment(inventory, category, data.WeaponType, data.Parts, inventoryChanges, defaultOverwrites);
     combineInventoryChanges(
         inventoryChanges,
         occupySlot(inventory, productCategoryToInventoryBin(category)!, !!data.isWebUi)

src/controllers/api/modularWeaponSaleController.ts

@@ -21,11 +21,7 @@ import { IInventoryChanges } from "@/src/types/purchaseTypes";
 export const modularWeaponSaleController: RequestHandler = async (req, res) => {
     const partTypeToParts: Record<string, string[]> = {};
     for (const [uniqueName, data] of Object.entries(ExportWeapons)) {
-        if (
-            data.partType &&
-            data.premiumPrice &&
-            !data.excludeFromCodex // exclude pvp variants
-        ) {
+        if (data.partType && data.premiumPrice) {
             partTypeToParts[data.partType] ??= [];
             partTypeToParts[data.partType].push(uniqueName);
         }
@@ -45,18 +41,24 @@ export const modularWeaponSaleController: RequestHandler = async (req, res) => {
         const defaultUpgrades = getDefaultUpgrades(weaponInfo.ModularParts);
         const configs = applyDefaultUpgrades(inventory, defaultUpgrades);
         const inventoryChanges: IInventoryChanges = {
-            ...addEquipment(inventory, category, weaponInfo.ItemType, {
-                Features: EquipmentFeatures.DOUBLE_CAPACITY | EquipmentFeatures.GILDED,
-                ItemName: payload.ItemName,
-                Configs: configs,
-                ModularParts: weaponInfo.ModularParts,
-                Polarity: [
-                    {
-                        Slot: payload.PolarizeSlot,
-                        Value: payload.PolarizeValue
-                    }
-                ]
-            }),
+            ...addEquipment(
+                inventory,
+                category,
+                weaponInfo.ItemType,
+                weaponInfo.ModularParts,
+                {},
+                {
+                    Features: EquipmentFeatures.DOUBLE_CAPACITY | EquipmentFeatures.GILDED,
+                    ItemName: payload.ItemName,
+                    Configs: configs,
+                    Polarity: [
+                        {
+                            Slot: payload.PolarizeSlot,
+                            Value: payload.PolarizeValue
+                        }
+                    ]
+                }
+            ),
             ...occupySlot(inventory, productCategoryToInventoryBin(category)!, true),
             ...updateCurrency(inventory, weaponInfo.PremiumPrice, true)
         };
@@ -141,7 +143,7 @@ const getModularWeaponSale = (
     getItemType: (parts: string[]) => string
 ): IModularWeaponSaleInfo => {
     const rng = new CRng(day);
-    const parts = partTypes.map(partType => rng.randomElement(partTypeToParts[partType])!);
+    const parts = partTypes.map(partType => rng.randomElement(partTypeToParts[partType]));
     let partsCost = 0;
     for (const part of parts) {
         partsCost += ExportWeapons[part].premiumPrice!;

src/controllers/api/nemesisController.ts

@@ -2,12 +2,8 @@ import {
     consumeModCharge,
     encodeNemesisGuess,
     getInfNodes,
-    getKnifeUpgrade,
     getNemesisPasscode,
-    getNemesisPasscodeModTypes,
-    getWeaponsForManifest,
-    IKnifeResponse,
-    showdownNodes
+    IKnifeResponse
 } from "@/src/helpers/nemesisHelpers";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Loadout } from "@/src/models/inventoryModels/loadoutModel";
@@ -18,8 +14,6 @@ import { IMongoDate, IOid } from "@/src/types/commonTypes";
 import { IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import {
     IInnateDamageFingerprint,
-    IInventoryClient,
-    INemesisClient,
     InventorySlot,
     IUpgradeClient,
     IWeaponSkinClient,
@@ -105,45 +99,50 @@ export const nemesisController: RequestHandler = async (req, res) => {
                 encodeNemesisGuess(guess[0], result1, guess[1], result2, guess[2], result3)
             );
 
-            // Increase antivirus if correct antivirus mod is installed
+            // Increase antivirus
+            let antivirusGain = 5;
+            const loadout = (await Loadout.findById(inventory.LoadOutPresets, "DATAKNIFE"))!;
+            const dataknifeLoadout = loadout.DATAKNIFE.id(inventory.CurrentLoadOutIds[LoadoutIndex.DATAKNIFE].$oid);
+            const dataknifeConfigIndex = dataknifeLoadout?.s?.mod ?? 0;
+            const dataknifeUpgrades = inventory.DataKnives[0].Configs[dataknifeConfigIndex].Upgrades!;
             const response: IKnifeResponse = {};
-            if (result1 == 0 || result2 == 0 || result3 == 0) {
-                let antivirusGain = 5;
-                const loadout = (await Loadout.findById(inventory.LoadOutPresets, "DATAKNIFE"))!;
-                const dataknifeLoadout = loadout.DATAKNIFE.id(inventory.CurrentLoadOutIds[LoadoutIndex.DATAKNIFE].$oid);
-                const dataknifeConfigIndex = dataknifeLoadout?.s?.mod ?? 0;
-                const dataknifeUpgrades = inventory.DataKnives[0].Configs[dataknifeConfigIndex].Upgrades!;
-                for (const upgrade of body.knife!.AttachedUpgrades) {
-                    switch (upgrade.ItemType) {
-                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusAndSpeedOnUseMod":
-                            antivirusGain += 10;
-                            consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                            break;
-                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusAndWeaponDamageOnUseMod":
-                            antivirusGain += 10;
-                            consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                            break;
-                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusLargeOnSingleUseMod": // Instant Secure
-                            antivirusGain += 15;
-                            consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                            break;
-                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusOnUseMod": // Immuno Shield
-                            antivirusGain += 15;
-                            consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                            break;
-                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusSmallOnSingleUseMod":
-                            antivirusGain += 10;
-                            consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                            break;
-                    }
+            for (const upgrade of body.knife!.AttachedUpgrades) {
+                switch (upgrade.ItemType) {
+                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusAndSpeedOnUseMod":
+                        antivirusGain += 10;
+                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
+                        break;
+                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusAndWeaponDamageOnUseMod":
+                        antivirusGain += 10;
+                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
+                        break;
+                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusLargeOnSingleUseMod": // Instant Secure
+                        antivirusGain += 15;
+                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
+                        break;
+                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusOnUseMod": // Immuno Shield
+                        antivirusGain += 15;
+                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
+                        break;
+                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusSmallOnSingleUseMod":
+                        antivirusGain += 10;
+                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
+                        break;
                 }
-                inventory.Nemesis!.HenchmenKilled += antivirusGain;
             }
-
+            inventory.Nemesis!.HenchmenKilled += antivirusGain;
             if (inventory.Nemesis!.HenchmenKilled >= 100) {
                 inventory.Nemesis!.HenchmenKilled = 100;
+                inventory.Nemesis!.InfNodes = [
+                    {
+                        Node: "CrewBattleNode559",
+                        Influence: 1
+                    }
+                ];
+                inventory.Nemesis!.Weakened = true;
+            } else {
+                inventory.Nemesis!.InfNodes = getInfNodes("FC_INFESTATION", 0);
             }
-            inventory.Nemesis!.InfNodes = getInfNodes("FC_INFESTATION", 0);
 
             await inventory.save();
             res.json(response);
@@ -171,7 +170,18 @@ export const nemesisController: RequestHandler = async (req, res) => {
 
         let weaponIdx = -1;
         if (body.target.Faction != "FC_INFESTATION") {
-            const weapons = getWeaponsForManifest(body.target.manifest);
+            let weapons: readonly string[];
+            if (body.target.manifest == "/Lotus/Types/Game/Nemesis/KuvaLich/KuvaLichManifestVersionSix") {
+                weapons = kuvaLichVersionSixWeapons;
+            } else if (
+                body.target.manifest == "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionFour" ||
+                body.target.manifest == "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionThree"
+            ) {
+                weapons = corpusVersionThreeWeapons;
+            } else {
+                throw new Error(`unknown nemesis manifest: ${body.target.manifest}`);
+            }
+
             const initialWeaponIdx = new SRng(body.target.fp).randomInt(0, weapons.length - 1);
             weaponIdx = initialWeaponIdx;
             do {
@@ -213,38 +223,6 @@ export const nemesisController: RequestHandler = async (req, res) => {
         res.json({
             target: inventory.toJSON().Nemesis
         });
-    } else if ((req.query.mode as string) == "w") {
-        const inventory = await getInventory(
-            accountId,
-            "Nemesis LoadOutPresets CurrentLoadOutIds DataKnives Upgrades RawUpgrades"
-        );
-        //const body = getJSONfromString<INemesisWeakenRequest>(String(req.body));
-
-        inventory.Nemesis!.InfNodes = [
-            {
-                Node: showdownNodes[inventory.Nemesis!.Faction],
-                Influence: 1
-            }
-        ];
-        inventory.Nemesis!.Weakened = true;
-
-        const response: IKnifeResponse & { target: INemesisClient } = {
-            target: inventory.toJSON<IInventoryClient>().Nemesis!
-        };
-
-        // Consume charge of the correct requiem mod(s)
-        const loadout = (await Loadout.findById(inventory.LoadOutPresets, "DATAKNIFE"))!;
-        const dataknifeLoadout = loadout.DATAKNIFE.id(inventory.CurrentLoadOutIds[LoadoutIndex.DATAKNIFE].$oid);
-        const dataknifeConfigIndex = dataknifeLoadout?.s?.mod ?? 0;
-        const dataknifeUpgrades = inventory.DataKnives[0].Configs[dataknifeConfigIndex].Upgrades!;
-        const modTypes = getNemesisPasscodeModTypes(inventory.Nemesis!);
-        for (const modType of modTypes) {
-            const upgrade = getKnifeUpgrade(inventory, dataknifeUpgrades, modType);
-            consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-        }
-
-        await inventory.save();
-        res.json(response);
     } else {
         logger.debug(`data provided to ${req.path}: ${String(req.body)}`);
         throw new Error(`unknown nemesis mode: ${String(req.query.mode)}`);
@@ -296,19 +274,48 @@ interface INemesisRequiemRequest {
     guess: number; // grn/crp: 4 bits | coda: 3x 4 bits
     position: number; // grn/crp: 0-2 | coda: 0
     // knife field provided for coda only
-    knife?: IKnife;
+    knife?: {
+        Item: IEquipmentClient;
+        Skins: IWeaponSkinClient[];
+        ModSlot: number;
+        CustSlot: number;
+        AttachedUpgrades: IUpgradeClient[];
+        HiddenWhenHolstered: boolean;
+    };
 }
 
-// interface INemesisWeakenRequest {
-//     target: INemesisClient;
-//     knife: IKnife;
-// }
+const kuvaLichVersionSixWeapons = [
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Drakgoon/KuvaDrakgoon",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Karak/KuvaKarak",
+    "/Lotus/Weapons/Grineer/Melee/GrnKuvaLichScythe/GrnKuvaLichScytheWeapon",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Kohm/KuvaKohm",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Ogris/KuvaOgris",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Quartakk/KuvaQuartakk",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Tonkor/KuvaTonkor",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Brakk/KuvaBrakk",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Kraken/KuvaKraken",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Seer/KuvaSeer",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Stubba/KuvaStubba",
+    "/Lotus/Weapons/Grineer/HeavyWeapons/GrnHeavyGrenadeLauncher",
+    "/Lotus/Weapons/Grineer/LongGuns/GrnKuvaLichRifle/GrnKuvaLichRifleWeapon",
+    "/Lotus/Weapons/Grineer/Bows/GrnBow/GrnBowWeapon",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hind/KuvaHind",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Nukor/KuvaNukor",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hek/KuvaHekWeapon",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Zarr/KuvaZarr",
+    "/Lotus/Weapons/Grineer/KuvaLich/HeavyWeapons/Grattler/KuvaGrattler",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Sobek/KuvaSobek"
+];
 
-interface IKnife {
-    Item: IEquipmentClient;
-    Skins: IWeaponSkinClient[];
-    ModSlot: number;
-    CustSlot: number;
-    AttachedUpgrades: IUpgradeClient[];
-    HiddenWhenHolstered: boolean;
-}
+const corpusVersionThreeWeapons = [
+    "/Lotus/Weapons/Corpus/LongGuns/CrpBriefcaseLauncher/CrpBriefcaseLauncher",
+    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEArcaPlasmor/CrpBEArcaPlasmor",
+    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEFluxRifle/CrpBEFluxRifle",
+    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBETetra/CrpBETetra",
+    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBECycron/CrpBECycron",
+    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBEDetron/CrpBEDetron",
+    "/Lotus/Weapons/Corpus/Pistols/CrpIgniterPistol/CrpIgniterPistol",
+    "/Lotus/Weapons/Corpus/Pistols/CrpBriefcaseAkimbo/CrpBriefcaseAkimboPistol",
+    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBEPlinx/CrpBEPlinxWeapon",
+    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEGlaxion/CrpBEGlaxion"
+];

src/controllers/api/placeDecoInComponentController.ts

@@ -37,7 +37,6 @@ export const placeDecoInComponentController: RequestHandler = async (req, res) =
         const deco = component.Decos.find(x => x._id.equals(request.MoveId))!;
         deco.Pos = request.Pos;
         deco.Rot = request.Rot;
-        deco.Scale = request.Scale;
     } else {
         const deco =
             component.Decos[
@@ -46,7 +45,6 @@ export const placeDecoInComponentController: RequestHandler = async (req, res) =
                     Type: request.Type,
                     Pos: request.Pos,
                     Rot: request.Rot,
-                    Scale: request.Scale,
                     Name: request.Name,
                     Sockets: request.Sockets
                 }) - 1
@@ -115,9 +113,9 @@ interface IPlaceDecoInComponentRequest {
     Type: string;
     Pos: number[];
     Rot: number[];
-    Scale?: number;
     Name?: string;
     Sockets?: number;
+    Scale?: number; // only provided alongside MoveId and seems to always be 1
     MoveId?: string;
     ShipDeco?: boolean;
     VaultDeco?: boolean;

src/controllers/api/questControlController.ts

@@ -1,25 +0,0 @@
-import { getInventory } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { RequestHandler } from "express";
-
-// Basic shim handling action=sync to login on U21
-export const questControlController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId);
-    const quests: IQuestState[] = [];
-    for (const quest of inventory.QuestKeys) {
-        quests.push({
-            quest: quest.ItemType,
-            state: 3 // COMPLETE
-        });
-    }
-    res.json({
-        QuestState: quests
-    });
-};
-
-interface IQuestState {
-    quest: string;
-    state: number;
-    task?: string;
-}

src/controllers/api/saveDialogueController.ts

@@ -4,6 +4,7 @@ import { addEmailItem, getInventory, updateCurrency } from "@/src/services/inven
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { ICompletedDialogue, IDialogueDatabase } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
+import { logger } from "@/src/utils/logger";
 import { RequestHandler } from "express";
 
 export const saveDialogueController: RequestHandler = async (req, res) => {
@@ -26,33 +27,33 @@ export const saveDialogueController: RequestHandler = async (req, res) => {
         const dialogue = getDialogue(inventory, request.DialogueName);
         dialogue.Rank = request.Rank;
         dialogue.Chemistry = request.Chemistry;
-        dialogue.QueuedDialogues = request.QueuedDialogues;
-        for (const bool of request.Booleans) {
-            dialogue.Booleans.push(bool);
-            if (bool == "LizzieShawzin") {
-                await addEmailItem(
-                    inventory,
-                    "/Lotus/Types/Items/EmailItems/LizzieShawzinSkinEmailItem",
-                    inventoryChanges
-                );
-            }
-        }
-        for (const bool of request.ResetBooleans) {
-            const index = dialogue.Booleans.findIndex(x => x == bool);
-            if (index != -1) {
-                dialogue.Booleans.splice(index, 1);
-            }
-        }
-        for (const info of request.OtherDialogueInfos) {
-            const otherDialogue = getDialogue(inventory, info.Dialogue);
-            if (info.Tag != "") {
-                otherDialogue.QueuedDialogues.push(info.Tag);
-            }
-            otherDialogue.Chemistry += info.Value; // unsure
-        }
         if (request.Data) {
+            dialogue.QueuedDialogues = request.QueuedDialogues;
+            for (const bool of request.Booleans) {
+                dialogue.Booleans.push(bool);
+                if (bool == "LizzieShawzin") {
+                    await addEmailItem(
+                        inventory,
+                        "/Lotus/Types/Items/EmailItems/LizzieShawzinSkinEmailItem",
+                        inventoryChanges
+                    );
+                }
+            }
+            for (const bool of request.ResetBooleans) {
+                const index = dialogue.Booleans.findIndex(x => x == bool);
+                if (index != -1) {
+                    dialogue.Booleans.splice(index, 1);
+                }
+            }
             dialogue.Completed.push(request.Data);
             dialogue.AvailableDate = new Date(tomorrowAt0Utc);
+            for (const info of request.OtherDialogueInfos) {
+                const otherDialogue = getDialogue(inventory, info.Dialogue);
+                if (info.Tag != "") {
+                    otherDialogue.QueuedDialogues.push(info.Tag);
+                }
+                otherDialogue.Chemistry += info.Value; // unsure
+            }
             await inventory.save();
             res.json({
                 InventoryChanges: inventoryChanges,
@@ -73,7 +74,7 @@ export const saveDialogueController: RequestHandler = async (req, res) => {
                 AvailableGiftDate: { $date: { $numberLong: tomorrowAt0Utc.toString() } }
             });
         } else {
-            res.end();
+            logger.error(`saveDialogue request not fully handled: ${String(req.body)}`);
         }
     }
 };

src/controllers/api/sellController.ts

@@ -8,8 +8,7 @@ import {
     addConsumables,
     freeUpSlot,
     combineInventoryChanges,
-    addCrewShipRawSalvage,
-    addFusionPoints
+    addCrewShipRawSalvage
 } from "@/src/services/inventoryService";
 import { InventorySlot } from "@/src/types/inventoryTypes/inventoryTypes";
 import { ExportDojoRecipes } from "warframe-public-export-plus";
@@ -45,10 +44,7 @@ export const sellController: RequestHandler = async (req, res) => {
     if (payload.Items.SpaceGuns || payload.Items.SpaceMelee) {
         requiredFields.add(InventorySlot.SPACEWEAPONS);
     }
-    if (payload.Items.MechSuits) {
-        requiredFields.add(InventorySlot.MECHSUITS);
-    }
-    if (payload.Items.Sentinels || payload.Items.SentinelWeapons || payload.Items.MoaPets) {
+    if (payload.Items.Sentinels || payload.Items.SentinelWeapons) {
         requiredFields.add(InventorySlot.SENTINELS);
     }
     if (payload.Items.OperatorAmps) {
@@ -73,7 +69,7 @@ export const sellController: RequestHandler = async (req, res) => {
     if (payload.SellCurrency == "SC_RegularCredits") {
         inventory.RegularCredits += payload.SellPrice;
     } else if (payload.SellCurrency == "SC_FusionPoints") {
-        addFusionPoints(inventory, payload.SellPrice);
+        inventory.FusionPoints += payload.SellPrice;
     } else if (payload.SellCurrency == "SC_PrimeBucks") {
         addMiscItems(inventory, [
             {
@@ -139,12 +135,6 @@ export const sellController: RequestHandler = async (req, res) => {
             freeUpSlot(inventory, InventorySlot.SPACEWEAPONS);
         });
     }
-    if (payload.Items.MechSuits) {
-        payload.Items.MechSuits.forEach(sellItem => {
-            inventory.MechSuits.pull({ _id: sellItem.String });
-            freeUpSlot(inventory, InventorySlot.MECHSUITS);
-        });
-    }
     if (payload.Items.Sentinels) {
         payload.Items.Sentinels.forEach(sellItem => {
             inventory.Sentinels.pull({ _id: sellItem.String });
@@ -157,12 +147,6 @@ export const sellController: RequestHandler = async (req, res) => {
             freeUpSlot(inventory, InventorySlot.SENTINELS);
         });
     }
-    if (payload.Items.MoaPets) {
-        payload.Items.MoaPets.forEach(sellItem => {
-            inventory.MoaPets.pull({ _id: sellItem.String });
-            freeUpSlot(inventory, InventorySlot.SENTINELS);
-        });
-    }
     if (payload.Items.OperatorAmps) {
         payload.Items.OperatorAmps.forEach(sellItem => {
             inventory.OperatorAmps.pull({ _id: sellItem.String });
@@ -294,10 +278,8 @@ interface ISellRequest {
         SpaceSuits?: ISellItem[];
         SpaceGuns?: ISellItem[];
         SpaceMelee?: ISellItem[];
-        MechSuits?: ISellItem[];
         Sentinels?: ISellItem[];
         SentinelWeapons?: ISellItem[];
-        MoaPets?: ISellItem[];
         OperatorAmps?: ISellItem[];
         Hoverboards?: ISellItem[];
         Drones?: ISellItem[];

src/controllers/api/setGuildMotdController.ts

@@ -2,7 +2,6 @@ import { Alliance, Guild, GuildMember } from "@/src/models/guildModel";
 import { hasGuildPermissionEx } from "@/src/services/guildService";
 import { getInventory } from "@/src/services/inventoryService";
 import { getAccountForRequest, getSuffixedName } from "@/src/services/loginService";
-import { version_compare } from "@/src/services/worldStateService";
 import { GuildPermission, ILongMOTD } from "@/src/types/guildTypes";
 import { RequestHandler } from "express";
 
@@ -56,9 +55,5 @@ export const setGuildMotdController: RequestHandler = async (req, res) => {
         await guild.save();
     }
 
-    if (!account.BuildLabel || version_compare(account.BuildLabel, "2020.03.24.20.24") > 0) {
-        res.json({ IsLongMOTD, MOTD });
-    } else {
-        res.send(MOTD).end();
-    }
+    res.json({ IsLongMOTD, MOTD });
 };

src/controllers/api/setShipFavouriteLoadoutController.ts

@@ -20,7 +20,7 @@ export const setShipFavouriteLoadoutController: RequestHandler = async (req, res
         throw new Error(`unexpected BootLocation: ${body.BootLocation}`);
     }
     await personalRooms.save();
-    res.json(body);
+    res.json({});
 };
 
 interface ISetShipFavouriteLoadoutRequest {

src/controllers/api/startRecipeController.ts

@@ -41,7 +41,7 @@ export const startRecipeController: RequestHandler = async (req, res) => {
         ];
 
     for (let i = 0; i != recipe.ingredients.length; ++i) {
-        if (startRecipeRequest.Ids[i] && startRecipeRequest.Ids[i][0] != "/") {
+        if (startRecipeRequest.Ids[i]) {
             const category = ExportWeapons[recipe.ingredients[i].ItemType].productCategory;
             if (category != "LongGuns" && category != "Pistols" && category != "Melee") {
                 throw new Error(`unexpected equipment ingredient type: ${category}`);

src/controllers/api/syndicateSacrificeController.ts

@@ -6,9 +6,6 @@ import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
 import { addMiscItems, combineInventoryChanges, getInventory, updateCurrency } from "@/src/services/inventoryService";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
 import { isStoreItem, toStoreItem } from "@/src/services/itemDataService";
-import { logger } from "@/src/utils/logger";
-
-const nightwaveCredsItemType = ExportNightwave.rewards[ExportNightwave.rewards.length - 1].uniqueName;
 
 export const syndicateSacrificeController: RequestHandler = async (request, response) => {
     const accountId = await getAccountIdForRequest(request);
@@ -77,14 +74,10 @@ export const syndicateSacrificeController: RequestHandler = async (request, resp
             if (!isStoreItem(rewardType)) {
                 rewardType = toStoreItem(rewardType);
             }
-            const rewardInventoryChanges = (await handleStoreItemAcquisition(rewardType, inventory, reward.itemCount))
-                .InventoryChanges;
-            if (Object.keys(rewardInventoryChanges).length == 0) {
-                logger.debug(`nightwave rank up reward did not seem to get added, giving 50 creds instead`);
-                rewardInventoryChanges.MiscItems = [{ ItemType: nightwaveCredsItemType, ItemCount: 50 }];
-                addMiscItems(inventory, rewardInventoryChanges.MiscItems);
-            }
-            combineInventoryChanges(res.InventoryChanges, rewardInventoryChanges);
+            combineInventoryChanges(
+                res.InventoryChanges,
+                (await handleStoreItemAcquisition(rewardType, inventory, reward.itemCount)).InventoryChanges
+            );
         }
     }
 

src/controllers/custom/addCurrencyController.ts

@@ -1,16 +1,12 @@
 import { RequestHandler } from "express";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { addFusionPoints, getInventory } from "@/src/services/inventoryService";
+import { getInventory } from "@/src/services/inventoryService";
 
 export const addCurrencyController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId);
     const request = req.body as IAddCurrencyRequest;
-    const inventory = await getInventory(accountId, request.currency);
-    if (request.currency == "FusionPoints") {
-        addFusionPoints(inventory, request.delta);
-    } else {
-        inventory[request.currency] += request.delta;
-    }
+    inventory[request.currency] += request.delta;
     await inventory.save();
     res.end();
 };

src/controllers/custom/addItemsController.ts

@@ -7,7 +7,7 @@ export const addItemsController: RequestHandler = async (req, res) => {
     const requests = req.body as IAddItemRequest[];
     const inventory = await getInventory(accountId);
     for (const request of requests) {
-        await addItem(inventory, request.ItemType, request.ItemCount, true, undefined, undefined, true);
+        await addItem(inventory, request.ItemType, request.ItemCount, true);
     }
     await inventory.save();
     res.end();

src/controllers/custom/addMissingMaxRankModsController.ts

@@ -1,44 +0,0 @@
-import { getInventory } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { RequestHandler } from "express";
-import { ExportArcanes, ExportUpgrades } from "warframe-public-export-plus";
-
-export const addMissingMaxRankModsController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "Upgrades");
-
-    const maxOwnedRanks: Record<string, number> = {};
-    for (const upgrade of inventory.Upgrades) {
-        const fingerprint = JSON.parse(upgrade.UpgradeFingerprint ?? "{}") as { lvl?: number };
-        if (fingerprint.lvl) {
-            maxOwnedRanks[upgrade.ItemType] ??= 0;
-            if (fingerprint.lvl > maxOwnedRanks[upgrade.ItemType]) {
-                maxOwnedRanks[upgrade.ItemType] = fingerprint.lvl;
-            }
-        }
-    }
-
-    for (const [uniqueName, data] of Object.entries(ExportUpgrades)) {
-        if (data.fusionLimit != 0 && data.type != "PARAZON" && maxOwnedRanks[uniqueName] != data.fusionLimit) {
-            inventory.Upgrades.push({
-                ItemType: uniqueName,
-                UpgradeFingerprint: JSON.stringify({ lvl: data.fusionLimit })
-            });
-        }
-    }
-
-    for (const [uniqueName, data] of Object.entries(ExportArcanes)) {
-        if (
-            data.name != "/Lotus/Language/Items/GenericCosmeticEnhancerName" &&
-            maxOwnedRanks[uniqueName] != data.fusionLimit
-        ) {
-            inventory.Upgrades.push({
-                ItemType: uniqueName,
-                UpgradeFingerprint: JSON.stringify({ lvl: data.fusionLimit })
-            });
-        }
-    }
-
-    await inventory.save();
-    res.end();
-};

src/controllers/custom/addXpController.ts

@@ -1,4 +1,4 @@
-import { applyClientEquipmentUpdates, getInventory } from "@/src/services/inventoryService";
+import { addGearExpByCategory, getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { TEquipmentKey } from "@/src/types/inventoryTypes/inventoryTypes";
@@ -20,7 +20,7 @@ export const addXpController: RequestHandler = async (req, res) => {
                 }
             }
         }
-        applyClientEquipmentUpdates(inventory, gear, category as TEquipmentKey);
+        addGearExpByCategory(inventory, gear, category as TEquipmentKey);
     }
     await inventory.save();
     res.end();

src/controllers/custom/getAccountInfoController.ts

@@ -1,18 +1,15 @@
 import { AllianceMember, Guild, GuildMember } from "@/src/models/guildModel";
-import { getInventory } from "@/src/services/inventoryService";
 import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
 import { RequestHandler } from "express";
 
 export const getAccountInfoController: RequestHandler = async (req, res) => {
     const account = await getAccountForRequest(req);
-    const inventory = await getInventory(account._id.toString(), "QuestKeys");
     const info: IAccountInfo = {
-        DisplayName: account.DisplayName,
-        IsAdministrator: isAdministrator(account),
-        CompletedVorsPrize: !!inventory.QuestKeys.find(
-            x => x.ItemType == "/Lotus/Types/Keys/VorsPrize/VorsPrizeQuestKeyChain"
-        )?.Completed
+        DisplayName: account.DisplayName
     };
+    if (isAdministrator(account)) {
+        info.IsAdministrator = true;
+    }
     const guildMember = await GuildMember.findOne({ accountId: account._id, status: 0 }, "guildId rank");
     if (guildMember) {
         const guild = (await Guild.findById(guildMember.guildId, "Ranks AllianceId"))!;
@@ -34,8 +31,7 @@ export const getAccountInfoController: RequestHandler = async (req, res) => {
 
 interface IAccountInfo {
     DisplayName: string;
-    IsAdministrator: boolean;
-    CompletedVorsPrize: boolean;
+    IsAdministrator?: boolean;
     GuildId?: string;
     GuildPermissions?: number;
     GuildRank?: number;

src/controllers/custom/getItemListsController.ts

@@ -20,7 +20,6 @@ import {
     TRelicQuality
 } from "warframe-public-export-plus";
 import archonCrystalUpgrades from "@/static/fixed_responses/webuiArchonCrystalUpgrades.json";
-import allIncarnons from "@/static/fixed_responses/allIncarnonList.json";
 
 interface ListedItem {
     uniqueName: string;
@@ -33,29 +32,6 @@ interface ListedItem {
     parazon?: boolean;
 }
 
-interface ItemLists {
-    archonCrystalUpgrades: Record<string, string>;
-    uniqueLevelCaps: Record<string, number>;
-    Suits: ListedItem[];
-    LongGuns: ListedItem[];
-    Melee: ListedItem[];
-    ModularParts: ListedItem[];
-    Pistols: ListedItem[];
-    Sentinels: ListedItem[];
-    SentinelWeapons: ListedItem[];
-    SpaceGuns: ListedItem[];
-    SpaceMelee: ListedItem[];
-    SpaceSuits: ListedItem[];
-    MechSuits: ListedItem[];
-    miscitems: ListedItem[];
-    Syndicates: ListedItem[];
-    OperatorAmps: ListedItem[];
-    QuestKeys: ListedItem[];
-    KubrowPets: ListedItem[];
-    EvolutionProgress: ListedItem[];
-    mods: ListedItem[];
-}
-
 const relicQualitySuffixes: Record<TRelicQuality, string> = {
     VPQ_BRONZE: "",
     VPQ_SILVER: " [Flawless]",
@@ -65,28 +41,23 @@ const relicQualitySuffixes: Record<TRelicQuality, string> = {
 
 const getItemListsController: RequestHandler = (req, response) => {
     const lang = getDict(typeof req.query.lang == "string" ? req.query.lang : "en");
-    const res: ItemLists = {
-        archonCrystalUpgrades,
-        uniqueLevelCaps: ExportMisc.uniqueLevelCaps,
-        Suits: [],
-        LongGuns: [],
-        Melee: [],
-        ModularParts: [],
-        Pistols: [],
-        Sentinels: [],
-        SentinelWeapons: [],
-        SpaceGuns: [],
-        SpaceMelee: [],
-        SpaceSuits: [],
-        MechSuits: [],
-        miscitems: [],
-        Syndicates: [],
-        OperatorAmps: [],
-        QuestKeys: [],
-        KubrowPets: [],
-        EvolutionProgress: [],
-        mods: []
-    };
+    const res: Record<string, ListedItem[]> = {};
+    res.Suits = [];
+    res.LongGuns = [];
+    res.Melee = [];
+    res.ModularParts = [];
+    res.Pistols = [];
+    res.Sentinels = [];
+    res.SentinelWeapons = [];
+    res.SpaceGuns = [];
+    res.SpaceMelee = [];
+    res.SpaceSuits = [];
+    res.MechSuits = [];
+    res.miscitems = [];
+    res.Syndicates = [];
+    res.OperatorAmps = [];
+    res.QuestKeys = [];
+    res.KubrowPets = [];
     for (const [uniqueName, item] of Object.entries(ExportWarframes)) {
         res[item.productCategory].push({
             uniqueName,
@@ -95,7 +66,7 @@ const getItemListsController: RequestHandler = (req, response) => {
         });
     }
     for (const [uniqueName, item] of Object.entries(ExportSentinels)) {
-        if (item.productCategory == "Sentinels" || item.productCategory == "KubrowPets") {
+        if (item.productCategory != "SpecialItems") {
             res[item.productCategory].push({
                 uniqueName,
                 name: getString(item.name, lang),
@@ -144,28 +115,12 @@ const getItemListsController: RequestHandler = (req, response) => {
         let name = getString(item.name, lang);
         if ("dissectionParts" in item) {
             name = getString("/Lotus/Language/Fish/FishDisplayName", lang).split("|FISH_NAME|").join(name);
-            if (item.syndicateTag == "CetusSyndicate") {
-                if (uniqueName.indexOf("Large") != -1) {
-                    name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeLargeAbbrev", lang));
-                } else if (uniqueName.indexOf("Medium") != -1) {
-                    name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeMediumAbbrev", lang));
-                } else {
-                    name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeSmallAbbrev", lang));
-                }
+            if (uniqueName.indexOf("Large") != -1) {
+                name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeLargeAbbrev", lang));
+            } else if (uniqueName.indexOf("Medium") != -1) {
+                name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeMediumAbbrev", lang));
             } else {
-                if (uniqueName.indexOf("Large") != -1) {
-                    name = name
-                        .split("|FISH_SIZE|")
-                        .join(getString("/Lotus/Language/SolarisVenus/RobofishAgeCategoryElderAbbrev", lang));
-                } else if (uniqueName.indexOf("Medium") != -1) {
-                    name = name
-                        .split("|FISH_SIZE|")
-                        .join(getString("/Lotus/Language/SolarisVenus/RobofishAgeCategoryMatureAbbrev", lang));
-                } else {
-                    name = name
-                        .split("|FISH_SIZE|")
-                        .join(getString("/Lotus/Language/SolarisVenus/RobofishAgeCategoryYoungAbbrev", lang));
-                }
+                name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeSmallAbbrev", lang));
             }
         }
         if (
@@ -229,6 +184,7 @@ const getItemListsController: RequestHandler = (req, response) => {
         });
     }
 
+    res.mods = [];
     for (const [uniqueName, upgrade] of Object.entries(ExportUpgrades)) {
         const mod: ListedItem = {
             uniqueName,
@@ -286,14 +242,12 @@ const getItemListsController: RequestHandler = (req, response) => {
             });
         }
     }
-    for (const uniqueName of allIncarnons) {
-        res.EvolutionProgress.push({
-            uniqueName,
-            name: getString(getItemName(uniqueName) || "", lang)
-        });
-    }
 
-    response.json(res);
+    response.json({
+        archonCrystalUpgrades,
+        uniqueLevelCaps: ExportMisc.uniqueLevelCaps,
+        ...res
+    });
 };
 
 export { getItemListsController };

src/controllers/custom/setEvolutionProgressController.ts

@@ -1,33 +0,0 @@
-import { getInventory } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { RequestHandler } from "express";
-
-export const setEvolutionProgressController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId);
-    const payload = req.body as ISetEvolutionProgressRequest;
-
-    inventory.EvolutionProgress ??= [];
-    payload.forEach(element => {
-        const entry = inventory.EvolutionProgress!.find(entry => entry.ItemType === element.ItemType);
-
-        if (entry) {
-            entry.Progress = 0;
-            entry.Rank = element.Rank;
-        } else {
-            inventory.EvolutionProgress!.push({
-                Progress: 0,
-                Rank: element.Rank,
-                ItemType: element.ItemType
-            });
-        }
-    });
-
-    await inventory.save();
-    res.end();
-};
-
-type ISetEvolutionProgressRequest = {
-    ItemType: string;
-    Rank: number;
-}[];

src/controllers/dynamic/getProfileViewingDataController.ts

@@ -18,71 +18,62 @@ import {
     ITypeXPItem
 } from "@/src/types/inventoryTypes/inventoryTypes";
 import { RequestHandler } from "express";
-import { catBreadHash, getJSONfromString } from "@/src/helpers/stringHelpers";
+import { catBreadHash } from "@/src/helpers/stringHelpers";
 import { ExportCustoms, ExportDojoRecipes } from "warframe-public-export-plus";
 import { IStatsClient } from "@/src/types/statTypes";
 import { toStoreItem } from "@/src/services/itemDataService";
-import { FlattenMaps } from "mongoose";
 
-const getProfileViewingDataByPlayerIdImpl = async (playerId: string): Promise<IProfileViewingData | undefined> => {
-    const account = await Account.findById(playerId, "DisplayName");
-    if (!account) {
-        return;
-    }
-    const inventory = (await Inventory.findOne({ accountOwnerId: account._id }))!;
-
-    const result: IPlayerProfileViewingDataResult = {
-        AccountId: toOid(account._id),
-        DisplayName: account.DisplayName,
-        PlayerLevel: inventory.PlayerLevel,
-        LoadOutInventory: {
-            WeaponSkins: [],
-            XPInfo: inventory.XPInfo
-        },
-        PlayerSkills: inventory.PlayerSkills,
-        ChallengeProgress: inventory.ChallengeProgress,
-        DeathMarks: inventory.DeathMarks,
-        Harvestable: inventory.Harvestable,
-        DeathSquadable: inventory.DeathSquadable,
-        Created: toMongoDate(inventory.Created),
-        MigratedToConsole: false,
-        Missions: inventory.Missions,
-        Affiliations: inventory.Affiliations,
-        DailyFocus: inventory.DailyFocus,
-        Wishlist: inventory.Wishlist,
-        Alignment: inventory.Alignment
-    };
-    await populateLoadout(inventory, result);
-    if (inventory.GuildId) {
-        const guild = (await Guild.findById(inventory.GuildId, "Name Tier XP Class Emblem"))!;
-        populateGuild(guild, result);
-    }
-    for (const key of allDailyAffiliationKeys) {
-        result[key] = inventory[key];
-    }
-
-    const stats = (await Stats.findOne({ accountOwnerId: account._id }))!.toJSON<Partial<TStatsDatabaseDocument>>();
-    delete stats._id;
-    delete stats.__v;
-    delete stats.accountOwnerId;
-
-    return {
-        Results: [result],
-        TechProjects: [],
-        XpComponents: [],
-        //XpCacheExpiryDate, some IMongoDate in the future, no clue what it's for
-        Stats: stats
-    };
-};
-
-export const getProfileViewingDataGetController: RequestHandler = async (req, res) => {
+export const getProfileViewingDataController: RequestHandler = async (req, res) => {
     if (req.query.playerId) {
-        const data = await getProfileViewingDataByPlayerIdImpl(req.query.playerId as string);
-        if (data) {
-            res.json(data);
-        } else {
+        const account = await Account.findById(req.query.playerId as string, "DisplayName");
+        if (!account) {
             res.status(409).send("Could not find requested account");
+            return;
         }
+        const inventory = (await Inventory.findOne({ accountOwnerId: account._id }))!;
+
+        const result: IPlayerProfileViewingDataResult = {
+            AccountId: toOid(account._id),
+            DisplayName: account.DisplayName,
+            PlayerLevel: inventory.PlayerLevel,
+            LoadOutInventory: {
+                WeaponSkins: [],
+                XPInfo: inventory.XPInfo
+            },
+            PlayerSkills: inventory.PlayerSkills,
+            ChallengeProgress: inventory.ChallengeProgress,
+            DeathMarks: inventory.DeathMarks,
+            Harvestable: inventory.Harvestable,
+            DeathSquadable: inventory.DeathSquadable,
+            Created: toMongoDate(inventory.Created),
+            MigratedToConsole: false,
+            Missions: inventory.Missions,
+            Affiliations: inventory.Affiliations,
+            DailyFocus: inventory.DailyFocus,
+            Wishlist: inventory.Wishlist,
+            Alignment: inventory.Alignment
+        };
+        await populateLoadout(inventory, result);
+        if (inventory.GuildId) {
+            const guild = (await Guild.findById(inventory.GuildId, "Name Tier XP Class Emblem"))!;
+            populateGuild(guild, result);
+        }
+        for (const key of allDailyAffiliationKeys) {
+            result[key] = inventory[key];
+        }
+
+        const stats = (await Stats.findOne({ accountOwnerId: account._id }))!.toJSON<Partial<TStatsDatabaseDocument>>();
+        delete stats._id;
+        delete stats.__v;
+        delete stats.accountOwnerId;
+
+        res.json({
+            Results: [result],
+            TechProjects: [],
+            XpComponents: [],
+            //XpCacheExpiryDate, some IMongoDate in the future, no clue what it's for
+            Stats: stats
+        });
     } else if (req.query.guildId) {
         const guild = await Guild.findById(req.query.guildId, "Name Tier XP Class Emblem TechProjects ClaimedXP");
         if (!guild) {
@@ -179,28 +170,6 @@ export const getProfileViewingDataGetController: RequestHandler = async (req, re
     }
 };
 
-// For old versions, this was an authenticated POST request.
-interface IGetProfileViewingDataRequest {
-    AccountId: string;
-}
-export const getProfileViewingDataPostController: RequestHandler = async (req, res) => {
-    const payload = getJSONfromString<IGetProfileViewingDataRequest>(String(req.body));
-    const data = await getProfileViewingDataByPlayerIdImpl(payload.AccountId);
-    if (data) {
-        res.json(data);
-    } else {
-        res.status(409).send("Could not find requested account");
-    }
-};
-
-interface IProfileViewingData {
-    Results: IPlayerProfileViewingDataResult[];
-    TechProjects: [];
-    XpComponents: [];
-    //XpCacheExpiryDate, some IMongoDate in the future, no clue what it's for
-    Stats: FlattenMaps<Partial<TStatsDatabaseDocument>>;
-}
-
 interface IPlayerProfileViewingDataResult extends Partial<IDailyAffiliations> {
     AccountId: IOid;
     DisplayName: string;

src/controllers/stats/viewController.ts

@@ -27,15 +27,7 @@ const viewController: RequestHandler = async (req, res) => {
         for (const type of Object.keys(ExportEnemies.avatars)) {
             if (!scans.has(type)) scans.add(type);
         }
-
-        // Take any existing scans and also set them to 9999
-        if (responseJson.Scans) {
-            for (const scan of responseJson.Scans) {
-                scans.add(scan.type);
-            }
-        }
-        responseJson.Scans = [];
-
+        responseJson.Scans ??= [];
         for (const type of scans) {
             responseJson.Scans.push({ type: type, scans: 9999 });
         }

src/helpers/inventoryHelpers.ts

@@ -10,10 +10,6 @@ export const toMongoDate = (date: Date): IMongoDate => {
     return { $date: { $numberLong: date.getTime().toString() } };
 };
 
-export const fromMongoDate = (date: IMongoDate): Date => {
-    return new Date(parseInt(date.$date.$numberLong));
-};
-
 export const kubrowWeights: Record<TRarity, number> = {
     COMMON: 6,
     UNCOMMON: 4,

src/helpers/nemesisHelpers.ts

@@ -1,14 +1,12 @@
-import { ExportRegions, ExportWarframes } from "warframe-public-export-plus";
-import { IInfNode, ITypeCount } from "@/src/types/inventoryTypes/inventoryTypes";
-import { getRewardAtPercentage, SRng } from "@/src/services/rngService";
+import { ExportRegions } from "warframe-public-export-plus";
+import { IInfNode } from "@/src/types/inventoryTypes/inventoryTypes";
+import { SRng } from "@/src/services/rngService";
 import { TInventoryDatabaseDocument } from "../models/inventoryModels/inventoryModel";
 import { logger } from "../utils/logger";
 import { IOid } from "../types/commonTypes";
 import { Types } from "mongoose";
-import { addMods, generateRewardSeed } from "../services/inventoryService";
-import { isArchwingMission, version_compare } from "../services/worldStateService";
-import { fromStoreItem, toStoreItem } from "../services/itemDataService";
-import { createMessage } from "../services/inboxService";
+import { addMods } from "../services/inventoryService";
+import { isArchwingMission } from "../services/worldStateService";
 
 export const getInfNodes = (faction: string, rank: number): IInfNode[] => {
     const infNodes = [];
@@ -40,59 +38,17 @@ const systemIndexes: Record<string, number[]> = {
     FC_INFESTATION: [23]
 };
 
-export const showdownNodes: Record<string, string> = {
-    FC_GRINEER: "CrewBattleNode557",
-    FC_CORPUS: "CrewBattleNode558",
-    FC_INFESTATION: "CrewBattleNode559"
-};
-
 // Get a parazon 'passcode' based on the nemesis fingerprint so it's always the same for the same nemesis.
 export const getNemesisPasscode = (nemesis: { fp: bigint; Faction: string }): number[] => {
     const rng = new SRng(nemesis.fp);
-    const choices = [0, 1, 2, 3, 5, 6, 7];
-    let choiceIndex = rng.randomInt(0, choices.length - 1);
-    const passcode = [choices[choiceIndex]];
+    const passcode = [rng.randomInt(0, 7)];
     if (nemesis.Faction != "FC_INFESTATION") {
-        choices.splice(choiceIndex, 1);
-        choiceIndex = rng.randomInt(0, choices.length - 1);
-        passcode.push(choices[choiceIndex]);
-
-        choices.splice(choiceIndex, 1);
-        choiceIndex = rng.randomInt(0, choices.length - 1);
-        passcode.push(choices[choiceIndex]);
+        passcode.push(rng.randomInt(0, 7));
+        passcode.push(rng.randomInt(0, 7));
     }
     return passcode;
 };
 
-const reqiuemMods: readonly string[] = [
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalOneMod",
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalTwoMod",
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalThreeMod",
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalFourMod",
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalFiveMod",
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalSixMod",
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalSevenMod",
-    "/Lotus/Upgrades/Mods/Immortal/ImmortalEightMod"
-];
-
-const antivirusMods: readonly string[] = [
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusOneMod",
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusTwoMod",
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusThreeMod",
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusFourMod",
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusFiveMod",
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusSixMod",
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusSevenMod",
-    "/Lotus/Upgrades/Mods/Immortal/AntivirusEightMod"
-];
-
-export const getNemesisPasscodeModTypes = (nemesis: { fp: bigint; Faction: string }): string[] => {
-    const passcode = getNemesisPasscode(nemesis);
-    return nemesis.Faction == "FC_INFESTATION"
-        ? passcode.map(i => antivirusMods[i])
-        : passcode.map(i => reqiuemMods[i]);
-};
-
 export const encodeNemesisGuess = (
     symbol1: number,
     result1: number,
@@ -123,31 +79,6 @@ export interface IKnifeResponse {
     HasKnife?: boolean;
 }
 
-export const getKnifeUpgrade = (
-    inventory: TInventoryDatabaseDocument,
-    dataknifeUpgrades: string[],
-    type: string
-): { ItemId: IOid; ItemType: string } => {
-    if (dataknifeUpgrades.indexOf(type) != -1) {
-        return {
-            ItemId: { $oid: "000000000000000000000000" },
-            ItemType: type
-        };
-    }
-    for (const upgradeId of dataknifeUpgrades) {
-        if (upgradeId.length == 24) {
-            const upgrade = inventory.Upgrades.id(upgradeId);
-            if (upgrade && upgrade.ItemType == type) {
-                return {
-                    ItemId: { $oid: upgradeId },
-                    ItemType: type
-                };
-            }
-        }
-    }
-    throw new Error(`${type} does not seem to be installed on parazon?!`);
-};
-
 export const consumeModCharge = (
     response: IKnifeResponse,
     inventory: TInventoryDatabaseDocument,
@@ -198,205 +129,3 @@ export const consumeModCharge = (
         response.UpgradeNew.push(true);
     }
 };
-
-const kuvaLichVersionSixWeapons = [
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Drakgoon/KuvaDrakgoon",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Karak/KuvaKarak",
-    "/Lotus/Weapons/Grineer/Melee/GrnKuvaLichScythe/GrnKuvaLichScytheWeapon",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Kohm/KuvaKohm",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Ogris/KuvaOgris",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Quartakk/KuvaQuartakk",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Tonkor/KuvaTonkor",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Brakk/KuvaBrakk",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Kraken/KuvaKraken",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Seer/KuvaSeer",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Stubba/KuvaStubba",
-    "/Lotus/Weapons/Grineer/HeavyWeapons/GrnHeavyGrenadeLauncher",
-    "/Lotus/Weapons/Grineer/LongGuns/GrnKuvaLichRifle/GrnKuvaLichRifleWeapon",
-    "/Lotus/Weapons/Grineer/Bows/GrnBow/GrnBowWeapon",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hind/KuvaHind",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Nukor/KuvaNukor",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hek/KuvaHekWeapon",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Zarr/KuvaZarr",
-    "/Lotus/Weapons/Grineer/KuvaLich/HeavyWeapons/Grattler/KuvaGrattler",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Sobek/KuvaSobek"
-];
-
-const corpusVersionThreeWeapons = [
-    "/Lotus/Weapons/Corpus/LongGuns/CrpBriefcaseLauncher/CrpBriefcaseLauncher",
-    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEArcaPlasmor/CrpBEArcaPlasmor",
-    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEFluxRifle/CrpBEFluxRifle",
-    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBETetra/CrpBETetra",
-    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBECycron/CrpBECycron",
-    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBEDetron/CrpBEDetron",
-    "/Lotus/Weapons/Corpus/Pistols/CrpIgniterPistol/CrpIgniterPistol",
-    "/Lotus/Weapons/Corpus/Pistols/CrpBriefcaseAkimbo/CrpBriefcaseAkimboPistol",
-    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBEPlinx/CrpBEPlinxWeapon",
-    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEGlaxion/CrpBEGlaxion"
-];
-
-export const getWeaponsForManifest = (manifest: string): readonly string[] => {
-    switch (manifest) {
-        case "/Lotus/Types/Game/Nemesis/KuvaLich/KuvaLichManifestVersionSix": // >= 35.6.0
-            return kuvaLichVersionSixWeapons;
-        case "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionThree": // >= 35.6.0
-        case "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionFour": // >= 37.0.0
-            return corpusVersionThreeWeapons;
-    }
-    throw new Error(`unknown nemesis manifest: ${manifest}`);
-};
-
-export const isNemesisCompatibleWithVersion = (
-    nemesis: { manifest: string; Faction: string },
-    buildLabel: string
-): boolean => {
-    // Anything below 35.6.0 is not going to be okay given our set of supported manifests.
-    if (version_compare(buildLabel, "2024.05.15.11.07") < 0) {
-        return false;
-    }
-
-    if (nemesis.Faction == "FC_INFESTATION") {
-        // Anything below 38.5.0 isn't gonna like an infested lich.
-        if (version_compare(buildLabel, "2025.03.18.16.07") < 0) {
-            return false;
-        }
-    } else if (nemesis.manifest == "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionFour") {
-        // Anything below 37.0.0 isn't gonna know version 4, but version 3 is identical in terms of weapon choices, so we can spoof it to that.
-        if (version_compare(buildLabel, "2024.10.01.11.03") < 0) {
-            nemesis.manifest = "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionThree";
-        }
-    }
-
-    return true;
-};
-
-export const getInnateDamageTag = (
-    KillingSuit: string
-):
-    | "InnateElectricityDamage"
-    | "InnateFreezeDamage"
-    | "InnateHeatDamage"
-    | "InnateImpactDamage"
-    | "InnateMagDamage"
-    | "InnateRadDamage"
-    | "InnateToxinDamage" => {
-    return ExportWarframes[KillingSuit].nemesisUpgradeTag!;
-};
-
-// TODO: For -1399275245665749231n, the value should be 75306944, but we're off by 59 with 75307003.
-export const getInnateDamageValue = (fp: bigint): number => {
-    const rng = new SRng(fp);
-    rng.randomFloat(); // used for the weapon index
-    const WeaponUpgradeValueAttenuationExponent = 2.25;
-    let value = Math.pow(rng.randomFloat(), WeaponUpgradeValueAttenuationExponent);
-    if (value >= 0.941428) {
-        value = 1;
-    }
-    return Math.trunc(value * 0x40000000);
-};
-
-export const getKillTokenRewardCount = (fp: bigint): number => {
-    const rng = new SRng(fp);
-    return rng.randomInt(10, 15);
-};
-
-// /Lotus/Types/Enemies/InfestedLich/InfestedLichRewardManifest
-const infestedLichRotA = [
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyDJRomHuman", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyDJRomInfested", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyDrillbitHuman", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyDrillbitInfested", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyHarddriveHuman", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyHarddriveInfested", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyPacketHuman", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyPacketInfested", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyZekeHuman", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyZekeInfested", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandBillboardPosterA", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandBillboardPosterB", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandDespairPoster", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandGridPoster", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandHuddlePoster", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandJumpPoster", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandLimoPoster", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandLookingDownPosterDay", probability: 0.046 },
-    {
-        type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandLookingDownPosterNight",
-        probability: 0.045
-    },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandSillyPoster", probability: 0.046 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandWhiteBluePoster", probability: 0.045 },
-    { type: "/Lotus/StoreItems/Types/Items/ShipDecos/BoybandPosters/BoybandWhitePinkPoster", probability: 0.045 }
-];
-const infestedLichRotB = [
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraA", probability: 0.072 },
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraB", probability: 0.071 },
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraC", probability: 0.072 },
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraD", probability: 0.071 },
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraE", probability: 0.072 },
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraF", probability: 0.071 },
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraG", probability: 0.071 },
-    { type: "/Lotus/StoreItems/Upgrades/Skins/Effects/InfestedLichEphemeraH", probability: 0.072 },
-    { type: "/Lotus/StoreItems/Types/Items/Emotes/DanceDJRomHype", probability: 0.071 },
-    { type: "/Lotus/StoreItems/Types/Items/Emotes/DancePacketWindmillShuffle", probability: 0.072 },
-    { type: "/Lotus/StoreItems/Types/Items/Emotes/DanceHarddrivePony", probability: 0.071 },
-    { type: "/Lotus/StoreItems/Types/Items/Emotes/DanceDrillbitCrisscross", probability: 0.072 },
-    { type: "/Lotus/StoreItems/Types/Items/Emotes/DanceZekeCanthavethis", probability: 0.071 },
-    { type: "/Lotus/StoreItems/Types/Items/PhotoBooth/PhotoboothTileRJLasXStadiumBossArena", probability: 0.071 }
-];
-export const getInfestedLichItemRewards = (fp: bigint): string[] => {
-    const rng = new SRng(fp);
-    const rotAReward = getRewardAtPercentage(infestedLichRotA, rng.randomFloat())!.type;
-    rng.randomFloat(); // unused afaict
-    const rotBReward = getRewardAtPercentage(infestedLichRotB, rng.randomFloat())!.type;
-    return [rotAReward, rotBReward];
-};
-
-export const sendCodaFinishedMessage = async (
-    inventory: TInventoryDatabaseDocument,
-    fp: bigint = generateRewardSeed(),
-    name: string = "ZEKE_BEATWOMAN_TM.1999",
-    killed: boolean = true
-): Promise<void> => {
-    const att: string[] = [];
-
-    // First vanquish/convert gives a sigil
-    const sigil = killed
-        ? "/Lotus/Upgrades/Skins/Sigils/InfLichVanquishedSigil"
-        : "/Lotus/Upgrades/Skins/Sigils/InfLichConvertedSigil";
-    if (!inventory.WeaponSkins.find(x => x.ItemType == sigil)) {
-        att.push(toStoreItem(sigil));
-    }
-
-    const [rotAReward, rotBReward] = getInfestedLichItemRewards(fp);
-    att.push(fromStoreItem(rotAReward));
-    att.push(fromStoreItem(rotBReward));
-
-    let countedAtt: ITypeCount[] | undefined;
-    if (killed) {
-        countedAtt = [
-            {
-                ItemType: "/Lotus/Types/Items/MiscItems/CodaWeaponBucks",
-                ItemCount: getKillTokenRewardCount(fp)
-            }
-        ];
-    }
-
-    await createMessage(inventory.accountOwnerId, [
-        {
-            sndr: "/Lotus/Language/Bosses/Ordis",
-            msg: "/Lotus/Language/Inbox/VanquishBandMsgBody",
-            arg: [
-                {
-                    Key: "LICH_NAME",
-                    Tag: name
-                }
-            ],
-            att: att,
-            countedAtt: countedAtt,
-            sub: "/Lotus/Language/Inbox/VanquishBandMsgTitle",
-            icon: "/Lotus/Interface/Icons/Npcs/Ordis.png",
-            highPriority: true
-        }
-    ]);
-};

src/helpers/rivenHelper.ts

@@ -31,7 +31,7 @@ export interface IFingerprintStat {
 }
 
 export const createVeiledRivenFingerprint = (meta: IUpgrade): IVeiledRivenFingerprint => {
-    const challenge = getRandomElement(meta.availableChallenges!)!;
+    const challenge = getRandomElement(meta.availableChallenges!);
     const fingerprintChallenge: IRivenChallenge = {
         Type: challenge.fullName,
         Progress: 0,
@@ -54,11 +54,11 @@ export const createVeiledRivenFingerprint = (meta: IUpgrade): IVeiledRivenFinger
 
 export const createUnveiledRivenFingerprint = (meta: IUpgrade): IUnveiledRivenFingerprint => {
     const fingerprint: IUnveiledRivenFingerprint = {
-        compat: getRandomElement(meta.compatibleItems!)!,
+        compat: getRandomElement(meta.compatibleItems!),
         lim: 0,
         lvl: 0,
         lvlReq: getRandomInt(8, 16),
-        pol: getRandomElement(["AP_ATTACK", "AP_DEFENSE", "AP_TACTIC"])!,
+        pol: getRandomElement(["AP_ATTACK", "AP_DEFENSE", "AP_TACTIC"]),
         buffs: [],
         curses: []
     };
@@ -81,7 +81,7 @@ export const randomiseRivenStats = (meta: IUpgrade, fingerprint: IUnveiledRivenF
     if (Math.random() < 0.5) {
         const entry = getRandomElement(
             meta.upgradeEntries!.filter(x => x.canBeCurse && !fingerprint.buffs.find(y => y.Tag == x.tag))
-        )!;
+        );
         fingerprint.curses.push({ Tag: entry.tag, Value: Math.trunc(Math.random() * 0x40000000) });
     }
 };

src/models/guildModel.ts

@@ -23,7 +23,6 @@ const dojoDecoSchema = new Schema<IDojoDecoDatabase>({
     Type: String,
     Pos: [Number],
     Rot: [Number],
-    Scale: Number,
     Name: String,
     Sockets: Number,
     RegularCredits: Number,

src/models/inventoryModels/inventoryModel.ts

@@ -96,8 +96,7 @@ import {
     IInvasionProgressDatabase,
     IInvasionProgressClient,
     IAccolades,
-    IHubNpcCustomization,
-    ILotusCustomization
+    IHubNpcCustomization
 } from "../../types/inventoryTypes/inventoryTypes";
 import { IOid } from "../../types/commonTypes";
 import {
@@ -391,8 +390,8 @@ MailboxSchema.set("toJSON", {
 
 const DuviriInfoSchema = new Schema<IDuviriInfo>(
     {
-        Seed: { type: BigInt, required: true },
-        NumCompletions: { type: Number, required: true }
+        Seed: Number,
+        NumCompletions: { type: Number, default: 0 }
     },
     {
         _id: false,
@@ -781,26 +780,6 @@ const loreFragmentScansSchema = new Schema<ILoreFragmentScan>(
     { _id: false }
 );
 
-// const lotusCustomizationSchema = new Schema<ILotusCustomization>().add(ItemConfigSchema).add({
-//     Persona: String
-// });
-
-// Laxer schema for cleanupInventory
-const lotusCustomizationSchema = new Schema<ILotusCustomization>(
-    {
-        Skins: [String],
-        pricol: colorSchema,
-        attcol: Schema.Types.Mixed,
-        sigcol: Schema.Types.Mixed,
-        eyecol: Schema.Types.Mixed,
-        facial: Schema.Types.Mixed,
-        cloth: Schema.Types.Mixed,
-        syancol: Schema.Types.Mixed,
-        Persona: String
-    },
-    { _id: false }
-);
-
 const evolutionProgressSchema = new Schema<IEvolutionProgress>(
     {
         Progress: Number,
@@ -1055,8 +1034,6 @@ const pendingRecipeSchema = new Schema<IPendingRecipeDatabase>(
     {
         ItemType: String,
         CompletionDate: Date,
-        TargetItemId: String,
-        TargetFingerprint: String,
         LongGuns: { type: [EquipmentSchema], default: undefined },
         Pistols: { type: [EquipmentSchema], default: undefined },
         Melee: { type: [EquipmentSchema], default: undefined },
@@ -1148,15 +1125,15 @@ const CustomMarkersSchema = new Schema<ICustomMarkers>(
 const calenderProgressSchema = new Schema<ICalendarProgress>(
     {
         Version: { type: Number, default: 19 },
-        Iteration: { type: Number, required: true },
+        Iteration: { type: Number, default: 2 },
         YearProgress: {
-            Upgrades: { type: [String], default: [] }
+            Upgrades: { type: [] }
         },
         SeasonProgress: {
-            SeasonType: { type: String, required: true },
-            LastCompletedDayIdx: { type: Number, default: 0 },
-            LastCompletedChallengeDayIdx: { type: Number, default: 0 },
-            ActivatedChallenges: { type: [String], default: [] }
+            SeasonType: String,
+            LastCompletedDayIdx: { type: Number, default: -1 },
+            LastCompletedChallengeDayIdx: { type: Number, default: -1 },
+            ActivatedChallenges: []
         }
     },
     { _id: false }
@@ -1278,11 +1255,11 @@ const nemesisSchema = new Schema<INemesisDatabase>(
         PrevOwners: Number,
         SecondInCommand: Boolean,
         Weakened: Boolean,
-        InfNodes: { type: [infNodeSchema], default: undefined },
+        InfNodes: [infNodeSchema],
         HenchmenKilled: Number,
         HintProgress: Number,
-        Hints: { type: [Number], default: undefined },
-        GuessHistory: { type: [Number], default: undefined },
+        Hints: [Number],
+        GuessHistory: [Number],
         MissionCount: Number,
         LastEnc: Number
     },
@@ -1399,7 +1376,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         //How many Gift do you have left*(gift spends the trade)
         GiftsRemaining: { type: Number, default: 8 },
         //Curent trade info Giving or Getting items
-        //PendingTrades: [Schema.Types.Mixed],
+        PendingTrades: [Schema.Types.Mixed],
 
         //Syndicate currently being pledged to.
         SupportedSyndicate: String,
@@ -1449,7 +1426,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
 
         KubrowPetEggs: [kubrowPetEggSchema],
         //Prints   Cat(3 Prints)\Kubrow(2 Prints) Pets
-        //KubrowPetPrints: [Schema.Types.Mixed],
+        KubrowPetPrints: [Schema.Types.Mixed],
 
         //Item for EquippedGear example:Scaner,LoadoutTechSummon etc
         Consumables: [typeCountSchema],
@@ -1495,7 +1472,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         //item like DojoKey or Boss missions key
         LevelKeys: [typeCountSchema],
         //Active quests
-        //Quests: [Schema.Types.Mixed],
+        Quests: [Schema.Types.Mixed],
 
         //Cosmetics like profile glyphs\Kavasa Prime Kubrow Collar\Game Theme etc
         FlavourItems: [FlavourItemSchema],
@@ -1534,7 +1511,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         TauntHistory: { type: [tauntSchema], default: undefined },
 
         //noShow2FA,VisitPrimeVault etc
-        //WebFlags: Schema.Types.Mixed,
+        WebFlags: Schema.Types.Mixed,
         //Id CompletedAlerts
         CompletedAlerts: [String],
 
@@ -1554,7 +1531,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         //the color your clan requests like Items/Research/DojoColors/DojoColorPlainsB
         ActiveDojoColorResearch: String,
 
-        //SentientSpawnChanceBoosters: Schema.Types.Mixed,
+        SentientSpawnChanceBoosters: Schema.Types.Mixed,
 
         QualifyingInvasions: [invasionProgressSchema],
         FactionScores: [Number],
@@ -1589,10 +1566,10 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         // open location store like EidolonPlainsDiscoverable or OrbVallisCaveDiscoverable
         DiscoveredMarkers: [discoveredMarkerSchema],
         //Open location mission like "JobId" + "StageCompletions"
-        //CompletedJobs: [Schema.Types.Mixed],
+        CompletedJobs: [Schema.Types.Mixed],
 
         //Game mission\ivent score example  "Tag": "WaterFight", "Best": 170, "Count": 1258,
-        //PersonalGoalProgress: [Schema.Types.Mixed],
+        PersonalGoalProgress: [Schema.Types.Mixed],
 
         //Setting interface Style
         ThemeStyle: String,
@@ -1622,13 +1599,13 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         LibraryActiveDailyTaskInfo: libraryDailyTaskInfoSchema,
 
         //https://warframe.fandom.com/wiki/Invasion
-        //InvasionChainProgress: [Schema.Types.Mixed],
+        InvasionChainProgress: [Schema.Types.Mixed],
 
         //CorpusLich or GrineerLich
         NemesisAbandonedRewards: { type: [String], default: [] },
         Nemesis: nemesisSchema,
-        NemesisHistory: { type: [nemesisSchema], default: undefined },
-        //LastNemesisAllySpawnTime: Schema.Types.Mixed,
+        NemesisHistory: [Schema.Types.Mixed],
+        LastNemesisAllySpawnTime: Schema.Types.Mixed,
 
         //TradingRulesConfirmed,ShowFriendInvNotifications(Option->Social)
         Settings: settingsSchema,
@@ -1642,7 +1619,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         PlayerSkills: { type: playerSkillsSchema, default: {} },
 
         //TradeBannedUntil data
-        //TradeBannedUntil: Schema.Types.Mixed,
+        TradeBannedUntil: Schema.Types.Mixed,
 
         //https://warframe.fandom.com/wiki/Helminth
         InfestedFoundry: infestedFoundrySchema,
@@ -1651,7 +1628,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
 
         //Purchase this new permanent skin from the Lotus customization options in Personal Quarters located in your Orbiter.
         //https://warframe.fandom.com/wiki/Lotus#The_New_War
-        LotusCustomization: { type: lotusCustomizationSchema, default: undefined },
+        LotusCustomization: Schema.Types.Mixed,
 
         //Progress+Rank+ItemType(ZarimanPumpShotgun)
         //https://warframe.fandom.com/wiki/Incarnon
@@ -1662,24 +1639,23 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
 
         //Unknown and system
         DuviriInfo: DuviriInfoSchema,
-        LastInventorySync: Schema.Types.ObjectId,
         Mailbox: MailboxSchema,
         HandlerPoints: Number,
         ChallengesFixVersion: { type: Number, default: 6 },
         PlayedParkourTutorial: Boolean,
-        //ActiveLandscapeTraps: [Schema.Types.Mixed],
-        //RepVotes: [Schema.Types.Mixed],
-        //LeagueTickets: [Schema.Types.Mixed],
+        ActiveLandscapeTraps: [Schema.Types.Mixed],
+        RepVotes: [Schema.Types.Mixed],
+        LeagueTickets: [Schema.Types.Mixed],
         HasContributedToDojo: Boolean,
         HWIDProtectEnabled: Boolean,
         LoadOutPresets: { type: Schema.Types.ObjectId, ref: "Loadout" },
         CurrentLoadOutIds: [oidSchema],
         RandomUpgradesIdentified: Number,
         BountyScore: Number,
-        //ChallengeInstanceStates: [Schema.Types.Mixed],
+        ChallengeInstanceStates: [Schema.Types.Mixed],
         RecentVendorPurchases: { type: [recentVendorPurchaseSchema], default: undefined },
-        //Robotics: [Schema.Types.Mixed],
-        //UsedDailyDeals: [Schema.Types.Mixed],
+        Robotics: [Schema.Types.Mixed],
+        UsedDailyDeals: [Schema.Types.Mixed],
         CollectibleSeries: { type: [collectibleEntrySchema], default: undefined },
         HasResetAccount: { type: Boolean, default: false },
 
@@ -1760,9 +1736,6 @@ inventorySchema.set("toJSON", {
                 sn: inventoryDatabase.LockedWeaponGroup.sn ? toOid(inventoryDatabase.LockedWeaponGroup.sn) : undefined
             };
         }
-        if (inventoryDatabase.LastInventorySync) {
-            inventoryResponse.LastInventorySync = toOid(inventoryDatabase.LastInventorySync);
-        }
     }
 });
 

src/models/loginModel.ts

@@ -20,7 +20,6 @@ const databaseAccountSchema = new Schema<IDatabaseAccountJson>(
         ConsentNeeded: { type: Boolean, required: true },
         TrackedSettings: { type: [String], default: [] },
         Nonce: { type: Number, default: 0 },
-        BuildLabel: String,
         Dropped: Boolean,
         LatestEventMessageDate: { type: Date, default: 0 },
         LastLoginRewardDate: { type: Number, default: 0 },

src/models/personalRoomsModel.ts

@@ -1,17 +1,14 @@
-import { toMongoDate, toOid } from "@/src/helpers/inventoryHelpers";
+import { toOid } from "@/src/helpers/inventoryHelpers";
 import { colorSchema } from "@/src/models/inventoryModels/inventoryModel";
 import { IOrbiter, IPersonalRoomsDatabase, PersonalRoomsModelType } from "@/src/types/personalRoomsTypes";
 import {
     IFavouriteLoadoutDatabase,
-    IGardeningDatabase,
+    IGardening,
     IPlacedDecosDatabase,
     IPictureFrameInfo,
     IRoom,
     ITailorShopDatabase,
-    IApartmentDatabase,
-    IPlanterDatabase,
-    IPlantDatabase,
-    IPlantClient
+    IApartmentDatabase
 } from "@/src/types/shipTypes";
 import { Schema, model } from "mongoose";
 
@@ -80,45 +77,15 @@ favouriteLoadoutSchema.set("toJSON", {
     }
 });
 
-const plantSchema = new Schema<IPlantDatabase>(
-    {
-        PlantType: String,
-        EndTime: Date,
-        PlotIndex: Number
-    },
-    { _id: false }
-);
-
-plantSchema.set("toJSON", {
-    virtuals: true,
-    transform(_doc, obj) {
-        const client = obj as IPlantClient;
-        const db = obj as IPlantDatabase;
-
-        client.EndTime = toMongoDate(db.EndTime);
-    }
+const gardeningSchema = new Schema<IGardening>({
+    Planters: [Schema.Types.Mixed] //TODO: add when implementing gardening
 });
 
-const planterSchema = new Schema<IPlanterDatabase>(
-    {
-        Name: { type: String, required: true },
-        Plants: { type: [plantSchema], default: [] }
-    },
-    { _id: false }
-);
-
-const gardeningSchema = new Schema<IGardeningDatabase>(
-    {
-        Planters: { type: [planterSchema], default: [] }
-    },
-    { _id: false }
-);
-
 const apartmentSchema = new Schema<IApartmentDatabase>(
     {
         Rooms: [roomSchema],
         FavouriteLoadouts: [favouriteLoadoutSchema],
-        Gardening: gardeningSchema
+        Gardening: gardeningSchema // TODO: ensure this is correct
     },
     { _id: false }
 );
@@ -131,9 +98,7 @@ const apartmentDefault: IApartmentDatabase = {
         { Name: "DuviriHallway", MaxCapacity: 1600 }
     ],
     FavouriteLoadouts: [],
-    Gardening: {
-        Planters: []
-    }
+    Gardening: {}
 };
 
 const orbiterSchema = new Schema<IOrbiter>(

src/routes/api.ts

@@ -19,7 +19,6 @@ import { claimCompletedRecipeController } from "@/src/controllers/api/claimCompl
 import { claimLibraryDailyTaskRewardController } from "@/src/controllers/api/claimLibraryDailyTaskRewardController";
 import { clearDialogueHistoryController } from "@/src/controllers/api/clearDialogueHistoryController";
 import { clearNewEpisodeRewardController } from "@/src/controllers/api/clearNewEpisodeRewardController";
-import { completeCalendarEventController } from "@/src/controllers/api/completeCalendarEventController";
 import { completeRandomModChallengeController } from "@/src/controllers/api/completeRandomModChallengeController";
 import { confirmAllianceInvitationController } from "@/src/controllers/api/confirmAllianceInvitationController";
 import { confirmGuildInvitationGetController, confirmGuildInvitationPostController } from "@/src/controllers/api/confirmGuildInvitationController";
@@ -48,7 +47,6 @@ import { findSessionsController } from "@/src/controllers/api/findSessionsContro
 import { fishmongerController } from "@/src/controllers/api/fishmongerController";
 import { focusController } from "@/src/controllers/api/focusController";
 import { fusionTreasuresController } from "@/src/controllers/api/fusionTreasuresController";
-import { gardeningController } from "@/src/controllers/api/gardeningController";
 import { genericUpdateController } from "@/src/controllers/api/genericUpdateController";
 import { getAllianceController } from "@/src/controllers/api/getAllianceController";
 import { getDailyDealStockLevelsController } from "@/src/controllers/api/getDailyDealStockLevelsController";
@@ -59,7 +57,6 @@ import { getGuildDojoController } from "@/src/controllers/api/getGuildDojoContro
 import { getGuildLogController } from "@/src/controllers/api/getGuildLogController";
 import { getIgnoredUsersController } from "@/src/controllers/api/getIgnoredUsersController";
 import { getNewRewardSeedController } from "@/src/controllers/api/getNewRewardSeedController";
-import { getProfileViewingDataPostController } from "@/src/controllers/dynamic/getProfileViewingDataController";
 import { getShipController } from "@/src/controllers/api/getShipController";
 import { getVendorInfoController } from "@/src/controllers/api/getVendorInfoController";
 import { getVoidProjectionRewardsController } from "@/src/controllers/api/getVoidProjectionRewardsController";
@@ -97,7 +94,6 @@ import { playerSkillsController } from "@/src/controllers/api/playerSkillsContro
 import { postGuildAdvertisementController } from "@/src/controllers/api/postGuildAdvertisementController";
 import { projectionManagerController } from "@/src/controllers/api/projectionManagerController";
 import { purchaseController } from "@/src/controllers/api/purchaseController";
-import { questControlController } from "@/src/controllers/api/questControlController";
 import { queueDojoComponentDestructionController } from "@/src/controllers/api/queueDojoComponentDestructionController";
 import { redeemPromoCodeController } from "@/src/controllers/api/redeemPromoCodeController";
 import { releasePetController } from "@/src/controllers/api/releasePetController";
@@ -162,7 +158,6 @@ apiRouter.get("/changeDojoRoot.php", changeDojoRootController);
 apiRouter.get("/changeGuildRank.php", changeGuildRankController);
 apiRouter.get("/checkDailyMissionBonus.php", checkDailyMissionBonusController);
 apiRouter.get("/claimLibraryDailyTaskReward.php", claimLibraryDailyTaskRewardController);
-apiRouter.get("/completeCalendarEvent.php", completeCalendarEventController);
 apiRouter.get("/confirmAllianceInvitation.php", confirmAllianceInvitationController);
 apiRouter.get("/confirmGuildInvitation.php", confirmGuildInvitationGetController);
 apiRouter.get("/credits.php", creditsController);
@@ -172,7 +167,6 @@ apiRouter.get("/deleteSession.php", deleteSessionController);
 apiRouter.get("/divvyAllianceVault.php", divvyAllianceVaultController);
 apiRouter.get("/dojo", dojoController);
 apiRouter.get("/drones.php", dronesController);
-apiRouter.get("/getAlliance.php", getAllianceController);
 apiRouter.get("/getDailyDealStockLevels.php", getDailyDealStockLevelsController);
 apiRouter.get("/getFriends.php", getFriendsController);
 apiRouter.get("/getGuild.php", getGuildController);
@@ -186,7 +180,6 @@ apiRouter.get("/getVendorInfo.php", getVendorInfoController);
 apiRouter.get("/hub", hubController);
 apiRouter.get("/hubInstances", hubInstancesController);
 apiRouter.get("/inbox.php", inboxController);
-apiRouter.get("/getMessages.php", inboxController); // unsure if this is correct, but needed for U17
 apiRouter.get("/inventory.php", inventoryController);
 apiRouter.get("/loginRewards.php", loginRewardsController);
 apiRouter.get("/logout.php", logoutController);
@@ -194,7 +187,6 @@ apiRouter.get("/marketRecommendations.php", marketRecommendationsController);
 apiRouter.get("/marketSearchRecommendations.php", marketRecommendationsController);
 apiRouter.get("/modularWeaponSale.php", modularWeaponSaleController);
 apiRouter.get("/playedParkourTutorial.php", playedParkourTutorialController);
-apiRouter.get("/questControl.php", questControlController);
 apiRouter.get("/queueDojoComponentDestruction.php", queueDojoComponentDestructionController);
 apiRouter.get("/removeFromAlliance.php", removeFromAllianceController);
 apiRouter.get("/setActiveQuest.php", setActiveQuestController);
@@ -225,7 +217,6 @@ apiRouter.post("/changeDojoRoot.php", changeDojoRootController);
 apiRouter.post("/claimCompletedRecipe.php", claimCompletedRecipeController);
 apiRouter.post("/clearDialogueHistory.php", clearDialogueHistoryController);
 apiRouter.post("/clearNewEpisodeReward.php", clearNewEpisodeRewardController);
-apiRouter.post("/commitStoryModeDecision.php", (_req, res) => { res.end(); }); // U14 (maybe wanna actually unlock the ship features?)
 apiRouter.post("/completeRandomModChallenge.php", completeRandomModChallengeController);
 apiRouter.post("/confirmGuildInvitation.php", confirmGuildInvitationPostController);
 apiRouter.post("/contributeGuildClass.php", contributeGuildClassController);
@@ -247,12 +238,10 @@ apiRouter.post("/findSessions.php", findSessionsController);
 apiRouter.post("/fishmonger.php", fishmongerController);
 apiRouter.post("/focus.php", focusController);
 apiRouter.post("/fusionTreasures.php", fusionTreasuresController);
-apiRouter.post("/gardening.php", gardeningController);
 apiRouter.post("/genericUpdate.php", genericUpdateController);
 apiRouter.post("/getAlliance.php", getAllianceController);
 apiRouter.post("/getFriends.php", getFriendsController);
 apiRouter.post("/getGuildDojo.php", getGuildDojoController);
-apiRouter.post("/getProfileViewingData.php", getProfileViewingDataPostController);
 apiRouter.post("/getVoidProjectionRewards.php", getVoidProjectionRewardsController);
 apiRouter.post("/gifting.php", giftingController);
 apiRouter.post("/gildWeapon.php", gildWeaponController);
@@ -280,7 +269,6 @@ apiRouter.post("/playerSkills.php", playerSkillsController);
 apiRouter.post("/postGuildAdvertisement.php", postGuildAdvertisementController);
 apiRouter.post("/projectionManager.php", projectionManagerController);
 apiRouter.post("/purchase.php", purchaseController);
-apiRouter.post("/questControl.php", questControlController); // U17
 apiRouter.post("/redeemPromoCode.php", redeemPromoCodeController);
 apiRouter.post("/releasePet.php", releasePetController);
 apiRouter.post("/removeFromGuild.php", removeFromGuildController);
@@ -316,7 +304,6 @@ apiRouter.post("/trainingResult.php", trainingResultController);
 apiRouter.post("/unlockShipFeature.php", unlockShipFeatureController);
 apiRouter.post("/updateAlignment.php", updateAlignmentController);
 apiRouter.post("/updateChallengeProgress.php", updateChallengeProgressController);
-apiRouter.post("/updateInventory.php", missionInventoryUpdateController); // U26 and below
 apiRouter.post("/updateNodeIntros.php", genericUpdateController);
 apiRouter.post("/updateQuest.php", updateQuestController);
 apiRouter.post("/updateSession.php", updateSessionPostController);

src/routes/custom.ts

@@ -10,7 +10,6 @@ import { getAccountInfoController } from "@/src/controllers/custom/getAccountInf
 import { renameAccountController } from "@/src/controllers/custom/renameAccountController";
 import { ircDroppedController } from "@/src/controllers/custom/ircDroppedController";
 import { unlockAllIntrinsicsController } from "@/src/controllers/custom/unlockAllIntrinsicsController";
-import { addMissingMaxRankModsController } from "@/src/controllers/custom/addMissingMaxRankModsController";
 
 import { createAccountController } from "@/src/controllers/custom/createAccountController";
 import { createMessageController } from "@/src/controllers/custom/createMessageController";
@@ -18,11 +17,10 @@ import { addCurrencyController } from "@/src/controllers/custom/addCurrencyContr
 import { addItemsController } from "@/src/controllers/custom/addItemsController";
 import { addXpController } from "@/src/controllers/custom/addXpController";
 import { importController } from "@/src/controllers/custom/importController";
-import { manageQuestsController } from "@/src/controllers/custom/manageQuestsController";
-import { setEvolutionProgressController } from "@/src/controllers/custom/setEvolutionProgressController";
 
 import { getConfigDataController } from "@/src/controllers/custom/getConfigDataController";
 import { updateConfigDataController } from "@/src/controllers/custom/updateConfigDataController";
+import { manageQuestsController } from "@/src/controllers/custom/manageQuestsController";
 
 const customRouter = express.Router();
 
@@ -36,7 +34,6 @@ customRouter.get("/getAccountInfo", getAccountInfoController);
 customRouter.get("/renameAccount", renameAccountController);
 customRouter.get("/ircDropped", ircDroppedController);
 customRouter.get("/unlockAllIntrinsics", unlockAllIntrinsicsController);
-customRouter.get("/addMissingMaxRankMods", addMissingMaxRankModsController);
 
 customRouter.post("/createAccount", createAccountController);
 customRouter.post("/createMessage", createMessageController);
@@ -45,7 +42,6 @@ customRouter.post("/addItems", addItemsController);
 customRouter.post("/addXp", addXpController);
 customRouter.post("/import", importController);
 customRouter.post("/manageQuests", manageQuestsController);
-customRouter.post("/setEvolutionProgress", setEvolutionProgressController);
 
 customRouter.get("/config", getConfigDataController);
 customRouter.post("/config", updateConfigDataController);

src/routes/dynamic.ts

@@ -1,14 +1,14 @@
 import express from "express";
 import { aggregateSessionsController } from "@/src/controllers/dynamic/aggregateSessionsController";
 import { getGuildAdsController } from "@/src/controllers/dynamic/getGuildAdsController";
-import { getProfileViewingDataGetController } from "@/src/controllers/dynamic/getProfileViewingDataController";
+import { getProfileViewingDataController } from "@/src/controllers/dynamic/getProfileViewingDataController";
 import { worldStateController } from "@/src/controllers/dynamic/worldStateController";
 
 const dynamicController = express.Router();
 
 dynamicController.get("/aggregateSessions.php", aggregateSessionsController);
 dynamicController.get("/getGuildAds.php", getGuildAdsController);
-dynamicController.get("/getProfileViewingData.php", getProfileViewingDataGetController);
+dynamicController.get("/getProfileViewingData.php", getProfileViewingDataController);
 dynamicController.get("/worldState.php", worldStateController);
 
 export { dynamicController };

src/services/configService.ts

@@ -24,7 +24,6 @@ interface IConfig {
     infiniteEndo?: boolean;
     infiniteRegalAya?: boolean;
     infiniteHelminthMaterials?: boolean;
-    dontSubtractConsumables?: boolean;
     unlockAllShipFeatures?: boolean;
     unlockAllShipDecorations?: boolean;
     unlockAllFlavourItems?: boolean;
@@ -44,7 +43,6 @@ interface IConfig {
     noKimCooldowns?: boolean;
     instantResourceExtractorDrones?: boolean;
     noResourceExtractorDronesDamage?: boolean;
-    skipClanKeyCrafting?: boolean;
     noDojoRoomBuildStage?: boolean;
     noDojoDecoBuildStage?: boolean;
     fastDojoRoomDestruction?: boolean;

src/services/guildService.ts

@@ -1,6 +1,6 @@
 import { Request } from "express";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { addLevelKeys, addRecipes, combineInventoryChanges, getInventory } from "@/src/services/inventoryService";
+import { getInventory } from "@/src/services/inventoryService";
 import { Alliance, AllianceMember, Guild, GuildAd, GuildMember, TGuildDatabaseDocument } from "@/src/models/guildModel";
 import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
 import {
@@ -105,7 +105,6 @@ export const getGuildClient = async (guild: TGuildDatabaseDocument, accountId: s
         Members: members,
         Ranks: guild.Ranks,
         Tier: guild.Tier,
-        Emblem: guild.Emblem,
         Vault: getGuildVault(guild),
         ActiveDojoColorResearch: guild.ActiveDojoColorResearch,
         Class: guild.Class,
@@ -134,7 +133,7 @@ export const getGuildVault = (guild: TGuildDatabaseDocument): IGuildVault => {
 export const getDojoClient = async (
     guild: TGuildDatabaseDocument,
     status: number,
-    componentId?: Types.ObjectId | string
+    componentId: Types.ObjectId | string | undefined = undefined
 ): Promise<IDojoClient> => {
     const dojo: IDojoClient = {
         _id: { $oid: guild._id.toString() },
@@ -175,9 +174,6 @@ export const getDojoClient = async (
             }
             if (dojoComponent.CompletionTime) {
                 clientComponent.CompletionTime = toMongoDate(dojoComponent.CompletionTime);
-                clientComponent.TimeRemaining = Math.trunc(
-                    (dojoComponent.CompletionTime.getTime() - Date.now()) / 1000
-                );
                 if (dojoComponent.CompletionLogPending && Date.now() >= dojoComponent.CompletionTime.getTime()) {
                     const entry = guild.RoomChanges?.find(x => x.componentId.equals(dojoComponent._id));
                     if (entry) {
@@ -213,9 +209,6 @@ export const getDojoClient = async (
                         continue;
                     }
                     clientComponent.DestructionTime = toMongoDate(dojoComponent.DestructionTime);
-                    clientComponent.DestructionTimeRemaining = Math.trunc(
-                        (dojoComponent.DestructionTime.getTime() - Date.now()) / 1000
-                    );
                 }
             } else {
                 clientComponent.RegularCredits = dojoComponent.RegularCredits;
@@ -229,7 +222,6 @@ export const getDojoClient = async (
                         Type: deco.Type,
                         Pos: deco.Pos,
                         Rot: deco.Rot,
-                        Scale: deco.Scale,
                         Name: deco.Name,
                         Sockets: deco.Sockets,
                         PictureFrameInfo: deco.PictureFrameInfo
@@ -251,7 +243,6 @@ export const getDojoClient = async (
                             continue;
                         }
                         clientDeco.CompletionTime = toMongoDate(deco.CompletionTime);
-                        clientDeco.TimeRemaining = Math.trunc((deco.CompletionTime.getTime() - Date.now()) / 1000);
                     } else {
                         clientDeco.RegularCredits = deco.RegularCredits;
                         clientDeco.MiscItems = deco.MiscItems;
@@ -512,7 +503,7 @@ export const hasGuildPermissionEx = (
 
 export const removePigmentsFromGuildMembers = async (guildId: string | Types.ObjectId): Promise<void> => {
     const members = await GuildMember.find({ guildId, status: 0 }, "accountId");
-    await parallelForeach(members, async member => {
+    for (const member of members) {
         const inventory = await getInventory(member.accountId.toString(), "MiscItems");
         const index = inventory.MiscItems.findIndex(
             x => x.ItemType == "/Lotus/Types/Items/Research/DojoColors/GenericDojoColorPigment"
@@ -521,7 +512,7 @@ export const removePigmentsFromGuildMembers = async (guildId: string | Types.Obj
             inventory.MiscItems.splice(index, 1);
             await inventory.save();
         }
-    });
+    }
 };
 
 export const processGuildTechProjectContributionsUpdate = async (
@@ -561,7 +552,7 @@ export const setGuildTechLogState = (
     guild: TGuildDatabaseDocument,
     type: string,
     state: number,
-    dateTime?: Date
+    dateTime: Date | undefined = undefined
 ): boolean => {
     guild.TechChanges ??= [];
     const entry = guild.TechChanges.find(x => x.details == type);
@@ -664,32 +655,6 @@ export const checkClanAscensionHasRequiredContributors = async (guild: TGuildDat
     }
 };
 
-export const giveClanKey = (inventory: TInventoryDatabaseDocument, inventoryChanges?: IInventoryChanges): void => {
-    if (config.skipClanKeyCrafting) {
-        const levelKeyChanges = [
-            {
-                ItemType: "/Lotus/Types/Keys/DojoKey",
-                ItemCount: 1
-            }
-        ];
-        addLevelKeys(inventory, levelKeyChanges);
-        if (inventoryChanges) {
-            combineInventoryChanges(inventoryChanges, { LevelKeys: levelKeyChanges });
-        }
-    } else {
-        const recipeChanges = [
-            {
-                ItemType: "/Lotus/Types/Keys/DojoKeyBlueprint",
-                ItemCount: 1
-            }
-        ];
-        addRecipes(inventory, recipeChanges);
-        if (inventoryChanges) {
-            combineInventoryChanges(inventoryChanges, { Recipes: recipeChanges });
-        }
-    }
-};
-
 export const removeDojoKeyItems = (inventory: TInventoryDatabaseDocument): IInventoryChanges => {
     const inventoryChanges: IInventoryChanges = {};
 

src/services/importService.ts

@@ -2,7 +2,6 @@ import { Types } from "mongoose";
 import {
     IEquipmentClient,
     IEquipmentDatabase,
-    IItemConfig,
     IOperatorConfigClient,
     IOperatorConfigDatabase
 } from "../types/inventoryTypes/commonInventoryTypes";
@@ -38,7 +37,6 @@ import {
 } from "../types/inventoryTypes/inventoryTypes";
 import { TInventoryDatabaseDocument } from "../models/inventoryModels/inventoryModel";
 import { ILoadoutConfigDatabase, ILoadoutDatabase } from "../types/saveLoadoutTypes";
-import { slotNames } from "../types/purchaseTypes";
 
 const convertDate = (value: IMongoDate): Date => {
     return new Date(parseInt(value.$date.$numberLong));
@@ -170,25 +168,10 @@ const convertPendingRecipe = (client: IPendingRecipeClient): IPendingRecipeDatab
 const convertNemesis = (client: INemesisClient): INemesisDatabase => {
     return {
         ...client,
-        fp: BigInt(client.fp),
         d: convertDate(client.d)
     };
 };
 
-// Empty objects from live may have been encoded as empty arrays because of PHP.
-const convertItemConfig = <T extends IItemConfig>(client: T): T => {
-    return {
-        ...client,
-        pricol: Array.isArray(client.pricol) ? {} : client.pricol,
-        attcol: Array.isArray(client.attcol) ? {} : client.attcol,
-        sigcol: Array.isArray(client.sigcol) ? {} : client.sigcol,
-        eyecol: Array.isArray(client.eyecol) ? {} : client.eyecol,
-        facial: Array.isArray(client.facial) ? {} : client.facial,
-        cloth: Array.isArray(client.cloth) ? {} : client.cloth,
-        syancol: Array.isArray(client.syancol) ? {} : client.syancol
-    };
-};
-
 export const importInventory = (db: TInventoryDatabaseDocument, client: Partial<IInventoryClient>): void => {
     for (const key of equipmentKeys) {
         if (client[key] !== undefined) {
@@ -229,7 +212,20 @@ export const importInventory = (db: TInventoryDatabaseDocument, client: Partial<
             replaceArray<IOperatorConfigDatabase>(db[key], client[key].map(convertOperatorConfig));
         }
     }
-    for (const key of slotNames) {
+    for (const key of [
+        "SuitBin",
+        "WeaponBin",
+        "SentinelBin",
+        "SpaceSuitBin",
+        "SpaceWeaponBin",
+        "PvpBonusLoadoutBin",
+        "PveBonusLoadoutBin",
+        "RandomModBin",
+        "MechBin",
+        "CrewMemberBin",
+        "OperatorAmpBin",
+        "CrewShipSalvageBin"
+    ] as const) {
         if (client[key] !== undefined) {
             replaceSlots(db[key], client[key]);
         }
@@ -367,7 +363,7 @@ export const importInventory = (db: TInventoryDatabaseDocument, client: Partial<
         db.PlayerSkills = client.PlayerSkills;
     }
     if (client.LotusCustomization !== undefined) {
-        db.LotusCustomization = convertItemConfig(client.LotusCustomization);
+        db.LotusCustomization = client.LotusCustomization;
     }
     if (client.CollectibleSeries !== undefined) {
         db.CollectibleSeries = client.CollectibleSeries;

src/services/inventoryService.ts

@@ -18,6 +18,7 @@ import {
     IKubrowPetEggDatabase,
     IKubrowPetEggClient,
     ILibraryDailyTaskInfo,
+    ICalendarProgress,
     IDroneClient,
     IUpgradeClient,
     TPartialStartingGear,
@@ -25,10 +26,7 @@ import {
     ICrewMemberClient,
     Status,
     IKubrowPetDetailsDatabase,
-    ITraits,
-    ICalendarProgress,
-    INemesisWeaponTargetFingerprint,
-    INemesisPetTargetFingerprint
+    ITraits
 } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IGenericUpdate, IUpdateNodeIntrosResponse } from "../types/genericUpdate";
 import { IKeyChainRequest, IMissionInventoryUpdateRequest } from "../types/requestTypes";
@@ -69,7 +67,6 @@ import {
 import { createShip } from "./shipService";
 import {
     catbrowDetails,
-    fromMongoDate,
     kubrowDetails,
     kubrowFurPatternsWeights,
     kubrowWeights,
@@ -81,8 +78,6 @@ import libraryDailyTasks from "@/static/fixed_responses/libraryDailyTasks.json";
 import { getRandomElement, getRandomInt, getRandomWeightedReward, SRng } from "./rngService";
 import { createMessage } from "./inboxService";
 import { getMaxStanding } from "@/src/helpers/syndicateStandingHelper";
-import { getWorldState } from "./worldStateService";
-import { getInnateDamageTag, getInnateDamageValue } from "../helpers/nemesisHelpers";
 
 export const createInventory = async (
     accountOwnerId: Types.ObjectId,
@@ -96,6 +91,7 @@ export const createInventory = async (
         });
 
         inventory.LibraryAvailableDailyTaskInfo = createLibraryDailyTask();
+        inventory.CalendarProgress = createCalendar();
         inventory.RewardSeed = generateRewardSeed();
         inventory.DuviriInfo = {
             Seed: generateRewardSeed(),
@@ -124,15 +120,10 @@ export const createInventory = async (
     }
 };
 
-export const generateRewardSeed = (): bigint => {
-    const hiDword = getRandomInt(0, 0x7fffffff);
-    const loDword = getRandomInt(0, 0xffffffff);
-    let seed = (BigInt(hiDword) << 32n) | BigInt(loDword);
-    if (Math.random() < 0.5) {
-        seed *= -1n;
-        seed -= 1n;
-    }
-    return seed;
+export const generateRewardSeed = (): number => {
+    const min = -Number.MAX_SAFE_INTEGER;
+    const max = Number.MAX_SAFE_INTEGER;
+    return Math.floor(Math.random() * (max - min + 1)) + min;
 };
 
 //TODO: RawUpgrades might need to return a LastAdded
@@ -147,13 +138,8 @@ const awakeningRewards = [
 
 export const addStartingGear = async (
     inventory: TInventoryDatabaseDocument,
-    startingGear?: TPartialStartingGear
+    startingGear: TPartialStartingGear | undefined = undefined
 ): Promise<IInventoryChanges> => {
-    if (inventory.ReceivedStartingGear) {
-        throw new Error(`account has already received starting gear`);
-    }
-    inventory.ReceivedStartingGear = true;
-
     const { LongGuns, Pistols, Suits, Melee } = startingGear || {
         LongGuns: [{ ItemType: "/Lotus/Weapons/Tenno/Rifle/Rifle" }],
         Pistols: [{ ItemType: "/Lotus/Weapons/Tenno/Pistol/Pistol" }],
@@ -163,22 +149,23 @@ export const addStartingGear = async (
 
     //TODO: properly merge weapon bin changes it is currently static here
     const inventoryChanges: IInventoryChanges = {};
-    addEquipment(inventory, "LongGuns", LongGuns[0].ItemType, { IsNew: false }, inventoryChanges);
-    addEquipment(inventory, "Pistols", Pistols[0].ItemType, { IsNew: false }, inventoryChanges);
-    addEquipment(inventory, "Melee", Melee[0].ItemType, { IsNew: false }, inventoryChanges);
-    await addPowerSuit(inventory, Suits[0].ItemType, { IsNew: false }, inventoryChanges);
+    addEquipment(inventory, "LongGuns", LongGuns[0].ItemType, undefined, inventoryChanges);
+    addEquipment(inventory, "Pistols", Pistols[0].ItemType, undefined, inventoryChanges);
+    addEquipment(inventory, "Melee", Melee[0].ItemType, undefined, inventoryChanges);
+    await addPowerSuit(inventory, Suits[0].ItemType, inventoryChanges);
     addEquipment(
         inventory,
         "DataKnives",
         "/Lotus/Weapons/Tenno/HackingDevices/TnHackingDevice/TnHackingDeviceWeapon",
-        { XP: 450_000, IsNew: false },
-        inventoryChanges
+        undefined,
+        inventoryChanges,
+        { XP: 450_000 }
     );
     addEquipment(
         inventory,
         "Scoops",
         "/Lotus/Weapons/Tenno/Speedball/SpeedballWeaponTest",
-        { IsNew: false },
+        undefined,
         inventoryChanges
     );
 
@@ -202,6 +189,11 @@ export const addStartingGear = async (
         combineInventoryChanges(inventoryChanges, inventoryDelta);
     }
 
+    if (inventory.ReceivedStartingGear) {
+        logger.warn(`account already had starting gear but asked for it again?!`);
+    }
+    inventory.ReceivedStartingGear = true;
+
     return inventoryChanges;
 };
 
@@ -216,15 +208,6 @@ export const combineInventoryChanges = (InventoryChanges: IInventoryChanges, del
     for (const key in delta) {
         if (!(key in InventoryChanges)) {
             InventoryChanges[key] = delta[key];
-        } else if (key == "MiscItems") {
-            for (const deltaItem of delta[key]!) {
-                const existing = InventoryChanges[key]!.find(x => x.ItemType == deltaItem.ItemType);
-                if (existing) {
-                    existing.ItemCount += deltaItem.ItemCount;
-                } else {
-                    InventoryChanges[key]!.push(deltaItem);
-                }
-            }
         } else if (Array.isArray(delta[key])) {
             const left = InventoryChanges[key] as object[];
             const right: object[] = delta[key];
@@ -257,7 +240,7 @@ export const combineInventoryChanges = (InventoryChanges: IInventoryChanges, del
 
 export const getInventory = async (
     accountOwnerId: string,
-    projection?: string
+    projection: string | undefined = undefined
 ): Promise<TInventoryDatabaseDocument> => {
     const inventory = await Inventory.findOne({ accountOwnerId: accountOwnerId }, projection);
 
@@ -331,9 +314,7 @@ export const addItem = async (
     typeName: string,
     quantity: number = 1,
     premiumPurchase: boolean = false,
-    seed?: bigint,
-    targetFingerprint?: string,
-    exactQuantity: boolean = false
+    seed?: bigint
 ): Promise<IInventoryChanges> => {
     // Bundles are technically StoreItems but a) they don't have a normal counterpart, and b) they are used in non-StoreItem contexts, e.g. email attachments.
     if (typeName in ExportBundles) {
@@ -488,12 +469,6 @@ export const addItem = async (
         };
     }
     if (typeName in ExportGear) {
-        // Multipling by purchase quantity for gear because:
-        // - The Saya's Vigil scanner message has it as a non-counted attachment.
-        // - Blueprints for Ancient Protector Specter, Shield Osprey Specter, etc. have num=1 despite giving their purchaseQuantity.
-        if (!exactQuantity) {
-            quantity *= ExportGear[typeName].purchaseQuantity ?? 1;
-        }
         const consumablesChanges = [
             {
                 ItemType: typeName,
@@ -542,13 +517,14 @@ export const addItem = async (
                     ]
                 });
             }
-            if (targetFingerprint) {
-                const targetFingerprintObj = JSON.parse(targetFingerprint) as INemesisWeaponTargetFingerprint;
-                defaultOverwrites.UpgradeType = targetFingerprintObj.ItemType;
-                defaultOverwrites.UpgradeFingerprint = JSON.stringify(targetFingerprintObj.UpgradeFingerprint);
-                defaultOverwrites.ItemName = targetFingerprintObj.Name;
-            }
-            const inventoryChanges = addEquipment(inventory, weapon.productCategory, typeName, defaultOverwrites);
+            const inventoryChanges = addEquipment(
+                inventory,
+                weapon.productCategory,
+                typeName,
+                [],
+                {},
+                defaultOverwrites
+            );
             if (weapon.additionalItems) {
                 for (const item of weapon.additionalItems) {
                     combineInventoryChanges(inventoryChanges, await addItem(inventory, item, 1));
@@ -556,32 +532,7 @@ export const addItem = async (
             }
             return {
                 ...inventoryChanges,
-                ...occupySlot(
-                    inventory,
-                    productCategoryToInventoryBin(weapon.productCategory) ?? InventorySlot.WEAPONS,
-                    premiumPurchase
-                )
-            };
-        } else if (targetFingerprint) {
-            // Sister's Hound
-            const targetFingerprintObj = JSON.parse(targetFingerprint) as INemesisPetTargetFingerprint;
-            const head = targetFingerprintObj.Parts[0];
-            const defaultOverwrites: Partial<IEquipmentDatabase> = {
-                ModularParts: targetFingerprintObj.Parts,
-                ItemName: targetFingerprintObj.Name,
-                Configs: applyDefaultUpgrades(inventory, ExportWeapons[head].defaultUpgrades)
-            };
-            const itemType = {
-                "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadA":
-                    "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetAPowerSuit",
-                "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadB":
-                    "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetBPowerSuit",
-                "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadC":
-                    "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetCPowerSuit"
-            }[head] as string;
-            return {
-                ...addEquipment(inventory, "MoaPets", itemType, defaultOverwrites),
-                ...occupySlot(inventory, InventorySlot.SENTINELS, premiumPurchase)
+                ...occupySlot(inventory, InventorySlot.WEAPONS, premiumPurchase)
             };
         } else {
             // Modular weapon parts
@@ -629,7 +580,7 @@ export const addItem = async (
     }
     if (typeName in ExportFusionBundles) {
         const fusionPointsTotal = ExportFusionBundles[typeName].fusionPoints * quantity;
-        addFusionPoints(inventory, fusionPointsTotal);
+        inventory.FusionPoints += fusionPointsTotal;
         return {
             FusionPoints: fusionPointsTotal
         };
@@ -670,9 +621,12 @@ export const addItem = async (
             switch (typeName.substr(1).split("/")[2]) {
                 default: {
                     return {
-                        ...(await addPowerSuit(inventory, typeName, {
-                            Features: premiumPurchase ? EquipmentFeatures.DOUBLE_CAPACITY : undefined
-                        })),
+                        ...(await addPowerSuit(
+                            inventory,
+                            typeName,
+                            {},
+                            premiumPurchase ? EquipmentFeatures.DOUBLE_CAPACITY : undefined
+                        )),
                         ...occupySlot(inventory, InventorySlot.SUITS, premiumPurchase)
                     };
                 }
@@ -789,10 +743,6 @@ export const addItem = async (
                     break;
                 }
                 case "NeutralCreatures": {
-                    if (inventory.Horses.length != 0) {
-                        logger.warn("refusing to add Horse because account already has one");
-                        return {};
-                    }
                     const horseIndex = inventory.Horses.push({ ItemType: typeName });
                     return {
                         Horses: [inventory.Horses[horseIndex - 1].toJSON<IEquipmentClient>()]
@@ -871,8 +821,7 @@ const addSentinel = (
 
     const features = premiumPurchase ? EquipmentFeatures.DOUBLE_CAPACITY : undefined;
     const sentinelIndex =
-        inventory.Sentinels.push({ ItemType: sentinelName, Configs: configs, XP: 0, Features: features, IsNew: true }) -
-        1;
+        inventory.Sentinels.push({ ItemType: sentinelName, Configs: configs, XP: 0, Features: features }) - 1;
     inventoryChanges.Sentinels ??= [];
     inventoryChanges.Sentinels.push(inventory.Sentinels[sentinelIndex].toJSON<IEquipmentClient>());
 
@@ -896,8 +845,8 @@ const addSentinelWeapon = (
 export const addPowerSuit = async (
     inventory: TInventoryDatabaseDocument,
     powersuitName: string,
-    defaultOverwrites?: Partial<IEquipmentDatabase>,
-    inventoryChanges: IInventoryChanges = {}
+    inventoryChanges: IInventoryChanges = {},
+    features: number | undefined = undefined
 ): Promise<IInventoryChanges> => {
     const powersuit = ExportWarframes[powersuitName] as IPowersuit | undefined;
     const exalted = powersuit?.exalted ?? [];
@@ -911,20 +860,15 @@ export const addPowerSuit = async (
             }
         }
     }
-    const suit: Omit<IEquipmentDatabase, "_id"> = Object.assign(
-        {
+    const suitIndex =
+        inventory.Suits.push({
             ItemType: powersuitName,
             Configs: [],
             UpgradeVer: 101,
             XP: 0,
+            Features: features,
             IsNew: true
-        },
-        defaultOverwrites
-    );
-    if (!suit.IsNew) {
-        suit.IsNew = undefined;
-    }
-    const suitIndex = inventory.Suits.push(suit) - 1;
+        }) - 1;
     inventoryChanges.Suits ??= [];
     inventoryChanges.Suits.push(inventory.Suits[suitIndex].toJSON<IEquipmentClient>());
     return inventoryChanges;
@@ -934,7 +878,7 @@ export const addMechSuit = async (
     inventory: TInventoryDatabaseDocument,
     mechsuitName: string,
     inventoryChanges: IInventoryChanges = {},
-    features?: number
+    features: number | undefined = undefined
 ): Promise<IInventoryChanges> => {
     const powersuit = ExportWarframes[mechsuitName] as IPowersuit | undefined;
     const exalted = powersuit?.exalted ?? [];
@@ -986,7 +930,7 @@ export const addSpaceSuit = (
     inventory: TInventoryDatabaseDocument,
     spacesuitName: string,
     inventoryChanges: IInventoryChanges = {},
-    features?: number
+    features: number | undefined = undefined
 ): IInventoryChanges => {
     const suitIndex =
         inventory.SpaceSuits.push({
@@ -1125,15 +1069,6 @@ export const updateCurrency = (
     return currencyChanges;
 };
 
-export const addFusionPoints = (inventory: TInventoryDatabaseDocument, add: number): number => {
-    if (inventory.FusionPoints + add > 2147483647) {
-        logger.warn(`capping FusionPoints balance at 2147483647`);
-        add = 2147483647 - inventory.FusionPoints;
-    }
-    inventory.FusionPoints += add;
-    return add;
-};
-
 const standingLimitBinToInventoryKey: Record<
     Exclude<TStandingLimitBin, "STANDING_LIMIT_BIN_NONE">,
     keyof IDailyAffiliations
@@ -1245,21 +1180,20 @@ export const addEquipment = (
     inventory: TInventoryDatabaseDocument,
     category: TEquipmentKey,
     type: string,
-    defaultOverwrites?: Partial<IEquipmentDatabase>,
-    inventoryChanges: IInventoryChanges = {}
+    modularParts: string[] | undefined = undefined,
+    inventoryChanges: IInventoryChanges = {},
+    defaultOverwrites: Partial<IEquipmentDatabase> | undefined = undefined
 ): IInventoryChanges => {
-    const equipment: Omit<IEquipmentDatabase, "_id"> = Object.assign(
+    const equipment = Object.assign(
         {
             ItemType: type,
             Configs: [],
             XP: 0,
-            IsNew: category != "CrewShipWeapons" && category != "CrewShipSalvagedWeapons"
+            ModularParts: modularParts,
+            IsNew: category != "CrewShipWeapons" && category != "CrewShipSalvagedWeapons" ? true : undefined
         },
         defaultOverwrites
     );
-    if (!equipment.IsNew) {
-        equipment.IsNew = undefined;
-    }
     const index = inventory[category].push(equipment) - 1;
 
     inventoryChanges[category] ??= [];
@@ -1288,16 +1222,12 @@ export const addSkin = (
     typeName: string,
     inventoryChanges: IInventoryChanges = {}
 ): IInventoryChanges => {
-    if (inventory.WeaponSkins.find(x => x.ItemType == typeName)) {
-        logger.debug(`refusing to add WeaponSkin ${typeName} because account already owns it`);
-    } else {
-        const index = inventory.WeaponSkins.push({ ItemType: typeName, IsNew: true }) - 1;
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        inventoryChanges.WeaponSkins ??= [];
-        (inventoryChanges.WeaponSkins as IWeaponSkinClient[]).push(
-            inventory.WeaponSkins[index].toJSON<IWeaponSkinClient>()
-        );
-    }
+    const index = inventory.WeaponSkins.push({ ItemType: typeName, IsNew: true }) - 1;
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    inventoryChanges.WeaponSkins ??= [];
+    (inventoryChanges.WeaponSkins as IWeaponSkinClient[]).push(
+        inventory.WeaponSkins[index].toJSON<IWeaponSkinClient>()
+    );
     return inventoryChanges;
 };
 
@@ -1483,20 +1413,21 @@ export const addEmailItem = async (
     return inventoryChanges;
 };
 
-export const applyClientEquipmentUpdates = (
+//TODO: wrong id is not erroring
+export const addGearExpByCategory = (
     inventory: TInventoryDatabaseDocument,
     gearArray: IEquipmentClient[],
     categoryName: TEquipmentKey
 ): void => {
     const category = inventory[categoryName];
 
-    gearArray.forEach(({ ItemId, XP, InfestationDate }) => {
-        const item = category.id(ItemId.$oid);
-        if (!item) {
-            throw new Error(`No item with id ${ItemId.$oid} in ${categoryName}`);
+    gearArray.forEach(({ ItemId, XP }) => {
+        if (!XP) {
+            return;
         }
 
-        if (XP) {
+        const item = category.id(ItemId.$oid);
+        if (item) {
             item.XP ??= 0;
             item.XP += XP;
 
@@ -1511,31 +1442,9 @@ export const applyClientEquipmentUpdates = (
                 });
             }
         }
-
-        if (InfestationDate) {
-            // 2147483647000 means cured, otherwise became infected
-            item.InfestationDate =
-                InfestationDate.$date.$numberLong == "2147483647000" ? new Date(0) : fromMongoDate(InfestationDate);
-        }
     });
 };
 
-export const addMiscItem = (
-    inventory: TInventoryDatabaseDocument,
-    type: string,
-    count: number,
-    inventoryChanges: IInventoryChanges
-): void => {
-    const miscItemChanges: IMiscItem[] = [
-        {
-            ItemType: type,
-            ItemCount: count
-        }
-    ];
-    addMiscItems(inventory, miscItemChanges);
-    combineInventoryChanges(inventoryChanges, { MiscItems: miscItemChanges });
-};
-
 export const addMiscItems = (inventory: TInventoryDatabaseDocument, itemsArray: IMiscItem[]): void => {
     const { MiscItems } = inventory;
 
@@ -1815,7 +1724,7 @@ export const addKeyChainItems = async (
 };
 
 export const createLibraryDailyTask = (): ILibraryDailyTaskInfo => {
-    const enemyTypes = getRandomElement(libraryDailyTasks)!;
+    const enemyTypes = getRandomElement(libraryDailyTasks);
     const enemyAvatar = ExportEnemies.avatars[enemyTypes[0]];
     const scansRequired = getRandomInt(2, 4);
     return {
@@ -1829,6 +1738,20 @@ export const createLibraryDailyTask = (): ILibraryDailyTaskInfo => {
     };
 };
 
+const createCalendar = (): ICalendarProgress => {
+    return {
+        Version: 19,
+        Iteration: 2,
+        YearProgress: { Upgrades: [] },
+        SeasonProgress: {
+            SeasonType: "CST_SPRING",
+            LastCompletedDayIdx: -1,
+            LastCompletedChallengeDayIdx: -1,
+            ActivatedChallenges: []
+        }
+    };
+};
+
 export const setupKahlSyndicate = (inventory: TInventoryDatabaseDocument): void => {
     inventory.Affiliations.push({
         Title: 1,
@@ -1864,132 +1787,4 @@ export const cleanupInventory = (inventory: TInventoryDatabaseDocument): void =>
         logger.debug(`removing FreeFavorsEarned from LibrarySyndicate`);
         LibrarySyndicate.FreeFavorsEarned = undefined;
     }
-
-    if (inventory.LotusCustomization) {
-        if (
-            Array.isArray(inventory.LotusCustomization.attcol) ||
-            Array.isArray(inventory.LotusCustomization.sigcol) ||
-            Array.isArray(inventory.LotusCustomization.eyecol) ||
-            Array.isArray(inventory.LotusCustomization.facial) ||
-            Array.isArray(inventory.LotusCustomization.cloth) ||
-            Array.isArray(inventory.LotusCustomization.syancol)
-        ) {
-            logger.debug(`fixing empty objects represented as empty arrays in LotusCustomization`);
-            inventory.LotusCustomization.attcol = {};
-            inventory.LotusCustomization.sigcol = {};
-            inventory.LotusCustomization.eyecol = {};
-            inventory.LotusCustomization.facial = {};
-            inventory.LotusCustomization.cloth = {};
-            inventory.LotusCustomization.syancol = {};
-        }
-    }
-};
-
-export const getCalendarProgress = (inventory: TInventoryDatabaseDocument): ICalendarProgress => {
-    const currentSeason = getWorldState().KnownCalendarSeasons[0];
-
-    if (!inventory.CalendarProgress) {
-        inventory.CalendarProgress = {
-            Version: 19,
-            Iteration: currentSeason.YearIteration,
-            YearProgress: {
-                Upgrades: []
-            },
-            SeasonProgress: {
-                SeasonType: currentSeason.Season,
-                LastCompletedDayIdx: 0,
-                LastCompletedChallengeDayIdx: 0,
-                ActivatedChallenges: []
-            }
-        };
-    }
-
-    const yearRolledOver = inventory.CalendarProgress.Iteration != currentSeason.YearIteration;
-    if (yearRolledOver) {
-        inventory.CalendarProgress.Iteration = currentSeason.YearIteration;
-        inventory.CalendarProgress.YearProgress.Upgrades = [];
-    }
-    if (yearRolledOver || inventory.CalendarProgress.SeasonProgress.SeasonType != currentSeason.Season) {
-        inventory.CalendarProgress.SeasonProgress.SeasonType = currentSeason.Season;
-        inventory.CalendarProgress.SeasonProgress.LastCompletedDayIdx = -1;
-        inventory.CalendarProgress.SeasonProgress.LastCompletedChallengeDayIdx = -1;
-        inventory.CalendarProgress.SeasonProgress.ActivatedChallenges = [];
-    }
-
-    return inventory.CalendarProgress;
-};
-
-export const giveNemesisWeaponRecipe = (
-    inventory: TInventoryDatabaseDocument,
-    weaponType: string,
-    nemesisName: string = "AGOR ROK",
-    weaponLoc?: string,
-    KillingSuit: string = "/Lotus/Powersuits/Ember/Ember",
-    fp: bigint = generateRewardSeed()
-): void => {
-    if (!weaponLoc) {
-        weaponLoc = ExportWeapons[weaponType].name;
-    }
-    const recipeType = Object.entries(ExportRecipes).find(arr => arr[1].resultType == weaponType)![0];
-    addRecipes(inventory, [
-        {
-            ItemType: recipeType,
-            ItemCount: 1
-        }
-    ]);
-    inventory.PendingRecipes.push({
-        CompletionDate: new Date(),
-        ItemType: recipeType,
-        TargetFingerprint: JSON.stringify({
-            ItemType: "/Lotus/Weapons/Grineer/KuvaLich/Upgrades/InnateDamageRandomMod",
-            UpgradeFingerprint: {
-                compat: weaponType,
-                buffs: [
-                    {
-                        Tag: getInnateDamageTag(KillingSuit),
-                        Value: getInnateDamageValue(fp)
-                    }
-                ]
-            },
-            Name: weaponLoc + "|" + nemesisName
-        } satisfies INemesisWeaponTargetFingerprint)
-    });
-};
-
-export const giveNemesisPetRecipe = (inventory: TInventoryDatabaseDocument, nemesisName: string = "AGOR ROK"): void => {
-    const head = getRandomElement([
-        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadA",
-        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadB",
-        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadC"
-    ])!;
-    const body = getRandomElement([
-        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartBodyA",
-        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartBodyB",
-        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartBodyC"
-    ])!;
-    const legs = getRandomElement([
-        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartLegsA",
-        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartLegsB",
-        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartLegsC"
-    ])!;
-    const tail = getRandomElement([
-        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartTailA",
-        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartTailB",
-        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartTailC"
-    ])!;
-    const recipeType = Object.entries(ExportRecipes).find(arr => arr[1].resultType == head)![0];
-    addRecipes(inventory, [
-        {
-            ItemType: recipeType,
-            ItemCount: 1
-        }
-    ]);
-    inventory.PendingRecipes.push({
-        CompletionDate: new Date(),
-        ItemType: recipeType,
-        TargetFingerprint: JSON.stringify({
-            Parts: [head, body, legs, tail],
-            Name: "/Lotus/Language/Pets/ZanukaPetName|" + nemesisName
-        } satisfies INemesisPetTargetFingerprint)
-    });
 };

src/services/itemDataService.ts

@@ -17,7 +17,6 @@ import {
     dict_uk,
     dict_zh,
     ExportArcanes,
-    ExportBoosters,
     ExportCustoms,
     ExportDrones,
     ExportGear,
@@ -218,30 +217,15 @@ export const convertInboxMessage = (message: IInboxMessage): IMessage => {
 };
 
 export const isStoreItem = (type: string): boolean => {
-    return type.startsWith("/Lotus/StoreItems/") || type in ExportBoosters;
+    return type.startsWith("/Lotus/StoreItems/");
 };
 
 export const toStoreItem = (type: string): string => {
-    if (type.startsWith("/Lotus/Types/StoreItems/Boosters/")) {
-        const boosterEntry = Object.entries(ExportBoosters).find(arr => arr[1].typeName == type);
-        if (boosterEntry) {
-            return boosterEntry[0];
-        }
-        throw new Error(`could not convert ${type} to a store item`);
-    }
     return "/Lotus/StoreItems/" + type.substring("/Lotus/".length);
 };
 
 export const fromStoreItem = (type: string): string => {
-    if (type.startsWith("/Lotus/StoreItems/")) {
-        return "/Lotus/" + type.substring("/Lotus/StoreItems/".length);
-    }
-
-    if (type in ExportBoosters) {
-        return ExportBoosters[type].typeName;
-    }
-
-    throw new Error(`${type} is not a store item`);
+    return "/Lotus/" + type.substring("/Lotus/StoreItems/".length);
 };
 
 export const getDefaultUpgrades = (parts: string[]): IDefaultUpgrade[] | undefined => {

src/services/loginRewardService.ts

@@ -77,6 +77,7 @@ const getRandomLoginReward = (rng: CRng, day: number, inventory: TInventoryDatab
     const reward = rng.randomReward(randomRewards)!;
     //const reward = randomRewards.find(x => x.RewardType == "RT_BOOSTER")!;
     if (reward.RewardType == "RT_RANDOM_RECIPE") {
+        // Not very faithful implementation but roughly the same idea
         const masteredItems = new Set();
         for (const entry of inventory.XPInfo) {
             masteredItems.add(entry.ItemType);
@@ -94,15 +95,15 @@ const getRandomLoginReward = (rng: CRng, day: number, inventory: TInventoryDatab
         }
         const eligibleRecipes: string[] = [];
         for (const [uniqueName, recipe] of Object.entries(ExportRecipes)) {
-            if (!recipe.excludeFromMarket && unmasteredItems.has(recipe.resultType)) {
+            if (unmasteredItems.has(recipe.resultType)) {
                 eligibleRecipes.push(uniqueName);
             }
         }
         if (eligibleRecipes.length == 0) {
-            // This account has all applicable warframes and weapons already mastered (filthy cheater), need a different reward.
+            // This account has all warframes and weapons already mastered (filthy cheater), need a different reward.
             return getRandomLoginReward(rng, day, inventory);
         }
-        reward.StoreItemType = toStoreItem(rng.randomElement(eligibleRecipes)!);
+        reward.StoreItemType = toStoreItem(rng.randomElement(eligibleRecipes));
     }
     return {
         //_id: toOid(new Types.ObjectId()),

src/services/missionInventoryUpdateService.ts

@@ -19,8 +19,8 @@ import {
     addCrewShipRawSalvage,
     addEmailItem,
     addFocusXpIncreases,
-    addFusionPoints,
     addFusionTreasures,
+    addGearExpByCategory,
     addItem,
     addLevelKeys,
     addLoreFragmentScans,
@@ -29,14 +29,9 @@ import {
     addMods,
     addRecipes,
     addShipDecorations,
-    addSkin,
     addStanding,
-    applyClientEquipmentUpdates,
     combineInventoryChanges,
     generateRewardSeed,
-    getCalendarProgress,
-    giveNemesisPetRecipe,
-    giveNemesisWeaponRecipe,
     updateCurrency,
     updateSyndicate
 } from "@/src/services/inventoryService";
@@ -48,20 +43,19 @@ import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/invento
 import { getEntriesUnsafe } from "@/src/utils/ts-utils";
 import { IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { handleStoreItemAcquisition } from "./purchaseService";
-import { IMissionCredits, IMissionReward } from "../types/missionTypes";
+import { IMissionReward } from "../types/missionTypes";
 import { crackRelic } from "@/src/helpers/relicHelper";
 import { createMessage } from "./inboxService";
 import kuriaMessage50 from "@/static/fixed_responses/kuriaMessages/fiftyPercent.json";
 import kuriaMessage75 from "@/static/fixed_responses/kuriaMessages/seventyFivePercent.json";
 import kuriaMessage100 from "@/static/fixed_responses/kuriaMessages/oneHundredPercent.json";
 import conservationAnimals from "@/static/fixed_responses/conservationAnimals.json";
-import { getInfNodes, getWeaponsForManifest, sendCodaFinishedMessage } from "@/src/helpers/nemesisHelpers";
+import { getInfNodes } from "@/src/helpers/nemesisHelpers";
 import { Loadout } from "../models/inventoryModels/loadoutModel";
 import { ILoadoutConfigDatabase } from "../types/saveLoadoutTypes";
-import { getLiteSortie, getSortie, idToBountyCycle, idToDay, idToWeek, pushClassicBounties } from "./worldStateService";
+import { getLiteSortie, getWorldState, idToWeek } from "./worldStateService";
 import { config } from "./configService";
 import libraryDailyTasks from "@/static/fixed_responses/libraryDailyTasks.json";
-import { ISyndicateMissionInfo } from "../types/worldStateTypes";
 
 const getRotations = (rewardInfo: IRewardInfo, tierOverride?: number): number[] => {
     // For Spy missions, e.g. 3 vaults cracked = A, B, C
@@ -73,23 +67,19 @@ const getRotations = (rewardInfo: IRewardInfo, tierOverride?: number): number[]
         return rotations;
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    const missionIndex: number | undefined = ExportRegions[rewardInfo.node]?.missionIndex;
-
     // For Rescue missions
-    if (missionIndex == 3 && rewardInfo.rewardTier) {
+    if (rewardInfo.node in ExportRegions && ExportRegions[rewardInfo.node].missionIndex == 3 && rewardInfo.rewardTier) {
         return [rewardInfo.rewardTier];
     }
 
-    const rotationCount = rewardInfo.rewardQualifications?.length || 0;
-
-    // Empty or absent rewardQualifications should not give rewards when:
-    // - Completing only 1 zone of (E)SO (https://onlyg.it/OpenWF/SpaceNinjaServer/issues/1823)
-    // - Aborting a railjack mission (https://onlyg.it/OpenWF/SpaceNinjaServer/issues/1741)
-    if (rotationCount == 0 && missionIndex != 30 && missionIndex != 32) {
-        return [0];
+    // Aborting a railjack mission should not give any rewards (https://onlyg.it/OpenWF/SpaceNinjaServer/issues/1741)
+    if (rewardInfo.rewardQualifications === undefined) {
+        return [];
     }
 
+    const rotationCount = rewardInfo.rewardQualifications.length || 0;
+    if (rotationCount === 0) return [0];
+
     const rotationPattern =
         tierOverride === undefined
             ? [0, 0, 1, 2] // A, A, B, C
@@ -144,6 +134,38 @@ export const addMissionInventoryUpdates = async (
                 ]);
             }
         }
+
+        // Somewhat heuristically detect G3 capture:
+        // - https://onlyg.it/OpenWF/SpaceNinjaServer/issues/1365
+        // - https://onlyg.it/OpenWF/SpaceNinjaServer/issues/1694
+        // - https://onlyg.it/OpenWF/SpaceNinjaServer/issues/1724
+        if (
+            inventoryUpdates.MissionFailed &&
+            inventoryUpdates.MissionStatus == "GS_FAILURE" &&
+            inventoryUpdates.ObjectiveReached &&
+            !inventoryUpdates.LockedWeaponGroup &&
+            !inventory.LockedWeaponGroup &&
+            !inventoryUpdates.LevelKeyName
+        ) {
+            const loadout = (await Loadout.findById(inventory.LoadOutPresets, "NORMAL"))!;
+            const config = loadout.NORMAL.id(inventory.CurrentLoadOutIds[0].$oid)!;
+            const SuitId = new Types.ObjectId(config.s!.ItemId.$oid);
+
+            inventory.BrandedSuits ??= [];
+            if (!inventory.BrandedSuits.find(x => x.equals(SuitId))) {
+                inventory.BrandedSuits.push(SuitId);
+
+                await createMessage(inventory.accountOwnerId, [
+                    {
+                        sndr: "/Lotus/Language/Menu/Mailbox_WarframeSender",
+                        msg: "/Lotus/Language/G1Quests/BrandedMessage",
+                        sub: "/Lotus/Language/G1Quests/BrandedTitle",
+                        att: ["/Lotus/Types/Recipes/Components/BrandRemovalBlueprint"],
+                        highPriority: true // TOVERIFY: I cannot find any content of this within the last 10 years so I can only assume that highPriority is set (it certainly would make sense), but I just don't know for sure that it is so on live.
+                    }
+                ]);
+            }
+        }
     }
     if (inventoryUpdates.RewardInfo) {
         if (inventoryUpdates.RewardInfo.periodicMissionTag) {
@@ -162,12 +184,6 @@ export const addMissionInventoryUpdates = async (
         if (inventoryUpdates.RewardInfo.NemesisAbandonedRewards) {
             inventory.NemesisAbandonedRewards = inventoryUpdates.RewardInfo.NemesisAbandonedRewards;
         }
-        if (inventoryUpdates.RewardInfo.NemesisHenchmenKills && inventory.Nemesis) {
-            inventory.Nemesis.HenchmenKilled += inventoryUpdates.RewardInfo.NemesisHenchmenKills;
-        }
-        if (inventoryUpdates.RewardInfo.NemesisHintProgress && inventory.Nemesis) {
-            inventory.Nemesis.HintProgress += inventoryUpdates.RewardInfo.NemesisHintProgress;
-        }
         if (inventoryUpdates.MissionStatus == "GS_SUCCESS" && inventoryUpdates.RewardInfo.jobId) {
             // e.g. for Profit-Taker Phase 1:
             // JobTier: -6,
@@ -249,14 +265,7 @@ export const addMissionInventoryUpdates = async (
                 addMiscItems(inventory, value);
                 break;
             case "Consumables":
-                if (config.dontSubtractConsumables) {
-                    addConsumables(
-                        inventory,
-                        value.filter(x => x.ItemCount > 0)
-                    );
-                } else {
-                    addConsumables(inventory, value);
-                }
+                addConsumables(inventory, value);
                 break;
             case "Recipes":
                 addRecipes(inventory, value);
@@ -278,14 +287,14 @@ export const addMissionInventoryUpdates = async (
                 addShipDecorations(inventory, value);
                 break;
             case "FusionBundles": {
-                let fusionPointsDelta = 0;
+                let fusionPoints = 0;
                 for (const fusionBundle of value) {
-                    fusionPointsDelta += addFusionPoints(
-                        inventory,
-                        ExportFusionBundles[fusionBundle.ItemType].fusionPoints * fusionBundle.ItemCount
-                    );
+                    const fusionPointsTotal =
+                        ExportFusionBundles[fusionBundle.ItemType].fusionPoints * fusionBundle.ItemCount;
+                    inventory.FusionPoints += fusionPointsTotal;
+                    fusionPoints += fusionPointsTotal;
                 }
-                inventoryChanges.FusionPoints = fusionPointsDelta;
+                inventoryChanges.FusionPoints = fusionPoints;
                 break;
             }
             case "EmailItems": {
@@ -349,7 +358,6 @@ export const addMissionInventoryUpdates = async (
                                     : 10)
                             ) {
                                 progress.Completed = true;
-                                inventory.LibraryPersonalTarget = undefined;
                             }
                             logger.debug(`synthesis of ${scan.EnemyType} added to personal target progress`);
                             synthesisIgnored = false;
@@ -403,11 +411,6 @@ export const addMissionInventoryUpdates = async (
                     upgrade.UpgradeFingerprint = clientUpgrade.UpgradeFingerprint; // primitive way to copy over the riven challenge progress
                 });
                 break;
-            case "WeaponSkins":
-                for (const item of value) {
-                    addSkin(inventory, item.ItemType);
-                }
-                break;
             case "Boosters":
                 value.forEach(booster => {
                     addBooster(booster.ItemType, booster.ExpiryDate, inventory);
@@ -485,16 +488,6 @@ export const addMissionInventoryUpdates = async (
                 }
                 break;
             }
-            case "KubrowPetEggs": {
-                for (const egg of value) {
-                    inventory.KubrowPetEggs ??= [];
-                    inventory.KubrowPetEggs.push({
-                        ItemType: egg.ItemType,
-                        _id: new Types.ObjectId()
-                    });
-                }
-                break;
-            }
             case "DiscoveredMarkers": {
                 for (const clientMarker of value) {
                     const dbMarker = inventory.DiscoveredMarkers.find(x => x.tag == clientMarker.tag);
@@ -506,23 +499,6 @@ export const addMissionInventoryUpdates = async (
                 }
                 break;
             }
-            case "BrandedSuits": {
-                inventory.BrandedSuits ??= [];
-                if (!inventory.BrandedSuits.find(x => x.equals(value.$oid))) {
-                    inventory.BrandedSuits.push(new Types.ObjectId(value.$oid));
-
-                    await createMessage(inventory.accountOwnerId, [
-                        {
-                            sndr: "/Lotus/Language/Menu/Mailbox_WarframeSender",
-                            msg: "/Lotus/Language/G1Quests/BrandedMessage",
-                            sub: "/Lotus/Language/G1Quests/BrandedTitle",
-                            att: ["/Lotus/Types/Recipes/Components/BrandRemovalBlueprint"],
-                            highPriority: true // TOVERIFY: I cannot find any content of this within the last 10 years so I can only assume that highPriority is set (it certainly would make sense), but I just don't know for sure that it is so on live.
-                        }
-                    ]);
-                }
-                break;
-            }
             case "LockedWeaponGroup": {
                 inventory.LockedWeaponGroup = {
                     s: new Types.ObjectId(value.s.$oid),
@@ -531,17 +507,12 @@ export const addMissionInventoryUpdates = async (
                     m: value.m ? new Types.ObjectId(value.m.$oid) : undefined,
                     sn: value.sn ? new Types.ObjectId(value.sn.$oid) : undefined
                 };
-                inventory.Harvestable = false;
                 break;
             }
             case "UnlockWeapons": {
                 inventory.LockedWeaponGroup = undefined;
                 break;
             }
-            case "IncHarvester": {
-                inventory.Harvestable = true;
-                break;
-            }
             case "CurrentLoadOutIds": {
                 if (value.LoadOuts) {
                     const loadout = await Loadout.findOne({ loadoutOwnerId: inventory.accountOwnerId });
@@ -590,79 +561,10 @@ export const addMissionInventoryUpdates = async (
                 }
                 break;
             }
-            case "CalendarProgress": {
-                const calendarProgress = getCalendarProgress(inventory);
-                for (const progress of value) {
-                    const challengeName = progress.challenge.substring(progress.challenge.lastIndexOf("/") + 1);
-                    calendarProgress.SeasonProgress.LastCompletedChallengeDayIdx++;
-                    calendarProgress.SeasonProgress.ActivatedChallenges.push(challengeName);
-                }
-                break;
-            }
-            case "duviriCaveOffers": {
-                // Duviri cave offers (generated with the duviri seed) change after completing one of its game modes (not when aborting).
-                if (inventoryUpdates.MissionStatus != "GS_QUIT") {
-                    inventory.DuviriInfo!.Seed = generateRewardSeed();
-                }
-                break;
-            }
-            case "NemesisKillConvert":
-                if (inventory.Nemesis) {
-                    inventory.NemesisHistory ??= [];
-                    inventory.NemesisHistory.push({
-                        // Copy over all 'base' values
-                        fp: inventory.Nemesis.fp,
-                        d: inventory.Nemesis.d,
-                        manifest: inventory.Nemesis.manifest,
-                        KillingSuit: inventory.Nemesis.KillingSuit,
-                        killingDamageType: inventory.Nemesis.killingDamageType,
-                        ShoulderHelmet: inventory.Nemesis.ShoulderHelmet,
-                        WeaponIdx: inventory.Nemesis.WeaponIdx,
-                        AgentIdx: inventory.Nemesis.AgentIdx,
-                        BirthNode: inventory.Nemesis.BirthNode,
-                        Faction: inventory.Nemesis.Faction,
-                        Rank: inventory.Nemesis.Rank,
-                        Traded: inventory.Nemesis.Traded,
-                        PrevOwners: inventory.Nemesis.PrevOwners,
-                        SecondInCommand: inventory.Nemesis.SecondInCommand,
-                        Weakened: inventory.Nemesis.Weakened,
-                        // And set killed flag
-                        k: value.killed
-                    });
-
-                    if (value.killed) {
-                        if (
-                            value.weaponLoc &&
-                            inventory.Nemesis.Faction != "FC_INFESTATION" // weaponLoc is "/Lotus/Language/Weapons/DerelictCernosName" for these for some reason
-                        ) {
-                            const weaponType = getWeaponsForManifest(inventory.Nemesis.manifest)[
-                                inventory.Nemesis.WeaponIdx
-                            ];
-                            giveNemesisWeaponRecipe(
-                                inventory,
-                                weaponType,
-                                value.nemesisName,
-                                value.weaponLoc,
-                                inventory.Nemesis.KillingSuit,
-                                inventory.Nemesis.fp
-                            );
-                        }
-                        if (value.petLoc) {
-                            giveNemesisPetRecipe(inventory);
-                        }
-                    }
-
-                    // TOVERIFY: Is the inbox message also sent when converting a lich? If not, how are the rewards given?
-                    if (inventory.Nemesis.Faction == "FC_INFESTATION") {
-                        await sendCodaFinishedMessage(inventory, inventory.Nemesis.fp, value.nemesisName, value.killed);
-                    }
-
-                    inventory.Nemesis = undefined;
-                }
-                break;
             default:
+                // Equipment XP updates
                 if (equipmentKeys.includes(key as TEquipmentKey)) {
-                    applyClientEquipmentUpdates(inventory, value as IEquipmentClient[], key as TEquipmentKey);
+                    addGearExpByCategory(inventory, value as IEquipmentClient[], key as TEquipmentKey);
                 }
                 break;
             // if (
@@ -684,140 +586,8 @@ interface AddMissionRewardsReturnType {
     credits?: IMissionCredits;
     AffiliationMods?: IAffiliationMods[];
     SyndicateXPItemReward?: number;
-    ConquestCompletedMissionsCount?: number;
 }
 
-interface IConquestReward {
-    at: number;
-    pool: IRngResult[];
-}
-
-const labConquestRewards: IConquestReward[] = [
-    {
-        at: 5,
-        pool: ExportRewards[
-            "/Lotus/Types/Game/MissionDecks/EntratiLabConquestRewards/EntratiLabConquestSilverRewards"
-        ][0] as IRngResult[]
-    },
-    {
-        at: 10,
-        pool: ExportRewards[
-            "/Lotus/Types/Game/MissionDecks/EntratiLabConquestRewards/EntratiLabConquestSilverRewards"
-        ][0] as IRngResult[]
-    },
-    {
-        at: 15,
-        pool: [
-            {
-                type: "/Lotus/StoreItems/Types/Gameplay/EntratiLab/Resources/EntratiLanthornBundle",
-                itemCount: 3,
-                probability: 1
-            }
-        ]
-    },
-    {
-        at: 20,
-        pool: ExportRewards[
-            "/Lotus/Types/Game/MissionDecks/EntratiLabConquestRewards/EntratiLabConquestGoldRewards"
-        ][0] as IRngResult[]
-    },
-    {
-        at: 28,
-        pool: [
-            {
-                type: "/Lotus/StoreItems/Types/Items/MiscItems/DistillPoints",
-                itemCount: 20,
-                probability: 1
-            }
-        ]
-    },
-    {
-        at: 31,
-        pool: ExportRewards[
-            "/Lotus/Types/Game/MissionDecks/EntratiLabConquestRewards/EntratiLabConquestGoldRewards"
-        ][0] as IRngResult[]
-    },
-    {
-        at: 34,
-        pool: ExportRewards[
-            "/Lotus/Types/Game/MissionDecks/EntratiLabConquestRewards/EntratiLabConquestArcaneRewards"
-        ][0] as IRngResult[]
-    },
-    {
-        at: 37,
-        pool: [
-            {
-                type: "/Lotus/StoreItems/Types/Items/MiscItems/DistillPoints",
-                itemCount: 50,
-                probability: 1
-            }
-        ]
-    }
-];
-
-const hexConquestRewards: IConquestReward[] = [
-    {
-        at: 5,
-        pool: ExportRewards[
-            "/Lotus/Types/Game/MissionDecks/1999ConquestRewards/1999ConquestSilverRewards"
-        ][0] as IRngResult[]
-    },
-    {
-        at: 10,
-        pool: ExportRewards[
-            "/Lotus/Types/Game/MissionDecks/1999ConquestRewards/1999ConquestSilverRewards"
-        ][0] as IRngResult[]
-    },
-    {
-        at: 15,
-        pool: [
-            {
-                type: "/Lotus/StoreItems/Types/BoosterPacks/1999StickersPackEchoesArchimedea",
-                itemCount: 1,
-                probability: 1
-            }
-        ]
-    },
-    {
-        at: 20,
-        pool: ExportRewards[
-            "/Lotus/Types/Game/MissionDecks/1999ConquestRewards/1999ConquestGoldRewards"
-        ][0] as IRngResult[]
-    },
-    {
-        at: 28,
-        pool: [
-            {
-                type: "/Lotus/StoreItems/Types/Items/MiscItems/1999ConquestBucks",
-                itemCount: 6,
-                probability: 1
-            }
-        ]
-    },
-    {
-        at: 31,
-        pool: ExportRewards[
-            "/Lotus/Types/Game/MissionDecks/1999ConquestRewards/1999ConquestGoldRewards"
-        ][0] as IRngResult[]
-    },
-    {
-        at: 34,
-        pool: ExportRewards[
-            "/Lotus/Types/Game/MissionDecks/1999ConquestRewards/1999ConquestArcaneRewards"
-        ][0] as IRngResult[]
-    },
-    {
-        at: 37,
-        pool: [
-            {
-                type: "/Lotus/StoreItems/Types/Items/MiscItems/1999ConquestBucks",
-                itemCount: 9,
-                probability: 1
-            }
-        ]
-    }
-];
-
 //TODO: return type of partial missioninventoryupdate response
 export const addMissionRewards = async (
     inventory: TInventoryDatabaseDocument,
@@ -839,13 +609,17 @@ export const addMissionRewards = async (
         return { MissionRewards: [] };
     }
 
+    if (rewardInfo.rewardSeed) {
+        // We're using a reward seed, so give the client a new one in the response. On live, missionInventoryUpdate seems to always provide a fresh one in the response.
+        inventory.RewardSeed = generateRewardSeed();
+    }
+
     //TODO: check double reward merging
     const MissionRewards: IMissionReward[] = getRandomMissionDrops(inventory, rewardInfo, wagerTier, firstCompletion);
     logger.debug("random mission drops:", MissionRewards);
     const inventoryChanges: IInventoryChanges = {};
     const AffiliationMods: IAffiliationMods[] = [];
     let SyndicateXPItemReward;
-    let ConquestCompletedMissionsCount;
 
     let missionCompletionCredits = 0;
     //inventory change is what the client has not rewarded itself, also the client needs to know the credit changes for display
@@ -859,7 +633,8 @@ export const addMissionRewards = async (
             for (const reward of fixedLevelRewards.levelKeyRewards2) {
                 //quest stage completion credit rewards
                 if (reward.rewardType == "RT_CREDITS") {
-                    missionCompletionCredits += reward.amount; // will be added to inventory in addCredits
+                    inventory.RegularCredits += reward.amount;
+                    missionCompletionCredits += reward.amount;
                     continue;
                 }
                 MissionRewards.push({
@@ -883,8 +658,7 @@ export const addMissionRewards = async (
             missions.Tag != "SolNode761" && // the index
             missions.Tag != "SolNode762" && // the index
             missions.Tag != "SolNode763" && // the index
-            missions.Tag != "CrewBattleNode556" && // free flight
-            getRotations(rewardInfo).length > 0 // (E)SO should not give credits for only completing zone 1, in which case it has no rewardQualifications (https://onlyg.it/OpenWF/SpaceNinjaServer/issues/1823)
+            missions.Tag != "CrewBattleNode556" // free flight
         ) {
             const levelCreditReward = getLevelCreditRewards(node);
             missionCompletionCredits += levelCreditReward;
@@ -896,14 +670,6 @@ export const addMissionRewards = async (
             missionCompletionCredits += addFixedLevelRewards(node.missionReward, inventory, MissionRewards, rewardInfo);
         }
 
-        if (rewardInfo.sortieTag == "Mission1") {
-            missionCompletionCredits += 20_000;
-        } else if (rewardInfo.sortieTag == "Mission2") {
-            missionCompletionCredits += 30_000;
-        } else if (rewardInfo.sortieTag == "Final") {
-            missionCompletionCredits += 50_000;
-        }
-
         if (missions.Tag == "PlutoToErisJunction") {
             await createMessage(inventory.accountOwnerId, [
                 {
@@ -920,67 +686,11 @@ export const addMissionRewards = async (
 
     if (rewardInfo.useVaultManifest) {
         MissionRewards.push({
-            StoreItem: getRandomElement(corruptedMods)!,
+            StoreItem: getRandomElement(corruptedMods),
             ItemCount: 1
         });
     }
 
-    if (rewardInfo.ConquestCompleted !== undefined) {
-        let score = 1;
-        if (rewardInfo.ConquestHardModeActive === 1) score += 3;
-
-        if (rewardInfo.ConquestPersonalModifiersActive !== undefined)
-            score += rewardInfo.ConquestPersonalModifiersActive;
-        if (rewardInfo.ConquestEquipmentSuggestionsFulfilled !== undefined)
-            score += rewardInfo.ConquestEquipmentSuggestionsFulfilled;
-
-        score *= rewardInfo.ConquestCompleted + 1;
-
-        if (rewardInfo.ConquestCompleted == 2 && rewardInfo.ConquestHardModeActive === 1) score += 1;
-
-        logger.debug(`completed conquest mission ${rewardInfo.ConquestCompleted + 1} for a score of ${score}`);
-
-        const conquestType = rewardInfo.ConquestType;
-        const conquestNode =
-            conquestType == "HexConquest" ? "EchoesHexConquestHardModeUnlocked" : "EntratiLabConquestHardModeUnlocked";
-        if (score >= 25 && inventory.NodeIntrosCompleted.indexOf(conquestNode) == -1)
-            inventory.NodeIntrosCompleted.push(conquestNode);
-
-        if (conquestType == "HexConquest") {
-            inventory.EchoesHexConquestCacheScoreMission ??= 0;
-            if (score > inventory.EchoesHexConquestCacheScoreMission) {
-                for (const reward of hexConquestRewards) {
-                    if (score >= reward.at && inventory.EchoesHexConquestCacheScoreMission < reward.at) {
-                        const rolled = getRandomReward(reward.pool)!;
-                        logger.debug(`rolled hex conquest reward for reaching ${reward.at} points`, rolled);
-                        MissionRewards.push({
-                            StoreItem: rolled.type,
-                            ItemCount: rolled.itemCount
-                        });
-                    }
-                }
-                inventory.EchoesHexConquestCacheScoreMission = score;
-            }
-        } else {
-            inventory.EntratiLabConquestCacheScoreMission ??= 0;
-            if (score > inventory.EntratiLabConquestCacheScoreMission) {
-                for (const reward of labConquestRewards) {
-                    if (score >= reward.at && inventory.EntratiLabConquestCacheScoreMission < reward.at) {
-                        const rolled = getRandomReward(reward.pool)!;
-                        logger.debug(`rolled lab conquest reward for reaching ${reward.at} points`, rolled);
-                        MissionRewards.push({
-                            StoreItem: rolled.type,
-                            ItemCount: rolled.itemCount
-                        });
-                    }
-                }
-                inventory.EntratiLabConquestCacheScoreMission = score;
-            }
-        }
-
-        ConquestCompletedMissionsCount = rewardInfo.ConquestCompleted == 2 ? 0 : rewardInfo.ConquestCompleted + 1;
-    }
-
     for (const reward of MissionRewards) {
         const inventoryChange = await handleStoreItemAcquisition(
             reward.StoreItem,
@@ -1087,10 +797,10 @@ export const addMissionRewards = async (
 
     if (rewardInfo.JobStage != undefined && rewardInfo.jobId) {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const [jobType, unkIndex, hubNode, syndicateMissionId, locationTag] = rewardInfo.jobId.split("_");
-        const syndicateMissions: ISyndicateMissionInfo[] = [];
-        pushClassicBounties(syndicateMissions, idToBountyCycle(syndicateMissionId));
-        const syndicateEntry = syndicateMissions.find(m => m._id.$oid === syndicateMissionId);
+        const [jobType, unkIndex, hubNode, syndicateId, locationTag] = rewardInfo.jobId.split("_");
+        const worldState = getWorldState();
+        let syndicateEntry = worldState.SyndicateMissions.find(m => m._id.$oid === syndicateId);
+        if (!syndicateEntry) syndicateEntry = worldState.SyndicateMissions.find(m => m.Tag === syndicateId); // Sometimes syndicateId can be tag
         if (syndicateEntry && syndicateEntry.Jobs) {
             let currentJob = syndicateEntry.Jobs[rewardInfo.JobTier!];
             if (syndicateEntry.Tag === "EntratiSyndicate") {
@@ -1172,16 +882,16 @@ export const addMissionRewards = async (
         }
     }
 
-    return {
-        inventoryChanges,
-        MissionRewards,
-        credits,
-        AffiliationMods,
-        SyndicateXPItemReward,
-        ConquestCompletedMissionsCount
-    };
+    return { inventoryChanges, MissionRewards, credits, AffiliationMods, SyndicateXPItemReward };
 };
 
+interface IMissionCredits {
+    MissionCredits: number[];
+    CreditBonus: number[];
+    TotalCredits: number[];
+    DailyMissionBonus?: boolean;
+}
+
 //creditBonus is not entirely accurate.
 //TODO: consider ActiveBoosters
 export const addCredits = (
@@ -1358,24 +1068,6 @@ function getRandomMissionDrops(
             // Invasion assassination has Phorid has the boss who should drop Nyx parts
             // TODO: Check that the invasion faction is indeed FC_INFESTATION once the Invasions in worldState are more dynamic
             rewardManifests = ["/Lotus/Types/Game/MissionDecks/BossMissionRewards/NyxRewards"];
-        } else if (RewardInfo.sortieId) {
-            // Sortie mission types differ from the underlying node and hence also don't give rewards from the underlying nodes. Assassinations are an exception to this.
-            if (region.missionIndex == 0) {
-                const arr = RewardInfo.sortieId.split("_");
-                let sortieId = arr[1];
-                if (sortieId == "Lite") {
-                    sortieId = arr[2];
-                }
-                const sortie = getSortie(idToDay(sortieId));
-                const mission = sortie.Variants.find(x => x.node == arr[0])!;
-                if (mission.missionType == "MT_ASSASSINATION") {
-                    rewardManifests = region.rewardManifests;
-                } else {
-                    rewardManifests = [];
-                }
-            } else {
-                rewardManifests = [];
-            }
         } else {
             rewardManifests = region.rewardManifests;
         }
@@ -1384,12 +1076,13 @@ function getRandomMissionDrops(
         if (RewardInfo.jobId) {
             if (RewardInfo.JobStage! >= 0) {
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const [jobType, unkIndex, hubNode, syndicateMissionId, locationTag] = RewardInfo.jobId.split("_");
+                const [jobType, unkIndex, hubNode, syndicateId, locationTag] = RewardInfo.jobId.split("_");
                 let isEndlessJob = false;
-                if (syndicateMissionId) {
-                    const syndicateMissions: ISyndicateMissionInfo[] = [];
-                    pushClassicBounties(syndicateMissions, idToBountyCycle(syndicateMissionId));
-                    const syndicateEntry = syndicateMissions.find(m => m._id.$oid === syndicateMissionId);
+                if (syndicateId) {
+                    const worldState = getWorldState();
+                    let syndicateEntry = worldState.SyndicateMissions.find(m => m._id.$oid === syndicateId);
+                    if (!syndicateEntry) syndicateEntry = worldState.SyndicateMissions.find(m => m.Tag === syndicateId);
+
                     if (syndicateEntry && syndicateEntry.Jobs) {
                         let job = syndicateEntry.Jobs[RewardInfo.JobTier!];
 
@@ -1464,11 +1157,7 @@ function getRandomMissionDrops(
                             }
                         }
                         rewardManifests = [job.rewards];
-                        if (job.xpAmounts.length > 1) {
-                            rotations = [RewardInfo.JobStage! % (job.xpAmounts.length - 1)];
-                        } else {
-                            rotations = [0];
-                        }
+                        rotations = [RewardInfo.JobStage! % (job.xpAmounts.length - 1)];
                         if (
                             RewardInfo.Q &&
                             (RewardInfo.JobStage === job.xpAmounts.length - 1 || job.isVault) &&
@@ -1527,11 +1216,6 @@ function getRandomMissionDrops(
         if (rewardManifests.length != 0) {
             logger.debug(`generating random mission rewards`, { rewardManifests, rotations });
         }
-        if (RewardInfo.rewardSeed) {
-            if (RewardInfo.rewardSeed != inventory.RewardSeed) {
-                logger.warn(`RewardSeed mismatch:`, { client: RewardInfo.rewardSeed, database: inventory.RewardSeed });
-            }
-        }
         const rng = new SRng(BigInt(RewardInfo.rewardSeed ?? generateRewardSeed()) ^ 0xffffffffffffffffn);
         rewardManifests.forEach(name => {
             const table = ExportRewards[name];

src/services/personalRoomsService.ts

@@ -1,14 +1,9 @@
 import { PersonalRooms } from "@/src/models/personalRoomsModel";
 import { addItem, getInventory } from "@/src/services/inventoryService";
 import { TPersonalRoomsDatabaseDocument } from "../types/personalRoomsTypes";
-import { IGardeningDatabase } from "../types/shipTypes";
-import { getRandomElement } from "./rngService";
 
-export const getPersonalRooms = async (
-    accountId: string,
-    projection?: string
-): Promise<TPersonalRoomsDatabaseDocument> => {
-    const personalRooms = await PersonalRooms.findOne({ personalRoomsOwnerId: accountId }, projection);
+export const getPersonalRooms = async (accountId: string): Promise<TPersonalRoomsDatabaseDocument> => {
+    const personalRooms = await PersonalRooms.findOne({ personalRoomsOwnerId: accountId });
 
     if (!personalRooms) {
         throw new Error(`personal rooms not found for account ${accountId}`);
@@ -30,64 +25,3 @@ export const updateShipFeature = async (accountId: string, shipFeature: string):
     await addItem(inventory, shipFeature, -1);
     await inventory.save();
 };
-
-export const createGarden = (): IGardeningDatabase => {
-    const plantTypes = [
-        "/Lotus/Types/Items/Plants/MiscItems/DuvxDuviriGrowingPlantA",
-        "/Lotus/Types/Items/Plants/MiscItems/DuvxDuviriGrowingPlantB",
-        "/Lotus/Types/Items/Plants/MiscItems/DuvxDuviriGrowingPlantC",
-        "/Lotus/Types/Items/Plants/MiscItems/DuvxDuviriGrowingPlantD",
-        "/Lotus/Types/Items/Plants/MiscItems/DuvxDuviriGrowingPlantE",
-        "/Lotus/Types/Items/Plants/MiscItems/DuvxDuviriGrowingPlantF"
-    ];
-    const endTime = new Date((Math.trunc(Date.now() / 1000) + 79200) * 1000); // Plants will take 22 hours to grow
-    return {
-        Planters: [
-            {
-                Name: "Garden0",
-                Plants: [
-                    {
-                        PlantType: getRandomElement(plantTypes)!,
-                        EndTime: endTime,
-                        PlotIndex: 0
-                    },
-                    {
-                        PlantType: getRandomElement(plantTypes)!,
-                        EndTime: endTime,
-                        PlotIndex: 1
-                    }
-                ]
-            },
-            {
-                Name: "Garden1",
-                Plants: [
-                    {
-                        PlantType: getRandomElement(plantTypes)!,
-                        EndTime: endTime,
-                        PlotIndex: 0
-                    },
-                    {
-                        PlantType: getRandomElement(plantTypes)!,
-                        EndTime: endTime,
-                        PlotIndex: 1
-                    }
-                ]
-            },
-            {
-                Name: "Garden2",
-                Plants: [
-                    {
-                        PlantType: getRandomElement(plantTypes)!,
-                        EndTime: endTime,
-                        PlotIndex: 0
-                    },
-                    {
-                        PlantType: getRandomElement(plantTypes)!,
-                        EndTime: endTime,
-                        PlotIndex: 1
-                    }
-                ]
-            }
-        ]
-    };
-};

src/services/purchaseService.ts

@@ -66,18 +66,6 @@ export const handlePurchase = async (
             if (!offer) {
                 throw new Error(`unknown vendor offer: ${ItemId ? ItemId : purchaseRequest.PurchaseParams.StoreItem}`);
             }
-            if (offer.RegularPrice) {
-                combineInventoryChanges(
-                    prePurchaseInventoryChanges,
-                    updateCurrency(inventory, offer.RegularPrice[0], false)
-                );
-            }
-            if (offer.PremiumPrice) {
-                combineInventoryChanges(
-                    prePurchaseInventoryChanges,
-                    updateCurrency(inventory, offer.PremiumPrice[0], true)
-                );
-            }
             if (offer.ItemPrices) {
                 handleItemPrices(
                     inventory,
@@ -182,9 +170,6 @@ export const handlePurchase = async (
                     purchaseResponse.InventoryChanges,
                     updateCurrency(inventory, offer.RegularPrice, false)
                 );
-                if (purchaseRequest.PurchaseParams.ExpectedPrice) {
-                    throw new Error(`vendor purchase should not have an expected price`);
-                }
 
                 const invItem: IMiscItem = {
                     ItemType: "/Lotus/Types/Items/MiscItems/PrimeBucks",
@@ -223,10 +208,10 @@ export const handlePurchase = async (
                                 purchaseResponse.Standing = [
                                     {
                                         Tag: syndicateTag,
-                                        Standing: favour.standingCost * purchaseRequest.PurchaseParams.Quantity
+                                        Standing: favour.standingCost
                                     }
                                 ];
-                                affiliation.Standing -= favour.standingCost * purchaseRequest.PurchaseParams.Quantity;
+                                affiliation.Standing -= favour.standingCost;
                             }
                         }
                     }
@@ -238,18 +223,12 @@ export const handlePurchase = async (
                 const vendor = ExportVendors[purchaseRequest.PurchaseParams.SourceId!];
                 const offer = vendor.items.find(x => x.storeItem == purchaseRequest.PurchaseParams.StoreItem);
                 if (offer) {
-                    if (typeof offer.credits == "number") {
+                    if (offer.credits) {
                         combineInventoryChanges(
                             purchaseResponse.InventoryChanges,
                             updateCurrency(inventory, offer.credits, false)
                         );
                     }
-                    if (typeof offer.platinum == "number") {
-                        combineInventoryChanges(
-                            purchaseResponse.InventoryChanges,
-                            updateCurrency(inventory, offer.platinum, true)
-                        );
-                    }
                     if (offer.itemPrices) {
                         handleItemPrices(
                             inventory,
@@ -260,9 +239,6 @@ export const handlePurchase = async (
                     }
                 }
             }
-            if (purchaseRequest.PurchaseParams.ExpectedPrice) {
-                throw new Error(`vendor purchase should not have an expected price`);
-            }
             break;
         case 18: {
             if (purchaseRequest.PurchaseParams.SourceId! != worldState.PrimeVaultTraders[0]._id.$oid) {

src/services/rngService.ts

@@ -6,7 +6,7 @@ export interface IRngResult {
     probability: number;
 }
 
-export const getRandomElement = <T>(arr: readonly T[]): T | undefined => {
+export const getRandomElement = <T>(arr: T[]): T => {
     return arr[Math.floor(Math.random() * arr.length)];
 };
 
@@ -18,10 +18,7 @@ export const getRandomInt = (min: number, max: number): number => {
     return Math.floor(Math.random() * (max - min + 1)) + min;
 };
 
-export const getRewardAtPercentage = <T extends { probability: number }>(
-    pool: T[],
-    percentage: number
-): T | undefined => {
+const getRewardAtPercentage = <T extends { probability: number }>(pool: T[], percentage: number): T | undefined => {
     if (pool.length == 0) return;
 
     const totalChance = pool.reduce((accum, item) => accum + item.probability, 0);
@@ -100,20 +97,12 @@ export class CRng {
     }
 
     randomInt(min: number, max: number): number {
-        const diff = max - min;
-        if (diff != 0) {
-            if (diff < 0) {
-                throw new Error(`max must be greater than min`);
-            }
-            if (diff > 0x3fffffff) {
-                throw new Error(`insufficient entropy`);
-            }
-            min += Math.floor(this.random() * (diff + 1));
-        }
-        return min;
+        min = Math.ceil(min);
+        max = Math.floor(max);
+        return Math.floor(this.random() * (max - min + 1)) + min;
     }
 
-    randomElement<T>(arr: readonly T[]): T | undefined {
+    randomElement<T>(arr: T[]): T {
         return arr[Math.floor(this.random() * arr.length)];
     }
 
@@ -145,7 +134,7 @@ export class SRng {
         return min;
     }
 
-    randomElement<T>(arr: readonly T[]): T | undefined {
+    randomElement<T>(arr: T[]): T {
         return arr[this.randomInt(0, arr.length - 1)];
     }
 

src/services/saveLoadoutService.ts

@@ -161,11 +161,6 @@ export const handleInventoryItemConfigChange = async (
                 }
                 break;
             }
-            case "LotusCustomization": {
-                logger.debug(`saved LotusCustomization`, equipmentChanges.LotusCustomization);
-                inventory.LotusCustomization = equipmentChanges.LotusCustomization;
-                break;
-            }
             default: {
                 if (equipmentKeys.includes(equipmentName as TEquipmentKey) && equipmentName != "ValidNewLoadoutId") {
                     logger.debug(`general Item config saved of type ${equipmentName}`, {

src/services/serversideVendorsService.ts

@@ -1,12 +1,17 @@
 import { unixTimesInMs } from "@/src/constants/timeConstants";
-import { catBreadHash } from "@/src/helpers/stringHelpers";
 import { CRng, mixSeeds } from "@/src/services/rngService";
 import { IMongoDate } from "@/src/types/commonTypes";
-import { IItemManifest, IVendorInfo, IVendorManifest } from "@/src/types/vendorTypes";
-import { ExportVendors, IRange } from "warframe-public-export-plus";
+import {
+    IItemManifestPreprocessed,
+    IRawVendorManifest,
+    IVendorInfo,
+    IVendorManifestPreprocessed
+} from "@/src/types/vendorTypes";
+import { ExportVendors } from "warframe-public-export-plus";
 
 import ArchimedeanVendorManifest from "@/static/fixed_responses/getVendorInfo/ArchimedeanVendorManifest.json";
 import DeimosEntratiFragmentVendorProductsManifest from "@/static/fixed_responses/getVendorInfo/DeimosEntratiFragmentVendorProductsManifest.json";
+import DeimosFishmongerVendorManifest from "@/static/fixed_responses/getVendorInfo/DeimosFishmongerVendorManifest.json";
 import DeimosHivemindCommisionsManifestFishmonger from "@/static/fixed_responses/getVendorInfo/DeimosHivemindCommisionsManifestFishmonger.json";
 import DeimosHivemindCommisionsManifestPetVendor from "@/static/fixed_responses/getVendorInfo/DeimosHivemindCommisionsManifestPetVendor.json";
 import DeimosHivemindCommisionsManifestProspector from "@/static/fixed_responses/getVendorInfo/DeimosHivemindCommisionsManifestProspector.json";
@@ -18,22 +23,26 @@ import DeimosProspectorVendorManifest from "@/static/fixed_responses/getVendorIn
 import DuviriAcrithisVendorManifest from "@/static/fixed_responses/getVendorInfo/DuviriAcrithisVendorManifest.json";
 import EntratiLabsEntratiLabsCommisionsManifest from "@/static/fixed_responses/getVendorInfo/EntratiLabsEntratiLabsCommisionsManifest.json";
 import EntratiLabsEntratiLabVendorManifest from "@/static/fixed_responses/getVendorInfo/EntratiLabsEntratiLabVendorManifest.json";
+import GuildAdvertisementVendorManifest from "@/static/fixed_responses/getVendorInfo/GuildAdvertisementVendorManifest.json";
 import HubsIronwakeDondaVendorManifest from "@/static/fixed_responses/getVendorInfo/HubsIronwakeDondaVendorManifest.json";
 import HubsRailjackCrewMemberVendorManifest from "@/static/fixed_responses/getVendorInfo/HubsRailjackCrewMemberVendorManifest.json";
 import MaskSalesmanManifest from "@/static/fixed_responses/getVendorInfo/MaskSalesmanManifest.json";
 import Nova1999ConquestShopManifest from "@/static/fixed_responses/getVendorInfo/Nova1999ConquestShopManifest.json";
+import OstronFishmongerVendorManifest from "@/static/fixed_responses/getVendorInfo/OstronFishmongerVendorManifest.json";
 import OstronPetVendorManifest from "@/static/fixed_responses/getVendorInfo/OstronPetVendorManifest.json";
 import OstronProspectorVendorManifest from "@/static/fixed_responses/getVendorInfo/OstronProspectorVendorManifest.json";
 import RadioLegionIntermission12VendorManifest from "@/static/fixed_responses/getVendorInfo/RadioLegionIntermission12VendorManifest.json";
+import SolarisDebtTokenVendorManifest from "@/static/fixed_responses/getVendorInfo/SolarisDebtTokenVendorManifest.json";
 import SolarisDebtTokenVendorRepossessionsManifest from "@/static/fixed_responses/getVendorInfo/SolarisDebtTokenVendorRepossessionsManifest.json";
+import SolarisFishmongerVendorManifest from "@/static/fixed_responses/getVendorInfo/SolarisFishmongerVendorManifest.json";
 import SolarisProspectorVendorManifest from "@/static/fixed_responses/getVendorInfo/SolarisProspectorVendorManifest.json";
-import Temple1999VendorManifest from "@/static/fixed_responses/getVendorInfo/Temple1999VendorManifest.json";
 import TeshinHardModeVendorManifest from "@/static/fixed_responses/getVendorInfo/TeshinHardModeVendorManifest.json";
 import ZarimanCommisionsManifestArchimedean from "@/static/fixed_responses/getVendorInfo/ZarimanCommisionsManifestArchimedean.json";
 
-const rawVendorManifests: IVendorManifest[] = [
+const rawVendorManifests: IRawVendorManifest[] = [
     ArchimedeanVendorManifest,
     DeimosEntratiFragmentVendorProductsManifest,
+    DeimosFishmongerVendorManifest,
     DeimosHivemindCommisionsManifestFishmonger,
     DeimosHivemindCommisionsManifestPetVendor,
     DeimosHivemindCommisionsManifestProspector,
@@ -45,22 +54,25 @@ const rawVendorManifests: IVendorManifest[] = [
     DuviriAcrithisVendorManifest,
     EntratiLabsEntratiLabsCommisionsManifest,
     EntratiLabsEntratiLabVendorManifest,
+    GuildAdvertisementVendorManifest, // uses preprocessing
     HubsIronwakeDondaVendorManifest, // uses preprocessing
     HubsRailjackCrewMemberVendorManifest,
     MaskSalesmanManifest,
     Nova1999ConquestShopManifest,
+    OstronFishmongerVendorManifest,
     OstronPetVendorManifest,
     OstronProspectorVendorManifest,
     RadioLegionIntermission12VendorManifest,
+    SolarisDebtTokenVendorManifest,
     SolarisDebtTokenVendorRepossessionsManifest,
+    SolarisFishmongerVendorManifest,
     SolarisProspectorVendorManifest,
-    Temple1999VendorManifest,
     TeshinHardModeVendorManifest, // uses preprocessing
     ZarimanCommisionsManifestArchimedean
 ];
 
 interface IGeneratableVendorInfo extends Omit<IVendorInfo, "ItemManifest" | "Expiry"> {
-    cycleOffset?: number;
+    cycleStart: number;
     cycleDuration: number;
 }
 
@@ -68,37 +80,30 @@ const generatableVendors: IGeneratableVendorInfo[] = [
     {
         _id: { $oid: "67dadc30e4b6e0e5979c8d84" },
         TypeName: "/Lotus/Types/Game/VendorManifests/TheHex/InfestedLichWeaponVendorManifest",
+        PropertyTextHash: "77093DD05A8561A022DEC9A4B9BB4A56",
         RandomSeedType: "VRST_WEAPON",
         RequiredGoalTag: "",
         WeaponUpgradeValueAttenuationExponent: 2.25,
-        cycleOffset: 1740960000_000,
+        cycleStart: 1740960000_000,
         cycleDuration: 4 * unixTimesInMs.day
     },
     {
         _id: { $oid: "60ad3b6ec96976e97d227e19" },
         TypeName: "/Lotus/Types/Game/VendorManifests/Hubs/PerrinSequenceWeaponVendorManifest",
+        PropertyTextHash: "34F8CF1DFF745F0D67433A5EF0A03E70",
         RandomSeedType: "VRST_WEAPON",
         WeaponUpgradeValueAttenuationExponent: 2.25,
-        cycleOffset: 1744934400_000,
+        cycleStart: 1744934400_000,
         cycleDuration: 4 * unixTimesInMs.day
-    },
-    {
-        _id: { $oid: "61ba123467e5d37975aeeb03" },
-        TypeName: "/Lotus/Types/Game/VendorManifests/Hubs/GuildAdvertisementVendorManifest",
-        RandomSeedType: "VRST_FLAVOUR_TEXT",
-        cycleDuration: unixTimesInMs.week // TODO: Auto-detect this based on the items, so we don't need to specify it explicitly.
     }
     // {
     //     _id: { $oid: "5dbb4c41e966f7886c3ce939" },
-    //     TypeName: "/Lotus/Types/Game/VendorManifests/Hubs/IronwakeDondaVendorManifest"
+    //     TypeName: "/Lotus/Types/Game/VendorManifests/Hubs/IronwakeDondaVendorManifest",
+    //     PropertyTextHash: "62B64A8065B7C0FA345895D4BC234621"
     // }
 ];
 
-const getVendorOid = (typeName: string): string => {
-    return "5be4a159b144f3cd" + catBreadHash(typeName).toString(16).padStart(8, "0");
-};
-
-export const getVendorManifestByTypeName = (typeName: string): IVendorManifest | undefined => {
+export const getVendorManifestByTypeName = (typeName: string): IVendorManifestPreprocessed | undefined => {
     for (const vendorManifest of rawVendorManifests) {
         if (vendorManifest.VendorInfo.TypeName == typeName) {
             return preprocessVendorManifest(vendorManifest);
@@ -109,18 +114,10 @@ export const getVendorManifestByTypeName = (typeName: string): IVendorManifest |
             return generateVendorManifest(vendorInfo);
         }
     }
-    if (typeName in ExportVendors) {
-        return generateVendorManifest({
-            _id: { $oid: getVendorOid(typeName) },
-            TypeName: typeName,
-            RandomSeedType: ExportVendors[typeName].randomSeedType,
-            cycleDuration: unixTimesInMs.hour
-        });
-    }
     return undefined;
 };
 
-export const getVendorManifestByOid = (oid: string): IVendorManifest | undefined => {
+export const getVendorManifestByOid = (oid: string): IVendorManifestPreprocessed | undefined => {
     for (const vendorManifest of rawVendorManifests) {
         if (vendorManifest.VendorInfo._id.$oid == oid) {
             return preprocessVendorManifest(vendorManifest);
@@ -131,34 +128,32 @@ export const getVendorManifestByOid = (oid: string): IVendorManifest | undefined
             return generateVendorManifest(vendorInfo);
         }
     }
-    for (const [typeName, manifest] of Object.entries(ExportVendors)) {
-        const typeNameOid = getVendorOid(typeName);
-        if (typeNameOid == oid) {
-            return generateVendorManifest({
-                _id: { $oid: typeNameOid },
-                TypeName: typeName,
-                RandomSeedType: manifest.randomSeedType,
-                cycleDuration: unixTimesInMs.hour
-            });
-        }
-    }
     return undefined;
 };
 
-const preprocessVendorManifest = (originalManifest: IVendorManifest): IVendorManifest => {
+const preprocessVendorManifest = (originalManifest: IRawVendorManifest): IVendorManifestPreprocessed => {
     if (Date.now() >= parseInt(originalManifest.VendorInfo.Expiry.$date.$numberLong)) {
         const manifest = structuredClone(originalManifest);
         const info = manifest.VendorInfo;
         refreshExpiry(info.Expiry);
         for (const offer of info.ItemManifest) {
-            refreshExpiry(offer.Expiry);
+            const iteration = refreshExpiry(offer.Expiry);
+            if (offer.ItemPrices) {
+                for (const price of offer.ItemPrices) {
+                    if (typeof price.ItemType != "string") {
+                        const itemSeed = parseInt(offer.Id.$oid.substring(16), 16);
+                        const rng = new CRng(mixSeeds(itemSeed, iteration));
+                        price.ItemType = rng.randomElement(price.ItemType);
+                    }
+                }
+            }
         }
-        return manifest;
+        return manifest as IVendorManifestPreprocessed;
     }
-    return originalManifest;
+    return originalManifest as IVendorManifestPreprocessed;
 };
 
-const refreshExpiry = (expiry: IMongoDate): void => {
+const refreshExpiry = (expiry: IMongoDate): number => {
     const period = parseInt(expiry.$date.$numberLong);
     if (Date.now() >= period) {
         const epoch = 1734307200_000; // Monday (for weekly schedules)
@@ -166,143 +161,65 @@ const refreshExpiry = (expiry: IMongoDate): void => {
         const start = epoch + iteration * period;
         const end = start + period;
         expiry.$date.$numberLong = end.toString();
+        return iteration;
     }
+    return 0;
 };
 
-const toRange = (value: IRange | number): IRange => {
-    if (typeof value == "number") {
-        return { minValue: value, maxValue: value };
+const generateVendorManifest = (vendorInfo: IGeneratableVendorInfo): IVendorManifestPreprocessed => {
+    const EPOCH = vendorInfo.cycleStart;
+    const manifest = ExportVendors[vendorInfo.TypeName];
+    let binThisCycle;
+    if (manifest.isOneBinPerCycle) {
+        const cycleDuration = vendorInfo.cycleDuration; // manifest.items[0].durationHours! * 3600_000;
+        const cycleIndex = Math.trunc((Date.now() - EPOCH) / cycleDuration);
+        binThisCycle = cycleIndex % 2; // Note: May want to auto-compute the bin size, but this is only used for coda weapons right now.
     }
-    return value;
-};
-
-const vendorInfoCache: Record<string, IVendorInfo> = {};
-
-const generateVendorManifest = (vendorInfo: IGeneratableVendorInfo): IVendorManifest => {
-    if (!(vendorInfo.TypeName in vendorInfoCache)) {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { cycleOffset, cycleDuration, ...clientVendorInfo } = vendorInfo;
-        vendorInfoCache[vendorInfo.TypeName] = {
-            ...clientVendorInfo,
-            ItemManifest: [],
-            Expiry: { $date: { $numberLong: "0" } }
-        };
-    }
-    const processed = vendorInfoCache[vendorInfo.TypeName];
-    if (Date.now() >= parseInt(processed.Expiry.$date.$numberLong)) {
-        // Remove expired offers
-        for (let i = 0; i != processed.ItemManifest.length; ) {
-            if (Date.now() >= parseInt(processed.ItemManifest[i].Expiry.$date.$numberLong)) {
-                processed.ItemManifest.splice(i, 1);
-            } else {
-                ++i;
-            }
+    const items: IItemManifestPreprocessed[] = [];
+    let soonestOfferExpiry: number = Number.MAX_SAFE_INTEGER;
+    for (let i = 0; i != manifest.items.length; ++i) {
+        const rawItem = manifest.items[i];
+        if (manifest.isOneBinPerCycle && rawItem.bin != binThisCycle) {
+            continue;
         }
-
-        // Add new offers
-        const vendorSeed = parseInt(vendorInfo._id.$oid.substring(16), 16);
-        const cycleOffset = vendorInfo.cycleOffset ?? 1734307200_000;
-        const cycleDuration = vendorInfo.cycleDuration;
-        const cycleIndex = Math.trunc((Date.now() - cycleOffset) / cycleDuration);
-        const rng = new CRng(mixSeeds(vendorSeed, cycleIndex));
-        const manifest = ExportVendors[vendorInfo.TypeName];
-        const offersToAdd = [];
-        if (manifest.numItems && !manifest.isOneBinPerCycle) {
-            const numItemsTarget = rng.randomInt(manifest.numItems.minValue, manifest.numItems.maxValue);
-            while (processed.ItemManifest.length + offersToAdd.length < numItemsTarget) {
-                // TODO: Consider per-bin item limits
-                // TODO: Consider item probability weightings
-                offersToAdd.push(rng.randomElement(manifest.items)!);
-            }
-        } else {
-            let binThisCycle;
-            if (manifest.isOneBinPerCycle) {
-                binThisCycle = cycleIndex % 2; // Note: May want to auto-compute the bin size, but this is only used for coda weapons right now.
-            }
-            for (const rawItem of manifest.items) {
-                if (!manifest.isOneBinPerCycle || rawItem.bin == binThisCycle) {
-                    offersToAdd.push(rawItem);
-                }
-            }
-
-            // For most vendors, the offers seem to roughly be in reverse order from the manifest. Coda weapons are an odd exception.
-            if (!manifest.isOneBinPerCycle) {
-                offersToAdd.reverse();
-            }
+        const cycleDuration = vendorInfo.cycleDuration; // rawItem.durationHours! * 3600_000;
+        const cycleIndex = Math.trunc((Date.now() - EPOCH) / cycleDuration);
+        const cycleStart = EPOCH + cycleIndex * cycleDuration;
+        const cycleEnd = cycleStart + cycleDuration;
+        if (soonestOfferExpiry > cycleEnd) {
+            soonestOfferExpiry = cycleEnd;
         }
-        const cycleStart = cycleOffset + cycleIndex * cycleDuration;
-        for (const rawItem of offersToAdd) {
-            const durationHoursRange = toRange(rawItem.durationHours);
-            const expiry =
-                cycleStart +
-                rng.randomInt(durationHoursRange.minValue, durationHoursRange.maxValue) * unixTimesInMs.hour;
-            const item: IItemManifest = {
+        const rng = new CRng(cycleIndex);
+        rng.churnSeed(i);
+        /*for (let j = -1; j != rawItem.duplicates; ++j)*/ {
+            const item: IItemManifestPreprocessed = {
                 StoreItem: rawItem.storeItem,
-                ItemPrices: rawItem.itemPrices?.map(itemPrice => ({ ...itemPrice, ProductCategory: "MiscItems" })),
+                ItemPrices: rawItem.itemPrices!.map(itemPrice => ({ ...itemPrice, ProductCategory: "MiscItems" })),
                 Bin: "BIN_" + rawItem.bin,
                 QuantityMultiplier: 1,
-                Expiry: { $date: { $numberLong: expiry.toString() } },
+                Expiry: { $date: { $numberLong: cycleEnd.toString() } },
                 AllowMultipurchase: false,
                 Id: {
                     $oid:
-                        ((cycleStart / 1000) & 0xffffffff).toString(16).padStart(8, "0") +
+                        i.toString(16).padStart(8, "0") +
                         vendorInfo._id.$oid.substring(8, 16) +
-                        rng.randomInt(0, 0xffff).toString(16).padStart(4, "0") +
-                        rng.randomInt(0, 0xffff).toString(16).padStart(4, "0")
+                        rng.randomInt(0, 0xffffffff).toString(16).padStart(8, "0")
                 }
             };
-            if (rawItem.numRandomItemPrices) {
-                item.ItemPrices = [];
-                for (let i = 0; i != rawItem.numRandomItemPrices; ++i) {
-                    let itemPrice: { type: string; count: IRange };
-                    do {
-                        itemPrice = rng.randomElement(manifest.randomItemPricesPerBin![rawItem.bin])!;
-                    } while (item.ItemPrices.find(x => x.ItemType == itemPrice.type));
-                    item.ItemPrices.push({
-                        ItemType: itemPrice.type,
-                        ItemCount: rng.randomInt(itemPrice.count.minValue, itemPrice.count.maxValue),
-                        ProductCategory: "MiscItems"
-                    });
-                }
-            }
-            if (rawItem.credits) {
-                const value =
-                    typeof rawItem.credits == "number"
-                        ? rawItem.credits
-                        : rng.randomInt(
-                              rawItem.credits.minValue / rawItem.credits.step,
-                              rawItem.credits.maxValue / rawItem.credits.step
-                          ) * rawItem.credits.step;
-                item.RegularPrice = [value, value];
-            }
-            if (rawItem.platinum) {
-                const value =
-                    typeof rawItem.platinum == "number"
-                        ? rawItem.platinum
-                        : rng.randomInt(rawItem.platinum.minValue, rawItem.platinum.maxValue);
-                item.PremiumPrice = [value, value];
-            }
             if (vendorInfo.RandomSeedType) {
-                item.LocTagRandSeed = (rng.randomInt(0, 0xffff) << 16) | rng.randomInt(0, 0xffff);
-                if (vendorInfo.RandomSeedType == "VRST_WEAPON") {
-                    const highDword = (rng.randomInt(0, 0xffff) << 16) | rng.randomInt(0, 0xffff);
-                    item.LocTagRandSeed = (BigInt(highDword) << 32n) | (BigInt(item.LocTagRandSeed) & 0xffffffffn);
-                }
+                item.LocTagRandSeed =
+                    (BigInt(rng.randomInt(0, 0xffffffff)) << 32n) | BigInt(rng.randomInt(0, 0xffffffff));
             }
-            processed.ItemManifest.push(item);
+            items.push(item);
         }
-
-        // Update vendor expiry
-        let soonestOfferExpiry: number = Number.MAX_SAFE_INTEGER;
-        for (const offer of processed.ItemManifest) {
-            const offerExpiry = parseInt(offer.Expiry.$date.$numberLong);
-            if (soonestOfferExpiry > offerExpiry) {
-                soonestOfferExpiry = offerExpiry;
-            }
-        }
-        processed.Expiry.$date.$numberLong = soonestOfferExpiry.toString();
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { cycleStart, cycleDuration, ...clientVendorInfo } = vendorInfo;
     return {
-        VendorInfo: processed
+        VendorInfo: {
+            ...clientVendorInfo,
+            ItemManifest: items,
+            Expiry: { $date: { $numberLong: soonestOfferExpiry.toString() } }
+        }
     };
 };

src/types/guildTypes.ts

@@ -11,7 +11,6 @@ export interface IGuildClient {
     Members: IGuildMemberClient[];
     Ranks: IGuildRank[];
     Tier: number;
-    Emblem?: boolean;
     Vault: IGuildVault;
     ActiveDojoColorResearch: string;
     Class: number;
@@ -173,11 +172,9 @@ export interface IDojoComponentClient {
     Message?: string;
     RegularCredits?: number; // "Collecting Materials" state: Number of credits that were donated.
     MiscItems?: IMiscItem[]; // "Collecting Materials" state: Resources that were donated.
-    CompletionTime?: IMongoDate; // new versions
-    TimeRemaining?: number; // old versions
+    CompletionTime?: IMongoDate;
     RushPlatinum?: number;
-    DestructionTime?: IMongoDate; // new versions
-    DestructionTimeRemaining?: number; // old versions
+    DestructionTime?: IMongoDate;
     Decos?: IDojoDecoClient[];
     DecoCapacity?: number;
     PaintBot?: IOid;
@@ -209,13 +206,11 @@ export interface IDojoDecoClient {
     Type: string;
     Pos: number[];
     Rot: number[];
-    Scale?: number;
     Name?: string; // for teleporters
     Sockets?: number;
     RegularCredits?: number;
     MiscItems?: IMiscItem[];
-    CompletionTime?: IMongoDate; // new versions
-    TimeRemaining?: number; // old versions
+    CompletionTime?: IMongoDate;
     RushPlatinum?: number;
     PictureFrameInfo?: IPictureFrameInfo;
     Pending?: boolean;

src/types/inventoryTypes/inventoryTypes.ts

@@ -11,7 +11,6 @@ import {
     IOperatorConfigDatabase
 } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { IFingerprintStat, RivenFingerprint } from "@/src/helpers/rivenHelper";
-import { IOrbiter } from "../personalRoomsTypes";
 
 export type InventoryDatabaseEquipment = {
     [_ in TEquipmentKey]: IEquipmentDatabase[];
@@ -44,7 +43,6 @@ export interface IInventoryDatabase
             | "RecentVendorPurchases"
             | "NextRefill"
             | "Nemesis"
-            | "NemesisHistory"
             | "EntratiVaultCountResetDate"
             | "BrandedSuits"
             | "LockedWeaponGroup"
@@ -53,7 +51,6 @@ export interface IInventoryDatabase
             | "LastLiteSortieReward"
             | "CrewMembers"
             | "QualifyingInvasions"
-            | "LastInventorySync"
             | TEquipmentKey
         >,
         InventoryDatabaseEquipment {
@@ -82,7 +79,6 @@ export interface IInventoryDatabase
     RecentVendorPurchases?: IRecentVendorPurchaseDatabase[];
     NextRefill?: Date;
     Nemesis?: INemesisDatabase;
-    NemesisHistory?: INemesisBaseDatabase[];
     EntratiVaultCountResetDate?: Date;
     BrandedSuits?: Types.ObjectId[];
     LockedWeaponGroup?: ILockedWeaponGroupDatabase;
@@ -91,7 +87,6 @@ export interface IInventoryDatabase
     LastLiteSortieReward?: ILastSortieRewardDatabase[];
     CrewMembers: ICrewMemberDatabase[];
     QualifyingInvasions: IInvasionProgressDatabase[];
-    LastInventorySync?: Types.ObjectId;
 }
 
 export interface IQuestKeyDatabase {
@@ -139,7 +134,7 @@ export const equipmentKeys = [
 export type TEquipmentKey = (typeof equipmentKeys)[number];
 
 export interface IDuviriInfo {
-    Seed: bigint;
+    Seed: number;
     NumCompletions: number;
 }
 
@@ -203,11 +198,11 @@ export interface IInventoryClient extends IDailyAffiliations, InventoryClientEqu
     OperatorLoadOuts: IOperatorConfigClient[];
     KahlLoadOuts: IOperatorConfigClient[];
 
-    DuviriInfo?: IDuviriInfo;
+    DuviriInfo: IDuviriInfo;
     Mailbox?: IMailboxClient;
     SubscribedToEmails: number;
     Created: IMongoDate;
-    RewardSeed: bigint;
+    RewardSeed: number | bigint;
     RegularCredits: number;
     PremiumCredits: number;
     PremiumCreditsFree: number;
@@ -261,7 +256,7 @@ export interface IInventoryClient extends IDailyAffiliations, InventoryClientEqu
     EquippedGear: string[];
     DeathMarks: string[];
     FusionTreasures: IFusionTreasure[];
-    //WebFlags: IWebFlags;
+    WebFlags: IWebFlags;
     CompletedAlerts: string[];
     Consumables: ITypeCount[];
     LevelKeys: ITypeCount[];
@@ -271,10 +266,10 @@ export interface IInventoryClient extends IDailyAffiliations, InventoryClientEqu
     KubrowPetEggs?: IKubrowPetEggClient[];
     LoreFragmentScans: ILoreFragmentScan[];
     EquippedEmotes: string[];
-    //PendingTrades: IPendingTrade[];
+    PendingTrades: IPendingTrade[];
     Boosters: IBooster[];
     ActiveDojoColorResearch: string;
-    //SentientSpawnChanceBoosters: ISentientSpawnChanceBoosters;
+    SentientSpawnChanceBoosters: ISentientSpawnChanceBoosters;
     SupportedSyndicate?: string;
     Affiliations: IAffiliation[];
     QualifyingInvasions: IInvasionProgressClient[];
@@ -296,19 +291,19 @@ export interface IInventoryClient extends IDailyAffiliations, InventoryClientEqu
     ActiveAvatarImageType: string;
     ShipDecorations: ITypeCount[];
     DiscoveredMarkers: IDiscoveredMarker[];
-    //CompletedJobs: ICompletedJob[];
+    CompletedJobs: ICompletedJob[];
     FocusAbility?: string;
     FocusUpgrades: IFocusUpgrade[];
     HasContributedToDojo?: boolean;
     HWIDProtectEnabled?: boolean;
-    //KubrowPetPrints: IKubrowPetPrint[];
+    KubrowPetPrints: IKubrowPetPrint[];
     AlignmentReplay?: IAlignment;
-    //PersonalGoalProgress: IPersonalGoalProgress[];
+    PersonalGoalProgress: IPersonalGoalProgress[];
     ThemeStyle: string;
     ThemeBackground: string;
     ThemeSounds: string;
     BountyScore: number;
-    //ChallengeInstanceStates: IChallengeInstanceState[];
+    ChallengeInstanceStates: IChallengeInstanceState[];
     LoginMilestoneRewards: string[];
     RecentVendorPurchases?: IRecentVendorPurchaseClient[];
     NodeIntrosCompleted: string[];
@@ -316,37 +311,37 @@ export interface IInventoryClient extends IDailyAffiliations, InventoryClientEqu
     CompletedJobChains?: ICompletedJobChain[];
     SeasonChallengeHistory: ISeasonChallenge[];
     EquippedInstrument?: string;
-    //InvasionChainProgress: IInvasionChainProgress[];
+    InvasionChainProgress: IInvasionChainProgress[];
     Nemesis?: INemesisClient;
-    NemesisHistory?: INemesisBaseClient[];
-    //LastNemesisAllySpawnTime?: IMongoDate;
+    NemesisHistory: INemesisBaseClient[];
+    LastNemesisAllySpawnTime?: IMongoDate;
     Settings?: ISettings;
     PersonalTechProjects: IPersonalTechProjectClient[];
     PlayerSkills: IPlayerSkills;
     CrewShipAmmo: ITypeCount[];
     CrewShipWeaponSkins: IUpgradeClient[];
     CrewShipSalvagedWeaponSkins: IUpgradeClient[];
-    //TradeBannedUntil?: IMongoDate;
+    TradeBannedUntil?: IMongoDate;
     PlayedParkourTutorial: boolean;
     SubscribedToEmailsPersonalized: number;
     InfestedFoundry?: IInfestedFoundryClient;
     BlessingCooldown?: IMongoDate;
     CrewShipRawSalvage: ITypeCount[];
     CrewMembers: ICrewMemberClient[];
-    LotusCustomization?: ILotusCustomization;
+    LotusCustomization: ILotusCustomization;
     UseAdultOperatorLoadout?: boolean;
     NemesisAbandonedRewards: string[];
-    LastInventorySync?: IOid;
+    LastInventorySync: IOid;
     NextRefill?: IMongoDate;
     FoundToday?: IMiscItem[]; // for Argon Crystals
     CustomMarkers?: ICustomMarkers[];
-    //ActiveLandscapeTraps: any[];
+    ActiveLandscapeTraps: any[];
     EvolutionProgress?: IEvolutionProgress[];
-    //RepVotes: any[];
-    //LeagueTickets: any[];
-    //Quests: any[];
-    //Robotics: any[];
-    //UsedDailyDeals: any[];
+    RepVotes: any[];
+    LeagueTickets: any[];
+    Quests: any[];
+    Robotics: any[];
+    UsedDailyDeals: any[];
     LibraryPersonalTarget?: string;
     LibraryPersonalProgress: ILibraryPersonalProgress[];
     CollectibleSeries?: ICollectibleEntry[];
@@ -358,7 +353,7 @@ export interface IInventoryClient extends IDailyAffiliations, InventoryClientEqu
     DeathSquadable: boolean;
     EndlessXP?: IEndlessXpProgress[];
     DialogueHistory?: IDialogueHistoryClient;
-    CalendarProgress?: ICalendarProgress;
+    CalendarProgress: ICalendarProgress;
     SongChallenges?: ISongChallenge[];
     EntratiVaultCountLastPeriod?: number;
     EntratiVaultCountResetDate?: IMongoDate;
@@ -374,7 +369,6 @@ export interface IInventoryClient extends IDailyAffiliations, InventoryClientEqu
     BrandedSuits?: IOid[];
     LockedWeaponGroup?: ILockedWeaponGroupClient;
     HubNpcCustomizations?: IHubNpcCustomization[];
-    Ship?: IOrbiter; // U22 and below, response only
 }
 
 export interface IAffiliation {
@@ -851,7 +845,7 @@ export interface IMission extends IMissionDatabase {
 }
 
 export interface INemesisBaseClient {
-    fp: bigint | number;
+    fp: bigint;
     manifest: string;
     KillingSuit: string;
     killingDamageType: number;
@@ -869,8 +863,7 @@ export interface INemesisBaseClient {
     Weakened: boolean;
 }
 
-export interface INemesisBaseDatabase extends Omit<INemesisBaseClient, "fp" | "d"> {
-    fp: bigint;
+export interface INemesisBaseDatabase extends Omit<INemesisBaseClient, "d"> {
     d: Date;
 }
 
@@ -884,8 +877,7 @@ export interface INemesisClient extends INemesisBaseClient {
     LastEnc: number;
 }
 
-export interface INemesisDatabase extends Omit<INemesisClient, "fp" | "d"> {
-    fp: bigint;
+export interface INemesisDatabase extends Omit<INemesisClient, "d"> {
     d: Date;
 }
 
@@ -908,8 +900,8 @@ export interface IPendingRecipeDatabase {
     ItemType: string;
     CompletionDate: Date;
     ItemId: IOid;
-    TargetItemId?: string; // unsure what this is for
-    TargetFingerprint?: string;
+    TargetItemId?: string; // likely related to liches
+    TargetFingerprint?: string; // likely related to liches
     LongGuns?: IEquipmentDatabase[];
     Pistols?: IEquipmentDatabase[];
     Melee?: IEquipmentDatabase[];
@@ -957,17 +949,6 @@ export interface ICrewShipComponentFingerprint extends IInnateDamageFingerprint
     SubroutineIndex?: number;
 }
 
-export interface INemesisWeaponTargetFingerprint {
-    ItemType: string;
-    UpgradeFingerprint: IInnateDamageFingerprint;
-    Name: string;
-}
-
-export interface INemesisPetTargetFingerprint {
-    Parts: string[];
-    Name: string;
-}
-
 export enum GettingSlotOrderInfo {
     Empty = "",
     LotusUpgradesModsRandomizedPlayerMeleeWeaponRandomModRare0 = "/Lotus/Upgrades/Mods/Randomized/PlayerMeleeWeaponRandomModRare:0",
@@ -1212,18 +1193,17 @@ export interface IMarker {
     z: number;
     showInHud: boolean;
 }
-
 export interface ISeasonProgress {
-    SeasonType: "CST_WINTER" | "CST_SPRING" | "CST_SUMMER" | "CST_FALL";
+    SeasonType: "CST_UNDEFINED" | "CST_WINTER" | "CST_SPRING" | "CST_SUMMER" | "CST_FALL";
     LastCompletedDayIdx: number;
     LastCompletedChallengeDayIdx: number;
-    ActivatedChallenges: string[];
+    ActivatedChallenges: unknown[];
 }
 
 export interface ICalendarProgress {
     Version: number;
     Iteration: number;
-    YearProgress: { Upgrades: string[] };
+    YearProgress: { Upgrades: unknown[] };
     SeasonProgress: ISeasonProgress;
 }
 

src/types/loginTypes.ts

@@ -3,20 +3,19 @@ import { Types } from "mongoose";
 export interface IAccountAndLoginResponseCommons {
     DisplayName: string;
     CountryCode: string;
-    ClientType?: string;
-    CrossPlatformAllowed?: boolean;
-    ForceLogoutVersion?: number;
+    ClientType: string;
+    CrossPlatformAllowed: boolean;
+    ForceLogoutVersion: number;
     AmazonAuthToken?: string;
     AmazonRefreshToken?: string;
-    ConsentNeeded?: boolean;
-    TrackedSettings?: string[];
+    ConsentNeeded: boolean;
+    TrackedSettings: string[];
     Nonce: number;
 }
 
 export interface IDatabaseAccountRequiredFields extends IAccountAndLoginResponseCommons {
     email: string;
     password: string;
-    BuildLabel?: string;
 }
 
 export interface IDatabaseAccount extends IDatabaseAccountRequiredFields {
@@ -35,23 +34,23 @@ export interface ILoginRequest {
     email: string;
     password: string;
     time: number;
-    s?: string;
-    lang?: string;
+    s: string;
+    lang: string;
     date: number;
-    ClientType?: string;
-    PS?: string;
+    ClientType: string;
+    PS: string;
     kick?: boolean;
 }
 
 export interface ILoginResponse extends IAccountAndLoginResponseCommons {
     id: string;
-    Groups?: IGroup[];
+    Groups: IGroup[];
     BuildLabel: string;
-    MatchmakingBuildId?: string;
+    MatchmakingBuildId: string;
     platformCDNs?: string[];
     NRS?: string[];
-    DTLS?: number;
-    IRC?: string[];
+    DTLS: number;
+    IRC: string[];
     HUB?: string;
 }
 

src/types/missionTypes.ts

@@ -1,5 +1,3 @@
-import { IAffiliationMods, IInventoryChanges } from "./purchaseTypes";
-
 export const inventoryFields = ["RawUpgrades", "MiscItems", "Consumables", "Recipes"] as const;
 export type IInventoryFieldType = (typeof inventoryFields)[number];
 
@@ -8,27 +6,8 @@ export interface IMissionReward {
     TypeName?: string;
     UpgradeLevel?: number;
     ItemCount: number;
-    DailyCooldown?: boolean;
-    Rarity?: number;
     TweetText?: string;
     ProductCategory?: string;
     FromEnemyCache?: boolean;
     IsStrippedItem?: boolean;
 }
-
-export interface IMissionCredits {
-    MissionCredits: number[];
-    CreditBonus: number[];
-    TotalCredits: number[];
-    DailyMissionBonus?: boolean;
-}
-
-export interface IMissionInventoryUpdateResponse extends Partial<IMissionCredits> {
-    ConquestCompletedMissionsCount?: number;
-    InventoryJson?: string;
-    MissionRewards?: IMissionReward[];
-    InventoryChanges?: IInventoryChanges;
-    FusionPoints?: number;
-    SyndicateXPItemReward?: number;
-    AffiliationMods?: IAffiliationMods[];
-}

src/types/personalRoomsTypes.ts

@@ -1,12 +1,12 @@
 import { IColor } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import {
+    IApartment,
     IRoom,
     IPlacedDecosDatabase,
     ITailorShop,
     ITailorShopDatabase,
     TBootLocation,
-    IApartmentDatabase,
-    IApartmentClient
+    IApartmentDatabase
 } from "@/src/types/shipTypes";
 import { Document, Model, Types } from "mongoose";
 
@@ -21,10 +21,10 @@ export interface IOrbiter {
     BootLocation?: TBootLocation;
 }
 
-export interface IPersonalRoomsClient {
+export interface IPersonalRooms {
     ShipInteriorColors: IColor;
     Ship: IOrbiter;
-    Apartment: IApartmentClient;
+    Apartment: IApartment;
     TailorShop: ITailorShop;
 }
 

src/types/purchaseTypes.ts

@@ -103,7 +103,6 @@ export const slotNames = [
     "WeaponBin",
     "MechBin",
     "PveBonusLoadoutBin",
-    "PvpBonusLoadoutBin",
     "SentinelBin",
     "SpaceSuitBin",
     "SpaceWeaponBin",

src/types/requestTypes.ts

@@ -20,10 +20,7 @@ import {
     IDiscoveredMarker,
     ILockedWeaponGroupClient,
     ILoadOutPresets,
-    IInvasionProgressClient,
-    IWeaponSkinClient,
-    IKubrowPetEggClient,
-    INemesisClient
+    IInvasionProgressClient
 } from "./inventoryTypes/inventoryTypes";
 import { IGroup } from "./loginTypes";
 
@@ -47,7 +44,6 @@ export type IMissionInventoryUpdateRequest = {
 
     SyndicateId?: string;
     SortieId?: string;
-    CalendarProgress?: { challenge: string }[];
     SeasonChallengeCompletions?: ISeasonChallenge[];
     AffiliationChanges?: IAffiliationChange[];
     crossPlaySetting?: string;
@@ -75,14 +71,6 @@ export type IMissionInventoryUpdateRequest = {
     PS: string;
     ActiveDojoColorResearch: string;
     RewardInfo?: IRewardInfo;
-    NemesisKillConvert?: {
-        nemesisName: string;
-        weaponLoc: string;
-        petLoc: "" | "/Lotus/Language/Pets/ZanukaPetName";
-        fingerprint: bigint | number;
-        killed: boolean;
-    };
-    target?: INemesisClient;
     ReceivedCeremonyMsg: boolean;
     LastCeremonyResetDate: number;
     MissionPTS: number;
@@ -112,7 +100,6 @@ export type IMissionInventoryUpdateRequest = {
     }[];
     CollectibleScans?: ICollectibleEntry[];
     Upgrades?: IUpgradeClient[]; // riven challenge progress
-    WeaponSkins?: IWeaponSkinClient[];
     StrippedItems?: {
         DropTable: string;
         DROP_MOD?: number[];
@@ -128,9 +115,7 @@ export type IMissionInventoryUpdateRequest = {
         NumExtraRewards: number;
         Count: number;
     }[];
-    KubrowPetEggs?: IKubrowPetEggClient[];
     DiscoveredMarkers?: IDiscoveredMarker[];
-    BrandedSuits?: IOid; // sent when captured by g3
     LockedWeaponGroup?: ILockedWeaponGroupClient; // sent when captured by zanuka
     UnlockWeapons?: boolean; // sent when recovered weapons from zanuka capture
     IncHarvester?: boolean; // sent when recovered weapons from zanuka capture
@@ -140,16 +125,6 @@ export type IMissionInventoryUpdateRequest = {
     wagerTier?: number; // the index
     creditsFee?: number; // the index
     InvasionProgress?: IInvasionProgressClient[];
-    ConquestMissionsCompleted?: number;
-    duviriSuitSelection?: string;
-    duviriPistolSelection?: string;
-    duviriLongGunSelection?: string;
-    duviriMeleeSelection?: string;
-    duviriCaveOffers?: {
-        Seed: number | bigint;
-        Warframes: string[];
-        Weapons: string[];
-    };
 } & {
     [K in TEquipmentKey]?: IEquipmentClient[];
 };
@@ -159,7 +134,7 @@ export interface IRewardInfo {
     invasionId?: string;
     invasionAllyFaction?: "FC_GRINEER" | "FC_CORPUS";
     sortieId?: string;
-    sortieTag?: "Mission1" | "Mission2" | "Final";
+    sortieTag?: string;
     sortiePrereqs?: string[];
     VaultsCracked?: number; // for Spy missions
     rewardTier?: number;
@@ -170,19 +145,12 @@ export interface IRewardInfo {
     lostTargetWave?: number;
     defenseTargetCount?: number;
     NemesisAbandonedRewards?: string[];
-    NemesisHenchmenKills?: number;
-    NemesisHintProgress?: number;
     EOM_AFK?: number;
     rewardQualifications?: string; // did a Survival for 5 minutes and this was "1"
     PurgatoryRewardQualifications?: string;
     rewardSeed?: number | bigint;
     periodicMissionTag?: string;
-    ConquestType?: string;
-    ConquestCompleted?: number;
-    ConquestEquipmentSuggestionsFulfilled?: number;
-    ConquestPersonalModifiersActive?: number;
-    ConquestStickersActive?: number;
-    ConquestHardModeActive?: number;
+
     // for bounties, only EOM_AFK and node are given from above, plus:
     JobTier?: number;
     jobId?: string;

src/types/saveLoadoutTypes.ts

@@ -6,8 +6,7 @@ import {
     ICrewShipMembersClient,
     ICrewShipWeapon,
     IFlavourItem,
-    ILoadoutConfigClient,
-    ILotusCustomization
+    ILoadoutConfigClient
 } from "./inventoryTypes/inventoryTypes";
 
 export interface ISaveLoadoutRequest {
@@ -44,7 +43,6 @@ export interface ISaveLoadoutRequest {
     EquippedEmotes: string[];
     UseAdultOperatorLoadout: boolean;
     WeaponSkins: IItemEntry;
-    LotusCustomization: ILotusCustomization;
 }
 
 export type ISaveLoadoutRequestNoUpgradeVer = Omit<ISaveLoadoutRequest, "UpgradeVer">;

src/types/shipTypes.ts

@@ -1,12 +1,12 @@
 import { Types } from "mongoose";
-import { IMongoDate, IOid } from "@/src/types/commonTypes";
+import { IOid } from "@/src/types/commonTypes";
 import { IColor } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { ILoadoutClient } from "./saveLoadoutTypes";
 
 export interface IGetShipResponse {
     ShipOwnerId: string;
     Ship: IShip;
-    Apartment: IApartmentClient;
+    Apartment: IApartment;
     TailorShop: ITailorShop;
     LoadOutInventory: { LoadOutPresets: ILoadoutClient };
 }
@@ -51,42 +51,28 @@ export interface IRoom {
     PlacedDecos?: IPlacedDecosDatabase[];
 }
 
-export interface IPlantClient {
+export interface IPlants {
     PlantType: string;
-    EndTime: IMongoDate;
+    EndTime: IOid;
     PlotIndex: number;
 }
-
-export interface IPlantDatabase extends Omit<IPlantClient, "EndTime"> {
-    EndTime: Date;
-}
-
-export interface IPlanterClient {
+export interface IPlanters {
     Name: string;
-    Plants: IPlantClient[];
+    Plants: IPlants[];
 }
 
-export interface IPlanterDatabase {
-    Name: string;
-    Plants: IPlantDatabase[];
+export interface IGardening {
+    Planters?: IPlanters[];
 }
 
-export interface IGardeningClient {
-    Planters: IPlanterClient[];
-}
-
-export interface IGardeningDatabase {
-    Planters: IPlanterDatabase[];
-}
-
-export interface IApartmentClient {
-    Gardening: IGardeningClient;
+export interface IApartment {
+    Gardening: IGardening;
     Rooms: IRoom[];
     FavouriteLoadouts: IFavouriteLoadout[];
 }
 
 export interface IApartmentDatabase {
-    Gardening: IGardeningDatabase;
+    Gardening: IGardening;
     Rooms: IRoom[];
     FavouriteLoadouts: IFavouriteLoadoutDatabase[];
 }

src/types/vendorTypes.ts

@@ -1,16 +1,18 @@
 import { IMongoDate, IOid } from "./commonTypes";
 
 export interface IItemPrice {
-    ItemType: string;
+    ItemType: string | string[]; // If string[], preprocessing will use RNG to pick one for the current period.
     ItemCount: number;
     ProductCategory: string;
 }
 
+export interface IItemPricePreprocessed extends Omit<IItemPrice, "ItemType"> {
+    ItemType: string;
+}
+
 export interface IItemManifest {
     StoreItem: string;
     ItemPrices?: IItemPrice[];
-    RegularPrice?: number[];
-    PremiumPrice?: number[];
     Bin: string;
     QuantityMultiplier: number;
     Expiry: IMongoDate; // Either a date in the distant future or a period in milliseconds for preprocessing.
@@ -21,6 +23,10 @@ export interface IItemManifest {
     Id: IOid;
 }
 
+export interface IItemManifestPreprocessed extends Omit<IItemManifest, "ItemPrices"> {
+    ItemPrices?: IItemPricePreprocessed[];
+}
+
 export interface IVendorInfo {
     _id: IOid;
     TypeName: string;
@@ -32,6 +38,14 @@ export interface IVendorInfo {
     Expiry: IMongoDate; // Either a date in the distant future or a period in milliseconds for preprocessing.
 }
 
-export interface IVendorManifest {
+export interface IVendorInfoPreprocessed extends Omit<IVendorInfo, "ItemManifest"> {
+    ItemManifest: IItemManifestPreprocessed[];
+}
+
+export interface IRawVendorManifest {
     VendorInfo: IVendorInfo;
 }
+
+export interface IVendorManifestPreprocessed {
+    VendorInfo: IVendorInfoPreprocessed;
+}

src/types/worldStateTypes.ts

@@ -10,9 +10,7 @@ export interface IWorldState {
     LiteSorties: ILiteSortie[];
     SyndicateMissions: ISyndicateMissionInfo[];
     GlobalUpgrades: IGlobalUpgrade[];
-    ActiveMissions: IFissure[];
     NodeOverrides: INodeOverride[];
-    PVPChallengeInstances: IPVPChallengeInstance[];
     EndlessXpChoices: IEndlessXpChoice[];
     SeasonInfo: {
         Activation: IMongoDate;
@@ -73,18 +71,6 @@ export interface IGlobalUpgrade {
     LocalizeDescTag: string;
 }
 
-export interface IFissure {
-    _id: IOid;
-    Region: number;
-    Seed: number;
-    Activation: IMongoDate;
-    Expiry: IMongoDate;
-    Node: string;
-    MissionType: string;
-    Modifier: string;
-    Hard?: boolean;
-}
-
 export interface INodeOverride {
     _id: IOid;
     Activation?: IMongoDate;
@@ -111,13 +97,6 @@ export interface ISortie {
     }[];
 }
 
-export interface ISortieMission {
-    missionType: string;
-    modifierType: string;
-    node: string;
-    tileset: string;
-}
-
 export interface ILiteSortie {
     _id: IOid;
     Activation: IMongoDate;
@@ -131,21 +110,6 @@ export interface ILiteSortie {
     }[];
 }
 
-export interface IPVPChallengeInstance {
-    _id: IOid;
-    challengeTypeRefID: string;
-    startDate: IMongoDate;
-    endDate: IMongoDate;
-    params: {
-        n: string; // "ScriptParamValue";
-        v: number;
-    }[];
-    isGenerated: boolean;
-    PVPMode: string;
-    subChallenges: IOid[];
-    Category: string; // "PVPChallengeTypeCategory_WEEKLY" | "PVPChallengeTypeCategory_WEEKLY_ROOT" | "PVPChallengeTypeCategory_DAILY";
-}
-
 export interface IEndlessXpChoice {
     Category: string;
     Choices: string[];
@@ -162,7 +126,7 @@ export interface ISeasonChallenge {
 export interface ICalendarSeason {
     Activation: IMongoDate;
     Expiry: IMongoDate;
-    Season: "CST_WINTER" | "CST_SPRING" | "CST_SUMMER" | "CST_FALL";
+    Season: string; // "CST_UNDEFINED" | "CST_WINTER" | "CST_SPRING" | "CST_SUMMER" | "CST_FALL"
     Days: ICalendarDay[];
     YearIteration: number;
     Version: number;

static/certs/cert.pem

@@ -1,38 +1,38 @@
 -----BEGIN CERTIFICATE-----
-MIIGMDCCBRigAwIBAgIQX4800cgswlDH/QexMSnnnjANBgkqhkiG9w0BAQsFADCB
-jzELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTcwNQYDVQQD
-Ey5TZWN0aWdvIFJTQSBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB
-MB4XDTI1MDMwNjAwMDAwMFoXDTI2MDMwNjIzNTk1OVowGDEWMBQGA1UEAwwNKi5m
-YWtldGxzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMe42XWK
-HJuR7doFTX79zrEKfTlD2hjRIif3dHKJNTJNvZa52mIoHelP7RVUuFOhp7aZCNLh
-IEzDyZObl8vwO6L2PVu5tbBEEoNixbpfhc8ZICEBuVo2UAhnJFcMJtuvtrCq+7ye
-oczM/k/nh8FBz2WnLzWs4CZt1sa5knZXFmBmsHJQtQIC6vx7QzVcKGOlAosIEHSK
-X4nIz5fLgWSzor1Gay56j31PTk+qRvlPQM2aKiLWnlLfRED4zHJqLe94itu8llPX
-b6g+cLxxRKUpMqtG/15cDdBZwv40Dja7bmNfe1u4w2QCVLjvHVaVpNXbcRay/Mhn
-M1w5LzDZmV58b18CAwEAAaOCAvwwggL4MB8GA1UdIwQYMBaAFI2MXsRUrYrhd+mb
-+ZsF4bgBjWHhMB0GA1UdDgQWBBS6/x/N38wMJrQq/cE1oIcRERMonTAOBgNVHQ8B
+MIIGLzCCBRegAwIBAgIRAILIyLcitteoEGcJt1QBXvcwDQYJKoZIhvcNAQELBQAw
+gY8xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDE3MDUGA1UE
+AxMuU2VjdGlnbyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
+QTAeFw0yNDA4MDIwMDAwMDBaFw0yNTA4MDIyMzU5NTlaMBcxFTATBgNVBAMMDCou
+dmlhdGxzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMTToSjY
+3aUIxjghIkikJfFExVwSEzIM2XaQNJE+SxQ6Cc+xUR5QJrMJnM/39sH5c5imMEUo
+2OnstCIaVMPx5ZPN+HXLsvmoVAe2/xYe7emnZ5ZFTUXPyqkzDRg0hkMJiWWo/Nmf
+ypZfUJoz6hVkXwsgNFPTVuo7aECQFlZslh2HQVDOfBaNBxQBaOJ5vf6nllf/aLyB
+tZ74nlLynVYV9kYzISP4dUcxQ+D4HZgIxyOQfcN3EHUS1ZVaIp8hupOygF8zGQyJ
+uzFozzg5I59U+hT1yQG3FlwTBnP+sA0+hW0LBTbWSISm0If1SgHlUEqxLlosjuTG
+BG45h9o2bAz9po0CAwEAAaOCAvswggL3MB8GA1UdIwQYMBaAFI2MXsRUrYrhd+mb
++ZsF4bgBjWHhMB0GA1UdDgQWBBQ/OeA2gLbVIKIuIitYRqSRUWMP3TAOBgNVHQ8B
 Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
 BQUHAwIwSQYDVR0gBEIwQDA0BgsrBgEEAbIxAQICBzAlMCMGCCsGAQUFBwIBFhdo
 dHRwczovL3NlY3RpZ28uY29tL0NQUzAIBgZngQwBAgEwgYQGCCsGAQUFBwEBBHgw
 djBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5zZWN0aWdvLmNvbS9TZWN0aWdvUlNB
 RG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAjBggrBgEFBQcwAYYX
-aHR0cDovL29jc3Auc2VjdGlnby5jb20wJQYDVR0RBB4wHIINKi5mYWtldGxzLmNv
-bYILZmFrZXRscy5jb20wggF+BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB2AJaXZL9V
-WJet90OHaDcIQnfp8DrV9qTzNm5GpD8PyqnGAAABlWsz5fgAAAQDAEcwRQIgTN7Y
-/mDqiD3RbGVLEOQK2wvXsboBolBRwGJFuFEsDScCIQCQ0qfb/0V8qqSxrkx/PiVS
-1lSn5gBEnQUiQOkefcnW0gB2ABmG1Mcoqm/+ugNveCpNAZGqzi1yMQ+uzl1wQS0l
-TMfUAAABlWsz5dAAAAQDAEcwRQIhAJnQJyrSCWWdi9Kyoa7XuMGyDKt183jJMY0E
-71abTuBOAiBC+WnK1esG6xr8aVGHRcc+1U/I7LiaG3LCRMYtCKrTGwB2AMs49xWJ
-fIShRF9bwd37yW7ymlnNRwppBYWwyxTDFFjnAAABlWsz5f4AAAQDAEcwRQIhAJUs
-4PWDwyQJnCxCyEwFlFUY2uYQkGrQPA9f9Sw5Xk1fAiB63eQtZQGjvzvhOghy6z9a
-8oGYbDfDQ/zfisMYO7rM6zANBgkqhkiG9w0BAQsFAAOCAQEAEHnSoeBbWiK3CS3a
-px0BL+YXxRxdUcTMHgn5o+LlI9sWlpf+JLXmn7Z4QA6fAwT4k/Ue7xsmIq0OraDk
-/pEVXWm1HO/9wUkGQg0DBi77BpfHircd7OWIMdt250Q8UAmZkOyhVgnwBcScqMwq
-2T5CPaYvYGgYWx/qkIBv7JqhVbrP82rnF9b9ZUZ8GIE31chBmtMva9AsnAN5dmRw
-81bVvPWXUfX30CYu5sxeWL06Zpy9nfJumxZri1SWXNTBjSvud2jsZ8tSCUAWLL/4
-ui3Vien9m2oMOpaA8xbS88ZTk9Alm/o5febEKJZUPlytQzij8gQpiovFw2v+Cdei
-+tFXKw==
+aHR0cDovL29jc3Auc2VjdGlnby5jb20wIwYDVR0RBBwwGoIMKi52aWF0bHMuY29t
+ggp2aWF0bHMuY29tMIIBfwYKKwYBBAHWeQIEAgSCAW8EggFrAWkAdQDd3Mo0ldfh
+FgXnlTL6x5/4PRxQ39sAOhQSdgosrLvIKgAAAZEVLi9VAAAEAwBGMEQCIGiZNOV7
+IvcHKU7nEaxFgWPpUu2CxyULg1ueJTYwTT12AiAJWQv3RrqCtOJC7JEdztILs3Bn
+an9s0Bf93uOE4C/LiAB3AA3h8jAr0w3BQGISCepVLvxHdHyx1+kw7w5CHrR+Tqo0
+AAABkRUuLxAAAAQDAEgwRgIhAOhlC+IpJV3uAaDCRXi6RZ+V8++QaLaTEtqFp2UP
+yWeSAiEA8qtGDk1RE1VGwQQcJCf3CBYU5YTlsZNi7F6hEONLuzMAdwAS8U40vVNy
+TIQGGcOPP3oT+Oe1YoeInG0wBYTr5YYmOgAAAZEVLi7kAAAEAwBIMEYCIQDWCnSm
+N+2/xxo8bl3pbpNBEBZZIwnYPQW0A+SJ0+dboQIhANjH2L0xV/+rPuPMzK40vk3J
+1fWHLocLjpgaxGhsBAOzMA0GCSqGSIb3DQEBCwUAA4IBAQBcObVjc1zFdOER50ZF
+mI+WyVF8t6nV6dm3zIDraLA4++zKUu9UKNJm9YPqLdPP7uTLHz6wuBNmyuWPdF0r
+qAf4vsK3tcAds7kjK8injewEUCPG20mtNMUHyhlNEOJR2ySPPQ6Q+t+TtGAnimKa
+Zr86quYgYaJYhoEEXcbB9fMoDQYlJDzgT2DXvfM4cyoden2tYZ3gQS6ftiXacBe0
+WzFWYZ8mIP2Kb+D9tCapB9MVUzu3XJVy3S2FLQEWcWIvjnpad73a0/35i/nro6/k
+TSK+MKBEBaNZuHJ8ubCToo1BftnsS8HuEPTNe8W1hyc2YmT9f5YQP6HWB2rxjH42
+OTXh
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIGEzCCA/ugAwIBAgIQfVtRJrR2uhHbdBYLvFMNpzANBgkqhkiG9w0BAQwFADCB

static/certs/key.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDHuNl1ihybke3a
-BU1+/c6xCn05Q9oY0SIn93RyiTUyTb2WudpiKB3pT+0VVLhToae2mQjS4SBMw8mT
-m5fL8Dui9j1bubWwRBKDYsW6X4XPGSAhAblaNlAIZyRXDCbbr7awqvu8nqHMzP5P
-54fBQc9lpy81rOAmbdbGuZJ2VxZgZrByULUCAur8e0M1XChjpQKLCBB0il+JyM+X
-y4Fks6K9Rmsueo99T05Pqkb5T0DNmioi1p5S30RA+Mxyai3veIrbvJZT12+oPnC8
-cUSlKTKrRv9eXA3QWcL+NA42u25jX3tbuMNkAlS47x1WlaTV23EWsvzIZzNcOS8w
-2ZlefG9fAgMBAAECggEAT1Tti/LASks8300b60WFxG0WMJjzGMh5eMaiSpyVtNWM
-aUKJrFOjDfnhgoeUcCPWKoG/L4Sc/+EFQMydDzTte120IasysEFZ2TZytAUdcZXZ
-XUMCDQNl5vCRTsJU7Q5u0t4YAGRCgMcsfTDKi8lISGiQKBHzN1CJ74Xm13rgOInd
-lAc0wd5S89sL6RYmRTj1LvuZ95EHXHqQGdv0fIFEyP3pF1iPwcoTuIVEeICqnEvW
-vd8CVO68eH3HFIwioqjp4qW3pxPZMhVq4161805uAMkoQlE+7MtEVenmP++1u1gM
-FjvAs3j9CZqOHZKcLlOtcGSwDlD++fCMMT4slLgLgQKBgQDy58E5nuYXdxlFQQk4
-QccUKpyJ2aVXyp9xvTFBot/5Pik1SkuDzv2XU1OTxdxf3EongLy91nMJ2/6/39Je
-lf0/2MjzCtJ/lSzZ/zpJAu86UkBkWBAA5loGIof6OKedbEIgqpJqtK59S+j3ExO9
-eqa+uFrtt1UfaJG4A7TT+dIvIwKBgQDSfSOdSM5Dh3KsQHVnIWcIkzwTtlJlO+rG
-6rDEADxw6Kp8VIL/dq4Foe8yW4VqLVrWUuZsU6jzC9GdnyYi6VaqZ/iSUtGkBMOT
-WTTYhqXlURaQ13jhqdwCZJRbVI72JbXn2OGEv8DgXnk//QKED/8VdKqAzCSr1t1f
-3yfwei0AlQKBgD19KU66yKg7/+umEP1quUiDmOjUbaSRqFcUe3mQD356m9ffnMob
-BdrevxNzTNv/Wc4yKpUryic+x3gu4oQLF/annAbaQHsHejkdANYmpgRvedls6XAw
-360Z5K4U1WlmVD8Mrs/QOTOCmdChxad7euZgqLPwat3ujKS2W3oljW1dAoGBAM4/
-AB6lsDZLCfnuTxt2h1bHrh5CkAnR5AJ1BC+Ja6/WyvZ4eMOIroumWJKnStr3BgLr
-yAxtDSbZddNUljGvIdRnfBEkRXbJlDlVN4rSpMtF4S6bcz7rCUDu/M9g05Qs70j2
-IkPJAFzZNUWVzFlKs096uXbqkSQvrUq7ho8DqAThAoGBAL7Nrbr5LWcBgvwEhEla
-VRfYb0FUrDwLIrVWntJjW566/pVQQ4BmatsblLjlQYWk9MCIYXWZbnB+2fRx9yjQ
-Adggez7Dws/Mrh/wVudKgayHCy5Lgd8rYjNgC+VZf8XGrWX3QXMJ6UWAyQLTeoO7
-hToW9o9CQMIhaR43G8di1kjF
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDE06Eo2N2lCMY4
+ISJIpCXxRMVcEhMyDNl2kDSRPksUOgnPsVEeUCazCZzP9/bB+XOYpjBFKNjp7LQi
+GlTD8eWTzfh1y7L5qFQHtv8WHu3pp2eWRU1Fz8qpMw0YNIZDCYllqPzZn8qWX1Ca
+M+oVZF8LIDRT01bqO2hAkBZWbJYdh0FQznwWjQcUAWjieb3+p5ZX/2i8gbWe+J5S
+8p1WFfZGMyEj+HVHMUPg+B2YCMcjkH3DdxB1EtWVWiKfIbqTsoBfMxkMibsxaM84
+OSOfVPoU9ckBtxZcEwZz/rANPoVtCwU21kiEptCH9UoB5VBKsS5aLI7kxgRuOYfa
+NmwM/aaNAgMBAAECggEAEYK8bzxf96tAq0SzXqAP6heSsV7AS28eN7CbpKJUnp+N
+OOePDnHWB46e31exoc82DAoY+EYqiiEvY2tRSD9wi8ZCyQQOz6w8kZUju42T3/ov
+Ooy+06upXYU3sIQXv8YM7bjridbv+JHRQ27D8BRGamB6l0yRinQvkbLf8d9mOYkj
+P5yYrpMPV/mfgkCir/aBlGOzmI+CuOv7FdF9DIz2OehtPXOzbExuab4xOQ4NQrN9
+TfzWWS798D86e5uDx+Ab0pfege8IJvEBjU5ngZo3aeS/F5i2us+BXImu1P6IrYdb
+ekXUo9VJPEHiD02iyLW/gFz3/AsWa3ztinXN0I069wKBgQD7yGPX6LG7MXlXEqL2
+DuCrFsKzVC4z0c/cpPXO8Xb8rGzvHR7Oa0i5Bo7i5wRiVXS87HT25iZmB78yjKnI
+bVmWA3tVWInx6fixbZUO7L4D/Q1Ddfin/DiXyNpAhKii0QgpD61P7HJnrfnwUar5
+Vpwd2grnPNCbuILZxAZhtIXRnwKBgQDIH5hmyiIUAvrz+4UpE55ecxTMOkj0+Pgx
+79KpSjXfEIk5V7UmCSk1SusQWq8Ri9d6QqPcTptVhxmC/geolp9bCW14JdORbjNv
+5+3JfAwgZJtbDP4l3GKf168fLQXzSpWCW3vT1lCBz4x4nNs2EudTdDCn5aUVLGEJ
+v15Iz0dQUwKBgHuZh8n55SXrx5FDCNSZwRi796Bo9rVhjhTWtgR87NhlHKTVOsZC
+TFToL0Sb+776DHCh81kw6jC0JNv/yWkmpQ/LbcQbzrv/C6KuFLpa5Xy3wMcZJpPw
+cSex5dI+TTqAOu1NUNsnS5IyCbw7mx8DsWfGHgweApovHa0hWbClGfwpAoGAfSt9
+6DTfkcK3cilMhX+2236BcKe4ADlFC/7jtW0sOsQeAFbCf/LU6ndchVMjEwdzlA3g
+bahg8eLZaxw2cBUdwRQpey+1n83csE7RZOeIsi4bGZ0LzWSF71I5P3eqtBxfXTSZ
+Q8tVeYv2YW5CkhTKyWDwGePCGHc0jqM6drHm+e8CgYEA+IkvplnK76zx3M579TpI
+M2ffiC2b12FtJMpgnNrk6HZ19o2mhbte/7wf9SHVqsRw4V7/n6rzBJ5wzEHOWre7
+7PrkLgS0mY2SRfMmeT74m59dA8GpvhBUW/Xa4wlDtZkU2iIcDkKnYLjgrTKjlK86
+ER+evzmHeTqYJzuK8Mfq93I=
 -----END PRIVATE KEY-----

static/fixed_responses/allIncarnonList.json

@@ -1,49 +0,0 @@
-[
-  "/Lotus/Weapons/ClanTech/Bio/BioWeapon",
-  "/Lotus/Weapons/ClanTech/Energy/EnergyRifle",
-  "/Lotus/Weapons/Corpus/Pistols/CorpusMinigun/CorpusMinigun",
-  "/Lotus/Weapons/Corpus/Pistols/CrpHandRL/CorpusHandRocketLauncher",
-  "/Lotus/Weapons/Grineer/LongGuns/GrineerSawbladeGun/SawBladeGun",
-  "/Lotus/Weapons/Grineer/Melee/GrineerTylAxeAndBoar/RegorAxeShield",
-  "/Lotus/Weapons/Grineer/Pistols/HeatGun/GrnHeatGun",
-  "/Lotus/Weapons/Infested/Pistols/InfVomitGun/InfVomitGunWep",
-  "/Lotus/Weapons/Syndicates/CephalonSuda/Pistols/CSDroidArray",
-  "/Lotus/Weapons/Tenno/Bows/HuntingBow",
-  "/Lotus/Weapons/Tenno/Bows/StalkerBow",
-  "/Lotus/Weapons/Tenno/LongGuns/TnoLeverAction/TnoLeverActionRifle",
-  "/Lotus/Weapons/Tenno/Melee/Axe/DualInfestedAxesWeapon",
-  "/Lotus/Weapons/Tenno/Melee/Dagger/CeramicDagger",
-  "/Lotus/Weapons/Tenno/Melee/Fist/Fist",
-  "/Lotus/Weapons/Tenno/Melee/Hammer/IceHammer/IceHammer",
-  "/Lotus/Weapons/Tenno/Melee/LongSword/LongSword",
-  "/Lotus/Weapons/Tenno/Melee/Maces/PaladinMace/PaladinMaceWeapon",
-  "/Lotus/Weapons/Tenno/Melee/Scythe/StalkerScytheWeapon",
-  "/Lotus/Weapons/Tenno/Melee/Scythe/ParisScythe/ParisScythe",
-  "/Lotus/Weapons/Tenno/Melee/Staff/Staff",
-  "/Lotus/Weapons/Tenno/Melee/Swords/CutlassAndPoignard/TennoCutlass",
-  "/Lotus/Weapons/Tenno/Melee/Swords/TennoSai/TennoSais",
-  "/Lotus/Weapons/Tenno/Pistol/AutoPistol",
-  "/Lotus/Weapons/Tenno/Pistol/BurstPistol",
-  "/Lotus/Weapons/Tenno/Pistol/HandShotGun",
-  "/Lotus/Weapons/Tenno/Pistol/HeavyPistol",
-  "/Lotus/Weapons/Tenno/Pistol/Pistol",
-  "/Lotus/Weapons/Tenno/Pistol/RevolverPistol",
-  "/Lotus/Weapons/Tenno/Pistols/ConclaveLeverPistol/ConclaveLeverPistol",
-  "/Lotus/Weapons/Tenno/Rifle/BoltoRifle",
-  "/Lotus/Weapons/Tenno/Rifle/BurstRifle",
-  "/Lotus/Weapons/Tenno/Rifle/HeavyRifle",
-  "/Lotus/Weapons/Tenno/Rifle/Rifle",
-  "/Lotus/Weapons/Tenno/Rifle/SemiAutoRifle",
-  "/Lotus/Weapons/Tenno/Rifle/TennoAR",
-  "/Lotus/Weapons/Tenno/Shotgun/FullAutoShotgun",
-  "/Lotus/Weapons/Tenno/Shotgun/Shotgun",
-  "/Lotus/Weapons/Tenno/ThrowingWeapons/Kunai",
-  "/Lotus/Weapons/Tenno/ThrowingWeapons/StalkerKunai",
-  "/Lotus/Weapons/Tenno/Zariman/LongGuns/PumpShotgun/ZarimanPumpShotgun",
-  "/Lotus/Weapons/Tenno/Zariman/LongGuns/SemiAutoRifle/ZarimanSemiAutoRifle",
-  "/Lotus/Weapons/Tenno/Zariman/Melee/Dagger/ZarimanDaggerWeapon",
-  "/Lotus/Weapons/Tenno/Zariman/Melee/Tonfas/ZarimanTonfaWeapon",
-  "/Lotus/Weapons/Tenno/Zariman/Pistols/HeavyPistol/ZarimanHeavyPistol",
-  "/Lotus/Weapons/Thanotech/EntFistIncarnon/EntFistIncarnon",
-  "/Lotus/Weapons/Thanotech/EntratiWristGun/EntratiWristGunWeapon"
-]

static/fixed_responses/allScans.json

@@ -1097,5 +1097,6 @@
   "/Lotus/Types/LevelObjects/InfestedPumpkinCocoonLamp",
   "/Lotus/Types/LevelObjects/InfestedPumpkinCocoonLampLarge",
   "/Lotus/Types/LevelObjects/InfestedPumpkinCocoonLampSmall",
-  "/Lotus/Types/LevelObjects/InfestedPumpkinExplosiveTotem"
+  "/Lotus/Types/LevelObjects/InfestedPumpkinExplosiveTotem",
+  "/Lotus/Types/Enemies/Orokin/OrokinMoaBipedAvatar"
 ]

static/fixed_responses/getVendorInfo/DeimosFishmongerVendorManifest.json

@@ -0,0 +1,106 @@
+{
+  "VendorInfo": {
+    "_id": {
+      "$oid": "5f456e01c96976e97d6b8016"
+    },
+    "TypeName": "/Lotus/Types/Game/VendorManifests/Deimos/FishmongerVendorManifest",
+    "ItemManifest": [
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Deimos/FishParts/DeimosOrokinFishAPartItem",
+        "PremiumPrice": [9, 9],
+        "Bin": "BIN_1",
+        "QuantityMultiplier": 10,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e91b9"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Deimos/FishParts/DeimosInfestedFishDPartItem",
+        "PremiumPrice": [17, 17],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e91ba"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Deimos/FishParts/DeimosInfestedFishCPartItem",
+        "PremiumPrice": [10, 10],
+        "Bin": "BIN_1",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e91bb"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Deimos/FishParts/DeimosInfestedFishBPartItem",
+        "PremiumPrice": [6, 6],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e91bc"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Deimos/FishParts/DeimosInfestedFishAPartItem",
+        "PremiumPrice": [5, 5],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e91bd"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Deimos/FishParts/DeimosGenericSharedFishPartItem",
+        "PremiumPrice": [7, 7],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e91be"
+        }
+      }
+    ],
+    "PropertyTextHash": "6DF13A7FB573C25B4B4F989CBEFFC615",
+    "Expiry": {
+      "$date": {
+        "$numberLong": "9999999000000"
+      }
+    }
+  }
+}

static/fixed_responses/getVendorInfo/GuildAdvertisementVendorManifest.json

@@ -0,0 +1,101 @@
+{
+  "VendorInfo": {
+    "_id": { "$oid": "61ba123467e5d37975aeeb03" },
+    "TypeName": "/Lotus/Types/Game/VendorManifests/Hubs/GuildAdvertisementVendorManifest",
+    "ItemManifest": [
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Guild/GuildAdvertisementMoon",
+        "ItemPrices": [
+          {
+            "ItemType": ["/Lotus/Types/Items/Research/BioFragment", "/Lotus/Types/Items/Research/ChemComponent", "/Lotus/Types/Items/Research/EnergyFragment"],
+            "ItemCount": 12,
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "RegularPrice": [1, 1],
+        "Bin": "BIN_4",
+        "QuantityMultiplier": 1,
+        "Expiry": { "$date": { "$numberLong": "604800000" } },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": false,
+        "LocTagRandSeed": 79554843,
+        "Id": { "$oid": "67bbb592e1534511d6c1c1e2" }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Guild/GuildAdvertisementMountain",
+        "ItemPrices": [
+          {
+            "ItemType": ["/Lotus/Types/Items/Research/BioFragment", "/Lotus/Types/Items/Research/ChemComponent", "/Lotus/Types/Items/Research/EnergyFragment"],
+            "ItemCount": 7,
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "RegularPrice": [1, 1],
+        "Bin": "BIN_3",
+        "QuantityMultiplier": 1,
+        "Expiry": { "$date": { "$numberLong": "604800000" } },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": false,
+        "LocTagRandSeed": 2413820225,
+        "Id": { "$oid": "67bbb592e1534511d6c1c1e3" }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Guild/GuildAdvertisementStorm",
+        "ItemPrices": [
+          {
+            "ItemType": ["/Lotus/Types/Items/Research/BioFragment", "/Lotus/Types/Items/Research/ChemComponent", "/Lotus/Types/Items/Research/EnergyFragment"],
+            "ItemCount": 3,
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "RegularPrice": [1, 1],
+        "Bin": "BIN_2",
+        "QuantityMultiplier": 1,
+        "Expiry": { "$date": { "$numberLong": "604800000" } },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": false,
+        "LocTagRandSeed": 3262300883,
+        "Id": { "$oid": "67bbb592e1534511d6c1c1e4" }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Guild/GuildAdvertisementShadow",
+        "ItemPrices": [
+          {
+            "ItemType": ["/Lotus/Types/Items/Research/BioFragment", "/Lotus/Types/Items/Research/ChemComponent", "/Lotus/Types/Items/Research/EnergyFragment"],
+            "ItemCount": 20,
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "RegularPrice": [1, 1],
+        "Bin": "BIN_1",
+        "QuantityMultiplier": 1,
+        "Expiry": { "$date": { "$numberLong": "604800000" } },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": false,
+        "LocTagRandSeed": 2797325750,
+        "Id": { "$oid": "67bbb592e1534511d6c1c1e5" }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Guild/GuildAdvertisementGhost",
+        "ItemPrices": [
+          {
+            "ItemType": ["/Lotus/Types/Items/Research/BioFragment", "/Lotus/Types/Items/Research/ChemComponent", "/Lotus/Types/Items/Research/EnergyFragment"],
+            "ItemCount": 10,
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "RegularPrice": [1, 1],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 1,
+        "Expiry": { "$date": { "$numberLong": "604800000" } },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": false,
+        "LocTagRandSeed": 554932310,
+        "Id": { "$oid": "67bbb592e1534511d6c1c1e6" }
+      }
+    ],
+    "PropertyTextHash": "255AFE2169BAE4130B4B20D7C55D14FA",
+    "RandomSeedType": "VRST_FLAVOUR_TEXT",
+    "Expiry": { "$date": { "$numberLong": "604800000" } }
+  }
+}

static/fixed_responses/getVendorInfo/OstronFishmongerVendorManifest.json

@@ -0,0 +1,106 @@
+{
+  "VendorInfo": {
+    "_id": {
+      "$oid": "59d6e27ebcc718474eb17115"
+    },
+    "TypeName": "/Lotus/Types/Game/VendorManifests/Ostron/FishmongerVendorManifest",
+    "ItemManifest": [
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Eidolon/FishParts/DayUncommonFishAPartItem",
+        "PremiumPrice": [14, 14],
+        "Bin": "BIN_1",
+        "QuantityMultiplier": 10,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e9808"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Eidolon/FishParts/BothUncommonFishBPartItem",
+        "PremiumPrice": [12, 12],
+        "Bin": "BIN_1",
+        "QuantityMultiplier": 10,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e9809"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Eidolon/FishParts/DayCommonFishCPartItem",
+        "PremiumPrice": [8, 8],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e980a"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Eidolon/FishParts/DayCommonFishBPartItem",
+        "PremiumPrice": [7, 7],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e980b"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Eidolon/FishParts/DayCommonFishAPartItem",
+        "PremiumPrice": [10, 10],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e980c"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Eidolon/FishParts/BothCommonFishBPartItem",
+        "PremiumPrice": [8, 8],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e980d"
+        }
+      }
+    ],
+    "PropertyTextHash": "CC3B9DAFB38F412998E90A41421A8986",
+    "Expiry": {
+      "$date": {
+        "$numberLong": "9999999000000"
+      }
+    }
+  }
+}

static/fixed_responses/getVendorInfo/SolarisDebtTokenVendorManifest.json

@@ -0,0 +1,248 @@
+{
+  "VendorInfo": {
+    "_id": {
+      "$oid": "5be4a159b144f3cdf1c22efa"
+    },
+    "TypeName": "/Lotus/Types/Game/VendorManifests/Solaris/DebtTokenVendorManifest",
+    "ItemManifest": [
+      {
+        "StoreItem": "/Lotus/Types/StoreItems/Packages/DebtTokenBundles/DebtTokenBundleUncommonD",
+        "ItemPrices": [
+          {
+            "ItemType": "/Lotus/Types/Gameplay/Venus/Resources/VenusCoconutItem",
+            "ItemCount": 5,
+            "ProductCategory": "MiscItems"
+          },
+          {
+            "ItemType": "/Lotus/Types/Items/MiscItems/Circuits",
+            "ItemCount": 3664,
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "RegularPrice": [87300, 87300],
+        "Bin": "BIN_1",
+        "QuantityMultiplier": 1,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": true,
+        "LocTagRandSeed": 1881404827,
+        "Id": {
+          "$oid": "670daf92d21f34757a5e73b4"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/Types/StoreItems/Packages/DebtTokenBundles/DebtTokenBundleRareC",
+        "ItemPrices": [
+          {
+            "ItemType": "/Lotus/Types/Items/MiscItems/NeuralSensor",
+            "ItemCount": 1,
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "RegularPrice": [53300, 53300],
+        "Bin": "BIN_2",
+        "QuantityMultiplier": 1,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": true,
+        "LocTagRandSeed": 1943984533,
+        "Id": {
+          "$oid": "6710b5029e1a3080a65e73a7"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/Types/StoreItems/Packages/DebtTokenBundles/DebtTokenBundleCommonG",
+        "ItemPrices": [
+          {
+            "ItemType": "/Lotus/Types/Items/MiscItems/Salvage",
+            "ItemCount": 11540,
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "RegularPrice": [27300, 27300],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 1,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": true,
+        "LocTagRandSeed": 744199559,
+        "Id": {
+          "$oid": "67112582cc115756985e73a4"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/Types/StoreItems/Packages/DebtTokenBundles/DebtTokenBundleUncommonB",
+        "ItemPrices": [
+          {
+            "ItemType": "/Lotus/Types/Items/Fish/Solaris/FishParts/CorpusFishThermalLaserItem",
+            "ItemCount": 9,
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "RegularPrice": [75800, 75800],
+        "Bin": "BIN_1",
+        "QuantityMultiplier": 1,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": true,
+        "LocTagRandSeed": 3744711432,
+        "Id": {
+          "$oid": "670de7d28a6ec82cd25e73a2"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/Types/StoreItems/Packages/DebtTokenBundles/DebtTokenBundleUncommonB",
+        "ItemPrices": [
+          {
+            "ItemType": "/Lotus/Types/Items/MiscItems/Rubedo",
+            "ItemCount": 3343,
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "RegularPrice": [52200, 52200],
+        "Bin": "BIN_1",
+        "QuantityMultiplier": 1,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": true,
+        "LocTagRandSeed": 1579000687,
+        "Id": {
+          "$oid": "670e58526171148e125e73ad"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/Types/StoreItems/Packages/DebtTokenBundles/DebtTokenBundleCommonA",
+        "ItemPrices": [
+          {
+            "ItemType": "/Lotus/Types/Gameplay/Venus/Resources/CoolantItem",
+            "ItemCount": 9,
+            "ProductCategory": "MiscItems"
+          },
+          {
+            "ItemType": "/Lotus/Types/Items/Fish/Solaris/FishParts/CorpusFishAnoscopicSensorItem",
+            "ItemCount": 5,
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "RegularPrice": [12400, 12400],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 1,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": true,
+        "LocTagRandSeed": 3589081466,
+        "Id": {
+          "$oid": "67112582cc115756985e73a5"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/Types/StoreItems/Packages/DebtTokenBundles/DebtTokenBundleUncommonC",
+        "ItemPrices": [
+          {
+            "ItemType": "/Lotus/Types/Items/Gems/Solaris/SolarisCommonOreBAlloyItem",
+            "ItemCount": 13,
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "RegularPrice": [77500, 77500],
+        "Bin": "BIN_1",
+        "QuantityMultiplier": 1,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": true,
+        "LocTagRandSeed": 1510234814,
+        "Id": {
+          "$oid": "670f0f21250ad046c35e73ee"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/Types/StoreItems/Packages/DebtTokenBundles/DebtTokenBundleUncommonD",
+        "ItemPrices": [
+          {
+            "ItemType": "/Lotus/Types/Items/Fish/Solaris/FishParts/CorpusFishParralelBiodeItem",
+            "ItemCount": 7,
+            "ProductCategory": "MiscItems"
+          },
+          {
+            "ItemType": "/Lotus/Types/Items/Gems/Solaris/SolarisCommonGemBCutItem",
+            "ItemCount": 12,
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "RegularPrice": [94600, 94600],
+        "Bin": "BIN_1",
+        "QuantityMultiplier": 1,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": true,
+        "LocTagRandSeed": 4222095721,
+        "Id": {
+          "$oid": "670f63827be40254f95e739d"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/Types/StoreItems/Packages/DebtTokenBundles/DebtTokenBundleCommonJ",
+        "ItemPrices": [
+          {
+            "ItemType": "/Lotus/Types/Items/MiscItems/Nanospores",
+            "ItemCount": 14830,
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "RegularPrice": [25600, 25600],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 1,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": true,
+        "LocTagRandSeed": 2694388669,
+        "Id": {
+          "$oid": "67112582cc115756985e73a6"
+        }
+      }
+    ],
+    "PropertyTextHash": "A39621049CA3CA13761028CD21C239EF",
+    "RandomSeedType": "VRST_FLAVOUR_TEXT",
+    "Expiry": {
+      "$date": {
+        "$numberLong": "9999999000000"
+      }
+    }
+  }
+}

static/fixed_responses/getVendorInfo/SolarisFishmongerVendorManifest.json

@@ -0,0 +1,106 @@
+{
+  "VendorInfo": {
+    "_id": {
+      "$oid": "5b0de8556df82a56ea9bae82"
+    },
+    "TypeName": "/Lotus/Types/Game/VendorManifests/Solaris/FishmongerVendorManifest",
+    "ItemManifest": [
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Solaris/FishParts/CorpusFishThermalLaserItem",
+        "PremiumPrice": [15, 15],
+        "Bin": "BIN_1",
+        "QuantityMultiplier": 10,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e9515"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Solaris/FishParts/CorpusFishVenedoCaseItem",
+        "PremiumPrice": [8, 8],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e9516"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Solaris/FishParts/SolarisFishDissipatorCoilItem",
+        "PremiumPrice": [18, 18],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e9517"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Solaris/FishParts/CorpusFishExaBrainItem",
+        "PremiumPrice": [5, 5],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e9518"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Solaris/FishParts/CorpusFishAnoscopicSensorItem",
+        "PremiumPrice": [5, 5],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e9519"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Fish/Solaris/FishParts/GenericFishScrapItem",
+        "PremiumPrice": [5, 5],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e951a"
+        }
+      }
+    ],
+    "PropertyTextHash": "946131D0CF5CDF7C2C03BB967DE0DF49",
+    "Expiry": {
+      "$date": {
+        "$numberLong": "9999999000000"
+      }
+    }
+  }
+}

static/fixed_responses/getVendorInfo/Temple1999VendorManifest.json

@@ -1,459 +0,0 @@
-{
-  "VendorInfo": {
-    "_id": {
-      "$oid": "67dadc30e4b6e0e5979c8d56"
-    },
-    "TypeName": "/Lotus/Types/Game/VendorManifests/TheHex/Temple1999VendorManifest",
-    "ItemManifest": [
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TempleBlueprint",
-        "ItemPrices": [
-          {
-            "ItemCount": 195,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c18c"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TempleSystemsBlueprint",
-        "ItemPrices": [
-          {
-            "ItemCount": 65,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c18d"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TempleChassisBlueprint",
-        "ItemPrices": [
-          {
-            "ItemCount": 65,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c18e"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TempleHelmetBlueprint",
-        "ItemPrices": [
-          {
-            "ItemCount": 65,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c18f"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Recipes/Weapons/1999EntHybridPistolBlueprint",
-        "ItemPrices": [
-          {
-            "ItemCount": 120,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c190"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Recipes/Weapons/WeaponParts/1999EntHybridPistolBarrelBlueprint",
-        "ItemPrices": [
-          {
-            "ItemCount": 60,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c191"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Recipes/Weapons/WeaponParts/1999EntHybridPistolReceiverBlueprint",
-        "ItemPrices": [
-          {
-            "ItemCount": 60,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c192"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Recipes/Weapons/WeaponParts/1999EntHybridPistolStockBlueprint",
-        "ItemPrices": [
-          {
-            "ItemCount": 60,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c193"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Items/ShipDecos/Hollvania/LASxStadiumDrumCoreKitA",
-        "ItemPrices": [
-          {
-            "ItemCount": 30,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c194"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Items/ShipDecos/Hollvania/LASxStadiumDrumCymbalA",
-        "ItemPrices": [
-          {
-            "ItemCount": 30,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c195"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Items/ShipDecos/Hollvania/LASxStadiumDrumFloorTomA",
-        "ItemPrices": [
-          {
-            "ItemCount": 30,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c196"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Items/ShipDecos/Hollvania/LASxStadiumDrumSnareA",
-        "ItemPrices": [
-          {
-            "ItemCount": 30,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c197"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Items/ShipDecos/Hollvania/LASxStadiumEquipmentCaseA",
-        "ItemPrices": [
-          {
-            "ItemCount": 30,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c198"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Items/ShipDecos/Hollvania/LASxStadiumEquipmentCaseB",
-        "ItemPrices": [
-          {
-            "ItemCount": 30,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c199"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Items/ShipDecos/Hollvania/LASxStadiumEquipmentCaseC",
-        "ItemPrices": [
-          {
-            "ItemCount": 30,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c19a"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Items/ShipDecos/Hollvania/LASxStadiumEquipmentCaseD",
-        "ItemPrices": [
-          {
-            "ItemCount": 30,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c19b"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Items/ShipDecos/Hollvania/LASxStadiumEquipmentCaseE",
-        "ItemPrices": [
-          {
-            "ItemCount": 30,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c19c"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Items/ShipDecos/Hollvania/LASxStadiumEquipmentCaseF",
-        "ItemPrices": [
-          {
-            "ItemCount": 30,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c19d"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Items/ShipDecos/Hollvania/LASxStadiumSynthKeyboardA",
-        "ItemPrices": [
-          {
-            "ItemCount": 30,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c19e"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Items/PhotoBooth/Vania/PhotoboothTileVaniaObjTempleDefense",
-        "ItemPrices": [
-          {
-            "ItemCount": 100,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 1,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "AllowMultipurchase": false,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c19f"
-        }
-      },
-      {
-        "StoreItem": "/Lotus/StoreItems/Types/Items/MiscItems/Kuva",
-        "ItemPrices": [
-          {
-            "ItemCount": 110,
-            "ItemType": "/Lotus/Types/Gameplay/1999Wf/Resources/1999ResourceDefense",
-            "ProductCategory": "MiscItems"
-          }
-        ],
-        "Bin": "BIN_0",
-        "QuantityMultiplier": 6000,
-        "Expiry": {
-          "$date": {
-            "$numberLong": "2051240400000"
-          }
-        },
-        "PurchaseQuantityLimit": 7,
-        "AllowMultipurchase": true,
-        "Id": {
-          "$oid": "67dadc30641da66dc5c1c1a5"
-        }
-      }
-    ],
-    "PropertyTextHash": "20B13D9EB78FEC80EA32D0687F5BA1AE",
-    "RequiredGoalTag": "",
-    "Expiry": {
-      "$date": {
-        "$numberLong": "2051240400000"
-      }
-    }
-  }
-}

static/fixed_responses/worldState/sortieTilesets.json

@@ -1,175 +0,0 @@
-{
-  "SettlementNode1": "CorpusShipTileset",
-  "SettlementNode11": "CorpusShipTileset",
-  "SettlementNode12": "CorpusShipTileset",
-  "SettlementNode14": "CorpusShipTileset",
-  "SettlementNode15": "CorpusShipTileset",
-  "SettlementNode2": "CorpusShipTileset",
-  "SettlementNode20": "CorpusShipTileset",
-  "SettlementNode3": "CorpusShipTileset",
-  "SolNode1": "CorpusOutpostTileset",
-  "SolNode10": "CorpusGasCityTileset",
-  "SolNode100": "CorpusGasCityTileset",
-  "SolNode101": "CorpusOutpostTileset",
-  "SolNode102": "CorpusShipTileset",
-  "SolNode103": "GrineerAsteroidTileset",
-  "SolNode104": "CorpusShipTileset",
-  "SolNode105": "GrineerOceanTilesetAnywhere",
-  "SolNode106": "GrineerSettlementTileset",
-  "SolNode107": "CorpusOutpostTileset",
-  "SolNode108": "GrineerAsteroidTileset",
-  "SolNode109": "CorpusOutpostTileset",
-  "SolNode11": "GrineerSettlementTileset",
-  "SolNode113": "GrineerSettlementTileset",
-  "SolNode118": "CorpusShipTileset",
-  "SolNode119": "GrineerAsteroidTileset",
-  "SolNode12": "GrineerAsteroidTileset",
-  "SolNode121": "CorpusGasCityTileset",
-  "SolNode122": "GrineerOceanTileset",
-  "SolNode123": "CorpusShipTileset",
-  "SolNode125": "CorpusGasCityTileset",
-  "SolNode126": "CorpusGasCityTileset",
-  "SolNode127": "CorpusShipTileset",
-  "SolNode128": "CorpusOutpostTileset",
-  "SolNode130": "GrineerAsteroidTileset",
-  "SolNode131": "GrineerShipyardsTileset",
-  "SolNode132": "GrineerShipyardsTileset",
-  "SolNode135": "GrineerGalleonTileset",
-  "SolNode137": "GrineerShipyardsTileset",
-  "SolNode138": "GrineerShipyardsTileset",
-  "SolNode139": "GrineerShipyardsTileset",
-  "SolNode14": "CorpusIcePlanetTilesetCaves",
-  "SolNode140": "GrineerShipyardsTileset",
-  "SolNode141": "GrineerShipyardsTileset",
-  "SolNode144": "GrineerShipyardsTileset",
-  "SolNode146": "GrineerAsteroidTileset",
-  "SolNode147": "GrineerShipyardsTileset",
-  "SolNode149": "GrineerShipyardsTileset",
-  "SolNode15": "GrineerGalleonTileset",
-  "SolNode16": "GrineerSettlementTileset",
-  "SolNode162": "InfestedCorpusShipTileset",
-  "SolNode164": "InfestedCorpusShipTileset",
-  "SolNode166": "InfestedCorpusShipTileset",
-  "SolNode17": "CorpusShipTileset",
-  "SolNode171": "InfestedCorpusShipTileset",
-  "SolNode172": "CorpusShipTileset",
-  "SolNode173": "InfestedCorpusShipTileset",
-  "SolNode175": "InfestedCorpusShipTileset",
-  "SolNode177": "GrineerGalleonTileset",
-  "SolNode18": "GrineerAsteroidTileset",
-  "SolNode181": "GrineerAsteroidTileset",
-  "SolNode184": "GrineerGalleonTileset",
-  "SolNode185": "GrineerGalleonTileset",
-  "SolNode187": "GrineerAsteroidTileset",
-  "SolNode188": "GrineerGalleonTileset",
-  "SolNode189": "GrineerGalleonTileset",
-  "SolNode19": "GrineerAsteroidTileset",
-  "SolNode191": "GrineerShipyardsTileset",
-  "SolNode193": "GrineerAsteroidTileset",
-  "SolNode195": "GrineerGalleonTileset",
-  "SolNode196": "GrineerGalleonTileset",
-  "SolNode2": "CorpusOutpostTileset",
-  "SolNode20": "GrineerGalleonTileset",
-  "SolNode203": "CorpusIcePlanetTileset",
-  "SolNode205": "CorpusIcePlanetTileset",
-  "SolNode209": "CorpusIcePlanetTileset",
-  "SolNode21": "CorpusOutpostTileset",
-  "SolNode210": "CorpusIcePlanetTileset",
-  "SolNode211": "CorpusIcePlanetTileset",
-  "SolNode212": "CorpusIcePlanetTileset",
-  "SolNode214": "CorpusIcePlanetTileset",
-  "SolNode215": "CorpusShipTileset",
-  "SolNode216": "CorpusIcePlanetTileset",
-  "SolNode217": "CorpusIcePlanetTileset",
-  "SolNode22": "CorpusOutpostTileset",
-  "SolNode220": "CorpusIcePlanetTileset",
-  "SolNode223": "GrineerAsteroidTileset",
-  "SolNode224": "GrineerGalleonTileset",
-  "SolNode225": "GrineerGalleonTileset",
-  "SolNode226": "GrineerGalleonTileset",
-  "SolNode228": "EidolonTileset",
-  "SolNode23": "CorpusShipTileset",
-  "SolNode24": "GrineerForestTileset",
-  "SolNode25": "CorpusGasCityTileset",
-  "SolNode26": "GrineerForestTileset",
-  "SolNode30": "GrineerSettlementTileset",
-  "SolNode300": "OrokinMoonTilesetGrineer",
-  "SolNode301": "OrokinMoonTilesetGrineer",
-  "SolNode302": "OrokinMoonTilesetCorpus",
-  "SolNode304": "OrokinMoonTilesetCorpus",
-  "SolNode305": "OrokinMoonTilesetGrineer",
-  "SolNode306": "OrokinMoonTilesetCorpus",
-  "SolNode307": "OrokinMoonTilesetCorpus",
-  "SolNode308": "OrokinMoonTilesetCorpus",
-  "SolNode31": "GrineerGalleonTileset",
-  "SolNode32": "GrineerGalleonTileset",
-  "SolNode36": "GrineerSettlementTileset",
-  "SolNode38": "CorpusOutpostTileset",
-  "SolNode39": "GrineerForestTileset",
-  "SolNode4": "CorpusShipTileset",
-  "SolNode400": "OrokinVoidTileset",
-  "SolNode401": "OrokinVoidTileset",
-  "SolNode402": "OrokinVoidTileset",
-  "SolNode403": "OrokinVoidTileset",
-  "SolNode404": "OrokinVoidTileset",
-  "SolNode405": "OrokinVoidTileset",
-  "SolNode406": "OrokinVoidTileset",
-  "SolNode407": "OrokinVoidTileset",
-  "SolNode408": "OrokinVoidTileset",
-  "SolNode409": "OrokinVoidTileset",
-  "SolNode41": "GrineerSettlementTileset",
-  "SolNode410": "OrokinVoidTileset",
-  "SolNode412": "OrokinVoidTileset",
-  "SolNode42": "GrineerGalleonTileset",
-  "SolNode43": "CorpusOutpostTileset",
-  "SolNode45": "GrineerSettlementTileset",
-  "SolNode46": "GrineerSettlementTileset",
-  "SolNode48": "CorpusOutpostTileset",
-  "SolNode49": "CorpusShipTileset",
-  "SolNode50": "GrineerAsteroidTileset",
-  "SolNode51": "CorpusOutpostTileset",
-  "SolNode53": "CorpusGasCityTileset",
-  "SolNode56": "CorpusShipTileset",
-  "SolNode57": "CorpusOutpostTileset",
-  "SolNode58": "GrineerSettlementTileset",
-  "SolNode59": "GrineerForestTileset",
-  "SolNode6": "CorpusOutpostTileset",
-  "SolNode61": "CorpusShipTileset",
-  "SolNode62": "CorpusIcePlanetTilesetCaves",
-  "SolNode64": "GrineerOceanTileset",
-  "SolNode66": "CorpusOutpostTileset",
-  "SolNode67": "GrineerAsteroidTileset",
-  "SolNode68": "GrineerGalleonTileset",
-  "SolNode70": "GrineerGalleonTileset",
-  "SolNode706": "OrokinDerelictTileset",
-  "SolNode707": "OrokinDerelictTileset",
-  "SolNode708": "OrokinDerelictTileset",
-  "SolNode709": "OrokinDerelictTileset",
-  "SolNode710": "OrokinDerelictTileset",
-  "SolNode711": "OrokinDerelictTileset",
-  "SolNode712": "OrokinDerelictTileset",
-  "SolNode713": "OrokinDerelictTileset",
-  "SolNode72": "CorpusOutpostTileset",
-  "SolNode73": "CorpusGasCityTileset",
-  "SolNode74": "CorpusGasCityTileset",
-  "SolNode741": "GrineerFortressTileset",
-  "SolNode742": "GrineerFortressTileset",
-  "SolNode743": "GrineerFortressTileset",
-  "SolNode744": "GrineerFortressTileset",
-  "SolNode745": "GrineerFortressTileset",
-  "SolNode746": "GrineerFortressTileset",
-  "SolNode747": "GrineerFortressTileset",
-  "SolNode748": "GrineerFortressTileset",
-  "SolNode75": "GrineerForestTileset",
-  "SolNode76": "CorpusShipTileset",
-  "SolNode78": "CorpusShipTileset",
-  "SolNode79": "GrineerForestTileset",
-  "SolNode81": "CorpusShipTileset",
-  "SolNode82": "GrineerGalleonTileset",
-  "SolNode84": "CorpusIcePlanetTilesetCaves",
-  "SolNode88": "CorpusShipTileset",
-  "SolNode93": "GrineerAsteroidTileset",
-  "SolNode96": "GrineerGalleonTileset",
-  "SolNode97": "CorpusGasCityTileset",
-  "SolNode99": "GrineerSettlementTileset"
-}

static/fixed_responses/worldState/syndicateMissions.json

@@ -1,157 +0,0 @@
-[
-  "SettlementNode1",
-  "SettlementNode11",
-  "SettlementNode12",
-  "SettlementNode14",
-  "SettlementNode15",
-  "SettlementNode2",
-  "SettlementNode3",
-  "SolNode1",
-  "SolNode10",
-  "SolNode100",
-  "SolNode101",
-  "SolNode102",
-  "SolNode103",
-  "SolNode106",
-  "SolNode107",
-  "SolNode109",
-  "SolNode11",
-  "SolNode113",
-  "SolNode118",
-  "SolNode119",
-  "SolNode12",
-  "SolNode121",
-  "SolNode122",
-  "SolNode123",
-  "SolNode125",
-  "SolNode126",
-  "SolNode128",
-  "SolNode130",
-  "SolNode131",
-  "SolNode132",
-  "SolNode135",
-  "SolNode137",
-  "SolNode138",
-  "SolNode139",
-  "SolNode14",
-  "SolNode140",
-  "SolNode141",
-  "SolNode146",
-  "SolNode147",
-  "SolNode149",
-  "SolNode15",
-  "SolNode153",
-  "SolNode16",
-  "SolNode162",
-  "SolNode164",
-  "SolNode166",
-  "SolNode167",
-  "SolNode17",
-  "SolNode171",
-  "SolNode172",
-  "SolNode173",
-  "SolNode175",
-  "SolNode177",
-  "SolNode18",
-  "SolNode181",
-  "SolNode184",
-  "SolNode185",
-  "SolNode187",
-  "SolNode188",
-  "SolNode189",
-  "SolNode19",
-  "SolNode191",
-  "SolNode195",
-  "SolNode196",
-  "SolNode2",
-  "SolNode20",
-  "SolNode203",
-  "SolNode204",
-  "SolNode205",
-  "SolNode209",
-  "SolNode21",
-  "SolNode211",
-  "SolNode212",
-  "SolNode214",
-  "SolNode215",
-  "SolNode216",
-  "SolNode217",
-  "SolNode22",
-  "SolNode220",
-  "SolNode223",
-  "SolNode224",
-  "SolNode225",
-  "SolNode226",
-  "SolNode23",
-  "SolNode25",
-  "SolNode26",
-  "SolNode27",
-  "SolNode30",
-  "SolNode31",
-  "SolNode36",
-  "SolNode38",
-  "SolNode39",
-  "SolNode4",
-  "SolNode400",
-  "SolNode401",
-  "SolNode402",
-  "SolNode403",
-  "SolNode404",
-  "SolNode405",
-  "SolNode406",
-  "SolNode407",
-  "SolNode408",
-  "SolNode409",
-  "SolNode41",
-  "SolNode410",
-  "SolNode412",
-  "SolNode42",
-  "SolNode43",
-  "SolNode45",
-  "SolNode46",
-  "SolNode48",
-  "SolNode49",
-  "SolNode50",
-  "SolNode56",
-  "SolNode57",
-  "SolNode58",
-  "SolNode59",
-  "SolNode6",
-  "SolNode61",
-  "SolNode62",
-  "SolNode63",
-  "SolNode64",
-  "SolNode66",
-  "SolNode67",
-  "SolNode68",
-  "SolNode70",
-  "SolNode706",
-  "SolNode707",
-  "SolNode708",
-  "SolNode709",
-  "SolNode710",
-  "SolNode711",
-  "SolNode72",
-  "SolNode73",
-  "SolNode74",
-  "SolNode741",
-  "SolNode742",
-  "SolNode743",
-  "SolNode744",
-  "SolNode745",
-  "SolNode746",
-  "SolNode748",
-  "SolNode75",
-  "SolNode76",
-  "SolNode78",
-  "SolNode79",
-  "SolNode81",
-  "SolNode82",
-  "SolNode84",
-  "SolNode85",
-  "SolNode88",
-  "SolNode89",
-  "SolNode93",
-  "SolNode96",
-  "SolNode97"
-]

static/webui/index.html

@@ -401,22 +401,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="row g-3">
-                    <div class="col-lg-6">
-                        <div class="card mb-3" style="height: 400px;">
-                            <h5 class="card-header" data-loc="inventory_evolutionProgress"></h5>
-                            <div class="card-body overflow-auto">
-                                <form class="input-group mb-3" onsubmit="doAcquireEvolution();return false;">
-                                    <input class="form-control" id="acquire-type-EvolutionProgress" list="datalist-EvolutionProgress" />
-                                    <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
-                                </form>
-                                <table class="table table-hover w-100">
-                                    <tbody id="EvolutionProgress-list"></tbody>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-                </div>
                 <div class="card mb-3">
                     <h5 class="card-header" data-loc="general_bulkActions"></h5>
                     <div class="card-body">
@@ -427,7 +411,6 @@
                             <button class="btn btn-primary" onclick="addMissingEquipment(['SpaceGuns', 'SpaceMelee']);" data-loc="inventory_bulkAddSpaceWeapons"></button>
                             <button class="btn btn-primary" onclick="addMissingEquipment(['Sentinels']);" data-loc="inventory_bulkAddSentinels"></button>
                             <button class="btn btn-primary" onclick="addMissingEquipment(['SentinelWeapons']);" data-loc="inventory_bulkAddSentinelWeapons"></button>
-                            <button class="btn btn-primary" onclick="addMissingEvolutionProgress();" data-loc="inventory_bulkAddEvolutionProgress"></button>
                         </div>
                         <div class="mb-2 d-flex flex-wrap gap-2">
                             <button class="btn btn-success" onclick="maxRankAllEquipment(['Suits']);" data-loc="inventory_bulkRankUpSuits"></button>
@@ -436,7 +419,6 @@
                             <button class="btn btn-success" onclick="maxRankAllEquipment(['SpaceGuns', 'SpaceMelee']);" data-loc="inventory_bulkRankUpSpaceWeapons"></button>
                             <button class="btn btn-success" onclick="maxRankAllEquipment(['Sentinels']);" data-loc="inventory_bulkRankUpSentinels"></button>
                             <button class="btn btn-success" onclick="maxRankAllEquipment(['SentinelWeapons']);" data-loc="inventory_bulkRankUpSentinelWeapons"></button>
-                            <button class="btn btn-success" onclick="maxRankAllEvolutions();" data-loc="inventory_bulkRankUpEvolutionProgress"></button>
                         </div>
                     </div>
                 </div>
@@ -510,9 +492,8 @@
                         <div class="card mb-3">
                             <h5 class="card-header" data-loc="general_bulkActions"></h5>
                             <div class="card-body d-flex flex-wrap gap-2">
-                                <button class="btn btn-primary" onclick="doAddAllMods();" data-loc="mods_addMissingUnrankedMods"></button>
+                                <button class="btn btn-primary" onclick="doAddAllMods();" data-loc="mods_bulkAddMods"></button>
                                 <button class="btn btn-danger" onclick="doRemoveUnrankedMods();" data-loc="mods_removeUnranked"></button>
-                                <button class="btn btn-primary" onclick="doAddMissingMaxRankMods();" data-loc="mods_addMissingMaxRankMods"></button>
                             </div>
                         </div>
                     </div>
@@ -594,10 +575,6 @@
                                         <input class="form-check-input" type="checkbox" id="infiniteHelminthMaterials" />
                                         <label class="form-check-label" for="infiniteHelminthMaterials" data-loc="cheats_infiniteHelminthMaterials"></label>
                                     </div>
-                                    <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" id="dontSubtractConsumables" />
-                                        <label class="form-check-label" for="dontSubtractConsumables" data-loc="cheats_dontSubtractConsumables"></label>
-                                    </div>
                                     <div class="form-check">
                                         <input class="form-check-input" type="checkbox" id="unlockAllShipFeatures" />
                                         <label class="form-check-label" for="unlockAllShipFeatures" data-loc="cheats_unlockAllShipFeatures"></label>
@@ -674,10 +651,6 @@
                                         <input class="form-check-input" type="checkbox" id="noResourceExtractorDronesDamage" />
                                         <label class="form-check-label" for="noResourceExtractorDronesDamage" data-loc="cheats_noResourceExtractorDronesDamage"></label>
                                     </div>
-                                    <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" id="skipClanKeyCrafting" />
-                                        <label class="form-check-label" for="skipClanKeyCrafting" data-loc="cheats_skipClanKeyCrafting"></label>
-                                    </div>
                                     <div class="form-check">
                                         <input class="form-check-input" type="checkbox" id="noDojoRoomBuildStage" />
                                         <label class="form-check-label" for="noDojoRoomBuildStage" data-loc="cheats_noDojoRoomBuildStage"></label>
@@ -760,7 +733,6 @@
     </datalist>
     <datalist id="datalist-archonCrystalUpgrades"></datalist>
     <datalist id="datalist-OperatorAmps"></datalist>
-    <datalist id="datalist-EvolutionProgress"></datalist>
     <datalist id="datalist-ModularParts"></datalist>
     <datalist id="datalist-ModularParts-HB_DECK"></datalist>
     <datalist id="datalist-ModularParts-HB_ENGINE"></datalist>

static/webui/script.js

@@ -13,7 +13,6 @@ function doLogin() {
 }
 
 function loginFromLocalStorage() {
-    const isRegister = registerSubmit;
     doLoginRequest(
         data => {
             if (single.getCurrentPath() == "/webui/") {
@@ -29,7 +28,7 @@ function loginFromLocalStorage() {
         },
         () => {
             logout();
-            alert(isRegister ? "Registration failed. Account already exists?" : "Login failed");
+            alert("Login failed");
         }
     );
 }
@@ -45,7 +44,7 @@ function doLoginRequest(succ_cb, fail_cb) {
             s: "W0RFXVN0ZXZlIGxpa2VzIGJpZyBidXR0cw==", // signature of some kind
             lang: "en",
             date: 1501230947855458660, // ???
-            ClientType: registerSubmit ? "webui-register" : "webui",
+            ClientType: registerSubmit ? "" : "webui",
             PS: "W0RFXVN0ZXZlIGxpa2VzIGJpZyBidXR0cw==" // anti-cheat data
         })
     });
@@ -78,22 +77,18 @@ function logout() {
 function renameAccount() {
     const newname = window.prompt(loc("code_changeNameConfirm"));
     if (newname) {
-        revalidateAuthz(() => {
-            fetch("/custom/renameAccount?" + window.authz + "&newname=" + newname).then(() => {
-                $(".displayname").text(newname);
-                updateLocElements();
-            });
+        fetch("/custom/renameAccount?" + window.authz + "&newname=" + newname).then(() => {
+            $(".displayname").text(newname);
+            updateLocElements();
         });
     }
 }
 
 function deleteAccount() {
     if (window.confirm(loc("code_deleteAccountConfirm"))) {
-        revalidateAuthz(() => {
-            fetch("/custom/deleteAccount?" + window.authz).then(() => {
-                logout();
-                single.loadRoute("/webui/"); // Show login screen
-            });
+        fetch("/custom/deleteAccount?" + window.authz).then(() => {
+            logout();
+            single.loadRoute("/webui/"); // Show login screen
         });
     }
 }
@@ -187,16 +182,6 @@ const webUiModularWeapons = [
     "/Lotus/Types/Friendly/Pets/CreaturePets/MedjayPredatorKubrowPetPowerSuit"
 ];
 
-const permanentEvolutionWeapons = new Set([
-    "/Lotus/Weapons/Tenno/Zariman/LongGuns/PumpShotgun/ZarimanPumpShotgun",
-    "/Lotus/Weapons/Tenno/Zariman/LongGuns/SemiAutoRifle/ZarimanSemiAutoRifle",
-    "/Lotus/Weapons/Tenno/Zariman/Melee/Dagger/ZarimanDaggerWeapon",
-    "/Lotus/Weapons/Tenno/Zariman/Melee/Tonfas/ZarimanTonfaWeapon",
-    "/Lotus/Weapons/Tenno/Zariman/Pistols/HeavyPistol/ZarimanHeavyPistol",
-    "/Lotus/Weapons/Thanotech/EntFistIncarnon/EntFistIncarnon",
-    "/Lotus/Weapons/Thanotech/EntratiWristGun/EntratiWristGunWeapon"
-]);
-
 let uniqueLevelCaps = {};
 function fetchItemList() {
     window.itemListPromise = new Promise(resolve => {
@@ -375,7 +360,6 @@ function fetchItemList() {
 }
 fetchItemList();
 
-// Assumes that caller revalidates authz
 function updateInventory() {
     const req = $.get("/api/inventory.php?" + window.authz + "&xpBasedLevelCapDisabled=1");
     req.done(data => {
@@ -488,27 +472,25 @@ function updateInventory() {
                             a.href = "#";
                             a.onclick = function (event) {
                                 event.preventDefault();
-                                revalidateAuthz(() => {
-                                    if (item.XP < maxXP) {
-                                        addGearExp(category, item.ItemId.$oid, maxXP - item.XP);
-                                    }
-                                    if ("exalted" in itemMap[item.ItemType]) {
-                                        for (const exaltedType of itemMap[item.ItemType].exalted) {
-                                            const exaltedItem = data.SpecialItems.find(x => x.ItemType == exaltedType);
-                                            if (exaltedItem) {
-                                                const exaltedCap =
-                                                    itemMap[exaltedType]?.type == "weapons" ? 800_000 : 1_600_000;
-                                                if (exaltedItem.XP < exaltedCap) {
-                                                    addGearExp(
-                                                        "SpecialItems",
-                                                        exaltedItem.ItemId.$oid,
-                                                        exaltedCap - exaltedItem.XP
-                                                    );
-                                                }
+                                if (item.XP < maxXP) {
+                                    addGearExp(category, item.ItemId.$oid, maxXP - item.XP);
+                                }
+                                if ("exalted" in itemMap[item.ItemType]) {
+                                    for (const exaltedType of itemMap[item.ItemType].exalted) {
+                                        const exaltedItem = data.SpecialItems.find(x => x.ItemType == exaltedType);
+                                        if (exaltedItem) {
+                                            const exaltedCap =
+                                                itemMap[exaltedType]?.type == "weapons" ? 800_000 : 1_600_000;
+                                            if (exaltedItem.XP < exaltedCap) {
+                                                addGearExp(
+                                                    "SpecialItems",
+                                                    exaltedItem.ItemId.$oid,
+                                                    exaltedCap - exaltedItem.XP
+                                                );
                                             }
                                         }
                                     }
-                                });
+                                }
                             };
                             a.title = loc("code_maxRank");
                             a.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M214.6 41.4c-12.5-12.5-32.8-12.5-45.3 0l-160 160c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0L160 141.2V448c0 17.7 14.3 32 32 32s32-14.3 32-32V141.2L329.4 246.6c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3l-160-160z"/></svg>`;
@@ -580,82 +562,6 @@ function updateInventory() {
                 });
             });
 
-            document.getElementById("EvolutionProgress-list").innerHTML = "";
-            data.EvolutionProgress?.forEach(item => {
-                const datalist = document.getElementById("datalist-EvolutionProgress");
-                const optionToRemove = datalist.querySelector(`option[data-key="${item.ItemType}"]`);
-                if (optionToRemove) {
-                    datalist.removeChild(optionToRemove);
-                }
-                const tr = document.createElement("tr");
-                tr.setAttribute("data-item-type", item.ItemType);
-                {
-                    const td = document.createElement("td");
-                    td.textContent = itemMap[item.ItemType]?.name ?? item.ItemType;
-                    if (item.Rank != null) {
-                        td.textContent += " | " + loc("code_rank") + ": [" + item.Rank + "/5]";
-                    }
-                    tr.appendChild(td);
-                }
-                {
-                    const td = document.createElement("td");
-                    td.classList = "text-end text-nowrap";
-                    if (item.Rank < 5) {
-                        const a = document.createElement("a");
-                        a.href = "#";
-                        a.onclick = function (event) {
-                            event.preventDefault();
-                            setEvolutionProgress([{ ItemType: item.ItemType, Rank: 5 }]);
-                        };
-                        a.title = loc("code_maxRank");
-                        a.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M214.6 41.4c-12.5-12.5-32.8-12.5-45.3 0l-160 160c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0L160 141.2V448c0 17.7 14.3 32 32 32s32-14.3 32-32V141.2L329.4 246.6c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3l-160-160z"/></svg>`;
-
-                        td.appendChild(a);
-                    }
-                    if ((permanentEvolutionWeapons.has(item.ItemType) && item.Rank > 0) || item.Rank > 1) {
-                        const a = document.createElement("a");
-                        a.href = "#";
-                        a.onclick = function (event) {
-                            event.preventDefault();
-                            setEvolutionProgress([{ ItemType: item.ItemType, Rank: item.Rank - 1 }]);
-                        };
-                        a.title = loc("code_rankDown");
-                        a.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M233.4 406.6c12.5 12.5 32.8 12.5 45.3 0l192-192c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L256 338.7 86.6 169.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l192 192z"/></svg>`;
-
-                        td.appendChild(a);
-                    }
-                    if (item.Rank < 5) {
-                        const a = document.createElement("a");
-                        a.href = "#";
-                        a.onclick = function (event) {
-                            event.preventDefault();
-                            setEvolutionProgress([{ ItemType: item.ItemType, Rank: item.Rank + 1 }]);
-                        };
-                        a.title = loc("code_rankUp");
-                        a.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M233.4 105.4c12.5-12.5 32.8-12.5 45.3 0l192 192c12.5 12.5 12.5 32.8 0 45.3s-32.8 12.5-45.3 0L256 173.3 86.6 342.6c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3l192-192z"/></svg>`;
-
-                        td.appendChild(a);
-                    }
-
-                    tr.appendChild(td);
-                }
-
-                document.getElementById("EvolutionProgress-list").appendChild(tr);
-            });
-
-            const datalistEvolutionProgress = document.querySelectorAll("#datalist-EvolutionProgress option");
-            const formEvolutionProgress = document.querySelector('form[onsubmit*="doAcquireEvolution()"]');
-            const giveAllQEvolutionProgress = document.querySelector(
-                'button[onclick*="addMissingEvolutionProgress()"]'
-            );
-
-            if (datalistEvolutionProgress.length === 0) {
-                formEvolutionProgress.classList.add("disabled");
-                formEvolutionProgress.querySelector("input").disabled = true;
-                formEvolutionProgress.querySelector("button").disabled = true;
-                giveAllQEvolutionProgress.disabled = true;
-            }
-
             // Populate quests route
             document.getElementById("QuestKeys-list").innerHTML = "";
             data.QuestKeys.forEach(item => {
@@ -767,18 +673,18 @@ function updateInventory() {
             });
 
             const datalistQuestKeys = document.querySelectorAll("#datalist-QuestKeys option");
-            const formQuestKeys = document.querySelector("form[onsubmit*=\"doAcquireEquipment('QuestKeys')\"]");
+            const form = document.querySelector("form[onsubmit*=\"doAcquireEquipment('QuestKeys')\"]");
             const giveAllQuestButton = document.querySelector("button[onclick*=\"doBulkQuestUpdate('giveAll')\"]");
 
             if (datalistQuestKeys.length === 0) {
-                formQuestKeys.classList.add("disabled");
-                formQuestKeys.querySelector("input").disabled = true;
-                formQuestKeys.querySelector("button").disabled = true;
+                form.classList.add("disabled");
+                form.querySelector("input").disabled = true;
+                form.querySelector("button").disabled = true;
                 giveAllQuestButton.disabled = true;
             } else {
-                formQuestKeys.classList.remove("disabled");
-                formQuestKeys.querySelector("input").disabled = false;
-                formQuestKeys.querySelector("button").disabled = false;
+                form.classList.remove("disabled");
+                form.querySelector("input").disabled = false;
+                form.querySelector("button").disabled = false;
                 giveAllQuestButton.disabled = false;
             }
 
@@ -1173,16 +1079,6 @@ function doAcquireModularEquipment(category, WeaponType) {
     }
 }
 
-function doAcquireEvolution() {
-    const uniqueName = getKey(document.getElementById("acquire-type-EvolutionProgress"));
-    if (!uniqueName) {
-        $("#acquire-type-EvolutionProgress").addClass("is-invalid").focus();
-        return;
-    }
-
-    setEvolutionProgress([{ ItemType: uniqueName, Rank: permanentEvolutionWeapons.has(uniqueName) ? 0 : 1 }]);
-}
-
 $("input[list]").on("input", function () {
     $(this).removeClass("is-invalid");
 });
@@ -1220,34 +1116,54 @@ function addMissingEquipment(categories) {
     }
 }
 
-function addMissingEvolutionProgress() {
-    const requests = [];
-    document.querySelectorAll("#datalist-EvolutionProgress option").forEach(elm => {
-        const uniqueName = elm.getAttribute("data-key");
-        requests.push({ ItemType: uniqueName, Rank: permanentEvolutionWeapons.has(uniqueName) ? 0 : 1 });
-    });
-    if (requests.length != 0 && window.confirm(loc("code_addItemsConfirm").split("|COUNT|").join(requests.length))) {
-        setEvolutionProgress(requests);
-    }
-}
+function maxRankAllEquipment(categories) {
+    const req = $.get("/api/inventory.php?" + window.authz + "&xpBasedLevelCapDisabled=1");
 
-function maxRankAllEvolutions() {
-    revalidateAuthz(() => {
-        const req = $.get("/api/inventory.php?" + window.authz + "&xpBasedLevelCapDisabled=1");
-        req.done(data => {
-            const requests = [];
+    req.done(data => {
+        window.itemListPromise.then(itemMap => {
+            const batchData = {};
 
-            data.EvolutionProgress.forEach(item => {
-                if (item.Rank < 5) {
-                    requests.push({
-                        ItemType: item.ItemType,
-                        Rank: 5
-                    });
-                }
+            categories.forEach(category => {
+                data[category].forEach(item => {
+                    const maxXP =
+                        category === "Suits" ||
+                        category === "SpaceSuits" ||
+                        category === "Sentinels" ||
+                        category === "Hoverboards"
+                            ? 1_600_000
+                            : 800_000;
+
+                    if (item.XP < maxXP) {
+                        if (!batchData[category]) {
+                            batchData[category] = [];
+                        }
+                        batchData[category].push({
+                            ItemId: { $oid: item.ItemId.$oid },
+                            XP: maxXP
+                        });
+                    }
+                    if (category === "Suits") {
+                        if ("exalted" in itemMap[item.ItemType]) {
+                            for (const exaltedType of itemMap[item.ItemType].exalted) {
+                                const exaltedItem = data["SpecialItems"].find(x => x.ItemType == exaltedType);
+                                if (exaltedItem) {
+                                    const exaltedCap = itemMap[exaltedType]?.type == "weapons" ? 800_000 : 1_600_000;
+                                    if (exaltedItem.XP < exaltedCap) {
+                                        batchData["SpecialItems"] ??= [];
+                                        batchData["SpecialItems"].push({
+                                            ItemId: { $oid: exaltedItem.ItemId.$oid },
+                                            XP: exaltedCap
+                                        });
+                                    }
+                                }
+                            }
+                        }
+                    }
+                });
             });
 
-            if (Object.keys(requests).length > 0) {
-                return setEvolutionProgress(requests);
+            if (Object.keys(batchData).length > 0) {
+                return sendBatchGearExp(batchData);
             }
 
             toast(loc("code_noEquipmentToRankUp"));
@@ -1255,64 +1171,6 @@ function maxRankAllEvolutions() {
     });
 }
 
-function maxRankAllEquipment(categories) {
-    revalidateAuthz(() => {
-        const req = $.get("/api/inventory.php?" + window.authz + "&xpBasedLevelCapDisabled=1");
-        req.done(data => {
-            window.itemListPromise.then(itemMap => {
-                const batchData = {};
-
-                categories.forEach(category => {
-                    data[category].forEach(item => {
-                        const maxXP =
-                            category === "Suits" ||
-                            category === "SpaceSuits" ||
-                            category === "Sentinels" ||
-                            category === "Hoverboards"
-                                ? 1_600_000
-                                : 800_000;
-
-                        if (item.XP < maxXP) {
-                            if (!batchData[category]) {
-                                batchData[category] = [];
-                            }
-                            batchData[category].push({
-                                ItemId: { $oid: item.ItemId.$oid },
-                                XP: maxXP
-                            });
-                        }
-                        if (category === "Suits") {
-                            if ("exalted" in itemMap[item.ItemType]) {
-                                for (const exaltedType of itemMap[item.ItemType].exalted) {
-                                    const exaltedItem = data["SpecialItems"].find(x => x.ItemType == exaltedType);
-                                    if (exaltedItem) {
-                                        const exaltedCap =
-                                            itemMap[exaltedType]?.type == "weapons" ? 800_000 : 1_600_000;
-                                        if (exaltedItem.XP < exaltedCap) {
-                                            batchData["SpecialItems"] ??= [];
-                                            batchData["SpecialItems"].push({
-                                                ItemId: { $oid: exaltedItem.ItemId.$oid },
-                                                XP: exaltedCap
-                                            });
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    });
-                });
-
-                if (Object.keys(batchData).length > 0) {
-                    return sendBatchGearExp(batchData);
-                }
-
-                toast(loc("code_noEquipmentToRankUp"));
-            });
-        });
-    });
-}
-
-// Assumes that caller revalidates authz
 function addGearExp(category, oid, xp) {
     const data = {};
     data[category] = [
@@ -1321,14 +1179,16 @@ function addGearExp(category, oid, xp) {
             XP: xp
         }
     ];
-    $.post({
-        url: "/custom/addXp?" + window.authz,
-        contentType: "application/json",
-        data: JSON.stringify(data)
-    }).done(function () {
-        if (category != "SpecialItems") {
-            updateInventory();
-        }
+    revalidateAuthz(() => {
+        $.post({
+            url: "/custom/addXp?" + window.authz,
+            contentType: "application/json",
+            data: JSON.stringify(data)
+        }).done(function () {
+            if (category != "SpecialItems") {
+                updateInventory();
+            }
+        });
     });
 }
 
@@ -1443,19 +1303,6 @@ function maturePet(oid, revert) {
     });
 }
 
-function setEvolutionProgress(requests) {
-    revalidateAuthz(() => {
-        const req = $.post({
-            url: "/custom/setEvolutionProgress?" + window.authz,
-            contentType: "application/json",
-            data: JSON.stringify(requests)
-        });
-        req.done(() => {
-            updateInventory();
-        });
-    });
-}
-
 function doAcquireMiscItems() {
     const uniqueName = getKey(document.getElementById("miscitem-type"));
     if (!uniqueName) {
@@ -1603,34 +1450,32 @@ function doAcquireMod() {
 const uiConfigs = [...$("#server-settings input[id]")].map(x => x.id);
 
 function doChangeSettings() {
-    revalidateAuthz(() => {
-        fetch("/custom/config?" + window.authz)
-            .then(response => response.json())
-            .then(json => {
-                for (const i of uiConfigs) {
-                    var x = document.getElementById(i);
-                    if (x != null) {
-                        if (x.type == "checkbox") {
-                            if (x.checked === true) {
-                                json[i] = true;
-                            } else {
-                                json[i] = false;
-                            }
-                        } else if (x.type == "number") {
-                            json[i] = parseInt(x.value);
+    fetch("/custom/config?" + window.authz)
+        .then(response => response.json())
+        .then(json => {
+            for (const i of uiConfigs) {
+                var x = document.getElementById(i);
+                if (x != null) {
+                    if (x.type == "checkbox") {
+                        if (x.checked === true) {
+                            json[i] = true;
+                        } else {
+                            json[i] = false;
                         }
+                    } else if (x.type == "number") {
+                        json[i] = parseInt(x.value);
                     }
                 }
-                $.post({
-                    url: "/custom/config?" + window.authz,
-                    contentType: "text/plain",
-                    data: JSON.stringify(json, null, 2)
-                }).then(() => {
-                    // A few cheats affect the inventory response which in turn may change what values we need to show
-                    updateInventory();
-                });
+            }
+            $.post({
+                url: "/custom/config?" + window.authz,
+                contentType: "text/plain",
+                data: JSON.stringify(json, null, 2)
+            }).then(() => {
+                // A few cheats affect the inventory response which in turn may change what values we need to show
+                updateInventory();
             });
-    });
+        });
 }
 
 // Cheats route
@@ -1802,14 +1647,6 @@ function doRemoveUnrankedMods() {
     });
 }
 
-function doAddMissingMaxRankMods() {
-    revalidateAuthz(() => {
-        fetch("/custom/addMissingMaxRankMods?" + window.authz).then(() => {
-            updateInventory();
-        });
-    });
-}
-
 // Powersuit Route
 
 single.getRoute("#powersuit-route").on("beforeload", function () {
@@ -1883,39 +1720,33 @@ function doChangeSupportedSyndicate() {
 }
 
 function doAddCurrency(currency) {
-    revalidateAuthz(() => {
-        $.post({
-            url: "/custom/addCurrency?" + window.authz,
-            contentType: "application/json",
-            data: JSON.stringify({
-                currency,
-                delta: document.getElementById(currency + "-delta").valueAsNumber
-            })
-        }).then(function () {
-            updateInventory();
-        });
+    $.post({
+        url: "/custom/addCurrency?" + window.authz,
+        contentType: "application/json",
+        data: JSON.stringify({
+            currency,
+            delta: document.getElementById(currency + "-delta").valueAsNumber
+        })
+    }).then(function () {
+        updateInventory();
     });
 }
 
 function doQuestUpdate(operation, itemType) {
-    revalidateAuthz(() => {
-        $.post({
-            url: "/custom/manageQuests?" + window.authz + "&operation=" + operation + "&itemType=" + itemType,
-            contentType: "application/json"
-        }).then(function () {
-            updateInventory();
-        });
+    $.post({
+        url: "/custom/manageQuests?" + window.authz + "&operation=" + operation + "&itemType=" + itemType,
+        contentType: "application/json"
+    }).then(function () {
+        updateInventory();
     });
 }
 
 function doBulkQuestUpdate(operation) {
-    revalidateAuthz(() => {
-        $.post({
-            url: "/custom/manageQuests?" + window.authz + "&operation=" + operation,
-            contentType: "application/json"
-        }).then(function () {
-            updateInventory();
-        });
+    $.post({
+        url: "/custom/manageQuests?" + window.authz + "&operation=" + operation,
+        contentType: "application/json"
+    }).then(function () {
+        updateInventory();
     });
 }
 

static/webui/translations/de.js

@@ -34,8 +34,6 @@ dict = {
     code_rerollsNumber: `Anzahl der Umrollversuche`,
     code_viewStats: `Statistiken anzeigen`,
     code_rank: `Rang`,
-    code_rankUp: `Rang erhöhen`,
-    code_rankDown: `Rang verringern`,
     code_count: `Anzahl`,
     code_focusAllUnlocked: `Alle Fokus-Schulen sind bereits freigeschaltet.`,
     code_focusUnlocked: `|COUNT| neue Fokus-Schulen freigeschaltet! Ein Inventar-Update wird benötigt, damit die Änderungen im Spiel sichtbar werden. Die Sternenkarte zu besuchen, sollte der einfachste Weg sein, dies auszulösen.`,
@@ -62,7 +60,7 @@ dict = {
     login_emailLabel: `E-Mail-Adresse`,
     login_passwordLabel: `Passwort`,
     login_loginButton: `Anmelden`,
-    login_registerButton: `Registrieren`,
+    login_registerButton: `[UNTRANSLATED] Register`,
     navbar_logout: `Abmelden`,
     navbar_renameAccount: `Account umbenennen`,
     navbar_deleteAccount: `Account löschen`,
@@ -84,23 +82,20 @@ dict = {
     inventory_sentinelWeapons: `Wächter-Waffen`,
     inventory_operatorAmps: `Verstärker`,
     inventory_hoverboards: `K-Drives`,
-    inventory_moaPets: `Moas`,
+    inventory_moaPets: `Moa`,
     inventory_kubrowPets: `Bestien`,
-    inventory_evolutionProgress: `Incarnon-Entwicklungsfortschritte`,
     inventory_bulkAddSuits: `Fehlende Warframes hinzufügen`,
     inventory_bulkAddWeapons: `Fehlende Waffen hinzufügen`,
     inventory_bulkAddSpaceSuits: `Fehlende Archwings hinzufügen`,
     inventory_bulkAddSpaceWeapons: `Fehlende Archwing-Waffen hinzufügen`,
     inventory_bulkAddSentinels: `Fehlende Wächter hinzufügen`,
     inventory_bulkAddSentinelWeapons: `Fehlende Wächter-Waffen hinzufügen`,
-    inventory_bulkAddEvolutionProgress: `Fehlende Incarnon-Entwicklungsfortschritte hinzufügen`,
     inventory_bulkRankUpSuits: `Alle Warframes auf Max. Rang`,
     inventory_bulkRankUpWeapons: `Alle Waffen auf Max. Rang`,
     inventory_bulkRankUpSpaceSuits: `Alle Archwings auf Max. Rang`,
     inventory_bulkRankUpSpaceWeapons: `Alle Archwing-Waffen auf Max. Rang`,
     inventory_bulkRankUpSentinels: `Alle Wächter auf Max. Rang`,
     inventory_bulkRankUpSentinelWeapons: `Alle Wächter-Waffen auf Max. Rang`,
-    inventory_bulkRankUpEvolutionProgress: `Alle Incarnon-Entwicklungsfortschritte auf Max. Rang`,
 
     quests_list: `Quests`,
     quests_completeAll: `Alle Quests abschließen`,
@@ -120,9 +115,8 @@ dict = {
     mods_fingerprintHelp: `Benötigst du Hilfe mit dem Fingerabdruck?`,
     mods_rivens: `Rivens`,
     mods_mods: `Mods`,
-    mods_addMissingUnrankedMods: `Fehlende Mods ohne Rang hinzufügen`,
-    mods_removeUnranked: `Mods ohne Rang entfernen`,
-    mods_addMissingMaxRankMods: `Fehlende Mods mit Max. Rang hinzufügen`,
+    mods_bulkAddMods: `Fehlende Mods hinzufügen`,
+    mods_removeUnranked: `[UNTRANSLATED] Remove Unranked Mods`,
     cheats_administratorRequirement: `Du musst Administrator sein, um diese Funktion nutzen zu können. Um Administrator zu werden, füge <code>|DISPLAYNAME|</code> zu <code>administratorNames</code> in der config.json hinzu.`,
     cheats_server: `Server`,
     cheats_skipTutorial: `Tutorial überspringen`,
@@ -134,7 +128,6 @@ dict = {
     cheats_infiniteEndo: `Unendlich Endo`,
     cheats_infiniteRegalAya: `Unendlich Reines Aya`,
     cheats_infiniteHelminthMaterials: `Unendlich Helminth-Materialien`,
-    cheats_dontSubtractConsumables: `Verbrauchsgegenstände (Ausrüstung) nicht verbrauchen`,
     cheats_unlockAllShipFeatures: `Alle Schiffs-Funktionen freischalten`,
     cheats_unlockAllShipDecorations: `Alle Schiffsdekorationen freischalten`,
     cheats_unlockAllFlavourItems: `Alle <abbr title=\"Animationssets, Glyphen, Farbpaletten usw.\">Sammlerstücke</abbr> freischalten`,
@@ -154,7 +147,6 @@ dict = {
     cheats_noKimCooldowns: `Keine Wartezeit bei KIM`,
     cheats_instantResourceExtractorDrones: `Sofortige Ressourcen-Extraktor-Drohnen`,
     cheats_noResourceExtractorDronesDamage: `Kein Schaden für Ressourcen-Extraktor-Drohnen`,
-    cheats_skipClanKeyCrafting: `Clan-Schlüsselherstellung überspringen`,
     cheats_noDojoRoomBuildStage: `Kein Dojo-Raum-Bauvorgang`,
     cheats_noDojoDecoBuildStage: `Kein Dojo-Deko-Bauvorgang`,
     cheats_fastDojoRoomDestruction: `Schnelle Dojo-Raum-Zerstörung`,

static/webui/translations/en.js

@@ -33,8 +33,6 @@ dict = {
     code_rerollsNumber: `Number of rerolls`,
     code_viewStats: `View Stats`,
     code_rank: `Rank`,
-    code_rankUp: `Rank up`,
-    code_rankDown: `Rank down`,
     code_count: `Count`,
     code_focusAllUnlocked: `All focus schools are already unlocked.`,
     code_focusUnlocked: `Unlocked |COUNT| new focus schools! An inventory update will be needed for the changes to be reflected in-game. Visiting the navigation should be the easiest way to trigger that.`,
@@ -83,23 +81,20 @@ dict = {
     inventory_sentinelWeapons: `Sentinel Weapons`,
     inventory_operatorAmps: `Amps`,
     inventory_hoverboards: `K-Drives`,
-    inventory_moaPets: `Moas`,
+    inventory_moaPets: `Moa`,
     inventory_kubrowPets: `Beasts`,
-    inventory_evolutionProgress: `Incarnon Evolution Progress`,
     inventory_bulkAddSuits: `Add Missing Warframes`,
     inventory_bulkAddWeapons: `Add Missing Weapons`,
     inventory_bulkAddSpaceSuits: `Add Missing Archwings`,
     inventory_bulkAddSpaceWeapons: `Add Missing Archwing Weapons`,
     inventory_bulkAddSentinels: `Add Missing Sentinels`,
     inventory_bulkAddSentinelWeapons: `Add Missing Sentinel Weapons`,
-    inventory_bulkAddEvolutionProgress: `Add Missing Incarnon Evolution Progress`,
     inventory_bulkRankUpSuits: `Max Rank All Warframes`,
     inventory_bulkRankUpWeapons: `Max Rank All Weapons`,
     inventory_bulkRankUpSpaceSuits: `Max Rank All Archwings`,
     inventory_bulkRankUpSpaceWeapons: `Max Rank All Archwing Weapons`,
     inventory_bulkRankUpSentinels: `Max Rank All Sentinels`,
     inventory_bulkRankUpSentinelWeapons: `Max Rank All Sentinel Weapons`,
-    inventory_bulkRankUpEvolutionProgress: `Max Rank All Incarnon Evolution Progress`,
 
     quests_list: `Quests`,
     quests_completeAll: `Complete All Quests`,
@@ -119,9 +114,8 @@ dict = {
     mods_fingerprintHelp: `Need help with the fingerprint?`,
     mods_rivens: `Rivens`,
     mods_mods: `Mods`,
-    mods_addMissingUnrankedMods: `Add Missing Unranked Mods`,
+    mods_bulkAddMods: `Add Missing Mods`,
     mods_removeUnranked: `Remove Unranked Mods`,
-    mods_addMissingMaxRankMods: `Add Missing Max Rank Mods`,
     cheats_administratorRequirement: `You must be an administrator to use this feature. To become an administrator, add <code>|DISPLAYNAME|</code> to <code>administratorNames</code> in the config.json.`,
     cheats_server: `Server`,
     cheats_skipTutorial: `Skip Tutorial`,
@@ -133,7 +127,6 @@ dict = {
     cheats_infiniteEndo: `Infinite Endo`,
     cheats_infiniteRegalAya: `Infinite Regal Aya`,
     cheats_infiniteHelminthMaterials: `Infinite Helminth Materials`,
-    cheats_dontSubtractConsumables: `Don't Subtract Consumables`,
     cheats_unlockAllShipFeatures: `Unlock All Ship Features`,
     cheats_unlockAllShipDecorations: `Unlock All Ship Decorations`,
     cheats_unlockAllFlavourItems: `Unlock All <abbr title=\"Animation Sets, Glyphs, Palettes, etc.\">Flavor Items</abbr>`,
@@ -153,7 +146,6 @@ dict = {
     cheats_noKimCooldowns: `No KIM Cooldowns`,
     cheats_instantResourceExtractorDrones: `Instant Resource Extractor Drones`,
     cheats_noResourceExtractorDronesDamage: `No Resource Extractor Drones Damage`,
-    cheats_skipClanKeyCrafting: `Skip Clan Key Crafting`,
     cheats_noDojoRoomBuildStage: `No Dojo Room Build Stage`,
     cheats_noDojoDecoBuildStage: `No Dojo Deco Build Stage`,
     cheats_fastDojoRoomDestruction: `Fast Dojo Room Destruction`,

static/webui/translations/es.js

@@ -34,8 +34,6 @@ dict = {
     code_rerollsNumber: `Cantidad de reintentos`,
     code_viewStats: `Ver estadísticas`,
     code_rank: `Rango`,
-    code_rankUp: `Subir de rango`,
-    code_rankDown: `Bajar de rango`,
     code_count: `Cantidad`,
     code_focusAllUnlocked: `Todas las escuelas de enfoque ya están desbloqueadas.`,
     code_focusUnlocked: `¡Desbloqueadas |COUNT| nuevas escuelas de enfoque! Se necesita una actualización del inventario para reflejar los cambios en el juego. Visitar la navegación debería ser la forma más sencilla de activarlo.`,
@@ -62,7 +60,7 @@ dict = {
     login_emailLabel: `Dirección de correo electrónico`,
     login_passwordLabel: `Contraseña`,
     login_loginButton: `Iniciar sesión`,
-    login_registerButton: `Registrarse`,
+    login_registerButton: `[UNTRANSLATED] Register`,
     navbar_logout: `Cerrar sesión`,
     navbar_renameAccount: `Renombrar cuenta`,
     navbar_deleteAccount: `Eliminar cuenta`,
@@ -84,23 +82,20 @@ dict = {
     inventory_sentinelWeapons: `Armas de centinela`,
     inventory_operatorAmps: `Amps`,
     inventory_hoverboards: `K-Drives`,
-    inventory_moaPets: `Moas`,
+    inventory_moaPets: `Moa`,
     inventory_kubrowPets: `Bestias`,
-    inventory_evolutionProgress: `Progreso de evolución Incarnon`,
     inventory_bulkAddSuits: `Agregar Warframes faltantes`,
     inventory_bulkAddWeapons: `Agregar armas faltantes`,
     inventory_bulkAddSpaceSuits: `Agregar Archwings faltantes`,
     inventory_bulkAddSpaceWeapons: `Agregar armas Archwing faltantes`,
     inventory_bulkAddSentinels: `Agregar centinelas faltantes`,
     inventory_bulkAddSentinelWeapons: `Agregar armas de centinela faltantes`,
-    inventory_bulkAddEvolutionProgress: `Completar el progreso de evolución Incarnon faltante`,
     inventory_bulkRankUpSuits: `Maximizar rango de todos los Warframes`,
     inventory_bulkRankUpWeapons: `Maximizar rango de todas las armas`,
     inventory_bulkRankUpSpaceSuits: `Maximizar rango de todos los Archwings`,
     inventory_bulkRankUpSpaceWeapons: `Maximizar rango de todas las armas Archwing`,
     inventory_bulkRankUpSentinels: `Maximizar rango de todos los centinelas`,
     inventory_bulkRankUpSentinelWeapons: `Maximizar rango de todas las armas de centinela`,
-    inventory_bulkRankUpEvolutionProgress: `Maximizar todo el progreso de evolución Incarnon`,
 
     quests_list: `Misiones`,
     quests_completeAll: `Completar todas las misiones`,
@@ -120,9 +115,8 @@ dict = {
     mods_fingerprintHelp: `¿Necesitas ayuda con la huella digital?`,
     mods_rivens: `Agrietados`,
     mods_mods: `Mods`,
-    mods_addMissingUnrankedMods: `Agregar mods sin rango faltantes`,
-    mods_removeUnranked: `Quitar mods sin rango`,
-    mods_addMissingMaxRankMods: `Agregar mods de rango máximo faltantes`,
+    mods_bulkAddMods: `Agregar mods faltantes`,
+    mods_removeUnranked: `[UNTRANSLATED] Remove Unranked Mods`,
     cheats_administratorRequirement: `Debes ser administrador para usar esta función. Para convertirte en administrador, agrega <code>|DISPLAYNAME|</code> a <code>administratorNames</code> en el archivo config.json.`,
     cheats_server: `Servidor`,
     cheats_skipTutorial: `Omitir tutorial`,
@@ -134,7 +128,6 @@ dict = {
     cheats_infiniteEndo: `Endo infinito`,
     cheats_infiniteRegalAya: `Aya Real infinita`,
     cheats_infiniteHelminthMaterials: `Materiales Helminto infinitos`,
-    cheats_dontSubtractConsumables: `No restar consumibles`,
     cheats_unlockAllShipFeatures: `Desbloquear todas las funciones de nave`,
     cheats_unlockAllShipDecorations: `Desbloquear todas las decoraciones de nave`,
     cheats_unlockAllFlavourItems: `Desbloquear todos los <abbr title="Conjuntos de animaciones, glifos, paletas, etc.">ítems estéticos</abbr>`,
@@ -154,7 +147,6 @@ dict = {
     cheats_noKimCooldowns: `Sin tiempo de espera para conversaciones KIM`,
     cheats_instantResourceExtractorDrones: `Drones de extracción de recursos instantáneos`,
     cheats_noResourceExtractorDronesDamage: `Sin daño a los drones extractores de recursos`,
-    cheats_skipClanKeyCrafting: `Saltar la fabricación de la llave de clan`,
     cheats_noDojoRoomBuildStage: `Sin etapa de construcción de sala del dojo`,
     cheats_noDojoDecoBuildStage: `Sin etapa de construcción de decoraciones del dojo`,
     cheats_fastDojoRoomDestruction: `Destrucción rápida de salas del dojo`,

static/webui/translations/fr.js

@@ -34,8 +34,6 @@ dict = {
     code_rerollsNumber: `Nombre de rerolls`,
     code_viewStats: `Voir les stats`,
     code_rank: `Rang`,
-    code_rankUp: `[UNTRANSLATED] Rank up`,
-    code_rankDown: `[UNTRANSLATED] Rank down`,
     code_count: `Quantité`,
     code_focusAllUnlocked: `Les écoles de Focus sont déjà déverrouillées.`,
     code_focusUnlocked: `|COUNT| écoles de Focus déverrouillées ! Synchronisation de l'inventaire nécessaire.`,
@@ -84,23 +82,20 @@ dict = {
     inventory_sentinelWeapons: `Armes de sentinelles`,
     inventory_operatorAmps: `Amplificateurs`,
     inventory_hoverboards: `K-Drives`,
-    inventory_moaPets: `Moas`,
+    inventory_moaPets: `Moa`,
     inventory_kubrowPets: `Bêtes`,
-    inventory_evolutionProgress: `[UNTRANSLATED] Incarnon Evolution Progress`,
     inventory_bulkAddSuits: `Ajouter les Warframes manquantes`,
     inventory_bulkAddWeapons: `Ajouter les armes manquantes`,
     inventory_bulkAddSpaceSuits: `Ajouter les Archwings manquants`,
     inventory_bulkAddSpaceWeapons: `Ajouter les armes d'Archwing manquantes`,
     inventory_bulkAddSentinels: `Ajouter les Sentinelles manquantes`,
     inventory_bulkAddSentinelWeapons: `Ajouter les armes de Sentinelles manquantes`,
-    inventory_bulkAddEvolutionProgress: `[UNTRANSLATED] Add Missing Incarnon Evolution Progress`,
     inventory_bulkRankUpSuits: `Toutes les Warframes rang max`,
     inventory_bulkRankUpWeapons: `Toutes les armes rang max`,
     inventory_bulkRankUpSpaceSuits: `Tous les Archwings rang max`,
     inventory_bulkRankUpSpaceWeapons: `Toutes les armes d'Archwing rang max`,
     inventory_bulkRankUpSentinels: `Toutes les Sentinelles rang max`,
     inventory_bulkRankUpSentinelWeapons: `Toutes les armes de Sentinelles rang max`,
-    inventory_bulkRankUpEvolutionProgress: `[UNTRANSLATED] Max Rank All Incarnon Evolution Progress`,
 
     quests_list: `Quêtes`,
     quests_completeAll: `Compléter toutes les quêtes`,
@@ -120,9 +115,8 @@ dict = {
     mods_fingerprintHelp: `Besoin d'aide pour l'empreinte ?`,
     mods_rivens: `Rivens`,
     mods_mods: `Mods`,
-    mods_addMissingUnrankedMods: `[UNTRANSLATED] Add Missing Unranked Mods`,
+    mods_bulkAddMods: `Ajouter les mods manquants`,
     mods_removeUnranked: `[UNTRANSLATED] Remove Unranked Mods`,
-    mods_addMissingMaxRankMods: `[UNTRANSLATED] Add Missing Max Rank Mods`,
     cheats_administratorRequirement: `Rôle d'administrateur requis pour cette fonctionnalité. Ajoutez <code>|DISPLAYNAME|</code> à la ligne <code>administratorNames</code> dans le fichier config.json.`,
     cheats_server: `Serveur`,
     cheats_skipTutorial: `Passer le tutoriel`,
@@ -134,7 +128,6 @@ dict = {
     cheats_infiniteEndo: `Endo infini`,
     cheats_infiniteRegalAya: `Aya Raffiné infini`,
     cheats_infiniteHelminthMaterials: `Ressources d'Helminth infinies`,
-    cheats_dontSubtractConsumables: `[UNTRANSLATED] Don't Subtract Consumables`,
     cheats_unlockAllShipFeatures: `Débloquer tous les segments du vaisseau`,
     cheats_unlockAllShipDecorations: `Débloquer toutes les décorations du vaisseau`,
     cheats_unlockAllFlavourItems: `Débloquer tous les <abbr title=\"Animations, Glyphes, Palettes, etc.\">Flavor Items</abbr>`,
@@ -154,7 +147,6 @@ dict = {
     cheats_noKimCooldowns: `Aucun cooldown sur le KIM`,
     cheats_instantResourceExtractorDrones: `Ressources de drones d'extraction instantannées`,
     cheats_noResourceExtractorDronesDamage: `Aucun dégâts aux drones d'extraction de resources`,
-    cheats_skipClanKeyCrafting: `[UNTRANSLATED] Skip Clan Key Crafting`,
     cheats_noDojoRoomBuildStage: `Aucune attente (construction des salles)`,
     cheats_noDojoDecoBuildStage: `Aucune attente (construction des décorations)`,
     cheats_fastDojoRoomDestruction: `Destruction de salle instantanée (Dojo)`,