chore: add TNemesisFaction

Reviewed-on: OpenWF/SpaceNinjaServer#2065
Co-authored-by: Animan8000 <animan8000@noreply.localhost>
Co-committed-by: Animan8000 <animan8000@noreply.localhost>

Dockerfile

@@ -14,6 +14,8 @@ ENV APP_INFINITE_PLATINUM=false
 ENV APP_INFINITE_ENDO=false
 ENV APP_INFINITE_REGAL_AYA=false
 ENV APP_INFINITE_HELMINTH_MATERIALS=false
+ENV APP_CLAIMING_BLUEPRINT_REFUNDS_INGREDIENTS=false
+ENV APP_DONT_SUBTRACT_VOIDTRACES=false
 ENV APP_DONT_SUBTRACT_CONSUMABLES=false
 ENV APP_UNLOCK_ALL_SHIP_FEATURES=false
 ENV APP_UNLOCK_ALL_SHIP_DECORATIONS=false

docker-compose.yml

@@ -21,6 +21,8 @@ services:
             # APP_INFINITE_ENDO: false
             # APP_INFINITE_REGAL_AYA: false
             # APP_INFINITE_HELMINTH_MATERIALS: false
+            # APP_CLAIMING_BLUEPRINT_REFUNDS_INGREDIENTS: false
+            # APP_DONT_SUBTRACT_VOIDTRACES: false
             # APP_DONT_SUBTRACT_CONSUMABLES: false
             # APP_UNLOCK_ALL_SHIP_FEATURES: false
             # APP_UNLOCK_ALL_SHIP_DECORATIONS: false

src/controllers/api/nemesisController.ts

@@ -24,7 +24,8 @@ import {
     IUpgradeClient,
     IWeaponSkinClient,
     LoadoutIndex,
-    TEquipmentKey
+    TEquipmentKey,
+    TNemesisFaction
 } from "@/src/types/inventoryTypes/inventoryTypes";
 import { logger } from "@/src/utils/logger";
 import { RequestHandler } from "express";
