OpenWF/SpaceNinjaServer
28
29
Fork 35
Code Issues 23 Pull Requests 1 Actions Packages Projects Releases Activity

feat: the circuit #2039

Merged
Sainan merged 6 commits from exp-reward-gen into main 2025-05-09 21:38:14 -07:00
Conversation 0 Commits 6 Files Changed 5 +39 -3
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f068b74841 - Show all commits

2
src/controllers/api/endlessXpController.ts
View File

@ -30,7 +30,7 @@ export const endlessXpController: RequestHandler = async (req, res) => {
entry.Earn = 0; entry.Earn = 0;
entry.Claim = 0; entry.Claim = 0;
entry.BonusAvailable = new Date(weekStart + 29 * 3600_000); entry.BonusAvailable = new Date(weekStart);
entry.Expiry = new Date(weekEnd); entry.Expiry = new Date(weekEnd);
entry.Choices = payload.Choices; entry.Choices = payload.Choices;
entry.PendingRewards = entry.PendingRewards =

40
src/services/missionInventoryUpdateService.ts
View File

@ -10,7 +10,7 @@ import {
import { IMissionInventoryUpdateRequest, IRewardInfo } from "../types/requestTypes"; import { IMissionInventoryUpdateRequest, IRewardInfo } from "../types/requestTypes";
import { logger } from "@/src/utils/logger"; import { logger } from "@/src/utils/logger";
import { IRngResult, SRng, getRandomElement, getRandomReward } from "@/src/services/rngService"; import { IRngResult, SRng, getRandomElement, getRandomReward } from "@/src/services/rngService";
import { equipmentKeys, TEquipmentKey } from "@/src/types/inventoryTypes/inventoryTypes"; import { equipmentKeys, IMission, TEquipmentKey } from "@/src/types/inventoryTypes/inventoryTypes";
import { import {
addBooster, addBooster,
addChallenges, addChallenges,
@ -841,7 +841,13 @@ export const addMissionRewards = async (
} }
//TODO: check double reward merging //TODO: check double reward merging
const MissionRewards: IMissionReward[] = getRandomMissionDrops(inventory, rewardInfo, wagerTier, firstCompletion); const MissionRewards: IMissionReward[] = getRandomMissionDrops(
inventory,
rewardInfo,
missions,
wagerTier,
firstCompletion
);
logger.debug("random mission drops:", MissionRewards); logger.debug("random mission drops:", MissionRewards);
const inventoryChanges: IInventoryChanges = {}; const inventoryChanges: IInventoryChanges = {};
const AffiliationMods: IAffiliationMods[] = []; const AffiliationMods: IAffiliationMods[] = [];
@ -1290,6 +1296,7 @@ function getLevelCreditRewards(node: IRegion): number {
function getRandomMissionDrops( function getRandomMissionDrops(
inventory: TInventoryDatabaseDocument, inventory: TInventoryDatabaseDocument,
RewardInfo: IRewardInfo, RewardInfo: IRewardInfo,
mission: IMission | undefined,
tierOverride: number | undefined, tierOverride: number | undefined,
firstCompletion: boolean firstCompletion: boolean
): IMissionReward[] { ): IMissionReward[] {
@ -1535,6 +1542,35 @@ function getRandomMissionDrops(
logger.error(`Unknown syndicate or tier: ${RewardInfo.challengeMissionId}`); logger.error(`Unknown syndicate or tier: ${RewardInfo.challengeMissionId}`);
} }
} else { } 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); rotations = getRotations(RewardInfo, tierOverride);
} }
if (rewardManifests.length != 0) { if (rewardManifests.length != 0) {