merge upstream

README.md

@@ -14,8 +14,7 @@ SpaceNinjaServer requires a `config.json`. To set it up, you can copy the [confi
 
 - `logger.level` can be `fatal`, `error`, `warn`, `info`, `http`, `debug`, or `trace`.
 - `myIrcAddresses` can be used to point to an IRC server. If not provided, defaults to `[ myAddress ]`.
-- `worldState.eidolonOverride` can be set to `day` or `night` to lock the time to day/fass and night/vome on Plains of Eidolon/Cambion Drift.
+- `worldState.lockTime` will lock the time provided in worldState if nonzero, e.g. `1743202800` for night in POE.
-- `worldState.vallisOverride` can be set to `warm` or `cold` to lock the temperature on Orb Vallis.
 - `worldState.nightwaveOverride` will lock the nightwave season, assuming the client is new enough for it. Valid values:
   - `RadioLegionIntermission13Syndicate` for Nora's Mix Vol. 9
   - `RadioLegionIntermission12Syndicate` for Nora's Mix Vol. 8

config.json.example

@@ -50,17 +50,12 @@
   "noDojoResearchTime": false,
   "fastClanAscension": false,
   "spoofMasteryRank": -1,
-  "nightwaveStandingMultiplier": 1,
   "worldState": {
     "creditBoost": false,
     "affinityBoost": false,
     "resourceBoost": false,
     "starDays": true,
-    "eidolonOverride": "",
+    "lockTime": 0,
-    "vallisOverride": "",
     "nightwaveOverride": ""
-  },
-  "dev": {
-    "keepVendorsExpired": false
   }
 }

package-lock.json

@@ -18,7 +18,7 @@
         "morgan": "^1.10.0",
         "ncp": "^2.0.0",
         "typescript": "^5.5",
-        "warframe-public-export-plus": "^0.5.67",
+        "warframe-public-export-plus": "^0.5.65",
         "warframe-riven-info": "^0.1.2",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"
@@ -3814,9 +3814,9 @@
       }
     },
     "node_modules/warframe-public-export-plus": {
-      "version": "0.5.67",
+      "version": "0.5.65",
-      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.67.tgz",
+      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.65.tgz",
-      "integrity": "sha512-LsnZD2E5PTA+5MK9kDGvM/hFDtg8sb0EwQ4hKH5ILqrSgz30a9W8785v77RSsL1AEVF8dfb/lZcSTCJq1DZHzQ=="
+      "integrity": "sha512-y/HN61lE5g8gx0Giutdl/jzQnQmw1u2uI0BiwKVW341nf42sKWQPsKsCVTL5x9MIDYyRCbFsMU+PazKC7byMdg=="
     },
     "node_modules/warframe-riven-info": {
       "version": "0.1.2",

package.json

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

src/controllers/api/claimCompletedRecipeController.ts

@@ -118,7 +118,7 @@ export const claimCompletedRecipeController: RequestHandler = async (req, res) =
                     break;
                 }
             }
