Update missionInventoryUpdateService.ts

Re #388

AGENTS.md

@@ -1,17 +0,0 @@
-## In General
-
-### Prerequisites
-
-Use `npm i` or `npm ci` to install all dependencies.
-
-### Testing
-
-Use `npm run verify` to verify that your changes pass TypeScript's checks.
-
-### Formatting
-
-Use `npm run prettier` to ensure your formatting matches the expected format. Failing to do so will cause CI failure.
-
-## WebUI Specific
-
-The translation system is designed around additions being made to `static/webui/translations/en.js`. They are copied over for translation via `npm run update-translations`. DO NOT produce non-English strings; we want them to be translated by humans who can understand the full context.

config.json.example

@@ -42,8 +42,6 @@
   "noDeathMarks": false,
   "noKimCooldowns": false,
   "fullyStockedVendors": false,
-  "baroAlwaysAvailable": false,
-  "baroFullyStocked": false,
   "syndicateMissionsRepeatable": false,
   "unlockAllProfitTakerStages": false,
   "instantFinishRivenChallenge": false,
@@ -60,16 +58,11 @@
   "unlockAllSimarisResearchEntries": false,
   "spoofMasteryRank": -1,
   "nightwaveStandingMultiplier": 1,
-  "unfaithfulBugFixes": {
-    "ignore1999LastRegionPlayed": false,
-    "fixXtraCheeseTimer": false
-  },
   "worldState": {
     "creditBoost": false,
     "affinityBoost": false,
     "resourceBoost": false,
     "starDays": true,
-    "galleonOfGhouls": 0,
     "eidolonOverride": "",
     "vallisOverride": "",
     "duviriOverride": "",

package-lock.json

@@ -21,7 +21,7 @@
         "ncp": "^2.0.0",
         "typescript": "^5.5",
         "undici": "^7.10.0",
-        "warframe-public-export-plus": "^0.5.70",
+        "warframe-public-export-plus": "^0.5.68",
         "warframe-riven-info": "^0.1.2",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0",
@@ -3396,9 +3396,9 @@
       }
     },
     "node_modules/warframe-public-export-plus": {
-      "version": "0.5.70",
-      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.70.tgz",
-      "integrity": "sha512-d5dQ/a0rakQnW9tl1HitST8439jDvEgMhkkntQIw7HmdM7s7mvIxvaYSl5wjlYawpUVfGyvGBdZVoAJ7kkQRWw=="
+      "version": "0.5.68",
+      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.68.tgz",
+      "integrity": "sha512-KMmwCVeQ4k+EN73UZqxnM+qQdPsST8geWoJCP7US5LT6JcRxa8ptmqYXwCzaLtckBLZyVbamsxKZAxPPJckxsA=="
     },
     "node_modules/warframe-riven-info": {
       "version": "0.1.2",

package.json

@@ -33,7 +33,7 @@
     "ncp": "^2.0.0",
     "typescript": "^5.5",
     "undici": "^7.10.0",
-    "warframe-public-export-plus": "^0.5.70",
+    "warframe-public-export-plus": "^0.5.68",
     "warframe-riven-info": "^0.1.2",
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0",

src/controllers/api/completeCalendarEventController.ts

@@ -1,4 +1,4 @@
-import { checkCalendarChallengeCompletion, getCalendarProgress, getInventory } from "@/src/services/inventoryService";
+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";
@@ -12,23 +12,27 @@ export const completeCalendarEventController: RequestHandler = async (req, res)
     const calendarProgress = getCalendarProgress(inventory);
     const currentSeason = getWorldState().KnownCalendarSeasons[0];
     let inventoryChanges: IInventoryChanges = {};
-    const dayIndex = calendarProgress.SeasonProgress.LastCompletedDayIdx + 1;
-    const day = currentSeason.Days[dayIndex];
+    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) {
-        if (day.events[0].type == "CET_CHALLENGE") {
-            throw new Error(`completeCalendarEvent should not be used for challenges`);
-        }
                     const selection = day.events[parseInt(req.query.CompletedEventIdx as string)];
                     if (selection.type == "CET_REWARD") {
-            inventoryChanges = (await handleStoreItemAcquisition(selection.reward!, inventory)).InventoryChanges;
+                        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}`);
                     }
                 }
-    calendarProgress.SeasonProgress.LastCompletedDayIdx = dayIndex;
-    checkCalendarChallengeCompletion(calendarProgress, currentSeason);
+                break;
+            }
+            ++dayIndex;
+        }
+    }
+    calendarProgress.SeasonProgress.LastCompletedDayIdx++;
     await inventory.save();
     res.json({
         InventoryChanges: inventoryChanges,

src/controllers/api/giftingController.ts

@@ -11,13 +11,13 @@ import {
 import { getAccountForRequest, getSuffixedName } from "@/src/services/loginService";
 import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
 import { IOid } from "@/src/types/commonTypes";
-import { IInventoryChanges, IPurchaseParams, PurchaseSource } from "@/src/types/purchaseTypes";
+import { IInventoryChanges, IPurchaseParams } from "@/src/types/purchaseTypes";
 import { RequestHandler } from "express";
 import { ExportBundles, ExportFlavour } from "warframe-public-export-plus";
 
 export const giftingController: RequestHandler = async (req, res) => {
     const data = getJSONfromString<IGiftingRequest>(String(req.body));
-    if (data.PurchaseParams.Source != PurchaseSource.Market || !data.PurchaseParams.UsePremium) {
+    if (data.PurchaseParams.Source != 0 || !data.PurchaseParams.UsePremium) {
         throw new Error(`unexpected purchase params in gifting request: ${String(req.body)}`);
     }
 

src/controllers/api/inventoryController.ts

@@ -22,8 +22,7 @@ import { getNemesisManifest } from "@/src/helpers/nemesisHelpers";
 import { getPersonalRooms } from "@/src/services/personalRoomsService";
 import { IPersonalRoomsClient } from "@/src/types/personalRoomsTypes";
 import { Ship } from "@/src/models/shipModel";
-import { toLegacyOid, toOid, version_compare } from "@/src/helpers/inventoryHelpers";
-import { Inbox } from "@/src/models/inboxModel";
+import { toLegacyOid, version_compare } from "@/src/helpers/inventoryHelpers";
 
 export const inventoryController: RequestHandler = async (request, response) => {
     const account = await getAccountForRequest(request);
@@ -129,21 +128,13 @@ export const getInventoryResponse = async (
     xpBasedLevelCapDisabled: boolean,
     buildLabel: string | undefined
 ): Promise<IInventoryClient> => {
-    const [inventoryWithLoadOutPresets, ships, latestMessage] = await Promise.all([
+    const [inventoryWithLoadOutPresets, ships] = await Promise.all([
         inventory.populate<{ LoadOutPresets: ILoadoutDatabase }>("LoadOutPresets"),
-        Ship.find({ ShipOwnerId: inventory.accountOwnerId }),
-        Inbox.findOne({ ownerId: inventory.accountOwnerId }, "_id").sort({ date: -1 })
+        Ship.find({ ShipOwnerId: inventory.accountOwnerId })
     ]);
     const inventoryResponse = inventoryWithLoadOutPresets.toJSON<IInventoryClient>();
     inventoryResponse.Ships = ships.map(x => x.toJSON<IShipInventory>());
 
-    // In case mission inventory update added an inbox message, we need to send the Mailbox part so the client knows to refresh it.
-    if (latestMessage) {
-        inventoryResponse.Mailbox = {
-            LastInboxId: toOid(latestMessage._id)
-        };
-    }
-
     if (config.infiniteCredits) {
         inventoryResponse.RegularCredits = 999999999;
     }

src/controllers/api/nemesisController.ts

@@ -8,15 +8,16 @@ import {
     getKnifeUpgrade,
     getNemesisManifest,
     getNemesisPasscode,
+    getNemesisPasscodeModTypes,
     GUESS_CORRECT,
     GUESS_INCORRECT,
     GUESS_NEUTRAL,
     GUESS_NONE,
     GUESS_WILDCARD,
-    IKnifeResponse,
-    parseUpgrade
+    IKnifeResponse
 } from "@/src/helpers/nemesisHelpers";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
+import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
 import { Loadout } from "@/src/models/inventoryModels/loadoutModel";
 import { freeUpSlot, getInventory } from "@/src/services/inventoryService";
 import { getAccountForRequest } from "@/src/services/loginService";
@@ -214,19 +215,7 @@ export const nemesisController: RequestHandler = async (req, res) => {
                         }
                     ];
                     inventory.Nemesis!.Weakened = true;
-
-                    // Subtract a charge from all requiem mods installed on parazon
-                    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 (let i = 3; i != 6; ++i) {
-                        //logger.debug(`subtracting a charge from ${dataknifeUpgrades[i]}`);
-                        const upgrade = parseUpgrade(inventory, dataknifeUpgrades[i]);
-                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                    }
+                    await consumePasscodeModCharges(inventory, response);
                 }
             } else {
                 // Guess was incorrect, increase rank
@@ -391,3 +380,18 @@ interface IKnife {
     AttachedUpgrades: IUpgradeClient[];
     HiddenWhenHolstered: boolean;
 }
+
+const consumePasscodeModCharges = async (
+    inventory: TInventoryDatabaseDocument,
+    response: IKnifeResponse
+): Promise<void> => {
+    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);
+    }
+};

src/controllers/api/updateChallengeProgressController.ts

@@ -13,7 +13,7 @@ export const updateChallengeProgressController: RequestHandler = async (req, res
 
     const inventory = await getInventory(
         account._id.toString(),
-        "ChallengesFixVersion ChallengeProgress SeasonChallengeHistory Affiliations CalendarProgress"
+        "ChallengesFixVersion ChallengeProgress SeasonChallengeHistory Affiliations"
     );
     let affiliationMods: IAffiliationMods[] = [];
     if (challenges.ChallengeProgress) {

src/helpers/nemesisHelpers.ts

@@ -237,7 +237,7 @@ export const getNemesisPasscode = (nemesis: { fp: bigint; Faction: TNemesisFacti
     return passcode;
 };
 
-/*const requiemMods: readonly string[] = [
+const requiemMods: readonly string[] = [
     "/Lotus/Upgrades/Mods/Immortal/ImmortalOneMod",
     "/Lotus/Upgrades/Mods/Immortal/ImmortalTwoMod",
     "/Lotus/Upgrades/Mods/Immortal/ImmortalThreeMod",
@@ -246,7 +246,7 @@ export const getNemesisPasscode = (nemesis: { fp: bigint; Faction: TNemesisFacti
     "/Lotus/Upgrades/Mods/Immortal/ImmortalSixMod",
     "/Lotus/Upgrades/Mods/Immortal/ImmortalSevenMod",
     "/Lotus/Upgrades/Mods/Immortal/ImmortalEightMod"
-];*/
+];
 
 export const antivirusMods: readonly string[] = [
     "/Lotus/Upgrades/Mods/Immortal/AntivirusOneMod",
@@ -259,12 +259,12 @@ export const antivirusMods: readonly string[] = [
     "/Lotus/Upgrades/Mods/Immortal/AntivirusEightMod"
 ];
 
-/*export const getNemesisPasscodeModTypes = (nemesis: { fp: bigint; Faction: TNemesisFaction }): string[] => {
+export const getNemesisPasscodeModTypes = (nemesis: { fp: bigint; Faction: TNemesisFaction }): string[] => {
     const passcode = getNemesisPasscode(nemesis);
     return nemesis.Faction == "FC_INFESTATION"
         ? passcode.map(i => antivirusMods[i])
         : passcode.map(i => requiemMods[i]);
-};*/
+};
 
 // Symbols; 0-7 are the normal requiem mods.
 export const GUESS_NONE = 8;
@@ -343,27 +343,6 @@ export const getKnifeUpgrade = (
     throw new Error(`${type} does not seem to be installed on parazon?!`);
 };
 
-export const parseUpgrade = (
-    inventory: TInventoryDatabaseDocument,
-    str: string
-): { ItemId: IOid; ItemType: string } => {
-    if (str.length == 24) {
-        const upgrade = inventory.Upgrades.id(str);
-        if (upgrade) {
-            return {
-                ItemId: { $oid: str },
-                ItemType: upgrade.ItemType
-            };
-        }
-        throw new Error(`Could not resolve oid ${str}`);
-    } else {
-        return {
-            ItemId: { $oid: "000000000000000000000000" },
-            ItemType: str
-        };
-    }
-};
-
 export const consumeModCharge = (
     response: IKnifeResponse,
     inventory: TInventoryDatabaseDocument,

src/index.ts

@@ -21,14 +21,13 @@ import mongoose from "mongoose";
 import { JSONStringify } from "json-with-bigint";
 import { startWebServer } from "./services/webService";
 
-import { syncConfigWithDatabase, validateConfig } from "@/src/services/configWatcherService";
+import { validateConfig } from "@/src/services/configWatcherService";
 import { updateWorldStateCollections } from "./services/worldStateService";
 
 // Patch JSON.stringify to work flawlessly with Bigints.
 JSON.stringify = JSONStringify;
 
 validateConfig();
-syncConfigWithDatabase();
 
 mongoose
     .connect(config.mongodbUrl)

src/models/inboxModel.ts

@@ -17,6 +17,7 @@ export interface IMessageDatabase extends IMessage {
     ownerId: Types.ObjectId;
     date: Date; //created at
     attVisualOnly?: boolean;
+    expiry?: Date;
     _id: Types.ObjectId;
 }
 
@@ -27,13 +28,11 @@ export interface IMessage {
     icon?: string;
     highPriority?: boolean;
     lowPrioNewPlayers?: boolean;
-    transmission?: string;
-    att?: string[];
-    countedAtt?: ITypeCount[];
     startDate?: Date;
     endDate?: Date;
-    goalTag?: string;
-    CrossPlatform?: boolean;
+    att?: string[];
+    countedAtt?: ITypeCount[];
+    transmission?: string;
     arg?: Arg[];
     gifts?: IGift[];
     r?: boolean;
@@ -108,10 +107,7 @@ const messageSchema = new Schema<IMessageDatabase>(
         lowPrioNewPlayers: Boolean,
         startDate: Date,
         endDate: Date,
-        goalTag: String,
-        date: { type: Date, required: true },
         r: Boolean,
-        CrossPlatform: Boolean,
         att: { type: [String], default: undefined },
         gifts: { type: [giftSchema], default: undefined },
         countedAtt: { type: [typeCountSchema], default: undefined },
@@ -132,7 +128,7 @@ const messageSchema = new Schema<IMessageDatabase>(
         declineAction: String,
         hasAccountAction: Boolean
     },
-    { id: false }
+    { timestamps: { createdAt: "date", updatedAt: false }, id: false }
 );
 
 messageSchema.virtual("messageId").get(function (this: IMessageDatabase) {
@@ -155,15 +151,13 @@ messageSchema.set("toJSON", {
 
         if (messageDatabase.startDate && messageDatabase.endDate) {
             messageClient.startDate = toMongoDate(messageDatabase.startDate);
+
             messageClient.endDate = toMongoDate(messageDatabase.endDate);
-        } else {
-            delete messageClient.startDate;
-            delete messageClient.endDate;
         }
     }
 });
 
 messageSchema.index({ ownerId: 1 });
-messageSchema.index({ endDate: 1 }, { expireAfterSeconds: 0 });
+messageSchema.index({ expiry: 1 }, { expireAfterSeconds: 0 });
 
 export const Inbox = model<IMessageDatabase>("Inbox", messageSchema, "inbox");

src/models/inventoryModels/inventoryModel.ts

@@ -1,4 +1,4 @@
-import { Document, Model, Schema, Types, model } from "mongoose";
+import { Document, HydratedDocument, Model, Schema, Types, model } from "mongoose";
 import {
     IFlavourItem,
     IRawUpgrade,
@@ -7,6 +7,7 @@ import {
     IBooster,
     IInventoryClient,
     ISlots,
+    IMailboxDatabase,
     IDuviriInfo,
     IPendingRecipeDatabase,
     IPendingRecipeClient,
@@ -53,6 +54,7 @@ import {
     IUpgradeDatabase,
     ICrewShipMemberDatabase,
     ICrewShipMemberClient,
+    IMailboxClient,
     TEquipmentKey,
     equipmentKeys,
     IKubrowPetDetailsDatabase,
@@ -97,9 +99,7 @@ import {
     IAccolades,
     IHubNpcCustomization,
     ILotusCustomization,
-    IEndlessXpReward,
-    IPersonalGoalProgressDatabase,
-    IPersonalGoalProgressClient
+    IEndlessXpReward
 } from "../../types/inventoryTypes/inventoryTypes";
 import { IOid } from "../../types/commonTypes";
 import {
@@ -371,7 +371,7 @@ FlavourItemSchema.set("toJSON", {
     }
 });
 
-/*const MailboxSchema = new Schema<IMailboxDatabase>(
+const MailboxSchema = new Schema<IMailboxDatabase>(
     {
         LastInboxId: Schema.Types.ObjectId
     },
@@ -384,7 +384,7 @@ MailboxSchema.set("toJSON", {
         delete mailboxDatabase.__v;
         (returnedObject as IMailboxClient).LastInboxId = toOid(mailboxDatabase.LastInboxId);
     }
-});*/
+});
 
 const DuviriInfoSchema = new Schema<IDuviriInfo>(
     {
@@ -457,29 +457,6 @@ const discoveredMarkerSchema = new Schema<IDiscoveredMarker>(
     { _id: false }
 );
 
-const personalGoalProgressSchema = new Schema<IPersonalGoalProgressDatabase>(
-    {
-        Best: Number,
-        Count: Number,
-        Tag: String,
-        goalId: Types.ObjectId
-    },
-    { _id: false }
-);
-
-personalGoalProgressSchema.set("toJSON", {
-    virtuals: true,
-    transform(_doc, obj) {
-        const db = obj as IPersonalGoalProgressDatabase;
-        const client = obj as IPersonalGoalProgressClient;
-
-        client._id = toOid(db.goalId);
-
-        delete obj.goalId;
-        delete obj.__v;
-    }
-});
-
 const challengeProgressSchema = new Schema<IChallengeProgress>(
     {
         Progress: Number,
@@ -1653,7 +1630,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         //CompletedJobs: [Schema.Types.Mixed],
 
         //Game mission\ivent score example  "Tag": "WaterFight", "Best": 170, "Count": 1258,
-        PersonalGoalProgress: { type: [personalGoalProgressSchema], default: undefined },
+        //PersonalGoalProgress: [Schema.Types.Mixed],
 
         //Setting interface Style
         ThemeStyle: String,
@@ -1724,7 +1701,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         //Unknown and system
         DuviriInfo: DuviriInfoSchema,
         LastInventorySync: Schema.Types.ObjectId,
-        //Mailbox: MailboxSchema,
+        Mailbox: MailboxSchema,
         HandlerPoints: Number,
         ChallengesFixVersion: Number,
         PlayedParkourTutorial: Boolean,

src/models/personalRoomsModel.ts

@@ -40,7 +40,6 @@ const placedDecosSchema = new Schema<IPlacedDecosDatabase>(
         Pos: [Number],
         Rot: [Number],
         Scale: Number,
-        Sockets: Number,
         PictureFrameInfo: { type: pictureFrameInfoSchema, default: undefined }
     },
     { id: false }

src/services/configService.ts

@@ -49,8 +49,6 @@ export interface IConfig {
     noDeathMarks?: boolean;
     noKimCooldowns?: boolean;
     fullyStockedVendors?: boolean;
-    baroAlwaysAvailable?: boolean;
-    baroFullyStocked?: boolean;
     syndicateMissionsRepeatable?: boolean;
     unlockAllProfitTakerStages?: boolean;
     instantFinishRivenChallenge?: boolean;
@@ -67,16 +65,11 @@ export interface IConfig {
     unlockAllSimarisResearchEntries?: boolean;
     spoofMasteryRank?: number;
     nightwaveStandingMultiplier?: number;
-    unfaithfulBugFixes?: {
-        ignore1999LastRegionPlayed?: boolean;
-        fixXtraCheeseTimer?: boolean;
-    };
     worldState?: {
         creditBoost?: boolean;
         affinityBoost?: boolean;
         resourceBoost?: boolean;
         starDays?: boolean;
-        galleonOfGhouls?: number;
         eidolonOverride?: string;
         vallisOverride?: string;
         duviriOverride?: string;

src/services/configWatcherService.ts

@@ -3,7 +3,6 @@ import fsPromises from "fs/promises";
 import { logger } from "../utils/logger";
 import { config, configPath, loadConfig } from "./configService";
 import { getWebPorts, sendWsBroadcast, startWebServer, stopWebServer } from "./webService";
-import { Inbox } from "../models/inboxModel";
 
 let amnesia = false;
 fs.watchFile(configPath, (now, then) => {
@@ -23,7 +22,6 @@ fs.watchFile(configPath, (now, then) => {
             process.exit(1);
         }
         validateConfig();
-        syncConfigWithDatabase();
 
         const webPorts = getWebPorts();
         if (config.httpPort != webPorts.http || config.httpsPort != webPorts.https) {
@@ -53,15 +51,6 @@ export const validateConfig = (): void => {
             }
         }
     }
-    if (
-        config.worldState?.galleonOfGhouls &&
-        config.worldState.galleonOfGhouls != 1 &&
-        config.worldState.galleonOfGhouls != 2 &&
-        config.worldState.galleonOfGhouls != 3
-    ) {
-        config.worldState.galleonOfGhouls = 0;
-        modified = true;
-    }
     if (modified) {
         logger.info(`Updating config file to fix some issues with it.`);
         void saveConfig();
@@ -72,10 +61,3 @@ export const saveConfig = async (): Promise<void> => {
     amnesia = true;
     await fsPromises.writeFile(configPath, JSON.stringify(config, null, 2));
 };
-
-export const syncConfigWithDatabase = (): void => {
-    // Event messages are deleted after endDate. Since we don't use beginDate/endDate and instead have config toggles, we need to delete the messages once those bools are false.
-    if (!config.worldState?.galleonOfGhouls) {
-        void Inbox.deleteMany({ goalTag: "GalleonRobbery" }).then(() => {}); // For some reason, I can't just do `Inbox.deleteMany(...)`; it needs this whole circus.
-    }
-};

src/services/inboxService.ts

@@ -2,8 +2,8 @@ import { IMessageDatabase, Inbox } from "@/src/models/inboxModel";
 import { getAccountForRequest } from "@/src/services/loginService";
 import { HydratedDocument, Types } from "mongoose";
 import { Request } from "express";
-import { unixTimesInMs } from "../constants/timeConstants";
-import { config } from "./configService";
+import eventMessages from "@/static/fixed_responses/eventMessages.json";
+import { logger } from "@/src/utils/logger";
 
 export const getAllMessagesSorted = async (accountId: string): Promise<HydratedDocument<IMessageDatabase>[]> => {
     const inbox = await Inbox.find({ ownerId: accountId }).sort({ date: -1 });
@@ -29,72 +29,40 @@ export const deleteAllMessagesRead = async (accountId: string): Promise<void> =>
 
 export const createNewEventMessages = async (req: Request): Promise<void> => {
     const account = await getAccountForRequest(req);
-    const newEventMessages: IMessageCreationTemplate[] = [];
+    const latestEventMessageDate = account.LatestEventMessageDate;
 
-    // Baro
-    const baroIndex = Math.trunc((Date.now() - 910800000) / (unixTimesInMs.day * 14));
-    const baroStart = baroIndex * (unixTimesInMs.day * 14) + 910800000;
-    const baroActualStart = baroStart + unixTimesInMs.day * (config.baroAlwaysAvailable ? 0 : 12);
-    if (account.LatestEventMessageDate.getTime() < baroActualStart) {
-        newEventMessages.push({
-            sndr: "/Lotus/Language/G1Quests/VoidTraderName",
-            sub: "/Lotus/Language/CommunityMessages/VoidTraderAppearanceTitle",
-            msg: "/Lotus/Language/CommunityMessages/VoidTraderAppearanceMessage",
-            icon: "/Lotus/Interface/Icons/Npcs/BaroKiTeerPortrait.png",
-            startDate: new Date(baroActualStart),
-            endDate: new Date(baroStart + unixTimesInMs.day * 14),
-            CrossPlatform: true,
-            arg: [
-                {
-                    Key: "NODE_NAME",
-                    Tag: ["EarthHUB", "MercuryHUB", "SaturnHUB", "PlutoHUB"][baroIndex % 4]
-                }
-            ],
-            date: new Date(baroActualStart)
-        });
-    }
-
-    // BUG: Deleting the inbox message manually means it'll just be automatically re-created. This is because we don't use startDate/endDate for these config-toggled events.
-    if (config.worldState?.galleonOfGhouls) {
-        if (!(await Inbox.exists({ ownerId: account._id, goalTag: "GalleonRobbery" }))) {
-            newEventMessages.push({
-                sndr: "/Lotus/Language/Bosses/BossCouncilorVayHek",
-                sub: "/Lotus/Language/Events/GalleonRobberyIntroMsgTitle",
-                msg: "/Lotus/Language/Events/GalleonRobberyIntroMsgDesc",
-                icon: "/Lotus/Interface/Icons/Npcs/VayHekPortrait.png",
-                transmission: "/Lotus/Sounds/Dialog/GalleonOfGhouls/DGhoulsWeekOneInbox0010VayHek",
-                att: ["/Lotus/Upgrades/Skins/Events/OgrisOldSchool"],
-                startDate: new Date(),
-                goalTag: "GalleonRobbery"
-            });
-        }
-    }
+    //TODO: is baroo there? create these kind of messages too (periodical messages)
+    const newEventMessages = eventMessages.Messages.filter(m => new Date(m.eventMessageDate) > latestEventMessageDate);
 
     if (newEventMessages.length === 0) {
+        logger.debug(`No new event messages. Latest event message date: ${latestEventMessageDate.toISOString()}`);
         return;
     }
 
-    await createMessage(account._id, newEventMessages);
+    const savedEventMessages = await createMessage(account._id, newEventMessages);
+    logger.debug("created event messages", savedEventMessages);
 
     const latestEventMessage = newEventMessages.reduce((prev, current) =>
-        prev.startDate! > current.startDate! ? prev : current
+        prev.eventMessageDate > current.eventMessageDate ? prev : current
     );
-    account.LatestEventMessageDate = new Date(latestEventMessage.startDate!);
+
+    account.LatestEventMessageDate = new Date(latestEventMessage.eventMessageDate);
     await account.save();
 };
 
 export const createMessage = async (
     accountId: string | Types.ObjectId,
     messages: IMessageCreationTemplate[]
-): Promise<void> => {
+): Promise<HydratedDocument<IMessageDatabase>[]> => {
     const ownerIdMessages = messages.map(m => ({
         ...m,
-        date: m.date ?? new Date(),
         ownerId: accountId
     }));
-    await Inbox.insertMany(ownerIdMessages);
+
+    const savedMessages = await Inbox.insertMany(ownerIdMessages);
+    return savedMessages as HydratedDocument<IMessageDatabase>[];
 };
 
 export interface IMessageCreationTemplate extends Omit<IMessageDatabase, "_id" | "date" | "ownerId"> {
-    date?: Date;
+    ownerId?: string;
 }

src/services/inventoryService.ts

@@ -84,11 +84,9 @@ import { getRandomElement, getRandomInt, getRandomWeightedReward, SRng } from ".
 import { createMessage } from "./inboxService";
 import { getMaxStanding, getMinStanding } from "@/src/helpers/syndicateStandingHelper";
 import { getNightwaveSyndicateTag, getWorldState } from "./worldStateService";
-import { ICalendarSeason } from "@/src/types/worldStateTypes";
 import { generateNemesisProfile, INemesisProfile } from "../helpers/nemesisHelpers";
 import { TAccountDocument } from "./loginService";
 import { unixTimesInMs } from "../constants/timeConstants";
-import { addString } from "../helpers/stringHelpers";
 
 export const createInventory = async (
     accountOwnerId: Types.ObjectId,
@@ -1785,10 +1783,6 @@ export const addChallenges = (
         } else {
             inventory.ChallengeProgress.push({ Name, Progress });
         }
-
-        if (Name.startsWith("Calendar")) {
-            addString(getCalendarProgress(inventory).SeasonProgress.ActivatedChallenges, Name);
-        }
     });
 
     const affiliationMods: IAffiliationMods[] = [];
@@ -2035,20 +2029,6 @@ export const getCalendarProgress = (inventory: TInventoryDatabaseDocument): ICal
     return inventory.CalendarProgress;
 };
 
-export const checkCalendarChallengeCompletion = (
-    calendarProgress: ICalendarProgress,
-    currentSeason: ICalendarSeason
-): void => {
-    const dayIndex = calendarProgress.SeasonProgress.LastCompletedDayIdx + 1;
-    if (calendarProgress.SeasonProgress.LastCompletedChallengeDayIdx >= dayIndex) {
-        const day = currentSeason.Days[dayIndex];
-        if (day.events.length != 0 && day.events[0].type == "CET_CHALLENGE") {
-            //logger.debug(`already completed the challenge, skipping ahead`);
-            calendarProgress.SeasonProgress.LastCompletedDayIdx++;
-        }
-    }
-};
-
 export const giveNemesisWeaponRecipe = (
     inventory: TInventoryDatabaseDocument,
     weaponType: string,

src/services/missionInventoryUpdateService.ts

@@ -33,7 +33,6 @@ import {
     addSkin,
     addStanding,
     applyClientEquipmentUpdates,
-    checkCalendarChallengeCompletion,
     combineInventoryChanges,
     generateRewardSeed,
     getCalendarProgress,
@@ -46,7 +45,7 @@ import {
 import { updateQuestKey } from "@/src/services/questService";
 import { Types } from "mongoose";
 import { IAffiliationMods, IInventoryChanges } from "@/src/types/purchaseTypes";
-import { fromStoreItem, getLevelKeyRewards, isStoreItem, toStoreItem } from "@/src/services/itemDataService";
+import { fromStoreItem, getLevelKeyRewards, toStoreItem } from "@/src/services/itemDataService";
 import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
 import { getEntriesUnsafe } from "@/src/utils/ts-utils";
 import { IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
@@ -68,15 +67,7 @@ import {
 } from "@/src/helpers/nemesisHelpers";
 import { Loadout } from "../models/inventoryModels/loadoutModel";
 import { ILoadoutConfigDatabase } from "../types/saveLoadoutTypes";
-import {
-    getLiteSortie,
-    getSortie,
-    getWorldState,
-    idToBountyCycle,
-    idToDay,
-    idToWeek,
-    pushClassicBounties
-} from "./worldStateService";
+import { getLiteSortie, getSortie, idToBountyCycle, idToDay, idToWeek, pushClassicBounties } from "./worldStateService";
 import { config } from "./configService";
 import libraryDailyTasks from "@/static/fixed_responses/libraryDailyTasks.json";
 import { ISyndicateMissionInfo } from "../types/worldStateTypes";
@@ -268,9 +259,7 @@ export const addMissionInventoryUpdates = async (
                 addMissionComplete(inventory, value);
                 break;
             case "LastRegionPlayed":
-                if (!(config.unfaithfulBugFixes?.ignore1999LastRegionPlayed && value === "1999MapName")) {
                 inventory.LastRegionPlayed = value;
-                }
                 break;
             case "RawUpgrades":
                 addMods(inventory, value);
@@ -482,7 +471,7 @@ export const addMissionInventoryUpdates = async (
                                     msg: "/Lotus/Language/G1Quests/DeathMarkMessage",
                                     icon: "/Lotus/Interface/Icons/Npcs/Stalker_d.png",
                                     highPriority: true,
-                                    endDate: new Date(Date.now() + 86400_000) // TOVERIFY: This type of inbox message seems to automatically delete itself. We'll just delete it after 24 hours, but it's not clear if this is correct.
+                                    expiry: new Date(Date.now() + 86400_000) // TOVERIFY: This type of inbox message seems to automatically delete itself. We'll just delete it after 24 hours, but it's clear if this is correct.
                                 }
                             ]);
                         }
@@ -609,47 +598,6 @@ export const addMissionInventoryUpdates = async (
                 inventoryChanges.RegularCredits -= value;
                 break;
             }
-            case "GoalProgress": {
-                for (const uploadProgress of value) {
-                    const goal = getWorldState().Goals.find(x => x._id.$oid == uploadProgress._id.$oid);
-                    if (goal && goal.Personal) {
-                        inventory.PersonalGoalProgress ??= [];
-                        const goalProgress = inventory.PersonalGoalProgress.find(x => x.goalId.equals(goal._id.$oid));
-                        if (goalProgress) {
-                            goalProgress.Best = Math.max(goalProgress.Best, uploadProgress.Best);
-                            goalProgress.Count += uploadProgress.Count;
-                        } else {
-                            inventory.PersonalGoalProgress.push({
-                                Best: uploadProgress.Best,
-                                Count: uploadProgress.Count,
-                                Tag: goal.Tag,
-                                goalId: new Types.ObjectId(goal._id.$oid)
-                            });
-
-                            if (
-                                goal.Reward &&
-                                goal.Reward.items &&
-                                goal.MissionKeyName &&
-                                goal.MissionKeyName in goalMessagesByKey
-                            ) {
-                                // Send reward via inbox
-                                const info = goalMessagesByKey[goal.MissionKeyName];
-                                await createMessage(inventory.accountOwnerId, [
-                                    {
-                                        sndr: info.sndr,
-                                        msg: info.msg,
-                                        att: goal.Reward.items.map(x => (isStoreItem(x) ? fromStoreItem(x) : x)),
-                                        sub: info.sub,
-                                        icon: info.icon,
-                                        highPriority: true
-                                    }
-                                ]);
-                            }
-                        }
-                    }
-                }
-                break;
-            }
             case "InvasionProgress": {
                 for (const clientProgress of value) {
                     const dbProgress = inventory.QualifyingInvasions.find(x =>
@@ -672,11 +620,12 @@ export const addMissionInventoryUpdates = async (
             }
             case "CalendarProgress": {
                 const calendarProgress = getCalendarProgress(inventory);
-                const currentSeason = getWorldState().KnownCalendarSeasons[0];
-                calendarProgress.SeasonProgress.LastCompletedChallengeDayIdx = currentSeason.Days.findIndex(
-                    x => x.events[0].challenge == value[value.length - 1].challenge
-                );
-                checkCalendarChallengeCompletion(calendarProgress, currentSeason);
+                for (const progress of value) {
+                    const challengeName = progress.challenge.substring(progress.challenge.lastIndexOf("/") + 1);
+                    calendarProgress.SeasonProgress.LastCompletedDayIdx++;
+                    calendarProgress.SeasonProgress.LastCompletedChallengeDayIdx++;
+                    calendarProgress.SeasonProgress.ActivatedChallenges.push(challengeName);
+                }
                 break;
             }
             case "duviriCaveOffers": {
@@ -1003,14 +952,6 @@ export const addMissionRewards = async (
 
     let missionCompletionCredits = 0;
     //inventory change is what the client has not rewarded itself, also the client needs to know the credit changes for display
-
-    if (rewardInfo.goalId) {
-        const goal = getWorldState().Goals.find(x => x._id.$oid == rewardInfo.goalId);
-        if (goal?.MissionKeyName) {
-            levelKeyName = goal.MissionKeyName;
-        }
-    }
-
     if (levelKeyName) {
         const fixedLevelRewards = getLevelKeyRewards(levelKeyName);
         //logger.debug(`fixedLevelRewards ${fixedLevelRewards}`);
@@ -1256,7 +1197,7 @@ export const addMissionRewards = async (
 
     if (rewardInfo.JobStage != undefined && rewardInfo.jobId) {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const [jobType, unkIndex, hubNode, syndicateMissionId] = rewardInfo.jobId.split("_");
+        const [jobType, unkIndex, hubNode, syndicateMissionId, locationTag] = rewardInfo.jobId.split("_");
         const syndicateMissions: ISyndicateMissionInfo[] = [];
         if (syndicateMissionId) {
             pushClassicBounties(syndicateMissions, idToBountyCycle(syndicateMissionId));
@@ -1265,27 +1206,12 @@ export const addMissionRewards = async (
         if (syndicateEntry && syndicateEntry.Jobs) {
             let currentJob = syndicateEntry.Jobs[rewardInfo.JobTier!];
             if (syndicateEntry.Tag === "EntratiSyndicate") {
-                if (
-                    [
-                        "DeimosRuinsExterminateBounty",
-                        "DeimosRuinsEscortBounty",
-                        "DeimosRuinsMistBounty",
-                        "DeimosRuinsPurifyBounty",
-                        "DeimosRuinsSacBounty",
-                        "VaultBounty"
-                    ].some(ending => jobType.endsWith(ending))
-                ) {
-                    const vault = syndicateEntry.Jobs.find(j => j.locationTag == rewardInfo.jobId!.split("_").at(-1));
-                    if (vault) {
-                        currentJob = vault;
                 if (jobType.endsWith("VaultBounty")) {
-                            currentJob.xpAmounts = [currentJob.xpAmounts.reduce((partialSum, a) => partialSum + a, 0)];
+                    const vault = syndicateEntry.Jobs.find(j => j.locationTag === locationTag);
+                    if (vault) currentJob = vault;
                 }
-                    }
-                }
-                let medallionAmount = Math.floor(
-                    Math.min(rewardInfo.JobStage, currentJob.xpAmounts.length - 1) / (rewardInfo.Q ? 0.8 : 1)
-                );
+                let medallionAmount = Math.floor(currentJob.xpAmounts[rewardInfo.JobStage] / (rewardInfo.Q ? 0.8 : 1));
+
                 if (
                     ["DeimosEndlessAreaDefenseBounty", "DeimosEndlessExcavateBounty", "DeimosEndlessPurifyBounty"].some(
                         ending => jobType.endsWith(ending)
@@ -1618,7 +1544,7 @@ function getRandomMissionDrops(
         if (RewardInfo.jobId) {
             if (RewardInfo.JobStage! >= 0) {
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                const [jobType, unkIndex, hubNode, syndicateMissionId] = RewardInfo.jobId.split("_");
+                const [jobType, unkIndex, hubNode, syndicateMissionId, locationTag] = RewardInfo.jobId.split("_");
                 let isEndlessJob = false;
                 if (syndicateMissionId) {
                     const syndicateMissions: ISyndicateMissionInfo[] = [];
@@ -1630,30 +1556,21 @@ function getRandomMissionDrops(
                         let job = syndicateEntry.Jobs[RewardInfo.JobTier!];
 
                         if (syndicateEntry.Tag === "EntratiSyndicate") {
-                            if (
-                                [
-                                    "DeimosRuinsExterminateBounty",
-                                    "DeimosRuinsEscortBounty",
-                                    "DeimosRuinsMistBounty",
-                                    "DeimosRuinsPurifyBounty",
-                                    "DeimosRuinsSacBounty",
-                                    "VaultBounty"
-                                ].some(ending => jobType.endsWith(ending))
-                            ) {
-                                const vault = syndicateEntry.Jobs.find(
-                                    j => j.locationTag === RewardInfo.jobId!.split("_").at(-1)
-                                );
-                                if (vault) {
-                                    job = vault;
                             if (jobType.endsWith("VaultBounty")) {
-                                        job.rewards = job.rewards.replace(
-                                            "/Lotus/Types/Game/MissionDecks/",
-                                            "/Supplementals/"
-                                        );
-                                        job.xpAmounts = [job.xpAmounts.reduce((partialSum, a) => partialSum + a, 0)];
-                                    }
-                                }
+                                const vault = syndicateEntry.Jobs.find(j => j.locationTag === locationTag);
+                                if (vault) job = vault;
                             }
+                            // if (
+                            //     [
+                            //         "DeimosRuinsExterminateBounty",
+                            //         "DeimosRuinsEscortBounty",
+                            //         "DeimosRuinsMistBounty",
+                            //         "DeimosRuinsPurifyBounty",
+                            //         "DeimosRuinsSacBounty"
+                            //     ].some(ending => jobType.endsWith(ending))
+                            // ) {
+                            //     job.rewards = "TODO"; // Droptable for Arcana Isolation Vault
+                            // }
                             if (
                                 [
                                     "DeimosEndlessAreaDefenseBounty",
@@ -1730,10 +1647,10 @@ function getRandomMissionDrops(
                         }
                         if (
                             RewardInfo.Q &&
-                            (RewardInfo.JobStage === job.xpAmounts.length - 1 || jobType.endsWith("VaultBounty")) &&
+                            (RewardInfo.JobStage === job.xpAmounts.length - 1 || job.isVault) &&
                             !isEndlessJob
                         ) {
-                            rotations.push(ExportRewards[job.rewards].length - 1);
+                            rotations.push(3);
                         }
                     }
                 }
@@ -2027,24 +1944,3 @@ const getHexBounties = (seed: number): { nodes: string[]; buddies: string[] } =>
     }
     return { nodes, buddies };
 };*/
-
-const goalMessagesByKey: Record<string, { sndr: string; msg: string; sub: string; icon: string }> = {
-    "/Lotus/Types/Keys/GalleonRobberyAlert": {
-        sndr: "/Lotus/Language/Bosses/BossCouncilorVayHek",
-        msg: "/Lotus/Language/Messages/GalleonRobbery2025RewardMsgA",
-        sub: "/Lotus/Language/Messages/GalleonRobbery2025MissionTitleA",
-        icon: "/Lotus/Interface/Icons/Npcs/VayHekPortrait.png"
-    },
-    "/Lotus/Types/Keys/GalleonRobberyAlertB": {
-        sndr: "/Lotus/Language/Bosses/BossCouncilorVayHek",
-        msg: "/Lotus/Language/Messages/GalleonRobbery2025RewardMsgB",
-        sub: "/Lotus/Language/Messages/GalleonRobbery2025MissionTitleB",
-        icon: "/Lotus/Interface/Icons/Npcs/VayHekPortrait.png"
-    },
-    "/Lotus/Types/Keys/GalleonRobberyAlertC": {
-        sndr: "/Lotus/Language/Bosses/BossCouncilorVayHek",
-        msg: "/Lotus/Language/Messages/GalleonRobbery2025RewardMsgC",
-        sub: "/Lotus/Language/Messages/GalleonRobbery2025MissionTitleC",
-        icon: "/Lotus/Interface/Icons/Npcs/VayHekPortrait.png"
-    }
-};

src/services/purchaseService.ts

@@ -11,16 +11,9 @@ import {
 import { getRandomWeightedRewardUc } from "@/src/services/rngService";
 import { applyStandingToVendorManifest, getVendorManifestByOid } from "@/src/services/serversideVendorsService";
 import { IMiscItem } from "@/src/types/inventoryTypes/inventoryTypes";
-import {
-    IPurchaseRequest,
-    IPurchaseResponse,
-    SlotPurchase,
-    IInventoryChanges,
-    PurchaseSource
-} from "@/src/types/purchaseTypes";
+import { IPurchaseRequest, IPurchaseResponse, SlotPurchase, IInventoryChanges } from "@/src/types/purchaseTypes";
 import { logger } from "@/src/utils/logger";
-import { getWorldState } from "./worldStateService";
-import staticWorldState from "@/static/fixed_responses/worldState/worldState.json";
+import worldState from "@/static/fixed_responses/worldState/worldState.json";
 import {
     ExportBoosterPacks,
     ExportBoosters,
@@ -59,7 +52,7 @@ export const handlePurchase = async (
 
     const prePurchaseInventoryChanges: IInventoryChanges = {};
     let seed: bigint | undefined;
-    if (purchaseRequest.PurchaseParams.Source == PurchaseSource.Vendor) {
+    if (purchaseRequest.PurchaseParams.Source == 7) {
         let manifest = getVendorManifestByOid(purchaseRequest.PurchaseParams.SourceId!);
         if (manifest) {
             manifest = applyStandingToVendorManifest(inventory, manifest);
@@ -76,12 +69,18 @@ export const handlePurchase = async (
             }
             if (!config.dontSubtractPurchaseCreditCost) {
                 if (offer.RegularPrice) {
-                    updateCurrency(inventory, offer.RegularPrice[0], false, prePurchaseInventoryChanges);
+                    combineInventoryChanges(
+                        prePurchaseInventoryChanges,
+                        updateCurrency(inventory, offer.RegularPrice[0], false)
+                    );
                 }
             }
             if (!config.dontSubtractPurchasePlatinumCost) {
                 if (offer.PremiumPrice) {
-                    updateCurrency(inventory, offer.PremiumPrice[0], true, prePurchaseInventoryChanges);
+                    combineInventoryChanges(
+                        prePurchaseInventoryChanges,
+                        updateCurrency(inventory, offer.PremiumPrice[0], true)
+                    );
                 }
             }
             if (!config.dontSubtractPurchaseItemCost) {
@@ -167,16 +166,18 @@ export const handlePurchase = async (
     );
     combineInventoryChanges(purchaseResponse.InventoryChanges, prePurchaseInventoryChanges);
 
-    updateCurrency(
+    const currencyChanges = updateCurrency(
         inventory,
         purchaseRequest.PurchaseParams.ExpectedPrice,
-        purchaseRequest.PurchaseParams.UsePremium,
-        prePurchaseInventoryChanges
+        purchaseRequest.PurchaseParams.UsePremium
     );
+    purchaseResponse.InventoryChanges = {
+        ...currencyChanges,
+        ...purchaseResponse.InventoryChanges
+    };
 
     switch (purchaseRequest.PurchaseParams.Source) {
-        case PurchaseSource.VoidTrader: {
-            const worldState = getWorldState();
+        case 1: {
             if (purchaseRequest.PurchaseParams.SourceId! != worldState.VoidTraders[0]._id.$oid) {
                 throw new Error("invalid request source");
             }
@@ -185,7 +186,10 @@ export const handlePurchase = async (
             );
             if (offer) {
                 if (!config.dontSubtractPurchaseCreditCost) {
-                    updateCurrency(inventory, offer.RegularPrice, false, purchaseResponse.InventoryChanges);
+                    combineInventoryChanges(
+                        purchaseResponse.InventoryChanges,
+                        updateCurrency(inventory, offer.RegularPrice, false)
+                    );
                 }
                 if (purchaseRequest.PurchaseParams.ExpectedPrice) {
                     throw new Error(`vendor purchase should not have an expected price`);
@@ -203,7 +207,7 @@ export const handlePurchase = async (
             }
             break;
         }
-        case PurchaseSource.SyndicateFavor:
+        case 2:
             {
                 const syndicateTag = purchaseRequest.PurchaseParams.SyndicateTag!;
                 if (purchaseRequest.PurchaseParams.UseFreeFavor!) {
@@ -240,16 +244,22 @@ export const handlePurchase = async (
                 }
             }
             break;
-        case PurchaseSource.Vendor:
+        case 7:
             if (purchaseRequest.PurchaseParams.SourceId! in ExportVendors) {
                 const vendor = ExportVendors[purchaseRequest.PurchaseParams.SourceId!];
                 const offer = vendor.items.find(x => x.storeItem == purchaseRequest.PurchaseParams.StoreItem);
                 if (offer) {
                     if (typeof offer.credits == "number" && !config.dontSubtractPurchaseCreditCost) {
-                        updateCurrency(inventory, offer.credits, false, purchaseResponse.InventoryChanges);
+                        combineInventoryChanges(
+                            purchaseResponse.InventoryChanges,
+                            updateCurrency(inventory, offer.credits, false)
+                        );
                     }
                     if (typeof offer.platinum == "number" && !config.dontSubtractPurchasePlatinumCost) {
-                        updateCurrency(inventory, offer.platinum, true, purchaseResponse.InventoryChanges);
+                        combineInventoryChanges(
+                            purchaseResponse.InventoryChanges,
+                            updateCurrency(inventory, offer.platinum, true)
+                        );
                     }
                     if (offer.itemPrices && !config.dontSubtractPurchaseItemCost) {
                         handleItemPrices(
@@ -265,15 +275,15 @@ export const handlePurchase = async (
                 throw new Error(`vendor purchase should not have an expected price`);
             }
             break;
-        case PurchaseSource.PrimeVaultTrader: {
-            if (purchaseRequest.PurchaseParams.SourceId! != staticWorldState.PrimeVaultTraders[0]._id.$oid) {
+        case 18: {
+            if (purchaseRequest.PurchaseParams.SourceId! != worldState.PrimeVaultTraders[0]._id.$oid) {
                 throw new Error("invalid request source");
             }
             const offer =
-                staticWorldState.PrimeVaultTraders[0].Manifest.find(
+                worldState.PrimeVaultTraders[0].Manifest.find(
                     x => x.ItemType == purchaseRequest.PurchaseParams.StoreItem
                 ) ??
-                staticWorldState.PrimeVaultTraders[0].EvergreenManifest.find(
+                worldState.PrimeVaultTraders[0].EvergreenManifest.find(
                     x => x.ItemType == purchaseRequest.PurchaseParams.StoreItem
                 );
             if (offer) {

src/services/rngService.ts

@@ -107,16 +107,6 @@ export class SRng {
         return arr[this.randomInt(0, arr.length - 1)];
     }
 
-    randomElementPop<T>(arr: T[]): T | undefined {
-        if (arr.length != 0) {
-            const index = this.randomInt(0, arr.length - 1);
-            const elm = arr[index];
-            arr.splice(index, 1);
-            return elm;
-        }
-        return undefined;
-    }
-
     randomFloat(): number {
         this.state = (0x5851f42d4c957f2dn * this.state + 0x14057b7ef767814fn) & 0xffffffffffffffffn;
         return (Number(this.state >> 38n) & 0xffffff) * 0.000000059604645;

src/services/shipCustomizationsService.ts

@@ -8,12 +8,11 @@ import {
 } from "@/src/types/shipTypes";
 import { logger } from "@/src/utils/logger";
 import { Types } from "mongoose";
-import { addFusionTreasures, addShipDecorations, getInventory } from "./inventoryService";
+import { addShipDecorations, getInventory } from "./inventoryService";
 import { config } from "./configService";
 import { Guild } from "../models/guildModel";
 import { hasGuildPermission } from "./guildService";
 import { GuildPermission } from "../types/guildTypes";
-import { ExportResources } from "warframe-public-export-plus";
 
 export const setShipCustomizations = async (
     accountId: string,
@@ -102,7 +101,6 @@ export const handleSetShipDecorations = async (
             Pos: placedDecoration.Pos,
             Rot: placedDecoration.Rot,
             Scale: placedDecoration.Scale,
-            Sockets: placedDecoration.Sockets,
             _id: placedDecoration.MoveId
         };
 
@@ -118,19 +116,12 @@ export const handleSetShipDecorations = async (
     }
 
     if (placedDecoration.RemoveId) {
-        const decoIndex = roomToPlaceIn.PlacedDecos.findIndex(x => x._id.equals(placedDecoration.RemoveId));
-        const deco = roomToPlaceIn.PlacedDecos[decoIndex];
-        roomToPlaceIn.PlacedDecos.splice(decoIndex, 1);
+        roomToPlaceIn.PlacedDecos.pull({ _id: placedDecoration.RemoveId });
         await personalRooms.save();
 
         if (!config.unlockAllShipDecorations) {
             const inventory = await getInventory(accountId);
-            const itemType = Object.entries(ExportResources).find(arr => arr[1].deco == deco.Type)![0];
-            if (deco.Sockets !== undefined) {
-                addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: deco.Sockets, ItemCount: 1 }]);
-            } else {
-                addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: 1 }]);
-            }
+            addShipDecorations(inventory, [{ ItemType: placedDecoration.Type, ItemCount: 1 }]);
             await inventory.save();
         }
 
@@ -143,14 +134,7 @@ export const handleSetShipDecorations = async (
     } else {
         if (!config.unlockAllShipDecorations) {
             const inventory = await getInventory(accountId);
-            const itemType = Object.entries(ExportResources).find(arr => arr[1].deco == placedDecoration.Type)![0];
-            if (placedDecoration.Sockets !== undefined) {
-                addFusionTreasures(inventory, [
-                    { ItemType: itemType, Sockets: placedDecoration.Sockets, ItemCount: -1 }
-                ]);
-            } else {
-                addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: -1 }]);
-            }
+            addShipDecorations(inventory, [{ ItemType: placedDecoration.Type, ItemCount: -1 }]);
             await inventory.save();
         }
     }
@@ -164,7 +148,6 @@ export const handleSetShipDecorations = async (
         Pos: placedDecoration.Pos,
         Rot: placedDecoration.Rot,
         Scale: placedDecoration.Scale,
-        Sockets: placedDecoration.Sockets,
         _id: decoId
     });
 

src/services/webService.ts

@@ -10,7 +10,7 @@ import { Account } from "../models/loginModel";
 import { createAccount, createNonce, getUsernameFromEmail, isCorrectPassword } from "./loginService";
 import { IDatabaseAccountJson } from "../types/loginTypes";
 import { HydratedDocument } from "mongoose";
-import { Agent, WebSocket as UnidiciWebSocket } from "undici";
+import { Agent, WebSocket } from "undici";
 
 let httpServer: http.Server | undefined;
 let httpsServer: https.Server | undefined;
@@ -46,9 +46,13 @@ export const startWebServer = (): void => {
                 "Access the WebUI in your browser at http://localhost" + (httpPort == 80 ? "" : ":" + httpPort)
             );
 
+            // https://github.com/oven-sh/bun/issues/20547
+            if (!process.versions.bun) {
                 void runWsSelfTest("wss", httpsPort).then(ok => {
                     if (!ok) {
-                    logger.warn(`WSS self-test failed. The server may not actually be reachable at port ${httpsPort}.`);
+                        logger.warn(
+                            `WSS self-test failed. The server may not actually be reachable at port ${httpsPort}.`
+                        );
                         if (process.platform == "win32") {
                             logger.warn(
                                 `You can check who actually has that port via powershell: Get-Process -Id (Get-NetTCPConnection -LocalPort ${httpsPort}).OwningProcess`
@@ -56,35 +60,21 @@ export const startWebServer = (): void => {
                         }
                     }
                 });
+            }
         });
     });
 };
 
 const runWsSelfTest = (protocol: "ws" | "wss", port: number): Promise<boolean> => {
     return new Promise(resolve => {
-        // https://github.com/oven-sh/bun/issues/20547
-        if (process.versions.bun) {
-            const client = new WebSocket(`${protocol}://localhost:${port}/custom/selftest`, {
-                tls: { rejectUnauthorized: false }
-            } as unknown as string);
-            client.onmessage = (e): void => {
-                resolve(e.data == "SpaceNinjaServer");
-            };
-            client.onerror = client.onclose = (): void => {
-                resolve(false);
-            };
-        } else {
         const agent = new Agent({ connect: { rejectUnauthorized: false } });
-            const client = new UnidiciWebSocket(`${protocol}://localhost:${port}/custom/selftest`, {
-                dispatcher: agent
-            });
+        const client = new WebSocket(`${protocol}://localhost:${port}/custom/selftest`, { dispatcher: agent });
         client.onmessage = (e): void => {
             resolve(e.data == "SpaceNinjaServer");
         };
         client.onerror = client.onclose = (): void => {
             resolve(false);
         };
-        }
     });
 };
 

