src/controllers/api/unlockShipFeatureController.ts

@@ -1,20 +1,11 @@
 import type { RequestHandler } from "express";
-import { getAccountIdForRequest } from "../../services/loginService.ts";
-import { getInventory } from "../../services/inventoryService.ts";
-import { getJSONfromString } from "../../helpers/stringHelpers.ts";
-import { unlockShipFeature } from "../../services/personalRoomsService.ts";
+import { updateShipFeature } from "../../services/personalRoomsService.ts";
+import type { IUnlockShipFeatureRequest } from "../../types/requestTypes.ts";
+import { parseString } from "../../helpers/general.ts";
 
 export const unlockShipFeatureController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "MiscItems accountOwnerId");
-    const request = getJSONfromString<IUnlockShipFeatureRequest>(String(req.body));
-
-    await unlockShipFeature(inventory, request.Feature);
-    await inventory.save();
+    const accountId = parseString(req.query.accountId);
+    const shipFeatureRequest = JSON.parse((req.body as string).toString()) as IUnlockShipFeatureRequest;
+    await updateShipFeature(accountId, shipFeatureRequest.Feature);
     res.send([]);
 };
-interface IUnlockShipFeatureRequest {
-    Feature: string;
-    KeyChain: string;
-    ChainStage: number;
-}

src/services/inventoryService.ts

