feat: classic lich ephemera reward

saveLoadout was missing bigint support to properly store NemesisFingerprint, and crewMembers was missing handling for liches being set on-call (the only option available for them)

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

package-lock.json

@@ -18,7 +18,7 @@
         "morgan": "^1.10.0",
         "ncp": "^2.0.0",
         "typescript": "^5.5",
-        "warframe-public-export-plus": "^0.5.60",
+        "warframe-public-export-plus": "^0.5.62",
         "warframe-riven-info": "^0.1.2",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"
@@ -3703,9 +3703,9 @@
       }
     },
     "node_modules/warframe-public-export-plus": {
-      "version": "0.5.60",
-      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.60.tgz",
-      "integrity": "sha512-vMfytUc4xRi+b7RTSq+TJEl91vwEegpQKxLtXwRPfs9ZHhntxc4rmDYSNWJTvgf/aWXsFUxQlqL/GV5OLPGM7g=="
+      "version": "0.5.62",
+      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.62.tgz",
+      "integrity": "sha512-D8ZzjkU9rrK/59VqCfpMoV31HVmwHZV1dNZxPO85AOlcjg/G81Fu3kgITQTaw9sdNagLPLQnFaiXY58pxxRwgA=="
     },
     "node_modules/warframe-riven-info": {
       "version": "0.1.2",

package.json

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

src/controllers/api/crewMembersController.ts

@@ -1,4 +1,5 @@
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
+import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
 import { getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { ICrewMemberClient } from "@/src/types/inventoryTypes/inventoryTypes";
@@ -7,15 +8,23 @@ import { Types } from "mongoose";
 
 export const crewMembersController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "CrewMembers");
+    const inventory = await getInventory(accountId, "CrewMembers NemesisHistory");
     const data = getJSONfromString<ICrewMembersRequest>(String(req.body));
-    const dbCrewMember = inventory.CrewMembers.id(data.crewMember.ItemId.$oid)!;
-    dbCrewMember.AssignedRole = data.crewMember.AssignedRole;
-    dbCrewMember.SkillEfficiency = data.crewMember.SkillEfficiency;
-    dbCrewMember.WeaponConfigIdx = data.crewMember.WeaponConfigIdx;
-    dbCrewMember.WeaponId = new Types.ObjectId(data.crewMember.WeaponId.$oid);
-    dbCrewMember.Configs = data.crewMember.Configs;
-    dbCrewMember.SecondInCommand = data.crewMember.SecondInCommand;
+    if (data.crewMember.SecondInCommand) {
+        clearOnCall(inventory);
+    }
+    if (data.crewMember.ItemId.$oid == "000000000000000000000000") {
+        const convertedNemesis = inventory.NemesisHistory!.find(x => x.fp == data.crewMember.NemesisFingerprint)!;
+        convertedNemesis.SecondInCommand = data.crewMember.SecondInCommand;
+    } else {
+        const dbCrewMember = inventory.CrewMembers.id(data.crewMember.ItemId.$oid)!;
+        dbCrewMember.AssignedRole = data.crewMember.AssignedRole;
+        dbCrewMember.SkillEfficiency = data.crewMember.SkillEfficiency;
+        dbCrewMember.WeaponConfigIdx = data.crewMember.WeaponConfigIdx;
+        dbCrewMember.WeaponId = new Types.ObjectId(data.crewMember.WeaponId.$oid);
+        dbCrewMember.Configs = data.crewMember.Configs;
+        dbCrewMember.SecondInCommand = data.crewMember.SecondInCommand;
+    }
     await inventory.save();
     res.json({
         crewMemberId: data.crewMember.ItemId.$oid,
@@ -26,3 +35,20 @@ export const crewMembersController: RequestHandler = async (req, res) => {
 interface ICrewMembersRequest {
     crewMember: ICrewMemberClient;
 }
+
+const clearOnCall = (inventory: TInventoryDatabaseDocument): void => {
+    for (const cm of inventory.CrewMembers) {
+        if (cm.SecondInCommand) {
+            cm.SecondInCommand = false;
+            return;
+        }
+    }
+    if (inventory.NemesisHistory) {
+        for (const cm of inventory.NemesisHistory) {
+            if (cm.SecondInCommand) {
+                cm.SecondInCommand = false;
+                return;
+            }
+        }
+    }
+};

src/controllers/api/missionInventoryUpdateController.ts

@@ -61,7 +61,11 @@ export const missionInventoryUpdateController: RequestHandler = async (req, res)
 
     if (
         missionReport.MissionStatus !== "GS_SUCCESS" &&
-        !(missionReport.RewardInfo?.jobId || missionReport.RewardInfo?.challengeMissionId)
+        !(
+            missionReport.RewardInfo?.jobId ||
+            missionReport.RewardInfo?.challengeMissionId ||
+            missionReport.RewardInfo?.T
+        )
     ) {
         if (missionReport.EndOfMatchUpload) {
             inventory.RewardSeed = generateRewardSeed();

src/controllers/api/saveDialogueController.ts

@@ -1,8 +1,7 @@
-import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
 import { config } from "@/src/services/configService";
-import { addEmailItem, getInventory, updateCurrency } from "@/src/services/inventoryService";
+import { addEmailItem, getDialogue, getInventory, updateCurrency } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { ICompletedDialogue, IDialogueDatabase } from "@/src/types/inventoryTypes/inventoryTypes";
+import { ICompletedDialogue } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
 import { RequestHandler } from "express";
 
@@ -107,26 +106,3 @@ interface IOtherDialogueInfo {
     Tag: string;
     Value: number;
 }
-
-const getDialogue = (inventory: TInventoryDatabaseDocument, dialogueName: string): IDialogueDatabase => {
-    let dialogue = inventory.DialogueHistory!.Dialogues!.find(x => x.DialogueName == dialogueName);
-    if (!dialogue) {
-        dialogue =
-            inventory.DialogueHistory!.Dialogues![
-                inventory.DialogueHistory!.Dialogues!.push({
-                    Rank: 0,
-                    Chemistry: 0,
-                    AvailableDate: new Date(0),
-                    AvailableGiftDate: new Date(0),
-                    RankUpExpiry: new Date(0),
-                    BountyChemExpiry: new Date(0),
-                    QueuedDialogues: [],
-                    Gifts: [],
-                    Booleans: [],
-                    Completed: [],
-                    DialogueName: dialogueName
-                }) - 1
-            ];
-    }
-    return dialogue;
-};

src/controllers/api/saveLoadoutController.ts

@@ -2,11 +2,12 @@ import { RequestHandler } from "express";
 import { ISaveLoadoutRequest } from "@/src/types/saveLoadoutTypes";
 import { handleInventoryItemConfigChange } from "@/src/services/saveLoadoutService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
+import { getJSONfromString } from "@/src/helpers/stringHelpers";
 
 export const saveLoadoutController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
 
-    const body: ISaveLoadoutRequest = JSON.parse(req.body as string) as ISaveLoadoutRequest;
+    const body: ISaveLoadoutRequest = getJSONfromString<ISaveLoadoutRequest>(String(req.body));
     // console.log(util.inspect(body, { showHidden: false, depth: null, colors: true }));
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars

src/models/inventoryModels/inventoryModel.ts

@@ -1318,7 +1318,7 @@ const nemesisSchema = new Schema<INemesisDatabase>(
         InfNodes: { type: [infNodeSchema], default: undefined },
         HenchmenKilled: Number,
         HintProgress: Number,
-        Hints: { type: [Number], default: undefined },
+        Hints: { type: [Number], default: [] },
         GuessHistory: { type: [Number], default: undefined },
         MissionCount: Number,
         LastEnc: Number

src/services/inventoryService.ts

@@ -28,7 +28,8 @@ import {
     ITraits,
     ICalendarProgress,
     INemesisWeaponTargetFingerprint,
-    INemesisPetTargetFingerprint
+    INemesisPetTargetFingerprint,
+    IDialogueDatabase
 } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IGenericUpdate, IUpdateNodeIntrosResponse } from "../types/genericUpdate";
 import { IKeyChainRequest, IMissionInventoryUpdateRequest } from "../types/requestTypes";
@@ -1906,6 +1907,29 @@ export const cleanupInventory = (inventory: TInventoryDatabaseDocument): void =>
     }
 };
 
+export const getDialogue = (inventory: TInventoryDatabaseDocument, dialogueName: string): IDialogueDatabase => {
+    let dialogue = inventory.DialogueHistory!.Dialogues!.find(x => x.DialogueName == dialogueName);
+    if (!dialogue) {
+        dialogue =
+            inventory.DialogueHistory!.Dialogues![
+                inventory.DialogueHistory!.Dialogues!.push({
+                    Rank: 0,
+                    Chemistry: 0,
+                    AvailableDate: new Date(0),
+                    AvailableGiftDate: new Date(0),
+                    RankUpExpiry: new Date(0),
+                    BountyChemExpiry: new Date(0),
+                    QueuedDialogues: [],
+                    Gifts: [],
+                    Booleans: [],
+                    Completed: [],
+                    DialogueName: dialogueName
+                }) - 1
+            ];
+    }
+    return dialogue;
+};
+
 export const getCalendarProgress = (inventory: TInventoryDatabaseDocument): ICalendarProgress => {
     const currentSeason = getWorldState().KnownCalendarSeasons[0];
 

src/services/missionInventoryUpdateService.ts

@@ -35,6 +35,7 @@ import {
     combineInventoryChanges,
     generateRewardSeed,
     getCalendarProgress,
+    getDialogue,
     giveNemesisPetRecipe,
     giveNemesisWeaponRecipe,
     updateCurrency,
@@ -58,12 +59,21 @@ import conservationAnimals from "@/static/fixed_responses/conservationAnimals.js
 import {
     generateNemesisProfile,
     getInfNodes,
+    getNemesisPasscode,
     getWeaponsForManifest,
     sendCodaFinishedMessage
 } from "@/src/helpers/nemesisHelpers";
 import { Loadout } from "../models/inventoryModels/loadoutModel";
 import { ILoadoutConfigDatabase } from "../types/saveLoadoutTypes";
-import { getLiteSortie, getSortie, idToBountyCycle, idToDay, idToWeek, pushClassicBounties } from "./worldStateService";
+import {
+    getLiteSortie,
+    getSortie,
+    getWorldState,
+    idToBountyCycle,
+    idToDay,
+    idToWeek,
+    pushClassicBounties
+} from "./worldStateService";
 import { config } from "./configService";
 import libraryDailyTasks from "@/static/fixed_responses/libraryDailyTasks.json";
 import { ISyndicateMissionInfo } from "../types/worldStateTypes";
@@ -173,6 +183,14 @@ export const addMissionInventoryUpdates = async (
         }
         if (inventoryUpdates.RewardInfo.NemesisHintProgress && inventory.Nemesis) {
             inventory.Nemesis.HintProgress += inventoryUpdates.RewardInfo.NemesisHintProgress;
+            if (inventory.Nemesis.Faction != "FC_INFESTATION" && inventory.Nemesis.Hints.length != 3) {
+                const progressNeeded = [35, 60, 100][inventory.Nemesis.Hints.length];
+                if (inventory.Nemesis.HintProgress >= progressNeeded) {
+                    inventory.Nemesis.HintProgress -= progressNeeded;
+                    const passcode = getNemesisPasscode(inventory.Nemesis);
+                    inventory.Nemesis.Hints.push(passcode[inventory.Nemesis.Hints.length]);
+                }
+            }
         }
         if (inventoryUpdates.MissionStatus == "GS_SUCCESS" && inventoryUpdates.RewardInfo.jobId) {
             // e.g. for Profit-Taker Phase 1:
@@ -636,7 +654,7 @@ export const addMissionInventoryUpdates = async (
                         Rank: inventory.Nemesis.Rank,
                         Traded: inventory.Nemesis.Traded,
                         PrevOwners: inventory.Nemesis.PrevOwners,
-                        SecondInCommand: inventory.Nemesis.SecondInCommand,
+                        SecondInCommand: false,
                         Weakened: inventory.Nemesis.Weakened,
                         // And set killed flag
                         k: value.killed
@@ -1184,8 +1202,9 @@ export const addMissionRewards = async (
     }
 
     if (rewardInfo.challengeMissionId) {
-        const [syndicateTag, tierStr] = rewardInfo.challengeMissionId.split("_"); // TODO: third part in HexSyndicate jobs - Chemistry points
+        const [syndicateTag, tierStr, chemistryStr] = rewardInfo.challengeMissionId.split("_");
         const tier = Number(tierStr);
+        const chemistry = Number(chemistryStr);
         const isSteelPath = missions?.Tier;
         if (syndicateTag === "ZarimanSyndicate") {
             let medallionAmount = tier + 1;
@@ -1202,6 +1221,23 @@ export const addMissionRewards = async (
             if (isSteelPath) standingAmount *= 1.5;
             AffiliationMods.push(addStanding(inventory, syndicateTag, standingAmount));
         }
+        if (syndicateTag == "HexSyndicate" && chemistry && tier < 6) {
+            const seed = getWorldState().SyndicateMissions.find(x => x.Tag == "HexSyndicate")!.Seed;
+            const { nodes, buddies } = getHexBounties(seed);
+            const buddy = buddies[tier];
+            logger.debug(`Hex seed is ${seed}, giving chemistry for ${buddy}`);
+            if (missions?.Tag != nodes[tier]) {
+                logger.warn(
+                    `Uh-oh, tier ${tier} bounty should've been on ${nodes[tier]} but you were just on ${missions?.Tag}`
+                );
+            }
+            const tomorrowAt0Utc = config.noKimCooldowns
+                ? Date.now()
+                : (Math.trunc(Date.now() / 86400_000) + 1) * 86400_000;
+            const dialogue = getDialogue(inventory, buddy);
+            dialogue.Chemistry += chemistry;
+            dialogue.BountyChemExpiry = new Date(tomorrowAt0Utc);
+        }
         if (isSteelPath) {
             await addItem(inventory, "/Lotus/Types/Items/MiscItems/SteelEssence", 1);
             MissionRewards.push({
@@ -1412,6 +1448,37 @@ function getRandomMissionDrops(
             } else {
                 rewardManifests = [];
             }
+        } else if (RewardInfo.T == 13) {
+            // Undercroft extra/side portal (normal mode), gives 1 Pathos Clamp + Duviri Arcane.
+            drops.push({
+                StoreItem: "/Lotus/StoreItems/Types/Gameplay/Duviri/Resource/DuviriDragonDropItem",
+                ItemCount: 1
+            });
+            rewardManifests = [
+                "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriStaticUndercroftResourceRewards"
+            ];
+        } else if (RewardInfo.T == 14) {
+            // Undercroft extra/side portal (steel path), gives 3 Pathos Clamps + Eidolon Arcane.
+            drops.push({
+                StoreItem: "/Lotus/StoreItems/Types/Gameplay/Duviri/Resource/DuviriDragonDropItem",
+                ItemCount: 3
+            });
+            rewardManifests = [
+                "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriSteelPathStaticUndercroftResourceRewards"
+            ];
+        } else if (RewardInfo.T == 15) {
+            rewardManifests = [
+                mission?.Tier == 1
+                    ? "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriKullervoSteelPathRNGRewards"
+                    : "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriKullervoNormalRNGRewards"
+            ];
+        } else if (RewardInfo.T == 70) {
+            // Orowyrm chest, gives 10 Pathos Clamps, or 15 on Steel Path.
+            drops.push({
+                StoreItem: "/Lotus/StoreItems/Types/Gameplay/Duviri/Resource/DuviriDragonDropItem",
+                ItemCount: mission?.Tier == 1 ? 15 : 10
+            });
+            rewardManifests = [];
         } else {
             rewardManifests = region.rewardManifests;
         }
@@ -1730,3 +1797,55 @@ const libraryPersonalTargetToAvatar: Record<string, string> = {
     "/Lotus/Types/Game/Library/Targets/Research10Target":
         "/Lotus/Types/Enemies/Corpus/Spaceman/AIWeek/NullifySpacemanAvatar"
 };
+
+const node_excluded_buddies: Record<string, string> = {
+    SolNode856: "/Lotus/Types/Gameplay/1999Wf/Dialogue/ArthurDialogue_rom.dialogue",
+    SolNode852: "/Lotus/Types/Gameplay/1999Wf/Dialogue/LettieDialogue_rom.dialogue",
+    SolNode851: "/Lotus/Types/Gameplay/1999Wf/Dialogue/JabirDialogue_rom.dialogue",
+    SolNode850: "/Lotus/Types/Gameplay/1999Wf/Dialogue/EleanorDialogue_rom.dialogue",
+    SolNode853: "/Lotus/Types/Gameplay/1999Wf/Dialogue/AoiDialogue_rom.dialogue",
+    SolNode854: "/Lotus/Types/Gameplay/1999Wf/Dialogue/QuincyDialogue_rom.dialogue"
+};
+
+const getHexBounties = (seed: number): { nodes: string[]; buddies: string[] } => {
+    // We're gonna shuffle these arrays, so they're not truly 'const'.
+    const nodes: string[] = [
+        "SolNode850",
+        "SolNode851",
+        "SolNode852",
+        "SolNode853",
+        "SolNode854",
+        "SolNode856",
+        "SolNode858"
+    ];
+    const excludable_nodes: string[] = ["SolNode851", "SolNode852", "SolNode853", "SolNode854"];
+    const buddies: string[] = [
+        "/Lotus/Types/Gameplay/1999Wf/Dialogue/JabirDialogue_rom.dialogue",
+        "/Lotus/Types/Gameplay/1999Wf/Dialogue/AoiDialogue_rom.dialogue",
+        "/Lotus/Types/Gameplay/1999Wf/Dialogue/ArthurDialogue_rom.dialogue",
+        "/Lotus/Types/Gameplay/1999Wf/Dialogue/EleanorDialogue_rom.dialogue",
+        "/Lotus/Types/Gameplay/1999Wf/Dialogue/LettieDialogue_rom.dialogue",
+        "/Lotus/Types/Gameplay/1999Wf/Dialogue/QuincyDialogue_rom.dialogue"
+    ];
+
+    const rng = new SRng(seed);
+    rng.shuffleArray(nodes);
+    rng.shuffleArray(excludable_nodes);
+    while (nodes.length > buddies.length) {
+        nodes.splice(
+            nodes.findIndex(x => x == excludable_nodes[0]),
+            1
+        );
+        excludable_nodes.splice(0, 1);
+    }
+    rng.shuffleArray(buddies);
+    for (let i = 0; i != 6; ++i) {
+        if (buddies[i] == node_excluded_buddies[nodes[i]]) {
+            const swapIdx = (i + 1) % buddies.length;
+            const tmp = buddies[swapIdx];
+            buddies[swapIdx] = buddies[i];
+            buddies[i] = tmp;
+        }
+    }
+    return { nodes, buddies };
+};

src/services/rngService.ts

@@ -115,4 +115,19 @@ export class SRng {
     randomReward<T extends { probability: number }>(pool: T[]): T | undefined {
         return getRewardAtPercentage(pool, this.randomFloat());
     }
+
+    churnSeed(its: number): void {
+        while (its--) {
+            this.state = (0x5851f42d4c957f2dn * this.state + 0x14057b7ef767814fn) & 0xffffffffffffffffn;
+        }
+    }
+
+    shuffleArray<T>(arr: T[]): void {
+        for (let lastIdx = arr.length - 1; lastIdx >= 1; --lastIdx) {
+            const swapIdx = this.randomInt(0, lastIdx);
+            const tmp = arr[swapIdx];
+            arr[swapIdx] = arr[lastIdx];
+            arr[lastIdx] = tmp;
+        }
+    }
 }

src/types/requestTypes.ts

@@ -177,6 +177,7 @@ export interface IRewardInfo {
     PurgatoryRewardQualifications?: string;
     rewardSeed?: number | bigint;
     periodicMissionTag?: string;
+    T?: number; // Duviri
     ConquestType?: string;
     ConquestCompleted?: number;
     ConquestEquipmentSuggestionsFulfilled?: number;