src/services/worldStateService.ts

@@ -1,5 +1,4 @@
 import staticWorldState from "@/static/fixed_responses/worldState/worldState.json";
-import baro from "@/static/fixed_responses/worldState/baro.json";
 import fissureMissions from "@/static/fixed_responses/worldState/fissureMissions.json";
 import sortieTilesets from "@/static/fixed_responses/worldState/sortieTilesets.json";
 import sortieTilesetMissions from "@/static/fixed_responses/worldState/sortieTilesetMissions.json";
@@ -20,8 +19,6 @@ import {
     ISyndicateMissionInfo,
     ITmp,
     IVoidStorm,
-    IVoidTrader,
-    IVoidTraderOffer,
     IWorldState,
     TCircuitGameMode
 } from "../types/worldStateTypes";
@@ -101,7 +98,7 @@ const sortieBossNode: Record<Exclude<TSortieBoss, "SORTIE_BOSS_CORRUPTED_VOR">,
     SORTIE_BOSS_VOR: "SolNode108"
 };
 
-const eidolonJobs: readonly string[] = [
+const eidolonJobs = [
     "/Lotus/Types/Gameplay/Eidolon/Jobs/AssassinateBountyAss",
     "/Lotus/Types/Gameplay/Eidolon/Jobs/AssassinateBountyCap",
     "/Lotus/Types/Gameplay/Eidolon/Jobs/AttritionBountySab",
@@ -117,14 +114,14 @@ const eidolonJobs: readonly string[] = [
     "/Lotus/Types/Gameplay/Eidolon/Jobs/RescueBountyResc"
 ];
 
-const eidolonNarmerJobs: readonly string[] = [
+const eidolonNarmerJobs = [
     "/Lotus/Types/Gameplay/Eidolon/Jobs/Narmer/AssassinateBountyAss",
     "/Lotus/Types/Gameplay/Eidolon/Jobs/Narmer/AttritionBountyExt",
     "/Lotus/Types/Gameplay/Eidolon/Jobs/Narmer/ReclamationBountyTheft",
     "/Lotus/Types/Gameplay/Eidolon/Jobs/Narmer/AttritionBountyLib"
 ];
 
-const venusJobs: readonly string[] = [
+const venusJobs = [
     "/Lotus/Types/Gameplay/Venus/Jobs/VenusArtifactJobAmbush",
     "/Lotus/Types/Gameplay/Venus/Jobs/VenusArtifactJobExcavation",
     "/Lotus/Types/Gameplay/Venus/Jobs/VenusArtifactJobRecovery",
@@ -150,14 +147,14 @@ const venusJobs: readonly string[] = [
     "/Lotus/Types/Gameplay/Venus/Jobs/VenusWetworkJobSpy"
 ];
 
-const venusNarmerJobs: readonly string[] = [
+const venusNarmerJobs = [
     "/Lotus/Types/Gameplay/Venus/Jobs/Narmer/NarmerVenusCullJobAssassinate",
     "/Lotus/Types/Gameplay/Venus/Jobs/Narmer/NarmerVenusCullJobExterminate",
     "/Lotus/Types/Gameplay/Venus/Jobs/Narmer/NarmerVenusPreservationJobDefense",
     "/Lotus/Types/Gameplay/Venus/Jobs/Narmer/NarmerVenusTheftJobExcavation"
 ];
 
-const microplanetJobs: readonly string[] = [
+const microplanetJobs = [
     "/Lotus/Types/Gameplay/InfestedMicroplanet/Jobs/DeimosAreaDefenseBounty",
     "/Lotus/Types/Gameplay/InfestedMicroplanet/Jobs/DeimosAssassinateBounty",
     "/Lotus/Types/Gameplay/InfestedMicroplanet/Jobs/DeimosCrpSurvivorBounty",
@@ -167,7 +164,7 @@ const microplanetJobs: readonly string[] = [
     "/Lotus/Types/Gameplay/InfestedMicroplanet/Jobs/DeimosPurifyBounty"
 ];
 
-const microplanetEndlessJobs: readonly string[] = [
+const microplanetEndlessJobs = [
     "/Lotus/Types/Gameplay/InfestedMicroplanet/Jobs/DeimosEndlessAreaDefenseBounty",
     "/Lotus/Types/Gameplay/InfestedMicroplanet/Jobs/DeimosEndlessExcavateBounty",
     "/Lotus/Types/Gameplay/InfestedMicroplanet/Jobs/DeimosEndlessPurifyBounty"
@@ -498,7 +495,6 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
 
     {
         const rng = new SRng(seed);
-        const pool = [...eidolonJobs];
         syndicateMissions.push({
             _id: {
                 $oid: ((bountyCycleStart / 1000) & 0xffffffff).toString(16).padStart(8, "0") + "0000000000000008"
@@ -510,7 +506,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
             Nodes: [],
             Jobs: [
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(eidolonJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/EidolonJobMissionRewards/TierATable${table}Rewards`,
                     masteryReq: 0,
                     minEnemyLevel: 5,
@@ -518,7 +514,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     xpAmounts: generateXpAmounts(rng, 3, 1000, 1500)
                 },
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(eidolonJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/EidolonJobMissionRewards/TierBTable${table}Rewards`,
                     masteryReq: 1,
                     minEnemyLevel: 10,
@@ -526,7 +522,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     xpAmounts: generateXpAmounts(rng, 3, 1750, 2250)
                 },
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(eidolonJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/EidolonJobMissionRewards/TierCTable${table}Rewards`,
                     masteryReq: 2,
                     minEnemyLevel: 20,
@@ -534,7 +530,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     xpAmounts: generateXpAmounts(rng, 4, 2500, 3000)
                 },
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(eidolonJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/EidolonJobMissionRewards/TierDTable${table}Rewards`,
                     masteryReq: 3,
                     minEnemyLevel: 30,
@@ -542,7 +538,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     xpAmounts: generateXpAmounts(rng, 5, 3250, 3750)
                 },
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(eidolonJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/EidolonJobMissionRewards/TierETable${table}Rewards`,
                     masteryReq: 5,
                     minEnemyLevel: 40,
@@ -550,7 +546,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     xpAmounts: generateXpAmounts(rng, 5, 4000, 4500)
                 },
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(eidolonJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/EidolonJobMissionRewards/TierETable${table}Rewards`,
                     masteryReq: 10,
                     minEnemyLevel: 100,
@@ -571,7 +567,6 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
 
     {
         const rng = new SRng(seed);
-        const pool = [...venusJobs];
         syndicateMissions.push({
             _id: {
                 $oid: ((bountyCycleStart / 1000) & 0xffffffff).toString(16).padStart(8, "0") + "0000000000000025"
@@ -583,7 +578,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
             Nodes: [],
             Jobs: [
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(venusJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierATable${table}Rewards`,
                     masteryReq: 0,
                     minEnemyLevel: 5,
@@ -591,7 +586,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     xpAmounts: generateXpAmounts(rng, 3, 1000, 1500)
                 },
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(venusJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierBTable${table}Rewards`,
                     masteryReq: 1,
                     minEnemyLevel: 10,
@@ -599,7 +594,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     xpAmounts: generateXpAmounts(rng, 3, 1750, 2250)
                 },
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(venusJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierCTable${table}Rewards`,
                     masteryReq: 2,
                     minEnemyLevel: 20,
@@ -607,7 +602,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     xpAmounts: generateXpAmounts(rng, 4, 2500, 3000)
                 },
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(venusJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierDTable${table}Rewards`,
                     masteryReq: 3,
                     minEnemyLevel: 30,
@@ -615,7 +610,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     xpAmounts: generateXpAmounts(rng, 5, 3250, 3750)
                 },
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(venusJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierETable${table}Rewards`,
                     masteryReq: 5,
                     minEnemyLevel: 40,
@@ -623,7 +618,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     xpAmounts: generateXpAmounts(rng, 5, 4000, 4500)
                 },
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(venusJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierETable${table}Rewards`,
                     masteryReq: 10,
                     minEnemyLevel: 100,
@@ -644,7 +639,6 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
 
     {
         const rng = new SRng(seed);
-        const pool = [...microplanetJobs];
         syndicateMissions.push({
             _id: {
                 $oid: ((bountyCycleStart / 1000) & 0xffffffff).toString(16).padStart(8, "0") + "0000000000000002"
@@ -656,7 +650,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
             Nodes: [],
             Jobs: [
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(microplanetJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/DeimosMissionRewards/TierATable${table}Rewards`,
                     masteryReq: 0,
                     minEnemyLevel: 5,
@@ -664,7 +658,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     xpAmounts: generateXpAmounts(rng, 3, 12, 18)
                 },
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(microplanetJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/DeimosMissionRewards/TierCTable${table}Rewards`,
                     masteryReq: 1,
                     minEnemyLevel: 15,
@@ -681,7 +675,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     xpAmounts: [14, 14, 14]
                 },
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(microplanetJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/DeimosMissionRewards/TierDTable${deimosDTable}Rewards`,
                     masteryReq: 2,
                     minEnemyLevel: 30,
@@ -689,7 +683,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     xpAmounts: generateXpAmounts(rng, 4, 72, 88)
                 },
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(microplanetJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/DeimosMissionRewards/TierETableARewards`,
                     masteryReq: 3,
                     minEnemyLevel: 40,
@@ -697,7 +691,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     xpAmounts: generateXpAmounts(rng, 5, 115, 135)
                 },
                 {
-                    jobType: rng.randomElementPop(pool),
+                    jobType: rng.randomElement(microplanetJobs),
                     rewards: `/Lotus/Types/Game/MissionDecks/DeimosMissionRewards/TierETableARewards`,
                     masteryReq: 10,
                     minEnemyLevel: 100,
@@ -1120,7 +1114,6 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
         LiteSorties: [],
         ActiveMissions: [],
         GlobalUpgrades: [],
-        VoidTraders: [],
         VoidStorms: [],
         EndlessXpChoices: [],
         KnownCalendarSeasons: [],
@@ -1149,77 +1142,6 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
             Node: "SolarisUnitedHub1"
         });
     }
-    // The client gets kinda confused when multiple goals have the same tag, so considering these mutually exclusive.
-    if (config.worldState?.galleonOfGhouls == 1) {
-        worldState.Goals.push({
-            _id: { $oid: "6814ddf00000000000000000" },
-            Activation: { $date: { $numberLong: "1746198000000" } },
-            Expiry: { $date: { $numberLong: "2000000000000" } },
-            Count: 0,
-            Goal: 1,
-            Success: 0,
-            Personal: true,
-            Bounty: true,
-            ClampNodeScores: true,
-            Node: "EventNode19",
-            MissionKeyName: "/Lotus/Types/Keys/GalleonRobberyAlert",
-            Desc: "/Lotus/Language/Events/GalleonRobberyEventMissionTitle",
-            Icon: "/Lotus/Interface/Icons/Player/GalleonRobberiesEvent.png",
-            Tag: "GalleonRobbery",
-            Reward: {
-                items: [
-                    "/Lotus/StoreItems/Types/Recipes/Weapons/GrnChainSawTonfaBlueprint",
-                    "/Lotus/StoreItems/Upgrades/Skins/Clan/BountyHunterBadgeItem"
-                ]
-            }
-        });
-    } else if (config.worldState?.galleonOfGhouls == 2) {
-        worldState.Goals.push({
-            _id: { $oid: "681e18700000000000000000" },
-            Activation: { $date: { $numberLong: "1746802800000" } },
-            Expiry: { $date: { $numberLong: "2000000000000" } },
-            Count: 0,
-            Goal: 1,
-            Success: 0,
-            Personal: true,
-            Bounty: true,
-            ClampNodeScores: true,
-            Node: "EventNode28",
-            MissionKeyName: "/Lotus/Types/Keys/GalleonRobberyAlertB",
-            Desc: "/Lotus/Language/Events/GalleonRobberyEventMissionTitle",
-            Icon: "/Lotus/Interface/Icons/Player/GalleonRobberiesEvent.png",
-            Tag: "GalleonRobbery",
-            Reward: {
-                items: [
-                    "/Lotus/StoreItems/Types/Recipes/Weapons/MortiforShieldAndSwordBlueprint",
-                    "/Lotus/StoreItems/Upgrades/Skins/Clan/BountyHunterBadgeItem"
-                ]
-            }
-        });
-    } else if (config.worldState?.galleonOfGhouls == 3) {
-        worldState.Goals.push({
-            _id: { $oid: "682752f00000000000000000" },
-            Activation: { $date: { $numberLong: "1747407600000" } },
-            Expiry: { $date: { $numberLong: "2000000000000" } },
-            Count: 0,
-            Goal: 1,
-            Success: 0,
-            Personal: true,
-            Bounty: true,
-            ClampNodeScores: true,
-            Node: "EventNode19",
-            MissionKeyName: "/Lotus/Types/Keys/GalleonRobberyAlertC",
-            Desc: "/Lotus/Language/Events/GalleonRobberyEventMissionTitle",
-            Icon: "/Lotus/Interface/Icons/Player/GalleonRobberiesEvent.png",
-            Tag: "GalleonRobbery",
-            Reward: {
-                items: [
-                    "/Lotus/Types/StoreItems/Packages/EventCatalystReactorBundle",
-                    "/Lotus/StoreItems/Upgrades/Skins/Clan/BountyHunterBadgeItem"
-                ]
-            }
-        });
-    }
 
     // Nightwave Challenges
     const nightwaveSyndicateTag = getNightwaveSyndicateTag(buildLabel);
@@ -1320,77 +1242,6 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
         });
     }
 
-    // Baro
-    {
-        const baroIndex = Math.trunc((Date.now() - 910800000) / (unixTimesInMs.day * 14));
-        const baroStart = baroIndex * (unixTimesInMs.day * 14) + 910800000;
-        const baroActualStart = baroStart + unixTimesInMs.day * (config.baroAlwaysAvailable ? 0 : 12);
-        const baroEnd = baroStart + unixTimesInMs.day * 14;
-        const baroNode = ["EarthHUB", "MercuryHUB", "SaturnHUB", "PlutoHUB"][baroIndex % 4];
-        const vt: IVoidTrader = {
-            _id: { $oid: ((baroStart / 1000) & 0xffffffff).toString(16).padStart(8, "0") + "493c96d6067610bc" },
-            Activation: { $date: { $numberLong: baroActualStart.toString() } },
-            Expiry: { $date: { $numberLong: baroEnd.toString() } },
-            Character: "Baro'Ki Teel",
-            Node: baroNode,
-            Manifest: []
-        };
-        worldState.VoidTraders.push(vt);
-        if (isBeforeNextExpectedWorldStateRefresh(timeMs, baroActualStart)) {
-            vt.Manifest = [];
-            if (config.baroFullyStocked) {
-                for (const armorSet of baro.armorSets) {
-                    if (Array.isArray(armorSet[0])) {
-                        for (const set of armorSet as IVoidTraderOffer[][]) {
-                            for (const item of set) {
-                                vt.Manifest.push(item);
-                            }
-                        }
-                    } else {
-                        for (const item of armorSet as IVoidTraderOffer[]) {
-                            vt.Manifest.push(item);
-                        }
-                    }
-                }
-                for (const item of baro.rest) {
-                    vt.Manifest.push(item);
-                }
-            } else {
-                const rng = new SRng(new SRng(baroIndex).randomInt(0, 100_000));
-                // TOVERIFY: Constraint for upgrades amount?
-                // TOVERIFY: Constraint for weapon amount?
-                // TOVERIFY: Constraint for relics amount?
-                let armorSet = rng.randomElement(baro.armorSets)!;
-                if (Array.isArray(armorSet[0])) {
-                    armorSet = rng.randomElement(baro.armorSets)!;
-                }
-                while (vt.Manifest.length + armorSet.length < 31) {
-                    const item = rng.randomElement(baro.rest)!;
-                    if (vt.Manifest.indexOf(item) == -1) {
-                        const set = baro.allIfAny.find(set => set.indexOf(item.ItemType) != -1);
-                        if (set) {
-                            for (const itemType of set) {
-                                vt.Manifest.push(baro.rest.find(x => x.ItemType == itemType)!);
-                            }
-                        } else {
-                            vt.Manifest.push(item);
-                        }
-                    }
-                }
-                const overflow = 31 - (vt.Manifest.length + armorSet.length);
-                if (overflow > 0) {
-                    vt.Manifest.splice(0, overflow);
-                }
-                for (const armor of armorSet) {
-                    vt.Manifest.push(armor as IVoidTraderOffer);
-                }
-            }
-            for (const item of baro.evergreen) {
-                vt.Manifest.push(item);
-            }
-        }
-    }
-
     // Sortie & syndicate missions cycling every day (at 16:00 or 17:00 UTC depending on if London, OT is observing DST)
     {
         const rollover = getSortieTime(day);
@@ -1474,17 +1325,6 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
     const cheeseInterval = hourInSeconds * 8;
     const cheeseDuration = hourInSeconds * 2;
     const cheeseIndex = Math.trunc(timeSecs / cheeseInterval);
-    let cheeseStart = cheeseIndex * cheeseInterval;
-    let cheeseEnd = cheeseStart + cheeseDuration;
-    let cheeseNext = (cheeseIndex + 1) * cheeseInterval;
-    // Live servers only update the start time once it happens, which makes the
-    // client show a negative countdown during off-hours. Optionally adjust the
-    // times so the next activation is always in the future.
-    if (config.unfaithfulBugFixes?.fixXtraCheeseTimer && timeSecs >= cheeseEnd) {
-        cheeseStart = cheeseNext;
-        cheeseEnd = cheeseStart + cheeseDuration;
-        cheeseNext += cheeseInterval;
-    }
     const tmp: ITmp = {
         cavabegin: "1690761600",
         PurchasePlatformLockEnabled: true,
@@ -1509,9 +1349,9 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
         ennnd: true,
         mbrt: true,
         fbst: {
-            a: cheeseStart,
-            e: cheeseEnd,
-            n: cheeseNext
+            a: cheeseIndex * cheeseInterval, // This has a bug where the client shows a negative time for "Xtra cheese starts in ..." until it refreshes the world state. This is because we're only providing the new activation as soon as that time/date is reached. However, this is 100% faithful to live.
+            e: cheeseIndex * cheeseInterval + cheeseDuration,
+            n: (cheeseIndex + 1) * cheeseInterval
         },
         sfn: [550, 553, 554, 555][halfHour % 4]
     };

src/types/inventoryTypes/inventoryTypes.ts

@@ -56,7 +56,6 @@ export interface IInventoryDatabase
             | "QualifyingInvasions"
             | "LastInventorySync"
             | "EndlessXP"
-            | "PersonalGoalProgress"
             | TEquipmentKey
         >,
         InventoryDatabaseEquipment {
@@ -64,7 +63,7 @@ export interface IInventoryDatabase
     Created: Date;
     TrainingDate: Date;
     LoadOutPresets: Types.ObjectId; // LoadOutPresets changed from ILoadOutPresets to Types.ObjectId for population
-    //Mailbox?: IMailboxDatabase;
+    Mailbox?: IMailboxDatabase;
     GuildId?: Types.ObjectId;
     PendingRecipes: IPendingRecipeDatabase[];
     QuestKeys: IQuestKeyDatabase[];
@@ -96,7 +95,6 @@ export interface IInventoryDatabase
     QualifyingInvasions: IInvasionProgressDatabase[];
     LastInventorySync?: Types.ObjectId;
     EndlessXP?: IEndlessXpProgressDatabase[];
-    PersonalGoalProgress?: IPersonalGoalProgressDatabase[];
 }
 
 export interface IQuestKeyDatabase {
@@ -152,9 +150,9 @@ export interface IMailboxClient {
     LastInboxId: IOid;
 }
 
-/*export interface IMailboxDatabase {
+export interface IMailboxDatabase {
     LastInboxId: Types.ObjectId;
-}*/
+}
 
 export type TSolarMapRegion =
     | "Earth"
@@ -308,7 +306,7 @@ export interface IInventoryClient extends IDailyAffiliations, InventoryClientEqu
     HWIDProtectEnabled?: boolean;
     //KubrowPetPrints: IKubrowPetPrint[];
     AlignmentReplay?: IAlignment;
-    PersonalGoalProgress?: IPersonalGoalProgressClient[];
+    //PersonalGoalProgress: IPersonalGoalProgress[];
     ThemeStyle: string;
     ThemeBackground: string;
     ThemeSounds: string;
@@ -1017,17 +1015,13 @@ export interface IPeriodicMissionCompletionResponse extends Omit<IPeriodicMissio
     date: IMongoDate;
 }
 
-export interface IPersonalGoalProgressClient {
-    Best: number;
+export interface IPersonalGoalProgress {
     Count: number;
     Tag: string;
+    Best?: number;
     _id: IOid;
-    //ReceivedClanReward0?: boolean;
-    //ReceivedClanReward1?: boolean;
-}
-
-export interface IPersonalGoalProgressDatabase extends Omit<IPersonalGoalProgressClient, "_id"> {
-    goalId: Types.ObjectId;
+    ReceivedClanReward0?: boolean;
+    ReceivedClanReward1?: boolean;
 }
 
 export interface IPersonalTechProjectDatabase {

src/types/purchaseTypes.ts

@@ -10,42 +10,14 @@ import {
     ICrewMemberClient
 } from "./inventoryTypes/inventoryTypes";
 
-export enum PurchaseSource {
-    Market = 0,
-    VoidTrader = 1,
-    SyndicateFavor = 2,
-    DailyDeal = 3,
-    Arsenal = 4,
-    Profile = 5,
-    Hub = 6,
-    Vendor = 7,
-    AppearancePreview = 8,
-    Museum = 9,
-    Operator = 10,
-    PlayerShip = 11,
-    Crewship = 12,
-    MenuStyle = 13,
-    MenuHud = 14,
-    Chat = 15,
-    Inventory = 16,
-    StarChart = 17,
-    PrimeVaultTrader = 18,
-    Incubator = 19,
-    Prompt = 20,
-    Kaithe = 21,
-    DuviriWeapon = 22,
-    UpdateScreen = 23,
-    Motorcycle = 24
-}
-
 export interface IPurchaseRequest {
     PurchaseParams: IPurchaseParams;
     buildLabel: string;
 }
 
 export interface IPurchaseParams {
-    Source: PurchaseSource;
-    SourceId?: string; // VoidTrader, Vendor, PrimeVaultTrader
+    Source: number;
+    SourceId?: string; // for Source 1, 7 & 18
     StoreItem: string;
     StorePage: string;
     SearchTerm: string;
@@ -53,10 +25,10 @@ export interface IPurchaseParams {
     Quantity: number;
     UsePremium: boolean;
     ExpectedPrice: number;
-    SyndicateTag?: string; // SyndicateFavor
-    UseFreeFavor?: boolean; // SyndicateFavor
-    ExtraPurchaseInfoJson?: string; // Vendor
-    IsWeekly?: boolean; // Vendor
+    SyndicateTag?: string; // for Source 2
+    UseFreeFavor?: boolean; // for Source 2
+    ExtraPurchaseInfoJson?: string; // for Source 7
+    IsWeekly?: boolean; // for Source 7
 }
 
 export type IInventoryChanges = {

src/types/requestTypes.ts

@@ -139,14 +139,6 @@ export type IMissionInventoryUpdateRequest = {
     };
     wagerTier?: number; // the index
     creditsFee?: number; // the index
-    GoalProgress?: {
-        _id: IOid;
-        Count: number;
-        Best: number;
-        Tag: string;
-        IsMultiProgress: boolean;
-        MultiProgress: unknown[];
-    }[];
     InvasionProgress?: IInvasionProgressClient[];
     ConquestMissionsCompleted?: number;
     duviriSuitSelection?: string;
@@ -164,8 +156,6 @@ export type IMissionInventoryUpdateRequest = {
 
 export interface IRewardInfo {
     node: string;
-    goalId?: string;
-    goalManifest?: string;
     invasionId?: string;
     invasionAllyFaction?: "FC_GRINEER" | "FC_CORPUS";
     sortieId?: string;

src/types/shipTypes.ts

@@ -96,7 +96,6 @@ export interface IPlacedDecosDatabase {
     Pos: [number, number, number];
     Rot: [number, number, number];
     Scale?: number;
-    Sockets?: number;
     PictureFrameInfo?: IPictureFrameInfo;
     _id: Types.ObjectId;
 }
@@ -137,7 +136,6 @@ export interface IShipDecorationsRequest {
     MoveId?: string;
     OldRoom?: string;
     Scale?: number;
-    Sockets?: number;
 }
 
 export interface IShipDecorationsResponse {

src/types/worldStateTypes.ts

@@ -1,4 +1,3 @@
-import { IMissionReward } from "warframe-public-export-plus";
 import { IMongoDate, IOid } from "./commonTypes";
 
 export interface IWorldState {
@@ -13,7 +12,6 @@ export interface IWorldState {
     ActiveMissions: IFissure[];
     GlobalUpgrades: IGlobalUpgrade[];
     NodeOverrides: INodeOverride[];
-    VoidTraders: IVoidTrader[];
     VoidStorms: IVoidStorm[];
     PVPChallengeInstances: IPVPChallengeInstance[];
     EndlessXpChoices: IEndlessXpChoice[];
@@ -38,15 +36,11 @@ export interface IGoal {
     Goal: number;
     Success: number;
     Personal: boolean;
-    Bounty?: boolean;
-    ClampNodeScores?: boolean;
     Desc: string;
-    ToolTip?: string;
+    ToolTip: string;
     Icon: string;
     Tag: string;
     Node: string;
-    MissionKeyName?: string;
-    Reward?: IMissionReward;
 }
 
 export interface ISyndicateMissionInfo {
@@ -146,21 +140,6 @@ export interface ILiteSortie {
     }[];
 }
 
-export interface IVoidTrader {
-    _id: IOid;
-    Activation: IMongoDate;
-    Expiry: IMongoDate;
-    Character: string;
-    Node: string;
-    Manifest: IVoidTraderOffer[];
-}
-
-export interface IVoidTraderOffer {
-    ItemType: string;
-    PrimePrice: number;
-    RegularPrice: number;
-}
-
 export interface IVoidStorm {
     _id: IOid;
     Node: string;

static/fixed_responses/eventMessages.json

@@ -0,0 +1,12 @@
+{
+  "Messages": [
+    {
+      "sub": "Welcome to Space Ninja Server",
+      "sndr": "/Lotus/Language/Bosses/Ordis",
+      "msg": "Enjoy your Space Ninja Experience",
+      "icon": "/Lotus/Interface/Icons/Npcs/Ordis.png",
+      "eventMessageDate": "2025-01-30T13:00:00.000Z",
+      "r": false
+    }
+  ]
+}

static/fixed_responses/worldState/baro.json

@@ -1,413 +0,0 @@
-{
-  "evergreen": [
-    { "ItemType": "/Lotus/StoreItems/Types/Keys/MummyQuestKeyBlueprint", "PrimePrice": 100, "RegularPrice": 25000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Effects/FootstepsMaple", "PrimePrice": 15, "RegularPrice": 1000 }
-  ],
-  "armorSets": [
-    [
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/BaroArmour/BaroArmourA", "PrimePrice": 350, "RegularPrice": 110000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/BaroArmour/BaroArmourC", "PrimePrice": 150, "RegularPrice": 250000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/BaroArmour/BaroArmourL", "PrimePrice": 300, "RegularPrice": 150000 }
-    ],
-    [
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/BaroArmourTwo/BaroArmourTwoA", "PrimePrice": 310, "RegularPrice": 100000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/BaroArmourTwo/BaroArmourTwoC", "PrimePrice": 175, "RegularPrice": 200000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/BaroArmourTwo/BaroArmourTwoL", "PrimePrice": 225, "RegularPrice": 150000 }
-    ],
-    [
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/BaroArmourThree/BaroArmourThreeA", "PrimePrice": 400, "RegularPrice": 350000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/BaroArmourThree/BaroArmourThreeC", "PrimePrice": 350, "RegularPrice": 300000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/BaroArmourThree/BaroArmourThreeL", "PrimePrice": 400, "RegularPrice": 350000 }
-    ],
-    [
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/FurisArmor/PrismaFurisAArmor", "PrimePrice": 300, "RegularPrice": 200000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/FurisArmor/PrismaFurisCArmor", "PrimePrice": 250, "RegularPrice": 220000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/FurisArmor/PrismaFurisLArmor", "PrimePrice": 225, "RegularPrice": 175000 }
-    ],
-    [
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/GrineerTurbines/WraithTurbinesArmArmor", "PrimePrice": 350, "RegularPrice": 150000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/GrineerTurbines/WraithTurbinesChestArmor", "PrimePrice": 300, "RegularPrice": 250000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/GrineerTurbines/WraithTurbinesLegArmor", "PrimePrice": 350, "RegularPrice": 150000 }
-    ],
-    [
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/NecraArmor/NecraArmorA", "PrimePrice": 315, "RegularPrice": 215000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/NecraArmor/NecraArmorC", "PrimePrice": 325, "RegularPrice": 250000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/NecraArmor/NecraArmorL", "PrimePrice": 300, "RegularPrice": 200000 }
-    ],
-    [
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/SetThreeWinged/VTSetThreeArmLeftArmor", "PrimePrice": 65, "RegularPrice": 75000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/SetThreeWinged/VTSetThreeArmRightArmor", "PrimePrice": 65, "RegularPrice": 75000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/SetThreeWinged/VTSetThreeChestArmor", "PrimePrice": 150, "RegularPrice": 100000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/SetThreeWinged/VTSetThreeLegLeftArmor", "PrimePrice": 65, "RegularPrice": 75000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/SetThreeWinged/VTSetThreeLegRightArmor", "PrimePrice": 65, "RegularPrice": 75000 }
-    ],
-    [
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/SetTwoSamurai/VTSetTwoArmLeftArmor", "PrimePrice": 100, "RegularPrice": 55000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/SetTwoSamurai/VTSetTwoArmRightArmor", "PrimePrice": 100, "RegularPrice": 55000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/SetTwoSamurai/VTSetTwoChestArmor", "PrimePrice": 225, "RegularPrice": 250000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/SetTwoSamurai/VTSetTwoLegLeftArmor", "PrimePrice": 100, "RegularPrice": 55000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/SetTwoSamurai/VTSetTwoLegRightArmor", "PrimePrice": 100, "RegularPrice": 55000 }
-    ],
-    [
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/TnLatronArmor/TnLatronArmArmorElixis", "PrimePrice": 325, "RegularPrice": 220000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/TnLatronArmor/TnLatronArmArmorPrisma", "PrimePrice": 325, "RegularPrice": 220000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/TnLatronArmor/TnLatronChestArmorElixis", "PrimePrice": 275, "RegularPrice": 200000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/TnLatronArmor/TnLatronChestArmorPrisma", "PrimePrice": 275, "RegularPrice": 200000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/TnLatronArmor/TnLatronLegArmorElixis", "PrimePrice": 300, "RegularPrice": 175000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/TnLatronArmor/TnLatronLegArmorPrisma", "PrimePrice": 300, "RegularPrice": 175000 }
-    ],
-    [
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/TnShinaiArmor/TnShinaiArmorA", "PrimePrice": 315, "RegularPrice": 125000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/TnShinaiArmor/TnShinaiArmorC", "PrimePrice": 300, "RegularPrice": 150000 },
-      { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/TnShinaiArmor/TnShinaiArmorL", "PrimePrice": 275, "RegularPrice": 115000 }
-    ],
-    [
-      [{ "ItemType": "/Lotus/Types/StoreItems/Packages/VTEosArmourBundle", "PrimePrice": 285, "RegularPrice": 260000 }],
-      [
-        { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/VTEos/VTEosALArmor", "PrimePrice": 50, "RegularPrice": 75000 },
-        { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/VTEos/VTEosARArmor", "PrimePrice": 50, "RegularPrice": 75000 },
-        { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/VTEos/VTEosChestArmor", "PrimePrice": 125, "RegularPrice": 75000 },
-        { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/VTEos/VTEosLLArmor", "PrimePrice": 65, "RegularPrice": 50000 },
-        { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/VTEos/VTEosLRArmor", "PrimePrice": 65, "RegularPrice": 50000 }
-      ]
-    ]
-  ],
-  "rest": [
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Armor/Halloween2014Wings/PrismaNaberusArmArmor", "PrimePrice": 220, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/AvatarImages/TennoCon2024GlyphAlt", "PrimePrice": 15, "RegularPrice": 1000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/Emotes/Tennocon2024EmoteAlt", "PrimePrice": 15, "RegularPrice": 1000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/HeartOfDeimosAlbumCoverPoster", "PrimePrice": 80, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/TarotCardTennoConC", "PrimePrice": 75, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/TarotCardTennoConJ", "PrimePrice": 75, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/TarotCardTennoConH", "PrimePrice": 75, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Game/Projections/T3VoidProjectionVoltOdonataPrimeBronze", "PrimePrice": 125, "RegularPrice": 55000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Game/Projections/T4VoidProjectionVoltOdonataPrimeBronze", "PrimePrice": 125, "RegularPrice": 55000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Game/Projections/T4VoidProjectionMagNovaVaultBBronze", "PrimePrice": 125, "RegularPrice": 55000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Scarves/SolsticeNelumboCape", "PrimePrice": 325, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/SummerSolstice/SummerSolsticeTwinGrakatas", "PrimePrice": 300, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Weapons/Staff/TnRibbonStaffSkin", "PrimePrice": 350, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Grineer/Melee/GunBlade/GrnGunBlade/GrnGunblade", "PrimePrice": 550, "RegularPrice": 325000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Corpus/LongGuns/CrpBFG/Vandal/VandalCrpBFG", "PrimePrice": 650, "RegularPrice": 550000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/Event/AmbulasEvent/Expert/SecondaryExplosionRadiusModExpert", "PrimePrice": 350, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Clan/Dragon2024BadgeItem", "PrimePrice": 55, "RegularPrice": 45000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Archwing/Rifle/PrimedArchwingDamageOnReloadMod", "PrimePrice": 375, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Archwing/Rifle/PrimedArchwingRifleFireIterationsMod", "PrimePrice": 400, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/AvatarImages/AvatarImageBaruukDoanStyle", "PrimePrice": 75, "RegularPrice": 60000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/OctaviaBobbleHead", "PrimePrice": 50, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sentinels/Skins/GaussSentinelSkin", "PrimePrice": 500, "RegularPrice": 425000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sigils/PrismaLotusVinesSigil", "PrimePrice": 55, "RegularPrice": 60000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/AvatarImages/AvatarImageExcaliburActionProto", "PrimePrice": 75, "RegularPrice": 60000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/AvatarImages/AvatarImageIvaraAction", "PrimePrice": 75, "RegularPrice": 60000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Scarves/HornSkullScarf", "PrimePrice": 325, "RegularPrice": 350000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sigils/RhinoDeluxeSigil", "PrimePrice": 45, "RegularPrice": 55000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Events/InfQuantaInfestedAladV", "PrimePrice": 325, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/JavisExperimentsPosterD", "PrimePrice": 90, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/JavisExperimentsPosterB", "PrimePrice": 90, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/JavisExperimentsPosterC", "PrimePrice": 90, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/Expert/PrimedWeaponElectricityDamageMod", "PrimePrice": 350, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Warframe/Expert/AvatarShieldMaxModExpert", "PrimePrice": 350, "RegularPrice": 225000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/JavisExperimentsPosterA", "PrimePrice": 90, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sigils/EventSigilScarletSpear", "PrimePrice": 45, "RegularPrice": 45000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Grineer/LongGuns/GrnOrokinRifle/GrnOrokinRifleWeapon", "PrimePrice": 675, "RegularPrice": 625000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/ElixisNikana", "PrimePrice": 375, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sentinels/Wings/GaussSentinelWings", "PrimePrice": 400, "RegularPrice": 500000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sentinels/Tails/GaussSentinelTail", "PrimePrice": 400, "RegularPrice": 500000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sentinels/Masks/GaussSentinelMask", "PrimePrice": 450, "RegularPrice": 400000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/LisetPropGrineerCutter", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Clan/CNY2023EmblemItem", "PrimePrice": 55, "RegularPrice": 45000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sigils/WeGameNewYearFreeTigerSigil", "PrimePrice": 55, "RegularPrice": 45000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Clan/CNY2022EmblemItem", "PrimePrice": 55, "RegularPrice": 45000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/Leverian/IvaraLeverianPovisRecordsDecoration", "PrimePrice": 75, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Operator/Hoods/HoodDuviriOperator", "PrimePrice": 550, "RegularPrice": 500000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Corpus/Melee/CrpTonfa/CrpPrismaTonfa", "PrimePrice": 450, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/LisetPropCleaningDroneDuviri", "PrimePrice": 800, "RegularPrice": 650000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Operator/Accessories/AshLevarianTiara", "PrimePrice": 550, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Effects/BaroEphemeraB", "PrimePrice": 250, "RegularPrice": 350000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Promo/Warframe/PromoParis", "PrimePrice": 315, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sigils/ThraxSigil", "PrimePrice": 50, "RegularPrice": 55000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Corpus/Bow/Longbow/PrismaLenz/PrismaLenzWeapon", "PrimePrice": 575, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/Vignettes/Warframes/ArchwingAFItem", "PrimePrice": 100, "RegularPrice": 330000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Game/QuartersWallpapers/LavosAlchemistWallpaper", "PrimePrice": 275, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/GrendelOrokinDishSet", "PrimePrice": 110, "RegularPrice": 130000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/SuitCustomizations/ColourPickerKiteerItemB", "PrimePrice": 200, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/NezhaEtchingsTablets", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/GaussTowerOfAltraDeco", "PrimePrice": 110, "RegularPrice": 125000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/BaroPlanter", "PrimePrice": 125, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/BaroPedestal", "PrimePrice": 150, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Operator/Leggings/LeggingsNovaEngineer", "PrimePrice": 300, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Operator/BodySuits/BodySuitNovaEngineer", "PrimePrice": 300, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Operator/Sleeves/SleevesNovaEngineer", "PrimePrice": 300, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Operator/Hoods/HoodNovaEngineer", "PrimePrice": 350, "RegularPrice": 375000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/BekranZaftBucketBroom", "PrimePrice": 100, "RegularPrice": 125000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Tenno/Melee/Warfan/TnMoonWarfan/MoonWarfanWeapon", "PrimePrice": 410, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/MeleeDangles/MoonWarfanSugatraMeleeDangle", "PrimePrice": 250, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/OstronHeadStatue", "PrimePrice": 125, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/DomsFinalDrink", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Wisp/WispAlternateSkin", "PrimePrice": 550, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Pacifist/BaruukImmortalSkin", "PrimePrice": 550, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/ErraBobbleHead", "PrimePrice": 75, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/OwlOrdisStatue", "PrimePrice": 350, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/TNWVesoBobbleHead", "PrimePrice": 75, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/TNWTeshinBobbleHead", "PrimePrice": 75, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/CosmeticEnhancers/Peculiars/EvilSpiritMod", "PrimePrice": 250, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Scarves/BaroCape3Scarf", "PrimePrice": 500, "RegularPrice": 500000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/ElixisTiberon", "PrimePrice": 315, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Effects/LotusFlowers", "PrimePrice": 250, "RegularPrice": 450000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/UmbraPedestal", "PrimePrice": 0, "RegularPrice": 1000000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Dragon/ChromaAlternateSkin", "PrimePrice": 550, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Hoverboard/HoverboardStickerBaroB", "PrimePrice": 75, "RegularPrice": 75000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/ElixisLatronPistol", "PrimePrice": 400, "RegularPrice": 215000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/WeaponGlaiveOnKillBuffSecondary", "PrimePrice": 300, "RegularPrice": 115000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/TarotCardTennoConA", "PrimePrice": 75, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/WeaponGlaiveSecondaryHeadshotKillMod", "PrimePrice": 300, "RegularPrice": 115000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/TarotCardTennoConD", "PrimePrice": 75, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/TarotCardTennoConB", "PrimePrice": 75, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/Expert/WeaponIncreaseRadialExplosionModExpert", "PrimePrice": 350, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Tenno/Archwing/Primary/ArchwingHeavyPistols/Prisma/PrismaArchHeavyPistols", "PrimePrice": 525, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/AvatarImages/TwinSnakesGlyph", "PrimePrice": 80, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/TarotCardTennoConF", "PrimePrice": 75, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/TarotCardTennoConE", "PrimePrice": 75, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/WeaponGlaiveOnSixKillsBuffSecondary", "PrimePrice": 300, "RegularPrice": 115000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sigils/WeGameNewYearOxSigil", "PrimePrice": 55, "RegularPrice": 45000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/TarotCardTennoConG", "PrimePrice": 75, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/Expert/WeaponFreezeDamageModExpert", "PrimePrice": 350, "RegularPrice": 125000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/GarvLatroxPoster", "PrimePrice": 80, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Grineer/Melee/GrnBoomerang/HalikarWraithWeapon", "PrimePrice": 450, "RegularPrice": 350000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/TarotCardTennoConI", "PrimePrice": 75, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/Expert/WeaponReloadSpeedModExpert", "PrimePrice": 300, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Grineer/Melee/GrineerMachetteAndCleaver/PrismaMachete", "PrimePrice": 400, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/MoaPet/BaroMoaPetSkin", "PrimePrice": 500, "RegularPrice": 325000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/Deimos/PlushySunMonsterCommon", "PrimePrice": 150, "RegularPrice": 125000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/Deimos/PlushyMoonMonsterCommon", "PrimePrice": 150, "RegularPrice": 125000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/Expert/WeaponClipMaxModExpert", "PrimePrice": 280, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/Expert/WeaponClipMaxModExpert", "PrimePrice": 280, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Tenno/Melee/Swords/TnShinaiSword/TnShinaiSwordSkin", "PrimePrice": 375, "RegularPrice": 280000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Weapons/DualSword/DualRibbonKamasSkin", "PrimePrice": 350, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Infestation/NidusAlternateSkin", "PrimePrice": 550, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Game/ActionFigureDioramas/EmpyreanRegionADiorama", "PrimePrice": 155, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/LisetPropGrineerFlak", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/LisetPropGrineerTaktis", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/AshLeverianLiosPistol", "PrimePrice": 400, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Glass/GaraAlternateSkin", "PrimePrice": 550, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/Expert/WeaponSnipersConvertAmmoModExpert", "PrimePrice": 400, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/EraHypnosisPoster", "PrimePrice": 100, "RegularPrice": 110000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Scarves/NezhaLeverianCape", "PrimePrice": 400, "RegularPrice": 350000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Leverian/NezhaLeverian/NezhaLeverianPolearm", "PrimePrice": 350, "RegularPrice": 325000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/BoredTennoPoster", "PrimePrice": 90, "RegularPrice": 120000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/LisetPropCorpusBasilisk", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/LisetPropCorpusWeaver", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/LisetPropCorpusHarpi", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Archwing/GrendelArchwingSkin", "PrimePrice": 400, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Operator/Hoods/JaviExecutionHood", "PrimePrice": 450, "RegularPrice": 450000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/DualStat/ElectEventMeleeMod", "PrimePrice": 300, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/DualStat/FireEventMeleeMod", "PrimePrice": 300, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Tenno/Melee/MeleeTrees/ClawCmbTwoMeleeTree", "PrimePrice": 385, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/DualStat/FireEventRifleMod", "PrimePrice": 300, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Tenno/Melee/MeleeTrees/AxeCmbThreeMeleeTree", "PrimePrice": 385, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/WeaponEventSlashDamageMod", "PrimePrice": 375, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/BowMultiShotOnHitMod", "PrimePrice": 300, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/DualStat/ElectEventShotgunMod", "PrimePrice": 300, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/DualStat/FireEventPistolMod", "PrimePrice": 300, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/DualStat/FireEventShotgunMod", "PrimePrice": 300, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/WeaponEventPistolImpactDamageMod", "PrimePrice": 300, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/Expert/PrimedWeaponCritDamageMod", "PrimePrice": 400, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/Expert/WeaponMeleeFactionDamageInfestedExpert", "PrimePrice": 350, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/Expert/WeaponMeleeFactionDamageGrineerExpert", "PrimePrice": 350, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/Expert/WeaponMeleeFactionDamageCorruptedExpert", "PrimePrice": 350, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/Expert/WeaponMeleeFactionDamageCorpusExpert", "PrimePrice": 350, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/Expert/WeaponClipMaxModExpert", "PrimePrice": 280, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/Expert/WeaponShotgunConvertAmmoModExpert", "PrimePrice": 400, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Archwing/Rifle/Expert/ArchwingRifleDamageAmountModExpert", "PrimePrice": 350, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/Expert/WeaponRifleConvertAmmoModExpert", "PrimePrice": 400, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Sentinels/SentinelPrecepts/PrimedRegen", "PrimePrice": 300, "RegularPrice": 220000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/Expert/WeaponMeleeRangeIncModExpert", "PrimePrice": 300, "RegularPrice": 220000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/Expert/WeaponCritDamageModExpert", "PrimePrice": 280, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/Expert/WeaponReloadSpeedModExpert", "PrimePrice": 375, "RegularPrice": 120000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/Expert/WeaponMeleeDamageModExpert", "PrimePrice": 385, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/Expert/WeaponDamageAmountModExpert", "PrimePrice": 300, "RegularPrice": 110000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/Expert/WeaponCritChanceModBeginnerExpert", "PrimePrice": 400, "RegularPrice": 220000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/Expert/WeaponPistolConvertAmmoModExpert", "PrimePrice": 400, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Sentinel/Kubrow/Expert/KubrowPackLeaderExpertMod", "PrimePrice": 300, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Archwing/Expert/ArchwingSuitAbilityStrengthModExpert", "PrimePrice": 350, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/Expert/WeaponImpactDamageModExpert", "PrimePrice": 350, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/Expert/WeaponFireDamageModExpert", "PrimePrice": 350, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Warframe/Expert/AvatarPowerMaxModExpert", "PrimePrice": 350, "RegularPrice": 110000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/Expert/WeaponToxinDamageModExpert", "PrimePrice": 350, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/Expert/WeaponReloadSpeedModExpert", "PrimePrice": 375, "RegularPrice": 120000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/Expert/WeaponPistolFactionDamageInfestedExpert", "PrimePrice": 350, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/Expert/WeaponPistolFactionDamageGrineerExpert", "PrimePrice": 350, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/Expert/WeaponPistolFactionDamageCorruptedExpert", "PrimePrice": 350, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/Expert/WeaponPistolFactionDamageCorpusExpert", "PrimePrice": 350, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/Expert/WeaponFreezeDamageModExpert", "PrimePrice": 350, "RegularPrice": 110000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Warframe/Expert/AvatarAbilityDurationModExpert", "PrimePrice": 350, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/Expert/WeaponShotgunFactionDamageInfestedExpert", "PrimePrice": 350, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/Expert/WeaponShotgunFactionDamageGrineerExpert", "PrimePrice": 350, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/Expert/WeaponShotgunFactionDamageCorruptedExpert", "PrimePrice": 350, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/Expert/WeaponShotgunFactionDamageCorpusExpert", "PrimePrice": 350, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/Expert/WeaponElectricityDamageModExpert", "PrimePrice": 350, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/Expert/PrimedWeaponFactionDamageInfested", "PrimePrice": 400, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/Expert/PrimedWeaponFactionDamageGrineer", "PrimePrice": 400, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/Expert/PrimedWeaponFactionDamageCorrupted", "PrimePrice": 400, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/Expert/PrimedWeaponFactionDamageCorpus", "PrimePrice": 400, "RegularPrice": 140000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Sentinel/SentinelLootRadarEnemyRadarExpertMod", "PrimePrice": 300, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Tenno/Melee/MeleeTrees/GlaiveCmbTwoMeleeTree", "PrimePrice": 385, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/WeaponEventSlashDamageMod", "PrimePrice": 375, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Melee/WeaponEventMeleeImpactDamageMod", "PrimePrice": 400, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/WeaponEventRifleImpactDamageMod", "PrimePrice": 330, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/WeaponEventSlashDamageMod", "PrimePrice": 375, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Shotgun/WeaponEventShotgunImpactDamageMod", "PrimePrice": 365, "RegularPrice": 220000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/DualStat/ElectEventRifleMod", "PrimePrice": 300, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/DualStat/ElectEventPistolMod", "PrimePrice": 300, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Pistol/WeaponEventSlashDamageMod", "PrimePrice": 375, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/VoidTrader/VTDetron", "PrimePrice": 500, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Corpus/LongGuns/CrpFreezeRay/Vandal/CrpFreezeRayVandalRifle", "PrimePrice": 475, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/ClanTech/Chemical/FlameThrowerWraith", "PrimePrice": 550, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Grineer/Melee/GrineerMachetteAndCleaver/WraithMacheteWeapon", "PrimePrice": 410, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Corpus/Pistols/CrpHandRL/PrismaAngstrum", "PrimePrice": 475, "RegularPrice": 210000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Grineer/Melee/GrineerMachetteAndCleaver/PrismaDualCleavers", "PrimePrice": 490, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Grineer/LongGuns/VoidTraderGorgon/VTGorgon", "PrimePrice": 600, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/VoidTrader/PrismaGrakata", "PrimePrice": 610, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Grineer/LongGuns/GrineerLeverActionRifle/PrismaGrinlokWeapon", "PrimePrice": 500, "RegularPrice": 220000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Corpus/Melee/KickAndPunch/PrismaObex", "PrimePrice": 500, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/VoidTrader/PrismaSkana", "PrimePrice": 510, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Corpus/LongGuns/CorpusUMP/PrismaCorpusUMP", "PrimePrice": 400, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Grineer/Pistols/GrineerBulbousSMG/Prisma/PrismaTwinGremlinsWeapon", "PrimePrice": 500, "RegularPrice": 220000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Tenno/Archwing/Melee/VoidTraderArchsword/VTArchSwordWeapon", "PrimePrice": 550, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/ClanTech/Energy/VandalElectroProd", "PrimePrice": 410, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Corpus/LongGuns/CrpShockRifle/QuantaVandal", "PrimePrice": 450, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Corpus/LongGuns/Machinegun/SupraVandal", "PrimePrice": 500, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Grineer/Pistols/WraithSingleViper/WraithSingleViper", "PrimePrice": 400, "RegularPrice": 75000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Grineer/LongGuns/GrineerSniperRifle/VulkarWraith", "PrimePrice": 450, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Weapons/Tenno/Pistols/ConclaveLeverPistol/ConclaveLeverPistol", "PrimePrice": 500, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/MeleeDangles/FireMeleeDangle", "PrimePrice": 100, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/BaroInarosPolearmSkin", "PrimePrice": 325, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/MeleeDangles/BaroInarosMeleeDangle", "PrimePrice": 250, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/MeleeDangles/InfestedMeleeDangle", "PrimePrice": 250, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/VTHalloweenDarkSword", "PrimePrice": 320, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/SummerSolstice/SummerSolsticeGorgon", "PrimePrice": 300, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/SummerSolstice/SummerIgnisSkin", "PrimePrice": 300, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/BaroArrow", "PrimePrice": 375, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/MeleeDangles/BaroMeleeDangle", "PrimePrice": 250, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/BaroScytheMacheteSkin", "PrimePrice": 375, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/ElixisOdonataSkin", "PrimePrice": 350, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/ElixisBallasSword", "PrimePrice": 350, "RegularPrice": 350000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/PrismaArrow", "PrimePrice": 350, "RegularPrice": 75000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/VTRedeemerSkin", "PrimePrice": 325, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/ElixisSonicor", "PrimePrice": 380, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/ElixisTigris", "PrimePrice": 300, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/VTQuanta", "PrimePrice": 300, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/VoidTrader/ElixisOpticor", "PrimePrice": 325, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Halloween/HalloweenDread", "PrimePrice": 300, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/AvatarImages/ImageBaroKiteer", "PrimePrice": 80, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/AvatarImages/Seasonal/AvatarImageGlyphCookieKavat", "PrimePrice": 80, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/AvatarImages/Seasonal/AvatarImageGlyphCookieKubrow", "PrimePrice": 80, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Scarves/LisetScarf", "PrimePrice": 600, "RegularPrice": 400000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/SuitCustomizations/ColourPickerTwitchBItemA", "PrimePrice": 220, "RegularPrice": 220000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Effects/FootstepsMaple", "PrimePrice": 15, "RegularPrice": 1000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Clan/BaroKavatBadgeItem", "PrimePrice": 50, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sigils/BaroKavatSigil", "PrimePrice": 55, "RegularPrice": 45000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Scarves/WraithTurbinesScarf", "PrimePrice": 400, "RegularPrice": 500000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Pirate/HydroidAlternateSkin", "PrimePrice": 550, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/AvatarImages/Seasonal/Halloween2019GrendelTreat", "PrimePrice": 80, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/SuitCustomizations/ColourPickerKiteerItemA", "PrimePrice": 150, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Scarves/KazBaroCape", "PrimePrice": 325, "RegularPrice": 450000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Effects/BaroEphemeraA", "PrimePrice": 100, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Scarves/BaroCape2Scarf", "PrimePrice": 400, "RegularPrice": 350000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Clan/BaroQuantumBadgeItem", "PrimePrice": 400, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Scarves/SolsticeBaroCape", "PrimePrice": 425, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Scarves/BaroCape", "PrimePrice": 500, "RegularPrice": 500000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/AvatarImages/AvatarImageBaroIcon", "PrimePrice": 80, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Magician/LimboImmortalSkin", "PrimePrice": 550, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Cowgirl/MesaImmortallSkin", "PrimePrice": 550, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Harlequin/MirageAlternateSkin", "PrimePrice": 550, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Clan/BaroKubrowBadgeItem", "PrimePrice": 50, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sigils/BaroKubrowSigil", "PrimePrice": 55, "RegularPrice": 45000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Scarves/VTHornSkullScarf", "PrimePrice": 250, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Clan/PrismaLotusEmblem", "PrimePrice": 80, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/AvatarImages/AvatarImageBaroTwoIcon", "PrimePrice": 80, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sigils/PrismaLotusSigil", "PrimePrice": 55, "RegularPrice": 45000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sigils/PrimeTraderSigil", "PrimePrice": 50, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Scarves/PrismaRazorScarf", "PrimePrice": 350, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Scarves/VTDinoSpikeScarf", "PrimePrice": 400, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/AvatarImages/AvatarImageLowPolyKavat", "PrimePrice": 80, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Types/StoreItems/AvatarImages/AvatarImageLowPolyKubrow", "PrimePrice": 80, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Tengu/ZephyrAlternateSkin", "PrimePrice": 550, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Game/KubrowPet/Patterns/KubrowPetPatternPrimeTraderA", "PrimePrice": 150, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Camo/DesertDirigaSkin", "PrimePrice": 225, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sentinels/Masks/KavatPetMask", "PrimePrice": 500, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sentinels/Tails/KavatPetTail", "PrimePrice": 400, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sentinels/Wings/KavatPetWings", "PrimePrice": 400, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Catbrows/Armor/CatbrowArmorVoidTraderA", "PrimePrice": 500, "RegularPrice": 275000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Kubrows/Armor/KubrowArmorBaro", "PrimePrice": 500, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sentinels/Masks/BaroPetMask", "PrimePrice": 500, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sentinels/Tails/BaroPetTail", "PrimePrice": 400, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sentinels/Wings/BaroPetWings", "PrimePrice": 400, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/Types/StoreItems/Packages/KavatColorPackNexus", "PrimePrice": 200, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sentinels/Wings/PrismaJetWings", "PrimePrice": 300, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sentinels/Tails/PrismaFishTail", "PrimePrice": 200, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sentinels/Masks/PrismaMechHeadMask", "PrimePrice": 175, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Kubrows/Armor/KubrowArmorPrisma", "PrimePrice": 400, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Sentinels/SentinelPowersuits/PrismaShadePowerSuit", "PrimePrice": 500, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Sentinels/Skins/DesertTaxonSkin", "PrimePrice": 200, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Catbrows/Armor/CatbrowArmorHalloweenA", "PrimePrice": 400, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/Types/StoreItems/Boosters/AffinityBooster3DayStoreItem", "PrimePrice": 450, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/Types/StoreItems/Boosters/CreditBooster3DayStoreItem", "PrimePrice": 350, "RegularPrice": 75000 },
-    { "ItemType": "/Lotus/Types/StoreItems/Boosters/ModDropChanceBooster3DayStoreItem", "PrimePrice": 500, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/Types/StoreItems/Boosters/ResourceAmount3DayStoreItem", "PrimePrice": 400, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Game/Projections/T4VoidProjectionPBronze", "PrimePrice": 50, "RegularPrice": 45000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Recipes/Components/CorruptedBombardBallBlueprint", "PrimePrice": 100, "RegularPrice": 50000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Restoratives/Consumable/CorruptedHeavyGunnerBall", "PrimePrice": 100, "RegularPrice": 40000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/OrbiterPictureFrameBaro", "PrimePrice": 100, "RegularPrice": 75000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Restoratives/Consumable/AssassinBaitC", "PrimePrice": 200, "RegularPrice": 125000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/MiscItems/PhotoboothTileInarosTomb", "PrimePrice": 325, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Restoratives/Consumable/BaroFireWorksCrate", "PrimePrice": 50, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/MiscItems/PhotoboothTileOrokinExtraction", "PrimePrice": 325, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Keys/MummyQuestKeyBlueprint", "PrimePrice": 100, "RegularPrice": 25000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Restoratives/Consumable/AssassinBait", "PrimePrice": 200, "RegularPrice": 125000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Restoratives/Consumable/AssassinBaitB", "PrimePrice": 200, "RegularPrice": 125000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/BaroKiTeerDecorationB", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/BaroKiTeerDecorationE", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/LisetPropCleaningDroneBaro", "PrimePrice": 700, "RegularPrice": 500000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/BaroKiTeerBobbleHead", "PrimePrice": 70, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Hoverboard/HoverboardStickerBaroA", "PrimePrice": 75, "RegularPrice": 75000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/KavatBust", "PrimePrice": 220, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/KubrowBust", "PrimePrice": 220, "RegularPrice": 250000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/Plushies/PlushyDesertSkate", "PrimePrice": 125, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/BaroKiTeerDecorationD", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/ExcaliburArchwingBobbleHead", "PrimePrice": 90, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Operator/Accessories/BaroTiara", "PrimePrice": 525, "RegularPrice": 375000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Operator/Accessories/EarpieceBaroC", "PrimePrice": 500, "RegularPrice": 400000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Operator/Accessories/BaroMouthPieceA", "PrimePrice": 500, "RegularPrice": 400000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Operator/Accessories/BaroVisor", "PrimePrice": 525, "RegularPrice": 375000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Operator/Accessories/BaroHorn", "PrimePrice": 525, "RegularPrice": 375000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Operator/Accessories/EarpieceBaroA", "PrimePrice": 500, "RegularPrice": 400000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Operator/Accessories/EarpieceBaroB", "PrimePrice": 250, "RegularPrice": 200000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Game/QuartersWallpapers/BaroWallpaper", "PrimePrice": 250, "RegularPrice": 175000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Liset/InarosLisetSkin", "PrimePrice": 400, "RegularPrice": 300000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/BaroKiTeerDecorationA", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Liset/LisetInsectSkinInaros", "PrimePrice": 425, "RegularPrice": 320000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Liset/LisetInsectSkinPrimeTrader", "PrimePrice": 230, "RegularPrice": 375000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/ParazonPoster", "PrimePrice": 100, "RegularPrice": 125000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/KubrowKavatLowPolyPoster", "PrimePrice": 90, "RegularPrice": 110000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Liset/LisetSkinVoidTrader", "PrimePrice": 120, "RegularPrice": 150000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Liset/LisetBlueSkySkinPrimeTrader", "PrimePrice": 210, "RegularPrice": 450000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/BaroKiTeerDecorationF", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Liset/LisetBlueSkySkinInaros", "PrimePrice": 375, "RegularPrice": 340000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/BaroKiTeerDecorationG", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/LisetPropOstRugBaro", "PrimePrice": 225, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/BaroKiTeerDecorationH", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Skins/Liset/Gyroscope/LisetGyroscopeSkinPrimeTrader", "PrimePrice": 220, "RegularPrice": 400000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/BaroKiTeerDecorationC", "PrimePrice": 100, "RegularPrice": 100000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/ShipDecos/PedistalPrime", "PrimePrice": 0, "RegularPrice": 1000000 },
-    { "ItemType": "/Lotus/StoreItems/Types/Items/Emotes/BaroEmote", "PrimePrice": 0, "RegularPrice": 1000000 },
-    { "ItemType": "/Lotus/StoreItems/Upgrades/Mods/Rifle/EventSniperReloadDamageMod", "PrimePrice": 2995, "RegularPrice": 1000000 }
-  ],
-  "allIfAny": [
-    [
-      "/Lotus/StoreItems/Upgrades/Skins/Operator/Leggings/LeggingsNovaEngineer",
-      "/Lotus/StoreItems/Upgrades/Skins/Operator/BodySuits/BodySuitNovaEngineer",
-      "/Lotus/StoreItems/Upgrades/Skins/Operator/Sleeves/SleevesNovaEngineer",
-      "/Lotus/StoreItems/Upgrades/Skins/Operator/Hoods/HoodNovaEngineer"
-    ]
-  ]
-}

static/webui/index.html

@@ -704,14 +704,6 @@
                                         <input class="form-check-input" type="checkbox" id="fullyStockedVendors" />
                                         <label class="form-check-label" for="fullyStockedVendors" data-loc="cheats_fullyStockedVendors"></label>
                                     </div>
-                                    <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" id="baroAlwaysAvailable" />
-                                        <label class="form-check-label" for="baroAlwaysAvailable" data-loc="cheats_baroAlwaysAvailable"></label>
-                                    </div>
-                                    <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" id="baroFullyStocked" />
-                                        <label class="form-check-label" for="baroFullyStocked" data-loc="cheats_baroFullyStocked"></label>
-                                    </div>
                                     <div class="form-check">
                                         <input class="form-check-input" type="checkbox" id="syndicateMissionsRepeatable" />
                                         <label class="form-check-label" for="syndicateMissionsRepeatable" data-loc="cheats_syndicateMissionsRepeatable"></label>
@@ -811,12 +803,8 @@
             </div>
             <div data-route="/webui/import" data-title="Import | OpenWF WebUI">
                 <p data-loc="import_importNote"></p>
-                <textarea class="form-control" id="import-inventory" style="height: calc(100vh - 300px)"></textarea>
+                <textarea class="form-control" id="import-inventory"></textarea>
                 <button class="btn btn-primary mt-3" onclick="doImport();" data-loc="import_submit"></button>
-                <p class="mt-3 mb-1" data-loc="import_samples"></p>
-                <ul>
-                    <li><a href="#" onclick="event.preventDefault();setImportSample('maxFocus');" data-loc="import_samples_maxFocus"></a></li>
-                </ul>
             </div>
         </div>
         <div class="toast-container position-fixed bottom-0 end-0 p-3"></div>

static/webui/script.js

@@ -2339,238 +2339,3 @@ async function doUnlockAllMissions() {
     await fetch("/custom/completeAllMissions?" + window.authz);
     updateInventory();
 }
-
-const importSamples = {
-    maxFocus: {
-        FocusUpgrades: [
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Attack/AttackFocusAbility"
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Attack/Stats/MoreAmmoFocusUpgrade",
-                Level: 3,
-                IsUniversal: true
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Attack/Residual/PowerSnapFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Attack/Residual/PhysicalDamageFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Attack/Active/CloakAttackChargeFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Attack/Stats/RegenAmmoFocusUpgrade",
-                Level: 3,
-                IsUniversal: true
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Tactic/TacticFocusAbility"
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Ward/WardFocusAbility"
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Defense/DefenseFocusAbility"
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Power/PowerFocusAbility"
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Ward/Active/KnockdownImmunityFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Ward/Active/UnairuWispFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Ward/Active/SunderingDissipationUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Ward/Active/MagneticExtensionUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Ward/Active/MagneticFieldFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Ward/Residual/ArmourBuffFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Ward/Active/ClearStaticOnKillFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Ward/Residual/SecondChanceDamageBuffFocusUpgrade",
-                Level: 3,
-                IsUniversal: true
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Ward/Residual/SecondChanceFocusUpgrade",
-                Level: 3,
-                IsUniversal: true
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Ward/Active/InvulnerableReturnFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Attack/Active/ConsecutivePowerUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Attack/Active/AttackEfficiencyFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Attack/Active/GhostlyTouchUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Attack/Active/GhostWaveUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Attack/Active/ConsecutiveEfficienyUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Tactic/Active/ProjectionStretchUpgrade",
-                Level: 3,
-                IsUniversal: true
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Tactic/Active/ProjectionExecutionUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Tactic/Active/FinisherTransferenceUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Tactic/Active/ComboAmpDamageFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Tactic/Residual/MeleeComboFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Tactic/Residual/MeleeXpFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Tactic/Active/LiftHitWaveUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Tactic/Active/LiftHitDamageUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Tactic/Stats/MoveSpeedFocusUpgrade",
-                Level: 3,
-                IsUniversal: true
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Tactic/Active/SlamComboFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Power/Active/PowerFieldFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Power/Active/DisarmedEnergyUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Power/Stats/EnergyPoolFocusUpgrade",
-                Level: 3,
-                IsUniversal: true
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Power/Residual/EnergyOverTimeFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Power/Active/BlastSlowFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Power/Stats/EnergyRestoreFocusUpgrade",
-                Level: 3,
-                IsUniversal: true
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Power/Residual/FreeAbilityCastsFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Power/Active/DisarmingProjectionUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Power/Residual/SlowHeadshotDamageFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Power/Active/DashBubbleFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Defense/Stats/HealthRegenFocusUpgrade",
-                Level: 3,
-                IsUniversal: true
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Defense/Residual/RadialXpFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Defense/Active/DefenseShieldFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Defense/Active/CloakHealFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Defense/Active/DefenseShieldBreakFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Defense/Active/DashImmunityFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Defense/Residual/InstantReviveFocusUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Defense/Active/SonicDissipationUpgrade",
-                Level: 3
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Defense/Stats/HealthMaxFocusUpgrade",
-                Level: 3,
-                IsUniversal: true
-            },
-            {
-                ItemType: "/Lotus/Upgrades/Focus/Defense/Active/CloakHealOthersFocusUpgrade",
-                Level: 2
-            }
-        ]
-    }
-};
-function setImportSample(key) {
-    $("#import-inventory").val(JSON.stringify(importSamples[key], null, 2));
-}

static/webui/translations/de.js

@@ -159,8 +159,6 @@ dict = {
     cheats_noDeathMarks: `Keine Todesmarkierungen`,
     cheats_noKimCooldowns: `Keine Wartezeit bei KIM`,
     cheats_fullyStockedVendors: `[UNTRANSLATED] Fully Stocked Vendors`,
-    cheats_baroAlwaysAvailable: `[UNTRANSLATED] Baro Always Available`,
-    cheats_baroFullyStocked: `[UNTRANSLATED] Baro Fully Stocked`,
     cheats_syndicateMissionsRepeatable: `Syndikat-Missionen wiederholbar`,
     cheats_unlockAllProfitTakerStages: `[UNTRANSLATED] Unlock All Profit Taker Stages`,
     cheats_instantFinishRivenChallenge: `Riven-Mod Herausforderung sofort abschließen`,
@@ -187,8 +185,6 @@ dict = {
     cheats_none: `Keines`,
     import_importNote: `Du kannst hier eine vollständige oder teilweise Inventarantwort (Client-Darstellung) einfügen. Alle Felder, die vom Importer unterstützt werden, <b>werden in deinem Account überschrieben</b>.`,
     import_submit: `Absenden`,
-    import_samples: `[UNTRANSLATED] Samples:`,
-    import_samples_maxFocus: `[UNTRANSLATED] All Focus Schools Maxed Out`,
 
     upgrade_Equilibrium: `[UNTRANSLATED] +|VAL|% Energy from Health pickups, +|VAL|% Health from Energy pickups`,
     upgrade_MeleeCritDamage: `[UNTRANSLATED] +|VAL|% Melee Critical Damage`,
@@ -231,7 +227,7 @@ dict = {
     upgrade_DamageReductionOnHack: `[UNTRANSLATED] 75% Damage Reduction while Hacking`,
     upgrade_OnExecutionReviveCompanion: `[UNTRANSLATED] Mercy Kills reduce Companion Recovery by 15s`,
     upgrade_OnExecutionParkourSpeed: `[UNTRANSLATED] +60% Parkour Speed after a Mercy for 15s`,
-    upgrade_AvatarTimeLimitIncrease: `[UNTRANSLATED] +8s to Hacking`,
+    upgrade_AvatarTimeLimitIncrease: `[UNTRANSLATED] s to Hacking`,
     upgrade_ElectrifyOnHack: `[UNTRANSLATED] Shock enemies within 20m while Hacking`,
     upgrade_OnExecutionTerrify: `[UNTRANSLATED] 50% chance for enemies within 15m to cower in fear for 8 seconds on Mercy`,
     upgrade_OnHackLockers: `[UNTRANSLATED] Unlock 5 lockers within 20m after Hacking`,

static/webui/translations/en.js

@@ -158,8 +158,6 @@ dict = {
     cheats_noDeathMarks: `No Death Marks`,
     cheats_noKimCooldowns: `No KIM Cooldowns`,
     cheats_fullyStockedVendors: `Fully Stocked Vendors`,
-    cheats_baroAlwaysAvailable: `Baro Always Available`,
-    cheats_baroFullyStocked: `Baro Fully Stocked`,
     cheats_syndicateMissionsRepeatable: `Syndicate Missions Repeatable`,
     cheats_unlockAllProfitTakerStages: `Unlock All Profit Taker Stages`,
     cheats_instantFinishRivenChallenge: `Instant Finish Riven Challenge`,
@@ -186,8 +184,6 @@ dict = {
     cheats_none: `None`,
     import_importNote: `You can provide a full or partial inventory response (client respresentation) here. All fields that are supported by the importer <b>will be overwritten</b> in your account.`,
     import_submit: `Submit`,
-    import_samples: `Samples:`,
-    import_samples_maxFocus: `All Focus Schools Maxed Out`,
 
     upgrade_Equilibrium: `+|VAL|% Energy from Health pickups, +|VAL|% Health from Energy pickups`,
     upgrade_MeleeCritDamage: `+|VAL|% Melee Critical Damage`,
@@ -230,7 +226,7 @@ dict = {
     upgrade_DamageReductionOnHack: `75% Damage Reduction while Hacking`,
     upgrade_OnExecutionReviveCompanion: `Mercy Kills reduce Companion Recovery by 15s`,
     upgrade_OnExecutionParkourSpeed: `+60% Parkour Speed after a Mercy for 15s`,
-    upgrade_AvatarTimeLimitIncrease: `+8s to Hacking`,
+    upgrade_AvatarTimeLimitIncrease: `s to Hacking`,
     upgrade_ElectrifyOnHack: `Shock enemies within 20m while Hacking`,
     upgrade_OnExecutionTerrify: `50% chance for enemies within 15m to cower in fear for 8 seconds on Mercy`,
     upgrade_OnHackLockers: `Unlock 5 lockers within 20m after Hacking`,

static/webui/translations/es.js

@@ -158,9 +158,7 @@ dict = {
     cheats_noVendorPurchaseLimits: `Sin límite de compras de vendedores`,
     cheats_noDeathMarks: `Sin marcas de muerte`,
     cheats_noKimCooldowns: `Sin tiempo de espera para conversaciones KIM`,
-    cheats_fullyStockedVendors: `Vendedores con stock completo`,
-    cheats_baroAlwaysAvailable: `Baro siempre disponible`,
-    cheats_baroFullyStocked: `Baro con stock completo`,
+    cheats_fullyStockedVendors: `[UNTRANSLATED] Fully Stocked Vendors`,
     cheats_syndicateMissionsRepeatable: `Misiones de sindicato rejugables`,
     cheats_unlockAllProfitTakerStages: `Deslobquea todas las etapas del Roba-ganancias`,
     cheats_instantFinishRivenChallenge: `Terminar desafío de agrietado inmediatamente`,
@@ -174,7 +172,7 @@ dict = {
     cheats_noDojoResearchTime: `Sin tiempo de investigación del dojo`,
     cheats_fastClanAscension: `Ascenso rápido del clan`,
     cheats_missionsCanGiveAllRelics: `Las misiones pueden otorgar todas las reliquias`,
-    cheats_unlockAllSimarisResearchEntries: `Desbloquear todas las entradas de investigación de Simaris`,
+    cheats_unlockAllSimarisResearchEntries: `[UNTRANSLATED] Unlock All Simaris Research Entries`,
     cheats_spoofMasteryRank: `Rango de maestría simulado (-1 para desactivar)`,
     cheats_nightwaveStandingMultiplier: `Multiplicador de Reputación de Onda Nocturna`,
     cheats_save: `Guardar`,
@@ -187,8 +185,6 @@ dict = {
     cheats_none: `Ninguno`,
     import_importNote: `Puedes proporcionar una respuesta de inventario completa o parcial (representación del cliente) aquí. Todos los campos compatibles con el importador <b>serán sobrescritos</b> en tu cuenta.`,
     import_submit: `Enviar`,
-    import_samples: `Muestras:`,
-    import_samples_maxFocus: `Todas las escuelas de enfoque al máximo`,
 
     upgrade_Equilibrium: `+|VAL|% de Energía al recoger salud, +|VAL|% de Salud al recoger energía`,
     upgrade_MeleeCritDamage: `+|VAL|% de daño crítico cuerpo a cuerpo`,
@@ -231,7 +227,7 @@ dict = {
     upgrade_DamageReductionOnHack: `75% de reducción de daño al hackear`,
     upgrade_OnExecutionReviveCompanion: `Las ejecuciones reducen el tiempo de recuperación del compañero en 15s`,
     upgrade_OnExecutionParkourSpeed: `+60% de velocidad de parkour durante 15s tras una ejecución`,
-    upgrade_AvatarTimeLimitIncrease: `[UNTRANSLATED] +8s to Hacking`,
+    upgrade_AvatarTimeLimitIncrease: `+|VAL|s al tiempo de hackeo`,
     upgrade_ElectrifyOnHack: `Electrocuta a los enemigos en un radio de 20m al hackear`,
     upgrade_OnExecutionTerrify: `50% de probabilidad de que enemigos en un radio de 15m entren en pánico por 8s tras una ejecución`,
     upgrade_OnHackLockers: `Desbloquea 5 casilleros en un radio de 20m tras hackear`,

static/webui/translations/fr.js

@@ -3,8 +3,8 @@ dict = {
     general_inventoryUpdateNote: `Note : Les changements effectués ici seront appliqués lors de la syncrhonisation. Visiter la navigation appliquera les changements apportés à l'inventaire.`,
     general_addButton: `Ajouter`,
     general_bulkActions: `Action groupée`,
-    code_loginFail: `Connexion échouée. Vérifiez le mot de passe.`,
-    code_regFail: `Enregistrement impossible. Compte existant?`,
+    code_loginFail: `[UNTRANSLATED] Login failed. Double-check the email and password.`,
+    code_regFail: `[UNTRANSLATED] Registration failed. Account already exists?`,
     code_changeNameConfirm: `Nouveau nom du compte :`,
     code_deleteAccountConfirm: `Supprimer |DISPLAYNAME| (|EMAIL|) ? Cette action est irreversible.`,
     code_archgun: `Archgun`,
@@ -85,7 +85,7 @@ dict = {
     inventory_moaPets: `Moas`,
     inventory_kubrowPets: `Bêtes`,
     inventory_evolutionProgress: `Progrès de l'évolution Incarnon`,
-    inventory_Boosters: `Boosters`,
+    inventory_Boosters: `[UNTRANSLATED] Boosters`,
     inventory_bulkAddSuits: `Ajouter les Warframes manquantes`,
     inventory_bulkAddWeapons: `Ajouter les armes manquantes`,
     inventory_bulkAddSpaceSuits: `Ajouter les Archwings manquants`,
@@ -100,7 +100,7 @@ dict = {
     inventory_bulkRankUpSentinels: `Toutes les Sentinelles au rang max`,
     inventory_bulkRankUpSentinelWeapons: `Toutes les armes de Sentinelles au rang max`,
     inventory_bulkRankUpEvolutionProgress: `Toutes les évolutions Incarnon au rang max`,
-    inventory_maxPlexus: `Plexus au rang max`,
+    inventory_maxPlexus: `[UNTRANSLATED] Max Rank Plexus`,
 
     quests_list: `Quêtes`,
     quests_completeAll: `Compléter toutes les quêtes`,
@@ -135,10 +135,10 @@ dict = {
     cheats_infiniteRegalAya: `Aya Raffiné infini`,
     cheats_infiniteHelminthMaterials: `Ressources d'Helminth infinies`,
     cheats_claimingBlueprintRefundsIngredients: `Récupérer les items rend les ressources`,
-    cheats_dontSubtractPurchaseCreditCost: `Ne pas retirer le coût en crédits`,
-    cheats_dontSubtractPurchasePlatinumCost: `Ne pas retirer le coût en platines`,
-    cheats_dontSubtractPurchaseItemCost: `Ne pas retirer le coût d'achat`,
-    cheats_dontSubtractPurchaseStandingCost: `Ne pas retirer le coût en réputation`,
+    cheats_dontSubtractPurchaseCreditCost: `[UNTRANSLATED] Don't Subtract Purchase Credit Cost`,
+    cheats_dontSubtractPurchasePlatinumCost: `[UNTRANSLATED] Don't Subtract Purchase Platinum Cost`,
+    cheats_dontSubtractPurchaseItemCost: `[UNTRANSLATED] Don't Subtract Purchase Item Cost`,
+    cheats_dontSubtractPurchaseStandingCost: `[UNTRANSLATED] Don't Subtract Purchase Standing Cost`,
     cheats_dontSubtractVoidTraces: `Ne pas consommer de Void Traces`,
     cheats_dontSubtractConsumables: `Ne pas retirer de consommables`,
     cheats_unlockAllShipFeatures: `Débloquer tous les segments du vaisseau`,
@@ -158,11 +158,9 @@ dict = {
     cheats_noVendorPurchaseLimits: `Aucune limite d'achat chez les PNJ`,
     cheats_noDeathMarks: `Aucune marque d'assassin`,
     cheats_noKimCooldowns: `Aucun cooldown sur le KIM`,
-    cheats_fullyStockedVendors: `Les vendeurs ont un stock à 100%`,
-    cheats_baroAlwaysAvailable: `[UNTRANSLATED] Baro Always Available`,
-    cheats_baroFullyStocked: `[UNTRANSLATED] Baro Fully Stocked`,
+    cheats_fullyStockedVendors: `[UNTRANSLATED] Fully Stocked Vendors`,
     cheats_syndicateMissionsRepeatable: `Mission syndicat répétables`,
-    cheats_unlockAllProfitTakerStages: `Débloquer toutes les étapes du Preneur de Profit`,
+    cheats_unlockAllProfitTakerStages: `[UNTRANSLATED] Unlock All Profit Taker Stages`,
     cheats_instantFinishRivenChallenge: `Débloquer le challenge Riven instantanément`,
     cheats_instantResourceExtractorDrones: `Ressources de drones d'extraction instantannées`,
     cheats_noResourceExtractorDronesDamage: `Aucun dégâts aux drones d'extraction de resources`,
@@ -173,11 +171,11 @@ dict = {
     cheats_noDojoResearchCosts: `Aucun coût de recherche (Dojo)`,
     cheats_noDojoResearchTime: `Aucun temps de recherche (Dojo)`,
     cheats_fastClanAscension: `Ascension de clan rapide`,
-    cheats_missionsCanGiveAllRelics: `Les missions donnent toutes les reliques`,
-    cheats_unlockAllSimarisResearchEntries: `Débloquer toute les recherches chez Simaris`,
+    cheats_missionsCanGiveAllRelics: `[UNTRANSLATED] Missions Can Give All Relics`,
+    cheats_unlockAllSimarisResearchEntries: `[UNTRANSLATED] Unlock All Simaris Research Entries`,
     cheats_spoofMasteryRank: `Rang de maîtrise personnalisé (-1 pour désactiver)`,
-    cheats_nightwaveStandingMultiplier: `Multiplicateur de réputation d'Ondes Nocturnes`,
-    cheats_save: `Sauvegarder`,
+    cheats_nightwaveStandingMultiplier: `[UNTRANSLATED] Nightwave Standing Multiplier`,
+    cheats_save: `[UNTRANSLATED] Save`,
     cheats_account: `Compte`,
     cheats_unlockAllFocusSchools: `Débloquer toutes les écoles de focus`,
     cheats_helminthUnlockAll: `Helminth niveau max`,
@@ -187,59 +185,57 @@ dict = {
     cheats_none: `Aucun`,
     import_importNote: `Import manuel. Toutes les modifcations supportées par l'inventaire <b>écraseront celles présentes dans la base de données</b>.`,
     import_submit: `Soumettre`,
-    import_samples: `Echantillons :`,
-    import_samples_maxFocus: `Toutes les écoles de focus au rang max`,
 
-    upgrade_Equilibrium: `Ramasser de la santé donne +|VAL|% d'énergie supplémentaire. Ramasser de l'énergie donne +|VAL|% de santé supplémentaire.`,
-    upgrade_MeleeCritDamage: `+|VAL|% de dégâts critique en mêlée`,
-    upgrade_PrimaryStatusChance: `+|VAL|% de chance de statut sur arme primaire`,
-    upgrade_SecondaryCritChance: `+|VAL|% de chance critique sur arme secondaire`,
-    upgrade_WarframeAbilityDuration: `+|VAL|% de durée de pouvoir`,
-    upgrade_WarframeAbilityStrength: `+|VAL|% de puissance de pouvoir`,
-    upgrade_WarframeArmourMax: `+|VAL| d'armure`,
-    upgrade_WarframeBlastProc: `+|VAL| de boucliers sur élimination avec des dégats d'explosion`,
-    upgrade_WarframeCastingSpeed: `+|VAL|% de vitesse de lancement de pouvoir`,
-    upgrade_WarframeCorrosiveDamageBoost: `+|VAL|% de dégâts de pouvoir sur les ennemis affectés par du statut corrosif`,
-    upgrade_WarframeCorrosiveStack: `+|VAL| de cumuls maximum de Statut Corrosif`,
-    upgrade_WarframeCritDamageBoost: `+|VAL|% de dégâts critique en mêlée (Doublé si l'énergie dépasse 500)`,
-    upgrade_WarframeElectricDamage: `+|VAL1|% de dégâts électrique sur arme primaire (+|VAL2|% par fragment supplémentaire)`,
-    upgrade_WarframeElectricDamageBoost: `+|VAL|% de dégâts de pouvoir sur les ennemis affectés par du statut électrique`,
-    upgrade_WarframeEnergyMax: `+|VAL| d'énergie max`,
-    upgrade_WarframeGlobeEffectEnergy: `+|VAL|% d'efficacité d'orbe d'énergie`,
-    upgrade_WarframeGlobeEffectHealth: `+|VAL|% d'efficacité d'orbe de santé`,
-    upgrade_WarframeHealthMax: `+|VAL| de santé`,
-    upgrade_WarframeHPBoostFromImpact: `+|VAL1| de santé par ennemi tué avec des dégâts explosifs (Max |VAL2| de santé)`,
-    upgrade_WarframeParkourVelocity: `+|VAL|% de vélocité de parkour`,
-    upgrade_WarframeRadiationDamageBoost: `+|VAL|% de dégâts de pouvoir sur les ennemis affectés par du statut radiation`,
-    upgrade_WarframeRegen: `+|VAL| régénération de santé/s`,
-    upgrade_WarframeShieldMax: `+|VAL| de boucliers`,
-    upgrade_WarframeStartingEnergy: `+|VAL|% d'énergie sur apparition`,
-    upgrade_WarframeToxinDamage: `+|VAL|% de dégâts sur le statut poison`,
-    upgrade_WarframeToxinHeal: `+|VAL| de santé récupérée à chaque dégât de statut poison`,
-    upgrade_WeaponCritBoostFromHeat: `+|VAL1|% de chance critique sur arme secondaire pour chaque ennemi affecté puis tué par du feu (Max |VAL2|%)`,
-    upgrade_AvatarAbilityRange: `+7.5% de portée de pouvoir`,
-    upgrade_AvatarAbilityEfficiency: `+5% d'efficacité de pouvoir`,
-    upgrade_AvatarEnergyRegen: `+0.5 de régénération d'énergie/s`,
-    upgrade_AvatarEnemyRadar: `+5m de radar ennemi`,
-    upgrade_AvatarLootRadar: `+7m de radar à butin`,
-    upgrade_WeaponAmmoMax: `+15% de munitions max`,
-    upgrade_EnemyArmorReductionAura: `-3% d'armure ennemi`,
-    upgrade_OnExecutionAmmo: `100% de rechargement des armes primaires et secondaires sur une une miséricorde`,
-    upgrade_OnExecutionHealthDrop: `100% de chance de drop une orbe de santé sur une miséricorde`,
-    upgrade_OnExecutionEnergyDrop: `50% de chance de drop une orbe d'énergie sur une miséricorde`,
+    upgrade_Equilibrium: `[UNTRANSLATED] +|VAL|% Energy from Health pickups, +|VAL|% Health from Energy pickups`,
+    upgrade_MeleeCritDamage: `[UNTRANSLATED] +|VAL|% Melee Critical Damage`,
+    upgrade_PrimaryStatusChance: `[UNTRANSLATED] +|VAL|% Primary Status Chance`,
+    upgrade_SecondaryCritChance: `[UNTRANSLATED] +|VAL|% Secondary Critical Chance`,
+    upgrade_WarframeAbilityDuration: `[UNTRANSLATED] +|VAL|% Ability Duration`,
+    upgrade_WarframeAbilityStrength: `[UNTRANSLATED] +|VAL|% Ability Strength`,
+    upgrade_WarframeArmourMax: `[UNTRANSLATED] +|VAL| Armor`,
+    upgrade_WarframeBlastProc: `[UNTRANSLATED] +|VAL| Shields on kill with Blast Damage`,
+    upgrade_WarframeCastingSpeed: `[UNTRANSLATED] +|VAL|% Casting Speed`,
+    upgrade_WarframeCorrosiveDamageBoost: `[UNTRANSLATED] +|VAL|% Ability Damage on enemies affected by Corrosion Status`,
+    upgrade_WarframeCorrosiveStack: `[UNTRANSLATED] Increase max stacks of Corrosion Status by +|VAL|`,
+    upgrade_WarframeCritDamageBoost: `[UNTRANSLATED] +|VAL|% Melee Critical Damage (Doubles over 500 Energy)`,
+    upgrade_WarframeElectricDamage: `[UNTRANSLATED] +|VAL1|% Primary Electricity Damage (+|VAL2|% per additional Shard)`,
+    upgrade_WarframeElectricDamageBoost: `[UNTRANSLATED] +|VAL|% Ability Damage on enemies affected by Electricity Status`,
+    upgrade_WarframeEnergyMax: `[UNTRANSLATED] +|VAL| Energy Max`,
+    upgrade_WarframeGlobeEffectEnergy: `[UNTRANSLATED] +|VAL|% Energy Orb Effectiveness`,
+    upgrade_WarframeGlobeEffectHealth: `[UNTRANSLATED] +|VAL|% Health Orb Effectiveness`,
+    upgrade_WarframeHealthMax: `[UNTRANSLATED] +|VAL| Health`,
+    upgrade_WarframeHPBoostFromImpact: `[UNTRANSLATED] +|VAL1| Health per enemy killed with Blast Damage (Max |VAL2| Health)`,
+    upgrade_WarframeParkourVelocity: `[UNTRANSLATED] +|VAL|% Parkour Velocity`,
+    upgrade_WarframeRadiationDamageBoost: `[UNTRANSLATED] +|VAL|% Ability Damage on enemies affected by Radiation Status`,
+    upgrade_WarframeRegen: `[UNTRANSLATED] +|VAL| Health Regen/s`,
+    upgrade_WarframeShieldMax: `[UNTRANSLATED] +|VAL| Shield`,
+    upgrade_WarframeStartingEnergy: `[UNTRANSLATED] +|VAL|% Energy on Spawn`,
+    upgrade_WarframeToxinDamage: `[UNTRANSLATED] +|VAL|% Toxin Status Effect Damage`,
+    upgrade_WarframeToxinHeal: `[UNTRANSLATED] +|VAL| Health on damaging enemies with Toxin Status`,
+    upgrade_WeaponCritBoostFromHeat: `[UNTRANSLATED] +|VAL1|% Secondary Critical Chance per Heat-affected enemy killed (Max |VAL2|%)`,
+    upgrade_AvatarAbilityRange: `[UNTRANSLATED] +7.5% Ability Range`,
+    upgrade_AvatarAbilityEfficiency: `[UNTRANSLATED] +5% Ability Efficiency`,
+    upgrade_AvatarEnergyRegen: `[UNTRANSLATED] +0.5 Energy Regen/s`,
+    upgrade_AvatarEnemyRadar: `[UNTRANSLATED] +5m Enemy Radar`,
+    upgrade_AvatarLootRadar: `[UNTRANSLATED] +7m Loot Radar`,
+    upgrade_WeaponAmmoMax: `[UNTRANSLATED] +15% Ammo Max`,
+    upgrade_EnemyArmorReductionAura: `[UNTRANSLATED] -3% Enemy Armor`,
+    upgrade_OnExecutionAmmo: `[UNTRANSLATED] 100% Primary and Secondary Magazine Refill on Mercy`,
+    upgrade_OnExecutionHealthDrop: `[UNTRANSLATED] 100% chance to drop a Health Orb on Mercy`,
+    upgrade_OnExecutionEnergyDrop: `[UNTRANSLATED] 50% chance to drop an Energy Orb on Mercy`,
     upgrade_OnFailHackReset: `[UNTRANSLATED] +50% to retry on Hacking failure`,
-    upgrade_DamageReductionOnHack: `75% de réduction de dégâts pendant un piratage`,
-    upgrade_OnExecutionReviveCompanion: `Les miséricordes réduisent le temps de récupération du compagnon de 15s`,
-    upgrade_OnExecutionParkourSpeed: `+60% de vitesse de parkour pendant 15s après une miséricorde`,
-    upgrade_AvatarTimeLimitIncrease: `+8s de temps de piratage`,
-    upgrade_ElectrifyOnHack: `Electrifie les ennemis dans un rayon de 20m pendant un piratage`,
-    upgrade_OnExecutionTerrify: `Les ennemis dans un rayon de 15m ont 50% de chance de s'enfuir après une miséricorde`,
-    upgrade_OnHackLockers: `5 casiers s'ouvrent dans un rayon de 20m après un piratage`,
-    upgrade_OnExecutionBlind: `Les ennemis sont aveuglés dans un rayon de 18 après une miséricorde`,
-    upgrade_OnExecutionDrainPower: `100% pour le prochain pouvoir de gagner +50% de puissance de pouvoir sur miséricorde`,
-    upgrade_OnHackSprintSpeed: `+75% de vitesse de course pendant 15s après un piratage`,
-    upgrade_SwiftExecute: `Vitesse des miséricordes augmentée de 50%`,
-    upgrade_OnHackInvis: `Invisible pendant 15 secondes après un piratage`,
+    upgrade_DamageReductionOnHack: `[UNTRANSLATED] 75% Damage Reduction while Hacking`,
+    upgrade_OnExecutionReviveCompanion: `[UNTRANSLATED] Mercy Kills reduce Companion Recovery by 15s`,
+    upgrade_OnExecutionParkourSpeed: `[UNTRANSLATED] +60% Parkour Speed after a Mercy for 15s`,
+    upgrade_AvatarTimeLimitIncrease: `[UNTRANSLATED] s to Hacking`,
+    upgrade_ElectrifyOnHack: `[UNTRANSLATED] Shock enemies within 20m while Hacking`,
+    upgrade_OnExecutionTerrify: `[UNTRANSLATED] 50% chance for enemies within 15m to cower in fear for 8 seconds on Mercy`,
+    upgrade_OnHackLockers: `[UNTRANSLATED] Unlock 5 lockers within 20m after Hacking`,
+    upgrade_OnExecutionBlind: `[UNTRANSLATED] Blind enemies within 18m on Mercy`,
+    upgrade_OnExecutionDrainPower: `[UNTRANSLATED] 100% chance for next ability cast to gain +50% Ability Strength on Mercy`,
+    upgrade_OnHackSprintSpeed: `[UNTRANSLATED] +75% Sprint Speed for 15s after Hacking`,
+    upgrade_SwiftExecute: `[UNTRANSLATED] Speed of Mercy Kills increased by 50%`,
+    upgrade_OnHackInvis: `[UNTRANSLATED] Invisible for 15 seconds after hacking`,
 
     prettier_sucks_ass: ``
 };

static/webui/translations/ru.js

@@ -159,8 +159,6 @@ dict = {
     cheats_noDeathMarks: `Без меток сметри`,
     cheats_noKimCooldowns: `Чаты KIM без кулдауна`,
     cheats_fullyStockedVendors: `[UNTRANSLATED] Fully Stocked Vendors`,
-    cheats_baroAlwaysAvailable: `[UNTRANSLATED] Baro Always Available`,
-    cheats_baroFullyStocked: `[UNTRANSLATED] Baro Fully Stocked`,
     cheats_syndicateMissionsRepeatable: `[UNTRANSLATED] Syndicate Missions Repeatable`,
     cheats_unlockAllProfitTakerStages: `[UNTRANSLATED] Unlock All Profit Taker Stages`,
     cheats_instantFinishRivenChallenge: `[UNTRANSLATED] Instant Finish Riven Challenge`,
@@ -187,8 +185,6 @@ dict = {
     cheats_none: `Отсутствует`,
     import_importNote: `Вы можете загрузить полный или частичный ответ инвентаря (клиентское представление) здесь. Все поддерживаемые поля <b>будут перезаписаны</b> в вашем аккаунте.`,
     import_submit: `Отправить`,
-    import_samples: `[UNTRANSLATED] Samples:`,
-    import_samples_maxFocus: `[UNTRANSLATED] All Focus Schools Maxed Out`,
 
     upgrade_Equilibrium: `[UNTRANSLATED] +|VAL|% Energy from Health pickups, +|VAL|% Health from Energy pickups`,
     upgrade_MeleeCritDamage: `[UNTRANSLATED] +|VAL|% Melee Critical Damage`,
@@ -231,7 +227,7 @@ dict = {
     upgrade_DamageReductionOnHack: `[UNTRANSLATED] 75% Damage Reduction while Hacking`,
     upgrade_OnExecutionReviveCompanion: `[UNTRANSLATED] Mercy Kills reduce Companion Recovery by 15s`,
     upgrade_OnExecutionParkourSpeed: `[UNTRANSLATED] +60% Parkour Speed after a Mercy for 15s`,
-    upgrade_AvatarTimeLimitIncrease: `[UNTRANSLATED] +8s to Hacking`,
+    upgrade_AvatarTimeLimitIncrease: `[UNTRANSLATED] s to Hacking`,
     upgrade_ElectrifyOnHack: `[UNTRANSLATED] Shock enemies within 20m while Hacking`,
     upgrade_OnExecutionTerrify: `[UNTRANSLATED] 50% chance for enemies within 15m to cower in fear for 8 seconds on Mercy`,
     upgrade_OnHackLockers: `[UNTRANSLATED] Unlock 5 lockers within 20m after Hacking`,

static/webui/translations/zh.js

@@ -143,7 +143,7 @@ dict = {
     cheats_dontSubtractConsumables: `消耗物品使用时无损耗`,
     cheats_unlockAllShipFeatures: `解锁所有飞船功能`,
     cheats_unlockAllShipDecorations: `解锁所有飞船装饰`,
-    cheats_unlockAllFlavourItems: `解锁所有<abbr title="动作表情、浮印、调色板等">装饰物品</abbr>`,
+    cheats_unlockAllFlavourItems: `解锁所有<abbr title="动画组合、图标、调色板等">装饰物品</abbr>`,
     cheats_unlockAllSkins: `解锁所有外观`,
     cheats_unlockAllCapturaScenes: `解锁所有Captura场景`,
     cheats_unlockAllDecoRecipes: `解锁所有道场配方`,
@@ -157,10 +157,8 @@ dict = {
     cheats_noMasteryRankUpCooldown: `段位考核无冷却时间`,
     cheats_noVendorPurchaseLimits: `商城或商人无购买限制`,
     cheats_noDeathMarks: `无死亡标记(不会被 Stalker/Grustrag 三霸/Zanuka 猎人等标记)`,
-    cheats_noKimCooldowns: `即时通无冷却时间`,
-    cheats_fullyStockedVendors: `商人贩卖所有商品`,
-    cheats_baroAlwaysAvailable: `虚空商人可永久访问`,
-    cheats_baroFullyStocked: `虚空商人贩卖所有商品`,
+    cheats_noKimCooldowns: `无 KIM 冷却时间`,
+    cheats_fullyStockedVendors: `[UNTRANSLATED] Fully Stocked Vendors`,
     cheats_syndicateMissionsRepeatable: `集团任务可重复`,
     cheats_unlockAllProfitTakerStages: `解锁利润收割者圆蛛所有阶段`,
     cheats_instantFinishRivenChallenge: `立即完成裂罅挑战`,
@@ -174,7 +172,7 @@ dict = {
     cheats_noDojoResearchTime: `无视道场研究时间`,
     cheats_fastClanAscension: `快速升级氏族`,
     cheats_missionsCanGiveAllRelics: `任务可获取所有遗物`,
-    cheats_unlockAllSimarisResearchEntries: `解锁所有Simaris研究条目`,
+    cheats_unlockAllSimarisResearchEntries: `[UNTRANSLATED] Unlock All Simaris Research Entries`,
     cheats_spoofMasteryRank: `伪造精通段位(-1为禁用)`,
     cheats_nightwaveStandingMultiplier: `午夜电波声望倍率`,
     cheats_save: `保存`,
@@ -187,8 +185,6 @@ dict = {
     cheats_none: `无`,
     import_importNote: `您可以在此处提供完整或部分库存响应（客户端表示）。支持的所有字段<b>将被覆盖</b>到您的账户中。`,
     import_submit: `提交`,
-    import_samples: `示例:`,
-    import_samples_maxFocus: `所有专精学派完全精通`,
 
     upgrade_Equilibrium: `+|VAL|% 能量 来自生命球, +|VAL|% 生命 来自能量球`,
     upgrade_MeleeCritDamage: `+|VAL|% 近战暴击伤害`,
@@ -231,7 +227,7 @@ dict = {
     upgrade_DamageReductionOnHack: `入侵时，+75% 伤害减免`,
     upgrade_OnExecutionReviveCompanion: `怜悯之击 减少同伴复苏时间 15秒`,
     upgrade_OnExecutionParkourSpeed: `怜悯之击 15秒内 +60% 跑酷速度`,
-    upgrade_AvatarTimeLimitIncrease: `+8秒 入侵时间`,
+    upgrade_AvatarTimeLimitIncrease: `增加入侵限制时间`,
     upgrade_ElectrifyOnHack: `入侵时震慑20米之内的敌人`,
     upgrade_OnExecutionTerrify: `怜悯之击 50% 几率让 15米 以内的敌人恐慌`,
     upgrade_OnHackLockers: `入侵后解锁20米内的5个储物柜`,