also check if Completes is valid

Closes #2283

README.md

@@ -34,5 +34,4 @@ SpaceNinjaServer requires a `config.json`. To set it up, you can copy the [confi
   - `RadioLegion2Syndicate` for The Emissary
   - `RadioLegionIntermissionSyndicate` for Intermission I
   - `RadioLegionSyndicate` for The Wolf of Saturn Six
-- `allTheFissures` can be set to `normal` or `hard` to enable all fissures either in normal or steel path, respectively.
 - `worldState.circuitGameModes` can be provided with an array of valid game modes (`Survival`, `VoidFlood`, `Excavation`, `Defense`, `Exterminate`, `Assassination`, `Alchemy`)

config.json.example

@@ -74,7 +74,6 @@
     "vallisOverride": "",
     "duviriOverride": "",
     "nightwaveOverride": "",
-    "allTheFissures": "",
     "circuitGameModes": null
   },
   "dev": {

package-lock.json

@@ -13,8 +13,6 @@
         "@types/morgan": "^1.9.9",
         "@types/websocket": "^1.0.10",
         "@types/ws": "^8.18.1",
-        "@typescript/native-preview": "^7.0.0-dev.20250625.1",
-        "chokidar": "^4.0.3",
         "crc-32": "^1.2.2",
         "express": "^5",
         "json-with-bigint": "^3.4.4",
@@ -23,7 +21,7 @@
         "ncp": "^2.0.0",
         "typescript": "^5.5",
         "undici": "^7.10.0",
-        "warframe-public-export-plus": "^0.5.72",
+        "warframe-public-export-plus": "^0.5.70",
         "warframe-riven-info": "^0.1.2",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0",
@@ -32,6 +30,8 @@
       "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.28.0",
         "@typescript-eslint/parser": "^8.28.0",
+        "@typescript/native-preview": "^7.0.0-dev.20250523.1",
+        "chokidar": "^4.0.3",
         "eslint": "^8",
         "eslint-plugin-prettier": "^5.2.5",
         "prettier": "^3.5.3",
@@ -605,9 +605,10 @@
       }
     },
     "node_modules/@typescript/native-preview": {
-      "version": "7.0.0-dev.20250625.1",
+      "version": "7.0.0-dev.20250523.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview/-/native-preview-7.0.0-dev.20250625.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview/-/native-preview-7.0.0-dev.20250523.1.tgz",
-      "integrity": "sha512-7781zmsKURCHknc37H4U4la4kZduyxmmUshZLBzNhPHhV5DKo++K8MF69kxhRG3/vS4HBhozf0YI0mZMIbkSDA==",
+      "integrity": "sha512-CgdgP/gmyaMThY7Fho19nDaTVryn9QV/zD/6w1KfDCn3M4Rq4WvkSc7Ob1ohc4V1XjCSIzg6Ul+HbLEc7xvV4Q==",
+      "dev": true,
       "license": "Apache-2.0",
       "bin": {
         "tsgo": "bin/tsgo.js"
@@ -616,22 +617,23 @@
         "node": ">=20.6.0"
       },
       "optionalDependencies": {
-        "@typescript/native-preview-darwin-arm64": "7.0.0-dev.20250625.1",
+        "@typescript/native-preview-darwin-arm64": "7.0.0-dev.20250523.1",
-        "@typescript/native-preview-darwin-x64": "7.0.0-dev.20250625.1",
+        "@typescript/native-preview-darwin-x64": "7.0.0-dev.20250523.1",
-        "@typescript/native-preview-linux-arm": "7.0.0-dev.20250625.1",
+        "@typescript/native-preview-linux-arm": "7.0.0-dev.20250523.1",
-        "@typescript/native-preview-linux-arm64": "7.0.0-dev.20250625.1",
+        "@typescript/native-preview-linux-arm64": "7.0.0-dev.20250523.1",
-        "@typescript/native-preview-linux-x64": "7.0.0-dev.20250625.1",
+        "@typescript/native-preview-linux-x64": "7.0.0-dev.20250523.1",
-        "@typescript/native-preview-win32-arm64": "7.0.0-dev.20250625.1",
+        "@typescript/native-preview-win32-arm64": "7.0.0-dev.20250523.1",
-        "@typescript/native-preview-win32-x64": "7.0.0-dev.20250625.1"
+        "@typescript/native-preview-win32-x64": "7.0.0-dev.20250523.1"
       }
     },
     "node_modules/@typescript/native-preview-darwin-arm64": {
-      "version": "7.0.0-dev.20250625.1",
+      "version": "7.0.0-dev.20250523.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-arm64/-/native-preview-darwin-arm64-7.0.0-dev.20250625.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-arm64/-/native-preview-darwin-arm64-7.0.0-dev.20250523.1.tgz",
-      "integrity": "sha512-JcLCql0O6+0iHIMllvax02kqpNtY1RUckGKomuO5kSbrOo9PsR+6r5MEcspfj47gwOl7AS0vrGhBCFFogF+KGw==",
+      "integrity": "sha512-oWJMPD+lfH9/dvHhPSZdTv43lfyZGrn7crytefhkiQPSwP0MIUCpnDkofGP/ML1nv0xx0pwWhH+Ein88NW3LuA==",
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -642,12 +644,13 @@
       }
     },
     "node_modules/@typescript/native-preview-darwin-x64": {
-      "version": "7.0.0-dev.20250625.1",
+      "version": "7.0.0-dev.20250523.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-x64/-/native-preview-darwin-x64-7.0.0-dev.20250625.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-x64/-/native-preview-darwin-x64-7.0.0-dev.20250523.1.tgz",
-      "integrity": "sha512-0vCkk3FdS92W625JyzA8Slu/0vgkeu10fRQNfgIbf+E29DKMKnwXW56WhHSdGXAivU44Mewwc589+CbsABq3Sw==",
+      "integrity": "sha512-Yk8bJEsYsRKgRqYlwPvh7DPdgBMC/oPN60X0LWeuMLci65+4kyqF8Cv6K/W3ABc005cB4tYn4iR+9T6zipvrKw==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -658,12 +661,13 @@
       }
     },
     "node_modules/@typescript/native-preview-linux-arm": {
-      "version": "7.0.0-dev.20250625.1",
+      "version": "7.0.0-dev.20250523.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm/-/native-preview-linux-arm-7.0.0-dev.20250625.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm/-/native-preview-linux-arm-7.0.0-dev.20250523.1.tgz",
-      "integrity": "sha512-MumU7p+09ikH/x5IOJRV6DUj6N5/0kSlI4IsAUPtpT2WGkQdDtL2CC523/94YvOfWB1/+9r01636LVCGOJ135g==",
+      "integrity": "sha512-B+8CRIv6ebL8gzAagnJP8wml3baFV2FtFWuXYl6jlAcLGoQOh/yGdcAueZoJjJKNod4gAOl8OJoTicuC0BVIxw==",
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -674,12 +678,13 @@
       }
     },
     "node_modules/@typescript/native-preview-linux-arm64": {
-      "version": "7.0.0-dev.20250625.1",
+      "version": "7.0.0-dev.20250523.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm64/-/native-preview-linux-arm64-7.0.0-dev.20250625.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm64/-/native-preview-linux-arm64-7.0.0-dev.20250523.1.tgz",
-      "integrity": "sha512-IgnoWQSKeoeL7Y7tvlbcDQx0nidK3UWa/bbm1zJv+AfQlAGMrEMygp+ZzocmycUCYOVM0dcIbymjoiI/QRHTng==",
+      "integrity": "sha512-IErNI08z9qE6mHaJaT6tM7il8j21ryH3DNVyFP4yz5FTKnkXFj1Kb4NcI41Q8w226LTQgBR8kNErVlbUWr7ywA==",
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -690,12 +695,13 @@
       }
     },
     "node_modules/@typescript/native-preview-linux-x64": {
-      "version": "7.0.0-dev.20250625.1",
+      "version": "7.0.0-dev.20250523.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-x64/-/native-preview-linux-x64-7.0.0-dev.20250625.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-x64/-/native-preview-linux-x64-7.0.0-dev.20250523.1.tgz",
-      "integrity": "sha512-6fE8piqPfzPPqmQ37ewTSbm4HW0cNqOEhfLG2F37zJd4525mefhIpWvj2iCkEHWp+BDlF2dYCbB4cY2nmfrNNw==",
+      "integrity": "sha512-TCZtknsLUgPRaEfX9CvBZNgrHhMRZPYYZgF1Aasdv0PONv9mB8w0Xforgxoo4UFjdF5ZzOu2icgc7sKJJeu5vw==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -706,12 +712,13 @@
       }
     },
     "node_modules/@typescript/native-preview-win32-arm64": {
-      "version": "7.0.0-dev.20250625.1",
+      "version": "7.0.0-dev.20250523.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-arm64/-/native-preview-win32-arm64-7.0.0-dev.20250625.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-arm64/-/native-preview-win32-arm64-7.0.0-dev.20250523.1.tgz",
-      "integrity": "sha512-ppCkjBAFotPxL8j9Vk5cNSwMreOvAt02AMa5Hko3JQGSVA2TQCIlvTFn+SHSIWzYbzomc9j4j5WOcOR0rmAAHg==",
+      "integrity": "sha512-bulwrkLEkoY4Jqeuvfz24RiVOiZZ7Rr9TblFqZAgZFZOnyXuhjM1jE8F1hnJFC5AghJe2HdLD3EKfabqlffrIw==",
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -722,12 +729,13 @@
       }
     },
     "node_modules/@typescript/native-preview-win32-x64": {
-      "version": "7.0.0-dev.20250625.1",
+      "version": "7.0.0-dev.20250523.1",
-      "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-x64/-/native-preview-win32-x64-7.0.0-dev.20250625.1.tgz",
+      "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-x64/-/native-preview-win32-x64-7.0.0-dev.20250523.1.tgz",
-      "integrity": "sha512-BsnJqso5MKAW4Y7fPmcamJ+EIrWOTqwLjeZP74NNFvTqCsA4RkITCw4NpLwD0lzrv9VsQcQ+bNwB8DrT+oDqoQ==",
+      "integrity": "sha512-ztzfO0oF/rj8xO5y3SyAcigmgvgczrqobCugEWFqiYumteWZPN2MYWcNYk2k8Y5LAgg1fN1xHIg8RRSPoo6XUg==",
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "Apache-2.0",
       "optional": true,
       "os": [
@@ -997,6 +1005,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
       "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "readdirp": "^4.0.1"
@@ -2802,6 +2811,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
       "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 14.18.0"
@@ -3386,9 +3396,9 @@
       }
     },
     "node_modules/warframe-public-export-plus": {
-      "version": "0.5.72",
+      "version": "0.5.70",
-      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.72.tgz",
+      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.70.tgz",
-      "integrity": "sha512-oOZgtU6L0MGcPRKfA6+bonu+Db1kie1lVdLmA7/DbheTPweNkBEx3Hx3Seib+hEaFW+nLj3T5GtmGxGcFHCHfg=="
+      "integrity": "sha512-d5dQ/a0rakQnW9tl1HitST8439jDvEgMhkkntQIw7HmdM7s7mvIxvaYSl5wjlYawpUVfGyvGBdZVoAJ7kkQRWw=="
     },
     "node_modules/warframe-riven-info": {
       "version": "0.1.2",

package.json

@@ -5,10 +5,8 @@
   "main": "index.ts",
   "scripts": {
     "start": "node --enable-source-maps --import ./build/src/pathman.js build/src/index.js",
-    "build": "tsgo --sourceMap && ncp static/webui build/static/webui",
+    "build": "tsc --incremental --sourceMap && ncp static/webui build/static/webui",
-    "build:tsc": "tsc --incremental --sourceMap && ncp static/webui build/static/webui",
+    "build:dev": "tsc --incremental --sourceMap",
-    "build:dev": "tsgo --sourceMap",
-    "build:dev:tsc": "tsc --incremental --sourceMap",
     "build-and-start": "npm run build && npm run start",
     "build-and-start:bun": "npm run verify && npm run bun-run",
     "dev": "node scripts/dev.js",
@@ -27,8 +25,6 @@
     "@types/morgan": "^1.9.9",
     "@types/websocket": "^1.0.10",
     "@types/ws": "^8.18.1",
-    "@typescript/native-preview": "^7.0.0-dev.20250625.1",
-    "chokidar": "^4.0.3",
     "crc-32": "^1.2.2",
     "express": "^5",
     "json-with-bigint": "^3.4.4",
@@ -37,7 +33,7 @@
     "ncp": "^2.0.0",
     "typescript": "^5.5",
     "undici": "^7.10.0",
-    "warframe-public-export-plus": "^0.5.72",
+    "warframe-public-export-plus": "^0.5.70",
     "warframe-riven-info": "^0.1.2",
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0",
@@ -46,6 +42,8 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^8.28.0",
     "@typescript-eslint/parser": "^8.28.0",
+    "@typescript/native-preview": "^7.0.0-dev.20250523.1",
+    "chokidar": "^4.0.3",
     "eslint": "^8",
     "eslint-plugin-prettier": "^5.2.5",
     "prettier": "^3.5.3",

src/controllers/api/claimJunctionChallengeRewardController.ts

@@ -1,35 +0,0 @@
-import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { combineInventoryChanges, getInventory } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
-import { RequestHandler } from "express";
-import { ExportChallenges } from "warframe-public-export-plus";
-
-export const claimJunctionChallengeRewardController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId);
-    const data = getJSONfromString<IClaimJunctionChallengeRewardRequest>(String(req.body));
-    const challengeProgress = inventory.ChallengeProgress.find(x => x.Name == data.Challenge)!;
-    if (challengeProgress.ReceivedJunctionReward) {
-        throw new Error(`attempt to double-claim junction reward`);
-    }
-    challengeProgress.ReceivedJunctionReward = true;
-    inventory.ClaimedJunctionChallengeRewards ??= [];
-    inventory.ClaimedJunctionChallengeRewards.push(data.Challenge);
-    const challengeMeta = Object.entries(ExportChallenges).find(arr => arr[0].endsWith("/" + data.Challenge))![1];
-    const inventoryChanges = {};
-    for (const reward of challengeMeta.countedRewards!) {
-        combineInventoryChanges(
-            inventoryChanges,
-            (await handleStoreItemAcquisition(reward.StoreItem, inventory, reward.ItemCount)).InventoryChanges
-        );
-    }
-    await inventory.save();
-    res.json({
-        inventoryChanges: inventoryChanges // Yeah, it's "inventoryChanges" in the response here.
-    });
-};
-
-interface IClaimJunctionChallengeRewardRequest {
-    Challenge: string;
-}

