From 4a5178b1571102947a212edc457f9c47e56bacc6 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Tue, 13 May 2025 10:46:24 +0200 Subject: [PATCH 1/6] feat: resource reward along with duviri decree --- package-lock.json | 8 ++++---- package.json | 2 +- src/controllers/api/missionInventoryUpdateController.ts | 6 +++++- src/services/missionInventoryUpdateService.ts | 2 ++ src/types/requestTypes.ts | 1 + 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index db379b43..bbe4098f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "morgan": "^1.10.0", "ncp": "^2.0.0", "typescript": "^5.5", - "warframe-public-export-plus": "^0.5.60", + "warframe-public-export-plus": "^0.5.61", "warframe-riven-info": "^0.1.2", "winston": "^3.17.0", "winston-daily-rotate-file": "^5.0.0" @@ -3703,9 +3703,9 @@ } }, "node_modules/warframe-public-export-plus": { - "version": "0.5.60", - "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.60.tgz", - "integrity": "sha512-vMfytUc4xRi+b7RTSq+TJEl91vwEegpQKxLtXwRPfs9ZHhntxc4rmDYSNWJTvgf/aWXsFUxQlqL/GV5OLPGM7g==" + "version": "0.5.61", + "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.61.tgz", + "integrity": "sha512-WxZ93G/a98agZK4/hlgtn4SaVsnl9hy3vmJu8hLzyMzxt8AMW+8prK7lC62WP/grA5DWp3qllokasqt644owmA==" }, "node_modules/warframe-riven-info": { "version": "0.1.2", diff --git a/package.json b/package.json index 010e5dcb..73d0e8c9 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "morgan": "^1.10.0", "ncp": "^2.0.0", "typescript": "^5.5", - "warframe-public-export-plus": "^0.5.60", + "warframe-public-export-plus": "^0.5.61", "warframe-riven-info": "^0.1.2", "winston": "^3.17.0", "winston-daily-rotate-file": "^5.0.0" diff --git a/src/controllers/api/missionInventoryUpdateController.ts b/src/controllers/api/missionInventoryUpdateController.ts index 41f49143..fedff108 100644 --- a/src/controllers/api/missionInventoryUpdateController.ts +++ b/src/controllers/api/missionInventoryUpdateController.ts @@ -61,7 +61,11 @@ export const missionInventoryUpdateController: RequestHandler = async (req, res) if ( missionReport.MissionStatus !== "GS_SUCCESS" && - !(missionReport.RewardInfo?.jobId || missionReport.RewardInfo?.challengeMissionId) + !( + missionReport.RewardInfo?.jobId || + missionReport.RewardInfo?.challengeMissionId || + missionReport.RewardInfo?.T + ) ) { if (missionReport.EndOfMatchUpload) { inventory.RewardSeed = generateRewardSeed(); diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts index 4ec203bb..ba76ee63 100644 --- a/src/services/missionInventoryUpdateService.ts +++ b/src/services/missionInventoryUpdateService.ts @@ -1403,6 +1403,8 @@ function getRandomMissionDrops( } else { rewardManifests = []; } + } else if (RewardInfo.T == 15) { + rewardManifests = ["/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriKullervoNormalRNGRewards"]; } else { rewardManifests = region.rewardManifests; } diff --git a/src/types/requestTypes.ts b/src/types/requestTypes.ts index ab895bd1..6fdd0c09 100644 --- a/src/types/requestTypes.ts +++ b/src/types/requestTypes.ts @@ -177,6 +177,7 @@ export interface IRewardInfo { PurgatoryRewardQualifications?: string; rewardSeed?: number | bigint; periodicMissionTag?: string; + T?: number; // Duviri ConquestType?: string; ConquestCompleted?: number; ConquestEquipmentSuggestionsFulfilled?: number; -- 2.47.2 From ec24c6666ce7f05413a08437ffd32e5f54942eac Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Tue, 13 May 2025 15:13:53 +0200 Subject: [PATCH 2/6] kullervo steel path --- src/services/missionInventoryUpdateService.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts index ba76ee63..55eec4b6 100644 --- a/src/services/missionInventoryUpdateService.ts +++ b/src/services/missionInventoryUpdateService.ts @@ -1404,7 +1404,11 @@ function getRandomMissionDrops( rewardManifests = []; } } else if (RewardInfo.T == 15) { - rewardManifests = ["/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriKullervoNormalRNGRewards"]; + rewardManifests = [ + mission?.Tier == 1 + ? "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriKullervoSteelPathRNGRewards" + : "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriKullervoNormalRNGRewards" + ]; } else { rewardManifests = region.rewardManifests; } -- 2.47.2 From 47d53f107123f1a3de047075118930252773bde8 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Tue, 13 May 2025 15:25:40 +0200 Subject: [PATCH 3/6] pathos clamps --- src/services/missionInventoryUpdateService.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts index 55eec4b6..cb8bf384 100644 --- a/src/services/missionInventoryUpdateService.ts +++ b/src/services/missionInventoryUpdateService.ts @@ -1409,6 +1409,20 @@ function getRandomMissionDrops( ? "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriKullervoSteelPathRNGRewards" : "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriKullervoNormalRNGRewards" ]; + } else if (RewardInfo.T == 13) { + // Undercroft extra/side portal, gives 1 Pathos Clamp, or 3 on Steel Path. + drops.push({ + StoreItem: "/Lotus/StoreItems/Types/Gameplay/Duviri/Resource/DuviriDragonDropItem", + ItemCount: mission?.Tier == 1 ? 3 : 1 + }); + rewardManifests = []; + } else if (RewardInfo.T == 70) { + // Orowyrm chest, gives 10 Pathos Clamps, or 15 on Steel Path. + drops.push({ + StoreItem: "/Lotus/StoreItems/Types/Gameplay/Duviri/Resource/DuviriDragonDropItem", + ItemCount: mission?.Tier == 1 ? 15 : 10 + }); + rewardManifests = []; } else { rewardManifests = region.rewardManifests; } -- 2.47.2 From b53260e7bd23c5621666775d27d67e7b078c8720 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Tue, 13 May 2025 15:45:41 +0200 Subject: [PATCH 4/6] undercroft side portal arcane rewards --- src/services/missionInventoryUpdateService.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts index cb8bf384..c5b12316 100644 --- a/src/services/missionInventoryUpdateService.ts +++ b/src/services/missionInventoryUpdateService.ts @@ -1410,12 +1410,16 @@ function getRandomMissionDrops( : "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriKullervoNormalRNGRewards" ]; } else if (RewardInfo.T == 13) { - // Undercroft extra/side portal, gives 1 Pathos Clamp, or 3 on Steel Path. + // Undercroft extra/side portal, gives 1 Pathos Clamp + Duviri Arcane, or 3 Pathos Clamp + Eidolon Arcane on Steel Path. drops.push({ StoreItem: "/Lotus/StoreItems/Types/Gameplay/Duviri/Resource/DuviriDragonDropItem", ItemCount: mission?.Tier == 1 ? 3 : 1 }); - rewardManifests = []; + rewardManifests = [ + mission?.Tier == 1 + ? "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriSteelPathStaticUndercroftResourceRewards" + : "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriStaticUndercroftResourceRewards" + ]; } else if (RewardInfo.T == 70) { // Orowyrm chest, gives 10 Pathos Clamps, or 15 on Steel Path. drops.push({ -- 2.47.2 From 8c39ae64c3a5f0e9253ed4d4eb07071823b8b548 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Tue, 13 May 2025 15:51:24 +0200 Subject: [PATCH 5/6] undercroft side portals have different T for SP --- src/services/missionInventoryUpdateService.ts | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts index c5b12316..4814fd6f 100644 --- a/src/services/missionInventoryUpdateService.ts +++ b/src/services/missionInventoryUpdateService.ts @@ -1403,23 +1403,30 @@ function getRandomMissionDrops( } else { rewardManifests = []; } + } else if (RewardInfo.T == 13) { + // Undercroft extra/side portal (normal mode), gives 1 Pathos Clamp + Duviri Arcane. + drops.push({ + StoreItem: "/Lotus/StoreItems/Types/Gameplay/Duviri/Resource/DuviriDragonDropItem", + ItemCount: 1 + }); + rewardManifests = [ + "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriStaticUndercroftResourceRewards" + ]; + } else if (RewardInfo.T == 14) { + // Undercroft extra/side portal (steel path), gives 3 Pathos Clamps + Eidolon Arcane. + drops.push({ + StoreItem: "/Lotus/StoreItems/Types/Gameplay/Duviri/Resource/DuviriDragonDropItem", + ItemCount: 3 + }); + rewardManifests = [ + "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriSteelPathStaticUndercroftResourceRewards" + ]; } else if (RewardInfo.T == 15) { rewardManifests = [ mission?.Tier == 1 ? "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriKullervoSteelPathRNGRewards" : "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriKullervoNormalRNGRewards" ]; - } else if (RewardInfo.T == 13) { - // Undercroft extra/side portal, gives 1 Pathos Clamp + Duviri Arcane, or 3 Pathos Clamp + Eidolon Arcane on Steel Path. - drops.push({ - StoreItem: "/Lotus/StoreItems/Types/Gameplay/Duviri/Resource/DuviriDragonDropItem", - ItemCount: mission?.Tier == 1 ? 3 : 1 - }); - rewardManifests = [ - mission?.Tier == 1 - ? "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriSteelPathStaticUndercroftResourceRewards" - : "/Lotus/Types/Game/MissionDecks/DuviriEncounterRewards/DuviriStaticUndercroftResourceRewards" - ]; } else if (RewardInfo.T == 70) { // Orowyrm chest, gives 10 Pathos Clamps, or 15 on Steel Path. drops.push({ -- 2.47.2 From 440d456ddf85c1d50f1edd518ed4a9dba41a77bf Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Wed, 14 May 2025 05:37:07 +0200 Subject: [PATCH 6/6] update PE+ --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index bbe4098f..9ab7b4bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "morgan": "^1.10.0", "ncp": "^2.0.0", "typescript": "^5.5", - "warframe-public-export-plus": "^0.5.61", + "warframe-public-export-plus": "^0.5.62", "warframe-riven-info": "^0.1.2", "winston": "^3.17.0", "winston-daily-rotate-file": "^5.0.0" @@ -3703,9 +3703,9 @@ } }, "node_modules/warframe-public-export-plus": { - "version": "0.5.61", - "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.61.tgz", - "integrity": "sha512-WxZ93G/a98agZK4/hlgtn4SaVsnl9hy3vmJu8hLzyMzxt8AMW+8prK7lC62WP/grA5DWp3qllokasqt644owmA==" + "version": "0.5.62", + "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.62.tgz", + "integrity": "sha512-D8ZzjkU9rrK/59VqCfpMoV31HVmwHZV1dNZxPO85AOlcjg/G81Fu3kgITQTaw9sdNagLPLQnFaiXY58pxxRwgA==" }, "node_modules/warframe-riven-info": { "version": "0.1.2", diff --git a/package.json b/package.json index 73d0e8c9..5b995cbd 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "morgan": "^1.10.0", "ncp": "^2.0.0", "typescript": "^5.5", - "warframe-public-export-plus": "^0.5.61", + "warframe-public-export-plus": "^0.5.62", "warframe-riven-info": "^0.1.2", "winston": "^3.17.0", "winston-daily-rotate-file": "^5.0.0" -- 2.47.2