feat: handle NemesisKillConvert at missionInventoryUpdate

add getWeaponsForManifest
feat: handle KubrowPetEggs in missionInventoryUpdate (#1876 )
2025-04-27 21:37:14 +02:00 · 2025-04-27 21:37:06 +02:00 · 2025-04-27 12:36:00 -07:00 · 2025-04-27 07:20:04 +02:00 · 2025-04-26 19:28:03 -07:00 · 2025-04-26 19:27:50 -07:00
14 changed files with 530 additions and 87 deletions
--- a/src/controllers/api/claimCompletedRecipeController.ts
+++ b/src/controllers/api/claimCompletedRecipeController.ts
@ -133,7 +133,14 @@ export const claimCompletedRecipeController: RequestHandler = async (req, res) =
        if (recipe.secretIngredientAction != "SIA_UNBRAND") {
            InventoryChanges = {
                ...InventoryChanges,
-                ...(await addItem(inventory, recipe.resultType, recipe.num, false))
+                ...(await addItem(
+                    inventory,
+                    recipe.resultType,
+                    recipe.num,
+                    false,
+                    undefined,
+                    pendingRecipe.TargetFingerprint
+                ))
            };
        }
        await inventory.save();
--- a/src/controllers/api/nemesisController.ts
+++ b/src/controllers/api/nemesisController.ts
@ -3,6 +3,7 @@ import {
    encodeNemesisGuess,
    getInfNodes,
    getNemesisPasscode,
+    getWeaponsForManifest,
    IKnifeResponse
 } from "@/src/helpers/nemesisHelpers";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
@ -170,18 +171,7 @@ export const nemesisController: RequestHandler = async (req, res) => {

        let weaponIdx = -1;
        if (body.target.Faction != "FC_INFESTATION") {
-            let weapons: readonly string[];
-            if (body.target.manifest == "/Lotus/Types/Game/Nemesis/KuvaLich/KuvaLichManifestVersionSix") {
-                weapons = kuvaLichVersionSixWeapons;
-            } else if (
-                body.target.manifest == "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionFour" ||
-                body.target.manifest == "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionThree"
-            ) {
-                weapons = corpusVersionThreeWeapons;
-            } else {
-                throw new Error(`unknown nemesis manifest: ${body.target.manifest}`);
-            }
-
+            const weapons = getWeaponsForManifest(body.target.manifest);
            const initialWeaponIdx = new SRng(body.target.fp).randomInt(0, weapons.length - 1);
            weaponIdx = initialWeaponIdx;
            do {
@ -283,39 +273,3 @@ interface INemesisRequiemRequest {
        HiddenWhenHolstered: boolean;
    };
 }
-
-const kuvaLichVersionSixWeapons = [
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Drakgoon/KuvaDrakgoon",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Karak/KuvaKarak",
-    "/Lotus/Weapons/Grineer/Melee/GrnKuvaLichScythe/GrnKuvaLichScytheWeapon",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Kohm/KuvaKohm",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Ogris/KuvaOgris",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Quartakk/KuvaQuartakk",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Tonkor/KuvaTonkor",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Brakk/KuvaBrakk",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Kraken/KuvaKraken",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Seer/KuvaSeer",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Stubba/KuvaStubba",
-    "/Lotus/Weapons/Grineer/HeavyWeapons/GrnHeavyGrenadeLauncher",
-    "/Lotus/Weapons/Grineer/LongGuns/GrnKuvaLichRifle/GrnKuvaLichRifleWeapon",
-    "/Lotus/Weapons/Grineer/Bows/GrnBow/GrnBowWeapon",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hind/KuvaHind",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Nukor/KuvaNukor",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hek/KuvaHekWeapon",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Zarr/KuvaZarr",
-    "/Lotus/Weapons/Grineer/KuvaLich/HeavyWeapons/Grattler/KuvaGrattler",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Sobek/KuvaSobek"
-];
-
-const corpusVersionThreeWeapons = [
-    "/Lotus/Weapons/Corpus/LongGuns/CrpBriefcaseLauncher/CrpBriefcaseLauncher",
-    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEArcaPlasmor/CrpBEArcaPlasmor",
-    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEFluxRifle/CrpBEFluxRifle",
-    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBETetra/CrpBETetra",
-    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBECycron/CrpBECycron",
-    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBEDetron/CrpBEDetron",
-    "/Lotus/Weapons/Corpus/Pistols/CrpIgniterPistol/CrpIgniterPistol",
-    "/Lotus/Weapons/Corpus/Pistols/CrpBriefcaseAkimbo/CrpBriefcaseAkimboPistol",
-    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBEPlinx/CrpBEPlinxWeapon",
-    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEGlaxion/CrpBEGlaxion"
-];
--- a/src/controllers/stats/viewController.ts
+++ b/src/controllers/stats/viewController.ts
@ -27,7 +27,15 @@ const viewController: RequestHandler = async (req, res) => {
        for (const type of Object.keys(ExportEnemies.avatars)) {
            if (!scans.has(type)) scans.add(type);
        }
-        responseJson.Scans ??= [];
+
+        // Take any existing scans and also set them to 9999
+        if (responseJson.Scans) {
+            for (const scan of responseJson.Scans) {
+                scans.add(scan.type);
+            }
+        }
+        responseJson.Scans = [];
+
        for (const type of scans) {
            responseJson.Scans.push({ type: type, scans: 9999 });
        }
--- a/src/helpers/nemesisHelpers.ts
+++ b/src/helpers/nemesisHelpers.ts
@ -1,4 +1,4 @@
-import { ExportRegions } from "warframe-public-export-plus";
+import { ExportRegions, ExportWarframes } from "warframe-public-export-plus";
 import { IInfNode } from "@/src/types/inventoryTypes/inventoryTypes";
 import { SRng } from "@/src/services/rngService";
 import { TInventoryDatabaseDocument } from "../models/inventoryModels/inventoryModel";
@ -129,3 +129,147 @@ export const consumeModCharge = (
        response.UpgradeNew.push(true);
    }
 };
+
+const kuvaLichVersionSixWeapons = [
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Drakgoon/KuvaDrakgoon",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Karak/KuvaKarak",
+    "/Lotus/Weapons/Grineer/Melee/GrnKuvaLichScythe/GrnKuvaLichScytheWeapon",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Kohm/KuvaKohm",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Ogris/KuvaOgris",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Quartakk/KuvaQuartakk",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Tonkor/KuvaTonkor",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Brakk/KuvaBrakk",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Kraken/KuvaKraken",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Seer/KuvaSeer",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Stubba/KuvaStubba",
+    "/Lotus/Weapons/Grineer/HeavyWeapons/GrnHeavyGrenadeLauncher",
+    "/Lotus/Weapons/Grineer/LongGuns/GrnKuvaLichRifle/GrnKuvaLichRifleWeapon",
+    "/Lotus/Weapons/Grineer/Bows/GrnBow/GrnBowWeapon",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hind/KuvaHind",
+    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Nukor/KuvaNukor",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hek/KuvaHekWeapon",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Zarr/KuvaZarr",
+    "/Lotus/Weapons/Grineer/KuvaLich/HeavyWeapons/Grattler/KuvaGrattler",
+    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Sobek/KuvaSobek"
+];
+
+const corpusVersionThreeWeapons = [
+    "/Lotus/Weapons/Corpus/LongGuns/CrpBriefcaseLauncher/CrpBriefcaseLauncher",
+    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEArcaPlasmor/CrpBEArcaPlasmor",
+    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEFluxRifle/CrpBEFluxRifle",
+    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBETetra/CrpBETetra",
+    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBECycron/CrpBECycron",
+    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBEDetron/CrpBEDetron",
+    "/Lotus/Weapons/Corpus/Pistols/CrpIgniterPistol/CrpIgniterPistol",
+    "/Lotus/Weapons/Corpus/Pistols/CrpBriefcaseAkimbo/CrpBriefcaseAkimboPistol",
+    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBEPlinx/CrpBEPlinxWeapon",
+    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEGlaxion/CrpBEGlaxion"
+];
+
+export const getWeaponsForManifest = (manifest: string): readonly string[] => {
+    switch (manifest) {
+        case "/Lotus/Types/Game/Nemesis/KuvaLich/KuvaLichManifestVersionSix":
+            return kuvaLichVersionSixWeapons;
+        case "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionThree":
+        case "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionFour":
+            return corpusVersionThreeWeapons;
+    }
+    throw new Error(`unknown nemesis manifest: ${manifest}`);
+};
+
+// TODO: This sucks.
+export const getInnateDamageTag = (
+    KillingSuit: string
+):
+    | "InnateElectricityDamage"
+    | "InnateFreezeDamage"
+    | "InnateHeatDamage"
+    | "InnateImpactDamage"
+    | "InnateMagDamage"
+    | "InnateRadDamage"
+    | "InnateToxinDamage" => {
+    const baseSuitType = ExportWarframes[KillingSuit].parentName;
+    switch (baseSuitType) {
+        case "/Lotus/Powersuits/Volt/VoltBaseSuit":
+        case "/Lotus/Powersuits/Excalibur/ExcaliburBaseSuit":
+        case "/Lotus/Powersuits/AntiMatter/NovaBaseSuit":
+        case "/Lotus/Powersuits/Banshee/BansheeBaseSuit":
+        case "/Lotus/Powersuits/Berserker/BerserkerBaseSuit":
+        case "/Lotus/Powersuits/Magician/MagicianBaseSuit":
+        case "/Lotus/Powersuits/Sentient/SentientBaseSuit":
+        case "/Lotus/Powersuits/Gyre/GyreBaseSuit":
+            return "InnateElectricityDamage";
+        case "/Lotus/Powersuits/Ember/EmberBaseSuit":
+        case "/Lotus/Powersuits/Dragon/DragonBaseSuit":
+        case "/Lotus/Powersuits/Nezha/NezhaBaseSuit":
+        case "/Lotus/Powersuits/Sandman/SandmanBaseSuit":
+        case "/Lotus/Powersuits/Trapper/TrapperBaseSuit":
+        case "/Lotus/Powersuits/Wisp/WispBaseSuit":
+        case "/Lotus/Powersuits/Odalisk/OdaliskBaseSuit":
+        case "/Lotus/Powersuits/PaxDuviricus/PaxDuviricusBaseSuit":
+        case "/Lotus/Powersuits/Choir/ChoirBaseSuit":
+        case "/Lotus/Powersuits/Temple/TempleBaseSuit":
+            return "InnateHeatDamage";
+        case "/Lotus/Powersuits/Frost/FrostBaseSuit":
+        case "/Lotus/Powersuits/Glass/GlassBaseSuit":
+        case "/Lotus/Powersuits/Fairy/FairyBaseSuit":
+        case "/Lotus/Powersuits/IronFrame/IronFrameBaseSuit":
+        case "/Lotus/Powersuits/Revenant/RevenantBaseSuit":
+        case "/Lotus/Powersuits/Trinity/TrinityBaseSuit":
+        case "/Lotus/Powersuits/Hoplite/HopliteBaseSuit":
+        case "/Lotus/Powersuits/Koumei/KoumeiBaseSuit":
+            return "InnateFreezeDamage";
+        case "/Lotus/Powersuits/Saryn/SarynBaseSuit":
+        case "/Lotus/Powersuits/Paladin/PaladinBaseSuit":
+        case "/Lotus/Powersuits/Brawler/BrawlerBaseSuit":
+        case "/Lotus/Powersuits/Infestation/InfestationBaseSuit":
+        case "/Lotus/Powersuits/Necro/NecroBaseSuit":
+        case "/Lotus/Powersuits/Khora/KhoraBaseSuit":
+        case "/Lotus/Powersuits/Ranger/RangerBaseSuit":
+        case "/Lotus/Powersuits/Dagath/DagathBaseSuit":
+            return "InnateToxinDamage";
+        case "/Lotus/Powersuits/Mag/MagBaseSuit":
+        case "/Lotus/Powersuits/Pirate/PirateBaseSuit":
+        case "/Lotus/Powersuits/Cowgirl/CowgirlBaseSuit":
+        case "/Lotus/Powersuits/Priest/PriestBaseSuit":
+        case "/Lotus/Powersuits/BrokenFrame/BrokenFrameBaseSuit":
+        case "/Lotus/Powersuits/Alchemist/AlchemistBaseSuit":
+        case "/Lotus/Powersuits/Yareli/YareliBaseSuit":
+        case "/Lotus/Powersuits/Geode/GeodeBaseSuit":
+        case "/Lotus/Powersuits/Frumentarius/FrumentariusBaseSuit":
+            return "InnateMagDamage";
+        case "/Lotus/Powersuits/Loki/LokiBaseSuit":
+        case "/Lotus/Powersuits/Ninja/NinjaBaseSuit":
+        case "/Lotus/Powersuits/Jade/JadeBaseSuit":
+        case "/Lotus/Powersuits/Bard/BardBaseSuit":
+        case "/Lotus/Powersuits/Harlequin/HarlequinBaseSuit":
+        case "/Lotus/Powersuits/Garuda/GarudaBaseSuit":
+        case "/Lotus/Powersuits/YinYang/YinYangBaseSuit":
+        case "/Lotus/Powersuits/Werewolf/WerewolfBaseSuit":
+        case "/Lotus/Powersuits/ConcreteFrame/ConcreteFrameBaseSuit":
+            return "InnateRadDamage";
+        case "/Lotus/Powersuits/Rhino/RhinoBaseSuit":
+        case "/Lotus/Powersuits/Tengu/TenguBaseSuit":
+        case "/Lotus/Powersuits/MonkeyKing/MonkeyKingBaseSuit":
+        case "/Lotus/Powersuits/Runner/RunnerBaseSuit":
+        case "/Lotus/Powersuits/Pacifist/PacifistBaseSuit":
+        case "/Lotus/Powersuits/Devourer/DevourerBaseSuit":
+        case "/Lotus/Powersuits/Wraith/WraithBaseSuit":
+        case "/Lotus/Powersuits/Pagemaster/PagemasterBaseSuit":
+            return "InnateImpactDamage";
+    }
+    logger.warn(`unknown innate damage type for ${KillingSuit}, using heat as a fallback`);
+    return "InnateHeatDamage";
+};
+
+// TODO: For -1399275245665749231n, the value should be 75306944, but we're off by 59 with 75307003.
+export const getInnateDamageValue = (fp: bigint): number => {
+    const rng = new SRng(fp);
+    rng.randomFloat(); // used for the weapon index
+    const WeaponUpgradeValueAttenuationExponent = 2.25;
+    let value = Math.pow(rng.randomFloat(), WeaponUpgradeValueAttenuationExponent);
+    if (value >= 0.941428) {
+        value = 1;
+    }
+    return Math.trunc(value * 0x40000000);
+};
--- a/src/models/inventoryModels/inventoryModel.ts
+++ b/src/models/inventoryModels/inventoryModel.ts
@ -1039,6 +1039,8 @@ const pendingRecipeSchema = new Schema<IPendingRecipeDatabase>(
    {
        ItemType: String,
        CompletionDate: Date,
+        TargetItemId: String,
+        TargetFingerprint: String,
        LongGuns: { type: [EquipmentSchema], default: undefined },
        Pistols: { type: [EquipmentSchema], default: undefined },
        Melee: { type: [EquipmentSchema], default: undefined },
@ -1260,11 +1262,11 @@ const nemesisSchema = new Schema<INemesisDatabase>(
        PrevOwners: Number,
        SecondInCommand: Boolean,
        Weakened: Boolean,
-        InfNodes: [infNodeSchema],
+        InfNodes: { type: [infNodeSchema], default: undefined },
        HenchmenKilled: Number,
        HintProgress: Number,
-        Hints: [Number],
-        GuessHistory: [Number],
+        Hints: { type: [Number], default: undefined },
+        GuessHistory: { type: [Number], default: undefined },
        MissionCount: Number,
        LastEnc: Number
    },
@ -1609,7 +1611,7 @@ const inventorySchema = new Schema<IInventoryDatabase, InventoryDocumentProps>(
        //CorpusLich or GrineerLich
        NemesisAbandonedRewards: { type: [String], default: [] },
        Nemesis: nemesisSchema,
-        NemesisHistory: [Schema.Types.Mixed],
+        NemesisHistory: { type: [nemesisSchema], default: undefined },
        LastNemesisAllySpawnTime: Schema.Types.Mixed,

        //TradingRulesConfirmed,ShowFriendInvNotifications(Option->Social)
--- a/src/services/guildService.ts
+++ b/src/services/guildService.ts
@ -505,7 +505,7 @@ export const hasGuildPermissionEx = (

 export const removePigmentsFromGuildMembers = async (guildId: string | Types.ObjectId): Promise<void> => {
    const members = await GuildMember.find({ guildId, status: 0 }, "accountId");
-    for (const member of members) {
+    await parallelForeach(members, async member => {
        const inventory = await getInventory(member.accountId.toString(), "MiscItems");
        const index = inventory.MiscItems.findIndex(
            x => x.ItemType == "/Lotus/Types/Items/Research/DojoColors/GenericDojoColorPigment"
@ -514,7 +514,7 @@ export const removePigmentsFromGuildMembers = async (guildId: string | Types.Obj
            inventory.MiscItems.splice(index, 1);
            await inventory.save();
        }
-    }
+    });
 };

 export const processGuildTechProjectContributionsUpdate = async (
--- a/src/services/inventoryService.ts
+++ b/src/services/inventoryService.ts
@ -26,7 +26,9 @@ import {
    Status,
    IKubrowPetDetailsDatabase,
    ITraits,
-    ICalendarProgress
+    ICalendarProgress,
+    INemesisWeaponTargetFingerprint,
+    INemesisPetTargetFingerprint
 } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IGenericUpdate, IUpdateNodeIntrosResponse } from "../types/genericUpdate";
 import { IKeyChainRequest, IMissionInventoryUpdateRequest } from "../types/requestTypes";
@ -79,6 +81,7 @@ import { getRandomElement, getRandomInt, getRandomWeightedReward, SRng } from ".
 import { createMessage } from "./inboxService";
 import { getMaxStanding } from "@/src/helpers/syndicateStandingHelper";
 import { getWorldState } from "./worldStateService";
+import { getInnateDamageTag, getInnateDamageValue } from "../helpers/nemesisHelpers";

 export const createInventory = async (
    accountOwnerId: Types.ObjectId,
@ -327,7 +330,8 @@ export const addItem = async (
    typeName: string,
    quantity: number = 1,
    premiumPurchase: boolean = false,
-    seed?: bigint
+    seed?: bigint,
+    targetFingerprint?: string
 ): Promise<IInventoryChanges> => {
    // Bundles are technically StoreItems but a) they don't have a normal counterpart, and b) they are used in non-StoreItem contexts, e.g. email attachments.
    if (typeName in ExportBundles) {
@ -530,6 +534,12 @@ export const addItem = async (
                    ]
                });
            }
+            if (targetFingerprint) {
+                const targetFingerprintObj = JSON.parse(targetFingerprint) as INemesisWeaponTargetFingerprint;
+                defaultOverwrites.UpgradeType = targetFingerprintObj.ItemType;
+                defaultOverwrites.UpgradeFingerprint = JSON.stringify(targetFingerprintObj.UpgradeFingerprint);
+                defaultOverwrites.ItemName = targetFingerprintObj.Name;
+            }
            const inventoryChanges = addEquipment(inventory, weapon.productCategory, typeName, defaultOverwrites);
            if (weapon.additionalItems) {
                for (const item of weapon.additionalItems) {
@ -544,6 +554,27 @@ export const addItem = async (
                    premiumPurchase
                )
            };
+        } else if (targetFingerprint) {
+            // Sister's Hound
+            const targetFingerprintObj = JSON.parse(targetFingerprint) as INemesisPetTargetFingerprint;
+            const head = targetFingerprintObj.Parts[0];
+            const defaultOverwrites: Partial<IEquipmentDatabase> = {
+                ModularParts: targetFingerprintObj.Parts,
+                ItemName: targetFingerprintObj.Name,
+                Configs: applyDefaultUpgrades(inventory, ExportWeapons[head].defaultUpgrades)
+            };
+            const itemType = {
+                "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadA":
+                    "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetAPowerSuit",
+                "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadB":
+                    "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetBPowerSuit",
+                "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadC":
+                    "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetCPowerSuit"
+            }[head] as string;
+            return {
+                ...addEquipment(inventory, "MoaPets", itemType, defaultOverwrites),
+                ...occupySlot(inventory, InventorySlot.SENTINELS, premiumPurchase)
+            };
        } else {
            // Modular weapon parts
            const miscItemChanges = [
@ -1851,3 +1882,78 @@ export const getCalendarProgress = (inventory: TInventoryDatabaseDocument): ICal

    return inventory.CalendarProgress;
 };
+
+export const giveNemesisWeaponRecipe = (
+    inventory: TInventoryDatabaseDocument,
+    weaponType: string,
+    nemesisName: string = "AGOR ROK",
+    weaponLoc?: string,
+    KillingSuit: string = "/Lotus/Powersuits/Ember/Ember",
+    fp: bigint = generateRewardSeed()
+): void => {
+    if (!weaponLoc) {
+        weaponLoc = ExportWeapons[weaponType].name;
+    }
+    const recipeType = Object.entries(ExportRecipes).find(arr => arr[1].resultType == weaponType)![0];
+    addRecipes(inventory, [
+        {
+            ItemType: recipeType,
+            ItemCount: 1
+        }
+    ]);
+    inventory.PendingRecipes.push({
+        CompletionDate: new Date(),
+        ItemType: recipeType,
+        TargetFingerprint: JSON.stringify({
+            ItemType: "/Lotus/Weapons/Grineer/KuvaLich/Upgrades/InnateDamageRandomMod",
+            UpgradeFingerprint: {
+                compat: weaponType,
+                buffs: [
+                    {
+                        Tag: getInnateDamageTag(KillingSuit),
+                        Value: getInnateDamageValue(fp)
+                    }
+                ]
+            },
+            Name: weaponLoc + "|" + nemesisName
+        } satisfies INemesisWeaponTargetFingerprint)
+    });
+};
+
+export const giveNemesisPetRecipe = (inventory: TInventoryDatabaseDocument, nemesisName: string = "AGOR ROK"): void => {
+    const head = getRandomElement([
+        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadA",
+        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadB",
+        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartHeadC"
+    ]);
+    const body = getRandomElement([
+        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartBodyA",
+        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartBodyB",
+        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartBodyC"
+    ]);
+    const legs = getRandomElement([
+        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartLegsA",
+        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartLegsB",
+        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartLegsC"
+    ]);
+    const tail = getRandomElement([
+        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartTailA",
+        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartTailB",
+        "/Lotus/Types/Friendly/Pets/ZanukaPets/ZanukaPetParts/ZanukaPetPartTailC"
+    ]);
+    const recipeType = Object.entries(ExportRecipes).find(arr => arr[1].resultType == head)![0];
+    addRecipes(inventory, [
+        {
+            ItemType: recipeType,
+            ItemCount: 1
+        }
+    ]);
+    inventory.PendingRecipes.push({
+        CompletionDate: new Date(),
+        ItemType: recipeType,
+        TargetFingerprint: JSON.stringify({
+            Parts: [head, body, legs, tail],
+            Name: "/Lotus/Language/Pets/ZanukaPetName|" + nemesisName
+        } satisfies INemesisPetTargetFingerprint)
+    });
+};
--- a/src/services/missionInventoryUpdateService.ts
+++ b/src/services/missionInventoryUpdateService.ts
@ -35,6 +35,8 @@ import {
    combineInventoryChanges,
    generateRewardSeed,
    getCalendarProgress,
+    giveNemesisPetRecipe,
+    giveNemesisWeaponRecipe,
    updateCurrency,
    updateSyndicate
 } from "@/src/services/inventoryService";
@ -53,7 +55,7 @@ import kuriaMessage50 from "@/static/fixed_responses/kuriaMessages/fiftyPercent.
 import kuriaMessage75 from "@/static/fixed_responses/kuriaMessages/seventyFivePercent.json";
 import kuriaMessage100 from "@/static/fixed_responses/kuriaMessages/oneHundredPercent.json";
 import conservationAnimals from "@/static/fixed_responses/conservationAnimals.json";
-import { getInfNodes } from "@/src/helpers/nemesisHelpers";
+import { getInfNodes, getWeaponsForManifest } from "@/src/helpers/nemesisHelpers";
 import { Loadout } from "../models/inventoryModels/loadoutModel";
 import { ILoadoutConfigDatabase } from "../types/saveLoadoutTypes";
 import { getLiteSortie, getWorldState, idToWeek } from "./worldStateService";
@ -513,6 +515,16 @@ export const addMissionInventoryUpdates = async (
                }
                break;
            }
+            case "KubrowPetEggs": {
+                for (const egg of value) {
+                    inventory.KubrowPetEggs ??= [];
+                    inventory.KubrowPetEggs.push({
+                        ItemType: egg.ItemType,
+                        _id: new Types.ObjectId()
+                    });
+                }
+                break;
+            }
            case "DiscoveredMarkers": {
                for (const clientMarker of value) {
                    const dbMarker = inventory.DiscoveredMarkers.find(x => x.tag == clientMarker.tag);
@ -602,6 +614,52 @@ export const addMissionInventoryUpdates = async (
                }
                break;
            }
+            case "NemesisKillConvert":
+                if (inventory.Nemesis) {
+                    inventory.NemesisHistory ??= [];
+                    inventory.NemesisHistory.push({
+                        // Copy over all 'base' values
+                        fp: inventory.Nemesis.fp,
+                        d: inventory.Nemesis.d,
+                        manifest: inventory.Nemesis.manifest,
+                        KillingSuit: inventory.Nemesis.KillingSuit,
+                        killingDamageType: inventory.Nemesis.killingDamageType,
+                        ShoulderHelmet: inventory.Nemesis.ShoulderHelmet,
+                        WeaponIdx: inventory.Nemesis.WeaponIdx,
+                        AgentIdx: inventory.Nemesis.AgentIdx,
+                        BirthNode: inventory.Nemesis.BirthNode,
+                        Faction: inventory.Nemesis.Faction,
+                        Rank: inventory.Nemesis.Rank,
+                        Traded: inventory.Nemesis.Traded,
+                        PrevOwners: inventory.Nemesis.PrevOwners,
+                        SecondInCommand: inventory.Nemesis.SecondInCommand,
+                        Weakened: inventory.Nemesis.Weakened,
+                        // And set killed flag
+                        k: value.killed
+                    });
+
+                    if (value.killed) {
+                        if (value.weaponLoc) {
+                            const weaponType = getWeaponsForManifest(inventory.Nemesis.manifest)[
+                                inventory.Nemesis.WeaponIdx
+                            ];
+                            giveNemesisWeaponRecipe(
+                                inventory,
+                                weaponType,
+                                value.nemesisName,
+                                value.weaponLoc,
+                                inventory.Nemesis.KillingSuit,
+                                inventory.Nemesis.fp
+                            );
+                        }
+                        if (value.petLoc) {
+                            giveNemesisPetRecipe(inventory);
+                        }
+                    }
+
+                    inventory.Nemesis = undefined;
+                }
+                break;
            default:
                // Equipment XP updates
                if (equipmentKeys.includes(key as TEquipmentKey)) {
--- a/src/services/serversideVendorsService.ts
+++ b/src/services/serversideVendorsService.ts
@ -73,7 +73,6 @@ const generatableVendors: IGeneratableVendorInfo[] = [
    {
        _id: { $oid: "67dadc30e4b6e0e5979c8d84" },
        TypeName: "/Lotus/Types/Game/VendorManifests/TheHex/InfestedLichWeaponVendorManifest",
-        PropertyTextHash: "77093DD05A8561A022DEC9A4B9BB4A56",
        RandomSeedType: "VRST_WEAPON",
        RequiredGoalTag: "",
        WeaponUpgradeValueAttenuationExponent: 2.25,
@ -83,7 +82,6 @@ const generatableVendors: IGeneratableVendorInfo[] = [
    {
        _id: { $oid: "60ad3b6ec96976e97d227e19" },
        TypeName: "/Lotus/Types/Game/VendorManifests/Hubs/PerrinSequenceWeaponVendorManifest",
-        PropertyTextHash: "34F8CF1DFF745F0D67433A5EF0A03E70",
        RandomSeedType: "VRST_WEAPON",
        WeaponUpgradeValueAttenuationExponent: 2.25,
        cycleOffset: 1744934400_000,
@ -92,21 +90,18 @@ const generatableVendors: IGeneratableVendorInfo[] = [
    {
        _id: { $oid: "5be4a159b144f3cdf1c22efa" },
        TypeName: "/Lotus/Types/Game/VendorManifests/Solaris/DebtTokenVendorManifest",
-        PropertyTextHash: "A39621049CA3CA13761028CD21C239EF",
        RandomSeedType: "VRST_FLAVOUR_TEXT",
        cycleDuration: unixTimesInMs.hour
    },
    {
        _id: { $oid: "61ba123467e5d37975aeeb03" },
        TypeName: "/Lotus/Types/Game/VendorManifests/Hubs/GuildAdvertisementVendorManifest",
-        PropertyTextHash: "255AFE2169BAE4130B4B20D7C55D14FA",
        RandomSeedType: "VRST_FLAVOUR_TEXT",
        cycleDuration: unixTimesInMs.week
    }
    // {
    //     _id: { $oid: "5dbb4c41e966f7886c3ce939" },
-    //     TypeName: "/Lotus/Types/Game/VendorManifests/Hubs/IronwakeDondaVendorManifest",
-    //     PropertyTextHash: "62B64A8065B7C0FA345895D4BC234621"
+    //     TypeName: "/Lotus/Types/Game/VendorManifests/Hubs/IronwakeDondaVendorManifest"
    // }
 ];

--- a/src/services/worldStateService.ts
+++ b/src/services/worldStateService.ts
@ -1,5 +1,6 @@
 import staticWorldState from "@/static/fixed_responses/worldState/worldState.json";
 import sortieTilesets from "@/static/fixed_responses/worldState/sortieTilesets.json";
+import syndicateMissions from "@/static/fixed_responses/worldState/syndicateMissions.json";
 import { buildConfig } from "@/src/services/buildConfigService";
 import { unixTimesInMs } from "@/src/constants/timeConstants";
 import { config } from "@/src/services/configService";
@ -189,20 +190,7 @@ const pushSyndicateMissions = (
    idSuffix: string,
    syndicateTag: string
 ): void => {
-    const nodeOptions: string[] = [];
-    for (const [key, value] of Object.entries(ExportRegions)) {
-        if (
-            !isArchwingMission(value) &&
-            !value.questReq && // Exclude zariman, murmor, and 1999 stuff
-            !value.hidden && // Exclude the index
-            !value.darkSectorData && // Exclude dark sectors
-            value.missionIndex != 10 && // Exclude MT_PVP (for relays)
-            value.missionIndex != 23 && // no junctions
-            value.missionIndex < 28 // no open worlds, railjack, etc
-        ) {
-            nodeOptions.push(key);
-        }
-    }
+    const nodeOptions: string[] = [...syndicateMissions];

    const rng = new CRng(seed);
    const nodes: string[] = [];
--- a/src/types/inventoryTypes/inventoryTypes.ts
+++ b/src/types/inventoryTypes/inventoryTypes.ts
@ -43,6 +43,7 @@ export interface IInventoryDatabase
            | "RecentVendorPurchases"
            | "NextRefill"
            | "Nemesis"
+            | "NemesisHistory"
            | "EntratiVaultCountResetDate"
            | "BrandedSuits"
            | "LockedWeaponGroup"
@ -79,6 +80,7 @@ export interface IInventoryDatabase
    RecentVendorPurchases?: IRecentVendorPurchaseDatabase[];
    NextRefill?: Date;
    Nemesis?: INemesisDatabase;
+    NemesisHistory?: INemesisBaseDatabase[];
    EntratiVaultCountResetDate?: Date;
    BrandedSuits?: Types.ObjectId[];
    LockedWeaponGroup?: ILockedWeaponGroupDatabase;
@ -313,7 +315,7 @@ export interface IInventoryClient extends IDailyAffiliations, InventoryClientEqu
    EquippedInstrument?: string;
    InvasionChainProgress: IInvasionChainProgress[];
    Nemesis?: INemesisClient;
-    NemesisHistory: INemesisBaseClient[];
+    NemesisHistory?: INemesisBaseClient[];
    LastNemesisAllySpawnTime?: IMongoDate;
    Settings?: ISettings;
    PersonalTechProjects: IPersonalTechProjectClient[];
@ -902,8 +904,8 @@ export interface IPendingRecipeDatabase {
    ItemType: string;
    CompletionDate: Date;
    ItemId: IOid;
-    TargetItemId?: string; // likely related to liches
-    TargetFingerprint?: string; // likely related to liches
+    TargetItemId?: string; // unsure what this is for
+    TargetFingerprint?: string;
    LongGuns?: IEquipmentDatabase[];
    Pistols?: IEquipmentDatabase[];
    Melee?: IEquipmentDatabase[];
@ -951,6 +953,17 @@ export interface ICrewShipComponentFingerprint extends IInnateDamageFingerprint
    SubroutineIndex?: number;
 }

+export interface INemesisWeaponTargetFingerprint {
+    ItemType: string;
+    UpgradeFingerprint: IInnateDamageFingerprint;
+    Name: string;
+}
+
+export interface INemesisPetTargetFingerprint {
+    Parts: string[];
+    Name: string;
+}
+
 export enum GettingSlotOrderInfo {
    Empty = "",
    LotusUpgradesModsRandomizedPlayerMeleeWeaponRandomModRare0 = "/Lotus/Upgrades/Mods/Randomized/PlayerMeleeWeaponRandomModRare:0",
--- a/src/types/requestTypes.ts
+++ b/src/types/requestTypes.ts
@ -21,7 +21,9 @@ import {
    ILockedWeaponGroupClient,
    ILoadOutPresets,
    IInvasionProgressClient,
-    IWeaponSkinClient
+    IWeaponSkinClient,
+    IKubrowPetEggClient,
+    INemesisClient
 } from "./inventoryTypes/inventoryTypes";
 import { IGroup } from "./loginTypes";

@ -73,6 +75,14 @@ export type IMissionInventoryUpdateRequest = {
    PS: string;
    ActiveDojoColorResearch: string;
    RewardInfo?: IRewardInfo;
+    NemesisKillConvert?: {
+        nemesisName: string;
+        weaponLoc: string;
+        petLoc: "" | "/Lotus/Language/Pets/ZanukaPetName";
+        fingerprint: bigint | number;
+        killed: boolean;
+    };
+    target?: INemesisClient;
    ReceivedCeremonyMsg: boolean;
    LastCeremonyResetDate: number;
    MissionPTS: number;
@ -118,6 +128,7 @@ export type IMissionInventoryUpdateRequest = {
        NumExtraRewards: number;
        Count: number;
    }[];
+    KubrowPetEggs?: IKubrowPetEggClient[];
    DiscoveredMarkers?: IDiscoveredMarker[];
    LockedWeaponGroup?: ILockedWeaponGroupClient; // sent when captured by zanuka
    UnlockWeapons?: boolean; // sent when recovered weapons from zanuka capture
--- a/static/fixed_responses/worldState/syndicateMissions.json
+++ b/static/fixed_responses/worldState/syndicateMissions.json
@ -0,0 +1,157 @@
+[
+  "SettlementNode1",
+  "SettlementNode11",
+  "SettlementNode12",
+  "SettlementNode14",
+  "SettlementNode15",
+  "SettlementNode2",
+  "SettlementNode3",
+  "SolNode1",
+  "SolNode10",
+  "SolNode100",
+  "SolNode101",
+  "SolNode102",
+  "SolNode103",
+  "SolNode106",
+  "SolNode107",
+  "SolNode109",
+  "SolNode11",
+  "SolNode113",
+  "SolNode118",
+  "SolNode119",
+  "SolNode12",
+  "SolNode121",
+  "SolNode122",
+  "SolNode123",
+  "SolNode125",
+  "SolNode126",
+  "SolNode128",
+  "SolNode130",
+  "SolNode131",
+  "SolNode132",
+  "SolNode135",
+  "SolNode137",
+  "SolNode138",
+  "SolNode139",
+  "SolNode14",
+  "SolNode140",
+  "SolNode141",
+  "SolNode146",
+  "SolNode147",
+  "SolNode149",
+  "SolNode15",
+  "SolNode153",
+  "SolNode16",
+  "SolNode162",
+  "SolNode164",
+  "SolNode166",
+  "SolNode167",
+  "SolNode17",
+  "SolNode171",
+  "SolNode172",
+  "SolNode173",
+  "SolNode175",
+  "SolNode177",
+  "SolNode18",
+  "SolNode181",
+  "SolNode184",
+  "SolNode185",
+  "SolNode187",
+  "SolNode188",
+  "SolNode189",
+  "SolNode19",
+  "SolNode191",
+  "SolNode195",
+  "SolNode196",
+  "SolNode2",
+  "SolNode20",
+  "SolNode203",
+  "SolNode204",
+  "SolNode205",
+  "SolNode209",
+  "SolNode21",
+  "SolNode211",
+  "SolNode212",
+  "SolNode214",
+  "SolNode215",
+  "SolNode216",
+  "SolNode217",
+  "SolNode22",
+  "SolNode220",
+  "SolNode223",
+  "SolNode224",
+  "SolNode225",
+  "SolNode226",
+  "SolNode23",
+  "SolNode25",
+  "SolNode26",
+  "SolNode27",
+  "SolNode30",
+  "SolNode31",
+  "SolNode36",
+  "SolNode38",
+  "SolNode39",
+  "SolNode4",
+  "SolNode400",
+  "SolNode401",
+  "SolNode402",
+  "SolNode403",
+  "SolNode404",
+  "SolNode405",
+  "SolNode406",
+  "SolNode407",
+  "SolNode408",
+  "SolNode409",
+  "SolNode41",
+  "SolNode410",
+  "SolNode412",
+  "SolNode42",
+  "SolNode43",
+  "SolNode45",
+  "SolNode46",
+  "SolNode48",
+  "SolNode49",
+  "SolNode50",
+  "SolNode56",
+  "SolNode57",
+  "SolNode58",
+  "SolNode59",
+  "SolNode6",
+  "SolNode61",
+  "SolNode62",
+  "SolNode63",
+  "SolNode64",
+  "SolNode66",
+  "SolNode67",
+  "SolNode68",
+  "SolNode70",
+  "SolNode706",
+  "SolNode707",
+  "SolNode708",
+  "SolNode709",
+  "SolNode710",
+  "SolNode711",
+  "SolNode72",
+  "SolNode73",
+  "SolNode74",
+  "SolNode741",
+  "SolNode742",
+  "SolNode743",
+  "SolNode744",
+  "SolNode745",
+  "SolNode746",
+  "SolNode748",
+  "SolNode75",
+  "SolNode76",
+  "SolNode78",
+  "SolNode79",
+  "SolNode81",
+  "SolNode82",
+  "SolNode84",
+  "SolNode85",
+  "SolNode88",
+  "SolNode89",
+  "SolNode93",
+  "SolNode96",
+  "SolNode97"
+]
--- a/static/webui/translations/es.js
+++ b/static/webui/translations/es.js
@ -120,9 +120,9 @@ dict = {
    mods_fingerprintHelp: `¿Necesitas ayuda con la huella digital?`,
    mods_rivens: `Agrietados`,
    mods_mods: `Mods`,
-    mods_addMissingUnrankedMods: `[UNTRANSLATED] Add Missing Unranked Mods`,
+    mods_addMissingUnrankedMods: `Agregar mods sin rango faltantes`,
    mods_removeUnranked: `Quitar mods sin rango`,
-    mods_addMissingMaxRankMods: `[UNTRANSLATED] Add Missing Max Rank Mods`,
+    mods_addMissingMaxRankMods: `Agregar mods de rango máximo faltantes`,
    cheats_administratorRequirement: `Debes ser administrador para usar esta función. Para convertirte en administrador, agrega <code>|DISPLAYNAME|</code> a <code>administratorNames</code> en el archivo config.json.`,
    cheats_server: `Servidor`,
    cheats_skipTutorial: `Omitir tutorial`,
@ -134,7 +134,7 @@ dict = {
    cheats_infiniteEndo: `Endo infinito`,
    cheats_infiniteRegalAya: `Aya Real infinita`,
    cheats_infiniteHelminthMaterials: `Materiales Helminto infinitos`,
-    cheats_dontSubtractConsumables: `[UNTRANSLATED] Don't Subtract Consumables`,
+    cheats_dontSubtractConsumables: `No restar consumibles`,
    cheats_unlockAllShipFeatures: `Desbloquear todas las funciones de nave`,
    cheats_unlockAllShipDecorations: `Desbloquear todas las decoraciones de nave`,
    cheats_unlockAllFlavourItems: `Desbloquear todos los <abbr title="Conjuntos de animaciones, glifos, paletas, etc.">ítems estéticos</abbr>`,
Author	SHA1	Message	Date
Sainan	f72c1482b3	feat: handle NemesisKillConvert at missionInventoryUpdate All checks were successful Build / build (push) Successful in 55s Details Build / build (pull_request) Successful in 1m32s Details	2025-04-27 21:37:14 +02:00
Sainan	40acb3b03f	add getWeaponsForManifest	2025-04-27 21:37:06 +02:00
Sainan	9e94083875	feat: handle KubrowPetEggs in missionInventoryUpdate (#1876 ) All checks were successful Build Docker image / docker (push) Successful in 33s Details Build / build (push) Successful in 1m35s Details Closes #1866 Reviewed-on: #1876 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>	2025-04-27 12:36:00 -07:00
Sainan	db0e0d80dd	chore: remove PropertyTextHash from auto-generated vendors All checks were successful Build / build (push) Successful in 55s Details Build Docker image / docker (push) Successful in 35s Details	2025-04-27 07:20:04 +02:00
Sainan	5cda2e2d08	chore: improve unlockAllScans's handling of existing scans (#1875 ) All checks were successful Build Docker image / docker (push) Successful in 1m5s Details Build / build (push) Successful in 1m23s Details Reviewed-on: #1875 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>	2025-04-26 19:28:03 -07:00
Sainan	e23d865044	fix: use a list of "known good" syndicate missions (#1874 ) Some checks failed Build Docker image / docker (push) Has been cancelled Details Build / build (push) Has been cancelled Details Closes #1870 Reviewed-on: #1874 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>	2025-04-26 19:27:50 -07:00
Sainan	c7658b5b20	chore: use parallelForeach in removePigmentsFromGuildMembers All checks were successful Build Docker image / docker (push) Successful in 34s Details Build / build (push) Successful in 1m34s Details	2025-04-27 04:22:18 +02:00
hxedcl	9993500eca	chore(webui): update to Spanish translation (#1881 ) All checks were successful Build Docker image / docker (push) Successful in 1m7s Details Build / build (push) Successful in 1m4s Details Reviewed-on: #1881 Co-authored-by: hxedcl <hxedcl@noreply.localhost> Co-committed-by: hxedcl <hxedcl@noreply.localhost>	2025-04-26 18:53:46 -07:00