src/controllers/api/endlessXpController.ts

@@ -1,13 +1,11 @@
 import { RequestHandler } from "express";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { combineInventoryChanges, getInventory } from "@/src/services/inventoryService";
+import { getInventory } from "@/src/services/inventoryService";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { IEndlessXpReward, IInventoryClient, TEndlessXpCategory } from "@/src/types/inventoryTypes/inventoryTypes";
 import { logger } from "@/src/utils/logger";
 import { ExportRewards, ICountedStoreItem } from "warframe-public-export-plus";
 import { getRandomElement } from "@/src/services/rngService";
-import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
-import { IInventoryChanges } from "@/src/types/purchaseTypes";
 
 export const endlessXpController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
@@ -32,7 +30,7 @@ export const endlessXpController: RequestHandler = async (req, res) => {
 
         entry.Earn = 0;
         entry.Claim = 0;
-        entry.BonusAvailable = new Date(weekStart);
+        entry.BonusAvailable = new Date(weekStart + 29 * 3600_000);
         entry.Expiry = new Date(weekEnd);
         entry.Choices = payload.Choices;
         entry.PendingRewards =
@@ -44,46 +42,17 @@ export const endlessXpController: RequestHandler = async (req, res) => {
         res.json({
             NewProgress: inventory.toJSON<IInventoryClient>().EndlessXP!.find(x => x.Category == payload.Category)!
         });
-    } else if (payload.Mode == "c") {
-        const inventory = await getInventory(accountId);
-        const entry = inventory.EndlessXP!.find(x => x.Category == payload.Category)!;
-        const inventoryChanges: IInventoryChanges = {};
-        for (const reward of entry.PendingRewards) {
-            if (entry.Claim < reward.RequiredTotalXp && reward.RequiredTotalXp <= entry.Earn) {
-                combineInventoryChanges(
-                    inventoryChanges,
-                    (
-                        await handleStoreItemAcquisition(
-                            reward.Rewards[0].StoreItem,
-                            inventory,
-                            reward.Rewards[0].ItemCount
-                        )
-                    ).InventoryChanges
-                );
-            }
-        }
-        entry.Claim = entry.Earn;
-        await inventory.save();
-        res.json({
-            InventoryChanges: inventoryChanges,
-            ClaimedXp: entry.Claim
-        });
     } else {
         logger.debug(`data provided to ${req.path}: ${String(req.body)}`);
         throw new Error(`unexpected endlessXp mode: ${payload.Mode}`);
     }
 };
 
-type IEndlessXpRequest =
+interface IEndlessXpRequest {
-    | {
+    Mode: string; // "r"
-          Mode: "r";
+    Category: TEndlessXpCategory;
-          Category: TEndlessXpCategory;
+    Choices: string[];
-          Choices: string[];
+}
-      }
-    | {
-          Mode: "c" | "something else";
-          Category: TEndlessXpCategory;
-      };
 
 const generateRandomRewards = (deckName: string): ICountedStoreItem[] => {
     const reward = getRandomElement(ExportRewards[deckName][0])!;

src/services/missionInventoryUpdateService.ts

@@ -10,7 +10,7 @@ import {
 import { IMissionInventoryUpdateRequest, IRewardInfo } from "../types/requestTypes";
 import { logger } from "@/src/utils/logger";
 import { IRngResult, SRng, getRandomElement, getRandomReward } from "@/src/services/rngService";
-import { equipmentKeys, IMission, TEquipmentKey } from "@/src/types/inventoryTypes/inventoryTypes";
+import { equipmentKeys, TEquipmentKey } from "@/src/types/inventoryTypes/inventoryTypes";
 import {
     addBooster,
     addChallenges,
@@ -841,13 +841,7 @@ export const addMissionRewards = async (
     }
 
     //TODO: check double reward merging
-    const MissionRewards: IMissionReward[] = getRandomMissionDrops(
+    const MissionRewards: IMissionReward[] = getRandomMissionDrops(inventory, rewardInfo, wagerTier, firstCompletion);
-        inventory,
-        rewardInfo,
-        missions,
-        wagerTier,
-        firstCompletion
-    );
     logger.debug("random mission drops:", MissionRewards);
     const inventoryChanges: IInventoryChanges = {};
     const AffiliationMods: IAffiliationMods[] = [];
@@ -1296,7 +1290,6 @@ function getLevelCreditRewards(node: IRegion): number {
 function getRandomMissionDrops(
     inventory: TInventoryDatabaseDocument,
     RewardInfo: IRewardInfo,
-    mission: IMission | undefined,
     tierOverride: number | undefined,
     firstCompletion: boolean
 ): IMissionReward[] {
@@ -1542,35 +1535,6 @@ function getRandomMissionDrops(
                 logger.error(`Unknown syndicate or tier: ${RewardInfo.challengeMissionId}`);
             }
         } else {
-            if (RewardInfo.node == "SolNode238") {
-                // The Circuit
-                const category = mission?.Tier == 1 ? "EXC_HARD" : "EXC_NORMAL";
-                const progress = inventory.EndlessXP?.find(x => x.Category == category);
-                if (progress) {
-                    // https://wiki.warframe.com/w/The%20Circuit#Tiers_and_Weekly_Rewards
-                    const roundsCompleted = RewardInfo.rewardQualifications?.length || 0;
-                    if (roundsCompleted >= 1) {
-                        progress.Earn += 100;
-                    }
-                    if (roundsCompleted >= 2) {
-                        progress.Earn += 110;
-                    }
-                    if (roundsCompleted >= 3) {
-                        progress.Earn += 125;
-                    }
-                    if (roundsCompleted >= 4) {
-                        progress.Earn += 145;
-                        if (progress.BonusAvailable && progress.BonusAvailable.getTime() <= Date.now()) {
-                            progress.Earn += 50;
-                            progress.BonusAvailable = new Date(Date.now() + 24 * 3600_000); // TOVERIFY
-                        }
-                    }
-                    if (roundsCompleted >= 5) {
-                        progress.Earn += (roundsCompleted - 4) * 170;
-                    }
-                }
-                tierOverride = 0;
-            }
             rotations = getRotations(RewardInfo, tierOverride);
         }
         if (rewardManifests.length != 0) {