diff --git a/src/controllers/custom/getItemListsController.ts b/src/controllers/custom/getItemListsController.ts index 574ec8d79..1f9417bf6 100644 --- a/src/controllers/custom/getItemListsController.ts +++ b/src/controllers/custom/getItemListsController.ts @@ -1,7 +1,13 @@ import { RequestHandler } from "express"; import { MinItem, items, getEnglishString } from "@/src/services/itemDataService"; import badItems from "@/static/json/exclude-mods.json"; -import { ExportArcanes, ExportResources, ExportWarframes, ExportWeapons } from "warframe-public-export-plus"; +import { + ExportArcanes, + ExportGear, + ExportResources, + ExportWarframes, + ExportWeapons +} from "warframe-public-export-plus"; interface ListedItem { uniqueName: string; @@ -31,7 +37,7 @@ const getItemListsController: RequestHandler = (_req, res) => { }); } else if (!item.excludeFromCodex) { miscitems.push({ - uniqueName, + uniqueName: "MiscItems:" + uniqueName, name: getEnglishString(item.name) }); } @@ -39,7 +45,13 @@ const getItemListsController: RequestHandler = (_req, res) => { } for (const [uniqueName, item] of Object.entries(ExportResources)) { miscitems.push({ - uniqueName, + uniqueName: "MiscItems:" + uniqueName, + name: getEnglishString(item.name) + }); + } + for (const [uniqueName, item] of Object.entries(ExportGear)) { + miscitems.push({ + uniqueName: "Consumables:" + uniqueName, name: getEnglishString(item.name) }); } diff --git a/static/webui/script.js b/static/webui/script.js index 0090d4270..f7d799620 100644 --- a/static/webui/script.js +++ b/static/webui/script.js @@ -512,17 +512,18 @@ function disposeOfItems(category, type, count) { } function doAcquireMiscItems() { - const uniqueName = getKey(document.getElementById("miscitem-type")); - if (!uniqueName) { + const data = getKey(document.getElementById("miscitem-type")); + if (!data) { $("#miscitem-type").addClass("is-invalid").focus(); return; } + const [category, uniqueName] = data.split(":"); revalidateAuthz(() => { $.post({ url: "/api/missionInventoryUpdate.php?" + window.authz, contentType: "text/plain", data: JSON.stringify({ - MiscItems: [ + [category]: [ { ItemType: uniqueName, ItemCount: parseInt($("#miscitem-count").val()) @@ -535,8 +536,8 @@ function doAcquireMiscItems() { }); } -$("#miscitem-name").on("input", () => { - $("#miscitem-name").removeClass("is-invalid"); +$("#miscitem-type").on("input", () => { + $("#miscitem-type").removeClass("is-invalid"); }); function doAcquireRiven() {