prettier

.vscode/launch.json

@@ -8,7 +8,8 @@
       "type": "node",
       "request": "launch",
       "name": "Debug and Watch",
-      "args": ["${workspaceFolder}/scripts/dev.js"],
+      "runtimeArgs": ["-r", "tsconfig-paths/register", "-r", "ts-node/register", "--watch-path", "src"],
+      "args": ["${workspaceFolder}/src/index.ts"],
       "console": "integratedTerminal"
     }
   ]

package-lock.json

@@ -23,7 +23,7 @@
         "ncp": "^2.0.0",
         "typescript": "^5.5",
         "undici": "^7.10.0",
-        "warframe-public-export-plus": "^0.5.74",
+        "warframe-public-export-plus": "^0.5.72",
         "warframe-riven-info": "^0.1.2",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0",
@@ -3386,9 +3386,9 @@
       }
     },
     "node_modules/warframe-public-export-plus": {
-      "version": "0.5.74",
-      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.74.tgz",
-      "integrity": "sha512-pA7dxA0lKn9w/2Sc97oxnn+CEzL1SrT9XriNLTDF4Xp+2SBEpGcfbqbdR9ljPQJopIbrc9Zy02R+uBQVomcwyA=="
+      "version": "0.5.72",
+      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.72.tgz",
+      "integrity": "sha512-oOZgtU6L0MGcPRKfA6+bonu+Db1kie1lVdLmA7/DbheTPweNkBEx3Hx3Seib+hEaFW+nLj3T5GtmGxGcFHCHfg=="
     },
     "node_modules/warframe-riven-info": {
       "version": "0.1.2",

package.json

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

src/controllers/api/checkDailyMissionBonusController.ts

@@ -1,12 +1,16 @@
-import { getAccountForRequest } from "@/src/services/loginService";
 import { RequestHandler } from "express";
 
-export const checkDailyMissionBonusController: RequestHandler = async (req, res) => {
-    const account = await getAccountForRequest(req);
-    const today = Math.trunc(Date.now() / 86400000) * 86400;
-    if (account.DailyFirstWinDate != today) {
-        res.send("DailyMissionBonus:1-DailyPVPWinBonus:1\n");
-    } else {
-        res.send("DailyMissionBonus:0-DailyPVPWinBonus:1\n");
-    }
+const checkDailyMissionBonusController: RequestHandler = (_req, res) => {
+    const data = Buffer.from([
+        0x44, 0x61, 0x69, 0x6c, 0x79, 0x4d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x6f, 0x6e, 0x75, 0x73, 0x3a,
+        0x31, 0x2d, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x50, 0x56, 0x50, 0x57, 0x69, 0x6e, 0x42, 0x6f, 0x6e, 0x75, 0x73,
+        0x3a, 0x31, 0x0a
+    ]);
+    res.writeHead(200, {
+        "Content-Type": "text/html",
+        "Content-Length": data.length
+    });
+    res.end(data);
 };
+
+export { checkDailyMissionBonusController };

src/controllers/api/missionInventoryUpdateController.ts

@@ -88,7 +88,7 @@ export const missionInventoryUpdateController: RequestHandler = async (req, res)
         AffiliationMods,
         SyndicateXPItemReward,
         ConquestCompletedMissionsCount
-    } = await addMissionRewards(account, inventory, missionReport, firstCompletion);
+    } = await addMissionRewards(inventory, missionReport, firstCompletion);
 
     if (missionReport.EndOfMatchUpload) {
         inventory.RewardSeed = generateRewardSeed();

src/controllers/api/placeDecoInComponentController.ts

@@ -57,11 +57,7 @@ export const placeDecoInComponentController: RequestHandler = async (req, res) =
                 component.DecoCapacity -= meta.capacityCost;
             }
         } else {
-            const [itemType, meta] = Object.entries(ExportResources).find(arr => arr[1].deco == deco.Type)!;
-            if (!itemType || meta.dojoCapacityCost === undefined) {
-                throw new Error(`unknown deco type: ${deco.Type}`);
-            }
-            component.DecoCapacity -= meta.dojoCapacityCost;
+            const itemType = Object.entries(ExportResources).find(arr => arr[1].deco == deco.Type)![0];
             if (deco.Sockets !== undefined) {
                 guild.VaultFusionTreasures!.find(x => x.ItemType == itemType && x.Sockets == deco.Sockets)!.ItemCount -=
                     1;

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/completeAllMissionsController.ts

@@ -26,7 +26,7 @@ export const completeAllMissionsController: RequestHandler = async (req, res) =>
         if (mission.Completes == 0) {
             mission.Completes++;
             if (node.missionReward) {
-                addFixedLevelRewards(node.missionReward, MissionRewards);
+                addFixedLevelRewards(node.missionReward, inventory, MissionRewards);
             }
         }
         mission.Tier = 1;

src/controllers/custom/configController.ts

@@ -1,44 +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";
-import { sendWsBroadcastExcept } from "@/src/services/webService";
-
-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;
-        }
-        sendWsBroadcastExcept(parseInt(String(req.query.wsid)), { config_reloaded: true });
-        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/setBoosterController.ts

@@ -23,9 +23,9 @@ export const setBoosterController: RequestHandler = async (req, res) => {
         res.status(400).send("Invalid ItemType provided.");
         return;
     }
-    const now = Math.trunc(Date.now() / 1000);
+    const now = Math.floor(Date.now() / 1000);
     for (const { ItemType, ExpiryDate } of requests) {
-        if (ExpiryDate <= now) {
+        if (ExpiryDate < now) {
             // remove expired boosters
             const index = boosters.findIndex(item => item.ItemType === ItemType);
             if (index !== -1) {

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/loginModel.ts

@@ -25,8 +25,7 @@ const databaseAccountSchema = new Schema<IDatabaseAccountJson>(
         LastLogin: { type: Date, default: 0 },
         LatestEventMessageDate: { type: Date, default: 0 },
         LastLoginRewardDate: { type: Number, default: 0 },
-        LoginDays: { type: Number, default: 1 },
-        DailyFirstWinDate: { type: Number, default: 0 }
+        LoginDays: { type: Number, default: 1 }
     },
     opts
 );

src/routes/custom.ts

@@ -25,7 +25,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();
 
@@ -54,7 +55,7 @@ customRouter.post("/manageQuests", manageQuestsController);
 customRouter.post("/setEvolutionProgress", setEvolutionProgressController);
 customRouter.post("/setBooster", setBoosterController);
 
-customRouter.post("/getConfig", getConfigController);
-customRouter.post("/setConfig", setConfigController);
+customRouter.get("/config", getConfigDataController);
+customRouter.post("/config", updateConfigDataController);
 
 export { customRouter };

src/services/guildService.ts

@@ -349,8 +349,7 @@ export const removeDojoDeco = (
             component.DecoCapacity! += meta.capacityCost;
         }
     } else {
-        const [itemType, meta] = Object.entries(ExportResources).find(arr => arr[1].deco == deco.Type)!;
-        component.DecoCapacity! += meta.dojoCapacityCost!;
+        const itemType = Object.entries(ExportResources).find(arr => arr[1].deco == deco.Type)![0];
         if (deco.Sockets !== undefined) {
             addVaultFusionTreasures(guild, [
                 {

src/services/inventoryService.ts

@@ -1832,15 +1832,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))
-                .InventoryChanges;
+            return (await handleStoreItemAcquisition(reward.StoreItemType, inventory, reward.Amount)).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,
@@ -234,7 +235,7 @@ export const addMissionInventoryUpdates = async (
     }
     for (const [key, value] of getEntriesUnsafe(inventoryUpdates)) {
         if (value === undefined) {
-            logger.error(`Inventory update key ${key} has no value`);
+            logger.error(`Inventory update key ${key} has no value `);
             continue;
         }
         switch (key) {
@@ -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": {
@@ -962,7 +968,6 @@ const droptableAliases: Record<string, string> = {
 
 //TODO: return type of partial missioninventoryupdate response
 export const addMissionRewards = async (
-    account: TAccountDocument,
     inventory: TInventoryDatabaseDocument,
     {
         wagerTier: wagerTier,
@@ -1010,17 +1015,13 @@ export const addMissionRewards = async (
         const fixedLevelRewards = getLevelKeyRewards(levelKeyName);
         //logger.debug(`fixedLevelRewards ${fixedLevelRewards}`);
         if (fixedLevelRewards.levelKeyRewards) {
-            missionCompletionCredits += addFixedLevelRewards(
-                fixedLevelRewards.levelKeyRewards,
-                MissionRewards,
-                rewardInfo
-            );
+            addFixedLevelRewards(fixedLevelRewards.levelKeyRewards, inventory, MissionRewards, rewardInfo);
         }
         if (fixedLevelRewards.levelKeyRewards2) {
             for (const reward of fixedLevelRewards.levelKeyRewards2) {
                 //quest stage completion credit rewards
                 if (reward.rewardType == "RT_CREDITS") {
-                    missionCompletionCredits += reward.amount;
+                    missionCompletionCredits += reward.amount; // will be added to inventory in addCredits
                     continue;
                 }
                 MissionRewards.push({
@@ -1049,11 +1050,12 @@ export const addMissionRewards = async (
         ) {
             const levelCreditReward = getLevelCreditRewards(node);
             missionCompletionCredits += levelCreditReward;
+            inventory.RegularCredits += levelCreditReward;
             logger.debug(`levelCreditReward ${levelCreditReward}`);
         }
 
         if (node.missionReward) {
-            missionCompletionCredits += addFixedLevelRewards(node.missionReward, MissionRewards, rewardInfo);
+            missionCompletionCredits += addFixedLevelRewards(node.missionReward, inventory, MissionRewards, rewardInfo);
         }
 
         if (rewardInfo.sortieTag == "Mission1") {
@@ -1163,9 +1165,7 @@ export const addMissionRewards = async (
         combineInventoryChanges(inventoryChanges, inventoryChange.InventoryChanges);
     }
 
-    inventory.RegularCredits += missionCompletionCredits;
-
-    const credits = await addCredits(account, inventory, {
+    const credits = addCredits(inventory, {
         missionCompletionCredits,
         missionDropCredits: creditDrops ?? 0,
         rngRewardCredits: inventoryChanges.RegularCredits ?? 0
@@ -1388,61 +1388,48 @@ export const addMissionRewards = async (
     };
 };
 
-export const addCredits = async (
-    account: TAccountDocument,
+//creditBonus is not entirely accurate.
+//TODO: consider ActiveBoosters
+export const addCredits = (
     inventory: TInventoryDatabaseDocument,
     {
         missionDropCredits,
         missionCompletionCredits,
         rngRewardCredits
     }: { missionDropCredits: number; missionCompletionCredits: number; rngRewardCredits: number }
-): Promise<IMissionCredits> => {
+): IMissionCredits => {
+    const hasDailyCreditBonus = true;
+    const totalCredits = missionDropCredits + missionCompletionCredits + rngRewardCredits;
+
     const finalCredits: IMissionCredits = {
         MissionCredits: [missionDropCredits, missionDropCredits],
-        CreditsBonus: [missionCompletionCredits, missionCompletionCredits],
-        TotalCredits: [0, 0]
+        CreditBonus: [missionCompletionCredits, missionCompletionCredits],
+        TotalCredits: [totalCredits, totalCredits]
     };
 
-    const today = Math.trunc(Date.now() / 86400000) * 86400;
-    if (account.DailyFirstWinDate != today) {
-        account.DailyFirstWinDate = today;
-        await account.save();
-
-        logger.debug(`daily first win, doubling missionCompletionCredits (${missionCompletionCredits})`);
-
-        finalCredits.DailyMissionBonus = true;
+    if (hasDailyCreditBonus) {
         inventory.RegularCredits += missionCompletionCredits;
-        finalCredits.CreditsBonus[1] *= 2;
+        finalCredits.CreditBonus[1] *= 2;
+        finalCredits.MissionCredits[1] *= 2;
+        finalCredits.TotalCredits[1] *= 2;
     }
 
-    const totalCredits = finalCredits.MissionCredits[1] + finalCredits.CreditsBonus[1] + rngRewardCredits;
-    finalCredits.TotalCredits = [totalCredits, totalCredits];
-
-    if (config.worldState?.creditBoost) {
-        inventory.RegularCredits += finalCredits.TotalCredits[1];
-        finalCredits.TotalCredits[1] += finalCredits.TotalCredits[1];
+    if (!hasDailyCreditBonus) {
+        return finalCredits;
     }
-    const now = Math.trunc(Date.now() / 1000); // TOVERIFY: Should we maybe subtract mission time as to apply credit boosters that expired during mission?
-    if ((inventory.Boosters.find(x => x.ItemType == "/Lotus/Types/Boosters/CreditBooster")?.ExpiryDate ?? 0) > now) {
-        inventory.RegularCredits += finalCredits.TotalCredits[1];
-        finalCredits.TotalCredits[1] += finalCredits.TotalCredits[1];
-    }
-    if ((inventory.Boosters.find(x => x.ItemType == "/Lotus/Types/Boosters/CreditBlessing")?.ExpiryDate ?? 0) > now) {
-        inventory.RegularCredits += finalCredits.TotalCredits[1];
-        finalCredits.TotalCredits[1] += finalCredits.TotalCredits[1];
-    }
-
-    return finalCredits;
+    return { ...finalCredits, DailyMissionBonus: true };
 };
 
 export const addFixedLevelRewards = (
     rewards: IMissionRewardExternal,
+    inventory: TInventoryDatabaseDocument,
     MissionRewards: IMissionReward[],
     rewardInfo?: IRewardInfo
 ): number => {
     let missionBonusCredits = 0;
     if (rewards.credits) {
         missionBonusCredits += rewards.credits;
+        inventory.RegularCredits += rewards.credits;
     }
     if (rewards.items) {
         for (const item of rewards.items) {
@@ -1616,27 +1603,6 @@ function getRandomMissionDrops(
                     ? "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriKullervoSteelPathRNGRewards"
                     : "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriKullervoNormalRNGRewards"
             ];
-        } else if (RewardInfo.T == 17) {
-            if (mission?.Tier == 1) {
-                logger.warn(`non-steel path duviri murmur tier used on steel path?!`);
-            }
-            /*if (operation eight claw is active) {
-                drops.push({
-                    StoreItem: "/Lotus/StoreItems/Types/Gameplay/DuviriMITW/Resources/DuviriMurmurItemEvent",
-                    ItemCount: 10
-                });
-            }*/
-            rewardManifests = ["/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriMurmurFinalChestRewards"];
-        } else if (RewardInfo.T == 19) {
-            /*if (operation eight claw is active) {
-                drops.push({
-                    StoreItem: "/Lotus/StoreItems/Types/Gameplay/DuviriMITW/Resources/DuviriMurmurItemEvent",
-                    ItemCount: 15
-                });
-            }*/
-            rewardManifests = [
-                "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriMurmurFinalSteelChestRewards"
-            ];
         } else if (RewardInfo.T == 70) {
             // Orowyrm chest, gives 10 Pathos Clamps, or 15 on Steel Path.
             drops.push({

src/services/questService.ts

@@ -331,7 +331,7 @@ export const giveKeyChainMissionReward = async (
             const fixedLevelRewards = getLevelKeyRewards(missionName);
             if (fixedLevelRewards.levelKeyRewards) {
                 const missionRewards: { StoreItem: string; ItemCount: number }[] = [];
-                inventory.RegularCredits += addFixedLevelRewards(fixedLevelRewards.levelKeyRewards, missionRewards);
+                addFixedLevelRewards(fixedLevelRewards.levelKeyRewards, inventory, missionRewards);
 
                 for (const reward of missionRewards) {
                     await addItem(inventory, fromStoreItem(reward.StoreItem), reward.ItemCount);

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}`);
-                            continue;
+                            throw new Error(`inventory item WeaponSkins not found with id ${itemId}`);
                         }
                         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}`);
-                            continue;
+                            throw new Error(`inventory item ${equipmentName} not found with id ${itemId}`);
                         }
 
                         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/shipCustomizationsService.ts

@@ -59,12 +59,7 @@ export const handleSetShipDecorations = async (
     const roomToPlaceIn = rooms.find(room => room.Name === placedDecoration.Room);
 
     if (!roomToPlaceIn) {
-        throw new Error(`unknown room: ${placedDecoration.Room}`);
-    }
-
-    const [itemType, meta] = Object.entries(ExportResources).find(arr => arr[1].deco == placedDecoration.Type)!;
-    if (!itemType || meta.capacityCost === undefined) {
-        throw new Error(`unknown deco type: ${placedDecoration.Type}`);
+        throw new Error("room not found");
     }
 
     if (placedDecoration.MoveId) {
@@ -88,7 +83,7 @@ export const handleSetShipDecorations = async (
                 OldRoom: placedDecoration.OldRoom,
                 NewRoom: placedDecoration.Room,
                 IsApartment: placedDecoration.IsApartment,
-                MaxCapacityIncrease: 0
+                MaxCapacityIncrease: 0 // TODO: calculate capacity change upon removal
             };
         }
 
@@ -101,7 +96,6 @@ export const handleSetShipDecorations = async (
         }
 
         oldRoom.PlacedDecos.pull({ _id: placedDecoration.MoveId });
-        oldRoom.MaxCapacity += meta.capacityCost;
 
         const newDecoration = {
             Type: placedDecoration.Type,
@@ -114,14 +108,12 @@ export const handleSetShipDecorations = async (
 
         //the new room is still roomToPlaceIn
         roomToPlaceIn.PlacedDecos.push(newDecoration);
-        roomToPlaceIn.MaxCapacity -= meta.capacityCost;
-
         await personalRooms.save();
         return {
             OldRoom: placedDecoration.OldRoom,
             NewRoom: placedDecoration.Room,
             IsApartment: placedDecoration.IsApartment,
-            MaxCapacityIncrease: -meta.capacityCost
+            MaxCapacityIncrease: 0 // TODO: calculate capacity change upon removal
         };
     }
 
@@ -129,11 +121,11 @@ export const handleSetShipDecorations = async (
         const decoIndex = roomToPlaceIn.PlacedDecos.findIndex(x => x._id.equals(placedDecoration.RemoveId));
         const deco = roomToPlaceIn.PlacedDecos[decoIndex];
         roomToPlaceIn.PlacedDecos.splice(decoIndex, 1);
-        roomToPlaceIn.MaxCapacity += meta.capacityCost;
         await personalRooms.save();
 
         if (!config.unlockAllShipDecorations) {
             const inventory = await getInventory(accountId);
+            const itemType = Object.entries(ExportResources).find(arr => arr[1].deco == deco.Type)![0];
             if (deco.Sockets !== undefined) {
                 addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: deco.Sockets, ItemCount: 1 }]);
             } else {
@@ -146,20 +138,24 @@ export const handleSetShipDecorations = async (
             DecoId: placedDecoration.RemoveId,
             Room: placedDecoration.Room,
             IsApartment: placedDecoration.IsApartment,
-            MaxCapacityIncrease: 0 // Client already implies the capacity being refunded.
+            MaxCapacityIncrease: 0
         };
+    } else {
+        if (!config.unlockAllShipDecorations) {
+            const inventory = await getInventory(accountId);
+            const itemType = Object.entries(ExportResources).find(arr => arr[1].deco == placedDecoration.Type)![0];
+            if (placedDecoration.Sockets !== undefined) {
+                addFusionTreasures(inventory, [
+                    { ItemType: itemType, Sockets: placedDecoration.Sockets, ItemCount: -1 }
+                ]);
+            } else {
+                addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: -1 }]);
+            }
+            await inventory.save();
+        }
     }
 
-    if (!config.unlockAllShipDecorations) {
-        const inventory = await getInventory(accountId);
-        const itemType = Object.entries(ExportResources).find(arr => arr[1].deco == placedDecoration.Type)![0];
-        if (placedDecoration.Sockets !== undefined) {
-            addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: placedDecoration.Sockets, ItemCount: -1 }]);
-        } else {
-            addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: -1 }]);
-        }
-        await inventory.save();
-    }
+    // TODO: handle capacity
 
     //place decoration
     const decoId = new Types.ObjectId();
@@ -171,16 +167,10 @@ export const handleSetShipDecorations = async (
         Sockets: placedDecoration.Sockets,
         _id: decoId
     });
-    roomToPlaceIn.MaxCapacity -= meta.capacityCost;
 
     await personalRooms.save();
 
-    return {
-        DecoId: decoId.toString(),
-        Room: placedDecoration.Room,
-        IsApartment: placedDecoration.IsApartment,
-        MaxCapacityIncrease: -meta.capacityCost
-    };
+    return { DecoId: decoId.toString(), Room: placedDecoration.Room, IsApartment: placedDecoration.IsApartment };
 };
 
 export const handleSetPlacedDecoInfo = async (accountId: string, req: ISetPlacedDecoInfoRequest): Promise<void> => {

src/services/webService.ts

@@ -136,10 +136,7 @@ export const stopWebServer = async (): Promise<void> => {
     await Promise.all(promises);
 };
 
-let lastWsid: number = 0;
-
 interface IWsCustomData extends ws {
-    id?: number;
     accountId?: string;
 }
 
@@ -153,7 +150,6 @@ interface IWsMsgFromClient {
 }
 
 interface IWsMsgToClient {
-    //wsid?: number;
     reload?: boolean;
     ports?: {
         http: number | undefined;
@@ -178,10 +174,6 @@ const wsOnConnect = (ws: ws, req: http.IncomingMessage): void => {
         ws.close();
         return;
     }
-
-    (ws as IWsCustomData).id = ++lastWsid;
-    ws.send(JSON.stringify({ wsid: lastWsid }));
-
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     ws.on("message", async msg => {
         const data = JSON.parse(String(msg)) as IWsMsgFromClient;
@@ -276,21 +268,3 @@ export const sendWsBroadcastTo = (accountId: string, data: IWsMsgToClient): void
         }
     }
 };
-
-export const sendWsBroadcastExcept = (wsid: number | undefined, data: IWsMsgToClient): void => {
-    const msg = JSON.stringify(data);
-    if (wsServer) {
-        for (const client of wsServer.clients) {
-            if ((client as IWsCustomData).id != wsid) {
-                client.send(msg);
-            }
-        }
-    }
-    if (wssServer) {
-        for (const client of wssServer.clients) {
-            if ((client as IWsCustomData).id != wsid) {
-                client.send(msg);
-            }
-        }
-    }
-};

src/services/worldStateService.ts

@@ -373,7 +373,7 @@ const getSeasonChallengePools = (syndicateTag: string): IRotatingSeasonChallenge
         hardWeekly: syndicate.weeklyChallenges!.filter(x =>
             x.startsWith("/Lotus/Types/Challenges/Seasons/WeeklyHard/")
         ),
-        hasWeeklyPermanent: syndicate.weeklyChallenges!.some(x =>
+        hasWeeklyPermanent: !!syndicate.weeklyChallenges!.find(x =>
             x.startsWith("/Lotus/Types/Challenges/Seasons/Weekly/SeasonWeeklyPermanent")
         )
     };

src/types/loginTypes.ts

@@ -25,7 +25,6 @@ export interface IDatabaseAccount extends IDatabaseAccountRequiredFields {
     LatestEventMessageDate: Date;
     LastLoginRewardDate: number;
     LoginDays: number;
-    DailyFirstWinDate: number;
 }
 
 // Includes virtual ID

src/types/missionTypes.ts

@@ -17,9 +17,9 @@ export interface IMissionReward {
 }
 
 export interface IMissionCredits {
-    MissionCredits: [number, number];
-    CreditsBonus: [number, number]; // "Credit Reward"; `CreditsBonus[1]` is `CreditsBonus[0] * 2` if DailyMissionBonus
-    TotalCredits: [number, number];
+    MissionCredits: number[];
+    CreditBonus: number[];
+    TotalCredits: number[];
     DailyMissionBonus?: boolean;
 }
 

static/fixed_responses/allDecoRecipes.json

@@ -20,10 +20,6 @@
   "/Lotus/Levels/ClanDojo/ComponentPropRecipes/DojoRemasterTrophyGoldARecipe",
   "/Lotus/Levels/ClanDojo/ComponentPropRecipes/DojoRemasterTrophyPlatinumARecipe",
   "/Lotus/Levels/ClanDojo/ComponentPropRecipes/DojoRemasterTrophySilverARecipe",
-  "/Lotus/Levels/ClanDojo/ComponentPropRecipes/DuviriMurmurEventBronzeTrophyRecipe",
-  "/Lotus/Levels/ClanDojo/ComponentPropRecipes/DuviriMurmurEventClayTrophyRecipe",
-  "/Lotus/Levels/ClanDojo/ComponentPropRecipes/DuviriMurmurEventGoldTrophyRecipe",
-  "/Lotus/Levels/ClanDojo/ComponentPropRecipes/DuviriMurmurEventSilverTrophyRecipe",
   "/Lotus/Levels/ClanDojo/ComponentPropRecipes/EntratiEventBaseTrophyRecipe",
   "/Lotus/Levels/ClanDojo/ComponentPropRecipes/EntratiEventBronzeTrophyRecipe",
   "/Lotus/Levels/ClanDojo/ComponentPropRecipes/EntratiEventGoldTrophyRecipe",

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>
@@ -811,93 +811,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

@@ -10,8 +10,7 @@
 
 let auth_pending = false,
     did_initial_auth = false,
-    ws_is_open = false,
-    wsid = 0;
+    ws_is_open = false;
 const sendAuth = isRegister => {
     if (ws_is_open && localStorage.getItem("email") && localStorage.getItem("password")) {
         auth_pending = true;
@@ -35,9 +34,6 @@ function openWebSocket() {
     };
     window.ws.onmessage = e => {
         const msg = JSON.parse(e.data);
-        if ("wsid" in msg) {
-            wsid = msg.wsid;
-        }
         if ("reload" in msg) {
             setTimeout(() => {
                 getWebSocket().then(() => {
@@ -1851,28 +1847,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") {
-        elm.onchange = function () {
-            let value = this.value;
-            if (!isNaN(parseInt(value))) {
-                value = parseInt(value);
-            }
-            $.post({
-                url: "/custom/setConfig?" + window.authz + "&wsid=" + wsid,
-                contentType: "application/json",
-                data: JSON.stringify({ [id]: value })
-            });
-        };
-    } else if (elm.type == "checkbox") {
+    if (elm.type == "checkbox") {
         elm.onchange = function () {
             $.post({
-                url: "/custom/setConfig?" + window.authz + "&wsid=" + wsid,
+                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();
@@ -1885,9 +1869,9 @@ for (const id of uiConfigs) {
 function doSaveConfig(id) {
     const elm = document.getElementById(id);
     $.post({
-        url: "/custom/setConfig?" + window.authz + "&wsid=" + wsid,
+        url: "/custom/config?" + window.authz,
         contentType: "application/json",
-        data: JSON.stringify({ [id]: parseInt(elm.value) })
+        data: JSON.stringify({ key: id, value: parseInt(elm.value) })
     });
 }
 
@@ -1898,29 +1882,26 @@ single.getRoute("/webui/cheats").on("beforeload", function () {
     interval = setInterval(() => {
         if (window.authz) {
             clearInterval(interval);
-            $.post({
-                url: "/custom/getConfig?" + window.authz,
-                contentType: "application/json",
-                data: JSON.stringify(uiConfigs)
-            })
-                .done(json => {
+            fetch("/custom/config?" + window.authz).then(async res => {
+                if (res.status == 200) {
                     //window.is_admin = true;
-                    $(".config-admin-hide").addClass("d-none");
-                    $(".config-admin-show").removeClass("d-none");
-                    Object.entries(json).forEach(entry => {
-                        const [key, value] = entry;
-                        var x = document.getElementById(`${key}`);
-                        if (x != null) {
-                            if (x.type == "checkbox") {
-                                x.checked = value;
-                            } else if (x.type == "number") {
-                                x.setAttribute("value", `${value}`);
+                    $("#server-settings-no-perms").addClass("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}`);
+                            if (x != null) {
+                                if (x.type == "checkbox") {
+                                    x.checked = value;
+                                } else if (x.type == "number") {
+                                    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");
@@ -1928,10 +1909,11 @@ single.getRoute("/webui/cheats").on("beforeload", function () {
                         });
                     } else {
                         //window.is_admin = false;
-                        $(".config-admin-hide").removeClass("d-none");
-                        $(".config-admin-show").addClass("d-none");
+                        $("#server-settings-no-perms").removeClass("d-none");
+                        $("#server-settings").addClass("d-none");
                     }
-                });
+                }
+            });
         }
     }, 10);
 });
@@ -2293,13 +2275,14 @@ function doAcquireBoosters() {
     const ExpiryDate = Date.now() / 1000 + 3 * 24 * 60 * 60; // default 3 days
     setBooster(uniqueName, ExpiryDate, () => {
         $("#acquire-type-Boosters").val("");
+        updateInventory();
     });
 }
 
 function doChangeBoosterExpiry(ItemType, ExpiryDateInput) {
     console.log("Changing booster expiry for", ItemType, "to", ExpiryDateInput.value);
     // cast local datetime string to unix timestamp
-    const ExpiryDate = Math.trunc(new Date(ExpiryDateInput.value).getTime() / 1000);
+    const ExpiryDate = new Date(ExpiryDateInput.value).getTime() / 1000;
     if (isNaN(ExpiryDate)) {
         ExpiryDateInput.addClass("is-invalid").focus();
         return false;

static/webui/translations/de.js

@@ -187,51 +187,6 @@ dict = {
     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

@@ -186,51 +186,6 @@ dict = {
     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

@@ -187,51 +187,6 @@ dict = {
     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

@@ -187,51 +187,6 @@ dict = {
     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

@@ -187,51 +187,6 @@ dict = {
     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: `添加`,
@@ -187,51 +187,6 @@ dict = {
     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: `示例:`,