-            pet.Details!.Status = canSetActive ? Status.StatusAvailable : Status.StatusStasis;
+            pet.Details!.Status = canSetActive ? Status.StatusAvailable : Status.StatusIncubating;
         } else if (recipe.secretIngredientAction != "SIA_UNBRAND") {
             InventoryChanges = {
                 ...InventoryChanges,

src/controllers/api/fishmongerController.ts

@@ -30,14 +30,15 @@ export const fishmongerController: RequestHandler = async (req, res) => {
         miscItemChanges.push({ ItemType: fish.ItemType, ItemCount: fish.ItemCount * -1 });
     }
     addMiscItems(inventory, miscItemChanges);
-    if (gainedStanding && syndicateTag) addStanding(inventory, syndicateTag, gainedStanding);
+    let affiliationMod;
+    if (gainedStanding && syndicateTag) affiliationMod = addStanding(inventory, syndicateTag, gainedStanding);
     await inventory.save();
     res.json({
         InventoryChanges: {
             MiscItems: miscItemChanges
         },
         SyndicateTag: syndicateTag,
-        StandingChange: gainedStanding
+        StandingChange: affiliationMod?.Standing || 0
     });
 };
 

src/controllers/api/getVendorInfoController.ts

@@ -2,7 +2,6 @@ import { RequestHandler } from "express";
 import { applyStandingToVendorManifest, getVendorManifestByTypeName } from "@/src/services/serversideVendorsService";
 import { getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { config } from "@/src/services/configService";
 
 export const getVendorInfoController: RequestHandler = async (req, res) => {
     let manifest = getVendorManifestByTypeName(req.query.vendor as string);
@@ -15,14 +14,6 @@ export const getVendorInfoController: RequestHandler = async (req, res) => {
         const accountId = await getAccountIdForRequest(req);
         const inventory = await getInventory(accountId);
         manifest = applyStandingToVendorManifest(inventory, manifest);
-        if (config.dev?.keepVendorsExpired) {
-            manifest = {
-                VendorInfo: {
-                    ...manifest.VendorInfo,
-                    Expiry: { $date: { $numberLong: "0" } }
-                }
-            };
-        }
     }
 
     res.json(manifest);

src/controllers/api/saveDialogueController.ts

@@ -24,7 +24,7 @@ export const saveDialogueController: RequestHandler = async (req, res) => {
         inventory.DialogueHistory.Dialogues ??= [];
         const dialogue = getDialogue(inventory, request.DialogueName);
         dialogue.Rank = request.Rank;
-        dialogue.Chemistry += request.Chemistry;
+        dialogue.Chemistry = request.Chemistry;
         dialogue.QueuedDialogues = request.QueuedDialogues;
         for (const bool of request.Booleans) {
             dialogue.Booleans.push(bool);

src/controllers/api/syndicateSacrificeController.ts

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

src/controllers/api/syndicateStandingBonusController.ts

@@ -5,7 +5,7 @@ import { IMiscItem, InventorySlot } from "@/src/types/inventoryTypes/inventoryTy
 import { IOid } from "@/src/types/commonTypes";
 import { ExportSyndicates, ExportWeapons } from "warframe-public-export-plus";
 import { logger } from "@/src/utils/logger";
-import { IAffiliationMods, IInventoryChanges } from "@/src/types/purchaseTypes";
+import { IInventoryChanges } from "@/src/types/purchaseTypes";
 import { EquipmentFeatures } from "@/src/types/inventoryTypes/commonInventoryTypes";
 
 export const syndicateStandingBonusController: RequestHandler = async (req, res) => {
@@ -54,14 +54,13 @@ export const syndicateStandingBonusController: RequestHandler = async (req, res)
         inventoryChanges[slotBin] = { count: -1, platinum: 0, Slots: 1 };
     }
 
-    const affiliationMods: IAffiliationMods[] = [];
+    const affiliationMod = addStanding(inventory, request.Operation.AffiliationTag, gainedStanding, true);
-    addStanding(inventory, request.Operation.AffiliationTag, gainedStanding, affiliationMods, true);
 
     await inventory.save();
 
     res.json({
         InventoryChanges: inventoryChanges,
-        AffiliationMods: affiliationMods
+        AffiliationMods: [affiliationMod]
     });
 };
 

src/controllers/api/trainingResultController.ts

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

src/controllers/custom/getItemListsController.ts

@@ -3,7 +3,6 @@ import { getDict, getItemName, getString } from "@/src/services/itemDataService"
 import {
     ExportArcanes,
     ExportAvionics,
-    ExportBoosters,
     ExportCustoms,
     ExportDrones,
     ExportGear,
@@ -20,6 +19,7 @@ import {
     ExportWeapons,
     TRelicQuality
 } from "warframe-public-export-plus";
+import archonCrystalUpgrades from "@/static/fixed_responses/webuiArchonCrystalUpgrades.json";
 import allIncarnons from "@/static/fixed_responses/allIncarnonList.json";
 
 interface ListedItem {
@@ -35,6 +35,7 @@ interface ListedItem {
 }
 
 interface ItemLists {
+    archonCrystalUpgrades: Record<string, string>;
     uniqueLevelCaps: Record<string, number>;
     Suits: ListedItem[];
     LongGuns: ListedItem[];
@@ -54,7 +55,6 @@ interface ItemLists {
     KubrowPets: ListedItem[];
     EvolutionProgress: ListedItem[];
     mods: ListedItem[];
-    Boosters: ListedItem[];
 }
 
 const relicQualitySuffixes: Record<TRelicQuality, string> = {
@@ -67,6 +67,7 @@ const relicQualitySuffixes: Record<TRelicQuality, string> = {
 const getItemListsController: RequestHandler = (req, response) => {
     const lang = getDict(typeof req.query.lang == "string" ? req.query.lang : "en");
     const res: ItemLists = {
+        archonCrystalUpgrades,
         uniqueLevelCaps: ExportMisc.uniqueLevelCaps,
         Suits: [],
         LongGuns: [],
@@ -85,8 +86,7 @@ const getItemListsController: RequestHandler = (req, response) => {
         QuestKeys: [],
         KubrowPets: [],
         EvolutionProgress: [],
-        mods: [],
+        mods: []
-        Boosters: []
     };
     for (const [uniqueName, item] of Object.entries(ExportWarframes)) {
         res[item.productCategory].push({
@@ -296,13 +296,6 @@ const getItemListsController: RequestHandler = (req, response) => {
         });
     }
 
-    for (const item of Object.values(ExportBoosters)) {
-        res.Boosters.push({
-            uniqueName: item.typeName,
-            name: getString(item.name, lang)
-        });
-    }
-
     response.json(res);
 };
 

src/controllers/custom/setBoosterController.ts

@@ -1,45 +0,0 @@
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { getInventory } from "@/src/services/inventoryService";
-import { RequestHandler } from "express";
-import { ExportBoosters } from "warframe-public-export-plus";
-
-const I32_MAX = 0x7fffffff;
-
-export const setBoosterController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const requests = req.body as { ItemType: string; ExpiryDate: number }[];
-    const inventory = await getInventory(accountId, "Boosters");
-    const boosters = inventory.Boosters;
-    if (
-        requests.some(request => {
-            if (typeof request.ItemType !== "string") return true;
-            if (Object.entries(ExportBoosters).find(([_, item]) => item.typeName === request.ItemType) === undefined)
-                return true;
-            if (typeof request.ExpiryDate !== "number") return true;
-            if (request.ExpiryDate < 0 || request.ExpiryDate > I32_MAX) return true;
-            return false;
-        })
-    ) {
-        res.status(400).send("Invalid ItemType provided.");
-        return;
-    }
-    const now = Math.floor(Date.now() / 1000);
-    for (const { ItemType, ExpiryDate } of requests) {
-        if (ExpiryDate < now) {
-            // remove expired boosters
-            const index = boosters.findIndex(item => item.ItemType === ItemType);
-            if (index !== -1) {
-                boosters.splice(index, 1);
-            }
-        } else {
-            const boosterItem = boosters.find(item => item.ItemType === ItemType);
-            if (boosterItem) {
-                boosterItem.ExpiryDate = ExpiryDate;
-            } else {
-                boosters.push({ ItemType, ExpiryDate });
-            }
-        }
-    }
-    await inventory.save();
-    res.end();
-};

src/helpers/syndicateStandingHelper.ts

@@ -10,14 +10,3 @@ export const getMaxStanding = (syndicate: ISyndicate, title: number): number =>
     }
     return syndicate.titles.find(x => x.level == title)!.maxStanding;
 };
-
-export const getMinStanding = (syndicate: ISyndicate, title: number): number => {
-    if (!syndicate.titles) {
-        // LibrarySyndicate
-        return 0;
-    }
-    if (title == 0) {
-        return syndicate.titles.find(x => x.level == -1)!.maxStanding;
-    }
-    return syndicate.titles.find(x => x.level == title)!.minStanding;
-};

src/index.ts

@@ -1,14 +1,9 @@
 // First, init config.
 import { config, loadConfig } from "@/src/services/configService";
-import fs from "fs";
 try {
     loadConfig();
 } catch (e) {
-    if (fs.existsSync("config.json")) {
+    console.log("ERROR: Failed to load config.json. You can copy config.json.example to create your config.json.");
-        console.log("Failed to load config.json: " + (e as Error).message);
-    } else {
-        console.log("Failed to load config.json. You can copy config.json.example to create your config.json.");
-    }
     process.exit(1);
 }
 

src/routes/custom.ts

@@ -23,7 +23,6 @@ import { setEvolutionProgressController } from "@/src/controllers/custom/setEvol
 
 import { getConfigDataController } from "@/src/controllers/custom/getConfigDataController";
 import { updateConfigDataController } from "@/src/controllers/custom/updateConfigDataController";
-import { setBoosterController } from "../controllers/custom/setBoosterController";
 
 const customRouter = express.Router();
 
@@ -47,7 +46,6 @@ customRouter.post("/addXp", addXpController);
 customRouter.post("/import", importController);
 customRouter.post("/manageQuests", manageQuestsController);
 customRouter.post("/setEvolutionProgress", setEvolutionProgressController);
-customRouter.post("/setBooster", setBoosterController);
 
 customRouter.get("/config", getConfigDataController);
 customRouter.post("/config", updateConfigDataController);

src/services/configService.ts

@@ -56,19 +56,14 @@ interface IConfig {
     noDojoResearchTime?: boolean;
     fastClanAscension?: boolean;
     spoofMasteryRank?: number;
-    nightwaveStandingMultiplier?: number;
     worldState?: {
         creditBoost?: boolean;
         affinityBoost?: boolean;
         resourceBoost?: boolean;
         starDays?: boolean;
-        eidolonOverride?: string;
+        lockTime?: number;
-        vallisOverride?: string;
         nightwaveOverride?: string;
     };
-    dev?: {
-        keepVendorsExpired?: boolean;
-    };
 }
 
 export const configPath = path.join(repoDir, "config.json");

src/services/configWatcherService.ts

@@ -13,7 +13,7 @@ fs.watchFile(configPath, () => {
         try {
             loadConfig();
         } catch (e) {
-            logger.error("FATAL ERROR: Config failed to be reloaded: " + (e as Error).message);
+            logger.error("Failed to reload config.json. Did you delete it?! Execution cannot continue.");
             process.exit(1);
         }
         validateConfig();

src/services/inventoryService.ts

@@ -82,7 +82,7 @@ import { handleBundleAcqusition } from "./purchaseService";
 import libraryDailyTasks from "@/static/fixed_responses/libraryDailyTasks.json";
 import { getRandomElement, getRandomInt, getRandomWeightedReward, SRng } from "./rngService";
 import { createMessage } from "./inboxService";
-import { getMaxStanding, getMinStanding } from "@/src/helpers/syndicateStandingHelper";
+import { getMaxStanding } from "@/src/helpers/syndicateStandingHelper";
 import { getNightwaveSyndicateTag, getWorldState } from "./worldStateService";
 import { generateNemesisProfile, INemesisProfile } from "../helpers/nemesisHelpers";
 import { TAccountDocument } from "./loginService";
@@ -1202,10 +1202,8 @@ export const addStanding = (
     inventory: TInventoryDatabaseDocument,
     syndicateTag: string,
     gainedStanding: number,
-    affiliationMods: IAffiliationMods[] = [],
+    isMedallion: boolean = false
-    isMedallion: boolean = false,
+): IAffiliationMods => {
-    propagateAlignments: boolean = true
-): void => {
     let syndicate = inventory.Affiliations.find(x => x.Tag == syndicateTag);
     const syndicateMeta = ExportSyndicates[syndicateTag];
 
@@ -1217,10 +1215,6 @@ export const addStanding = (
     const max = getMaxStanding(syndicateMeta, syndicate.Title ?? 0);
     if (syndicate.Standing + gainedStanding > max) gainedStanding = max - syndicate.Standing;
 
-    if (syndicate.Title == -2 && syndicate.Standing + gainedStanding < -71000) {
-        gainedStanding = -71000 + syndicate.Standing;
-    }
-
     if (!isMedallion || syndicateMeta.medallionsCappedByDailyLimit) {
         if (gainedStanding > getStandingLimit(inventory, syndicateMeta.dailyLimitBin)) {
             gainedStanding = getStandingLimit(inventory, syndicateMeta.dailyLimitBin);
@@ -1229,27 +1223,10 @@ export const addStanding = (
     }
 
     syndicate.Standing += gainedStanding;
-    const affiliationMod: IAffiliationMods = {
+    return {
         Tag: syndicateTag,
         Standing: gainedStanding
     };
-    affiliationMods.push(affiliationMod);
-
-    if (syndicateMeta.alignments) {
-        if (propagateAlignments) {
-            for (const [tag, factor] of Object.entries(syndicateMeta.alignments)) {
-                addStanding(inventory, tag, gainedStanding * factor, affiliationMods, isMedallion, false);
-            }
-        } else {
-            while (syndicate.Standing < getMinStanding(syndicateMeta, syndicate.Title ?? 0)) {
-                syndicate.Title ??= 0;
-                syndicate.Title -= 1;
-                affiliationMod.Title ??= 0;
-                affiliationMod.Title -= 1;
-                logger.debug(`${syndicateTag} is decreasing to title ${syndicate.Title} after applying alignment`);
-            }
-        }
-    }
 };
 
 // TODO: AffiliationMods support (Nightwave).
@@ -1548,8 +1525,7 @@ export const applyClientEquipmentUpdates = (
     gearArray.forEach(({ ItemId, XP, InfestationDate }) => {
         const item = category.id(fromOid(ItemId));
         if (!item) {
-            logger.warn(`Skipping unknown ${categoryName} item: id ${fromOid(ItemId)} not found`);
+            throw new Error(`No item with id ${fromOid(ItemId)} in ${categoryName}`);
-            return;
         }
 
         if (XP) {
@@ -1796,14 +1772,13 @@ export const addChallenges = (
                             }) - 1
                         ];
                 }
+                affiliation.Standing += meta.standing!;
 
-                const standingToAdd = meta.standing! * (config.nightwaveStandingMultiplier ?? 1);
-                affiliation.Standing += standingToAdd;
                 if (affiliationMods.length == 0) {
                     affiliationMods.push({ Tag: nightwaveSyndicateTag });
                 }
                 affiliationMods[0].Standing ??= 0;
-                affiliationMods[0].Standing += standingToAdd;
+                affiliationMods[0].Standing += meta.standing!;
             }
         }
     }

src/services/itemDataService.ts

@@ -233,7 +233,7 @@ export const isStoreItem = (type: string): boolean => {
 };
 
 export const toStoreItem = (type: string): string => {
-    if (type.startsWith("/Lotus/Types/Boosters/")) {
+    if (type.startsWith("/Lotus/Types/StoreItems/Boosters/")) {
         const boosterEntry = Object.entries(ExportBoosters).find(arr => arr[1].typeName == type);
         if (boosterEntry) {
             return boosterEntry[0];

src/services/missionInventoryUpdateService.ts

@@ -66,7 +66,15 @@ import {
 } from "@/src/helpers/nemesisHelpers";
 import { Loadout } from "../models/inventoryModels/loadoutModel";
 import { ILoadoutConfigDatabase } from "../types/saveLoadoutTypes";
-import { getLiteSortie, getSortie, idToBountyCycle, idToDay, idToWeek, pushClassicBounties } from "./worldStateService";
+import {
+    getLiteSortie,
+    getSortie,
+    getWorldState,
+    idToBountyCycle,
+    idToDay,
+    idToWeek,
+    pushClassicBounties
+} from "./worldStateService";
 import { config } from "./configService";
 import libraryDailyTasks from "@/static/fixed_responses/libraryDailyTasks.json";
 import { ISyndicateMissionInfo } from "../types/worldStateTypes";
@@ -1228,18 +1236,19 @@ export const addMissionRewards = async (
                 SyndicateXPItemReward = medallionAmount;
             } else {
                 if (rewardInfo.JobTier! >= 0) {
+                    AffiliationMods.push(
                         addStanding(
                             inventory,
                             syndicateEntry.Tag,
-                        Math.floor(currentJob.xpAmounts[rewardInfo.JobStage] / (rewardInfo.Q ? 0.8 : 1)),
+                            Math.floor(currentJob.xpAmounts[rewardInfo.JobStage] / (rewardInfo.Q ? 0.8 : 1))
-                        AffiliationMods
+                        )
                     );
                 } else {
                     if (jobType.endsWith("Heists/HeistProfitTakerBountyOne") && rewardInfo.JobStage === 2) {
-                        addStanding(inventory, syndicateEntry.Tag, 1000, AffiliationMods);
+                        AffiliationMods.push(addStanding(inventory, syndicateEntry.Tag, 1000));
                     }
                     if (jobType.endsWith("Hunts/AllTeralystsHunt") && rewardInfo.JobStage === 2) {
-                        addStanding(inventory, syndicateEntry.Tag, 5000, AffiliationMods);
+                        AffiliationMods.push(addStanding(inventory, syndicateEntry.Tag, 5000));
                     }
                     if (
                         [
@@ -1250,7 +1259,7 @@ export const addMissionRewards = async (
                             "Heists/HeistExploiterBountyOne"
                         ].some(ending => jobType.endsWith(ending))
                     ) {
-                        addStanding(inventory, syndicateEntry.Tag, 1000, AffiliationMods);
+                        AffiliationMods.push(addStanding(inventory, syndicateEntry.Tag, 1000));
                     }
                 }
             }
@@ -1258,9 +1267,9 @@ export const addMissionRewards = async (
     }
 
     if (rewardInfo.challengeMissionId) {
-        const [syndicateTag, tierStr, chemistryBuddyStr] = rewardInfo.challengeMissionId.split("_");
+        const [syndicateTag, tierStr, chemistryStr] = rewardInfo.challengeMissionId.split("_");
         const tier = Number(tierStr);
-        const chemistryBuddy = Number(chemistryBuddyStr);
+        const chemistry = Number(chemistryStr);
         const isSteelPath = missions?.Tier;
         if (syndicateTag === "ZarimanSyndicate") {
             let medallionAmount = tier + 1;
@@ -1275,21 +1284,24 @@ export const addMissionRewards = async (
             let standingAmount = (tier + 1) * 1000;
             if (tier > 5) standingAmount = 7500; // InfestedLichBounty
             if (isSteelPath) standingAmount *= 1.5;
-            addStanding(inventory, syndicateTag, standingAmount, AffiliationMods);
+            AffiliationMods.push(addStanding(inventory, syndicateTag, standingAmount));
+        }
+        if (syndicateTag == "HexSyndicate" && chemistry && tier < 6) {
+            const seed = getWorldState().SyndicateMissions.find(x => x.Tag == "HexSyndicate")!.Seed;
+            const { nodes, buddies } = getHexBounties(seed);
+            const buddy = buddies[tier];
+            logger.debug(`Hex seed is ${seed}, giving chemistry for ${buddy}`);
+            if (missions?.Tag != nodes[tier]) {
+                logger.warn(
+                    `Uh-oh, tier ${tier} bounty should've been on ${nodes[tier]} but you were just on ${missions?.Tag}`
+                );
             }
-        if (syndicateTag == "HexSyndicate" && tier < 6) {
-            const buddy = chemistryBuddies[chemistryBuddy];
-            const dialogue = getDialogue(inventory, buddy);
-            if (Date.now() >= dialogue.BountyChemExpiry.getTime()) {
-                logger.debug(`Giving 20 chemistry for ${buddy}`);
             const tomorrowAt0Utc = config.noKimCooldowns
                 ? Date.now()
                 : (Math.trunc(Date.now() / 86400_000) + 1) * 86400_000;
-                dialogue.Chemistry += 20;
+            const dialogue = getDialogue(inventory, buddy);
+            dialogue.Chemistry += chemistry;
             dialogue.BountyChemExpiry = new Date(tomorrowAt0Utc);
-            } else {
-                logger.debug(`Already got today's chemistry for ${buddy}`);
-            }
         }
         if (isSteelPath) {
             await addItem(inventory, "/Lotus/Types/Items/MiscItems/SteelEssence", 1);
@@ -1853,16 +1865,7 @@ const libraryPersonalTargetToAvatar: Record<string, string> = {
         "/Lotus/Types/Enemies/Corpus/Spaceman/AIWeek/NullifySpacemanAvatar"
 };
 
-const chemistryBuddies: readonly string[] = [
+const node_excluded_buddies: Record<string, string> = {
-    "/Lotus/Types/Gameplay/1999Wf/Dialogue/JabirDialogue_rom.dialogue",
-    "/Lotus/Types/Gameplay/1999Wf/Dialogue/AoiDialogue_rom.dialogue",
-    "/Lotus/Types/Gameplay/1999Wf/Dialogue/ArthurDialogue_rom.dialogue",
-    "/Lotus/Types/Gameplay/1999Wf/Dialogue/EleanorDialogue_rom.dialogue",
-    "/Lotus/Types/Gameplay/1999Wf/Dialogue/LettieDialogue_rom.dialogue",
-    "/Lotus/Types/Gameplay/1999Wf/Dialogue/QuincyDialogue_rom.dialogue"
-];
-
-/*const node_excluded_buddies: Record<string, string> = {
     SolNode856: "/Lotus/Types/Gameplay/1999Wf/Dialogue/ArthurDialogue_rom.dialogue",
     SolNode852: "/Lotus/Types/Gameplay/1999Wf/Dialogue/LettieDialogue_rom.dialogue",
     SolNode851: "/Lotus/Types/Gameplay/1999Wf/Dialogue/JabirDialogue_rom.dialogue",
@@ -1912,4 +1915,4 @@ const getHexBounties = (seed: number): { nodes: string[]; buddies: string[] } =>
         }
     }
     return { nodes, buddies };
-};*/
+};

src/services/serversideVendorsService.ts

@@ -6,7 +6,7 @@ import { mixSeeds, SRng } from "@/src/services/rngService";
 import { IMongoDate } from "@/src/types/commonTypes";
 import { IItemManifest, IVendorInfo, IVendorManifest } from "@/src/types/vendorTypes";
 import { logger } from "@/src/utils/logger";
-import { ExportVendors, IRange, IVendor, IVendorOffer } from "warframe-public-export-plus";
+import { ExportVendors, IRange, IVendor } from "warframe-public-export-plus";
 
 import ArchimedeanVendorManifest from "@/static/fixed_responses/getVendorInfo/ArchimedeanVendorManifest.json";
 import DeimosEntratiFragmentVendorProductsManifest from "@/static/fixed_responses/getVendorInfo/DeimosEntratiFragmentVendorProductsManifest.json";
@@ -17,14 +17,18 @@ import DeimosHivemindCommisionsManifestTokenVendor from "@/static/fixed_response
 import DeimosHivemindCommisionsManifestWeaponsmith from "@/static/fixed_responses/getVendorInfo/DeimosHivemindCommisionsManifestWeaponsmith.json";
 import DeimosHivemindTokenVendorManifest from "@/static/fixed_responses/getVendorInfo/DeimosHivemindTokenVendorManifest.json";
 import DeimosPetVendorManifest from "@/static/fixed_responses/getVendorInfo/DeimosPetVendorManifest.json";
+import DeimosProspectorVendorManifest from "@/static/fixed_responses/getVendorInfo/DeimosProspectorVendorManifest.json";
 import DuviriAcrithisVendorManifest from "@/static/fixed_responses/getVendorInfo/DuviriAcrithisVendorManifest.json";
 import EntratiLabsEntratiLabsCommisionsManifest from "@/static/fixed_responses/getVendorInfo/EntratiLabsEntratiLabsCommisionsManifest.json";
 import EntratiLabsEntratiLabVendorManifest from "@/static/fixed_responses/getVendorInfo/EntratiLabsEntratiLabVendorManifest.json";
+import HubsIronwakeDondaVendorManifest from "@/static/fixed_responses/getVendorInfo/HubsIronwakeDondaVendorManifest.json";
 import HubsRailjackCrewMemberVendorManifest from "@/static/fixed_responses/getVendorInfo/HubsRailjackCrewMemberVendorManifest.json";
 import MaskSalesmanManifest from "@/static/fixed_responses/getVendorInfo/MaskSalesmanManifest.json";
 import Nova1999ConquestShopManifest from "@/static/fixed_responses/getVendorInfo/Nova1999ConquestShopManifest.json";
 import OstronPetVendorManifest from "@/static/fixed_responses/getVendorInfo/OstronPetVendorManifest.json";
+import OstronProspectorVendorManifest from "@/static/fixed_responses/getVendorInfo/OstronProspectorVendorManifest.json";
 import SolarisDebtTokenVendorRepossessionsManifest from "@/static/fixed_responses/getVendorInfo/SolarisDebtTokenVendorRepossessionsManifest.json";
+import SolarisProspectorVendorManifest from "@/static/fixed_responses/getVendorInfo/SolarisProspectorVendorManifest.json";
 import Temple1999VendorManifest from "@/static/fixed_responses/getVendorInfo/Temple1999VendorManifest.json";
 import TeshinHardModeVendorManifest from "@/static/fixed_responses/getVendorInfo/TeshinHardModeVendorManifest.json";
 import ZarimanCommisionsManifestArchimedean from "@/static/fixed_responses/getVendorInfo/ZarimanCommisionsManifestArchimedean.json";
@@ -39,14 +43,18 @@ const rawVendorManifests: IVendorManifest[] = [
     DeimosHivemindCommisionsManifestWeaponsmith,
     DeimosHivemindTokenVendorManifest,
     DeimosPetVendorManifest,
+    DeimosProspectorVendorManifest,
     DuviriAcrithisVendorManifest,
     EntratiLabsEntratiLabsCommisionsManifest,
     EntratiLabsEntratiLabVendorManifest,
+    HubsIronwakeDondaVendorManifest, // uses preprocessing
     HubsRailjackCrewMemberVendorManifest,
     MaskSalesmanManifest,
     Nova1999ConquestShopManifest,
     OstronPetVendorManifest,
+    OstronProspectorVendorManifest,
     SolarisDebtTokenVendorRepossessionsManifest,
+    SolarisProspectorVendorManifest,
     Temple1999VendorManifest,
     TeshinHardModeVendorManifest, // uses preprocessing
     ZarimanCommisionsManifestArchimedean
@@ -75,6 +83,10 @@ const generatableVendors: IGeneratableVendorInfo[] = [
         cycleOffset: 1744934400_000,
         cycleDuration: 4 * unixTimesInMs.day
     }
+    // {
+    //     _id: { $oid: "5dbb4c41e966f7886c3ce939" },
+    //     TypeName: "/Lotus/Types/Game/VendorManifests/Hubs/IronwakeDondaVendorManifest"
+    // }
 ];
 
 const getVendorOid = (typeName: string): string => {
@@ -216,22 +228,6 @@ const toRange = (value: IRange | number): IRange => {
     return value;
 };
 
-const getCycleDurationRange = (manifest: IVendor): IRange | undefined => {
-    const res: IRange = { minValue: Number.MAX_SAFE_INTEGER, maxValue: 0 };
-    for (const offer of manifest.items) {
-        if (offer.durationHours) {
-            const range = toRange(offer.durationHours);
-            if (res.minValue > range.minValue) {
-                res.minValue = range.minValue;
-            }
-            if (res.maxValue < range.maxValue) {
-                res.maxValue = range.maxValue;
-            }
-        }
-    }
-    return res.maxValue != 0 ? res : undefined;
-};
-
 const vendorManifestCache: Record<string, IVendorManifest> = {};
 
 const generateVendorManifest = (vendorInfo: IGeneratableVendorInfo): IVendorManifest => {
@@ -248,16 +244,10 @@ const generateVendorManifest = (vendorInfo: IGeneratableVendorInfo): IVendorMani
     }
     const cacheEntry = vendorManifestCache[vendorInfo.TypeName];
     const info = cacheEntry.VendorInfo;
-    const manifest = ExportVendors[vendorInfo.TypeName];
+    if (Date.now() >= parseInt(info.Expiry.$date.$numberLong)) {
-    const cycleDurationRange = getCycleDurationRange(manifest);
-    let now = Date.now();
-    if (cycleDurationRange && cycleDurationRange.minValue != cycleDurationRange.maxValue) {
-        now -= (cycleDurationRange.maxValue - 1) * unixTimesInMs.hour;
-    }
-    while (Date.now() >= parseInt(info.Expiry.$date.$numberLong)) {
         // Remove expired offers
         for (let i = 0; i != info.ItemManifest.length; ) {
-            if (now >= parseInt(info.ItemManifest[i].Expiry.$date.$numberLong)) {
+            if (Date.now() >= parseInt(info.ItemManifest[i].Expiry.$date.$numberLong)) {
                 info.ItemManifest.splice(i, 1);
             } else {
                 ++i;
@@ -268,10 +258,16 @@ const generateVendorManifest = (vendorInfo: IGeneratableVendorInfo): IVendorMani
         const vendorSeed = parseInt(vendorInfo._id.$oid.substring(16), 16);
         const cycleOffset = vendorInfo.cycleOffset ?? 1734307200_000;
         const cycleDuration = vendorInfo.cycleDuration;
-        const cycleIndex = Math.trunc((now - cycleOffset) / cycleDuration);
+        const cycleIndex = Math.trunc((Date.now() - cycleOffset) / cycleDuration);
         const rng = new SRng(mixSeeds(vendorSeed, cycleIndex));
-        const offersToAdd: IVendorOffer[] = [];
+        const manifest = ExportVendors[vendorInfo.TypeName];
-        if (!manifest.isOneBinPerCycle) {
+        const offersToAdd = [];
+        if (
+            manifest.numItems &&
+            (manifest.numItems.minValue != manifest.numItems.maxValue ||
+                manifest.items.length != manifest.numItems.minValue) &&
+            !manifest.isOneBinPerCycle
+        ) {
             const remainingItemCapacity: Record<string, number> = {};
             for (const item of manifest.items) {
                 remainingItemCapacity[item.storeItem] = 1 + item.duplicates;
@@ -279,7 +275,6 @@ const generateVendorManifest = (vendorInfo: IGeneratableVendorInfo): IVendorMani
             for (const offer of info.ItemManifest) {
                 remainingItemCapacity[offer.StoreItem] -= 1;
             }
-            if (manifest.numItems && manifest.items.length != manifest.numItems.minValue) {
             const numItemsTarget = rng.randomInt(manifest.numItems.minValue, manifest.numItems.maxValue);
             while (info.ItemManifest.length + offersToAdd.length < numItemsTarget) {
                 // TODO: Consider per-bin item limits
@@ -291,36 +286,20 @@ const generateVendorManifest = (vendorInfo: IGeneratableVendorInfo): IVendorMani
                 }
             }
         } else {
-                for (const item of manifest.items) {
+            let binThisCycle;
-                    if (!item.alwaysOffered && remainingItemCapacity[item.storeItem] != 0) {
+            if (manifest.isOneBinPerCycle) {
-                        remainingItemCapacity[item.storeItem] -= 1;
+                binThisCycle = cycleIndex % 2; // Note: May want to auto-compute the bin size, but this is only used for coda weapons right now.
-                        offersToAdd.push(item);
             }
-                }
-                for (const e of Object.entries(remainingItemCapacity)) {
-                    const item = manifest.items.find(x => x.storeItem == e[0])!;
-                    if (!item.alwaysOffered) {
-                        while (e[1] != 0) {
-                            e[1] -= 1;
-                            offersToAdd.push(item);
-                        }
-                    }
-                }
-                for (const item of manifest.items) {
-                    if (item.alwaysOffered && remainingItemCapacity[item.storeItem] != 0) {
-                        remainingItemCapacity[item.storeItem] -= 1;
-                        offersToAdd.push(item);
-                    }
-                }
-                offersToAdd.reverse();
-            }
-        } else {
-            const binThisCycle = cycleIndex % 2; // Note: May want to auto-compute the bin size, but this is only used for coda weapons right now.
             for (const rawItem of manifest.items) {
-                if (rawItem.bin == binThisCycle) {
+                if (!manifest.isOneBinPerCycle || rawItem.bin == binThisCycle) {
                     offersToAdd.push(rawItem);
                 }
             }
+
+            // For most vendors, the offers seem to roughly be in reverse order from the manifest. Coda weapons are an odd exception.
+            if (!manifest.isOneBinPerCycle) {
+                offersToAdd.reverse();
+            }
         }
         const cycleStart = cycleOffset + cycleIndex * cycleDuration;
         for (const rawItem of offersToAdd) {
@@ -332,7 +311,7 @@ const generateVendorManifest = (vendorInfo: IGeneratableVendorInfo): IVendorMani
                 StoreItem: rawItem.storeItem,
                 ItemPrices: rawItem.itemPrices?.map(itemPrice => ({ ...itemPrice, ProductCategory: "MiscItems" })),
                 Bin: "BIN_" + rawItem.bin,
-                QuantityMultiplier: rawItem.quantity,
+                QuantityMultiplier: 1,
                 Expiry: { $date: { $numberLong: expiry.toString() } },
                 AllowMultipurchase: false,
                 Id: {
@@ -392,8 +371,6 @@ const generateVendorManifest = (vendorInfo: IGeneratableVendorInfo): IVendorMani
             }
         }
         info.Expiry.$date.$numberLong = soonestOfferExpiry.toString();
-
-        now += unixTimesInMs.hour;
     }
     return cacheEntry;
 };
@@ -411,17 +388,4 @@ if (isDev) {
     ) {
         logger.warn(`self test failed for /Lotus/Types/Game/VendorManifests/Hubs/GuildAdvertisementVendorManifest`);
     }
-
-    const pall = getVendorManifestByTypeName("/Lotus/Types/Game/VendorManifests/Hubs/IronwakeDondaVendorManifest")!
-        .VendorInfo.ItemManifest;
-    if (
-        pall.length != 5 ||
-        pall[0].StoreItem != "/Lotus/StoreItems/Types/Items/ShipDecos/HarrowQuestKeyOrnament" ||
-        pall[1].StoreItem != "/Lotus/StoreItems/Types/BoosterPacks/RivenModPack" ||
-        pall[2].StoreItem != "/Lotus/StoreItems/Types/StoreItems/CreditBundles/150000Credits" ||
-        pall[3].StoreItem != "/Lotus/StoreItems/Types/Items/MiscItems/Kuva" ||
-        pall[4].StoreItem != "/Lotus/StoreItems/Types/BoosterPacks/RivenModPack"
-    ) {
-        logger.warn(`self test failed for /Lotus/Types/Game/VendorManifests/Hubs/IronwakeDondaVendorManifest`);
-    }
 }

src/services/worldStateService.ts

@@ -19,7 +19,6 @@ import {
     IWorldState
 } from "../types/worldStateTypes";
 import { version_compare } from "../helpers/inventoryHelpers";
-import { logger } from "../utils/logger";
 
 const sortieBosses = [
     "SORTIE_BOSS_HYENA",
@@ -453,37 +452,13 @@ const pushWeeklyActs = (
     }
 };
 
-const generateXpAmounts = (rng: SRng, stageCount: number, minXp: number, maxXp: number): number[] => {
-    const step = minXp < 1000 ? 1 : 10;
-    const totalDeciXp = rng.randomInt(minXp / step, maxXp / step);
-    const xpAmounts: number[] = [];
-    if (stageCount < 4) {
-        const perStage = Math.ceil(totalDeciXp / stageCount) * step;
-        for (let i = 0; i != stageCount; ++i) {
-            xpAmounts.push(perStage);
-        }
-    } else {
-        const perStage = Math.ceil(Math.round(totalDeciXp * 0.667) / (stageCount - 1)) * step;
-        for (let i = 0; i != stageCount - 1; ++i) {
-            xpAmounts.push(perStage);
-        }
-        xpAmounts.push(Math.ceil(totalDeciXp * 0.332) * step);
-    }
-    return xpAmounts;
-};
-// Test vectors:
-//console.log(generateXpAmounts(new SRng(1337n), 5, 5000, 5000)); // [840, 840, 840, 840, 1660]
-//console.log(generateXpAmounts(new SRng(1337n), 3, 40, 40)); // [14, 14, 14]
-//console.log(generateXpAmounts(new SRng(1337n), 5, 150, 150)); // [25, 25, 25, 25, 50]
-//console.log(generateXpAmounts(new SRng(1337n), 4, 10, 10)); // [2, 2, 2, 4]
-//console.log(generateXpAmounts(new SRng(1337n), 4, 15, 15)); // [4, 4, 4, 5]
-//console.log(generateXpAmounts(new SRng(1337n), 4, 20, 20)); // [5, 5, 5, 7]
-
 export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[], bountyCycle: number): void => {
     const table = String.fromCharCode(65 + (bountyCycle % 3));
     const vaultTable = String.fromCharCode(65 + ((bountyCycle + 1) % 3));
     const deimosDTable = String.fromCharCode(65 + (bountyCycle % 2));
 
+    // TODO: xpAmounts need to be calculated based on the jobType somehow?
+
     const seed = new SRng(bountyCycle).randomInt(0, 100_000);
     const bountyCycleStart = bountyCycle * 9000000;
     const bountyCycleEnd = bountyCycleStart + 9000000;
@@ -506,7 +481,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 0,
                     minEnemyLevel: 5,
                     maxEnemyLevel: 15,
-                    xpAmounts: generateXpAmounts(rng, 3, 1000, 1500)
+                    xpAmounts: [430, 430, 430]
                 },
                 {
                     jobType: rng.randomElement(eidolonJobs),
@@ -514,7 +489,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 1,
                     minEnemyLevel: 10,
                     maxEnemyLevel: 30,
-                    xpAmounts: generateXpAmounts(rng, 3, 1750, 2250)
+                    xpAmounts: [620, 620, 620]
                 },
                 {
                     jobType: rng.randomElement(eidolonJobs),
@@ -522,7 +497,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 2,
                     minEnemyLevel: 20,
                     maxEnemyLevel: 40,
-                    xpAmounts: generateXpAmounts(rng, 4, 2500, 3000)
+                    xpAmounts: [670, 670, 670, 990]
                 },
                 {
                     jobType: rng.randomElement(eidolonJobs),
@@ -530,7 +505,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 3,
                     minEnemyLevel: 30,
                     maxEnemyLevel: 50,
-                    xpAmounts: generateXpAmounts(rng, 5, 3250, 3750)
+                    xpAmounts: [570, 570, 570, 570, 1110]
                 },
                 {
                     jobType: rng.randomElement(eidolonJobs),
@@ -538,7 +513,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 5,
                     minEnemyLevel: 40,
                     maxEnemyLevel: 60,
-                    xpAmounts: generateXpAmounts(rng, 5, 4000, 4500)
+                    xpAmounts: [740, 740, 740, 740, 1450]
                 },
                 {
                     jobType: rng.randomElement(eidolonJobs),
@@ -554,7 +529,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 0,
                     minEnemyLevel: 50,
                     maxEnemyLevel: 70,
-                    xpAmounts: generateXpAmounts(rng, 5, 4500, 5000)
+                    xpAmounts: [840, 840, 840, 840, 1650]
                 }
             ]
         });
@@ -578,7 +553,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 0,
                     minEnemyLevel: 5,
                     maxEnemyLevel: 15,
-                    xpAmounts: generateXpAmounts(rng, 3, 1000, 1500)
+                    xpAmounts: [340, 340, 340]
                 },
                 {
                     jobType: rng.randomElement(venusJobs),
@@ -586,7 +561,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 1,
                     minEnemyLevel: 10,
                     maxEnemyLevel: 30,
-                    xpAmounts: generateXpAmounts(rng, 3, 1750, 2250)
+                    xpAmounts: [660, 660, 660]
                 },
                 {
                     jobType: rng.randomElement(venusJobs),
@@ -594,7 +569,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 2,
                     minEnemyLevel: 20,
                     maxEnemyLevel: 40,
-                    xpAmounts: generateXpAmounts(rng, 4, 2500, 3000)
+                    xpAmounts: [610, 610, 610, 900]
                 },
                 {
                     jobType: rng.randomElement(venusJobs),
@@ -602,7 +577,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 3,
                     minEnemyLevel: 30,
                     maxEnemyLevel: 50,
-                    xpAmounts: generateXpAmounts(rng, 5, 3250, 3750)
+                    xpAmounts: [600, 600, 600, 600, 1170]
                 },
                 {
                     jobType: rng.randomElement(venusJobs),
@@ -610,7 +585,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 5,
                     minEnemyLevel: 40,
                     maxEnemyLevel: 60,
-                    xpAmounts: generateXpAmounts(rng, 5, 4000, 4500)
+                    xpAmounts: [690, 690, 690, 690, 1350]
                 },
                 {
                     jobType: rng.randomElement(venusJobs),
@@ -626,7 +601,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 0,
                     minEnemyLevel: 50,
                     maxEnemyLevel: 70,
-                    xpAmounts: generateXpAmounts(rng, 5, 4500, 5000)
+                    xpAmounts: [780, 780, 780, 780, 1540]
                 }
             ]
         });
@@ -650,7 +625,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 0,
                     minEnemyLevel: 5,
                     maxEnemyLevel: 15,
-                    xpAmounts: generateXpAmounts(rng, 3, 12, 18)
+                    xpAmounts: [5, 5, 5]
                 },
                 {
                     jobType: rng.randomElement(microplanetJobs),
@@ -658,7 +633,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 1,
                     minEnemyLevel: 15,
                     maxEnemyLevel: 25,
-                    xpAmounts: generateXpAmounts(rng, 3, 24, 36)
+                    xpAmounts: [12, 12, 12]
                 },
                 {
                     jobType: rng.randomElement(microplanetEndlessJobs),
@@ -675,7 +650,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 2,
                     minEnemyLevel: 30,
                     maxEnemyLevel: 40,
-                    xpAmounts: generateXpAmounts(rng, 4, 72, 88)
+                    xpAmounts: [17, 17, 17, 25]
                 },
                 {
                     jobType: rng.randomElement(microplanetJobs),
@@ -683,7 +658,7 @@ export const pushClassicBounties = (syndicateMissions: ISyndicateMissionInfo[],
                     masteryReq: 3,
                     minEnemyLevel: 40,
                     maxEnemyLevel: 60,
-                    xpAmounts: generateXpAmounts(rng, 5, 115, 135)
+                    xpAmounts: [22, 22, 22, 22, 43]
                 },
                 {
                     jobType: rng.randomElement(microplanetJobs),
@@ -963,61 +938,8 @@ const getCalendarSeason = (week: number): ICalendarSeason => {
     };
 };
 
-const doesTimeSatsifyConstraints = (timeSecs: number): boolean => {
-    if (config.worldState?.eidolonOverride) {
-        const eidolonEpoch = 1391992660;
-        const eidolonCycle = Math.trunc((timeSecs - eidolonEpoch) / 9000);
-        const eidolonCycleStart = eidolonEpoch + eidolonCycle * 9000;
-        const eidolonCycleEnd = eidolonCycleStart + 9000;
-        const eidolonCycleNightStart = eidolonCycleEnd - 3000;
-        if (config.worldState.eidolonOverride == "day") {
-            if (
-                //timeSecs < eidolonCycleStart ||
-                isBeforeNextExpectedWorldStateRefresh(timeSecs * 1000, eidolonCycleNightStart * 1000)
-            ) {
-                return false;
-            }
-        } else {
-            if (
-                timeSecs < eidolonCycleNightStart ||
-                isBeforeNextExpectedWorldStateRefresh(timeSecs * 1000, eidolonCycleEnd * 1000)
-            ) {
-                return false;
-            }
-        }
-    }
-
-    if (config.worldState?.vallisOverride) {
-        const vallisEpoch = 1541837628;
-        const vallisCycle = Math.trunc((timeSecs - vallisEpoch) / 1600);
-        const vallisCycleStart = vallisEpoch + vallisCycle * 1600;
-        const vallisCycleEnd = vallisCycleStart + 1600;
-        const vallisCycleColdStart = vallisCycleStart + 400;
-        if (config.worldState.vallisOverride == "cold") {
-            if (
-                timeSecs < vallisCycleColdStart ||
-                isBeforeNextExpectedWorldStateRefresh(timeSecs * 1000, vallisCycleEnd * 1000)
-            ) {
-                return false;
-            }
-        } else {
-            if (
-                //timeSecs < vallisCycleStart ||
-                isBeforeNextExpectedWorldStateRefresh(timeSecs * 1000, vallisCycleColdStart * 1000)
-            ) {
-                return false;
-            }
-        }
-    }
-
-    return true;
-};
-
 export const getWorldState = (buildLabel?: string): IWorldState => {
-    let timeSecs = Math.round(Date.now() / 1000);
+    const timeSecs = config.worldState?.lockTime || Math.round(Date.now() / 1000);
-    while (!doesTimeSatsifyConstraints(timeSecs)) {
-        timeSecs -= 60;
-    }
     const timeMs = timeSecs * 1000;
     const day = Math.trunc((timeMs - EPOCH) / 86400000);
     const week = Math.trunc(day / 7);
@@ -1353,14 +1275,8 @@ export const isArchwingMission = (node: IRegion): boolean => {
 
 export const getNightwaveSyndicateTag = (buildLabel: string | undefined): string | undefined => {
     if (config.worldState?.nightwaveOverride) {
-        if (config.worldState.nightwaveOverride in nightwaveTagToSeason) {
         return config.worldState.nightwaveOverride;
     }
-        logger.warn(`ignoring invalid config value for worldState.nightwaveOverride`, {
-            value: config.worldState.nightwaveOverride,
-            valid_values: Object.keys(nightwaveTagToSeason)
-        });
-    }
     if (!buildLabel || version_compare(buildLabel, "2025.05.20.10.18") >= 0) {
         return "RadioLegionIntermission13Syndicate";
     }

static/fixed_responses/getVendorInfo/DeimosProspectorVendorManifest.json

@@ -0,0 +1,61 @@
+{
+  "VendorInfo": {
+    "_id": {
+      "$oid": "5f456e00c96976e97d6b7fd7"
+    },
+    "TypeName": "/Lotus/Types/Game/VendorManifests/Deimos/ProspectorVendorManifest",
+    "ItemManifest": [
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Gems/Deimos/DeimosUncommonGemACutItem",
+        "PremiumPrice": [13, 13],
+        "Bin": "BIN_1",
+        "QuantityMultiplier": 10,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e93a8"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Gems/Deimos/DeimosCommonGemBCutItem",
+        "PremiumPrice": [7, 7],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e93a9"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Gems/Deimos/DeimosCommonGemACutItem",
+        "PremiumPrice": [7, 7],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e93aa"
+        }
+      }
+    ],
+    "PropertyTextHash": "2BBC116116C757F6AF4FBC3B9BF754C8",
+    "Expiry": {
+      "$date": {
+        "$numberLong": "9999999000000"
+      }
+    }
+  }
+}

static/fixed_responses/getVendorInfo/HubsIronwakeDondaVendorManifest.json

@@ -0,0 +1,125 @@
+{
+  "VendorInfo": {
+    "_id": {
+      "$oid": "5dbb4c41e966f7886c3ce939"
+    },
+    "TypeName": "/Lotus/Types/Game/VendorManifests/Hubs/IronwakeDondaVendorManifest",
+    "ItemManifest": [
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/ShipDecos/HarrowQuestKeyOrnament",
+        "ItemPrices": [
+          {
+            "ItemCount": 25,
+            "ItemType": "/Lotus/Types/Items/MiscItems/PrimeBucks",
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 1,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "604800000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e945f"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/BoosterPacks/RivenModPack",
+        "ItemPrices": [
+          {
+            "ItemCount": 10,
+            "ItemType": "/Lotus/Types/Items/MiscItems/RivenFragment",
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 1,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "604800000"
+          }
+        },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": false,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e9468"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/StoreItems/CreditBundles/150000Credits",
+        "ItemPrices": [
+          {
+            "ItemCount": 5,
+            "ItemType": "/Lotus/Types/Items/MiscItems/RivenFragment",
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 1,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "604800000"
+          }
+        },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": false,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e9469"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/MiscItems/Kuva",
+        "ItemPrices": [
+          {
+            "ItemCount": 10,
+            "ItemType": "/Lotus/Types/Items/MiscItems/RivenFragment",
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 35000,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "604800000"
+          }
+        },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": false,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e946a"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/BoosterPacks/RivenModPack",
+        "ItemPrices": [
+          {
+            "ItemCount": 10,
+            "ItemType": "/Lotus/Types/Items/MiscItems/RivenFragment",
+            "ProductCategory": "MiscItems"
+          }
+        ],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 1,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "604800000"
+          }
+        },
+        "PurchaseQuantityLimit": 1,
+        "AllowMultipurchase": false,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e946b"
+        }
+      }
+    ],
+    "PropertyTextHash": "62B64A8065B7C0FA345895D4BC234621",
+    "Expiry": {
+      "$date": {
+        "$numberLong": "604800000"
+      }
+    }
+  }
+}

static/fixed_responses/getVendorInfo/OstronProspectorVendorManifest.json

@@ -0,0 +1,62 @@
+{
+  "VendorInfo": {
+    "_id": {
+      "$oid": "59dfe591314805ffe1d47c0a"
+    },
+    "TypeName": "/Lotus/Types/Game/VendorManifests/Ostron/ProspectorVendorManifest",
+    "ItemManifest": [
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Gems/Eidolon/RareGemACutAItem",
+        "PremiumPrice": [19, 19],
+        "Bin": "BIN_1",
+        "QuantityMultiplier": 5,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e98f0"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Gems/Eidolon/CommonGemBCutAItem",
+        "PremiumPrice": [8, 8],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e98f1"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Gems/Eidolon/CommonGemACutAItem",
+        "PremiumPrice": [5, 5],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e98f2"
+        }
+      }
+    ],
+    "MaxDailyPurchases": 0,
+    "PropertyTextHash": "773C6968D9A65506CD28DF28C768F0DA",
+    "Expiry": {
+      "$date": {
+        "$numberLong": "9999999000000"
+      }
+    }
+  }
+}

static/fixed_responses/getVendorInfo/SolarisProspectorVendorManifest.json

@@ -0,0 +1,61 @@
+{
+  "VendorInfo": {
+    "_id": {
+      "$oid": "5be4a159b144f3cdf1c22ebb"
+    },
+    "TypeName": "/Lotus/Types/Game/VendorManifests/Solaris/ProspectorVendorManifest",
+    "ItemManifest": [
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Gems/Solaris/SolarisRareGemACutItem",
+        "PremiumPrice": [20, 20],
+        "Bin": "BIN_1",
+        "QuantityMultiplier": 5,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e9777"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Gems/Solaris/SolarisCommonGemBCutItem",
+        "PremiumPrice": [10, 10],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e9778"
+        }
+      },
+      {
+        "StoreItem": "/Lotus/StoreItems/Types/Items/Gems/Solaris/SolarisCommonGemACutItem",
+        "PremiumPrice": [8, 8],
+        "Bin": "BIN_0",
+        "QuantityMultiplier": 20,
+        "Expiry": {
+          "$date": {
+            "$numberLong": "9999999000000"
+          }
+        },
+        "AllowMultipurchase": true,
+        "Id": {
+          "$oid": "66fd60b20ba592c4c95e9779"
+        }
+      }
+    ],
+    "PropertyTextHash": "A5756A21991FF49CFA7D096B4026515B",
+    "Expiry": {
+      "$date": {
+        "$numberLong": "9999999000000"
+      }
+    }
+  }
+}

static/fixed_responses/webuiArchonCrystalUpgrades.json

@@ -0,0 +1,83 @@
+{
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeEquilibrium": "+20% Energy from Health pickups, +20% Health from Energy pickups",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeEquilibriumMythic": "+30% Energy from Health pickups, +30% Health from Energy pickups",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeMeleeCritDamage": "+25% Melee Critical Damage",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeMeleeCritDamageMythic": "+37.5% Melee Critical Damage",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradePrimaryStatusChance": "+25% Primary Status Chance",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradePrimaryStatusChanceMythic": "+37.5% Primary Status Chance",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeSecondaryCritChance": "+25% Secondary Critical Chance",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeSecondaryCritChanceMythic": "+37.5% Secondary Critical Chance",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeAbilityDuration": "+10% Ability Duration",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeAbilityDurationMythic": "+15% Ability Duration",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeAbilityStrength": "+10% Ability Strength",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeAbilityStrengthMythic": "+15% Ability Strength",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeArmourMax": "+150 Armor",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeArmourMaxMythic": "+225 Armor",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeBlastProc": "+5 Shields on inflicting Blast Status",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeBlastProcMythic": "+7.5 Shields on inflicting Blast Status",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCastingSpeed": "+25% Casting Speed",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCastingSpeedMythic": "+37.5% Casting Speed",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCorrosiveDamageBoost": "+10% Ability Damage on enemies affected by Corrosion Status",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCorrosiveDamageBoostMythic": "+15% Ability Damage on enemies affected by Corrosion Status",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCorrosiveStack": "Increase max stacks of Corrosion Status by +2",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCorrosiveStackMythic": "Increase max stacks of Corrosion Status by +3",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCritDamageBoost": "+25% Melee Critical Damage (Doubles over 500 Energy)",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCritDamageBoostMythic": "+37% Melee Critical Damage (Doubles over 500 Energy)",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeElectricDamage": "+30% Primary Electricity Damage (+10% per additional Shard)",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeElectricDamageMythic": "+45% Primary Electricity Damage (+15% per additional Shard)",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeElectricDamageBoost": "+10% Ability Damage on enemies affected by Electricity Status",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeElectricDamageBoostMythic": "+15% Ability Damage on enemies affected by Electricity Status",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeEnergyMax": "+50 Energy Max",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeEnergyMaxMythic": "+75 Energy Max",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeGlobeEffectEnergy": "+50% Energy Orb Effectiveness",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeGlobeEffectEnergyMythic": "+75% Energy Orb Effectiveness",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeGlobeEffectHealth": "+100% Health Orb Effectiveness",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeGlobeEffectHealthMythic": "+150% Health Orb Effectiveness",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeHealthMax": "+150 Health",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeHealthMaxMythic": "+225 Health",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeHPBoostFromImpact": "+1 Health per enemy killed with Blast Damage (Max 300 Health)",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeHPBoostFromImpactMythic": "+2 Health per enemy killed with Blast Damage (Max 450 Health)",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeParkourVelocity": "+15% Parkour Velocity",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeParkourVelocityMythic": "+22.5% Parkour Velocity",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeRadiationDamageBoost": "+10% Ability Damage on enemies affected by Radiation Status",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeRadiationDamageBoostMythic": "+15% Ability Damage on enemies affected by Radiation Status",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeRegen": "+5 Health Regen/s",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeRegenMythic": "+7.5 Health Regen/s",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeShieldMax": "+150 Shield",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeShieldMaxMythic": "+225 Shield",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeStartingEnergy": "+30% Energy on Spawn",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeStartingEnergyMythic": "+45% Energy on Spawn",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeToxinDamage": "+30% Toxin Status Effect Damage",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeToxinDamageMythic": "+45% Toxin Status Effect Damage",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeToxinHeal": "+2 Health on damaging enemies with Toxin Status",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeToxinHealMythic": "+3 Health on damaging enemies with Toxin Status",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWeaponCritBoostFromHeat": "+1% Secondary Critical Chance per Heat-affected enemy killed (Max 50%)",
+  "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWeaponCritBoostFromHeatMythic": "+1.5% Secondary Critical Chance per Heat-affected enemy killed (Max 75%)",
+
+  "/Lotus/Upgrades/Mods/Warframe/AvatarAbilityRangeMod": "+7.5% Ability Range",
+  "/Lotus/Upgrades/Mods/Warframe/AvatarAbilityEfficiencyMod": "+5% Ability Efficiency",
+  "/Lotus/Upgrades/Mods/Warframe/AvatarEnergyRegenMod": "+0.5 Energy Regen/s",
+  "/Lotus/Upgrades/Mods/Warframe/AvatarEnemyRadarMod": "+5m Enemy Radar",
+  "/Lotus/Upgrades/Mods/Warframe/AvatarLootRadarMod": "+7m Loot Radar",
+
+  "/Lotus/Upgrades/Mods/Rifle/WeaponAmmoMaxMod": "+15% Ammo Max",
+
+  "/Lotus/Upgrades/Mods/Aura/EnemyArmorReductionAuraMod": "-3% Enemy Armor",
+
+  "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionAmmoMod": "100% Primary and Secondary Magazine Refill on Mercy",
+  "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionHealthDropMod": "100% chance to drop a Health Orb on Mercy",
+  "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionEnergyDropMod": "50% chance to drop an Energy Orb on Mercy",
+  "/Lotus/Upgrades/Mods/DataSpike/Cipher/OnFailHackResetMod": "+50% to retry on Hacking failure",
+  "/Lotus/Upgrades/Mods/DataSpike/Cipher/DamageReductionOnHackMod": "75% Damage Reduction while Hacking",
+  "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionReviveCompanionMod": "Mercy Kills reduce Companion Recovery by 15s",
+  "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionParkourSpeedMod": "+60% Parkour Speed after a Mercy for 15s",
+  "/Lotus/Upgrades/Mods/Warframe/AvatarTimeLimitIncreaseMod": "+8s to Hacking",
+  "/Lotus/Upgrades/Mods/DataSpike/Cipher/ElectrifyOnHackMod": "Shock enemies within 20m while Hacking",
+  "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionTerrifyMod": "50% chance for enemies within 15m to cower in fear for 8 seconds on Mercy",
+  "/Lotus/Upgrades/Mods/DataSpike/Cipher/OnHackLockersMod": "Unlock 5 lockers within 20m after Hacking",
+  "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionBlindMod": "Blind enemies within 18m on Mercy",
+  "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionDrainPowerMod": "100% chance for next ability cast to gain +50% Ability Strength on Mercy",
+  "/Lotus/Upgrades/Mods/DataSpike/Cipher/OnHackSprintSpeedMod": "+75% Sprint Speed for 15s after Hacking",
+  "/Lotus/Upgrades/Mods/DataSpike/Assassin/SwiftExecuteMod": "Speed of Mercy Kills increased by 50%",
+  "/Lotus/Upgrades/Mods/DataSpike/Cipher/OnHackInvisMod": "Invisible for 15 seconds after hacking"
+}

static/webui/index.html

@@ -1,6 +1,10 @@
 <!doctype html>
-<html lang="en" data-bs-theme="dark">
+<html lang="en">
 <head>
+    <script>
+        // Set theme early to prevent flash of incorrect style
+        document.documentElement.setAttribute("data-bs-theme", localStorage.getItem("theme") || "dark");
+    </script>
     <title>OpenWF WebUI</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="stylesheet" href="/webui/libs/bootstrap.min.css" />
@@ -33,6 +37,13 @@
                         <li><a class="dropdown-item" href="#" data-lang="tc" onclick="event.preventDefault();setLanguage('tc');">繁體中文</a></li>
                         <li><a class="dropdown-item" href="#" data-lang="th" onclick="event.preventDefault();setLanguage('th');">แบบไทย</a></li>
                     </ul>
+                </li>
+				<li class="nav-item dropdown">
+					<button id="active-theme-name" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"></button>
+					<ul class="dropdown-menu dropdown-menu-end">
+						<li><a class="dropdown-item active" href="#" data-theme="dark" onclick="event.preventDefault();setTheme('dark');" data-loc="navbar_darkTheme"></a></li>
+						<li><a class="dropdown-item" href="#" data-theme="light" onclick="event.preventDefault();setTheme('light');" data-loc="navbar_lightTheme"></a></li>
+					</ul>
 				</li>
 				<li class="nav-item dropdown user-dropdown">
                     <button class="nav-link dropdown-toggle displayname" data-bs-toggle="dropdown" aria-expanded="false"></button>
@@ -416,20 +427,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-lg-6">
-                        <div class="card mb-3" style="height: 400px;">
-                            <h5 class="card-header" data-loc="inventory_Boosters"></h5>
-                            <div class="card-body overflow-auto">
-                                <form class="input-group mb-3" onsubmit="doAcquireBoosters();return false;">
-                                    <input class="form-control" id="acquire-type-Boosters" list="datalist-Boosters" />
-                                    <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
-                                </form>
-                                <table class="table table-hover w-100">
-                                    <tbody id="Boosters-list"></tbody>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
                 </div>
                 <div class="card mb-3">
                     <h5 class="card-header" data-loc="general_bulkActions"></h5>
@@ -736,10 +733,6 @@
                                         <label class="form-label" for="spoofMasteryRank" data-loc="cheats_spoofMasteryRank"></label>
                                         <input class="form-control" id="spoofMasteryRank" type="number" min="-1" max="65535" />
                                     </div>
-                                    <div class="form-group mt-2">
-                                        <label class="form-label" for="nightwaveStandingMultiplier" data-loc="cheats_nightwaveStandingMultiplier"></label>
-                                        <input class="form-control" id="nightwaveStandingMultiplier" type="number" min="1" max="1000000" value="1" />
-                                    </div>
                                     <button class="btn btn-primary mt-3" type="submit" data-loc="cheats_saveSettings"></button>
                                 </form>
                             </div>
@@ -822,7 +815,6 @@
     <datalist id="datalist-ModularParts-CATBROW_MUTAGEN"></datalist>
     <datalist id="datalist-ModularParts-KUBROW_ANTIGEN"></datalist>
     <datalist id="datalist-ModularParts-KUBROW_MUTAGEN"></datalist>
-    <datalist id="datalist-Boosters"></datalist>
     <script src="/webui/libs/jquery-3.6.0.min.js"></script>
     <script src="/webui/libs/whirlpool-js.min.js"></script>
     <script src="/webui/libs/single.js"></script>

static/webui/script.js

@@ -155,6 +155,7 @@ function setActiveLanguage(lang) {
         script.src = "/translations/" + webui_lang + ".js";
         script.onload = function () {
             updateLocElements();
+            setTheme(localStorage.getItem("theme") ?? "dark");
             resolve(window.dict);
         };
         document.documentElement.appendChild(script);
@@ -172,6 +173,15 @@ function setLanguage(lang) {
     }
 }
 
+function setTheme(theme) {
+    localStorage.setItem("theme", theme);
+    document.documentElement.setAttribute("data-bs-theme", theme);
+    const themeName = document.querySelector(`[data-theme="${theme}"]`)?.textContent;
+    document.getElementById("active-theme-name").textContent = themeName;
+    document.querySelectorAll("[data-theme].active").forEach(el => el.classList.remove("active"));
+    document.querySelector(`[data-theme="${theme}"]`)?.classList.add("active");
+}
+
 const webUiModularWeapons = [
     "/Lotus/Weapons/Sentients/OperatorAmplifiers/OperatorAmpWeapon",
     "/Lotus/Weapons/Ostron/Melee/LotusModularWeapon",
@@ -213,86 +223,6 @@ function fetchItemList() {
             document.getElementById("changeSyndicate").innerHTML = "";
             document.getElementById("changeSyndicate").appendChild(syndicateNone);
 
-            // prettier-ignore
-            data.archonCrystalUpgrades = {
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeEquilibrium": loc("upgrade_Equilibrium").split("|VAL|").join("20"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeEquilibriumMythic": loc("upgrade_Equilibrium").split("|VAL|").join("30"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeMeleeCritDamage": loc("upgrade_MeleeCritDamage").split("|VAL|").join("25"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeMeleeCritDamageMythic": loc("upgrade_MeleeCritDamage").split("|VAL|").join("37.5"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradePrimaryStatusChance": loc("upgrade_PrimaryStatusChance").split("|VAL|").join("25"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradePrimaryStatusChanceMythic": loc("upgrade_PrimaryStatusChance").split("|VAL|").join("37.5"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeSecondaryCritChance": loc("upgrade_SecondaryCritChance").split("|VAL|").join("25"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeSecondaryCritChanceMythic": loc("upgrade_SecondaryCritChance").split("|VAL|").join("37.5"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeAbilityDuration": loc("upgrade_WarframeAbilityDuration").split("|VAL|").join("10"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeAbilityDurationMythic": loc("upgrade_WarframeAbilityDuration").split("|VAL|").join("15"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeAbilityStrength": loc("upgrade_WarframeAbilityStrength").split("|VAL|").join("10"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeAbilityStrengthMythic": loc("upgrade_WarframeAbilityStrength").split("|VAL|").join("15"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeArmourMax": loc("upgrade_WarframeArmourMax").split("|VAL|").join("150"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeArmourMaxMythic": loc("upgrade_WarframeArmourMax").split("|VAL|").join("225"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeBlastProc": loc("upgrade_WarframeBlastProc").split("|VAL|").join("5"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeBlastProcMythic": loc("upgrade_WarframeBlastProc").split("|VAL|").join("7.5"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCastingSpeed": loc("upgrade_WarframeCastingSpeed").split("|VAL|").join("25"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCastingSpeedMythic": loc("upgrade_WarframeCastingSpeed").split("|VAL|").join("37.5"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCorrosiveDamageBoost": loc("upgrade_WarframeCorrosiveDamageBoost").split("|VAL|").join("10"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCorrosiveDamageBoostMythic": loc("upgrade_WarframeCorrosiveDamageBoost").split("|VAL|").join("15"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCorrosiveStack": loc("upgrade_WarframeCorrosiveStack").split("|VAL|").join("2"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCorrosiveStackMythic": loc("upgrade_WarframeCorrosiveStack").split("|VAL|").join("3"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCritDamageBoost": loc("upgrade_WarframeCritDamageBoost").split("|VAL|").join("25"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeCritDamageBoostMythic": loc("upgrade_WarframeCritDamageBoost").split("|VAL|").join("37"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeElectricDamage": loc("upgrade_WarframeElectricDamage").split("|VAL1|").join("30").split("|VAL2|").join("10"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeElectricDamageMythic": loc("upgrade_WarframeElectricDamage").split("|VAL1|").join("45").split("|VAL2|").join("15"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeElectricDamageBoost": loc("upgrade_WarframeElectricDamageBoost").split("|VAL|").join("10"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeElectricDamageBoostMythic": loc("upgrade_WarframeElectricDamageBoost").split("|VAL|").join("15"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeEnergyMax": loc("upgrade_WarframeEnergyMax").split("|VAL|").join("50"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeEnergyMaxMythic": loc("upgrade_WarframeEnergyMax").split("|VAL|").join("75"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeGlobeEffectEnergy": loc("upgrade_WarframeGlobeEffectEnergy").split("|VAL|").join("50"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeGlobeEffectEnergyMythic": loc("upgrade_WarframeGlobeEffectEnergy").split("|VAL|").join("75"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeGlobeEffectHealth": loc("upgrade_WarframeGlobeEffectHealth").split("|VAL|").join("100"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeGlobeEffectHealthMythic": loc("upgrade_WarframeGlobeEffectHealth").split("|VAL|").join("150"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeHealthMax": loc("upgrade_WarframeHealthMax").split("|VAL|").join("150"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeHealthMaxMythic": loc("upgrade_WarframeHealthMax").split("|VAL|").join("225"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeHPBoostFromImpact": loc("upgrade_WarframeHPBoostFromImpact").split("|VAL1|").join("1").split("|VAL2|").join("300"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeHPBoostFromImpactMythic": loc("upgrade_WarframeHPBoostFromImpact").split("|VAL1|").join("2").split("|VAL2|").join("450"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeParkourVelocity": loc("upgrade_WarframeParkourVelocity").split("|VAL|").join("15"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeParkourVelocityMythic": loc("upgrade_WarframeParkourVelocity").split("|VAL|").join("22.5"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeRadiationDamageBoost": loc("upgrade_WarframeRadiationDamageBoost").split("|VAL|").join("10"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeRadiationDamageBoostMythic": loc("upgrade_WarframeRadiationDamageBoost").split("|VAL|").join("15"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeRegen": loc("upgrade_WarframeRegen").split("|VAL|").join("5"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeRegenMythic": loc("upgrade_WarframeRegen").split("|VAL|").join("7.5"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeShieldMax": loc("upgrade_WarframeShieldMax").split("|VAL|").join("150"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeShieldMaxMythic": loc("upgrade_WarframeShieldMax").split("|VAL|").join("225"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeStartingEnergy": loc("upgrade_WarframeStartingEnergy").split("|VAL|").join("30"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeStartingEnergyMythic": loc("upgrade_WarframeStartingEnergy").split("|VAL|").join("45"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeToxinDamage": loc("upgrade_WarframeToxinDamage").split("|VAL|").join("30"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeToxinDamageMythic": loc("upgrade_WarframeToxinDamage").split("|VAL|").join("45"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeToxinHeal": loc("upgrade_WarframeToxinHeal").split("|VAL|").join("2"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWarframeToxinHealMythic": loc("upgrade_WarframeToxinHeal").split("|VAL|").join("3"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWeaponCritBoostFromHeat": loc("upgrade_WeaponCritBoostFromHeat").split("|VAL1|").join("1").split("|VAL2|").join("50"),
-                "/Lotus/Upgrades/Invigorations/ArchonCrystalUpgrades/ArchonCrystalUpgradeWeaponCritBoostFromHeatMythic": loc("upgrade_WeaponCritBoostFromHeat").split("|VAL1|").join("1.5").split("|VAL2|").join("75"),
-                "/Lotus/Upgrades/Mods/Warframe/AvatarAbilityRangeMod": loc("upgrade_AvatarAbilityRange"),
-                "/Lotus/Upgrades/Mods/Warframe/AvatarAbilityEfficiencyMod": loc("upgrade_AvatarAbilityEfficiency"),
-                "/Lotus/Upgrades/Mods/Warframe/AvatarEnergyRegenMod": loc("upgrade_AvatarEnergyRegen"),
-                "/Lotus/Upgrades/Mods/Warframe/AvatarEnemyRadarMod": loc("upgrade_AvatarEnemyRadar"),
-                "/Lotus/Upgrades/Mods/Warframe/AvatarLootRadarMod": loc("upgrade_AvatarLootRadar"),
-                "/Lotus/Upgrades/Mods/Rifle/WeaponAmmoMaxMod": loc("upgrade_WeaponAmmoMax"),
-                "/Lotus/Upgrades/Mods/Aura/EnemyArmorReductionAuraMod": loc("upgrade_EnemyArmorReductionAura"),
-                "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionAmmoMod": loc("upgrade_OnExecutionAmmo"),
-                "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionHealthDropMod": loc("upgrade_OnExecutionHealthDrop"),
-                "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionEnergyDropMod": loc("upgrade_OnExecutionEnergyDrop"),
-                "/Lotus/Upgrades/Mods/DataSpike/Cipher/OnFailHackResetMod": loc("upgrade_OnFailHackReset"),
-                "/Lotus/Upgrades/Mods/DataSpike/Cipher/DamageReductionOnHackMod": loc("upgrade_DamageReductionOnHack"),
-                "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionReviveCompanionMod": loc("upgrade_OnExecutionReviveCompanion"),
-                "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionParkourSpeedMod": loc("upgrade_OnExecutionParkourSpeed"),
-                "/Lotus/Upgrades/Mods/Warframe/AvatarTimeLimitIncreaseMod": loc("upgrade_AvatarTimeLimitIncrease"),
-                "/Lotus/Upgrades/Mods/DataSpike/Cipher/ElectrifyOnHackMod": loc("upgrade_ElectrifyOnHack"),
-                "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionTerrifyMod": loc("upgrade_OnExecutionTerrify"),
-                "/Lotus/Upgrades/Mods/DataSpike/Cipher/OnHackLockersMod": loc("upgrade_OnHackLockers"),
-                "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionBlindMod": loc("upgrade_OnExecutionBlind"),
-                "/Lotus/Upgrades/Mods/DataSpike/Assassin/OnExecutionDrainPowerMod": loc("upgrade_OnExecutionDrainPower"),
-                "/Lotus/Upgrades/Mods/DataSpike/Cipher/OnHackSprintSpeedMod": loc("upgrade_OnHackSprintSpeed"),
-                "/Lotus/Upgrades/Mods/DataSpike/Assassin/SwiftExecuteMod": loc("upgrade_SwiftExecute"),
-                "/Lotus/Upgrades/Mods/DataSpike/Cipher/OnHackInvisMod": loc("upgrade_OnHackInvis"),
-            };
             window.archonCrystalUpgrades = data.archonCrystalUpgrades;
 
             // Add mods mising in data sources
@@ -1091,63 +1021,6 @@ function updateInventory() {
                 }
             }
             document.getElementById("changeSyndicate").value = data.SupportedSyndicate ?? "";
-
-            document.getElementById("Boosters-list").innerHTML = "";
-            const now = Math.floor(Date.now() / 1000);
-            data.Boosters.forEach(({ ItemType, ExpiryDate }) => {
-                if (ExpiryDate < now) {
-                    // Booster has expired, skip it
-                    return;
-                }
-                const tr = document.createElement("tr");
-                {
-                    const td = document.createElement("td");
-                    td.textContent = itemMap[ItemType]?.name ?? ItemType;
-                    tr.appendChild(td);
-                }
-                {
-                    const td = document.createElement("td");
-                    td.classList = "text-end text-nowrap";
-                    const timeString = formatDatetime("%Y-%m-%d %H:%M:%s", ExpiryDate * 1000);
-                    const inlineForm = document.createElement("form");
-                    const input = document.createElement("input");
-
-                    inlineForm.style.display = "inline-block";
-                    inlineForm.onsubmit = function (event) {
-                        event.preventDefault();
-                        doChangeBoosterExpiry(ItemType, input);
-                    };
-                    input.type = "datetime-local";
-                    input.classList.add("form-control");
-                    input.classList.add("form-control-sm");
-                    input.value = timeString;
-                    let changed = false;
-                    input.onchange = function () {
-                        changed = true;
-                    };
-                    input.onblur = function () {
-                        if (changed) {
-                            doChangeBoosterExpiry(ItemType, input);
-                        }
-                    };
-                    inlineForm.appendChild(input);
-
-                    td.appendChild(inlineForm);
-
-                    const removeButton = document.createElement("a");
-                    removeButton.title = loc("code_remove");
-                    removeButton.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M135.2 17.7L128 32H32C14.3 32 0 46.3 0 64S14.3 96 32 96H416c17.7 0 32-14.3 32-32s-14.3-32-32-32H320l-7.2-14.3C307.4 6.8 296.3 0 284.2 0H163.8c-12.1 0-23.2 6.8-28.6 17.7zM416 128H32L53.2 467c1.6 25.3 22.6 45 47.9 45H346.9c25.3 0 46.3-19.7 47.9-45L416 128z"/></svg>`;
-                    removeButton.href = "#";
-                    removeButton.onclick = function (event) {
-                        event.preventDefault();
-                        setBooster(ItemType, 0);
-                    };
-                    td.appendChild(removeButton);
-
-                    tr.appendChild(td);
-                }
-                document.getElementById("Boosters-list").appendChild(tr);
-            });
         });
     });
 }
@@ -2164,77 +2037,3 @@ function handleModularSelection(category) {
         });
     });
 }
-
-function setBooster(ItemType, ExpiryDate, callback) {
-    revalidateAuthz(() => {
-        $.post({
-            url: "/custom/setBooster?" + window.authz,
-            contentType: "application/json",
-            data: JSON.stringify([
-                {
-                    ItemType,
-                    ExpiryDate
-                }
-            ])
-        }).done(function () {
-            updateInventory();
-            if (callback) callback();
-        });
-    });
-}
-
-function doAcquireBoosters() {
-    const uniqueName = getKey(document.getElementById("acquire-type-Boosters"));
-    if (!uniqueName) {
-        $("#acquire-type-Boosters").addClass("is-invalid").focus();
-        return;
-    }
-    const ExpiryDate = Date.now() / 1000 + 3 * 24 * 60 * 60; // default 3 days
-    setBooster(uniqueName, ExpiryDate, () => {
-        $("#acquire-type-Boosters").val("");
-        updateInventory();
-    });
-}
-
-function doChangeBoosterExpiry(ItemType, ExpiryDateInput) {
-    console.log("Changing booster expiry for", ItemType, "to", ExpiryDateInput.value);
-    // cast local datetime string to unix timestamp
-    const ExpiryDate = new Date(ExpiryDateInput.value).getTime() / 1000;
-    if (isNaN(ExpiryDate)) {
-        ExpiryDateInput.addClass("is-invalid").focus();
-        return false;
-    }
-    setBooster(ItemType, ExpiryDate);
-    return true;
-}
-
-function formatDatetime(fmt, date) {
-    if (typeof date === "number") date = new Date(date);
-    return fmt.replace(/(%[yY]|%m|%[Dd]|%H|%h|%M|%[Ss]|%[Pp])/g, match => {
-        switch (match) {
-            case "%Y":
-                return date.getFullYear().toString();
-            case "%y":
-                return date.getFullYear().toString().slice(-2);
-            case "%m":
-                return (date.getMonth() + 1).toString().padStart(2, "0");
-            case "%D":
-            case "%d":
-                return date.getDate().toString().padStart(2, "0");
-            case "%H":
-                return date.getHours().toString().padStart(2, "0");
-            case "%h":
-                return (date.getHours() % 12).toString().padStart(2, "0");
-            case "%M":
-                return date.getMinutes().toString().padStart(2, "0");
-            case "%S":
-            case "%s":
-                return date.getSeconds().toString().padStart(2, "0");
-            case "%P":
-            case "%p":
-                return date.getHours() < 12 ? "am" : "pm";
-            default:
-                return match;
-        }
-    });
-}

static/webui/translations/de.js

@@ -63,6 +63,8 @@ dict = {
     navbar_logout: `Abmelden`,
     navbar_renameAccount: `Account umbenennen`,
     navbar_deleteAccount: `Account löschen`,
+    navbar_darkTheme: `Dunkles Design`,
+    navbar_lightTheme: `Helles Design`,
     navbar_inventory: `Inventar`,
     navbar_mods: `Mods`,
     navbar_quests: `Quests`,
@@ -98,7 +100,6 @@ dict = {
     inventory_bulkRankUpSentinels: `Alle Wächter auf Max. Rang`,
     inventory_bulkRankUpSentinelWeapons: `Alle Wächter-Waffen auf Max. Rang`,
     inventory_bulkRankUpEvolutionProgress: `Alle Incarnon-Entwicklungsfortschritte auf Max. Rang`,
-    inventory_Boosters: `[UNTRANSLATED] Boosters`,
 
     quests_list: `Quests`,
     quests_completeAll: `Alle Quests abschließen`,
@@ -164,7 +165,6 @@ dict = {
     cheats_noDojoResearchTime: `Keine Dojo-Forschungszeit`,
     cheats_fastClanAscension: `Schneller Clan-Aufstieg`,
     cheats_spoofMasteryRank: `Gefälschter Meisterschaftsrang (-1 zum deaktivieren)`,
-    cheats_nightwaveStandingMultiplier: `[UNTRANSLATED] Nightwave Standing Multiplier`,
     cheats_saveSettings: `Einstellungen speichern`,
     cheats_account: `Account`,
     cheats_unlockAllFocusSchools: `Alle Fokus-Schulen freischalten`,
@@ -175,57 +175,5 @@ 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`,
-
-    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 inflicting Blast Status`,
-    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: `[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/en.js

@@ -62,6 +62,8 @@ dict = {
     navbar_logout: `Logout`,
     navbar_renameAccount: `Rename Account`,
     navbar_deleteAccount: `Delete Account`,
+    navbar_darkTheme: `Dark Theme`,
+    navbar_lightTheme: `Light Theme`,
     navbar_inventory: `Inventory`,
     navbar_mods: `Mods`,
     navbar_quests: `Quests`,
@@ -97,7 +99,6 @@ dict = {
     inventory_bulkRankUpSentinels: `Max Rank All Sentinels`,
     inventory_bulkRankUpSentinelWeapons: `Max Rank All Sentinel Weapons`,
     inventory_bulkRankUpEvolutionProgress: `Max Rank All Incarnon Evolution Progress`,
-    inventory_Boosters: `Boosters`,
 
     quests_list: `Quests`,
     quests_completeAll: `Complete All Quests`,
@@ -163,7 +164,6 @@ dict = {
     cheats_noDojoResearchTime: `No Dojo Research Time`,
     cheats_fastClanAscension: `Fast Clan Ascension`,
     cheats_spoofMasteryRank: `Spoofed Mastery Rank (-1 to disable)`,
-    cheats_nightwaveStandingMultiplier: `Nightwave Standing Multiplier`,
     cheats_saveSettings: `Save Settings`,
     cheats_account: `Account`,
     cheats_unlockAllFocusSchools: `Unlock All Focus Schools`,
@@ -174,57 +174,5 @@ 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`,
-
-    upgrade_Equilibrium: `+|VAL|% Energy from Health pickups, +|VAL|% Health from Energy pickups`,
-    upgrade_MeleeCritDamage: `+|VAL|% Melee Critical Damage`,
-    upgrade_PrimaryStatusChance: `+|VAL|% Primary Status Chance`,
-    upgrade_SecondaryCritChance: `+|VAL|% Secondary Critical Chance`,
-    upgrade_WarframeAbilityDuration: `+|VAL|% Ability Duration`,
-    upgrade_WarframeAbilityStrength: `+|VAL|% Ability Strength`,
-    upgrade_WarframeArmourMax: `+|VAL| Armor`,
-    upgrade_WarframeBlastProc: `+|VAL| Shields on inflicting Blast Status`,
-    upgrade_WarframeCastingSpeed: `+|VAL|% Casting Speed`,
-    upgrade_WarframeCorrosiveDamageBoost: `+|VAL|% Ability Damage on enemies affected by Corrosion Status`,
-    upgrade_WarframeCorrosiveStack: `Increase max stacks of Corrosion Status by +|VAL|`,
-    upgrade_WarframeCritDamageBoost: `+|VAL|% Melee Critical Damage (Doubles over 500 Energy)`,
-    upgrade_WarframeElectricDamage: `+|VAL1|% Primary Electricity Damage (+|VAL2|% per additional Shard)`,
-    upgrade_WarframeElectricDamageBoost: `+|VAL|% Ability Damage on enemies affected by Electricity Status`,
-    upgrade_WarframeEnergyMax: `+|VAL| Energy Max`,
-    upgrade_WarframeGlobeEffectEnergy: `+|VAL|% Energy Orb Effectiveness`,
-    upgrade_WarframeGlobeEffectHealth: `+|VAL|% Health Orb Effectiveness`,
-    upgrade_WarframeHealthMax: `+|VAL| Health`,
-    upgrade_WarframeHPBoostFromImpact: `+|VAL1| Health per enemy killed with Blast Damage (Max |VAL2| Health)`,
-    upgrade_WarframeParkourVelocity: `+|VAL|% Parkour Velocity`,
-    upgrade_WarframeRadiationDamageBoost: `+|VAL|% Ability Damage on enemies affected by Radiation Status`,
-    upgrade_WarframeRegen: `+|VAL| Health Regen/s`,
-    upgrade_WarframeShieldMax: `+|VAL| Shield`,
-    upgrade_WarframeStartingEnergy: `+|VAL|% Energy on Spawn`,
-    upgrade_WarframeToxinDamage: `+|VAL|% Toxin Status Effect Damage`,
-    upgrade_WarframeToxinHeal: `+|VAL| Health on damaging enemies with Toxin Status`,
-    upgrade_WeaponCritBoostFromHeat: `+|VAL1|% Secondary Critical Chance per Heat-affected enemy killed (Max |VAL2|%)`,
-    upgrade_AvatarAbilityRange: `+7.5% Ability Range`,
-    upgrade_AvatarAbilityEfficiency: `+5% Ability Efficiency`,
-    upgrade_AvatarEnergyRegen: `+0.5 Energy Regen/s`,
-    upgrade_AvatarEnemyRadar: `+5m Enemy Radar`,
-    upgrade_AvatarLootRadar: `+7m Loot Radar`,
-    upgrade_WeaponAmmoMax: `+15% Ammo Max`,
-    upgrade_EnemyArmorReductionAura: `-3% Enemy Armor`,
-    upgrade_OnExecutionAmmo: `100% Primary and Secondary Magazine Refill on Mercy`,
-    upgrade_OnExecutionHealthDrop: `100% chance to drop a Health Orb on Mercy`,
-    upgrade_OnExecutionEnergyDrop: `50% chance to drop an Energy Orb on Mercy`,
-    upgrade_OnFailHackReset: `+50% to retry on Hacking failure`,
-    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: `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`,
-    upgrade_OnExecutionBlind: `Blind enemies within 18m on Mercy`,
-    upgrade_OnExecutionDrainPower: `100% chance for next ability cast to gain +50% Ability Strength on Mercy`,
-    upgrade_OnHackSprintSpeed: `+75% Sprint Speed for 15s after Hacking`,
-    upgrade_SwiftExecute: `Speed of Mercy Kills increased by 50%`,
-    upgrade_OnHackInvis: `Invisible for 15 seconds after hacking`,
-
     prettier_sucks_ass: ``
 };

static/webui/translations/es.js

@@ -63,6 +63,8 @@ dict = {
     navbar_logout: `Cerrar sesión`,
     navbar_renameAccount: `Renombrar cuenta`,
     navbar_deleteAccount: `Eliminar cuenta`,
+    navbar_darkTheme: `[UNTRANSLATED] Dark Theme`,
+    navbar_lightTheme: `[UNTRANSLATED] Light Theme`,
     navbar_inventory: `Inventario`,
     navbar_mods: `Mods`,
     navbar_quests: `Misiones`,
@@ -98,7 +100,6 @@ dict = {
     inventory_bulkRankUpSentinels: `Maximizar rango de todos los centinelas`,
     inventory_bulkRankUpSentinelWeapons: `Maximizar rango de todas las armas de centinela`,
     inventory_bulkRankUpEvolutionProgress: `Maximizar todo el progreso de evolución Incarnon`,
-    inventory_Boosters: `Potenciadores`,
 
     quests_list: `Misiones`,
     quests_completeAll: `Completar todas las misiones`,
@@ -164,7 +165,6 @@ dict = {
     cheats_noDojoResearchTime: `Sin tiempo de investigación del dojo`,
     cheats_fastClanAscension: `Ascenso rápido del clan`,
     cheats_spoofMasteryRank: `Rango de maestría simulado (-1 para desactivar)`,
-    cheats_nightwaveStandingMultiplier: `Multiplicador de Reputación de Onda Nocturna`,
     cheats_saveSettings: `Guardar configuración`,
     cheats_account: `Cuenta`,
     cheats_unlockAllFocusSchools: `Desbloquear todas las escuelas de enfoque`,
@@ -175,57 +175,5 @@ 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`,
-
-    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`,
-    upgrade_PrimaryStatusChance: `+|VAL|% de probabilidad de estado en armas primarias`,
-    upgrade_SecondaryCritChance: `+|VAL|% de probabilidad crítica en armas secundarias`,
-    upgrade_WarframeAbilityDuration: `+|VAL|% de duración de habilidades`,
-    upgrade_WarframeAbilityStrength: `+|VAL|% de fuerza de habilidades`,
-    upgrade_WarframeArmourMax: `+|VAL| de armadura`,
-    upgrade_WarframeBlastProc: `+|VAL| de escudos al infligir estado de explosión`,
-    upgrade_WarframeCastingSpeed: `+|VAL|% de velocidad de lanzamiento de habilidades`,
-    upgrade_WarframeCorrosiveDamageBoost: `+|VAL|% de daño de habilidades a enemigos con estado corrosivo`,
-    upgrade_WarframeCorrosiveStack: `Aumenta los acumuladores máximos de estado corrosivo en +|VAL|`,
-    upgrade_WarframeCritDamageBoost: `+|VAL|% de daño crítico cuerpo a cuerpo (se duplica con más de 500 de energía)`,
-    upgrade_WarframeElectricDamage: `+|VAL1|% de daño eléctrico en armas primarias (+|VAL2|% por fragmento adicional)`,
-    upgrade_WarframeElectricDamageBoost: `+|VAL|% de daño de habilidades a enemigos con estado eléctrico`,
-    upgrade_WarframeEnergyMax: `+|VAL| de energía máxima`,
-    upgrade_WarframeGlobeEffectEnergy: `+|VAL|% de efectividad de orbes de energía`,
-    upgrade_WarframeGlobeEffectHealth: `+|VAL|% de efectividad de orbes de salud`,
-    upgrade_WarframeHealthMax: `+|VAL| de salud máxima`,
-    upgrade_WarframeHPBoostFromImpact: `+|VAL1| de salud por enemigo eliminado con daño explosivo (máximo |VAL2| de salud)`,
-    upgrade_WarframeParkourVelocity: `+|VAL|% de velocidad de parkour`,
-    upgrade_WarframeRadiationDamageBoost: `+|VAL|% de daño de habilidades a enemigos con estado radiactivo`,
-    upgrade_WarframeRegen: `+|VAL| de regeneración de salud por segundo`,
-    upgrade_WarframeShieldMax: `+|VAL| de escudo`,
-    upgrade_WarframeStartingEnergy: `+|VAL|% de energía al reaparecer`,
-    upgrade_WarframeToxinDamage: `+|VAL|% de daño por efecto de estado tóxico`,
-    upgrade_WarframeToxinHeal: `+|VAL| de salud al dañar enemigos con estado tóxico`,
-    upgrade_WeaponCritBoostFromHeat: `+|VAL1|% de probabilidad crítica secundaria por enemigo afectado por calor eliminado (máx. |VAL2|%)`,
-    upgrade_AvatarAbilityRange: `+7.5% de alcance de habilidades`,
-    upgrade_AvatarAbilityEfficiency: `+5% de eficiencia de habilidades`,
-    upgrade_AvatarEnergyRegen: `+0.5 de regeneración de energía por segundo`,
-    upgrade_AvatarEnemyRadar: `+5m de radar de enemigos`,
-    upgrade_AvatarLootRadar: `+7m de radar de botín`,
-    upgrade_WeaponAmmoMax: `+15% de munición máxima`,
-    upgrade_EnemyArmorReductionAura: `-3% de armadura enemiga`,
-    upgrade_OnExecutionAmmo: `Recarga al 100% el cargador primario y secundario tras ejecución (Misericordia)`,
-    upgrade_OnExecutionHealthDrop: `100% de probabilidad de soltar un orbe de salud tras ejecución (Misericordia)`,
-    upgrade_OnExecutionEnergyDrop: `50% de probabilidad de soltar un orbe de energía tras ejecución (Misericordia)`,
-    upgrade_OnFailHackReset: `+50% de probabilidad de reintento al fallar un hackeo`,
-    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: `+|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`,
-    upgrade_OnExecutionBlind: `Ciega a los enemigos en un radio de 18m tras una ejecución`,
-    upgrade_OnExecutionDrainPower: `100% de probabilidad de que la siguiente habilidad tenga +50% de fuerza tras una ejecución`,
-    upgrade_OnHackSprintSpeed: `+75% de velocidad de carrera durante 15s después de hackear`,
-    upgrade_SwiftExecute: `Velocidad de ejecuciones aumentada en un 50%`,
-    upgrade_OnHackInvis: `Invisible durante 15 segundos después de hackear`,
-
     prettier_sucks_ass: ``
 };

static/webui/translations/fr.js

@@ -63,6 +63,8 @@ dict = {
     navbar_logout: `Déconnexion`,
     navbar_renameAccount: `Renommer le compte`,
     navbar_deleteAccount: `Supprimer le compte`,
+    navbar_darkTheme: `[UNTRANSLATED] Dark Theme`,
+    navbar_lightTheme: `[UNTRANSLATED] Light Theme`,
     navbar_inventory: `Inventaire`,
     navbar_mods: `Mods`,
     navbar_quests: `Quêtes`,
@@ -98,7 +100,6 @@ 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_Boosters: `[UNTRANSLATED] Boosters`,
 
     quests_list: `Quêtes`,
     quests_completeAll: `Compléter toutes les quêtes`,
@@ -164,7 +165,6 @@ dict = {
     cheats_noDojoResearchTime: `Aucun temps de recherche (Dojo)`,
     cheats_fastClanAscension: `Ascension de clan rapide`,
     cheats_spoofMasteryRank: `Rang de maîtrise personnalisé (-1 pour désactiver)`,
-    cheats_nightwaveStandingMultiplier: `[UNTRANSLATED] Nightwave Standing Multiplier`,
     cheats_saveSettings: `Sauvegarder les paramètres`,
     cheats_account: `Compte`,
     cheats_unlockAllFocusSchools: `Débloquer toutes les écoles de focus`,
@@ -175,57 +175,5 @@ 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`,
-
-    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 inflicting Blast Status`,
-    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: `[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

@@ -63,6 +63,8 @@ dict = {
     navbar_logout: `Выйти`,
     navbar_renameAccount: `Переименовать аккаунт`,
     navbar_deleteAccount: `Удалить аккаунт`,
+    navbar_darkTheme: `[UNTRANSLATED] Dark Theme`,
+    navbar_lightTheme: `[UNTRANSLATED] Light Theme`,
     navbar_inventory: `Инвентарь`,
     navbar_mods: `Моды`,
     navbar_quests: `Квесты`,
@@ -98,7 +100,6 @@ dict = {
     inventory_bulkRankUpSentinels: `Максимальный ранг всех стражей`,
     inventory_bulkRankUpSentinelWeapons: `Максимальный ранг всего оружия стражей`,
     inventory_bulkRankUpEvolutionProgress: `Максимальный ранг всех эволюций Инкарнонов`,
-    inventory_Boosters: `[UNTRANSLATED] Boosters`,
 
     quests_list: `Квесты`,
     quests_completeAll: `Завершить все квесты`,
@@ -164,7 +165,6 @@ dict = {
     cheats_noDojoResearchTime: `Мгновенные Исследование Додзё`,
     cheats_fastClanAscension: `Мгновенное Вознесение Клана`,
     cheats_spoofMasteryRank: `Подделанный ранг мастерства (-1 для отключения)`,
-    cheats_nightwaveStandingMultiplier: `[UNTRANSLATED] Nightwave Standing Multiplier`,
     cheats_saveSettings: `Сохранить настройки`,
     cheats_account: `Аккаунт`,
     cheats_unlockAllFocusSchools: `Разблокировать все школы фокуса`,
@@ -175,57 +175,5 @@ dict = {
     cheats_none: `Отсутствует`,
     import_importNote: `Вы можете загрузить полный или частичный ответ инвентаря (клиентское представление) здесь. Все поддерживаемые поля <b>будут перезаписаны</b> в вашем аккаунте.`,
     import_submit: `Отправить`,
-
-    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 inflicting Blast Status`,
-    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: `[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/zh.js

@@ -1,4 +1,4 @@
-// Chinese translation by meb154 & bishan178
+// Chinese translation by meb154
 dict = {
     general_inventoryUpdateNote: `注意：此处所做的更改只有在游戏同步仓库后才会生效。您可以通过访问星图来触发仓库更新。`,
     general_addButton: `添加`,
@@ -18,7 +18,7 @@ dict = {
     code_kDrive: `K式悬浮板`,
     code_legendaryCore: `传奇核心`,
     code_traumaticPeculiar: `创伤怪奇`,
-    code_starter: `|MOD|(有瑕疵的)`,
+    code_starter: `|MOD| (有瑕疵的)`,
     code_badItem: `(Imposter)`,
     code_maxRank: `满级`,
     code_rename: `重命名`,
@@ -28,7 +28,7 @@ dict = {
     code_succRankUp: `[UNTRANSLATED] Successfully ranked up.`,
     code_noEquipmentToRankUp: `没有可升级的装备。`,
     code_succAdded: `已成功添加。`,
-    code_succRemoved: `已成功移除。`,
+    code_succRemoved: `[UNTRANSLATED] Successfully removed.`,
     code_buffsNumber: `增益数量`,
     code_cursesNumber: `负面数量`,
     code_rerollsNumber: `洗卡次数`,
@@ -39,30 +39,32 @@ dict = {
     code_count: `数量`,
     code_focusAllUnlocked: `所有专精学派均已解锁。`,
     code_focusUnlocked: `已解锁 |COUNT| 个新专精学派！需要游戏内仓库更新才能生效，您可以通过访问星图来触发仓库更新。`,
-    code_addModsConfirm: `确定要向账户添加 |COUNT| 张MOD吗?`,
+    code_addModsConfirm: `确定要向账户添加 |COUNT| 张MOD吗？`,
     code_succImport: `导入成功。`,
     code_gild: `镀金`,
     code_moa: `恐鸟`,
     code_zanuka: `猎犬`,
-    code_stage: `阶段`,
+    code_stage: `[UNTRANSLATED] Stage`,
-    code_complete: `完成`,
+    code_complete: `[UNTRANSLATED] Complete`,
-    code_nextStage: `下一阶段`,
+    code_nextStage: `[UNTRANSLATED] Next stage`,
-    code_prevStage: `上一阶段`,
+    code_prevStage: `[UNTRANSLATED] Previous stage`,
-    code_reset: `重置`,
+    code_reset: `[UNTRANSLATED] Reset`,
-    code_setInactive: `使任务处于未激活状态`,
+    code_setInactive: `[UNTRANSLATED] Make the quest inactive`,
-    code_completed: `已完成`,
+    code_completed: `[UNTRANSLATED] Completed`,
-    code_active: `正在执行`,
+    code_active: `[UNTRANSLATED] Active`,
     code_pigment: `颜料`,
-    code_mature: `成长并战备`,
+    code_mature: `[UNTRANSLATED] Mature for combat`,
-    code_unmature: `逆转衰老基因`,
+    code_unmature: `[UNTRANSLATED] Regress genetic aging`,
     login_description: `使用您的 OpenWF 账户凭证登录（与游戏内连接本服务器时使用的昵称相同）。`,
     login_emailLabel: `电子邮箱`,
     login_passwordLabel: `密码`,
     login_loginButton: `登录`,
-    login_registerButton: `注册账号`,
+    login_registerButton: `[UNTRANSLATED] Register`,
     navbar_logout: `退出登录`,
     navbar_renameAccount: `重命名账户`,
     navbar_deleteAccount: `删除账户`,
+    navbar_darkTheme: `[UNTRANSLATED] Dark Theme`,
+    navbar_lightTheme: `[UNTRANSLATED] Light Theme`,
     navbar_inventory: `仓库`,
     navbar_mods: `Mods`,
     navbar_quests: `任务`,
@@ -82,23 +84,22 @@ dict = {
     inventory_operatorAmps: `增幅器`,
     inventory_hoverboards: `K式悬浮板`,
     inventory_moaPets: `恐鸟`,
-    inventory_kubrowPets: `动物同伴`,
+    inventory_kubrowPets: `[UNTRANSLATED] Beasts`,
-    inventory_evolutionProgress: `灵化之源进度`,
+    inventory_evolutionProgress: `[UNTRANSLATED] Incarnon Evolution Progress`,
     inventory_bulkAddSuits: `添加缺失战甲`,
     inventory_bulkAddWeapons: `添加缺失武器`,
     inventory_bulkAddSpaceSuits: `添加缺失Archwing`,
     inventory_bulkAddSpaceWeapons: `添加缺失Archwing武器`,
     inventory_bulkAddSentinels: `添加缺失守护`,
     inventory_bulkAddSentinelWeapons: `添加缺失守护武器`,
-    inventory_bulkAddEvolutionProgress: `添加缺失的灵化之源`,
+    inventory_bulkAddEvolutionProgress: `[UNTRANSLATED] Add Missing Incarnon Evolution Progress`,
     inventory_bulkRankUpSuits: `所有战甲升满级`,
     inventory_bulkRankUpWeapons: `所有武器升满级`,
     inventory_bulkRankUpSpaceSuits: `所有Archwing升满级`,
     inventory_bulkRankUpSpaceWeapons: `所有Archwing武器升满级`,
     inventory_bulkRankUpSentinels: `所有守护升满级`,
     inventory_bulkRankUpSentinelWeapons: `所有守护武器升满级`,
-    inventory_bulkRankUpEvolutionProgress: `所有灵化之源最大等级`,
+    inventory_bulkRankUpEvolutionProgress: `[UNTRANSLATED] Max Rank All Incarnon Evolution Progress`,
-    inventory_Boosters: `加成器`,
 
     quests_list: `任务`,
     quests_completeAll: `完成所有任务`,
@@ -112,15 +113,15 @@ dict = {
     currency_owned: `当前拥有 |COUNT|。`,
     powersuit_archonShardsLabel: `执刑官源力石槽位`,
     powersuit_archonShardsDescription: `您可以使用这些无限插槽应用各种强化效果`,
-    powersuit_archonShardsDescription2: `请注意, 在加载时, 每个执政官源力石都需要一定的时间来生效。`,
+    powersuit_archonShardsDescription2: `[UNTRANSLATED] Note that each archon shard takes some time to be applied when loading in.`,
     mods_addRiven: `添加裂罅MOD`,
     mods_fingerprint: `印记`,
     mods_fingerprintHelp: `需要印记相关的帮助？`,
     mods_rivens: `裂罅MOD`,
     mods_mods: `Mods`,
-    mods_addMissingUnrankedMods: `添加所有缺失的Mods`,
+    mods_addMissingUnrankedMods: `[UNTRANSLATED] Add Missing Unranked Mods`,
-    mods_removeUnranked: `删除所有未升级的Mods`,
+    mods_removeUnranked: `[UNTRANSLATED] Remove Unranked Mods`,
-    mods_addMissingMaxRankMods: `添加所有缺失的满级Mods`,
+    mods_addMissingMaxRankMods: `[UNTRANSLATED] Add Missing Max Rank Mods`,
     cheats_administratorRequirement: `您必须是管理员才能使用此功能。要成为管理员，请将 <code>|DISPLAYNAME|</code> 添加到 config.json 的 <code>administratorNames</code> 中。`,
     cheats_server: `服务器`,
     cheats_skipTutorial: `跳过教程`,
@@ -132,100 +133,47 @@ dict = {
     cheats_infiniteEndo: `无限内融核心`,
     cheats_infiniteRegalAya: `无限御品阿耶`,
     cheats_infiniteHelminthMaterials: `无限Helminth材料`,
-    cheats_claimingBlueprintRefundsIngredients: `取消蓝图制造时返还材料`,
+    cheats_claimingBlueprintRefundsIngredients: `[UNTRANSLATED] Claiming Blueprint Refunds Ingredients`,
-    cheats_dontSubtractVoidTraces: `虚空光体无消耗`,
+    cheats_dontSubtractVoidTraces: `[UNTRANSLATED] Don't Subtract Void Traces`,
-    cheats_dontSubtractConsumables: `消耗物品使用时无损耗`,
+    cheats_dontSubtractConsumables: `[UNTRANSLATED] Don't Subtract Consumables`,
     cheats_unlockAllShipFeatures: `解锁所有飞船功能`,
     cheats_unlockAllShipDecorations: `解锁所有飞船装饰`,
     cheats_unlockAllFlavourItems: `解锁所有<abbr title=\"动画组合、图标、调色板等\">装饰物品</abbr>`,
     cheats_unlockAllSkins: `解锁所有外观`,
     cheats_unlockAllCapturaScenes: `解锁所有Captura场景`,
-    cheats_unlockAllDecoRecipes: `解锁所有道场配方`,
+    cheats_unlockAllDecoRecipes: `[UNTRANSLATED] Unlock All Dojo Deco Recipes`,
     cheats_universalPolarityEverywhere: `全局万用极性`,
     cheats_unlockDoubleCapacityPotatoesEverywhere: `全物品自带Orokin反应堆`,
     cheats_unlockExilusEverywhere: `全物品自带适配器`,
     cheats_unlockArcanesEverywhere: `全物品自带赋能适配器`,
     cheats_noDailyStandingLimits: `无每日声望限制`,
-    cheats_noDailyFocusLimit: `指挥官专精无每日获取上限`,
+    cheats_noDailyFocusLimit: `[UNTRANSLATED] No Daily Focus Limits`,
-    cheats_noArgonCrystalDecay: `氩结晶无衰变`,
+    cheats_noArgonCrystalDecay: `[UNTRANSLATED] No Argon Crystal Decay`,
-    cheats_noMasteryRankUpCooldown: `段位考核无冷却时间`,
+    cheats_noMasteryRankUpCooldown: `[UNTRANSLATED] No Mastery Rank Up Cooldown`,
-    cheats_noVendorPurchaseLimits: `商城或商人无购买限制`,
+    cheats_noVendorPurchaseLimits: `[UNTRANSLATED] No Vendor Purchase Limits`,
-    cheats_noDeathMarks: `无死亡标记(不会被 Stalker/Grustrag 三霸/Zanuka 猎人等标记)`,
+    cheats_noDeathMarks: `[UNTRANSLATED] No Death Marks`,
-    cheats_noKimCooldowns: `无 KIM 冷却时间`,
+    cheats_noKimCooldowns: `[UNTRANSLATED] No KIM Cooldowns`,
-    cheats_syndicateMissionsRepeatable: `集团任务可重复`,
+    cheats_syndicateMissionsRepeatable: `[UNTRANSLATED] Syndicate Missions Repeatable`,
-    cheats_instantFinishRivenChallenge: `立即完成裂罅挑战`,
+    cheats_instantFinishRivenChallenge: `[UNTRANSLATED] Instant Finish Riven Challenge`,
     cheats_instantResourceExtractorDrones: `即时资源采集无人机`,
-    cheats_noResourceExtractorDronesDamage: `资源提取器不会损毁`,
+    cheats_noResourceExtractorDronesDamage: `[UNTRANSLATED] No Resource Extractor Drones Damage`,
-    cheats_skipClanKeyCrafting: `跳过氏族钥匙制作, 进入道场无需氏族钥匙`,
+    cheats_skipClanKeyCrafting: `[UNTRANSLATED] Skip Clan Key Crafting`,
     cheats_noDojoRoomBuildStage: `无视道场房间建造阶段`,
-    cheats_noDojoDecoBuildStage: `道场装饰建造立即完成`,
+    cheats_noDojoDecoBuildStage: `[UNTRANSLATED] No Dojo Deco Build Stage`,
     cheats_fastDojoRoomDestruction: `快速拆除道场房间`,
     cheats_noDojoResearchCosts: `无视道场研究消耗`,
     cheats_noDojoResearchTime: `无视道场研究时间`,
     cheats_fastClanAscension: `快速升级氏族`,
-    cheats_spoofMasteryRank: `伪造精通段位(-1为禁用)`,
+    cheats_spoofMasteryRank: `伪造精通段位（-1为禁用）`,
-    cheats_nightwaveStandingMultiplier: `午夜电波声望倍率`,
     cheats_saveSettings: `保存设置`,
     cheats_account: `账户`,
     cheats_unlockAllFocusSchools: `解锁所有专精学派`,
     cheats_helminthUnlockAll: `完全升级Helminth`,
-    cheats_intrinsicsUnlockAll: `所有内源之力最大等级`,
+    cheats_intrinsicsUnlockAll: `[UNTRANSLATED] Max Rank All Intrinsics`,
     cheats_changeSupportedSyndicate: `支持的集团`,
     cheats_changeButton: `更改`,
     cheats_none: `无`,
     import_importNote: `您可以在此处提供完整或部分库存响应（客户端表示）。支持的所有字段<b>将被覆盖</b>到您的账户中。`,
     import_submit: `提交`,
-
-    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 inflicting Blast Status`,
-    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: `[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: ``
 };