chore: use some instead of find

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

package-lock.json

@@ -23,7 +23,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.73",
         "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.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=="
+      "version": "0.5.73",
+      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.73.tgz",
+      "integrity": "sha512-v5lmaq/rNICg7WIZcosyfz92RpmrNyfW6+/Pbi9Iu8HbZH74PfaQKT6suAyC9xQn6xp8/cG3NLinqlLZovbKpw=="
     },
     "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.72",
+    "warframe-public-export-plus": "^0.5.73",
     "warframe-riven-info": "^0.1.2",
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0",

src/controllers/api/checkDailyMissionBonusController.ts

@@ -1,16 +1,12 @@
+import { getAccountForRequest } from "@/src/services/loginService";
 import { RequestHandler } from "express";
 
-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 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");
+    }
 };
-
-export { checkDailyMissionBonusController };

src/controllers/api/missionInventoryUpdateController.ts

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

src/controllers/api/placeDecoInComponentController.ts

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

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, inventory, MissionRewards);
+                addFixedLevelRewards(node.missionReward, MissionRewards);
             }
         }
         mission.Tier = 1;

src/controllers/custom/configController.ts

@@ -2,6 +2,7 @@ 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);
@@ -24,6 +25,7 @@ export const setConfigController: RequestHandler = async (req, res) => {
             const [obj, idx] = configIdToIndexable(id);
             obj[idx] = value;
         }
+        sendWsBroadcastExcept(parseInt(String(req.query.wsid)), { config_reloaded: true });
         await saveConfig();
         res.end();
     } else {

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.floor(Date.now() / 1000);
+    const now = Math.trunc(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/models/loginModel.ts

@@ -25,7 +25,8 @@ 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 }
+        LoginDays: { type: Number, default: 1 },
+        DailyFirstWinDate: { type: Number, default: 0 }
     },
     opts
 );

src/services/guildService.ts

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

src/services/missionInventoryUpdateService.ts

