From 751ff8addbc19c8613b62a65b2ec48e64231e4ed Mon Sep 17 00:00:00 2001 From: Sainan Date: Sun, 23 Feb 2025 05:00:15 +0100 Subject: [PATCH] feat: unveil riven with cipher --- .../completeRandomModChallengeController.ts | 57 +++++++++++++++++++ .../api/rerollRandomModController.ts | 3 +- src/helpers/rivenFingerprintHelper.ts | 10 ++-- src/routes/api.ts | 2 + 4 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 src/controllers/api/completeRandomModChallengeController.ts diff --git a/src/controllers/api/completeRandomModChallengeController.ts b/src/controllers/api/completeRandomModChallengeController.ts new file mode 100644 index 00000000..60c77b3c --- /dev/null +++ b/src/controllers/api/completeRandomModChallengeController.ts @@ -0,0 +1,57 @@ +import { RequestHandler } from "express"; +import { getAccountIdForRequest } from "@/src/services/loginService"; +import { addMiscItems, getInventory, updateCurrency } from "@/src/services/inventoryService"; +import { IInventoryChanges } from "@/src/types/purchaseTypes"; +import { IMiscItem } from "@/src/types/inventoryTypes/inventoryTypes"; +import { getJSONfromString } from "@/src/helpers/stringHelpers"; +import { IUnveiledRivenFingerprint, randomiseRivenStats } from "@/src/helpers/rivenFingerprintHelper"; +import { getRandomElement, getRandomInt } from "@/src/services/rngService"; +import { ExportUpgrades } from "warframe-public-export-plus"; + +export const completeRandomModChallengeController: RequestHandler = async (req, res) => { + const accountId = await getAccountIdForRequest(req); + const inventory = await getInventory(accountId); + const request = getJSONfromString(String(req.body)); + let inventoryChanges: IInventoryChanges = {}; + + // Remove 20 plat or riven cipher + if ((req.query.p as string) == "1") { + inventoryChanges = { ...updateCurrency(inventory, 20, true) }; + } else { + const miscItemChanges: IMiscItem[] = [ + { + ItemType: "/Lotus/Types/Items/MiscItems/RivenIdentifier", + ItemCount: -1 + } + ]; + addMiscItems(inventory, miscItemChanges); + inventoryChanges.MiscItems = miscItemChanges; + } + + // Update riven fingerprint to a randomised unveiled state + const upgrade = inventory.Upgrades.id(request.ItemId)!; + const meta = ExportUpgrades[upgrade.ItemType]; + const fingerprint: IUnveiledRivenFingerprint = { + compat: getRandomElement(meta.compatibleItems!), + lim: 0, + lvl: 0, + lvlReq: getRandomInt(8, 16), + rerolls: 0, + pol: getRandomElement(["AP_ATTACK", "AP_DEFENSE", "AP_TACTIC"]), + buffs: [], + curses: [] + }; + randomiseRivenStats(meta, fingerprint); + upgrade.UpgradeFingerprint = JSON.stringify(fingerprint); + + await inventory.save(); + + res.json({ + InventoryChanges: inventoryChanges, + Fingerprint: upgrade.UpgradeFingerprint + }); +}; + +interface ICompleteRandomModChallengeRequest { + ItemId: string; +} diff --git a/src/controllers/api/rerollRandomModController.ts b/src/controllers/api/rerollRandomModController.ts index 17253ded..e35df1a8 100644 --- a/src/controllers/api/rerollRandomModController.ts +++ b/src/controllers/api/rerollRandomModController.ts @@ -3,6 +3,7 @@ import { getAccountIdForRequest } from "@/src/services/loginService"; import { addMiscItems, getInventory } from "@/src/services/inventoryService"; import { getJSONfromString } from "@/src/helpers/stringHelpers"; import { IUnveiledRivenFingerprint, randomiseRivenStats } from "@/src/helpers/rivenFingerprintHelper"; +import { ExportUpgrades } from "warframe-public-export-plus"; export const rerollRandomModController: RequestHandler = async (req, res) => { const accountId = await getAccountIdForRequest(req); @@ -24,7 +25,7 @@ export const rerollRandomModController: RequestHandler = async (req, res) => { fingerprint.rerolls++; upgrade.UpgradeFingerprint = JSON.stringify(fingerprint); - randomiseRivenStats(upgrade.ItemType, fingerprint); + randomiseRivenStats(ExportUpgrades[upgrade.ItemType], fingerprint); upgrade.PendingRerollFingerprint = JSON.stringify(fingerprint); await inventory.save(); diff --git a/src/helpers/rivenFingerprintHelper.ts b/src/helpers/rivenFingerprintHelper.ts index 912b911c..c3742391 100644 --- a/src/helpers/rivenFingerprintHelper.ts +++ b/src/helpers/rivenFingerprintHelper.ts @@ -1,11 +1,11 @@ -import { ExportUpgrades } from "warframe-public-export-plus"; +import { IUpgrade } from "warframe-public-export-plus"; import { getRandomElement } from "../services/rngService"; export interface IUnveiledRivenFingerprint { compat: string; - lim: number; + lim: 0; lvl: number; - lvlReq: 0; + lvlReq: number; rerolls?: number; pol: string; buffs: IRivenStat[]; @@ -17,9 +17,7 @@ interface IRivenStat { Value: number; } -export const randomiseRivenStats = (randomModType: string, fingerprint: IUnveiledRivenFingerprint): void => { - const meta = ExportUpgrades[randomModType]; - +export const randomiseRivenStats = (meta: IUpgrade, fingerprint: IUnveiledRivenFingerprint): void => { fingerprint.buffs = []; const numBuffs = 2 + Math.trunc(Math.random() * 2); // 2 or 3 const buffEntries = meta.upgradeEntries!.filter(x => x.canBeBuff); diff --git a/src/routes/api.ts b/src/routes/api.ts index 2b3e511c..0a2c6716 100644 --- a/src/routes/api.ts +++ b/src/routes/api.ts @@ -8,6 +8,7 @@ import { changeDojoRootController } from "@/src/controllers/api/changeDojoRootCo import { checkDailyMissionBonusController } from "@/src/controllers/api/checkDailyMissionBonusController"; import { claimCompletedRecipeController } from "@/src/controllers/api/claimCompletedRecipeController"; import { clearDialogueHistoryController } from "@/src/controllers/api/clearDialogueHistoryController"; +import { completeRandomModChallengeController } from "@/src/controllers/api/completeRandomModChallengeController"; import { createGuildController } from "@/src/controllers/api/createGuildController"; import { creditsController } from "@/src/controllers/api/creditsController"; import { deleteSessionController } from "@/src/controllers/api/deleteSessionController"; @@ -133,6 +134,7 @@ apiRouter.post("/artifacts.php", artifactsController); apiRouter.post("/changeDojoRoot.php", changeDojoRootController); apiRouter.post("/claimCompletedRecipe.php", claimCompletedRecipeController); apiRouter.post("/clearDialogueHistory.php", clearDialogueHistoryController); +apiRouter.post("/completeRandomModChallenge.php", completeRandomModChallengeController); apiRouter.post("/createGuild.php", createGuildController); apiRouter.post("/endlessXp.php", endlessXpController); apiRouter.post("/evolveWeapon.php", evolveWeaponController);