fix: conditional in giveKeyChainItem (#2804)

Using safe navigation now and inverted the condition because i would be false when we have to give items, not true.

Closes #2803

Reviewed-on: OpenWF/SpaceNinjaServer#2804
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>

config-vanilla.json

@@ -11,8 +11,6 @@
   "administratorNames": [],
   "autoCreateAccount": true,
   "skipTutorial": false,
-  "unlockAllShipDecorations": false,
-  "unlockAllFlavourItems": false,
   "unlockAllSkins": false,
   "fullyStockedVendors": false,
   "skipClanKeyCrafting": false,

package-lock.json

@@ -17,7 +17,7 @@
         "morgan": "^1.10.0",
         "ncp": "^2.0.0",
         "undici": "^7.10.0",
-        "warframe-public-export-plus": "^0.5.88",
+        "warframe-public-export-plus": "^0.5.89",
         "warframe-riven-info": "^0.1.2",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0",
@@ -5532,9 +5532,9 @@
       }
     },
     "node_modules/warframe-public-export-plus": {
-      "version": "0.5.88",
+      "version": "0.5.89",
-      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.88.tgz",
+      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.89.tgz",
-      "integrity": "sha512-uX766+MYDY3pMncu/23Dp9VZvrUe8pdWRWMcxfUbXg29aYO2GqipimHaFtw+vfrY06YAE8nbFkCWhFL3oPDPGw=="
+      "integrity": "sha512-a6dM1MirzofSsuv3LlRQHFLSSIGKPVSN93dcXSDmA3njsWqOGjJJdWyXqcyxxYw8rEB8CNowSHst/MUmKvKlRg=="
     },
     "node_modules/warframe-riven-info": {
       "version": "0.1.2",

package.json

@@ -35,7 +35,7 @@
     "morgan": "^1.10.0",
     "ncp": "^2.0.0",
     "undici": "^7.10.0",
-    "warframe-public-export-plus": "^0.5.88",
+    "warframe-public-export-plus": "^0.5.89",
     "warframe-riven-info": "^0.1.2",
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0",

src/controllers/api/giveKeyChainTriggeredItemsController.ts

@@ -10,7 +10,8 @@ export const giveKeyChainTriggeredItemsController: RequestHandler = async (req,
     const keyChainInfo = getJSONfromString<IKeyChainRequest>((req.body as string).toString());
 
     const inventory = await getInventory(accountId);
-    const inventoryChanges = await giveKeyChainItem(inventory, keyChainInfo);
+    const questKey = inventory.QuestKeys.find(qk => qk.ItemType === keyChainInfo.KeyChain)!;
+    const inventoryChanges = await giveKeyChainItem(inventory, keyChainInfo, questKey);
     await inventory.save();
 
     res.send(inventoryChanges);

src/controllers/api/giveKeyChainTriggeredMessageController.ts

@@ -8,8 +8,9 @@ export const giveKeyChainTriggeredMessageController: RequestHandler = async (req
     const accountId = await getAccountIdForRequest(req);
     const keyChainInfo = JSON.parse((req.body as Buffer).toString()) as IKeyChainRequest;
 
-    const inventory = await getInventory(accountId, "QuestKeys");
+    const inventory = await getInventory(accountId, "QuestKeys accountOwnerId");
-    await giveKeyChainMessage(inventory, accountId, keyChainInfo);
+    const questKey = inventory.QuestKeys.find(qk => qk.ItemType === keyChainInfo.KeyChain)!;
+    await giveKeyChainMessage(inventory, keyChainInfo, questKey);
     await inventory.save();
 
     res.send(1);

src/controllers/api/inventoryController.ts

@@ -10,7 +10,7 @@ import { equipmentKeys } from "../../types/inventoryTypes/inventoryTypes.ts";
 import type { IPolarity } from "../../types/inventoryTypes/commonInventoryTypes.ts";
 import { ArtifactPolarity } from "../../types/inventoryTypes/commonInventoryTypes.ts";
 import type { ICountedItem } from "warframe-public-export-plus";
-import { ExportCustoms, ExportFlavour, ExportResources } from "warframe-public-export-plus";
+import { ExportCustoms } from "warframe-public-export-plus";
 import { applyCheatsToInfestedFoundry, handleSubsumeCompletion } from "../../services/infestedFoundryService.ts";
 import {
     addEmailItem,
@@ -321,21 +321,7 @@ export const getInventoryResponse = async (
         }
     }
 
-    if (config.unlockAllShipDecorations) {
+    if (config.worldState?.baroTennoConRelay) {
-        inventoryResponse.ShipDecorations = [];
-        for (const [uniqueName, item] of Object.entries(ExportResources)) {
-            if (item.productCategory == "ShipDecorations") {
-                inventoryResponse.ShipDecorations.push({ ItemType: uniqueName, ItemCount: 999_999 });
-            }
-        }
-    }
-
-    if (config.unlockAllFlavourItems) {
-        inventoryResponse.FlavourItems = [];
-        for (const uniqueName in ExportFlavour) {
-            inventoryResponse.FlavourItems.push({ ItemType: uniqueName });
-        }
-    } else if (config.worldState?.baroTennoConRelay) {
         [
             "/Lotus/Types/Items/Events/TennoConRelay2022EarlyAccess",
             "/Lotus/Types/Items/Events/TennoConRelay2023EarlyAccess",

src/controllers/api/startCollectibleEntryController.ts

@@ -17,7 +17,7 @@ export const startCollectibleEntryController: RequestHandler = async (req, res)
         IncentiveStates: request.other
     });
     await inventory.save();
-    res.status(200).end();
+    res.send(`target = ${request.target}key = 0key = 1{"Target":"${request.target}"}`);
 };
 
 interface IStartCollectibleEntryRequest {

src/controllers/custom/getItemListsController.ts

@@ -10,6 +10,7 @@ import {
     ExportDojoRecipes,
     ExportDrones,
     ExportFactions,
+    ExportFlavour,
     ExportGear,
     ExportKeys,
     ExportRailjackWeapons,
@@ -35,10 +36,11 @@ interface ListedItem {
     partType?: string;
     chainLength?: number;
     parazon?: boolean;
+    alwaysAvailable?: boolean;
+    maxLevelCap?: number;
 }
 
 interface ItemLists {
-    uniqueLevelCaps: Record<string, number>;
     Suits: ListedItem[];
     LongGuns: ListedItem[];
     Melee: ListedItem[];
@@ -62,6 +64,8 @@ interface ItemLists {
     Abilities: ListedItem[];
     TechProjects: ListedItem[];
     VaultDecoRecipes: ListedItem[];
+    FlavourItems: ListedItem[];
+    ShipDecorations: ListedItem[];
     //circuitGameModes: ListedItem[];
 }
 
@@ -79,7 +83,6 @@ const toTitleCase = (str: string): string => {
 const getItemListsController: RequestHandler = (req, response) => {
     const lang = getDict(typeof req.query.lang == "string" ? req.query.lang : "en");
     const res: ItemLists = {
-        uniqueLevelCaps: {},
         Suits: [],
         LongGuns: [],
         Melee: [],
@@ -102,7 +105,9 @@ const getItemListsController: RequestHandler = (req, response) => {
         VarziaOffers: [],
         Abilities: [],
         TechProjects: [],
-        VaultDecoRecipes: []
+        VaultDecoRecipes: [],
+        FlavourItems: [],
+        ShipDecorations: []
         /*circuitGameModes: [
             {
                 uniqueName: "Survival",
@@ -138,7 +143,8 @@ const getItemListsController: RequestHandler = (req, response) => {
         res[item.productCategory].push({
             uniqueName,
             name: getString(item.name, lang),
-            exalted: item.exalted
+            exalted: item.exalted,
+            maxLevelCap: item.maxLevelCap
         });
         item.abilities.forEach(ability => {
             res.Abilities.push({
@@ -146,9 +152,6 @@ const getItemListsController: RequestHandler = (req, response) => {
                 name: getString(ability.name || uniqueName, lang)
             });
         });
-        if (item.maxLevelCap) {
-            res.uniqueLevelCaps[uniqueName] = item.maxLevelCap;
-        }
     }
     for (const [uniqueName, item] of Object.entries(ExportSentinels)) {
         if (item.productCategory == "Sentinels" || item.productCategory == "KubrowPets") {
@@ -189,7 +192,8 @@ const getItemListsController: RequestHandler = (req, response) => {
             ) {
                 res[item.productCategory].push({
                     uniqueName,
-                    name: getString(item.name, lang)
+                    name: getString(item.name, lang),
+                    maxLevelCap: item.maxLevelCap
                 });
             }
         } else if (!item.excludeFromCodex) {
@@ -198,9 +202,6 @@ const getItemListsController: RequestHandler = (req, response) => {
                 name: getString(item.name, lang)
             });
         }
-        if (item.maxLevelCap) {
-            res.uniqueLevelCaps[uniqueName] = item.maxLevelCap;
-        }
     }
     for (const [uniqueName, item] of Object.entries(ExportResources)) {
         let name = getString(item.name, lang);
@@ -230,7 +231,12 @@ const getItemListsController: RequestHandler = (req, response) => {
                 }
             }
         }
-        if (
+        if (item.productCategory == "ShipDecorations") {
+            res.ShipDecorations.push({
+                uniqueName: uniqueName,
+                name: name
+            });
+        } else if (
             name &&
             uniqueName.substring(0, 30) != "/Lotus/Types/Game/Projections/" &&
             uniqueName != "/Lotus/Types/Gameplay/EntratiLab/Resources/EntratiLanthornBundle"
@@ -443,6 +449,14 @@ const getItemListsController: RequestHandler = (req, response) => {
         });
     }
 
+    for (const [uniqueName, item] of Object.entries(ExportFlavour)) {
+        res.FlavourItems.push({
+            uniqueName,
+            name: getString(item.name, lang),
+            alwaysAvailable: item.alwaysAvailable
+        });
+    }
+
     response.json(res);
 };
 

src/controllers/custom/manageQuestsController.ts

@@ -102,8 +102,16 @@ export const manageQuestsController: RequestHandler = async (req, res) => {
                     questKey.Completed = false;
                     questKey.CompletionDate = undefined;
                 }
+
+                const run = questKey.Progress[0]?.c ?? 0;
+                const stage = questKey.Progress.map(p => p.c).lastIndexOf(run);
+
+                if (run > 0) {
+                    questKey.Progress[stage].c = run - 1;
+                } else {
                     questKey.Progress.pop();
-                const stage = questKey.Progress.length - 1;
+                }
+
                 if (stage > 0) {
                     await giveKeyChainStageTriggered(inventory, {
                         KeyChain: questKey.ItemType,
@@ -123,28 +131,28 @@ export const manageQuestsController: RequestHandler = async (req, res) => {
                 }
                 if (!questKey.Progress) break;
 
-                const currentStage = questKey.Progress.length;
+                const run = questKey.Progress[0]?.c ?? 0;
+                const currentStage = questKey.Progress.map(p => p.c).lastIndexOf(run);
+
                 if (currentStage + 1 == questManifest.chainStages?.length) {
                     logger.debug(`Trying to complete last stage with nextStage, calling completeQuest instead`);
                     await completeQuest(inventory, questKey.ItemType);
                 } else {
-                    const progress = {
+                    if (run > 0) {
-                        c: 0,
+                        questKey.Progress[currentStage + 1].c = run;
-                        i: false,
+                    } else {
-                        m: false,
+                        questKey.Progress.push({ c: run, i: false, m: false, b: [] });
-                        b: []
+                    }
-                    };
-                    questKey.Progress.push(progress);
 
                     await giveKeyChainStageTriggered(inventory, {
                         KeyChain: questKey.ItemType,
-                        ChainStage: currentStage
+                        ChainStage: currentStage + 1
                     });
 
                     if (currentStage > 0) {
                         await giveKeyChainMissionReward(inventory, {
                             KeyChain: questKey.ItemType,
-                            ChainStage: currentStage - 1
+                            ChainStage: currentStage
                         });
                     }
                 }

src/controllers/custom/removeCustomizationController.ts

@@ -0,0 +1,14 @@
+import { getAccountIdForRequest } from "../../services/loginService.ts";
+import { getInventory } from "../../services/inventoryService.ts";
+import type { RequestHandler } from "express";
+import { broadcastInventoryUpdate } from "../../services/wsService.ts";
+
+export const removeCustomizationController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const ItemType = req.query.itemType as string;
+    const inventory = await getInventory(accountId, "FlavourItems");
+    inventory.FlavourItems.pull({ ItemType });
+    await inventory.save();
+    res.end();
+    broadcastInventoryUpdate(req);
+};

src/controllers/custom/unlockLevelCapController.ts

@@ -0,0 +1,25 @@
+import type { RequestHandler } from "express";
+import { getAccountIdForRequest } from "../../services/loginService.ts";
+import { broadcastInventoryUpdate } from "../../services/wsService.ts";
+import { getInventory } from "../../services/inventoryService.ts";
+import type { TEquipmentKey } from "../../types/inventoryTypes/inventoryTypes.ts";
+
+export const unlockLevelCapController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const data = req.body as IunlockLevelCapRequest;
+    const inventory = await getInventory(accountId, data.Category);
+    const equipment = inventory[data.Category].id(data.ItemId)!;
+
+    equipment.Polarized ??= 0;
+    equipment.Polarized = data.Polarized;
+
+    await inventory.save();
+    res.end();
+    broadcastInventoryUpdate(req);
+};
+
+interface IunlockLevelCapRequest {
+    Category: TEquipmentKey;
+    ItemId: string;
+    Polarized: number;
+}

src/models/guildModel.ts

@@ -104,11 +104,11 @@ const guildRankSchema = new Schema<IGuildRank>(
 const defaultRanks: IGuildRank[] = [
     {
         Name: "/Lotus/Language/Game/Rank_Creator",
-        Permissions: 16351
+        Permissions: GuildPermission.Host | 16351
     },
     {
         Name: "/Lotus/Language/Game/Rank_Warlord",
-        Permissions: 16351
+        Permissions: GuildPermission.Host | 16351
     },
     {
         Name: "/Lotus/Language/Game/Rank_General",

src/routes/custom.ts

@@ -21,6 +21,7 @@ import { unlockAllSimarisResearchEntriesController } from "../controllers/custom
 import { unlockAllScansController } from "../controllers/custom/unlockAllScansController.ts";
 import { unlockAllShipFeaturesController } from "../controllers/custom/unlockAllShipFeaturesController.ts";
 import { unlockAllCapturaScenesController } from "../controllers/custom/unlockAllCapturaScenesController.ts";
+import { removeCustomizationController } from "../controllers/custom/removeCustomizationController.ts";
 
 import { abilityOverrideController } from "../controllers/custom/abilityOverrideController.ts";
 import { createAccountController } from "../controllers/custom/createAccountController.ts";
@@ -40,6 +41,7 @@ import { manageQuestsController } from "../controllers/custom/manageQuestsContro
 import { setEvolutionProgressController } from "../controllers/custom/setEvolutionProgressController.ts";
 import { setBoosterController } from "../controllers/custom/setBoosterController.ts";
 import { updateFingerprintController } from "../controllers/custom/updateFingerprintController.ts";
+import { unlockLevelCapController } from "../controllers/custom/unlockLevelCapController.ts";
 import { changeModularPartsController } from "../controllers/custom/changeModularPartsController.ts";
 import { editSuitInvigorationUpgradeController } from "../controllers/custom/editSuitInvigorationUpgradeController.ts";
 import { setAccountCheatController } from "../controllers/custom/setAccountCheatController.ts";
@@ -70,6 +72,7 @@ customRouter.get("/unlockAllSimarisResearchEntries", unlockAllSimarisResearchEnt
 customRouter.get("/unlockAllScans", unlockAllScansController);
 customRouter.get("/unlockAllShipFeatures", unlockAllShipFeaturesController);
 customRouter.get("/unlockAllCapturaScenes", unlockAllCapturaScenesController);
+customRouter.get("/removeCustomization", removeCustomizationController);
 
 customRouter.post("/abilityOverride", abilityOverrideController);
 customRouter.post("/createAccount", createAccountController);
@@ -87,6 +90,7 @@ customRouter.post("/manageQuests", manageQuestsController);
 customRouter.post("/setEvolutionProgress", setEvolutionProgressController);
 customRouter.post("/setBooster", setBoosterController);
 customRouter.post("/updateFingerprint", updateFingerprintController);
+customRouter.post("/unlockLevelCap", unlockLevelCapController);
 customRouter.post("/changeModularParts", changeModularPartsController);
 customRouter.post("/editSuitInvigorationUpgrade", editSuitInvigorationUpgradeController);
 customRouter.post("/setAccountCheat", setAccountCheatController);

src/services/configService.ts

@@ -21,8 +21,6 @@ export interface IConfig {
     administratorNames?: string[];
     autoCreateAccount?: boolean;
     skipTutorial?: boolean;
-    unlockAllShipDecorations?: boolean;
-    unlockAllFlavourItems?: boolean;
     unlockAllSkins?: boolean;
     fullyStockedVendors?: boolean;
     skipClanKeyCrafting?: boolean;
@@ -128,6 +126,8 @@ export const configRemovedOptionsKeys = [
     "noDojoResearchCosts",
     "noDojoResearchTime",
     "fastClanAscension",
+    "unlockAllFlavourItems",
+    "unlockAllShipDecorations",
     "unlockAllDecoRecipes"
 ];
 

src/services/questService.ts

@@ -6,7 +6,6 @@ import { addItem, addItems, addKeyChainItems, setupKahlSyndicate } from "./inven
 import { fromStoreItem, getKeyChainMessage, getLevelKeyRewards } from "./itemDataService.ts";
 import type { IQuestKeyClient, IQuestKeyDatabase, IQuestStage } from "../types/inventoryTypes/inventoryTypes.ts";
 import { logger } from "../utils/logger.ts";
-import type { Types } from "mongoose";
 import { ExportKeys } from "warframe-public-export-plus";
 import { addFixedLevelRewards } from "./missionInventoryUpdateService.ts";
 import type { IInventoryChanges } from "../types/purchaseTypes.ts";
@@ -44,7 +43,12 @@ export const updateQuestKey = async (
         inventory.QuestKeys[questKeyIndex].CompletionDate = new Date();
 
         const questKey = questKeyUpdate[0].ItemType;
-        await handleQuestCompletion(inventory, questKey, inventoryChanges);
+        await handleQuestCompletion(
+            inventory,
+            questKey,
+            inventoryChanges,
+            (questKeyUpdate[0].Progress?.[0]?.c ?? 0) > 0
+        );
     }
     return inventoryChanges;
 };
@@ -52,7 +56,7 @@ export const updateQuestKey = async (
 export const updateQuestStage = (
     inventory: TInventoryDatabaseDocument,
     { KeyChain, ChainStage }: IKeyChainRequest,
-    questStageUpdate: IQuestStage
+    questStageUpdate: Partial<IQuestStage>
 ): void => {
     const quest = inventory.QuestKeys.find(quest => quest.ItemType === KeyChain);
 
@@ -68,14 +72,22 @@ export const updateQuestStage = (
 
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (!questStage) {
-        const questStageIndex = quest.Progress.push(questStageUpdate) - 1;
+        const questStageIndex =
+            quest.Progress.push({
+                c: questStageUpdate.c ?? 0,
+                i: questStageUpdate.i ?? false,
+                m: questStageUpdate.m ?? false,
+                b: questStageUpdate.b ?? []
+            }) - 1;
         if (questStageIndex !== ChainStage) {
             throw new Error(`Quest stage index mismatch: ${questStageIndex} !== ${ChainStage}`);
         }
         return;
     }
 
-    Object.assign(questStage, questStageUpdate);
+    for (const [key, value] of Object.entries(questStageUpdate) as [keyof IQuestStage, number | boolean | any[]][]) {
+        (questStage[key] as any) = value;
+    }
 };
 
 export const addQuestKey = (
@@ -112,58 +124,53 @@ export const completeQuest = async (inventory: TInventoryDatabaseDocument, quest
     }
 
     const chainStageTotal = chainStages.length;
+    let existingQuestKey = inventory.QuestKeys.find(qk => qk.ItemType === questKey);
 
-    const existingQuestKey = inventory.QuestKeys.find(qk => qk.ItemType === questKey);
+    if (!existingQuestKey) {
-
+        const completedQuestKey: IQuestKeyDatabase = {
-    const startingStage = Math.max((existingQuestKey?.Progress?.length ?? 0) - 1, 0);
+            ItemType: questKey,
-
+            Completed: false,
-    if (existingQuestKey?.Completed) {
+            unlock: true,
+            Progress: Array.from({ length: chainStageTotal }, () => ({
+                c: 0,
+                i: false,
+                m: false,
+                b: []
+            }))
+        };
+        addQuestKey(inventory, completedQuestKey);
+        existingQuestKey = inventory.QuestKeys.find(qk => qk.ItemType === questKey)!;
+    } else if (existingQuestKey.Completed) {
         return;
     }
-    if (existingQuestKey) {
+
     existingQuestKey.Progress = existingQuestKey.Progress ?? [];
 
-        const existingProgressLength = existingQuestKey.Progress.length;
+    const run = existingQuestKey.Progress[0]?.c ?? 0;
 
+    const existingProgressLength = existingQuestKey.Progress.length;
     if (existingProgressLength < chainStageTotal) {
         const missingProgress: IQuestStage[] = Array.from(
             { length: chainStageTotal - existingProgressLength },
-                () =>
+            () => ({ c: run, i: false, m: false, b: [] }) as IQuestStage
-                    ({
-                        c: 0,
-                        i: false,
-                        m: false,
-                        b: []
-                    }) as IQuestStage
         );
-
         existingQuestKey.Progress.push(...missingProgress);
-            existingQuestKey.CompletionDate = new Date();
-            existingQuestKey.Completed = true;
-        }
-    } else {
-        const completedQuestKey: IQuestKeyDatabase = {
-            ItemType: questKey,
-            Completed: true,
-            unlock: true,
-            Progress: Array(chainStageTotal).fill({
-                c: 0,
-                i: false,
-                m: false,
-                b: []
-            } satisfies IQuestStage),
-            CompletionDate: new Date()
-        };
-        addQuestKey(inventory, completedQuestKey);
     }
 
-    for (let i = startingStage; i < chainStageTotal; i++) {
+    for (let i = 0; i < chainStageTotal; i++) {
+        const stage = existingQuestKey.Progress[i];
+        if (stage.c <= run) {
+            stage.c = run;
             await giveKeyChainStageTriggered(inventory, { KeyChain: questKey, ChainStage: i });
-
             await giveKeyChainMissionReward(inventory, { KeyChain: questKey, ChainStage: i });
         }
+    }
 
-    await handleQuestCompletion(inventory, questKey);
+    if (existingQuestKey.Progress.every(p => p.c == run)) {
+        existingQuestKey.Completed = true;
+        existingQuestKey.CompletionDate = new Date();
+        await handleQuestCompletion(inventory, questKey, undefined, run > 0);
+    }
 };
 
 const getQuestCompletionItems = (questKey: string): ITypeCount[] | undefined => {
@@ -214,28 +221,35 @@ const doesQuestCompletionFinishSet = (
 const handleQuestCompletion = async (
     inventory: TInventoryDatabaseDocument,
     questKey: string,
-    inventoryChanges: IInventoryChanges = {}
+    inventoryChanges: IInventoryChanges = {},
+    isRerun: boolean = false
 ): Promise<void> => {
     logger.debug(`completed quest ${questKey}`);
 
+    if (inventory.ActiveQuest == questKey) inventory.ActiveQuest = "";
     if (questKey == "/Lotus/Types/Keys/OrokinMoonQuest/OrokinMoonQuestKeyChain") {
+        const att = isRerun
+            ? []
+            : [
+                  "/Lotus/Weapons/Tenno/Melee/Swords/StalkerTwo/StalkerTwoSmallSword",
+                  "/Lotus/Upgrades/Skins/Sigils/ScarSigil"
+              ];
         await createMessage(inventory.accountOwnerId, [
             {
                 sndr: "/Lotus/Language/Bosses/Ordis",
                 msg: "/Lotus/Language/G1Quests/SecondDreamFinishInboxMessage",
-                att: [
+                att,
-                    "/Lotus/Weapons/Tenno/Melee/Swords/StalkerTwo/StalkerTwoSmallSword",
-                    "/Lotus/Upgrades/Skins/Sigils/ScarSigil"
-                ],
                 sub: "/Lotus/Language/G1Quests/SecondDreamFinishInboxTitle",
                 icon: "/Lotus/Interface/Icons/Npcs/Ordis.png",
                 highPriority: true
             }
         ]);
-    } else if (questKey == "/Lotus/Types/Keys/NewWarQuest/NewWarQuestKeyChain") {
+    } else if (questKey == "/Lotus/Types/Keys/NewWarQuest/NewWarQuestKeyChain" && !isRerun) {
         setupKahlSyndicate(inventory);
     }
 
+    if (isRerun) return;
+
     // Whispers in the Walls is unlocked once The New War + Heart of Deimos are completed.
     if (
         doesQuestCompletionFinishSet(inventory, questKey, [
@@ -279,21 +293,24 @@ const handleQuestCompletion = async (
     if (questCompletionItems) {
         await addItems(inventory, questCompletionItems, inventoryChanges);
     }
-
-    if (inventory.ActiveQuest == questKey) inventory.ActiveQuest = "";
 };
 
 export const giveKeyChainItem = async (
     inventory: TInventoryDatabaseDocument,
-    keyChainInfo: IKeyChainRequest
+    keyChainInfo: IKeyChainRequest,
+    questKey: IQuestKeyDatabase
 ): Promise<IInventoryChanges> => {
-    const inventoryChanges = await addKeyChainItems(inventory, keyChainInfo);
+    let inventoryChanges: IInventoryChanges = {};
+
+    if (!questKey.Progress?.[keyChainInfo.ChainStage]?.i) {
+        inventoryChanges = await addKeyChainItems(inventory, keyChainInfo);
 
         if (isEmptyObject(inventoryChanges)) {
             logger.warn("inventory changes was empty after getting keychain items: should not happen");
         }
         // items were added: update quest stage's i (item was given)
         updateQuestStage(inventory, keyChainInfo, { i: true });
+    }
 
     return inventoryChanges;
 
@@ -309,12 +326,17 @@ export const giveKeyChainItem = async (
 
 export const giveKeyChainMessage = async (
     inventory: TInventoryDatabaseDocument,
-    accountId: string | Types.ObjectId,
+    keyChainInfo: IKeyChainRequest,
-    keyChainInfo: IKeyChainRequest
+    questKey: IQuestKeyDatabase
 ): Promise<void> => {
     const keyChainMessage = getKeyChainMessage(keyChainInfo);
 
-    await createMessage(accountId, [keyChainMessage]);
+    if (questKey.Progress![0].c > 0) {
+        keyChainMessage.att = [];
+        keyChainMessage.countedAtt = [];
+    }
+
+    await createMessage(inventory.accountOwnerId, [keyChainMessage]);
 
     updateQuestStage(inventory, keyChainInfo, { m: true });
 };
@@ -328,8 +350,10 @@ export const giveKeyChainMissionReward = async (
 
     if (chainStages) {
         const missionName = chainStages[keyChainInfo.ChainStage].key;
-        if (missionName) {
+        const questKey = inventory.QuestKeys.find(q => q.ItemType === keyChainInfo.KeyChain);
+        if (missionName && questKey) {
             const fixedLevelRewards = getLevelKeyRewards(missionName);
+            const run = questKey.Progress?.[0]?.c ?? 0;
             if (fixedLevelRewards.levelKeyRewards) {
                 const missionRewards: { StoreItem: string; ItemCount: number }[] = [];
                 inventory.RegularCredits += addFixedLevelRewards(fixedLevelRewards.levelKeyRewards, missionRewards);
@@ -338,7 +362,7 @@ export const giveKeyChainMissionReward = async (
                     await addItem(inventory, fromStoreItem(reward.StoreItem), reward.ItemCount);
                 }
 
-                updateQuestStage(inventory, keyChainInfo, { c: 0 });
+                updateQuestStage(inventory, keyChainInfo, { c: run });
             } else if (fixedLevelRewards.levelKeyRewards2) {
                 for (const reward of fixedLevelRewards.levelKeyRewards2) {
                     if (reward.rewardType == "RT_CREDITS") {
@@ -352,7 +376,7 @@ export const giveKeyChainMissionReward = async (
                     }
                 }
 
-                updateQuestStage(inventory, keyChainInfo, { c: 0 });
+                updateQuestStage(inventory, keyChainInfo, { c: run });
             }
         }
     }
@@ -364,14 +388,15 @@ export const giveKeyChainStageTriggered = async (
 ): Promise<void> => {
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     const chainStages = ExportKeys[keyChainInfo.KeyChain]?.chainStages;
+    const questKey = inventory.QuestKeys.find(qk => qk.ItemType === keyChainInfo.KeyChain);
 
-    if (chainStages) {
+    if (chainStages && questKey) {
         if (chainStages[keyChainInfo.ChainStage].itemsToGiveWhenTriggered.length > 0) {
-            await giveKeyChainItem(inventory, keyChainInfo);
+            await giveKeyChainItem(inventory, keyChainInfo, questKey);
         }
 
         if (chainStages[keyChainInfo.ChainStage].messageToSendWhenTriggered) {
-            await giveKeyChainMessage(inventory, inventory.accountOwnerId, keyChainInfo);
+            await giveKeyChainMessage(inventory, keyChainInfo, questKey);
         }
     }
 };

src/services/shipCustomizationsService.ts

@@ -14,7 +14,6 @@ import type {
 import { logger } from "../utils/logger.ts";
 import { Types } from "mongoose";
 import { addFusionTreasures, addShipDecorations, getInventory } from "./inventoryService.ts";
-import { config } from "./configService.ts";
 import { Guild } from "../models/guildModel.ts";
 import { hasGuildPermission } from "./guildService.ts";
 import { GuildPermission } from "../types/guildTypes.ts";
@@ -137,7 +136,6 @@ export const handleSetShipDecorations = async (
         roomToPlaceIn.MaxCapacity += meta.capacityCost;
         await personalRooms.save();
 
-        if (!config.unlockAllShipDecorations) {
         const inventory = await getInventory(accountId);
         if (deco.Sockets !== undefined) {
             addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: deco.Sockets, ItemCount: 1 }]);
@@ -145,7 +143,6 @@ export const handleSetShipDecorations = async (
             addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: 1 }]);
         }
         await inventory.save();
-        }
 
         return {
             DecoId: placedDecoration.RemoveId,
@@ -155,7 +152,6 @@ export const handleSetShipDecorations = async (
         };
     }
 
-    if (!config.unlockAllShipDecorations) {
     const inventory = await getInventory(accountId);
     if (placedDecoration.Sockets !== undefined) {
         addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: placedDecoration.Sockets, ItemCount: -1 }]);
@@ -163,7 +159,6 @@ export const handleSetShipDecorations = async (
         addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: -1 }]);
     }
     await inventory.save();
-    }
 
     //place decoration
     const decoId = new Types.ObjectId();
@@ -221,13 +216,11 @@ export const handleResetShipDecorations = async (
         }
 
         // refund item
-        if (!config.unlockAllShipDecorations) {
         if (deco.Sockets !== undefined) {
             addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: deco.Sockets, ItemCount: 1 }]);
         } else {
             addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: 1 }]);
         }
-        }
 
         // refund capacity
         room.MaxCapacity += meta.capacityCost;

src/services/worldStateService.ts

@@ -266,14 +266,15 @@ export const getSortie = (day: number): ISortie => {
     const rng = new SRng(seed);
 
     const boss = rng.randomElement(sortieBosses)!;
+    const enemyFaction = sortieBossToFaction[boss];
 
     const nodes: string[] = [];
     for (const [key, value] of Object.entries(ExportRegions)) {
         if (
-            sortieFactionToSystemIndexes[sortieBossToFaction[boss]].includes(value.systemIndex) &&
+            sortieFactionToSystemIndexes[enemyFaction].includes(value.systemIndex) &&
-            sortieFactionToFactions[sortieBossToFaction[boss]].includes(value.faction!) &&
+            sortieFactionToFactions[enemyFaction].includes(value.faction!) &&
             key in sortieTilesets &&
-            (key != "SolNode228" || sortieBossToFaction[boss] == "FC_GRINEER") // PoE does not work for non-infested enemies
+            (key != "SolNode228" || enemyFaction == "FC_GRINEER") // PoE only works for grineer enemies
         ) {
             nodes.push(key);
         }
@@ -339,13 +340,7 @@ export const getSortie = (day: number): ISortie => {
             modifiers.push("SORTIE_MODIFIER_HAZARD_RADIATION");
         }
 
-        if (ExportRegions[node].faction == "FC_GRINEER") {
+        modifiers.push(enemyFaction == "FC_CORPUS" ? "SORTIE_MODIFIER_SHIELDS" : "SORTIE_MODIFIER_ARMOR");
-            // Grineer
-            modifiers.push("SORTIE_MODIFIER_ARMOR");
-        } else if (ExportRegions[node].faction == "FC_CORPUS") {
-            // Corpus
-            modifiers.push("SORTIE_MODIFIER_SHIELDS");
-        }
 
         const modifierType = rng.randomElement(modifiers)!;
 

src/types/inventoryTypes/inventoryTypes.ts

@@ -977,10 +977,10 @@ export interface IQuestKeyClient extends Omit<IQuestKeyDatabase, "CompletionDate
 }
 
 export interface IQuestStage {
-    c?: number;
+    c: number;
-    i?: boolean;
+    i: boolean;
-    m?: boolean;
+    m: boolean;
-    b?: any[];
+    b: any[];
 }
 
 export interface IRawUpgrade {

static/fixed_responses/worldState/worldState.json

@@ -6,7 +6,7 @@
       "Messages": [
         { "LanguageCode": "fr", "Message": "Rejoignez le Discord OpenWF!" },
         { "LanguageCode": "it", "Message": "Unisciti al Discord di OpenWF!" },
-        { "LanguageCode": "de", "Message": "Tritt dem OpenWF Discord bei!" },
+        { "LanguageCode": "de", "Message": "Trete dem OpenWF Discord bei!" },
         { "LanguageCode": "es", "Message": "Únete al Discord de OpenWF!" },
         { "LanguageCode": "pt", "Message": "Junte-se ao Discord do OpenWF!" },
         { "LanguageCode": "ru", "Message": "Присоединяйтесь к OpenWF Discord!" },

static/webui/index.html

@@ -108,9 +108,9 @@
                     <div class="card-body">
                         <div class="tab-content">
                             <div class="tab-pane" id="miscItems-tab-content">
-                                <form class="card-body input-group" onsubmit="doAcquireMiscItems();return false;">
+                                <form class="card-body input-group" onsubmit="doAcquireCountItems('miscitems');return false;">
-                                    <input class="form-control" id="miscitem-count" type="number" value="1" />
+                                    <input class="form-control" id="miscitems-count" type="number" value="1" />
-                                    <input class="form-control w-50" id="miscitem-type" list="datalist-miscitems" />
+                                    <input class="form-control w-50" id="acquire-type-miscitems" list="datalist-miscitems" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
                             </div>
@@ -180,30 +180,33 @@
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_suits"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('Suits');return false;">
                                     <input class="form-control" id="acquire-type-Suits" list="datalist-Suits" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="Suits-list"></tbody>
                                     </table>
                                 </div>
                             </div>
                         </div>
+                    </div>
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_longGuns"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="handleModularSelection('LongGuns');return false;">
                                     <input class="form-control" id="acquire-type-LongGuns" list="datalist-LongGuns" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
-                                <form class="input-group mb-3" id="modular-LongGuns" style="display: none;">
+                                <form class="input-group mb-3 d-none" id="modular-LongGuns">
                                     <input class="form-control" id="acquire-type-LongGuns-GUN_BARREL" list="datalist-ModularParts-GUN_BARREL" />
                                     <input class="form-control" id="acquire-type-LongGuns-GUN_PRIMARY_HANDLE" list="datalist-ModularParts-GUN_PRIMARY_HANDLE" />
                                     <input class="form-control" id="acquire-type-LongGuns-GUN_CLIP" list="datalist-ModularParts-GUN_CLIP" />
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="LongGuns-list"></tbody>
                                     </table>
@@ -211,39 +214,43 @@
                             </div>
                         </div>
                     </div>
+                </div>
                 <div class="row g-3 mb-3">
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_pistols"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="handleModularSelection('Pistols');return false;">
                                     <input class="form-control" id="acquire-type-Pistols" list="datalist-Pistols" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
-                                <form class="input-group mb-3" id="modular-Pistols" style="display: none;">
+                                <form class="input-group mb-3 d-none" id="modular-Pistols">
                                     <input class="form-control" id="acquire-type-Pistols-GUN_BARREL" list="datalist-ModularParts-GUN_BARREL" />
                                     <input class="form-control" id="acquire-type-Pistols-GUN_SECONDARY_HANDLE" list="datalist-ModularParts-GUN_SECONDARY_HANDLE" />
                                     <input class="form-control" id="acquire-type-Pistols-GUN_CLIP" list="datalist-ModularParts-GUN_CLIP" />
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="Pistols-list"></tbody>
                                     </table>
                                 </div>
                             </div>
                         </div>
+                    </div>
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_melee"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="handleModularSelection('Melee');return false;">
                                     <input class="form-control" id="acquire-type-Melee" list="datalist-Melee" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
-                                <form class="input-group mb-3" id="modular-Melee" style="display: none;">
+                                <form class="input-group mb-3 d-none" id="modular-Melee">
                                     <input class="form-control" id="acquire-type-Melee-BLADE" list="datalist-ModularParts-BLADE" />
                                     <input class="form-control" id="acquire-type-Melee-HILT" list="datalist-ModularParts-HILT" />
                                     <input class="form-control" id="acquire-type-Melee-HILT_WEIGHT" list="datalist-ModularParts-HILT_WEIGHT" />
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="Melee-list"></tbody>
                                     </table>
@@ -251,29 +258,33 @@
                             </div>
                         </div>
                     </div>
+                </div>
                 <div class="row g-3 mb-3">
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_spaceSuits"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('SpaceSuits');return false;">
                                     <input class="form-control" id="acquire-type-SpaceSuits" list="datalist-SpaceSuits" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="SpaceSuits-list"></tbody>
                                     </table>
                                 </div>
                             </div>
                         </div>
+                    </div>
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_spaceGuns"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('SpaceGuns');return false;">
                                     <input class="form-control" id="acquire-type-SpaceGuns" list="datalist-SpaceGuns" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="SpaceGuns-list"></tbody>
                                     </table>
@@ -281,29 +292,33 @@
                             </div>
                         </div>
                     </div>
+                </div>
                 <div class="row g-3 mb-3">
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_spaceMelee"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('SpaceMelee');return false;">
                                     <input class="form-control" id="acquire-type-SpaceMelee" list="datalist-SpaceMelee" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="SpaceMelee-list"></tbody>
                                     </table>
                                 </div>
                             </div>
                         </div>
+                    </div>
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_mechSuits"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('MechSuits');return false;">
                                     <input class="form-control" id="acquire-type-MechSuits" list="datalist-MechSuits" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="MechSuits-list"></tbody>
                                     </table>
@@ -311,41 +326,45 @@
                             </div>
                         </div>
                     </div>
+                </div>
                 <div class="row g-3 mb-3">
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_sentinels"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('Sentinels');return false;">
                                     <input class="form-control" id="acquire-type-Sentinels" list="datalist-Sentinels" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="Sentinels-list"></tbody>
                                     </table>
                                 </div>
                             </div>
                         </div>
+                    </div>
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_moaPets"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="handleModularSelection('MoaPets');return false;">
                                     <input class="form-control" id="acquire-type-MoaPets" list="datalist-MoaPets" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
-                                <form class="input-group mb-3" id="modular-MoaPets-Moa" style="display: none;">
+                                <form class="input-group mb-3 d-none" id="modular-MoaPets-Moa">
                                     <input class="form-control" id="acquire-type-MoaPets-MOA_ENGINE" list="datalist-ModularParts-MOA_ENGINE" />
                                     <input class="form-control" id="acquire-type-MoaPets-MOA_PAYLOAD" list="datalist-ModularParts-MOA_PAYLOAD" />
                                     <input class="form-control" id="acquire-type-MoaPets-MOA_HEAD" list="datalist-ModularParts-MOA_HEAD" />
                                     <input class="form-control" id="acquire-type-MoaPets-MOA_LEG" list="datalist-ModularParts-MOA_LEG" />
                                 </form>
-                                <form class="input-group mb-3" id="modular-MoaPets-Zanuka" style="display: none;">
+                                <form class="input-group mb-3 d-none" id="modular-MoaPets-Zanuka">
                                     <input class="form-control" id="acquire-type-MoaPets-ZANUKA_HEAD" list="datalist-ModularParts-ZANUKA_HEAD" />
                                     <input class="form-control" id="acquire-type-MoaPets-ZANUKA_BODY" list="datalist-ModularParts-ZANUKA_BODY" />
                                     <input class="form-control" id="acquire-type-MoaPets-ZANUKA_LEG" list="datalist-ModularParts-ZANUKA_LEG" />
                                     <input class="form-control" id="acquire-type-MoaPets-ZANUKA_TAIL" list="datalist-ModularParts-ZANUKA_TAIL" />
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="MoaPets-list"></tbody>
                                     </table>
@@ -353,37 +372,41 @@
                             </div>
                         </div>
                     </div>
+                </div>
                 <div class="row g-3 mb-3">
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_kubrowPets"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="handleModularSelection('KubrowPets');return false;">
                                     <input class="form-control" id="acquire-type-KubrowPets" list="datalist-KubrowPets" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
-                                <form class="input-group mb-3" id="modular-KubrowPets-Catbrow" style="display: none;">
+                                <form class="input-group mb-3 d-none" id="modular-KubrowPets-Catbrow">
                                     <input class="form-control" id="acquire-type-KubrowPets-CATBROW_ANTIGEN" list="datalist-ModularParts-CATBROW_ANTIGEN" />
                                     <input class="form-control" id="acquire-type-KubrowPets-CATBROW_MUTAGEN" list="datalist-ModularParts-CATBROW_MUTAGEN" />
                                 </form>
-                                <form class="input-group mb-3" id="modular-KubrowPets-Kubrow" style="display: none;">
+                                <form class="input-group mb-3 d-none" id="modular-KubrowPets-Kubrow">
                                     <input class="form-control" id="acquire-type-KubrowPets-KUBROW_ANTIGEN" list="datalist-ModularParts-KUBROW_ANTIGEN" />
                                     <input class="form-control" id="acquire-type-KubrowPets-KUBROW_MUTAGEN" list="datalist-ModularParts-KUBROW_MUTAGEN" />
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="KubrowPets-list"></tbody>
                                     </table>
                                 </div>
                             </div>
                         </div>
+                    </div>
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_sentinelWeapons"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('SentinelWeapons');return false;">
                                     <input class="form-control" id="acquire-type-SentinelWeapons" list="datalist-SentinelWeapons" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="SentinelWeapons-list"></tbody>
                                     </table>
@@ -391,30 +414,33 @@
                             </div>
                         </div>
                     </div>
+                </div>
                 <div class="row g-3 mb-3">
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_operatorAmps"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="handleModularSelection('OperatorAmps');return false;">
                                     <input class="form-control" id="acquire-type-OperatorAmps" list="datalist-OperatorAmps" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
-                                <form class="input-group mb-3" id="modular-OperatorAmps" style="display: none;">
+                                <form class="input-group mb-3 d-none" id="modular-OperatorAmps">
                                     <input class="form-control" id="acquire-type-OperatorAmps-AMP_OCULUS" list="datalist-ModularParts-AMP_OCULUS" />
                                     <input class="form-control" id="acquire-type-OperatorAmps-AMP_CORE" list="datalist-ModularParts-AMP_CORE" />
                                     <input class="form-control" id="acquire-type-OperatorAmps-AMP_BRACE" list="datalist-ModularParts-AMP_BRACE" />
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="OperatorAmps-list"></tbody>
                                     </table>
                                 </div>
                             </div>
                         </div>
+                    </div>
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_hoverboards"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="doAcquireModularEquipment('Hoverboards');return false;">
                                     <input class="form-control" id="acquire-type-Hoverboards-HB_DECK" list="datalist-ModularParts-HB_DECK" />
                                     <input class="form-control" id="acquire-type-Hoverboards-HB_ENGINE" list="datalist-ModularParts-HB_ENGINE" />
@@ -422,6 +448,7 @@
                                     <input class="form-control" id="acquire-type-Hoverboards-HB_JET" list="datalist-ModularParts-HB_JET" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="Hoverboards-list"></tbody>
                                     </table>
@@ -429,29 +456,33 @@
                             </div>
                         </div>
                     </div>
+                </div>
                 <div class="row g-3 mb-3">
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_evolutionProgress"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="doAcquireEvolution();return false;">
                                     <input class="form-control" id="acquire-type-EvolutionProgress" list="datalist-EvolutionProgress" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="EvolutionProgress-list"></tbody>
                                     </table>
                                 </div>
                             </div>
                         </div>
+                    </div>
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_Boosters"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <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>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="Boosters-list"></tbody>
                                     </table>
@@ -459,6 +490,42 @@
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="row g-3 mb-3">
+                    <div class="col-lg-6">
+                        <div class="card" style="height: 400px;">
+                            <h5 class="card-header" data-loc="inventory_flavourItems"></h5>
+                            <div class="card-body d-flex flex-column">
+                                <form class="input-group mb-3" onsubmit="doAcquireEquipment('FlavourItems');return false;">
+                                    <input class="form-control" id="acquire-type-FlavourItems" list="datalist-FlavourItems" />
+                                    <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
+                                </form>
+                                <div class="overflow-auto">
+                                    <table class="table table-hover w-100">
+                                        <tbody id="FlavourItems-list"></tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-lg-6">
+                        <div class="card" style="height: 400px;">
+                            <h5 class="card-header" data-loc="inventory_shipDecorations"></h5>
+                            <div class="card-body d-flex flex-column">
+                                <form class="input-group mb-3" onsubmit="doAcquireCountItems('ShipDecorations');return false;">
+                                    <input class="form-control" id="ShipDecorations-count" type="number" value="1" />
+                                    <input class="form-control w-50" id="acquire-type-ShipDecorations" list="datalist-ShipDecorations" />
+                                    <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
+                                </form>
+                                <div class="overflow-auto">
+                                    <table class="table table-hover w-100">
+                                        <tbody id="ShipDecorations-list"></tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="card">
                     <h5 class="card-header" data-loc="general_bulkActions"></h5>
                     <div class="card-body">
@@ -469,6 +536,8 @@
                             <button class="btn btn-primary" onclick="debounce(addMissingEquipment, ['SpaceGuns', 'SpaceMelee']);" data-loc="inventory_bulkAddSpaceWeapons"></button>
                             <button class="btn btn-primary" onclick="debounce(addMissingEquipment, ['Sentinels']);" data-loc="inventory_bulkAddSentinels"></button>
                             <button class="btn btn-primary" onclick="debounce(addMissingEquipment, ['SentinelWeapons']);" data-loc="inventory_bulkAddSentinelWeapons"></button>
+                            <button class="btn btn-primary" onclick="debounce(addMissingEquipment, ['FlavourItems']);" data-loc="inventory_bulkAddFlavourItems"></button>
+                            <button class="btn btn-primary" onclick="debounce(addMissingEquipment, ['ShipDecorations']);" data-loc="inventory_bulkAddShipDecorations"></button>
                             <button class="btn btn-primary" onclick="debounce(addMissingEvolutionProgress);" data-loc="inventory_bulkAddEvolutionProgress"></button>
                         </div>
                         <div class="mb-2 d-flex flex-wrap gap-2">
@@ -519,25 +588,28 @@
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="guildView_techProjects"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form id="techProjects-form" class="input-group mb-3 d-none" onsubmit="addGuildTechProject();return false;">
                                     <input class="form-control" id="acquire-type-TechProjects" list="datalist-TechProjects" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="TechProjects-list"></tbody>
                                     </table>
                                 </div>
                             </div>
                         </div>
+                    </div>
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
                             <h5 class="card-header" data-loc="guildView_vaultDecoRecipes"></h5>
-                            <div class="card-body overflow-auto">
+                            <div class="card-body d-flex flex-column">
                                 <form id="vaultDecoRecipes-form" class="input-group mb-3 d-none" onsubmit="addVaultDecoRecipe();return false;">
                                     <input class="form-control" id="acquire-type-VaultDecoRecipes" list="datalist-VaultDecoRecipes" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="VaultDecoRecipes-list"></tbody>
                                     </table>
@@ -545,6 +617,7 @@
                             </div>
                         </div>
                     </div>
+                </div>
                 <div class="row g-3 mb-3">
                     <div class="col-lg-6">
                         <div class="card" style="height: 400px;">
@@ -774,19 +847,21 @@
                 <p class="mb-3 inventory-update-note"></p>
                 <div class="row g-3">
                     <div class="col-md-6">
-                        <div class="card">
+                        <div class="card" style="height: 800px;">
                             <h5 class="card-header" data-loc="quests_list"></h5>
-                            <div class="card-body">
+                            <div class="card-body d-flex flex-column">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('QuestKeys');return false;">
                                     <input class="form-control" id="acquire-type-QuestKeys" list="datalist-QuestKeys" />
                                     <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                                 </form>
+                                <div class="overflow-auto">
                                     <table class="table table-hover w-100">
                                         <tbody id="QuestKeys-list"></tbody>
                                     </table>
                                 </div>
                             </div>
                         </div>
+                    </div>
                     <div class="col-md-6">
                         <div class="card">
                             <h5 class="card-header" data-loc="general_bulkActions"></h5>
@@ -979,14 +1054,6 @@
                                         <input class="form-check-input" type="checkbox" id="skipTutorial" />
                                         <label class="form-check-label" for="skipTutorial" data-loc="cheats_skipTutorial"></label>
                                     </div>
-                                    <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" id="unlockAllShipDecorations" />
-                                        <label class="form-check-label" for="unlockAllShipDecorations" data-loc="cheats_unlockAllShipDecorations"></label>
-                                    </div>
-                                    <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" id="unlockAllFlavourItems" />
-                                        <label class="form-check-label" for="unlockAllFlavourItems" data-loc="cheats_unlockAllFlavourItems"></label>
-                                    </div>
                                     <div class="form-check">
                                         <input class="form-check-input" type="checkbox" id="unlockAllSkins" />
                                         <label class="form-check-label" for="unlockAllSkins" data-loc="cheats_unlockAllSkins"></label>
@@ -1387,6 +1454,8 @@
     <datalist id="datalist-Abilities"></datalist>
     <datalist id="datalist-TechProjects"></datalist>
     <datalist id="datalist-VaultDecoRecipes"></datalist>
+    <datalist id="datalist-FlavourItems"></datalist>
+    <datalist id="datalist-ShipDecorations"></datalist>
     <datalist id="datalist-circuitGameModes">
         <option>Survival</option>
         <option>VoidFlood</option>

static/webui/script.js

@@ -311,7 +311,6 @@ const permanentEvolutionWeapons = new Set([
     "/Lotus/Weapons/Tenno/Zariman/Melee/HeavyScythe/ZarimanHeavyScythe/ZarimanHeavyScytheWeapon"
 ]);
 
-let uniqueLevelCaps = {};
 function fetchItemList() {
     window.itemListPromise = new Promise(resolve => {
         const req = $.get("/custom/getItemLists?lang=" + window.lang);
@@ -505,6 +504,9 @@ function fetchItemList() {
                         i => i.uniqueName === "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadC"
                     ).name
                 },
+                "/Lotus/Powersuits/Stalker/Stalker": {
+                    name: loc("code_stalker")
+                },
                 "/Lotus/Language/Game/Rank_Creator": {
                     name: loc("guildView_rank_creator")
                 },
@@ -555,8 +557,6 @@ function fetchItemList() {
                         option.textContent = item.name;
                         document.getElementById("worldState.varziaOverride").appendChild(option);
                     });
-                } else if (type == "uniqueLevelCaps") {
-                    uniqueLevelCaps = items;
                 } else if (type == "Syndicates") {
                     items.forEach(item => {
                         if (item.uniqueName === "ConclaveSyndicate") {
@@ -570,6 +570,35 @@ function fetchItemList() {
                         option.textContent = item.name;
                         document.getElementById("changeSyndicate").appendChild(option);
                     });
+                } else if (type == "FlavourItems") {
+                    const cursorPrefixes = {
+                        Controller: loc("code_controller"),
+                        MouseGrey: loc("code_mouse"),
+                        MouseLine: loc("code_mouseLine"),
+                        Mouse: loc("code_mouse")
+                    };
+                    items.forEach(item => {
+                        if (item.uniqueName.startsWith("/Lotus/Interface/Graphics/CustomUI/Cursors/")) {
+                            let base = item.uniqueName.replace("/Lotus/Interface/Graphics/CustomUI/Cursors/", "");
+                            for (const key in cursorPrefixes) {
+                                if (base.startsWith(key)) {
+                                    const prefix = cursorPrefixes[key];
+                                    const suffix = base.slice(key.length);
+                                    item.name = prefix + " " + suffix;
+                                    break;
+                                }
+                            }
+                        } else if (item.uniqueName.includes("ColourPicker")) {
+                            item.name = loc("code_itemColorPalette").split("|ITEM|").join(item.name);
+                        }
+                        if (!item.alwaysAvailable) {
+                            const option = document.createElement("option");
+                            option.setAttribute("data-key", item.uniqueName);
+                            option.value = item.name;
+                            document.getElementById("datalist-" + type).appendChild(option);
+                        }
+                        itemMap[item.uniqueName] = { ...item, type };
+                    });
                 } else {
                     const nameToItems = {};
                     items.forEach(item => {
@@ -759,7 +788,7 @@ function updateInventory() {
                             const td = document.createElement("td");
                             td.classList = "text-end text-nowrap";
 
-                            let maxXP = Math.pow(uniqueLevelCaps[item.ItemType] ?? 30, 2) * 1000;
+                            let maxXP = Math.pow(itemMap[item.ItemType].maxLevelCap ?? 30, 2) * 1000;
                             if (
                                 category != "Suits" &&
                                 category != "SpaceSuits" &&
@@ -785,6 +814,24 @@ function updateInventory() {
                                     }
                                 }
                             }
+                            if (
+                                itemMap[item.ItemType].maxLevelCap > 30 &&
+                                (item.Polarized ?? 0) < (itemMap[item.ItemType].maxLevelCap - 30) / 2
+                            ) {
+                                const a = document.createElement("a");
+                                a.href = "#";
+                                a.onclick = function (event) {
+                                    event.preventDefault();
+                                    unlockLevelCap(
+                                        category,
+                                        item.ItemId.$oid,
+                                        (itemMap[item.ItemType].maxLevelCap - 30) / 2
+                                    );
+                                };
+                                a.title = loc("code_unlockLevelCap");
+                                a.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--!Font Awesome Free v7.0.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M48 195.8l209.2 86.1c9.8 4 20.2 6.1 30.8 6.1s21-2.1 30.8-6.1l242.4-99.8c9-3.7 14.8-12.4 14.8-22.1s-5.8-18.4-14.8-22.1L318.8 38.1C309 34.1 298.6 32 288 32s-21 2.1-30.8 6.1L14.8 137.9C5.8 141.6 0 150.3 0 160L0 456c0 13.3 10.7 24 24 24s24-10.7 24-24l0-260.2zm48 71.7L96 384c0 53 86 96 192 96s192-43 192-96l0-116.6-142.9 58.9c-15.6 6.4-32.2 9.7-49.1 9.7s-33.5-3.3-49.1-9.7L96 267.4z"/></svg>`;
+                                td.appendChild(a);
+                            }
                             if (item.XP < maxXP || anyExaltedMissingXP) {
                                 const a = document.createElement("a");
                                 a.href = "#";
@@ -960,6 +1007,46 @@ function updateInventory() {
                 document.getElementById("EvolutionProgress-list").appendChild(tr);
             });
 
+            document.getElementById("FlavourItems-list").innerHTML = "";
+            data.FlavourItems.forEach(item => {
+                const datalist = document.getElementById("datalist-FlavourItems");
+                if (!data.FlavourItems.some(x => x.ItemType == item.ItemType)) {
+                    if (!datalist.querySelector(`option[data-key="${item.ItemType}"]`)) {
+                        reAddToItemList(itemMap, "FlavourItems", item.ItemType);
+                    }
+                }
+                const optionToRemove = datalist.querySelector(`option[data-key="${item.ItemType}"]`);
+                optionToRemove?.remove();
+
+                const tr = document.createElement("tr");
+                tr.setAttribute("data-item-type", item.ItemType);
+                {
+                    const td = document.createElement("td");
+                    td.textContent = itemMap[item.ItemType]?.name ?? item.ItemType;
+                    tr.appendChild(td);
+                }
+                {
+                    const td = document.createElement("td");
+                    td.classList = "text-end text-nowrap";
+
+                    {
+                        const a = document.createElement("a");
+                        a.href = "#";
+                        a.onclick = function (event) {
+                            event.preventDefault();
+                            reAddToItemList(itemMap, "FlavourItems", item.ItemType);
+                            removeCustomization(item.ItemType);
+                        };
+                        a.title = loc("code_remove");
+                        a.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>`;
+                        td.appendChild(a);
+                    }
+                    tr.appendChild(td);
+                }
+
+                document.getElementById("FlavourItems-list").appendChild(tr);
+            });
+
             const datalistEvolutionProgress = document.querySelectorAll("#datalist-EvolutionProgress option");
             const formEvolutionProgress = document.querySelector('form[onsubmit*="doAcquireEvolution()"]');
 
@@ -976,6 +1063,40 @@ function updateInventory() {
                 };
             }
 
+            document.getElementById("ShipDecorations-list").innerHTML = "";
+            data.ShipDecorations.forEach(item => {
+                if (item.ItemCount > 0) {
+                    const tr = document.createElement("tr");
+                    tr.setAttribute("data-item-type", item.ItemType);
+                    {
+                        const td = document.createElement("td");
+                        td.textContent = itemMap[item.ItemType]?.name ?? item.ItemType;
+                        if (item.ItemCount > 1) {
+                            td.innerHTML +=
+                                " <span title='" + loc("code_count") + "'>🗍 " + parseInt(item.ItemCount) + "</span>";
+                        }
+                        tr.appendChild(td);
+                    }
+                    {
+                        const td = document.createElement("td");
+                        td.classList = "text-end text-nowrap";
+                        {
+                            const a = document.createElement("a");
+                            a.href = "#";
+                            a.onclick = function (event) {
+                                event.preventDefault();
+                                removeCountItems(item.ItemType, item.ItemCount);
+                            };
+                            a.title = loc("code_remove");
+                            a.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>`;
+                            td.appendChild(a);
+                        }
+                        tr.appendChild(td);
+                    }
+                    document.getElementById("ShipDecorations-list").appendChild(tr);
+                }
+            });
+
             // Populate quests route
             document.getElementById("QuestKeys-list").innerHTML = "";
             window.allQuestKeys.forEach(questKey => {
@@ -989,7 +1110,8 @@ function updateInventory() {
             data.QuestKeys.forEach(item => {
                 const tr = document.createElement("tr");
                 tr.setAttribute("data-item-type", item.ItemType);
-                const stage = item.Progress?.length ?? 0;
+                const run = item.Progress[0]?.c ?? 0;
+                const stage = run == 0 ? item.Progress.length : item.Progress.map(p => p.c ?? 0).lastIndexOf(run);
 
                 const datalist = document.getElementById("datalist-QuestKeys");
                 const optionToRemove = datalist.querySelector(`option[data-key="${item.ItemType}"]`);
@@ -1007,6 +1129,10 @@ function updateInventory() {
                         td.textContent += " | " + loc("code_completed");
                     }
 
+                    if (run > 0) {
+                        td.textContent += " | " + loc("code_replays") + ": " + (run + 1);
+                    }
+
                     if (data.ActiveQuest == item.ItemType) td.textContent += " | " + loc("code_active");
                     tr.appendChild(td);
                 }
@@ -1232,7 +1358,8 @@ function updateInventory() {
                         td.textContent = itemMap[item.ItemType]?.name ?? item.ItemType;
                         td.innerHTML += " <span title='" + loc("code_rank") + "'>★ 0/" + maxRank + "</span>";
                         if (item.ItemCount > 1) {
-                            td.innerHTML += " <span title='Count'>🗍 " + parseInt(item.ItemCount) + "</span>";
+                            td.innerHTML +=
+                                " <span title='" + loc("code_count") + "'>🗍 " + parseInt(item.ItemCount) + "</span>";
                         }
                         tr.appendChild(td);
                     }
@@ -1966,6 +2093,15 @@ function doAcquireEquipment(category) {
     });
 }
 
+function removeCustomization(uniqueName) {
+    revalidateAuthz().then(() => {
+        const req = $.get("/custom/removeCustomization?" + window.authz + "&itemType=" + uniqueName);
+        req.done(() => {
+            updateInventory();
+        });
+    });
+}
+
 function getRequiredParts(category, WeaponType) {
     switch (category) {
         case "Hoverboards":
@@ -2084,18 +2220,13 @@ function doAcquireModularEquipment(category, WeaponType) {
                 if (mainInput) {
                     mainInput.value = "";
                     if (category === "MoaPets") {
-                        const modularFieldsMoa = document.getElementById("modular-MoaPets-Moa");
+                        document.getElementById("modular-MoaPets-Zanuka").classList.add("d-none");
-                        const modularFieldsZanuka = document.getElementById("modular-MoaPets-Zanuka");
+                        document.getElementById("modular-MoaPets-Moa").classList.add("d-none");
-                        modularFieldsZanuka.style.display = "none";
-                        modularFieldsMoa.style.display = "none";
                     } else if (category === "KubrowPets") {
-                        const modularFieldsCatbrow = document.getElementById("modular-KubrowPets-Catbrow");
+                        document.getElementById("modular-KubrowPets-Catbrow").classList.add("d-none");
-                        const modularFieldsKubrow = document.getElementById("modular-KubrowPets-Kubrow");
+                        document.getElementById("modular-KubrowPets-Kubrow").classList.add("d-none");
-                        modularFieldsCatbrow.style.display = "none";
-                        modularFieldsKubrow.style.display = "none";
                     } else {
-                        const modularFields = document.getElementById("modular-" + category);
+                        document.getElementById("modular-" + category).classList.add("d-none");
-                        modularFields.style.display = "none";
                     }
                 }
                 requiredParts.forEach(part => {
@@ -2147,7 +2278,9 @@ function addMissingEquipment(categories) {
                 )
             ) {
                 if (!webUiModularWeapons.includes(elm.getAttribute("data-key"))) {
-                    requests.push({ ItemType: elm.getAttribute("data-key"), ItemCount: 1 });
+                    let ItemCount = 1;
+                    if (category == "ShipDecorations") ItemCount = 999999;
+                    requests.push({ ItemType: elm.getAttribute("data-key"), ItemCount });
                 }
             }
         });
@@ -2636,6 +2769,22 @@ function gildEquipment(category, oid) {
     });
 }
 
+function unlockLevelCap(category, oid, formas) {
+    revalidateAuthz().then(() => {
+        $.post({
+            url: "/custom/unlockLevelCap?" + window.authz,
+            contentType: "application/json",
+            data: JSON.stringify({
+                Category: category,
+                ItemId: oid,
+                Polarized: formas
+            })
+        }).done(function () {
+            updateInventory();
+        });
+    });
+}
+
 function maturePet(oid, revert) {
     revalidateAuthz().then(() => {
         $.post({
@@ -2667,13 +2816,13 @@ function setEvolutionProgress(requests) {
     });
 }
 
-function doAcquireMiscItems() {
+function doAcquireCountItems(category) {
-    const uniqueName = getKey(document.getElementById("miscitem-type"));
+    const uniqueName = getKey(document.getElementById("acquire-type-" + category));
     if (!uniqueName) {
-        $("#miscitem-type").addClass("is-invalid").focus();
+        $(`#acquire-type-${category}`).addClass("is-invalid").focus();
         return;
     }
-    const count = parseInt($("#miscitem-count").val());
+    const count = parseInt($(`#${category}-count`).val());
     if (count != 0) {
         revalidateAuthz().then(() => {
             $.post({
@@ -2691,11 +2840,30 @@ function doAcquireMiscItems() {
                 } else {
                     toast(loc("code_succRemoved"));
                 }
+                if (category != "miscitems") updateInventory();
             });
         });
     }
 }
 
+function removeCountItems(uniqueName, count) {
+    revalidateAuthz().then(() => {
+        $.post({
+            url: "/custom/addItems?" + window.authz,
+            contentType: "application/json",
+            data: JSON.stringify([
+                {
+                    ItemType: uniqueName,
+                    ItemCount: count * -1
+                }
+            ])
+        }).done(function () {
+            toast(loc("code_succRemoved"));
+            updateInventory();
+        });
+    });
+}
+
 function addItemByItemType() {
     const ItemType = document.getElementById("typeName-type").value;
     // Must start with "/Lotus/", contain only A–Z letters, no "//", and not end with "/"
@@ -3268,11 +3436,14 @@ function doAddCurrency(currency) {
 }
 
 function reAddToItemList(itemMap, datalist, itemType) {
+    const item = itemMap[itemType];
+    if (!item?.alwaysAvailable) {
         const option = document.createElement("option");
         option.setAttribute("data-key", itemType);
-    option.value = itemMap[itemType]?.name ?? itemType;
+        option.value = item?.name ?? itemType;
         document.getElementById("datalist-" + datalist).appendChild(option);
     }
+}
 
 function doQuestUpdate(operation, itemType) {
     revalidateAuthz().then(() => {
@@ -3336,35 +3507,35 @@ function handleModularSelection(category) {
             if (webUiModularWeapons.includes(key)) {
                 if (inventoryCategory === "MoaPets") {
                     if (key === "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetPowerSuit") {
-                        modularFieldsMoa.style.display = "none";
+                        modularFieldsMoa.classList.add("d-none");
-                        modularFieldsZanuka.style.display = "";
+                        modularFieldsZanuka.classList.remove("d-none");
                     } else if (key === "/Lotus/Types/Friendly/Pets/MoaPets/MoaPetPowerSuit") {
-                        modularFieldsMoa.style.display = "";
+                        modularFieldsMoa.classList.remove("d-none");
-                        modularFieldsZanuka.style.display = "none";
+                        modularFieldsZanuka.classList.add("d-none");
                     }
                 } else if (inventoryCategory === "KubrowPets") {
                     if (key.endsWith("InfestedCatbrowPetPowerSuit")) {
-                        modularFieldsCatbrow.style.display = "";
+                        modularFieldsCatbrow.classList.remove("d-none");
-                        modularFieldsKubrow.style.display = "none";
+                        modularFieldsKubrow.classList.add("d-none");
                     } else if (key.endsWith("PredatorKubrowPetPowerSuit")) {
-                        modularFieldsCatbrow.style.display = "none";
+                        modularFieldsCatbrow.classList.add("d-none");
-                        modularFieldsKubrow.style.display = "";
+                        modularFieldsKubrow.classList.remove("d-none");
                     } else {
-                        modularFieldsCatbrow.style.display = "none";
+                        modularFieldsCatbrow.classList.add("d-none");
-                        modularFieldsKubrow.style.display = "none";
+                        modularFieldsKubrow.classList.add("d-none");
                     }
                 } else {
-                    modularFields.style.display = "";
+                    modularFields.classList.remove("d-none");
                 }
             } else {
                 if (inventoryCategory === "MoaPets") {
-                    modularFieldsZanuka.style.display = "none";
+                    modularFieldsMoa.classList.add("d-none");
-                    modularFieldsMoa.style.display = "none";
+                    modularFieldsZanuka.classList.add("d-none");
                 } else if (inventoryCategory === "KubrowPets") {
-                    modularFieldsCatbrow.style.display = "none";
+                    modularFieldsCatbrow.classList.add("d-none");
-                    modularFieldsKubrow.style.display = "none";
+                    modularFieldsKubrow.classList.add("d-none");
                 } else {
-                    modularFields.style.display = "none";
+                    modularFields.classList.add("d-none");
                 }
             }
         });

static/webui/translations/de.js

@@ -45,6 +45,7 @@ dict = {
     code_rank: `Rang`,
     code_rankUp: `Rang erhöhen`,
     code_rankDown: `Rang verringern`,
+    code_unlockLevelCap: `[UNTRANSLATED] Unlock level cap`,
     code_count: `Anzahl`,
     code_focusAllUnlocked: `Alle Fokus-Schulen sind bereits freigeschaltet.`,
     code_focusUnlocked: `|COUNT| neue Fokus-Schulen freigeschaltet! Ein Inventar-Update wird benötigt, damit die Änderungen im Spiel sichtbar werden. Die Sternenkarte zu besuchen, sollte der einfachste Weg sein, dies auszulösen.`,
@@ -64,10 +65,16 @@ dict = {
     code_completed: `Abgeschlossen`,
     code_active: `Aktiv`,
     code_pigment: `Pigment`,
+    code_controller: `[UNTRANSLATED] Controller cursor`,
+    code_mouseLine: `[UNTRANSLATED] Line cursor`,
+    code_mouse: `[UNTRANSLATED] Cursor`,
+    code_itemColorPalette: `|ITEM| Farbpalette`,
     code_mature: `Für den Kampf auswachsen lassen`,
     code_unmature: `Genetisches Altern zurücksetzen`,
     code_fund: `[UNTRANSLATED] Fund`,
     code_funded: `[UNTRANSLATED] Funded`,
+    code_replays: `[UNTRANSLATED] Replays`,
+    code_stalker: `Stalker`,
     code_succChange: `Erfolgreich geändert.`,
     code_requiredInvigorationUpgrade: `Du musst sowohl ein offensives & defensives Upgrade auswählen.`,
     login_description: `Melde dich mit deinem OpenWF-Account an (denselben Angaben wie im Spiel, wenn du dich mit diesem Server verbindest).`,
@@ -103,12 +110,16 @@ dict = {
     inventory_kubrowPets: `Bestien`,
     inventory_evolutionProgress: `Incarnon-Entwicklungsfortschritte`,
     inventory_Boosters: `Booster`,
+    inventory_flavourItems: `<abbr title="Animationssets, Glyphen, Farbpaletten usw.">Sammlerstücke</abbr>`,
+    inventory_shipDecorations: `Schiffsdekorationen`,
     inventory_bulkAddSuits: `Fehlende Warframes hinzufügen`,
     inventory_bulkAddWeapons: `Fehlende Waffen hinzufügen`,
     inventory_bulkAddSpaceSuits: `Fehlende Archwings hinzufügen`,
     inventory_bulkAddSpaceWeapons: `Fehlende Archwing-Waffen hinzufügen`,
     inventory_bulkAddSentinels: `Fehlende Wächter hinzufügen`,
     inventory_bulkAddSentinelWeapons: `Fehlende Wächter-Waffen hinzufügen`,
+    inventory_bulkAddFlavourItems: `[UNTRANSLATED] Add Missing Flavour Items`,
+    inventory_bulkAddShipDecorations: `[UNTRANSLATED] Add Missing Ship Decorations`,
     inventory_bulkAddEvolutionProgress: `Fehlende Incarnon-Entwicklungsfortschritte hinzufügen`,
     inventory_bulkRankUpSuits: `Alle Warframes auf Max. Rang`,
     inventory_bulkRankUpWeapons: `Alle Waffen auf Max. Rang`,
@@ -198,8 +209,6 @@ dict = {
     cheats_dontSubtractVoidTraces: `Void-Spuren nicht verbrauchen`,
     cheats_dontSubtractConsumables: `Verbrauchsgegenstände (Ausrüstung) nicht verbrauchen`,
     cheats_unlockAllShipFeatures: `Alle Schiffs-Funktionen freischalten`,
-    cheats_unlockAllShipDecorations: `Alle Schiffsdekorationen freischalten`,
-    cheats_unlockAllFlavourItems: `Alle <abbr title="Animationssets, Glyphen, Farbpaletten usw.">Sammlerstücke</abbr> freischalten`,
     cheats_unlockAllSkins: `Alle Skins freischalten`,
     cheats_unlockAllCapturaScenes: `Alle Photora-Szenen freischalten`,
     cheats_universalPolarityEverywhere: `Universelle Polarität überall`,

static/webui/translations/en.js

@@ -44,6 +44,7 @@ dict = {
     code_rank: `Rank`,
     code_rankUp: `Rank up`,
     code_rankDown: `Rank down`,
+    code_unlockLevelCap: `Unlock level cap`,
     code_count: `Count`,
     code_focusAllUnlocked: `All focus schools are already unlocked.`,
     code_focusUnlocked: `Unlocked |COUNT| new focus schools! An inventory update will be needed for the changes to be reflected in-game. Visiting the navigation should be the easiest way to trigger that.`,
@@ -63,10 +64,16 @@ dict = {
     code_completed: `Completed`,
     code_active: `Active`,
     code_pigment: `Pigment`,
+    code_controller: `Controller cursor`,
+    code_mouseLine: `Line cursor`,
+    code_mouse: `Cursor`,
+    code_itemColorPalette: `|ITEM| Color Palette`,
     code_mature: `Mature for combat`,
     code_unmature: `Regress genetic aging`,
     code_fund: `Fund`,
     code_funded: `Funded`,
+    code_replays: `Replays`,
+    code_stalker: `Stalker`,
     code_succChange: `Successfully changed.`,
     code_requiredInvigorationUpgrade: `You must select both an offensive & defensive upgrade.`,
     login_description: `Login using your OpenWF account credentials (same as in-game when connecting to this server).`,
@@ -102,12 +109,16 @@ dict = {
     inventory_kubrowPets: `Beasts`,
     inventory_evolutionProgress: `Incarnon Evolution Progress`,
     inventory_Boosters: `Boosters`,
+    inventory_flavourItems: `<abbr title="Animation Sets, Glyphs, Palettes, etc.">Flavour Items</abbr>`,
+    inventory_shipDecorations: `Ship Decorations`,
     inventory_bulkAddSuits: `Add Missing Warframes`,
     inventory_bulkAddWeapons: `Add Missing Weapons`,
     inventory_bulkAddSpaceSuits: `Add Missing Archwings`,
     inventory_bulkAddSpaceWeapons: `Add Missing Archwing Weapons`,
     inventory_bulkAddSentinels: `Add Missing Sentinels`,
     inventory_bulkAddSentinelWeapons: `Add Missing Sentinel Weapons`,
+    inventory_bulkAddFlavourItems: `Add Missing Flavour Items`,
+    inventory_bulkAddShipDecorations: `Add Missing Ship Decorations`,
     inventory_bulkAddEvolutionProgress: `Add Missing Incarnon Evolution Progress`,
     inventory_bulkRankUpSuits: `Max Rank All Warframes`,
     inventory_bulkRankUpWeapons: `Max Rank All Weapons`,
@@ -197,8 +208,6 @@ dict = {
     cheats_dontSubtractVoidTraces: `Don't Subtract Void Traces`,
     cheats_dontSubtractConsumables: `Don't Subtract Consumables`,
     cheats_unlockAllShipFeatures: `Unlock All Ship Features`,
-    cheats_unlockAllShipDecorations: `Unlock All Ship Decorations`,
-    cheats_unlockAllFlavourItems: `Unlock All <abbr title="Animation Sets, Glyphs, Palettes, etc.">Flavor Items</abbr>`,
     cheats_unlockAllSkins: `Unlock All Skins`,
     cheats_unlockAllCapturaScenes: `Unlock All Captura Scenes`,
     cheats_universalPolarityEverywhere: `Universal Polarity Everywhere`,

static/webui/translations/es.js

@@ -45,6 +45,7 @@ dict = {
     code_rank: `Rango`,
     code_rankUp: `Subir de rango`,
     code_rankDown: `Bajar de rango`,
+    code_unlockLevelCap: `[UNTRANSLATED] Unlock level cap`,
     code_count: `Cantidad`,
     code_focusAllUnlocked: `Todas las escuelas de enfoque ya están desbloqueadas.`,
     code_focusUnlocked: `¡Desbloqueadas |COUNT| nuevas escuelas de enfoque! Se necesita una actualización del inventario para reflejar los cambios en el juego. Visitar la navegación debería ser la forma más sencilla de activarlo.`,
@@ -64,10 +65,16 @@ dict = {
     code_completed: `Completada`,
     code_active: `Activa`,
     code_pigment: `Pigmento`,
+    code_controller: `[UNTRANSLATED] Controller cursor`,
+    code_mouseLine: `[UNTRANSLATED] Line cursor`,
+    code_mouse: `[UNTRANSLATED] Cursor`,
+    code_itemColorPalette: `Paleta de colores |ITEM|`,
     code_mature: `Listo para el combate`,
     code_unmature: `Regresar el envejecimiento genético`,
     code_fund: `[UNTRANSLATED] Fund`,
     code_funded: `[UNTRANSLATED] Funded`,
+    code_replays: `[UNTRANSLATED] Replays`,
+    code_stalker: `Stalker`,
     code_succChange: `Cambiado correctamente`,
     code_requiredInvigorationUpgrade: `Debes seleccionar una mejora ofensiva y una defensiva.`,
     login_description: `Inicia sesión con las credenciales de tu cuenta OpenWF (las mismas que usas en el juego al conectarte a este servidor).`,
@@ -103,12 +110,16 @@ dict = {
     inventory_kubrowPets: `Bestias`,
     inventory_evolutionProgress: `Progreso de evolución Incarnon`,
     inventory_Boosters: `Potenciadores`,
+    inventory_flavourItems: `<abbr title="Conjuntos de animaciones, glifos, paletas, etc.">Ítems estéticos</abbr>`,
+    inventory_shipDecorations: `Decoraciones de nave`,
     inventory_bulkAddSuits: `Agregar Warframes faltantes`,
     inventory_bulkAddWeapons: `Agregar armas faltantes`,
     inventory_bulkAddSpaceSuits: `Agregar Archwings faltantes`,
     inventory_bulkAddSpaceWeapons: `Agregar armas Archwing faltantes`,
     inventory_bulkAddSentinels: `Agregar centinelas faltantes`,
     inventory_bulkAddSentinelWeapons: `Agregar armas de centinela faltantes`,
+    inventory_bulkAddFlavourItems: `[UNTRANSLATED] Add Missing Flavour Items`,
+    inventory_bulkAddShipDecorations: `[UNTRANSLATED] Add Missing Ship Decorations`,
     inventory_bulkAddEvolutionProgress: `Completar el progreso de evolución Incarnon faltante`,
     inventory_bulkRankUpSuits: `Maximizar rango de todos los Warframes`,
     inventory_bulkRankUpWeapons: `Maximizar rango de todas las armas`,
@@ -198,8 +209,6 @@ dict = {
     cheats_dontSubtractVoidTraces: `No descontar vestigios del Vacío`,
     cheats_dontSubtractConsumables: `No restar consumibles`,
     cheats_unlockAllShipFeatures: `Desbloquear todas las funciones de nave`,
-    cheats_unlockAllShipDecorations: `Desbloquear todas las decoraciones de nave`,
-    cheats_unlockAllFlavourItems: `Desbloquear todos los <abbr title="Conjuntos de animaciones, glifos, paletas, etc.">ítems estéticos</abbr>`,
     cheats_unlockAllSkins: `Desbloquear todas las skins`,
     cheats_unlockAllCapturaScenes: `Desbloquear todas las escenas de Captura`,
     cheats_universalPolarityEverywhere: `Polaridad universal en todas partes`,

static/webui/translations/fr.js

@@ -45,6 +45,7 @@ dict = {
     code_rank: `Rang`,
     code_rankUp: `Monter de rang`,
     code_rankDown: `Baisser de rang`,
+    code_unlockLevelCap: `[UNTRANSLATED] Unlock level cap`,
     code_count: `Quantité`,
     code_focusAllUnlocked: `Les écoles de Focus sont déjà déverrouillées.`,
     code_focusUnlocked: `|COUNT| écoles de Focus déverrouillées ! Synchronisation de l'inventaire nécessaire.`,
@@ -64,10 +65,16 @@ dict = {
     code_completed: `Complétée`,
     code_active: `Active`,
     code_pigment: `Pigment`,
+    code_controller: `[UNTRANSLATED] Controller cursor`,
+    code_mouseLine: `[UNTRANSLATED] Line cursor`,
+    code_mouse: `[UNTRANSLATED] Cursor`,
+    code_itemColorPalette: `Palette de couleurs |ITEM|`,
     code_mature: `Maturer pour le combat`,
     code_unmature: `Régrésser l'âge génétique`,
     code_fund: `Financer`,
     code_funded: `Complété`,
+    code_replays: `[UNTRANSLATED] Replays`,
+    code_stalker: `Stalker`,
     code_succChange: `Changement effectué.`,
     code_requiredInvigorationUpgrade: `Augmentation offensive et défensive requises.`,
     login_description: `Connexion avec les informations de connexion OpenWF.`,
@@ -103,12 +110,16 @@ dict = {
     inventory_kubrowPets: `Bêtes`,
     inventory_evolutionProgress: `Progrès de l'évolution Incarnon`,
     inventory_Boosters: `Boosters`,
+    inventory_flavourItems: `[UNTRANSLATED] <abbr title="Animation Sets, Glyphs, Palettes, etc.">Flavour Items</abbr>`,
+    inventory_shipDecorations: `Décorations du vaisseau`,
     inventory_bulkAddSuits: `Ajouter les Warframes manquantes`,
     inventory_bulkAddWeapons: `Ajouter les armes manquantes`,
     inventory_bulkAddSpaceSuits: `Ajouter les Archwings manquants`,
     inventory_bulkAddSpaceWeapons: `Ajouter les armes d'Archwing manquantes`,
     inventory_bulkAddSentinels: `Ajouter les Sentinelles manquantes`,
     inventory_bulkAddSentinelWeapons: `Ajouter les armes de Sentinelles manquantes`,
+    inventory_bulkAddFlavourItems: `[UNTRANSLATED] Add Missing Flavour Items`,
+    inventory_bulkAddShipDecorations: `[UNTRANSLATED] Add Missing Ship Decorations`,
     inventory_bulkAddEvolutionProgress: `Ajouter les évolutions Incarnon manquantes`,
     inventory_bulkRankUpSuits: `Toutes les Warframes au rang max`,
     inventory_bulkRankUpWeapons: `Toutes les armes au rang max`,
@@ -198,8 +209,6 @@ dict = {
     cheats_dontSubtractVoidTraces: `Ne pas consommer de Void Traces`,
     cheats_dontSubtractConsumables: `Ne pas retirer de consommables`,
     cheats_unlockAllShipFeatures: `Débloquer tous les segments du vaisseau`,
-    cheats_unlockAllShipDecorations: `Débloquer toutes les décorations du vaisseau`,
-    cheats_unlockAllFlavourItems: `Débloquer tous les <abbr title="Animations, Glyphes, Palettes, etc.">Flavor Items</abbr>`,
     cheats_unlockAllSkins: `Débloquer tous les skins`,
     cheats_unlockAllCapturaScenes: `Débloquer toutes les scènes captura`,
     cheats_universalPolarityEverywhere: `Polarités universelles partout`,

static/webui/translations/ru.js

@@ -1,7 +1,7 @@
 // Russian translation by AMelonInsideLemon, LoseFace
 dict = {
-    general_inventoryUpdateNote: `Примечание: Чтобы увидеть изменения в игре, вам нужно повторно синхронизировать свой инвентарь, например, используя команду /sync загрузчика, посетив Додзё/Реле или перезагрузив игру.`,
+    general_inventoryUpdateNote: `Примечание: Чтобы увидеть изменения в игре, вам нужно повторно синхронизировать свой инвентарь, например, используя команду /sync в программе bootstrapper, посетив Додзё/Реле или перезагрузив игру.`,
-    general_inventoryUpdateNoteGameWs: `[UNTRANSLATED] Note: You may need to reopen any menu you are on for changes to be reflected.`,
+    general_inventoryUpdateNoteGameWs: `Примечание: для того, чтобы изменения вступили в силу, может потребоваться повторно открыть меню, в котором вы находитесь.`,
     general_addButton: `Добавить`,
     general_setButton: `Установить`,
     general_none: `Отсутствует`,
@@ -45,6 +45,7 @@ dict = {
     code_rank: `Ранг`,
     code_rankUp: `Повысить ранг`,
     code_rankDown: `Понизить ранг`,
+    code_unlockLevelCap: `[UNTRANSLATED] Unlock level cap`,
     code_count: `Количество`,
     code_focusAllUnlocked: `Все школы Фокуса уже разблокированы.`,
     code_focusUnlocked: `Разблокировано |COUNT| новых школ Фокуса! Для отображения изменений в игре потребуется обновление инвентаря. Посещение навигации — самый простой способ этого добиться.`,
@@ -64,10 +65,16 @@ dict = {
     code_completed: `Завершено`,
     code_active: `Активный`,
     code_pigment: `Пигмент`,
+    code_controller: `Курсор контроллера`,
+    code_mouseLine: `Линейный курсор`,
+    code_mouse: `Курсор`,
+    code_itemColorPalette: `Цветовая палитра: |ITEM|`,
     code_mature: `Подготовить к сражениям`,
     code_unmature: `Регрессия генетического старения`,
     code_fund: `Профинансировать`,
     code_funded: `Профинансировано`,
+    code_replays: `Повторов`,
+    code_stalker: `Сталкер`,
     code_succChange: `Успешно изменено.`,
     code_requiredInvigorationUpgrade: `Вы должны выбрать как атакующее, так и вспомогательное улучшение.`,
     login_description: `Войдите, используя учетные данные OpenWF (те же, что и в игре при подключении к этому серверу).`,
@@ -85,7 +92,7 @@ dict = {
     navbar_cheats: `Читы`,
     navbar_import: `Импорт`,
     inventory_addItems: `Добавить предметы`,
-    inventory_addItemByItemType: `[UNTRANSLATED] Raw`,
+    inventory_addItemByItemType: `Необработанные данные`,
     inventory_addItemByItemType_warning: `Используйте эту функцию на свой страх и риск. Она может повредить ваш инвентарь, и в случае проблем вам придётся удалять предметы вручную.`,
     inventory_suits: `Варфреймы`,
     inventory_longGuns: `Основное оружие`,
@@ -103,12 +110,16 @@ dict = {
     inventory_kubrowPets: `Звери`,
     inventory_evolutionProgress: `Прогресс эволюции Инкарнонов`,
     inventory_Boosters: `Бустеры`,
+    inventory_flavourItems: `<abbr title="Наборы анимаций, глифы, палитры и т. д.">Уникальные предметы</abbr>`,
+    inventory_shipDecorations: `Украшения корабля`,
     inventory_bulkAddSuits: `Добавить отсутствующие Варфреймы`,
     inventory_bulkAddWeapons: `Добавить отсутствующее оружие`,
     inventory_bulkAddSpaceSuits: `Добавить отсутствующие Арчвинги`,
     inventory_bulkAddSpaceWeapons: `Добавить отсутствующее оружие Арчвингов`,
     inventory_bulkAddSentinels: `Добавить отсутствующих Стражей`,
     inventory_bulkAddSentinelWeapons: `Добавить отсутствующее оружие Стражей`,
+    inventory_bulkAddFlavourItems: `Добавить отсутствующие уникальные предметы`,
+    inventory_bulkAddShipDecorations: `Добавить отсутствующие украшения корабля`,
     inventory_bulkAddEvolutionProgress: `Добавить отсутствующий прогресс эволюции Инкарнонов`,
     inventory_bulkRankUpSuits: `Макс. ранг всех Варфреймов`,
     inventory_bulkRankUpWeapons: `Макс. ранг всего оружия`,
@@ -182,7 +193,7 @@ dict = {
     cheats_skipTutorial: `Пропустить обучение`,
     cheats_skipAllDialogue: `Пропустить все диалоги`,
     cheats_unlockAllScans: `Разблокировать все сканирования`,
-    cheats_unlockSuccRelog: `[UNTRANSLATED] Success. Please that you'll need to relog for the client to refresh this.`,
+    cheats_unlockSuccRelog: `Успех. Вам необходимо повторно войти в игру, чтобы клиент обновил эту информацию.`,
     cheats_unlockAllMissions: `Разблокировать все миссии`,
     cheats_unlockAllMissions_ok: `Успех. Пожалуйста, обратите внимание, что вам нужно будет войти в Додзё/Реле или перезайти, чтобы клиент обновил звездную карту.`,
     cheats_infiniteCredits: `Бесконечные Кредиты`,
@@ -198,8 +209,6 @@ dict = {
     cheats_dontSubtractVoidTraces: `Не вычитать количество Отголосков Бездны`,
     cheats_dontSubtractConsumables: `Не вычитать количество расходников`,
     cheats_unlockAllShipFeatures: `Разблокировать все функции корабля`,
-    cheats_unlockAllShipDecorations: `Разблокировать все украшения корабля`,
-    cheats_unlockAllFlavourItems: `Разблокировать все <abbr title="Наборы анимаций, глифы, палитры и т. д.">уникальные предметы</abbr>`,
     cheats_unlockAllSkins: `Разблокировать все скины`,
     cheats_unlockAllCapturaScenes: `Разблокировать все сцены Каптуры`,
     cheats_universalPolarityEverywhere: `Универсальная полярность везде`,
@@ -218,7 +227,7 @@ dict = {
     cheats_baroFullyStocked: `Баро полностью укомплектован`,
     cheats_syndicateMissionsRepeatable: `Повторять миссии синдиката`,
     cheats_unlockAllProfitTakerStages: `Разблокировать все этапы Сферы извлечения прибыли`,
-    cheats_unlockSuccInventory: `[UNTRANSLATED] Success. Please note that you'll need to resync your inventory, e.g. using the bootstrapper's /sync command, visiting a dojo/relay, or relogging..`,
+    cheats_unlockSuccInventory: `Успех. Обратите внимание, что вам необходимо будет повторно синхронизировать свой инвентарь, например, с помощью команды /sync в программе bootstrapper, посетив Додзё/Реле или повторно войдя в игру.`,
     cheats_instantFinishRivenChallenge: `Мгновенное завершение испытания мода Разлома`,
     cheats_instantResourceExtractorDrones: `Мгновенно добывающие Дроны-сборщики`,
     cheats_noResourceExtractorDronesDamage: `Без урона по Дронам-сборщикам`,
@@ -393,7 +402,7 @@ dict = {
     theme_light: `Светлая тема`,
 
     guildView_cheats: `Читы Клана`,
-    guildView_techProjects: `Иследовения`,
+    guildView_techProjects: `Исследовения`,
     guildView_vaultDecoRecipes: `Рецепты декораций Додзё`,
     guildView_alliance: `Альянс`,
     guildView_members: `Товарищи`,
@@ -415,10 +424,10 @@ dict = {
     guildView_rank_utility: `Инженер`,
     guildView_rank_warlord: `Военачальник`,
     guildView_currency_owned: `В хранилище |COUNT|.`,
-    guildView_bulkAddTechProjects: `Добавить отсутствующие Иследования`,
+    guildView_bulkAddTechProjects: `Добавить отсутствующие исследования`,
     guildView_bulkAddVaultDecoRecipes: `Добавить отсутствующие рецепты декораций Дoдзё`,
-    guildView_bulkFundTechProjects: `Профинансировать все Иследования`,
+    guildView_bulkFundTechProjects: `Профинансировать все исследования`,
-    guildView_bulkCompleteTechProjects: `Завершить все Иследования`,
+    guildView_bulkCompleteTechProjects: `Завершить все исследования`,
     guildView_promote: `Повысить`,
     guildView_demote: `Понизить`,
 

static/webui/translations/uk.js

@@ -1,7 +1,7 @@
 // Ukrainian translation by LoseFace
 dict = {
-    general_inventoryUpdateNote: `Пам'ятка: Щоб побачити зміни в грі, вам потрібно повторно синхронізувати своє спорядження, наприклад, використовуючи команду /sync завантажувача, відвідавши Доджьо/Реле або перезавантаживши гру.`,
+    general_inventoryUpdateNote: `Пам'ятка: Щоб побачити зміни в грі, вам потрібно повторно синхронізувати своє спорядження, наприклад, використовуючи команду /sync в програмі bootstrapper, відвідавши Доджьо/Реле або перезавантаживши гру.`,
-    general_inventoryUpdateNoteGameWs: `[UNTRANSLATED] Note: You may need to reopen any menu you are on for changes to be reflected.`,
+    general_inventoryUpdateNoteGameWs: `Примітка: для відображення змін може знадобитися повторно відкрити меню, в якому ви перебуваєте.`,
     general_addButton: `Добавити`,
     general_setButton: `Встановити`,
     general_none: `Відсутній`,
@@ -32,8 +32,8 @@ dict = {
     code_renamePrompt: `Введіть нове ім'я:`,
     code_remove: `Видалити`,
     code_addItemsConfirm: `Ви впевнені, що хочете додати |COUNT| предметів на ваш обліковий запис?`,
-    code_addTechProjectsConfirm: `[UNTRANSLATED] Are you sure you want to add |COUNT| research to your clan?`,
+    code_addTechProjectsConfirm: `Ви впевнені, що хочете додати |COUNT| досліджень до свого клану?`,
-    code_addDecoRecipesConfirm: `[UNTRANSLATED] Are you sure you want to add |COUNT| deco recipes to your clan?`,
+    code_addDecoRecipesConfirm: `Ви впевнені, що хочете додати |COUNT| рецептів оздоблень до свого клану?`,
     code_succRankUp: `Рівень успішно підвищено`,
     code_noEquipmentToRankUp: `Немає спорядження для підвищення рівня.`,
     code_succAdded: `Успішно додано.`,
@@ -45,6 +45,7 @@ dict = {
     code_rank: `Рівень`,
     code_rankUp: `Підвищити рівень`,
     code_rankDown: `Понизити рівень`,
+    code_unlockLevelCap: `[UNTRANSLATED] Unlock level cap`,
     code_count: `Кількість`,
     code_focusAllUnlocked: `Всі школи Фокусу вже розблоковані.`,
     code_focusUnlocked: `Розблоковано |COUNT| нових шкіл Фокусу! Для відображення змін в грі знадобиться оновлення спорядження. Відвідування навігації — найпростіший спосіб цього досягти.`,
@@ -64,10 +65,16 @@ dict = {
     code_completed: `Завершено`,
     code_active: `Активний`,
     code_pigment: `Барвник`,
+    code_controller: `Курсор контролера`,
+    code_mouseLine: `Лінійний курсор`,
+    code_mouse: `Курсор`,
+    code_itemColorPalette: `Палітра кольорів «|ITEM|»`,
     code_mature: `Виростити для бою`,
     code_unmature: `Обернути старіння`,
-    code_fund: `[UNTRANSLATED] Fund`,
+    code_fund: `Профінансувати`,
-    code_funded: `[UNTRANSLATED] Funded`,
+    code_funded: `Профінансовано`,
+    code_replays: `Повтори`,
+    code_stalker: `Сталкер`,
     code_succChange: `Успішно змінено.`,
     code_requiredInvigorationUpgrade: `Ви повинні вибрати як атакуюче, так і допоміжне вдосконалення.`,
     login_description: `Увійдіть, використовуючи облікові дані OpenWF (ті ж, що й у грі при підключенні до цього серверу).`,
@@ -85,8 +92,8 @@ dict = {
     navbar_cheats: `Чити`,
     navbar_import: `Імпорт`,
     inventory_addItems: `Додати предмети`,
-    inventory_addItemByItemType: `[UNTRANSLATED] Raw`,
+    inventory_addItemByItemType: `Необроблені дані`,
-    inventory_addItemByItemType_warning: `[UNTRANSLATED] Use this feature at your own risk. It may break your inventory, and you will need to remove items manually if something goes wrong.`,
+    inventory_addItemByItemType_warning: `Використовуйте цю функцію на власний ризик. Вона може пошкодити ваше спорядження, і вам доведеться видаляти предмети вручну, якщо щось піде не так.`,
     inventory_suits: `Ворфрейми`,
     inventory_longGuns: `Основна зброя`,
     inventory_pistols: `Допоміжна зброя`,
@@ -103,12 +110,16 @@ dict = {
     inventory_kubrowPets: `Тварини`,
     inventory_evolutionProgress: `Прогрес еволюції Інкарнонів`,
     inventory_Boosters: `Посилення`,
+    inventory_flavourItems: `<abbr title="Набори анімацій, гліфи, палітри і т. д.">Унікальні предмети</abbr>`,
+    inventory_shipDecorations: `Прикраси судна`,
     inventory_bulkAddSuits: `Додати відсутні Ворфрейми`,
     inventory_bulkAddWeapons: `Додати відсутню зброю`,
     inventory_bulkAddSpaceSuits: `Додати відсутні Арквінґи`,
     inventory_bulkAddSpaceWeapons: `Додати відсутню зброю Арквінґів`,
     inventory_bulkAddSentinels: `Додати відсутніх Вартових`,
     inventory_bulkAddSentinelWeapons: `Додати відсутню зброю Вартових`,
+    inventory_bulkAddFlavourItems: `Додати відсутні унікальні предмети`,
+    inventory_bulkAddShipDecorations: `Додати відсутні оздоби корабля`,
     inventory_bulkAddEvolutionProgress: `Додати відсутній прогрес еволюції Інкарнонів`,
     inventory_bulkRankUpSuits: `Макс. рівень всіх Ворфреймів`,
     inventory_bulkRankUpWeapons: `Макс. рівень всієї зброї`,
@@ -182,7 +193,7 @@ dict = {
     cheats_skipTutorial: `Пропустити навчання`,
     cheats_skipAllDialogue: `Пропустити всі діалоги`,
     cheats_unlockAllScans: `Розблокувати всі сканування`,
-    cheats_unlockSuccRelog: `[UNTRANSLATED] Success. Please that you'll need to relog for the client to refresh this.`,
+    cheats_unlockSuccRelog: `Успіх. Вам потрібно буде повторно увійти в гру, щоб клієнт оновив цю інформацію.`,
     cheats_unlockAllMissions: `Розблокувати всі місії`,
     cheats_unlockAllMissions_ok: `Успіх. Будь ласка, зверніть увагу, що вам потрібно буде увійти в Доджьо/Реле або перезайти, щоб клієнт оновив Зоряну мапу.`,
     cheats_infiniteCredits: `Бескінечні Кредити`,
@@ -198,8 +209,6 @@ dict = {
     cheats_dontSubtractVoidTraces: `Не вираховувати кількість Відлуння`,
     cheats_dontSubtractConsumables: `Не вираховувати кількість витратних матеріалів`,
     cheats_unlockAllShipFeatures: `Розблокувати всі функції судна`,
-    cheats_unlockAllShipDecorations: `Розблокувати всі прикраси судна`,
-    cheats_unlockAllFlavourItems: `Розблокувати всі <abbr title="Набори анімацій, гліфи, палітри і т. д.">унікальні предмети</abbr>`,
     cheats_unlockAllSkins: `Розблокувати всі скіни`,
     cheats_unlockAllCapturaScenes: `Розблокувати всі сцени Світлописця`,
     cheats_universalPolarityEverywhere: `Будь-яка полярність скрізь`,
@@ -218,7 +227,7 @@ dict = {
     cheats_baroFullyStocked: `Баро повністю укомплектований`,
     cheats_syndicateMissionsRepeatable: `Повторювати місії синдиката`,
     cheats_unlockAllProfitTakerStages: `Розблокувати всі етапи Привласнювачки`,
-    cheats_unlockSuccInventory: `[UNTRANSLATED] Success. Please note that you'll need to resync your inventory, e.g. using the bootstrapper's /sync command, visiting a dojo/relay, or relogging..`,
+    cheats_unlockSuccInventory: `Успішно. Зверніть увагу, що вам потрібно буде повторно синхронізувати своє спорядження, наприклад, за допомогою команди /sync в програмі bootstrapper, відвідавши Доджьо/Реле або повторно увійшовши в гру.`,
     cheats_instantFinishRivenChallenge: `Миттєве завершення випробування модифікатора Розколу`,
     cheats_instantResourceExtractorDrones: `Миттєво добуваючі Дрони-видобувачі`,
     cheats_noResourceExtractorDronesDamage: `Без шкоди по Дронам-видобувачам`,
@@ -392,9 +401,9 @@ dict = {
     theme_dark: `Темна тема`,
     theme_light: `Світла тема`,
 
-    guildView_cheats: `[UNTRANSLATED] Clan Cheats`,
+    guildView_cheats: `Кланові чити`,
     guildView_techProjects: `Дослідження`,
-    guildView_vaultDecoRecipes: `[UNTRANSLATED] Dojo Deco Recipes`,
+    guildView_vaultDecoRecipes: `Рецепти оздоблень Доджьо`,
     guildView_alliance: `Альянс`,
     guildView_members: `Учасники`,
     guildView_pending: `Очікування`,
@@ -414,11 +423,11 @@ dict = {
     guildView_rank_soldier: `Солдат`,
     guildView_rank_utility: `Наймит`,
     guildView_rank_warlord: `Воєвода`,
-    guildView_currency_owned: `[UNTRANSLATED] |COUNT| in Vault.`,
+    guildView_currency_owned: `В сховищі |COUNT|.`,
-    guildView_bulkAddTechProjects: `[UNTRANSLATED] Add Missing Research`,
+    guildView_bulkAddTechProjects: `Додати відсутні дослідження`,
-    guildView_bulkAddVaultDecoRecipes: `[UNTRANSLATED] Add Missing Dojo Deco Recipes`,
+    guildView_bulkAddVaultDecoRecipes: `Додати відсутні рецепти оздоблень Доджьо`,
-    guildView_bulkFundTechProjects: `[UNTRANSLATED] Fund All Research`,
+    guildView_bulkFundTechProjects: `Фінансувати всі дослідження`,
-    guildView_bulkCompleteTechProjects: `[UNTRANSLATED] Complete All Research`,
+    guildView_bulkCompleteTechProjects: `Завершити всі дослідження`,
     guildView_promote: `Підвищити звання`,
     guildView_demote: `Понизити звання`,
 

static/webui/translations/zh.js

@@ -45,6 +45,7 @@ dict = {
     code_rank: `等级`,
     code_rankUp: `等级提升`,
     code_rankDown: `等级下降`,
+    code_unlockLevelCap: `[UNTRANSLATED] Unlock level cap`,
     code_count: `数量`,
     code_focusAllUnlocked: `所有专精学派均已解锁`,
     code_focusUnlocked: `已解锁 |COUNT| 个新专精学派!需要游戏内仓库更新才能生效,您可以通过访问星图来触发仓库更新.`,
@@ -64,10 +65,16 @@ dict = {
     code_completed: `已完成`,
     code_active: `正在执行`,
     code_pigment: `颜料`,
+    code_controller: `[UNTRANSLATED] Controller cursor`,
+    code_mouseLine: `[UNTRANSLATED] Line cursor`,
+    code_mouse: `[UNTRANSLATED] Cursor`,
+    code_itemColorPalette: `|ITEM| 调色盘`,
     code_mature: `成长并战备`,
     code_unmature: `逆转衰老基因`,
     code_fund: `[UNTRANSLATED] Fund`,
     code_funded: `[UNTRANSLATED] Funded`,
+    code_replays: `[UNTRANSLATED] Replays`,
+    code_stalker: `追猎者`,
     code_succChange: `更改成功`,
     code_requiredInvigorationUpgrade: `您必须同时选择一个进攻型和一个功能型活化属性.`,
     login_description: `使用您的 OpenWF 账户凭证登录(与游戏内连接本服务器时使用的昵称相同)`,
@@ -103,12 +110,16 @@ dict = {
     inventory_kubrowPets: `动物同伴`,
     inventory_evolutionProgress: `灵化之源进度`,
     inventory_Boosters: `加成器`,
+    inventory_flavourItems: `<abbr title="动作表情、浮印、调色板等">装饰物品</abbr>`,
+    inventory_shipDecorations: `飞船装饰`,
     inventory_bulkAddSuits: `添加缺失战甲`,
     inventory_bulkAddWeapons: `添加缺失武器`,
     inventory_bulkAddSpaceSuits: `添加缺失载具`,
     inventory_bulkAddSpaceWeapons: `添加缺失载具武器`,
     inventory_bulkAddSentinels: `添加缺失守护`,
     inventory_bulkAddSentinelWeapons: `添加缺失守护武器`,
+    inventory_bulkAddFlavourItems: `[UNTRANSLATED] Add Missing Flavour Items`,
+    inventory_bulkAddShipDecorations: `[UNTRANSLATED] Add Missing Ship Decorations`,
     inventory_bulkAddEvolutionProgress: `添加缺失的灵化之源进度`,
     inventory_bulkRankUpSuits: `所有战甲升满级`,
     inventory_bulkRankUpWeapons: `所有武器升满级`,
@@ -198,8 +209,6 @@ dict = {
     cheats_dontSubtractVoidTraces: `虚空光体无消耗`,
     cheats_dontSubtractConsumables: `消耗物品使用时无损耗`,
     cheats_unlockAllShipFeatures: `解锁所有飞船功能`,
-    cheats_unlockAllShipDecorations: `解锁所有飞船装饰`,
-    cheats_unlockAllFlavourItems: `解锁所有<abbr title="动作表情、浮印、调色板等">装饰物品</abbr>`,
     cheats_unlockAllSkins: `解锁所有外观`,
     cheats_unlockAllCapturaScenes: `解锁所有Captura场景`,
     cheats_universalPolarityEverywhere: `全局万用极性`,