@@ -962,6 +962,7 @@ const droptableAliases: Record<string, string> = {
 
 //TODO: return type of partial missioninventoryupdate response
 export const addMissionRewards = async (
+    account: TAccountDocument,
     inventory: TInventoryDatabaseDocument,
     {
         wagerTier: wagerTier,
@@ -1009,13 +1010,17 @@ export const addMissionRewards = async (
         const fixedLevelRewards = getLevelKeyRewards(levelKeyName);
         //logger.debug(`fixedLevelRewards ${fixedLevelRewards}`);
         if (fixedLevelRewards.levelKeyRewards) {
-            addFixedLevelRewards(fixedLevelRewards.levelKeyRewards, inventory, MissionRewards, rewardInfo);
+            missionCompletionCredits += addFixedLevelRewards(
+                fixedLevelRewards.levelKeyRewards,
+                MissionRewards,
+                rewardInfo
+            );
         }
         if (fixedLevelRewards.levelKeyRewards2) {
             for (const reward of fixedLevelRewards.levelKeyRewards2) {
                 //quest stage completion credit rewards
                 if (reward.rewardType == "RT_CREDITS") {
-                    missionCompletionCredits += reward.amount; // will be added to inventory in addCredits
+                    missionCompletionCredits += reward.amount;
                     continue;
                 }
                 MissionRewards.push({
@@ -1044,12 +1049,11 @@ export const addMissionRewards = async (
         ) {
             const levelCreditReward = getLevelCreditRewards(node);
             missionCompletionCredits += levelCreditReward;
-            inventory.RegularCredits += levelCreditReward;
             logger.debug(`levelCreditReward ${levelCreditReward}`);
         }
 
         if (node.missionReward) {
-            missionCompletionCredits += addFixedLevelRewards(node.missionReward, inventory, MissionRewards, rewardInfo);
+            missionCompletionCredits += addFixedLevelRewards(node.missionReward, MissionRewards, rewardInfo);
         }
 
         if (rewardInfo.sortieTag == "Mission1") {
@@ -1159,7 +1163,9 @@ export const addMissionRewards = async (
         combineInventoryChanges(inventoryChanges, inventoryChange.InventoryChanges);
     }
 
-    const credits = addCredits(inventory, {
+    inventory.RegularCredits += missionCompletionCredits;
+
+    const credits = await addCredits(account, inventory, {
         missionCompletionCredits,
         missionDropCredits: creditDrops ?? 0,
         rngRewardCredits: inventoryChanges.RegularCredits ?? 0
@@ -1382,48 +1388,61 @@ export const addMissionRewards = async (
     };
 };
 
-//creditBonus is not entirely accurate.
-//TODO: consider ActiveBoosters
-export const addCredits = (
+export const addCredits = async (
+    account: TAccountDocument,
     inventory: TInventoryDatabaseDocument,
     {
         missionDropCredits,
         missionCompletionCredits,
         rngRewardCredits
     }: { missionDropCredits: number; missionCompletionCredits: number; rngRewardCredits: number }
-): IMissionCredits => {
-    const hasDailyCreditBonus = true;
-    const totalCredits = missionDropCredits + missionCompletionCredits + rngRewardCredits;
-
+): Promise<IMissionCredits> => {
     const finalCredits: IMissionCredits = {
         MissionCredits: [missionDropCredits, missionDropCredits],
-        CreditBonus: [missionCompletionCredits, missionCompletionCredits],
-        TotalCredits: [totalCredits, totalCredits]
+        CreditsBonus: [missionCompletionCredits, missionCompletionCredits],
+        TotalCredits: [0, 0]
     };
 
-    if (hasDailyCreditBonus) {
+    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;
         inventory.RegularCredits += missionCompletionCredits;
-        finalCredits.CreditBonus[1] *= 2;
-        finalCredits.MissionCredits[1] *= 2;
-        finalCredits.TotalCredits[1] *= 2;
+        finalCredits.CreditsBonus[1] *= 2;
     }
 
-    if (!hasDailyCreditBonus) {
-        return finalCredits;
+    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];
     }
-    return { ...finalCredits, DailyMissionBonus: true };
+    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;
 };
 
 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) {
@@ -1597,6 +1616,27 @@ 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 }[] = [];
-                addFixedLevelRewards(fixedLevelRewards.levelKeyRewards, inventory, missionRewards);
+                inventory.RegularCredits += addFixedLevelRewards(fixedLevelRewards.levelKeyRewards, missionRewards);
 
                 for (const reward of missionRewards) {
                     await addItem(inventory, fromStoreItem(reward.StoreItem), reward.ItemCount);

src/services/serversideVendorsService.ts

@@ -281,6 +281,10 @@ 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,7 +59,12 @@ export const handleSetShipDecorations = async (
     const roomToPlaceIn = rooms.find(room => room.Name === placedDecoration.Room);
 
     if (!roomToPlaceIn) {
-        throw new Error("room not found");
+        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}`);
     }
 
     if (placedDecoration.MoveId) {
@@ -83,7 +88,7 @@ export const handleSetShipDecorations = async (
                 OldRoom: placedDecoration.OldRoom,
                 NewRoom: placedDecoration.Room,
                 IsApartment: placedDecoration.IsApartment,
-                MaxCapacityIncrease: 0 // TODO: calculate capacity change upon removal
+                MaxCapacityIncrease: 0
             };
         }
 
@@ -96,6 +101,7 @@ export const handleSetShipDecorations = async (
         }
 
         oldRoom.PlacedDecos.pull({ _id: placedDecoration.MoveId });
+        oldRoom.MaxCapacity += meta.capacityCost;
 
         const newDecoration = {
             Type: placedDecoration.Type,
@@ -108,12 +114,14 @@ 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: 0 // TODO: calculate capacity change upon removal
+            MaxCapacityIncrease: -meta.capacityCost
         };
     }
 
@@ -121,11 +129,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 {
@@ -138,24 +146,20 @@ export const handleSetShipDecorations = async (
             DecoId: placedDecoration.RemoveId,
             Room: placedDecoration.Room,
             IsApartment: placedDecoration.IsApartment,
-            MaxCapacityIncrease: 0
+            MaxCapacityIncrease: 0 // Client already implies the capacity being refunded.
         };
-    } 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();
-        }
     }
 
-    // TODO: handle capacity
+    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();
+    }
 
     //place decoration
     const decoId = new Types.ObjectId();
@@ -167,10 +171,16 @@ 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 };
+    return {
+        DecoId: decoId.toString(),
+        Room: placedDecoration.Room,
+        IsApartment: placedDecoration.IsApartment,
+        MaxCapacityIncrease: -meta.capacityCost
+    };
 };
 
 export const handleSetPlacedDecoInfo = async (accountId: string, req: ISetPlacedDecoInfoRequest): Promise<void> => {

src/services/webService.ts

@@ -136,7 +136,10 @@ export const stopWebServer = async (): Promise<void> => {
     await Promise.all(promises);
 };
 
+let lastWsid: number = 0;
+
 interface IWsCustomData extends ws {
+    id?: number;
     accountId?: string;
 }
 
@@ -150,6 +153,7 @@ interface IWsMsgFromClient {
 }
 
 interface IWsMsgToClient {
+    //wsid?: number;
     reload?: boolean;
     ports?: {
         http: number | undefined;
@@ -174,6 +178,10 @@ 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;
@@ -268,3 +276,21 @@ 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

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

src/types/loginTypes.ts

@@ -25,6 +25,7 @@ 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[];
-    CreditBonus: number[];
-    TotalCredits: number[];
+    MissionCredits: [number, number];
+    CreditsBonus: [number, number]; // "Credit Reward"; `CreditsBonus[1]` is `CreditsBonus[0] * 2` if DailyMissionBonus
+    TotalCredits: [number, number];
     DailyMissionBonus?: boolean;
 }
 

static/fixed_responses/allDecoRecipes.json

@@ -20,6 +20,10 @@
   "/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">
+                <div class="row g-3 mb-3">
                     <div class="col-md-3">
-                        <div class="card mb-3">
+                        <div class="card">
                             <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 mb-3">
+                        <div class="card">
                             <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 mb-3">
+                        <div class="card">
                             <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 mb-3">
+                        <div class="card">
                             <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">
+                <div class="row g-3 mb-3">
                     <div class="col-lg-6">
-                        <div class="card mb-3" style="height: 400px;">
+                        <div class="card" 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 mb-3" style="height: 400px;">
+                        <div class="card" 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">
+                <div class="row g-3 mb-3">
                     <div class="col-lg-6">
-                        <div class="card mb-3" style="height: 400px;">
+                        <div class="card" 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 mb-3" style="height: 400px;">
+                        <div class="card" 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">
+                <div class="row g-3 mb-3">
                     <div class="col-lg-6">
-                        <div class="card mb-3" style="height: 400px;">
+                        <div class="card" 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 mb-3" style="height: 400px;">
+                        <div class="card" 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">
+                <div class="row g-3 mb-3">
                     <div class="col-lg-6">
-                        <div class="card mb-3" style="height: 400px;">
+                        <div class="card" 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 mb-3" style="height: 400px;">
+                        <div class="card" 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">
+                <div class="row g-3 mb-3">
                     <div class="col-lg-6">
-                        <div class="card mb-3" style="height: 400px;">
+                        <div class="card" 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 mb-3" style="height: 400px;">
+                        <div class="card" 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">
+                <div class="row g-3 mb-3">
                     <div class="col-lg-6">
-                        <div class="card mb-3" style="height: 400px;">
+                        <div class="card" 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 mb-3" style="height: 400px;">
+                        <div class="card" 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">
+                <div class="row g-3 mb-3">
                     <div class="col-lg-6">
-                        <div class="card mb-3" style="height: 400px;">
+                        <div class="card" 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 mb-3" style="height: 400px;">
+                        <div class="card" 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">
+                <div class="row g-3 mb-3">
                     <div class="col-lg-6">
-                        <div class="card mb-3" style="height: 400px;">
+                        <div class="card" 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 mb-3" style="height: 400px;">
+                        <div class="card" 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 mb-3">
+                <div class="card">
                     <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 mb-3">
+                <div class="card">
                     <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 mb-3">
+                        <div class="card">
                             <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 mb-3">
+                        <div class="card">
                             <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 mb-3">
+                        <div class="card">
                             <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 mb-3">
+                        <div class="card">
                             <h5 class="card-header" data-loc="general_bulkActions"></h5>
                             <div class="card-body">
                                 <div class="d-flex flex-wrap gap-2">
@@ -565,7 +565,7 @@
             <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 mb-3">
+                        <div class="card">
                             <h5 class="card-header" data-loc="cheats_server"></h5>
                             <div class="card-body">
                                 <div class="d-none config-admin-hide">
@@ -807,7 +807,7 @@
                                 </form>
                             </div>
                         </div>
-                        <div class="card mb-3 d-none config-admin-show config-form">
+                        <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">

static/webui/script.js

@@ -10,7 +10,8 @@
 
 let auth_pending = false,
     did_initial_auth = false,
-    ws_is_open = false;
+    ws_is_open = false,
+    wsid = 0;
 const sendAuth = isRegister => {
     if (ws_is_open && localStorage.getItem("email") && localStorage.getItem("password")) {
         auth_pending = true;
@@ -34,6 +35,9 @@ 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(() => {
@@ -1858,7 +1862,7 @@ for (const id of uiConfigs) {
                 value = parseInt(value);
             }
             $.post({
-                url: "/custom/setConfig?" + window.authz,
+                url: "/custom/setConfig?" + window.authz + "&wsid=" + wsid,
                 contentType: "application/json",
                 data: JSON.stringify({ [id]: value })
             });
@@ -1866,7 +1870,7 @@ for (const id of uiConfigs) {
     } else if (elm.type == "checkbox") {
         elm.onchange = function () {
             $.post({
-                url: "/custom/setConfig?" + window.authz,
+                url: "/custom/setConfig?" + window.authz + "&wsid=" + wsid,
                 contentType: "application/json",
                 data: JSON.stringify({ [id]: this.checked })
             }).then(() => {
@@ -1881,7 +1885,7 @@ for (const id of uiConfigs) {
 function doSaveConfig(id) {
     const elm = document.getElementById(id);
     $.post({
-        url: "/custom/setConfig?" + window.authz,
+        url: "/custom/setConfig?" + window.authz + "&wsid=" + wsid,
         contentType: "application/json",
         data: JSON.stringify({ [id]: parseInt(elm.value) })
     });
@@ -2289,14 +2293,13 @@ 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 = new Date(ExpiryDateInput.value).getTime() / 1000;
+    const ExpiryDate = Math.trunc(new Date(ExpiryDateInput.value).getTime() / 1000);
     if (isNaN(ExpiryDate)) {
         ExpiryDateInput.addClass("is-invalid").focus();
         return false;

static/webui/translations/zh.js

@@ -1,4 +1,4 @@
-// Chinese translation by meb154 & bishan178
+// Chinese translation by meb154, bishan178 & Corvus
 dict = {
     general_inventoryUpdateNote: `注意：此处所做的更改只有在游戏同步仓库后才会生效。您可以通过访问星图来触发仓库更新。`,
     general_addButton: `添加`,
@@ -187,49 +187,49 @@ dict = {
     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`,
+    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: `提交`,