@@ -269,7 +270,7 @@ interface INemesisStartRequest {
         WeaponIdx: number;
         AgentIdx: number;
         BirthNode: string;
-        Faction: string;
+        Faction: TNemesisFaction;
         Rank: number;
         k: boolean;
         Traded: boolean;

src/helpers/nemesisHelpers.ts

@@ -1,5 +1,5 @@
 import { ExportRegions, ExportWarframes } from "warframe-public-export-plus";
-import { IInfNode, ITypeCount } from "@/src/types/inventoryTypes/inventoryTypes";
+import { IInfNode, ITypeCount, TNemesisFaction } from "@/src/types/inventoryTypes/inventoryTypes";
 import { getRewardAtPercentage, SRng } from "@/src/services/rngService";
 import { TInventoryDatabaseDocument } from "../models/inventoryModels/inventoryModel";
 import { logger } from "../utils/logger";
@@ -11,7 +11,7 @@ import { fromStoreItem, toStoreItem } from "../services/itemDataService";
 import { createMessage } from "../services/inboxService";
 import { version_compare } from "./inventoryHelpers";
 
-export const getInfNodes = (faction: string, rank: number): IInfNode[] => {
+export const getInfNodes = (faction: TNemesisFaction, rank: number): IInfNode[] => {
     const infNodes = [];
     const systemIndex = systemIndexes[faction][rank];
     for (const [key, value] of Object.entries(ExportRegions)) {
@@ -35,20 +35,20 @@ export const getInfNodes = (faction: string, rank: number): IInfNode[] => {
     return infNodes;
 };
 
-const systemIndexes: Record<string, number[]> = {
+const systemIndexes: Record<TNemesisFaction, number[]> = {
     FC_GRINEER: [2, 3, 9, 11, 18],
     FC_CORPUS: [1, 15, 4, 7, 8],
     FC_INFESTATION: [23]
 };
 
-export const showdownNodes: Record<string, string> = {
+export const showdownNodes: Record<TNemesisFaction, string> = {
     FC_GRINEER: "CrewBattleNode557",
     FC_CORPUS: "CrewBattleNode558",
     FC_INFESTATION: "CrewBattleNode559"
 };
 
 // Get a parazon 'passcode' based on the nemesis fingerprint so it's always the same for the same nemesis.
-export const getNemesisPasscode = (nemesis: { fp: bigint; Faction: string }): number[] => {
+export const getNemesisPasscode = (nemesis: { fp: bigint; Faction: TNemesisFaction }): number[] => {
     const rng = new SRng(nemesis.fp);
     const choices = [0, 1, 2, 3, 5, 6, 7];
     let choiceIndex = rng.randomInt(0, choices.length - 1);
@@ -87,7 +87,7 @@ const antivirusMods: readonly string[] = [
     "/Lotus/Upgrades/Mods/Immortal/AntivirusEightMod"
 ];
 
-export const getNemesisPasscodeModTypes = (nemesis: { fp: bigint; Faction: string }): string[] => {
+export const getNemesisPasscodeModTypes = (nemesis: { fp: bigint; Faction: TNemesisFaction }): string[] => {
     const passcode = getNemesisPasscode(nemesis);
     return nemesis.Faction == "FC_INFESTATION"
         ? passcode.map(i => antivirusMods[i])
@@ -248,7 +248,7 @@ export const getWeaponsForManifest = (manifest: string): readonly string[] => {
 };
 
 export const isNemesisCompatibleWithVersion = (
-    nemesis: { manifest: string; Faction: string },
+    nemesis: { manifest: string; Faction: TNemesisFaction },
     buildLabel: string
 ): boolean => {
     // Anything below 35.6.0 is not going to be okay given our set of supported manifests.

src/services/inventoryService.ts

@@ -1585,12 +1585,17 @@ export const addMiscItems = (inventory: TInventoryDatabaseDocument, itemsArray:
         if (MiscItems[itemIndex].ItemCount == 0) {
             MiscItems.splice(itemIndex, 1);
         } else if (MiscItems[itemIndex].ItemCount <= 0) {
-            logger.warn(`account now owns a negative amount of ${ItemType}`);
+            logger.warn(`inventory.MiscItems has a negative count for ${ItemType}`);
         }
     });
 };
 
-const applyArrayChanges = (arr: ITypeCount[], changes: ITypeCount[]): void => {
+const applyArrayChanges = (
+    inventory: TInventoryDatabaseDocument,
+    key: "ShipDecorations" | "Consumables" | "CrewShipRawSalvage" | "CrewShipAmmo" | "Recipes" | "LevelKeys",
+    changes: ITypeCount[]
+): void => {
+    const arr: ITypeCount[] = inventory[key];
     for (const change of changes) {
         if (change.ItemCount != 0) {
             let itemIndex = arr.findIndex(x => x.ItemType === change.ItemType);
@@ -1602,34 +1607,34 @@ const applyArrayChanges = (arr: ITypeCount[], changes: ITypeCount[]): void => {
             if (arr[itemIndex].ItemCount == 0) {
                 arr.splice(itemIndex, 1);
             } else if (arr[itemIndex].ItemCount <= 0) {
-                logger.warn(`account now owns a negative amount of ${change.ItemType}`);
+                logger.warn(`inventory.${key} has a negative count for ${change.ItemType}`);
             }
         }
     }
 };
 
 export const addShipDecorations = (inventory: TInventoryDatabaseDocument, itemsArray: ITypeCount[]): void => {
-    applyArrayChanges(inventory.ShipDecorations, itemsArray);
+    applyArrayChanges(inventory, "ShipDecorations", itemsArray);
 };
 
 export const addConsumables = (inventory: TInventoryDatabaseDocument, itemsArray: ITypeCount[]): void => {
-    applyArrayChanges(inventory.Consumables, itemsArray);
+    applyArrayChanges(inventory, "Consumables", itemsArray);
 };
 
 export const addCrewShipRawSalvage = (inventory: TInventoryDatabaseDocument, itemsArray: ITypeCount[]): void => {
-    applyArrayChanges(inventory.CrewShipRawSalvage, itemsArray);
+    applyArrayChanges(inventory, "CrewShipRawSalvage", itemsArray);
 };
 
 export const addCrewShipAmmo = (inventory: TInventoryDatabaseDocument, itemsArray: ITypeCount[]): void => {
-    applyArrayChanges(inventory.CrewShipAmmo, itemsArray);
+    applyArrayChanges(inventory, "CrewShipAmmo", itemsArray);
 };
 
 export const addRecipes = (inventory: TInventoryDatabaseDocument, itemsArray: ITypeCount[]): void => {
-    applyArrayChanges(inventory.Recipes, itemsArray);
+    applyArrayChanges(inventory, "Recipes", itemsArray);
 };
 
 export const addLevelKeys = (inventory: TInventoryDatabaseDocument, itemsArray: ITypeCount[]): void => {
-    applyArrayChanges(inventory.LevelKeys, itemsArray);
+    applyArrayChanges(inventory, "LevelKeys", itemsArray);
 };
 
 export const addMods = (inventory: TInventoryDatabaseDocument, itemsArray: IRawUpgrade[]): void => {
@@ -1649,7 +1654,7 @@ export const addMods = (inventory: TInventoryDatabaseDocument, itemsArray: IRawU
         if (RawUpgrades[itemIndex].ItemCount == 0) {
             RawUpgrades.splice(itemIndex, 1);
         } else if (RawUpgrades[itemIndex].ItemCount <= 0) {
-            logger.warn(`account now owns a negative amount of ${ItemType}`);
+            logger.warn(`inventory.RawUpgrades has a negative count for ${ItemType}`);
         }
     });
 };
@@ -1664,7 +1669,7 @@ export const addFusionTreasures = (inventory: TInventoryDatabaseDocument, itemsA
             if (FusionTreasures[itemIndex].ItemCount == 0) {
                 FusionTreasures.splice(itemIndex, 1);
             } else if (FusionTreasures[itemIndex].ItemCount <= 0) {
-                logger.warn(`account now owns a negative amount of ${ItemType}`);
+                logger.warn(`inventory.FusionTreasures has a negative count for ${ItemType}`);
             }
         } else {
             FusionTreasures.push({ ItemCount, ItemType, Sockets });

src/services/missionInventoryUpdateService.ts

@@ -825,6 +825,13 @@ const hexConquestRewards: IConquestReward[] = [
     }
 ];
 
+const droptableAliases: Record<string, string> = {
+    "/Lotus/Types/DropTables/ManInTheWall/MITWGruzzlingArcanesDropTable":
+        "/Lotus/Types/DropTables/EntratiLabDropTables/DoppelgangerDropTable",
+    "/Lotus/Types/DropTables/WF1999DropTables/LasrianTankSteelPathDropTable":
+        "/Lotus/Types/DropTables/WF1999DropTables/LasrianTankHardModeDropTable"
+};
+
 //TODO: return type of partial missioninventoryupdate response
 export const addMissionRewards = async (
     inventory: TInventoryDatabaseDocument,
@@ -1033,11 +1040,9 @@ export const addMissionRewards = async (
 
     if (strippedItems) {
         for (const si of strippedItems) {
-            if (si.DropTable == "/Lotus/Types/DropTables/ManInTheWall/MITWGruzzlingArcanesDropTable") {
-                logger.debug(
-                    `rewriting ${si.DropTable} to /Lotus/Types/DropTables/EntratiLabDropTables/DoppelgangerDropTable`
-                );
-                si.DropTable = "/Lotus/Types/DropTables/EntratiLabDropTables/DoppelgangerDropTable";
+            if (si.DropTable in droptableAliases) {
+                logger.debug(`rewriting ${si.DropTable} to ${droptableAliases[si.DropTable]}`);
+                si.DropTable = droptableAliases[si.DropTable];
             }
             const droptables = ExportEnemies.droptables[si.DropTable] ?? [];
             if (si.DROP_MOD) {
@@ -1517,7 +1522,7 @@ function getRandomMissionDrops(
                 ZarimanSyndicate: [
                     "/Lotus/Types/Game/MissionDecks/ZarimanJobMissionRewards/TierATableRewards",
                     "/Lotus/Types/Game/MissionDecks/ZarimanJobMissionRewards/TierBTableRewards",
-                    "/Lotus/Types/Game/MissionDecks/ZarimanJobMissionRewards/TierCTableRewards",
+                    "/Lotus/Types/Game/MissionDecks/ZarimanJobMissionRewards/TierCTableARewards", // [sic]
                     "/Lotus/Types/Game/MissionDecks/ZarimanJobMissionRewards/TierDTableRewards",
                     "/Lotus/Types/Game/MissionDecks/ZarimanJobMissionRewards/TierETableRewards"
                 ],

src/types/inventoryTypes/inventoryTypes.ts

@@ -863,6 +863,8 @@ export interface IMission extends IMissionDatabase {
     RewardsCooldownTime?: IMongoDate;
 }
 
+export type TNemesisFaction = "FC_GRINEER" | "FC_CORPUS" | "FC_INFESTATION";
+
 export interface INemesisBaseClient {
     fp: bigint | number;
     manifest: string;
@@ -872,7 +874,7 @@ export interface INemesisBaseClient {
     WeaponIdx: number;
     AgentIdx: number;
     BirthNode: string;
-    Faction: string;
+    Faction: TNemesisFaction;
     Rank: number;
     k: boolean;
     Traded: boolean;

static/webui/translations/de.js

@@ -132,7 +132,7 @@ dict = {
     cheats_infiniteRegalAya: `Unendlich Reines Aya`,
     cheats_infiniteHelminthMaterials: `Unendlich Helminth-Materialien`,
     cheats_claimingBlueprintRefundsIngredients: `Fertige Blaupausen erstatten Ressourcen zurück`,
-    cheats_dontSubtractVoidTraces: `[UNTRANSLATED] Don't Subtract Void Traces`,
+    cheats_dontSubtractVoidTraces: `Void-Spuren nicht verbrauchen`,
     cheats_dontSubtractConsumables: `Verbrauchsgegenstände (Ausrüstung) nicht verbrauchen`,
     cheats_unlockAllShipFeatures: `Alle Schiffs-Funktionen freischalten`,
     cheats_unlockAllShipDecorations: `Alle Schiffsdekorationen freischalten`,

static/webui/translations/es.js

@@ -132,7 +132,7 @@ dict = {
     cheats_infiniteRegalAya: `Aya Real infinita`,
     cheats_infiniteHelminthMaterials: `Materiales Helminto infinitos`,
     cheats_claimingBlueprintRefundsIngredients: `Reclamar ingredientes devueltos por planos`,
-    cheats_dontSubtractVoidTraces: `[UNTRANSLATED] Don't Subtract Void Traces`,
+    cheats_dontSubtractVoidTraces: `No descontar vestigios del Vacío`,
     cheats_dontSubtractConsumables: `No restar consumibles`,
     cheats_unlockAllShipFeatures: `Desbloquear todas las funciones de nave`,
     cheats_unlockAllShipDecorations: `Desbloquear todas las decoraciones de nave`,