From 4256e25fdd26f13cec0a3ae8df158edee98d06fb Mon Sep 17 00:00:00 2001 From: Ordis <134585663+OrdisPrime@users.noreply.github.com> Date: Tue, 18 Feb 2025 22:31:24 +0100 Subject: [PATCH] stable --- src/controllers/api/inventoryController.ts | 38 +--------- .../custom/manageQuestsController.ts | 76 +++++++++++++++++++ src/routes/custom.ts | 2 + src/services/questService.ts | 8 ++ static/webui/index.html | 24 ++++++ static/webui/script.js | 9 +++ static/webui/translations/en.js | 7 ++ 7 files changed, 127 insertions(+), 37 deletions(-) create mode 100644 src/controllers/custom/manageQuestsController.ts diff --git a/src/controllers/api/inventoryController.ts b/src/controllers/api/inventoryController.ts index d614b147..9218d38f 100644 --- a/src/controllers/api/inventoryController.ts +++ b/src/controllers/api/inventoryController.ts @@ -102,42 +102,6 @@ export const getInventoryResponse = async ( addString(inventoryResponse.NodeIntrosCompleted, "TeshinHardModeUnlocked"); } - if (config.unlockAllQuests) { - for (const [k, v] of Object.entries(ExportKeys)) { - if ("chainStages" in v) { - if (!inventoryResponse.QuestKeys.find(quest => quest.ItemType == k)) { - inventoryResponse.QuestKeys.push({ ItemType: k }); - } - } - } - } - if (config.completeAllQuests) { - for (const quest of inventoryResponse.QuestKeys) { - quest.unlock = true; - quest.Completed = true; - - let numStages = 1; - if (quest.ItemType in ExportKeys && "chainStages" in ExportKeys[quest.ItemType]) { - numStages = ExportKeys[quest.ItemType].chainStages!.length; - } - quest.Progress = []; - for (let i = 0; i != numStages; ++i) { - quest.Progress.push({ - c: 0, - i: false, - m: false, - b: [] - }); - } - } - - inventoryResponse.ArchwingEnabled = true; - inventoryResponse.ActiveQuest = ""; //TODO: might need to reconsider this if this does not work long term. - - // Skip "Watch The Maker" - addString(inventoryResponse.NodeIntrosCompleted, "/Lotus/Levels/Cinematics/NewWarIntro/NewWarStageTwo.level"); - } - if (config.unlockAllShipDecorations) { inventoryResponse.ShipDecorations = []; for (const [uniqueName, item] of Object.entries(ExportResources)) { @@ -261,7 +225,7 @@ export const getInventoryResponse = async ( return inventoryResponse; }; -const addString = (arr: string[], str: string): void => { +export const addString = (arr: string[], str: string): void => { if (!arr.find(x => x == str)) { arr.push(str); } diff --git a/src/controllers/custom/manageQuestsController.ts b/src/controllers/custom/manageQuestsController.ts new file mode 100644 index 00000000..f4eb043c --- /dev/null +++ b/src/controllers/custom/manageQuestsController.ts @@ -0,0 +1,76 @@ +import { addString } from "@/src/controllers/api/inventoryController"; +import { getInventory } from "@/src/services/inventoryService"; +import { getAccountIdForRequest } from "@/src/services/loginService"; +import { addQuestKey, IUpdateQuestRequest, updateQuestKey } from "@/src/services/questService"; +import { logger } from "@/src/utils/logger"; +import { RequestHandler } from "express"; +import { ExportKeys } from "warframe-public-export-plus"; +import { add } from "winston"; + +export const manageQuestsController: RequestHandler = async (req, res) => { + const accountId = await getAccountIdForRequest(req); + const operation = req.query.operation as + | "unlockAll" + | "completeAll" + | "ResetAll" + | "completeAllUnlocked" + | "updateKey"; + const questKeyUpdate = req.body as IUpdateQuestRequest["QuestKeys"]; + + const allQuestKeys: string[] = []; + for (const [k, v] of Object.entries(ExportKeys)) { + if ("chainStages" in v) { + allQuestKeys.push(k); + } + } + const inventory = await getInventory(accountId, "QuestKeys"); + + switch (operation) { + case "updateKey": { + //TODO: if this is intended to be used, one needs to add a updateQuestKeyMultiple, the game does never intend to do it, so it errors for multiple keys. + updateQuestKey(inventory, questKeyUpdate); + break; + } + case "unlockAll": { + for (const questKey of allQuestKeys) { + addQuestKey(inventory, { ItemType: questKey, Completed: false, unlock: true, Progress: [] }); + } + break; + } + case "completeAll": { + logger.info("completing all quests.."); + for (const questKey of allQuestKeys) { + const inventoryQuestKey = inventory.QuestKeys.find(qk => qk.ItemType === questKey); + if (inventoryQuestKey) { + inventoryQuestKey.Completed = true; + continue; + } + addQuestKey(inventory, { ItemType: questKey, Completed: true, unlock: true, Progress: [] }); + } + inventory.ArchwingEnabled = true; + inventory.ActiveQuest = ""; + + // Skip "Watch The Maker" + addString(inventory.NodeIntrosCompleted, "/Lotus/Levels/Cinematics/NewWarIntro/NewWarStageTwo.level"); + break; + } + case "ResetAll": { + logger.info("resetting all quests.."); + for (const questKey of inventory.QuestKeys) { + questKey.Completed = false; + } + break; + } + case "completeAllUnlocked": { + logger.info("completing all unlocked quests.."); + for (const questKey of inventory.QuestKeys) { + //if (!questKey.unlock) { continue; } + questKey.Completed = true; + } + break; + } + } + + await inventory.save(); + res.status(200).end(); +}; diff --git a/src/routes/custom.ts b/src/routes/custom.ts index ad2ea069..a69afc1c 100644 --- a/src/routes/custom.ts +++ b/src/routes/custom.ts @@ -16,6 +16,7 @@ import { importController } from "@/src/controllers/custom/importController"; import { getConfigDataController } from "@/src/controllers/custom/getConfigDataController"; import { updateConfigDataController } from "@/src/controllers/custom/updateConfigDataController"; +import { manageQuestsController } from "@/src/controllers/custom/manageQuestsController"; const customRouter = express.Router(); @@ -32,6 +33,7 @@ customRouter.post("/addCurrency", addCurrencyController); customRouter.post("/addItems", addItemsController); customRouter.post("/addXp", addXpController); customRouter.post("/import", importController); +customRouter.post("/manageQuests", manageQuestsController); customRouter.get("/config", getConfigDataController); customRouter.post("/config", updateConfigDataController); diff --git a/src/services/questService.ts b/src/services/questService.ts index ae7c8133..efc01a49 100644 --- a/src/services/questService.ts +++ b/src/services/questService.ts @@ -63,3 +63,11 @@ export const updateQuestStage = ( Object.assign(questStage, questStageUpdate); }; + +export const addQuestKey = (inventory: TInventoryDatabaseDocument, questKey: IQuestKeyDatabase): void => { + if (inventory.QuestKeys.some(q => q.ItemType === questKey.ItemType)) { + logger.error(`quest key ${questKey.ItemType} already exists`); + return; + } + inventory.QuestKeys.push(questKey); +}; diff --git a/static/webui/index.html b/static/webui/index.html index 5273ba50..f1bd53a9 100644 --- a/static/webui/index.html +++ b/static/webui/index.html @@ -61,6 +61,9 @@
    • +
  • + +
    • @@ -410,6 +413,27 @@ +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    diff --git a/static/webui/script.js b/static/webui/script.js index 32d002c2..1c55cf4d 100644 --- a/static/webui/script.js +++ b/static/webui/script.js @@ -1153,3 +1153,12 @@ function doAddCurrency(currency) { updateInventory(); }); } + +function doQuestUpdate(operation) { + $.post({ + url: "/custom/manageQuests?" + window.authz + "&operation=" + operation, + contentType: "application/json" + }).then(function () { + updateInventory(); + }); +} diff --git a/static/webui/translations/en.js b/static/webui/translations/en.js index aac5bcb5..e06c2989 100644 --- a/static/webui/translations/en.js +++ b/static/webui/translations/en.js @@ -45,6 +45,7 @@ dict = { navbar_deleteAccount: `Delete Account`, navbar_inventory: `Inventory`, navbar_mods: `Mods`, + navbar_quests: `Quests`, navbar_cheats: `Cheats`, navbar_import: `Import`, inventory_addItems: `Add Items`, @@ -72,6 +73,12 @@ dict = { inventory_bulkRankUpSpaceWeapons: `Max Rank All Archwing Weapons`, inventory_bulkRankUpSentinels: `Max Rank All Sentinels`, inventory_bulkRankUpSentinelWeapons: `Max Rank All Sentinel Weapons`, + quests_list: `Quest List unimplemented currently`, + quests_Actions: `Quest Actions`, + quests_UnlockAll: `Unlock All Quests`, + quests_CompleteAll: `Complete All Quests`, + quests_CompleteAllUnlocked: `Complete All Unlocked Quests`, + quests_ResetAll: `Reset All Quests`, currency_RegularCredits: `Credits`, currency_PremiumCredits: `Platinum`, currency_FusionPoints: `Endo`,