@@ -388,7 +388,7 @@ export const addItem = async (
             };
         } else if (ExportResources[typeName].productCategory == "CrewShips") {
             return {
-                ...(await addCrewShip(inventory, typeName)),
+                ...addCrewShip(inventory, typeName),
                 // fix to unlock railjack modding, item bellow supposed to be obtained from archwing quest
                 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
                 ...(!inventory.CrewShipHarnesses?.length
@@ -1543,31 +1543,17 @@ export const addCrewShipSalvagedWeaponSkin = (
     return inventoryChanges;
 };
 
-const addCrewShip = async (
+const addCrewShip = (
     inventory: TInventoryDatabaseDocument,
     typeName: string,
     inventoryChanges: IInventoryChanges = {}
-): Promise<IInventoryChanges> => {
+): IInventoryChanges => {
     if (inventory.CrewShips.length != 0) {
         logger.warn("refusing to add CrewShip because account already has one");
     } else {
         const index = inventory.CrewShips.push({ ItemType: typeName }) - 1;
         inventoryChanges.CrewShips ??= [];
         inventoryChanges.CrewShips.push(inventory.CrewShips[index].toJSON<IEquipmentClient>());
-        const railjackQuest = inventory.QuestKeys.find(
-            qk => qk.ItemType === "/Lotus/Types/Keys/RailJackBuildQuest/RailjackBuildQuestKeyChain"
-        );
-        if (!railjackQuest || !railjackQuest.Completed) {
-            const questChanges = await completeQuest(
-                inventory,
-                "/Lotus/Types/Keys/RailJackBuildQuest/RailjackBuildQuestKeyChain",
-                false
-            );
-            if (questChanges) {
-                inventoryChanges.QuestKeys ??= [];
-                inventoryChanges.QuestKeys.push(questChanges);
-            }
-        }
     }
     return inventoryChanges;
 };

src/services/missionInventoryUpdateService.ts

@@ -243,7 +243,7 @@ export const addMissionInventoryUpdates = async (
                 }
             }
         }
-        if (inventoryUpdates.RewardInfo.jobId) {
+        if (inventoryUpdates.MissionStatus == "GS_SUCCESS" && inventoryUpdates.RewardInfo.jobId) {
             // e.g. for Profit-Taker Phase 1:
             // JobTier: -6,
             // jobId: '/Lotus/Types/Gameplay/Venus/Jobs/Heists/HeistProfitTakerBountyOne_-6_SolarisUnitedHub1_663a71c80000000000000025_EudicoHeists',
@@ -251,10 +251,7 @@ export const addMissionInventoryUpdates = async (
 
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const [bounty, tier, hub, id, tag] = inventoryUpdates.RewardInfo.jobId.split("_");
-            if (
-                (tag == "EudicoHeists" && inventoryUpdates.MissionStatus == "GS_SUCCESS") ||
-                (tag == "NokkoColony" && inventoryUpdates.RewardInfo.JobStage == 4)
-            ) {
+            if (tag == "EudicoHeists") {
                 inventory.CompletedJobChains ??= [];
                 let chain = inventory.CompletedJobChains.find(x => x.LocationTag == tag);
                 if (!chain) {
@@ -1129,8 +1126,7 @@ export const addMissionRewards = async (
         RegularCredits: creditDrops,
         VoidTearParticipantsCurrWave: voidTearWave,
         StrippedItems: strippedItems,
-        AffiliationChanges: AffiliationMods,
-        InvasionProgress: invasionProgress
+        AffiliationChanges: AffiliationMods
     }: IMissionInventoryUpdateRequest,
     firstCompletion: boolean
 ): Promise<AddMissionRewardsReturnType> => {
@@ -1180,19 +1176,6 @@ export const addMissionRewards = async (
 
     //inventory change is what the client has not rewarded itself, also the client needs to know the credit changes for display
 
-    if (invasionProgress) {
-        for (const clientProgress of invasionProgress) {
-            const dbProgress = inventory.QualifyingInvasions.find(x => x.invasionId.equals(clientProgress._id.$oid));
-            if (dbProgress) {
-                const run =
-                    (clientProgress.AttackerScore > clientProgress.DefenderScore
-                        ? dbProgress.AttackerScore
-                        : dbProgress.DefenderScore) - 1;
-                missionCompletionCredits += 1000 * Math.min(run, 10);
-            }
-        }
-    }
-
     if (rewardInfo.goalId) {
         const goal = getWorldState().Goals.find(x => x._id.$oid == rewardInfo.goalId);
         if (goal) {
@@ -1517,7 +1500,7 @@ export const addMissionRewards = async (
             syndicateEntry = Goals.find(m => m._id.$oid === syndicateMissionId);
             if (syndicateEntry) syndicateEntry.Tag = syndicateEntry.JobAffiliationTag!;
         }
-        if (syndicateEntry && syndicateEntry.Jobs && !jobType.startsWith("/Lotus/Types/Gameplay/NokkoColony/Jobs")) {
+        if (syndicateEntry && syndicateEntry.Jobs) {
             let currentJob = syndicateEntry.Jobs[rewardInfo.JobTier!];
             if (
                 [
@@ -2025,17 +2008,6 @@ function getRandomMissionDrops(
                                     xpAmounts: [1000]
                                 };
                                 RewardInfo.Q = false; // Just in case
-                            } else if (jobType.startsWith("/Lotus/Types/Gameplay/NokkoColony/Jobs/NokkoJob")) {
-                                job = {
-                                    rewards: jobType.replace(
-                                        "/Lotus/Types/Gameplay/NokkoColony/Jobs/NokkoJob",
-                                        "Lotus/Types/Game/MissionDecks/NokkoColonyRewards/NokkoColonyRewards"
-                                    ),
-                                    masteryReq: 0,
-                                    minEnemyLevel: 30,
-                                    maxEnemyLevel: 40,
-                                    xpAmounts: [0, 0, 0, 0, 0]
-                                };
                             } else {
                                 const tierMap = {
                                     Two: "B",
@@ -2079,18 +2051,14 @@ function getRandomMissionDrops(
                             } else if (totalStage == 5 && curentStage == 4) {
                                 tableIndex = 2;
                             }
-                            if (jobType.startsWith("/Lotus/Types/Gameplay/NokkoColony/Jobs/NokkoJob")) {
-                                if (RewardInfo.JobStage === job.xpAmounts.length - 1) rotations = [0, 1, 2];
-                            } else {
-                                rotations = [tableIndex];
-                            }
+
+                            rotations = [tableIndex];
                         } else {
                             rotations = [0];
                         }
                         if (
                             RewardInfo.Q &&
                             (RewardInfo.JobStage === job.xpAmounts.length - 1 || jobType.endsWith("VaultBounty")) &&
-                            !jobType.startsWith("/Lotus/Types/Gameplay/NokkoColony/Jobs/NokkoJob") &&
                             !isEndlessJob
                         ) {
                             rotations.push(ExportRewards[job.rewards].length - 1);
@@ -2181,24 +2149,22 @@ function getRandomMissionDrops(
                 logger.warn(`RewardSeed mismatch:`, { client: RewardInfo.rewardSeed, database: inventory.RewardSeed });
             }
         }
-        if (rotations.length > 1) {
-            const rng = new SRng(BigInt(RewardInfo.rewardSeed ?? generateRewardSeed()) ^ 0xffffffffffffffffn);
-            rewardManifests.forEach(name => {
-                const table = ExportRewards[name];
-                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                if (!table) {
-                    logger.error(`unknown droptable: ${name}`);
-                    return;
+        const rng = new SRng(BigInt(RewardInfo.rewardSeed ?? generateRewardSeed()) ^ 0xffffffffffffffffn);
+        rewardManifests.forEach(name => {
+            const table = ExportRewards[name];
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+            if (!table) {
+                logger.error(`unknown droptable: ${name}`);
+                return;
+            }
+            for (const rotation of rotations) {
+                const rotationRewards = table[rotation];
+                const drop = getRandomRewardByChance(rotationRewards, rng);
+                if (drop) {
+                    drops.push({ StoreItem: drop.type, ItemCount: drop.itemCount });
                 }
-                for (const rotation of rotations) {
-                    const rotationRewards = table[rotation];
-                    const drop = getRandomRewardByChance(rotationRewards, rng);
-                    if (drop) {
-                        drops.push({ StoreItem: drop.type, ItemCount: drop.itemCount });
-                    }
-                }
-            });
-        }
+            }
+        });
 
         // Railjack Abandoned Cache Rewards, Rotation A (Mandatory Objectives)
         if (RewardInfo.POICompletions) {

src/services/personalRoomsService.ts

@@ -1,9 +1,7 @@
 import { PersonalRooms } from "../models/personalRoomsModel.ts";
-import { addItem } from "./inventoryService.ts";
+import { addItem, getInventory } from "./inventoryService.ts";
 import type { IGardeningDatabase, TPersonalRoomsDatabaseDocument } from "../types/personalRoomsTypes.ts";
 import { getRandomElement } from "./rngService.ts";
-import type { TInventoryDatabaseDocument } from "../models/inventoryModels/inventoryModel.ts";
-import { logger } from "../utils/logger.ts";
 
 export const getPersonalRooms = async (
     accountId: string,
@@ -17,17 +15,19 @@ export const getPersonalRooms = async (
     return personalRooms;
 };
 
-export const unlockShipFeature = async (inventory: TInventoryDatabaseDocument, shipFeature: string): Promise<void> => {
-    const personalRooms = await getPersonalRooms(inventory.accountOwnerId.toString());
+export const updateShipFeature = async (accountId: string, shipFeature: string): Promise<void> => {
+    const personalRooms = await getPersonalRooms(accountId);
 
     if (personalRooms.Ship.Features.includes(shipFeature)) {
-        logger.warn(`ship feature ${shipFeature} already unlocked`);
-    } else {
-        personalRooms.Ship.Features.push(shipFeature);
-        await personalRooms.save();
+        throw new Error(`ship feature ${shipFeature} already unlocked`);
     }
-    const miscItem = inventory.MiscItems.find(x => x.ItemType === shipFeature);
-    if (miscItem && miscItem.ItemCount > 0) await addItem(inventory, shipFeature, miscItem.ItemCount * -1);
+
+    personalRooms.Ship.Features.push(shipFeature);
+    await personalRooms.save();
+
+    const inventory = await getInventory(accountId);
+    await addItem(inventory, shipFeature, -1);
+    await inventory.save();
 };
 
 export const createGarden = (): IGardeningDatabase => {

src/services/questService.ts

@@ -120,7 +120,7 @@ export const completeQuest = async (
     inventory: TInventoryDatabaseDocument,
     questKey: string,
     sendMessages: boolean = false
-): Promise<void | IQuestKeyClient> => {
+): Promise<void> => {
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     const chainStages = ExportKeys[questKey]?.chainStages;
 
@@ -176,8 +176,6 @@ export const completeQuest = async (
         existingQuestKey.CompletionDate = new Date();
         await handleQuestCompletion(inventory, questKey, undefined, run > 0);
     }
-
-    return existingQuestKey.toJSON<IQuestKeyClient>();
 };
 
 const getQuestCompletionItems = (questKey: string): ITypeCount[] | undefined => {

src/types/purchaseTypes.ts

@@ -9,8 +9,7 @@ import type {
     TEquipmentKey,
     ICrewMemberClient,
     IKubrowPetPrintClient,
-    IUpgradeClient,
-    IQuestKeyClient
+    IUpgradeClient
 } from "./inventoryTypes/inventoryTypes.ts";
 
 export enum PurchaseSource {
@@ -84,7 +83,6 @@ export type IInventoryChanges = {
     CrewMembers?: ICrewMemberClient[];
     KubrowPetPrints?: IKubrowPetPrintClient[];
     Upgrades?: IUpgradeClient[]; // TOVERIFY
-    QuestKeys?: IQuestKeyClient[];
 } & Record<
         Exclude<
             string,

src/types/requestTypes.ts

@@ -234,6 +234,11 @@ export interface IUpgradeOperation {
     PolarizeValue: ArtifactPolarity;
     PolarityRemap: IPolarity[];
 }
+export interface IUnlockShipFeatureRequest {
+    Feature: string;
+    KeyChain: string;
+    ChainStage: number;
+}
 
 export interface IVoidTearParticipantInfo {
     AccountId: string;