src/controllers/api/updateChallengeProgressController.ts

@@ -1,7 +1,7 @@
 import { RequestHandler } from "express";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { getAccountForRequest } from "@/src/services/loginService";
-import { addCalendarProgress, addChallenges, getInventory } from "@/src/services/inventoryService";
+import { addChallenges, getInventory } from "@/src/services/inventoryService";
 import { IChallengeProgress, ISeasonChallenge } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IAffiliationMods } from "@/src/types/purchaseTypes";
 import { getEntriesUnsafe } from "@/src/utils/ts-utils";
@@ -25,17 +25,13 @@ export const updateChallengeProgressController: RequestHandler = async (req, res
         );
     }
     for (const [key, value] of getEntriesUnsafe(challenges)) {
-        if (value === undefined) {
-            logger.error(`Challenge progress update key ${key} has no value`);
-            continue;
-        }
         switch (key) {
             case "ChallengesFixVersion":
                 inventory.ChallengesFixVersion = value;
                 break;
 
             case "SeasonChallengeHistory":
-                value.forEach(({ challenge, id }) => {
+                value!.forEach(({ challenge, id }) => {
                     const itemIndex = inventory.SeasonChallengeHistory.findIndex(i => i.challenge === challenge);
                     if (itemIndex !== -1) {
                         inventory.SeasonChallengeHistory[itemIndex].id = id;
@@ -45,10 +41,6 @@ export const updateChallengeProgressController: RequestHandler = async (req, res
                 });
                 break;
 
-            case "CalendarProgress":
-                addCalendarProgress(inventory, value);
-                break;
-
             case "ChallengeProgress":
             case "SeasonChallengeCompletions":
             case "ChallengePTS":
@@ -71,6 +63,5 @@ interface IUpdateChallengeProgressRequest {
     ChallengeProgress?: IChallengeProgress[];
     SeasonChallengeHistory?: ISeasonChallenge[];
     SeasonChallengeCompletions?: ISeasonChallenge[];
-    CalendarProgress?: { challenge: string }[];
     crossPlaySetting?: string;
 }

src/controllers/custom/addMissingHelminthBlueprintsController.ts

@@ -1,24 +0,0 @@
-import { getAccountIdForRequest } from "@/src/services/loginService";
-import { getInventory, addRecipes } from "@/src/services/inventoryService";
-import { RequestHandler } from "express";
-import { ExportRecipes } from "warframe-public-export-plus";
-
-export const addMissingHelminthBlueprintsController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "Recipes");
-    const allHelminthRecipes = Object.keys(ExportRecipes).filter(
-        key => ExportRecipes[key].secretIngredientAction === "SIA_WARFRAME_ABILITY"
-    );
-    const inventoryHelminthRecipes = inventory.Recipes.filter(recipe =>
-        recipe.ItemType.startsWith("/Lotus/Types/Recipes/AbilityOverrides/")
-    ).map(recipe => recipe.ItemType);
-
-    const missingHelminthRecipes = allHelminthRecipes
-        .filter(key => !inventoryHelminthRecipes.includes(key))
-        .map(ItemType => ({ ItemType, ItemCount: 1 }));
-
-    addRecipes(inventory, missingHelminthRecipes);
-
-    await inventory.save();
-    res.end();
-};

src/controllers/custom/completeAllMissionsController.ts

@@ -12,24 +12,21 @@ export const completeAllMissionsController: RequestHandler = async (req, res) =>
     const inventory = await getInventory(accountId);
     const MissionRewards: IMissionReward[] = [];
     for (const [tag, node] of Object.entries(ExportRegions)) {
-        let mission = inventory.Missions.find(x => x.Tag == tag);
+        const mission = inventory.Missions.find(x => x.Tag === tag);
         if (!mission) {
-            mission =
-                inventory.Missions[
             inventory.Missions.push({
-                        Completes: 0,
+                Completes: 1,
-                        Tier: 0,
+                Tier: 1,
                 Tag: tag
-                    }) - 1
+            });
-                ];
+
-        }
-        if (mission.Completes == 0) {
-            mission.Completes++;
             if (node.missionReward) {
                 addFixedLevelRewards(node.missionReward, inventory, MissionRewards);
             }
+        } else {
+            if (!mission.Tier) mission.Tier = 1;
+            if (!mission.Completes) mission.Completes = 1;
         }
-        mission.Tier = 1;
     }
     for (const reward of MissionRewards) {
         await handleStoreItemAcquisition(reward.StoreItem, inventory, reward.ItemCount, undefined, true);

src/controllers/custom/configController.ts

@@ -1,42 +0,0 @@
-import { RequestHandler } from "express";
-import { config } from "@/src/services/configService";
-import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
-import { saveConfig } from "@/src/services/configWatcherService";
-
-export const getConfigController: RequestHandler = async (req, res) => {
-    const account = await getAccountForRequest(req);
-    if (isAdministrator(account)) {
-        const responseData: Record<string, boolean | string | number | null> = {};
-        for (const id of req.body as string[]) {
-            const [obj, idx] = configIdToIndexable(id);
-            responseData[id] = obj[idx] ?? null;
-        }
-        res.json(responseData);
-    } else {
-        res.status(401).end();
-    }
-};
-
-export const setConfigController: RequestHandler = async (req, res) => {
-    const account = await getAccountForRequest(req);
-    if (isAdministrator(account)) {
-        for (const [id, value] of Object.entries(req.body as Record<string, boolean | string | number>)) {
-            const [obj, idx] = configIdToIndexable(id);
-            obj[idx] = value;
-        }
-        await saveConfig();
-        res.end();
-    } else {
-        res.status(401).end();
-    }
-};
-
-const configIdToIndexable = (id: string): [Record<string, boolean | string | number | undefined>, string] => {
-    let obj = config as unknown as Record<string, never>;
-    const arr = id.split(".");
-    while (arr.length > 1) {
-        obj = obj[arr[0]];
-        arr.splice(0, 1);
-    }
-    return [obj, arr[0]];
-};

src/controllers/custom/getConfigDataController.ts

@@ -0,0 +1,14 @@
+import { RequestHandler } from "express";
+import { config } from "@/src/services/configService";
+import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
+
+const getConfigDataController: RequestHandler = async (req, res) => {
+    const account = await getAccountForRequest(req);
+    if (isAdministrator(account)) {
+        res.json(config);
+    } else {
+        res.status(401).end();
+    }
+};
+
+export { getConfigDataController };

src/controllers/custom/updateConfigDataController.ts

@@ -0,0 +1,21 @@
+import { RequestHandler } from "express";
+import { saveConfig } from "@/src/services/configWatcherService";
+import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
+import { config, IConfig } from "@/src/services/configService";
+
+export const updateConfigDataController: RequestHandler = async (req, res) => {
+    const account = await getAccountForRequest(req);
+    if (isAdministrator(account)) {
+        const data = req.body as IUpdateConfigDataRequest;
+        config[data.key] = data.value;
+        await saveConfig();
+        res.end();
+    } else {
+        res.status(401).end();
+    }
+};
+
+interface IUpdateConfigDataRequest {
+    key: keyof IConfig;
+    value: never;
+}

src/models/inventoryModels/inventoryModel.ts

@@ -483,9 +483,8 @@ personalGoalProgressSchema.set("toJSON", {
 const challengeProgressSchema = new Schema<IChallengeProgress>(
     {
         Progress: Number,
-        Completed: { type: [String], default: undefined },
+        Name: String,
-        ReceivedJunctionReward: Boolean,
+        Completed: [String]
-        Name: { type: String, required: true }
     },
     { _id: false }
 );
@@ -1778,9 +1777,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
         BrandedSuits: { type: [Schema.Types.ObjectId], default: undefined },
         LockedWeaponGroup: { type: lockedWeaponGroupSchema, default: undefined },
 
-        HubNpcCustomizations: { type: [hubNpcCustomizationSchema], default: undefined },
+        HubNpcCustomizations: { type: [hubNpcCustomizationSchema], default: undefined }
-
-        ClaimedJunctionChallengeRewards: { type: [String], default: undefined }
     },
     { timestamps: { createdAt: "Created", updatedAt: false } }
 );

src/routes/api.ts

@@ -19,7 +19,6 @@ import { changeDojoRootController } from "@/src/controllers/api/changeDojoRootCo
 import { changeGuildRankController } from "@/src/controllers/api/changeGuildRankController";
 import { checkDailyMissionBonusController } from "@/src/controllers/api/checkDailyMissionBonusController";
 import { claimCompletedRecipeController } from "@/src/controllers/api/claimCompletedRecipeController";
-import { claimJunctionChallengeRewardController } from "@/src/controllers/api/claimJunctionChallengeRewardController";
 import { claimLibraryDailyTaskRewardController } from "@/src/controllers/api/claimLibraryDailyTaskRewardController";
 import { clearDialogueHistoryController } from "@/src/controllers/api/clearDialogueHistoryController";
 import { clearNewEpisodeRewardController } from "@/src/controllers/api/clearNewEpisodeRewardController";
@@ -238,7 +237,6 @@ apiRouter.post("/artifacts.php", artifactsController);
 apiRouter.post("/artifactTransmutation.php", artifactTransmutationController);
 apiRouter.post("/changeDojoRoot.php", changeDojoRootController);
 apiRouter.post("/claimCompletedRecipe.php", claimCompletedRecipeController);
-apiRouter.post("/claimJunctionChallengeReward.php", claimJunctionChallengeRewardController);
 apiRouter.post("/clearDialogueHistory.php", clearDialogueHistoryController);
 apiRouter.post("/clearNewEpisodeReward.php", clearNewEpisodeRewardController);
 apiRouter.post("/commitStoryModeDecision.php", (_req, res) => { res.end(); }); // U14 (maybe wanna actually unlock the ship features?)

src/routes/custom.ts

@@ -13,7 +13,6 @@ import { unlockAllIntrinsicsController } from "@/src/controllers/custom/unlockAl
 import { addMissingMaxRankModsController } from "@/src/controllers/custom/addMissingMaxRankModsController";
 import { webuiFileChangeDetectedController } from "@/src/controllers/custom/webuiFileChangeDetectedController";
 import { completeAllMissionsController } from "@/src/controllers/custom/completeAllMissionsController";
-import { addMissingHelminthBlueprintsController } from "@/src/controllers/custom/addMissingHelminthBlueprintsController";
 
 import { createAccountController } from "@/src/controllers/custom/createAccountController";
 import { createMessageController } from "@/src/controllers/custom/createMessageController";
@@ -25,7 +24,8 @@ import { manageQuestsController } from "@/src/controllers/custom/manageQuestsCon
 import { setEvolutionProgressController } from "@/src/controllers/custom/setEvolutionProgressController";
 import { setBoosterController } from "@/src/controllers/custom/setBoosterController";
 
-import { getConfigController, setConfigController } from "@/src/controllers/custom/configController";
+import { getConfigDataController } from "@/src/controllers/custom/getConfigDataController";
+import { updateConfigDataController } from "@/src/controllers/custom/updateConfigDataController";
 
 const customRouter = express.Router();
 
@@ -42,7 +42,6 @@ customRouter.get("/unlockAllIntrinsics", unlockAllIntrinsicsController);
 customRouter.get("/addMissingMaxRankMods", addMissingMaxRankModsController);
 customRouter.get("/webuiFileChangeDetected", webuiFileChangeDetectedController);
 customRouter.get("/completeAllMissions", completeAllMissionsController);
-customRouter.get("/addMissingHelminthBlueprints", addMissingHelminthBlueprintsController);
 
 customRouter.post("/createAccount", createAccountController);
 customRouter.post("/createMessage", createMessageController);
@@ -54,7 +53,7 @@ customRouter.post("/manageQuests", manageQuestsController);
 customRouter.post("/setEvolutionProgress", setEvolutionProgressController);
 customRouter.post("/setBooster", setBoosterController);
 
-customRouter.post("/getConfig", getConfigController);
+customRouter.get("/config", getConfigDataController);
-customRouter.post("/setConfig", setConfigController);
+customRouter.post("/config", updateConfigDataController);
 
 export { customRouter };

src/services/configService.ts

@@ -81,7 +81,6 @@ export interface IConfig {
         vallisOverride?: string;
         duviriOverride?: string;
         nightwaveOverride?: string;
-        allTheFissures?: string;
         circuitGameModes?: string[];
     };
     dev?: {

src/services/configWatcherService.ts

@@ -1,4 +1,4 @@
-import chokidar from "chokidar";
+import fs from "fs";
 import fsPromises from "fs/promises";
 import { logger } from "../utils/logger";
 import { config, configPath, loadConfig } from "./configService";
@@ -6,7 +6,12 @@ import { getWebPorts, sendWsBroadcast, startWebServer, stopWebServer } from "./w
 import { Inbox } from "../models/inboxModel";
 
 let amnesia = false;
-chokidar.watch(configPath).on("change", () => {
+fs.watchFile(configPath, (now, then) => {
+    // https://github.com/oven-sh/bun/issues/20542
+    if (process.versions.bun && now.mtimeMs == then.mtimeMs) {
+        return;
+    }
+
     if (amnesia) {
         amnesia = false;
     } else {

src/services/inventoryService.ts

@@ -499,7 +499,6 @@ export const addItem = async (
         // - Blueprints for Ancient Protector Specter, Shield Osprey Specter, etc. have num=1 despite giving their purchaseQuantity.
         if (!exactQuantity) {
             quantity *= ExportGear[typeName].purchaseQuantity ?? 1;
-            logger.debug(`non-exact acquisition of ${typeName}; factored quantity is ${quantity}`);
         }
         const consumablesChanges = [
             {
@@ -1832,15 +1831,6 @@ export const addChallenges = (
     return affiliationMods;
 };
 
-export const addCalendarProgress = (inventory: TInventoryDatabaseDocument, value: { challenge: string }[]): void => {
-    const calendarProgress = getCalendarProgress(inventory);
-    const currentSeason = getWorldState().KnownCalendarSeasons[0];
-    calendarProgress.SeasonProgress.LastCompletedChallengeDayIdx = currentSeason.Days.findIndex(
-        day => day.events.length != 0 && day.events[0].challenge == value[value.length - 1].challenge
-    );
-    checkCalendarChallengeCompletion(calendarProgress, currentSeason);
-};
-
 export const addMissionComplete = (inventory: TInventoryDatabaseDocument, { Tag, Completes, Tier }: IMission): void => {
     const { Missions } = inventory;
     const itemIndex = Missions.findIndex(item => item.Tag === Tag);

src/services/loginRewardService.ts

@@ -144,8 +144,7 @@ export const claimLoginReward = async (
         case "RT_STORE_ITEM":
         case "RT_RECIPE":
         case "RT_RANDOM_RECIPE":
-            return (await handleStoreItemAcquisition(reward.StoreItemType, inventory, reward.Amount, undefined, true))
+            return (await handleStoreItemAcquisition(reward.StoreItemType, inventory, reward.Amount)).InventoryChanges;
-                .InventoryChanges;
 
         case "RT_CREDITS":
             return updateCurrency(inventory, -reward.Amount, false);

src/services/missionInventoryUpdateService.ts

@@ -14,7 +14,6 @@ import { IRngResult, SRng, getRandomElement, getRandomReward } from "@/src/servi
 import { equipmentKeys, IMission, ITypeCount, TEquipmentKey } from "@/src/types/inventoryTypes/inventoryTypes";
 import {
     addBooster,
-    addCalendarProgress,
     addChallenges,
     addConsumables,
     addCrewShipAmmo,
@@ -34,8 +33,10 @@ import {
     addSkin,
     addStanding,
     applyClientEquipmentUpdates,
+    checkCalendarChallengeCompletion,
     combineInventoryChanges,
     generateRewardSeed,
+    getCalendarProgress,
     getDialogue,
     giveNemesisPetRecipe,
     giveNemesisWeaponRecipe,
@@ -670,7 +671,12 @@ export const addMissionInventoryUpdates = async (
                 break;
             }
             case "CalendarProgress": {
-                addCalendarProgress(inventory, value);
+                const calendarProgress = getCalendarProgress(inventory);
+                const currentSeason = getWorldState().KnownCalendarSeasons[0];
+                calendarProgress.SeasonProgress.LastCompletedChallengeDayIdx = currentSeason.Days.findIndex(
+                    x => x.events[0].challenge == value[value.length - 1].challenge
+                );
+                checkCalendarChallengeCompletion(calendarProgress, currentSeason);
                 break;
             }
             case "duviriCaveOffers": {

src/services/purchaseService.ts

@@ -371,28 +371,18 @@ export const handleStoreItemAcquisition = async (
     } else {
         const storeCategory = getStoreItemCategory(storeItemName);
         const internalName = fromStoreItem(storeItemName);
+        logger.debug(`store category ${storeCategory}`);
         if (!ignorePurchaseQuantity) {
             if (internalName in ExportGear) {
                 quantity *= ExportGear[internalName].purchaseQuantity || 1;
-                logger.debug(`factored quantity is ${quantity}`);
             } else if (internalName in ExportResources) {
                 quantity *= ExportResources[internalName].purchaseQuantity || 1;
-                logger.debug(`factored quantity is ${quantity}`);
             }
         }
-        logger.debug(`store category ${storeCategory}`);
         switch (storeCategory) {
             default: {
                 purchaseResponse = {
-                    InventoryChanges: await addItem(
+                    InventoryChanges: await addItem(inventory, internalName, quantity, premiumPurchase, seed)
-                        inventory,
-                        internalName,
-                        quantity,
-                        premiumPurchase,
-                        seed,
-                        undefined,
-                        true
-                    )
                 };
                 break;
             }
@@ -534,9 +524,7 @@ const handleTypesPurchase = async (
     logger.debug(`type category ${typeCategory}`);
     switch (typeCategory) {
         default:
-            return {
+            return { InventoryChanges: await addItem(inventory, typesName, quantity, premiumPurchase, seed) };
-                InventoryChanges: await addItem(inventory, typesName, quantity, premiumPurchase, seed, undefined, true)
-            };
         case "BoosterPacks":
             return handleBoosterPackPurchase(typesName, inventory, quantity);
         case "SlotItems":

src/services/saveLoadoutService.ts

@@ -149,8 +149,7 @@ export const handleInventoryItemConfigChange = async (
                     } else {
                         const inventoryItem = inventory.WeaponSkins.id(itemId);
                         if (!inventoryItem) {
-                            logger.warn(`inventory item WeaponSkins not found with id ${itemId}`);
+                            throw new Error(`inventory item WeaponSkins not found with id ${itemId}`);
-                            continue;
                         }
                         if ("Favorite" in itemConfigEntries) {
                             inventoryItem.Favorite = itemConfigEntries.Favorite;
@@ -178,8 +177,7 @@ export const handleInventoryItemConfigChange = async (
                         const inventoryItem = inventory[equipmentName].id(itemId);
 
                         if (!inventoryItem) {
-                            logger.warn(`inventory item ${equipmentName} not found with id ${itemId}`);
+                            throw new Error(`inventory item ${equipmentName} not found with id ${itemId}`);
-                            continue;
                         }
 
                         for (const [configId, config] of Object.entries(itemConfigEntries)) {

src/services/serversideVendorsService.ts

@@ -281,10 +281,6 @@ const generateVendorManifest = (
                         offersToAdd.push(item);
                         ++offset;
                     }
-                    if (missingItemsPerBin[item.bin]) {
-                        missingItemsPerBin[item.bin] -= 1;
-                        numOffersThatNeedToMatchABin -= 1;
-                    }
                 } else {
                     numCountedOffers += 1 + item.duplicates;
                 }

src/services/worldStateService.ts

@@ -1524,25 +1524,6 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
 };
 
 export const populateFissures = async (worldState: IWorldState): Promise<void> => {
-    if (config.worldState?.allTheFissures) {
-        let i = 0;
-        for (const [tier, nodes] of Object.entries(fissureMissions)) {
-            for (const node of nodes) {
-                const meta = ExportRegions[node];
-                worldState.ActiveMissions.push({
-                    _id: { $oid: (i++).toString().padStart(8, "0") + "8e0c70ba050f1eb7" },
-                    Region: meta.systemIndex + 1,
-                    Seed: 1337,
-                    Activation: { $date: { $numberLong: "1000000000000" } },
-                    Expiry: { $date: { $numberLong: "2000000000000" } },
-                    Node: node,
-                    MissionType: eMissionType[meta.missionIndex].tag,
-                    Modifier: tier,
-                    Hard: config.worldState.allTheFissures == "hard"
-                });
-            }
-        }
-    } else {
     const fissures = await Fissure.find({});
     for (const fissure of fissures) {
         const meta = ExportRegions[fissure.Node];
@@ -1558,7 +1539,6 @@ export const populateFissures = async (worldState: IWorldState): Promise<void> =
             Hard: fissure.Hard
         });
     }
-    }
 };
 
 export const idToBountyCycle = (id: string): number => {

src/types/inventoryTypes/inventoryTypes.ts

@@ -380,7 +380,6 @@ export interface IInventoryClient extends IDailyAffiliations, InventoryClientEqu
     LockedWeaponGroup?: ILockedWeaponGroupClient;
     HubNpcCustomizations?: IHubNpcCustomization[];
     Ship?: IOrbiter; // U22 and below, response only
-    ClaimedJunctionChallengeRewards?: string[]; // U39
 }
 
 export interface IAffiliation {
@@ -449,9 +448,8 @@ export interface IVendorPurchaseHistoryEntryDatabase {
 
 export interface IChallengeProgress {
     Progress: number;
-    Completed?: string[];
-    ReceivedJunctionReward?: boolean; // U39
     Name: string;
+    Completed?: string[];
 }
 
 export interface ICollectibleEntry {

static/fixed_responses/allIncarnonList.json

@@ -45,6 +45,5 @@
   "/Lotus/Weapons/Tenno/Zariman/Melee/Tonfas/ZarimanTonfaWeapon",
   "/Lotus/Weapons/Tenno/Zariman/Pistols/HeavyPistol/ZarimanHeavyPistol",
   "/Lotus/Weapons/Thanotech/EntFistIncarnon/EntFistIncarnon",
-  "/Lotus/Weapons/Thanotech/EntratiWristGun/EntratiWristGunWeapon",
+  "/Lotus/Weapons/Thanotech/EntratiWristGun/EntratiWristGunWeapon"
-  "/Lotus/Weapons/Tenno/Zariman/Melee/HeavyScythe/ZarimanHeavyScythe/ZarimanHeavyScytheWeapon"
 ]

static/webui/index.html

@@ -98,9 +98,9 @@
                         <button class="btn btn-primary" type="submit" data-loc="general_addButton"></button>
                     </form>
                 </div>
-                <div class="row g-3 mb-3">
+                <div class="row g-3">
                     <div class="col-md-3">
-                        <div class="card">
+                        <div class="card mb-3">
                             <h5 class="card-header" data-loc="currency_RegularCredits"></h5>
                             <div class="card-body">
                                 <p class="card-text" id="RegularCredits-owned"></p>
@@ -112,7 +112,7 @@
                         </div>
                     </div>
                     <div class="col-md-3">
-                        <div class="card">
+                        <div class="card mb-3">
                             <h5 class="card-header" data-loc="currency_PremiumCredits"></h5>
                             <div class="card-body">
                                 <p class="card-text" id="PremiumCredits-owned"></p>
@@ -124,7 +124,7 @@
                         </div>
                     </div>
                     <div class="col-md-3">
-                        <div class="card">
+                        <div class="card mb-3">
                             <h5 class="card-header" data-loc="currency_FusionPoints"></h5>
                             <div class="card-body">
                                 <p class="card-text" id="FusionPoints-owned"></p>
@@ -136,7 +136,7 @@
                         </div>
                     </div>
                     <div class="col-md-3">
-                        <div class="card">
+                        <div class="card mb-3">
                             <h5 class="card-header" data-loc="currency_PrimeTokens"></h5>
                             <div class="card-body">
                                 <p class="card-text" id="PrimeTokens-owned"></p>
@@ -148,9 +148,9 @@
                         </div>
                     </div>
                 </div>
-                <div class="row g-3 mb-3">
+                <div class="row g-3">
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_suits"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('Suits');return false;">
@@ -164,7 +164,7 @@
                         </div>
                     </div>
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_longGuns"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="handleModularSelection('LongGuns');return false;">
@@ -183,9 +183,9 @@
                         </div>
                     </div>
                 </div>
-                <div class="row g-3 mb-3">
+                <div class="row g-3">
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_pistols"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="handleModularSelection('Pistols');return false;">
@@ -204,7 +204,7 @@
                         </div>
                     </div>
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_melee"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="handleModularSelection('Melee');return false;">
@@ -223,9 +223,9 @@
                         </div>
                     </div>
                 </div>
-                <div class="row g-3 mb-3">
+                <div class="row g-3">
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_spaceSuits"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('SpaceSuits');return false;">
@@ -239,7 +239,7 @@
                         </div>
                     </div>
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_spaceGuns"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('SpaceGuns');return false;">
@@ -253,9 +253,9 @@
                         </div>
                     </div>
                 </div>
-                <div class="row g-3 mb-3">
+                <div class="row g-3">
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_spaceMelee"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('SpaceMelee');return false;">
@@ -269,7 +269,7 @@
                         </div>
                     </div>
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_mechSuits"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('MechSuits');return false;">
@@ -283,9 +283,9 @@
                         </div>
                     </div>
                 </div>
-                <div class="row g-3 mb-3">
+                <div class="row g-3">
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_sentinels"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('Sentinels');return false;">
@@ -299,7 +299,7 @@
                         </div>
                     </div>
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_moaPets"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="handleModularSelection('MoaPets');return false;">
@@ -325,9 +325,9 @@
                         </div>
                     </div>
                 </div>
-                <div class="row g-3 mb-3">
+                <div class="row g-3">
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_kubrowPets"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="handleModularSelection('KubrowPets');return false;">
@@ -349,7 +349,7 @@
                         </div>
                     </div>
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_sentinelWeapons"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('SentinelWeapons');return false;">
@@ -363,9 +363,9 @@
                         </div>
                     </div>
                 </div>
-                <div class="row g-3 mb-3">
+                <div class="row g-3">
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_operatorAmps"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="handleModularSelection('OperatorAmps');return false;">
@@ -384,7 +384,7 @@
                         </div>
                     </div>
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_hoverboards"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="doAcquireModularEquipment('HoverBoards');return false;">
@@ -401,9 +401,9 @@
                         </div>
                     </div>
                 </div>
-                <div class="row g-3 mb-3">
+                <div class="row g-3">
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_evolutionProgress"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="doAcquireEvolution();return false;">
@@ -417,7 +417,7 @@
                         </div>
                     </div>
                     <div class="col-lg-6">
-                        <div class="card" style="height: 400px;">
+                        <div class="card mb-3" style="height: 400px;">
                             <h5 class="card-header" data-loc="inventory_Boosters"></h5>
                             <div class="card-body overflow-auto">
                                 <form class="input-group mb-3" onsubmit="doAcquireBoosters();return false;">
@@ -431,7 +431,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="card">
+                <div class="card mb-3">
                     <h5 class="card-header" data-loc="general_bulkActions"></h5>
                     <div class="card-body">
                         <div class="mb-2 d-flex flex-wrap gap-2">
@@ -458,7 +458,7 @@
             <div id="powersuit-route" data-route="~ /webui/powersuit/(.+)" data-title="Inventory | OpenWF WebUI">
                 <h3 class="mb-0"></h3>
                 <p class="text-body-secondary"></p>
-                <div class="card">
+                <div class="card mb-3">
                     <h5 class="card-header" data-loc="powersuit_archonShardsLabel"></h5>
                     <div class="card-body">
                         <p>
@@ -498,7 +498,7 @@
                                 <a href="riven-tool/" target="_blank" data-loc="mods_fingerprintHelp"></a>
                             </form>
                         </div>
-                        <div class="card">
+                        <div class="card mb-3">
                             <h5 class="card-header" data-loc="mods_rivens"></h5>
                             <div class="card-body">
                                 <table class="table table-hover w-100">
@@ -521,7 +521,7 @@
                                 </table>
                             </div>
                         </div>
-                        <div class="card">
+                        <div class="card mb-3">
                             <h5 class="card-header" data-loc="general_bulkActions"></h5>
                             <div class="card-body d-flex flex-wrap gap-2">
                                 <button class="btn btn-primary" onclick="doAddAllMods();" data-loc="mods_addMissingUnrankedMods"></button>
@@ -535,7 +535,7 @@
             <div data-route="/webui/quests" data-title="Quests | OpenWF WebUI">
                 <div class="row g-3">
                     <div class="col-md-6">
-                        <div class="card">
+                        <div class="card mb-3">
                             <h5 class="card-header" data-loc="quests_list"></h5>
                             <div class="card-body">
                                 <form class="input-group mb-3" onsubmit="doAcquireEquipment('QuestKeys');return false;">
@@ -549,7 +549,7 @@
                         </div>
                     </div>
                     <div class="col-md-6">
-                        <div class="card">
+                        <div class="card mb-3">
                             <h5 class="card-header" data-loc="general_bulkActions"></h5>
                             <div class="card-body">
                                 <div class="d-flex flex-wrap gap-2">
@@ -565,13 +565,13 @@
             <div data-route="/webui/cheats, /webui/settings" data-title="Cheats | OpenWF WebUI">
                 <div class="row g-3">
                     <div class="col-md-6">
-                        <div class="card">
+                        <div class="card mb-3">
                             <h5 class="card-header" data-loc="cheats_server"></h5>
                             <div class="card-body">
-                                <div class="d-none config-admin-hide">
+                                <div id="server-settings-no-perms" class="d-none">
                                     <p class="card-text" data-loc="cheats_administratorRequirement"></p>
                                 </div>
-                                <div class="d-none config-admin-show config-form">
+                                <div id="server-settings" class="d-none">
                                     <div class="form-check">
                                         <input class="form-check-input" type="checkbox" id="skipTutorial" />
                                         <label class="form-check-label" for="skipTutorial" data-loc="cheats_skipTutorial"></label>
@@ -794,7 +794,6 @@
                                     <button class="btn btn-primary" onclick="debounce(doUnlockAllMissions);" data-loc="cheats_unlockAllMissions"></button>
                                     <button class="btn btn-primary" onclick="doUnlockAllFocusSchools();" data-loc="cheats_unlockAllFocusSchools"></button>
                                     <button class="btn btn-primary" onclick="doHelminthUnlockAll();" data-loc="cheats_helminthUnlockAll"></button>
-                                    <button class="btn btn-primary" onclick="debounce(addMissingHelminthRecipes);" data-loc="cheats_addMissingSubsumedAbilities"></button>
                                     <button class="btn btn-primary" onclick="doIntrinsicsUnlockAll();" data-loc="cheats_intrinsicsUnlockAll"></button>
                                     <button class="btn btn-primary" onclick="debounce(doMaxPlexus);" data-loc="inventory_maxPlexus"></button>
                                 </div>
@@ -807,93 +806,6 @@
                                 </form>
                             </div>
                         </div>
-                        <div class="card d-none config-admin-show config-form">
-                            <h5 class="card-header" data-loc="worldState"></h5>
-                            <div class="card-body">
-                                <div class="form-check">
-                                    <input class="form-check-input" type="checkbox" id="worldState.creditBoost" />
-                                    <label class="form-check-label" for="worldState.creditBoost" data-loc="worldState_creditBoost"></label>
-                                </div>
-                                <div class="form-check">
-                                    <input class="form-check-input" type="checkbox" id="worldState.affinityBoost" />
-                                    <label class="form-check-label" for="worldState.affinityBoost" data-loc="worldState_affinityBoost"></label>
-                                </div>
-                                <div class="form-check">
-                                    <input class="form-check-input" type="checkbox" id="worldState.resourceBoost" />
-                                    <label class="form-check-label" for="worldState.resourceBoost" data-loc="worldState_resourceBoost"></label>
-                                </div>
-                                <div class="form-check">
-                                    <input class="form-check-input" type="checkbox" id="worldState.starDays" />
-                                    <label class="form-check-label" for="worldState.starDays" data-loc="worldState_starDays"></label>
-                                </div>
-                                <div class="form-group mt-2">
-                                    <label class="form-label" for="changeSyndicate" data-loc="worldState_galleonOfGhouls"></label>
-                                    <select class="form-control" id="worldState.galleonOfGhouls">
-                                        <option value="0" data-loc="disabled"></option>
-                                        <option value="1" data-loc="worldState_we1"></option>
-                                        <option value="2" data-loc="worldState_we2"></option>
-                                        <option value="3" data-loc="worldState_we3"></option>
-                                    </select>
-                                </div>
-                                <div class="form-group mt-2">
-                                    <label class="form-label" for="changeSyndicate" data-loc="worldState_eidolonOverride"></label>
-                                    <select class="form-control" id="worldState.eidolonOverride">
-                                        <option value="" data-loc="disabled"></option>
-                                        <option value="day" data-loc="worldState_day"></option>
-                                        <option value="night" data-loc="worldState_night"></option>
-                                    </select>
-                                </div>
-                                <div class="form-group mt-2">
-                                    <label class="form-label" for="changeSyndicate" data-loc="worldState_vallisOverride"></label>
-                                    <select class="form-control" id="worldState.vallisOverride">
-                                        <option value="" data-loc="disabled"></option>
-                                        <option value="warm" data-loc="worldState_warm"></option>
-                                        <option value="cold" data-loc="worldState_cold"></option>
-                                    </select>
-                                </div>
-                                <div class="form-group mt-2">
-                                    <label class="form-label" for="changeSyndicate" data-loc="worldState_duviriOverride"></label>
-                                    <select class="form-control" id="worldState.duviriOverride">
-                                        <option value="" data-loc="disabled"></option>
-                                        <option value="joy" data-loc="worldState_joy"></option>
-                                        <option value="anger" data-loc="worldState_anger"></option>
-                                        <option value="envy" data-loc="worldState_envy"></option>
-                                        <option value="sorrow" data-loc="worldState_sorrow"></option>
-                                        <option value="fear" data-loc="worldState_fear"></option>
-                                    </select>
-                                </div>
-                                <div class="form-group mt-2">
-                                    <label class="form-label" for="changeSyndicate" data-loc="worldState_nightwaveOverride"></label>
-                                    <select class="form-control" id="worldState.nightwaveOverride">
-                                        <option value="" data-loc="disabled"></option>
-                                        <option value="RadioLegionIntermission13Syndicate" data-loc="worldState_RadioLegionIntermission13Syndicate"></option>
-                                        <option value="RadioLegionIntermission12Syndicate" data-loc="worldState_RadioLegionIntermission12Syndicate"></option>
-                                        <option value="RadioLegionIntermission11Syndicate" data-loc="worldState_RadioLegionIntermission11Syndicate"></option>
-                                        <option value="RadioLegionIntermission10Syndicate" data-loc="worldState_RadioLegionIntermission10Syndicate"></option>
-                                        <option value="RadioLegionIntermission9Syndicate" data-loc="worldState_RadioLegionIntermission9Syndicate"></option>
-                                        <option value="RadioLegionIntermission8Syndicate" data-loc="worldState_RadioLegionIntermission8Syndicate"></option>
-                                        <option value="RadioLegionIntermission7Syndicate" data-loc="worldState_RadioLegionIntermission7Syndicate"></option>
-                                        <option value="RadioLegionIntermission6Syndicate" data-loc="worldState_RadioLegionIntermission6Syndicate"></option>
-                                        <option value="RadioLegionIntermission5Syndicate" data-loc="worldState_RadioLegionIntermission5Syndicate"></option>
-                                        <option value="RadioLegionIntermission4Syndicate" data-loc="worldState_RadioLegionIntermission4Syndicate"></option>
-                                        <option value="RadioLegionIntermission3Syndicate" data-loc="worldState_RadioLegionIntermission3Syndicate"></option>
-                                        <option value="RadioLegion3Syndicate" data-loc="worldState_RadioLegion3Syndicate"></option>
-                                        <option value="RadioLegionIntermission2Syndicate" data-loc="worldState_RadioLegionIntermission2Syndicate"></option>
-                                        <option value="RadioLegion2Syndicate" data-loc="worldState_RadioLegion2Syndicate"></option>
-                                        <option value="RadioLegionIntermissionSyndicate" data-loc="worldState_RadioLegionIntermissionSyndicate"></option>
-                                        <option value="RadioLegionSyndicate" data-loc="worldState_RadioLegionSyndicate"></option>
-                                    </select>
-                                </div>
-                                <div class="form-group mt-2">
-                                    <label class="form-label" for="changeSyndicate" data-loc="worldState_fissures"></label>
-                                    <select class="form-control" id="worldState.allTheFissures">
-                                        <option value="" data-loc="normal"></option>
-                                        <option value="normal" data-loc="worldState_allAtOnceNormal"></option>
-                                        <option value="hard" data-loc="worldState_allAtOnceSteelPath"></option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
                     </div>
                 </div>
             </div>

static/webui/script.js

@@ -248,8 +248,7 @@ const permanentEvolutionWeapons = new Set([
     "/Lotus/Weapons/Tenno/Zariman/Melee/Tonfas/ZarimanTonfaWeapon",
     "/Lotus/Weapons/Tenno/Zariman/Pistols/HeavyPistol/ZarimanHeavyPistol",
     "/Lotus/Weapons/Thanotech/EntFistIncarnon/EntFistIncarnon",
-    "/Lotus/Weapons/Thanotech/EntratiWristGun/EntratiWristGunWeapon",
+    "/Lotus/Weapons/Thanotech/EntratiWristGun/EntratiWristGunWeapon"
-    "/Lotus/Weapons/Tenno/Zariman/Melee/HeavyScythe/ZarimanHeavyScythe/ZarimanHeavyScytheWeapon"
 ]);
 
 let uniqueLevelCaps = {};
@@ -1450,11 +1449,6 @@ function addMissingEquipment(categories) {
     }
 }
 
-async function addMissingHelminthRecipes() {
-    await revalidateAuthz();
-    await fetch("/custom/addMissingHelminthBlueprints?" + window.authz);
-}
-
 function addMissingEvolutionProgress() {
     const requests = [];
     document.querySelectorAll("#datalist-EvolutionProgress option").forEach(elm => {
@@ -1847,28 +1841,16 @@ function doAcquireMod() {
     }
 }
 
-const uiConfigs = [...$(".config-form input[id], .config-form select[id]")].map(x => x.id);
+const uiConfigs = [...$("#server-settings input[id]")].map(x => x.id);
 
 for (const id of uiConfigs) {
     const elm = document.getElementById(id);
-    if (elm.tagName == "SELECT") {
+    if (elm.type == "checkbox") {
-        elm.onchange = function () {
-            let value = this.value;
-            if (!isNaN(parseInt(value))) {
-                value = parseInt(value);
-            }
-            $.post({
-                url: "/custom/setConfig?" + window.authz,
-                contentType: "application/json",
-                data: JSON.stringify({ [id]: value })
-            });
-        };
-    } else if (elm.type == "checkbox") {
         elm.onchange = function () {
             $.post({
-                url: "/custom/setConfig?" + window.authz,
+                url: "/custom/config?" + window.authz,
                 contentType: "application/json",
-                data: JSON.stringify({ [id]: this.checked })
+                data: JSON.stringify({ key: id, value: this.checked })
             }).then(() => {
                 if (["infiniteCredits", "infinitePlatinum", "infiniteEndo", "infiniteRegalAya"].indexOf(id) != -1) {
                     updateInventory();
@@ -1881,9 +1863,9 @@ for (const id of uiConfigs) {
 function doSaveConfig(id) {
     const elm = document.getElementById(id);
     $.post({
-        url: "/custom/setConfig?" + window.authz,
+        url: "/custom/config?" + window.authz,
         contentType: "application/json",
-        data: JSON.stringify({ [id]: parseInt(elm.value) })
+        data: JSON.stringify({ key: id, value: parseInt(elm.value) })
     });
 }
 
@@ -1894,15 +1876,12 @@ single.getRoute("/webui/cheats").on("beforeload", function () {
     interval = setInterval(() => {
         if (window.authz) {
             clearInterval(interval);
-            $.post({
+            fetch("/custom/config?" + window.authz).then(async res => {
-                url: "/custom/getConfig?" + window.authz,
+                if (res.status == 200) {
-                contentType: "application/json",
-                data: JSON.stringify(uiConfigs)
-            })
-                .done(json => {
                     //window.is_admin = true;
-                    $(".config-admin-hide").addClass("d-none");
+                    $("#server-settings-no-perms").addClass("d-none");
-                    $(".config-admin-show").removeClass("d-none");
+                    $("#server-settings").removeClass("d-none");
+                    res.json().then(json =>
                         Object.entries(json).forEach(entry => {
                             const [key, value] = entry;
                             var x = document.getElementById(`${key}`);
@@ -1913,10 +1892,10 @@ single.getRoute("/webui/cheats").on("beforeload", function () {
                                     x.setAttribute("value", `${value}`);
                                 }
                             }
-                    });
                         })
-                .fail(res => {
+                    );
-                    if (res.responseText == "Log-in expired") {
+                } else {
+                    if ((await res.text()) == "Log-in expired") {
                         revalidateAuthz().then(() => {
                             if (single.getCurrentPath() == "/webui/cheats") {
                                 single.loadRoute("/webui/cheats");
@@ -1924,8 +1903,9 @@ single.getRoute("/webui/cheats").on("beforeload", function () {
                         });
                     } else {
                         //window.is_admin = false;
-                        $(".config-admin-hide").removeClass("d-none");
+                        $("#server-settings-no-perms").removeClass("d-none");
-                        $(".config-admin-show").addClass("d-none");
+                        $("#server-settings").addClass("d-none");
+                    }
                 }
             });
         }

static/webui/translations/de.js

@@ -181,56 +181,10 @@ dict = {
     cheats_account: `Account`,
     cheats_unlockAllFocusSchools: `Alle Fokus-Schulen freischalten`,
     cheats_helminthUnlockAll: `Helminth vollständig aufleveln`,
-    cheats_addMissingSubsumedAbilities: `[UNTRANSLATED] Add Missing Subsumed Abilities`,
     cheats_intrinsicsUnlockAll: `Alle Inhärenzen auf Max. Rang`,
     cheats_changeSupportedSyndicate: `Unterstütztes Syndikat`,
     cheats_changeButton: `Ändern`,
     cheats_none: `Keines`,
-
-    worldState: `[UNTRANSLATED] World State`,
-    worldState_creditBoost: `[UNTRANSLATED] Credit Boost`,
-    worldState_affinityBoost: `[UNTRANSLATED] Affinity Boost`,
-    worldState_resourceBoost: `[UNTRANSLATED] Resource Boost`,
-    worldState_starDays: `[UNTRANSLATED] Star Days`,
-    worldState_galleonOfGhouls: `[UNTRANSLATED] Galleon of Ghouls`,
-    disabled: `[UNTRANSLATED] Disabled`,
-    worldState_we1: `[UNTRANSLATED] Weekend 1`,
-    worldState_we2: `[UNTRANSLATED] Weekend 2`,
-    worldState_we3: `[UNTRANSLATED] Weekend 3`,
-    worldState_eidolonOverride: `[UNTRANSLATED] Eidolon Override`,
-    worldState_day: `[UNTRANSLATED] Day`,
-    worldState_night: `[UNTRANSLATED] Night`,
-    worldState_vallisOverride: `[UNTRANSLATED] Orb Vallis Override`,
-    worldState_warm: `[UNTRANSLATED] Warm`,
-    worldState_cold: `[UNTRANSLATED] Cold`,
-    worldState_duviriOverride: `[UNTRANSLATED] Duviri Override`,
-    worldState_joy: `[UNTRANSLATED] Joy`,
-    worldState_anger: `[UNTRANSLATED] Anger`,
-    worldState_envy: `[UNTRANSLATED] Envy`,
-    worldState_sorrow: `[UNTRANSLATED] Sorrow`,
-    worldState_fear: `[UNTRANSLATED] Fear`,
-    worldState_nightwaveOverride: `[UNTRANSLATED] Nightwave Override`,
-    worldState_RadioLegionIntermission13Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 9`,
-    worldState_RadioLegionIntermission12Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 8`,
-    worldState_RadioLegionIntermission11Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 7`,
-    worldState_RadioLegionIntermission10Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 6`,
-    worldState_RadioLegionIntermission9Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 5`,
-    worldState_RadioLegionIntermission8Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 4`,
-    worldState_RadioLegionIntermission7Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 3`,
-    worldState_RadioLegionIntermission6Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 2`,
-    worldState_RadioLegionIntermission5Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 1`,
-    worldState_RadioLegionIntermission4Syndicate: `[UNTRANSLATED] Nora's Choice`,
-    worldState_RadioLegionIntermission3Syndicate: `[UNTRANSLATED] Intermission III`,
-    worldState_RadioLegion3Syndicate: `[UNTRANSLATED] Glassmaker`,
-    worldState_RadioLegionIntermission2Syndicate: `[UNTRANSLATED] Intermission II`,
-    worldState_RadioLegion2Syndicate: `[UNTRANSLATED] The Emissary`,
-    worldState_RadioLegionIntermissionSyndicate: `[UNTRANSLATED] Intermission I`,
-    worldState_RadioLegionSyndicate: `[UNTRANSLATED] The Wolf of Saturn Six`,
-    worldState_fissures: `[UNTRANSLATED] Fissures`,
-    normal: `[UNTRANSLATED] Normal`,
-    worldState_allAtOnceNormal: `[UNTRANSLATED] All At Once, Normal`,
-    worldState_allAtOnceSteelPath: `[UNTRANSLATED] All At Once, Steel Path`,
-
     import_importNote: `Du kannst hier eine vollständige oder teilweise Inventarantwort (Client-Darstellung) einfügen. Alle Felder, die vom Importer unterstützt werden, <b>werden in deinem Account überschrieben</b>.`,
     import_submit: `Absenden`,
     import_samples: `[UNTRANSLATED] Samples:`,

static/webui/translations/en.js

@@ -180,56 +180,10 @@ dict = {
     cheats_account: `Account`,
     cheats_unlockAllFocusSchools: `Unlock All Focus Schools`,
     cheats_helminthUnlockAll: `Fully Level Up Helminth`,
-    cheats_addMissingSubsumedAbilities: `Add Missing Subsumed Abilities`,
     cheats_intrinsicsUnlockAll: `Max Rank All Intrinsics`,
     cheats_changeSupportedSyndicate: `Supported syndicate`,
     cheats_changeButton: `Change`,
     cheats_none: `None`,
-
-    worldState: `World State`,
-    worldState_creditBoost: `Credit Boost`,
-    worldState_affinityBoost: `Affinity Boost`,
-    worldState_resourceBoost: `Resource Boost`,
-    worldState_starDays: `Star Days`,
-    worldState_galleonOfGhouls: `Galleon of Ghouls`,
-    disabled: `Disabled`,
-    worldState_we1: `Weekend 1`,
-    worldState_we2: `Weekend 2`,
-    worldState_we3: `Weekend 3`,
-    worldState_eidolonOverride: `Eidolon Override`,
-    worldState_day: `Day`,
-    worldState_night: `Night`,
-    worldState_vallisOverride: `Orb Vallis Override`,
-    worldState_warm: `Warm`,
-    worldState_cold: `Cold`,
-    worldState_duviriOverride: `Duviri Override`,
-    worldState_joy: `Joy`,
-    worldState_anger: `Anger`,
-    worldState_envy: `Envy`,
-    worldState_sorrow: `Sorrow`,
-    worldState_fear: `Fear`,
-    worldState_nightwaveOverride: `Nightwave Override`,
-    worldState_RadioLegionIntermission13Syndicate: `Nora's Mix Vol. 9`,
-    worldState_RadioLegionIntermission12Syndicate: `Nora's Mix Vol. 8`,
-    worldState_RadioLegionIntermission11Syndicate: `Nora's Mix Vol. 7`,
-    worldState_RadioLegionIntermission10Syndicate: `Nora's Mix Vol. 6`,
-    worldState_RadioLegionIntermission9Syndicate: `Nora's Mix Vol. 5`,
-    worldState_RadioLegionIntermission8Syndicate: `Nora's Mix Vol. 4`,
-    worldState_RadioLegionIntermission7Syndicate: `Nora's Mix Vol. 3`,
-    worldState_RadioLegionIntermission6Syndicate: `Nora's Mix Vol. 2`,
-    worldState_RadioLegionIntermission5Syndicate: `Nora's Mix Vol. 1`,
-    worldState_RadioLegionIntermission4Syndicate: `Nora's Choice`,
-    worldState_RadioLegionIntermission3Syndicate: `Intermission III`,
-    worldState_RadioLegion3Syndicate: `Glassmaker`,
-    worldState_RadioLegionIntermission2Syndicate: `Intermission II`,
-    worldState_RadioLegion2Syndicate: `The Emissary`,
-    worldState_RadioLegionIntermissionSyndicate: `Intermission I`,
-    worldState_RadioLegionSyndicate: `The Wolf of Saturn Six`,
-    worldState_fissures: `Fissures`,
-    normal: `Normal`,
-    worldState_allAtOnceNormal: `All At Once, Normal`,
-    worldState_allAtOnceSteelPath: `All At Once, Steel Path`,
-
     import_importNote: `You can provide a full or partial inventory response (client respresentation) here. All fields that are supported by the importer <b>will be overwritten</b> in your account.`,
     import_submit: `Submit`,
     import_samples: `Samples:`,

static/webui/translations/es.js

@@ -181,56 +181,10 @@ dict = {
     cheats_account: `Cuenta`,
     cheats_unlockAllFocusSchools: `Desbloquear todas las escuelas de enfoque`,
     cheats_helminthUnlockAll: `Subir al máximo el Helminto`,
-    cheats_addMissingSubsumedAbilities: `[UNTRANSLATED] Add Missing Subsumed Abilities`,
     cheats_intrinsicsUnlockAll: `Maximizar todos los intrínsecos`,
     cheats_changeSupportedSyndicate: `Sindicatos disponibles`,
     cheats_changeButton: `Cambiar`,
     cheats_none: `Ninguno`,
-
-    worldState: `[UNTRANSLATED] World State`,
-    worldState_creditBoost: `[UNTRANSLATED] Credit Boost`,
-    worldState_affinityBoost: `[UNTRANSLATED] Affinity Boost`,
-    worldState_resourceBoost: `[UNTRANSLATED] Resource Boost`,
-    worldState_starDays: `[UNTRANSLATED] Star Days`,
-    worldState_galleonOfGhouls: `[UNTRANSLATED] Galleon of Ghouls`,
-    disabled: `[UNTRANSLATED] Disabled`,
-    worldState_we1: `[UNTRANSLATED] Weekend 1`,
-    worldState_we2: `[UNTRANSLATED] Weekend 2`,
-    worldState_we3: `[UNTRANSLATED] Weekend 3`,
-    worldState_eidolonOverride: `[UNTRANSLATED] Eidolon Override`,
-    worldState_day: `[UNTRANSLATED] Day`,
-    worldState_night: `[UNTRANSLATED] Night`,
-    worldState_vallisOverride: `[UNTRANSLATED] Orb Vallis Override`,
-    worldState_warm: `[UNTRANSLATED] Warm`,
-    worldState_cold: `[UNTRANSLATED] Cold`,
-    worldState_duviriOverride: `[UNTRANSLATED] Duviri Override`,
-    worldState_joy: `[UNTRANSLATED] Joy`,
-    worldState_anger: `[UNTRANSLATED] Anger`,
-    worldState_envy: `[UNTRANSLATED] Envy`,
-    worldState_sorrow: `[UNTRANSLATED] Sorrow`,
-    worldState_fear: `[UNTRANSLATED] Fear`,
-    worldState_nightwaveOverride: `[UNTRANSLATED] Nightwave Override`,
-    worldState_RadioLegionIntermission13Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 9`,
-    worldState_RadioLegionIntermission12Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 8`,
-    worldState_RadioLegionIntermission11Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 7`,
-    worldState_RadioLegionIntermission10Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 6`,
-    worldState_RadioLegionIntermission9Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 5`,
-    worldState_RadioLegionIntermission8Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 4`,
-    worldState_RadioLegionIntermission7Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 3`,
-    worldState_RadioLegionIntermission6Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 2`,
-    worldState_RadioLegionIntermission5Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 1`,
-    worldState_RadioLegionIntermission4Syndicate: `[UNTRANSLATED] Nora's Choice`,
-    worldState_RadioLegionIntermission3Syndicate: `[UNTRANSLATED] Intermission III`,
-    worldState_RadioLegion3Syndicate: `[UNTRANSLATED] Glassmaker`,
-    worldState_RadioLegionIntermission2Syndicate: `[UNTRANSLATED] Intermission II`,
-    worldState_RadioLegion2Syndicate: `[UNTRANSLATED] The Emissary`,
-    worldState_RadioLegionIntermissionSyndicate: `[UNTRANSLATED] Intermission I`,
-    worldState_RadioLegionSyndicate: `[UNTRANSLATED] The Wolf of Saturn Six`,
-    worldState_fissures: `[UNTRANSLATED] Fissures`,
-    normal: `[UNTRANSLATED] Normal`,
-    worldState_allAtOnceNormal: `[UNTRANSLATED] All At Once, Normal`,
-    worldState_allAtOnceSteelPath: `[UNTRANSLATED] All At Once, Steel Path`,
-
     import_importNote: `Puedes proporcionar una respuesta de inventario completa o parcial (representación del cliente) aquí. Todos los campos compatibles con el importador <b>serán sobrescritos</b> en tu cuenta.`,
     import_submit: `Enviar`,
     import_samples: `Muestras:`,

static/webui/translations/fr.js

@@ -181,56 +181,10 @@ dict = {
     cheats_account: `Compte`,
     cheats_unlockAllFocusSchools: `Débloquer toutes les écoles de focus`,
     cheats_helminthUnlockAll: `Helminth niveau max`,
-    cheats_addMissingSubsumedAbilities: `[UNTRANSLATED] Add Missing Subsumed Abilities`,
     cheats_intrinsicsUnlockAll: `Inhérences niveau max`,
     cheats_changeSupportedSyndicate: `Allégeance`,
     cheats_changeButton: `Changer`,
     cheats_none: `Aucun`,
-
-    worldState: `[UNTRANSLATED] World State`,
-    worldState_creditBoost: `[UNTRANSLATED] Credit Boost`,
-    worldState_affinityBoost: `[UNTRANSLATED] Affinity Boost`,
-    worldState_resourceBoost: `[UNTRANSLATED] Resource Boost`,
-    worldState_starDays: `[UNTRANSLATED] Star Days`,
-    worldState_galleonOfGhouls: `[UNTRANSLATED] Galleon of Ghouls`,
-    disabled: `[UNTRANSLATED] Disabled`,
-    worldState_we1: `[UNTRANSLATED] Weekend 1`,
-    worldState_we2: `[UNTRANSLATED] Weekend 2`,
-    worldState_we3: `[UNTRANSLATED] Weekend 3`,
-    worldState_eidolonOverride: `[UNTRANSLATED] Eidolon Override`,
-    worldState_day: `[UNTRANSLATED] Day`,
-    worldState_night: `[UNTRANSLATED] Night`,
-    worldState_vallisOverride: `[UNTRANSLATED] Orb Vallis Override`,
-    worldState_warm: `[UNTRANSLATED] Warm`,
-    worldState_cold: `[UNTRANSLATED] Cold`,
-    worldState_duviriOverride: `[UNTRANSLATED] Duviri Override`,
-    worldState_joy: `[UNTRANSLATED] Joy`,
-    worldState_anger: `[UNTRANSLATED] Anger`,
-    worldState_envy: `[UNTRANSLATED] Envy`,
-    worldState_sorrow: `[UNTRANSLATED] Sorrow`,
-    worldState_fear: `[UNTRANSLATED] Fear`,
-    worldState_nightwaveOverride: `[UNTRANSLATED] Nightwave Override`,
-    worldState_RadioLegionIntermission13Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 9`,
-    worldState_RadioLegionIntermission12Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 8`,
-    worldState_RadioLegionIntermission11Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 7`,
-    worldState_RadioLegionIntermission10Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 6`,
-    worldState_RadioLegionIntermission9Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 5`,
-    worldState_RadioLegionIntermission8Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 4`,
-    worldState_RadioLegionIntermission7Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 3`,
-    worldState_RadioLegionIntermission6Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 2`,
-    worldState_RadioLegionIntermission5Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 1`,
-    worldState_RadioLegionIntermission4Syndicate: `[UNTRANSLATED] Nora's Choice`,
-    worldState_RadioLegionIntermission3Syndicate: `[UNTRANSLATED] Intermission III`,
-    worldState_RadioLegion3Syndicate: `[UNTRANSLATED] Glassmaker`,
-    worldState_RadioLegionIntermission2Syndicate: `[UNTRANSLATED] Intermission II`,
-    worldState_RadioLegion2Syndicate: `[UNTRANSLATED] The Emissary`,
-    worldState_RadioLegionIntermissionSyndicate: `[UNTRANSLATED] Intermission I`,
-    worldState_RadioLegionSyndicate: `[UNTRANSLATED] The Wolf of Saturn Six`,
-    worldState_fissures: `[UNTRANSLATED] Fissures`,
-    normal: `[UNTRANSLATED] Normal`,
-    worldState_allAtOnceNormal: `[UNTRANSLATED] All At Once, Normal`,
-    worldState_allAtOnceSteelPath: `[UNTRANSLATED] All At Once, Steel Path`,
-
     import_importNote: `Import manuel. Toutes les modifcations supportées par l'inventaire <b>écraseront celles présentes dans la base de données</b>.`,
     import_submit: `Soumettre`,
     import_samples: `Echantillons :`,

static/webui/translations/ru.js

@@ -181,56 +181,10 @@ dict = {
     cheats_account: `Аккаунт`,
     cheats_unlockAllFocusSchools: `Разблокировать все школы фокуса`,
     cheats_helminthUnlockAll: `Полностью улучшить Гельминта`,
-    cheats_addMissingSubsumedAbilities: `Добавить отсутствующие поглощённые способности`,
     cheats_intrinsicsUnlockAll: `Полностью улучшить Модуляры`,
     cheats_changeSupportedSyndicate: `Поддерживаемый синдикат`,
     cheats_changeButton: `Изменить`,
     cheats_none: `Отсутствует`,
-
-    worldState: `[UNTRANSLATED] World State`,
-    worldState_creditBoost: `[UNTRANSLATED] Credit Boost`,
-    worldState_affinityBoost: `[UNTRANSLATED] Affinity Boost`,
-    worldState_resourceBoost: `[UNTRANSLATED] Resource Boost`,
-    worldState_starDays: `[UNTRANSLATED] Star Days`,
-    worldState_galleonOfGhouls: `[UNTRANSLATED] Galleon of Ghouls`,
-    disabled: `[UNTRANSLATED] Disabled`,
-    worldState_we1: `[UNTRANSLATED] Weekend 1`,
-    worldState_we2: `[UNTRANSLATED] Weekend 2`,
-    worldState_we3: `[UNTRANSLATED] Weekend 3`,
-    worldState_eidolonOverride: `[UNTRANSLATED] Eidolon Override`,
-    worldState_day: `[UNTRANSLATED] Day`,
-    worldState_night: `[UNTRANSLATED] Night`,
-    worldState_vallisOverride: `[UNTRANSLATED] Orb Vallis Override`,
-    worldState_warm: `[UNTRANSLATED] Warm`,
-    worldState_cold: `[UNTRANSLATED] Cold`,
-    worldState_duviriOverride: `[UNTRANSLATED] Duviri Override`,
-    worldState_joy: `[UNTRANSLATED] Joy`,
-    worldState_anger: `[UNTRANSLATED] Anger`,
-    worldState_envy: `[UNTRANSLATED] Envy`,
-    worldState_sorrow: `[UNTRANSLATED] Sorrow`,
-    worldState_fear: `[UNTRANSLATED] Fear`,
-    worldState_nightwaveOverride: `[UNTRANSLATED] Nightwave Override`,
-    worldState_RadioLegionIntermission13Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 9`,
-    worldState_RadioLegionIntermission12Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 8`,
-    worldState_RadioLegionIntermission11Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 7`,
-    worldState_RadioLegionIntermission10Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 6`,
-    worldState_RadioLegionIntermission9Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 5`,
-    worldState_RadioLegionIntermission8Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 4`,
-    worldState_RadioLegionIntermission7Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 3`,
-    worldState_RadioLegionIntermission6Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 2`,
-    worldState_RadioLegionIntermission5Syndicate: `[UNTRANSLATED] Nora's Mix Vol. 1`,
-    worldState_RadioLegionIntermission4Syndicate: `[UNTRANSLATED] Nora's Choice`,
-    worldState_RadioLegionIntermission3Syndicate: `[UNTRANSLATED] Intermission III`,
-    worldState_RadioLegion3Syndicate: `[UNTRANSLATED] Glassmaker`,
-    worldState_RadioLegionIntermission2Syndicate: `[UNTRANSLATED] Intermission II`,
-    worldState_RadioLegion2Syndicate: `[UNTRANSLATED] The Emissary`,
-    worldState_RadioLegionIntermissionSyndicate: `[UNTRANSLATED] Intermission I`,
-    worldState_RadioLegionSyndicate: `[UNTRANSLATED] The Wolf of Saturn Six`,
-    worldState_fissures: `[UNTRANSLATED] Fissures`,
-    normal: `[UNTRANSLATED] Normal`,
-    worldState_allAtOnceNormal: `[UNTRANSLATED] All At Once, Normal`,
-    worldState_allAtOnceSteelPath: `[UNTRANSLATED] All At Once, Steel Path`,
-
     import_importNote: `Вы можете загрузить полный или частичный ответ инвентаря (клиентское представление) здесь. Все поддерживаемые поля <b>будут перезаписаны</b> в вашем аккаунте.`,
     import_submit: `Отправить`,
     import_samples: `[UNTRANSLATED] Samples:`,

static/webui/translations/zh.js

@@ -1,4 +1,4 @@
-// Chinese translation by meb154, bishan178 & Corvus
+// Chinese translation by meb154 & bishan178
 dict = {
     general_inventoryUpdateNote: `注意：此处所做的更改只有在游戏同步仓库后才会生效。您可以通过访问星图来触发仓库更新。`,
     general_addButton: `添加`,
@@ -74,9 +74,9 @@ dict = {
     inventory_longGuns: `主要武器`,
     inventory_pistols: `次要武器`,
     inventory_melee: `近战武器`,
-    inventory_spaceSuits: `载具`,
+    inventory_spaceSuits: `Archwings`,
-    inventory_spaceGuns: `载具主武器`,
+    inventory_spaceGuns: `Archwing主武器`,
-    inventory_spaceMelee: `载具近战武器`,
+    inventory_spaceMelee: `Archwing近战武器`,
     inventory_mechSuits: `殁世机甲`,
     inventory_sentinels: `守护`,
     inventory_sentinelWeapons: `守护武器`,
@@ -88,15 +88,15 @@ dict = {
     inventory_Boosters: `加成器`,
     inventory_bulkAddSuits: `添加缺失战甲`,
     inventory_bulkAddWeapons: `添加缺失武器`,
-    inventory_bulkAddSpaceSuits: `添加缺失载具`,
+    inventory_bulkAddSpaceSuits: `添加缺失Archwing`,
-    inventory_bulkAddSpaceWeapons: `添加缺失载具武器`,
+    inventory_bulkAddSpaceWeapons: `添加缺失Archwing武器`,
     inventory_bulkAddSentinels: `添加缺失守护`,
     inventory_bulkAddSentinelWeapons: `添加缺失守护武器`,
     inventory_bulkAddEvolutionProgress: `添加缺失的灵化之源`,
     inventory_bulkRankUpSuits: `所有战甲升满级`,
     inventory_bulkRankUpWeapons: `所有武器升满级`,
-    inventory_bulkRankUpSpaceSuits: `所有载具升满级`,
+    inventory_bulkRankUpSpaceSuits: `所有Archwing升满级`,
-    inventory_bulkRankUpSpaceWeapons: `所有载具武器升满级`,
+    inventory_bulkRankUpSpaceWeapons: `所有Archwing武器升满级`,
     inventory_bulkRankUpSentinels: `所有守护升满级`,
     inventory_bulkRankUpSentinelWeapons: `所有守护武器升满级`,
     inventory_bulkRankUpEvolutionProgress: `所有灵化之源最大等级`,
@@ -181,56 +181,10 @@ dict = {
     cheats_account: `账户`,
     cheats_unlockAllFocusSchools: `解锁所有专精学派`,
     cheats_helminthUnlockAll: `完全升级Helminth`,
-    cheats_addMissingSubsumedAbilities: `添加Helminth未汲取的战甲技能`,
     cheats_intrinsicsUnlockAll: `所有内源之力最大等级`,
     cheats_changeSupportedSyndicate: `支持的集团`,
     cheats_changeButton: `更改`,
     cheats_none: `无`,
-
-    worldState: `世界状态配置`,
-    worldState_creditBoost: `现金加成`,
-    worldState_affinityBoost: `经验加成`,
-    worldState_resourceBoost: `资源加成`,
-    worldState_starDays: `活动：星日`,
-    worldState_galleonOfGhouls: `战术警报：尸鬼的帆船战舰`,
-    disabled: `关闭/取消配置`,
-    worldState_we1: `活动阶段：第一周`,
-    worldState_we2: `活动阶段：第二周`,
-    worldState_we3: `活动阶段：第三周`,
-    worldState_eidolonOverride: `夜灵平原/魔胎之境状态`,
-    worldState_day: `白昼/FASS`,
-    worldState_night: `黑夜/VOME`,
-    worldState_vallisOverride: `奥布山谷状态`,
-    worldState_warm: `温暖`,
-    worldState_cold: `寒冷`,
-    worldState_duviriOverride: `双衍王镜状态`,
-    worldState_joy: `喜悦`,
-    worldState_anger: `愤怒`,
-    worldState_envy: `嫉妒`,
-    worldState_sorrow: `悲伤`,
-    worldState_fear: `恐惧`,
-    worldState_nightwaveOverride: `午夜电波系列`,
-    worldState_RadioLegionIntermission13Syndicate: `诺拉的混选VOL.9`,
-    worldState_RadioLegionIntermission12Syndicate: `诺拉的混选VOL.8`,
-    worldState_RadioLegionIntermission11Syndicate: `诺拉的混选VOL.7`,
-    worldState_RadioLegionIntermission10Syndicate: `诺拉的混选VOL.6`,
-    worldState_RadioLegionIntermission9Syndicate: `诺拉的混选VOL.5`,
-    worldState_RadioLegionIntermission8Syndicate: `诺拉的混选VOL.4`,
-    worldState_RadioLegionIntermission7Syndicate: `诺拉的混选VOL.3`,
-    worldState_RadioLegionIntermission6Syndicate: `诺拉的混选VOL.2`,
-    worldState_RadioLegionIntermission5Syndicate: `诺拉的混选VOL.1`,
-    worldState_RadioLegionIntermission4Syndicate: `诺拉的精选`,
-    worldState_RadioLegionIntermission3Syndicate: `间歇III`,
-    worldState_RadioLegion3Syndicate: `系列3 — 玻璃匠`,
-    worldState_RadioLegionIntermission2Syndicate: `间歇II`,
-    worldState_RadioLegion2Syndicate: `系列2 — 使徒`,
-    worldState_RadioLegionIntermissionSyndicate: `间歇I`,
-    worldState_RadioLegionSyndicate: `系列1 — 土星六号之狼`,
-    worldState_fissures: `虚空裂缝难度设定`,
-    normal: `正常`,
-    worldState_allAtOnceNormal: `全部开启（普通）`,
-    worldState_allAtOnceSteelPath: `全部开启（钢铁之路）`,
-
     import_importNote: `您可以在此处提供完整或部分库存响应（客户端表示）。支持的所有字段<b>将被覆盖</b>到您的账户中。`,
     import_submit: `提交`,
     import_samples: `示例:`,