From 36c05a7d66c51485a5cd8e6ea7512b5ff4d95d9b Mon Sep 17 00:00:00 2001 From: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com> Date: Sun, 14 Sep 2025 17:07:03 +0200 Subject: [PATCH 1/5] feat(webui): ship decorations Re #2361 --- config-vanilla.json | 1 - src/controllers/api/inventoryController.ts | 9 --- .../custom/getItemListsController.ts | 11 ++- src/services/configService.ts | 2 +- src/services/shipCustomizationsService.ts | 38 +++++------ static/webui/index.html | 27 ++++++-- static/webui/script.js | 68 +++++++++++++++++-- static/webui/translations/de.js | 3 +- static/webui/translations/en.js | 3 +- static/webui/translations/es.js | 3 +- static/webui/translations/fr.js | 3 +- static/webui/translations/ru.js | 3 +- static/webui/translations/uk.js | 3 +- static/webui/translations/zh.js | 3 +- 14 files changed, 123 insertions(+), 54 deletions(-) diff --git a/config-vanilla.json b/config-vanilla.json index e6f716ac..5e907ab2 100644 --- a/config-vanilla.json +++ b/config-vanilla.json @@ -11,7 +11,6 @@ "administratorNames": [], "autoCreateAccount": true, "skipTutorial": false, - "unlockAllShipDecorations": false, "unlockAllFlavourItems": false, "unlockAllSkins": false, "fullyStockedVendors": false, diff --git a/src/controllers/api/inventoryController.ts b/src/controllers/api/inventoryController.ts index 1af5c350..ce6bb775 100644 --- a/src/controllers/api/inventoryController.ts +++ b/src/controllers/api/inventoryController.ts @@ -321,15 +321,6 @@ export const getInventoryResponse = async ( } } - if (config.unlockAllShipDecorations) { - inventoryResponse.ShipDecorations = []; - for (const [uniqueName, item] of Object.entries(ExportResources)) { - if (item.productCategory == "ShipDecorations") { - inventoryResponse.ShipDecorations.push({ ItemType: uniqueName, ItemCount: 999_999 }); - } - } - } - if (config.unlockAllFlavourItems) { inventoryResponse.FlavourItems = []; for (const uniqueName in ExportFlavour) { diff --git a/src/controllers/custom/getItemListsController.ts b/src/controllers/custom/getItemListsController.ts index 063d7cfa..e35e8a86 100644 --- a/src/controllers/custom/getItemListsController.ts +++ b/src/controllers/custom/getItemListsController.ts @@ -62,6 +62,7 @@ interface ItemLists { Abilities: ListedItem[]; TechProjects: ListedItem[]; VaultDecoRecipes: ListedItem[]; + ShipDecorations: ListedItem[]; //circuitGameModes: ListedItem[]; } @@ -102,7 +103,8 @@ const getItemListsController: RequestHandler = (req, response) => { VarziaOffers: [], Abilities: [], TechProjects: [], - VaultDecoRecipes: [] + VaultDecoRecipes: [], + ShipDecorations: [] /*circuitGameModes: [ { uniqueName: "Survival", @@ -230,7 +232,12 @@ const getItemListsController: RequestHandler = (req, response) => { } } } - if ( + if (item.productCategory == "ShipDecorations") { + res.ShipDecorations.push({ + uniqueName: uniqueName, + name: name + }); + } else if ( name && uniqueName.substring(0, 30) != "/Lotus/Types/Game/Projections/" && uniqueName != "/Lotus/Types/Gameplay/EntratiLab/Resources/EntratiLanthornBundle" diff --git a/src/services/configService.ts b/src/services/configService.ts index 162de999..12812f07 100644 --- a/src/services/configService.ts +++ b/src/services/configService.ts @@ -21,7 +21,6 @@ export interface IConfig { administratorNames?: string[]; autoCreateAccount?: boolean; skipTutorial?: boolean; - unlockAllShipDecorations?: boolean; unlockAllFlavourItems?: boolean; unlockAllSkins?: boolean; fullyStockedVendors?: boolean; @@ -128,6 +127,7 @@ export const configRemovedOptionsKeys = [ "noDojoResearchCosts", "noDojoResearchTime", "fastClanAscension", + "unlockAllShipDecorations", "unlockAllDecoRecipes" ]; diff --git a/src/services/shipCustomizationsService.ts b/src/services/shipCustomizationsService.ts index 2358fe41..d018b73b 100644 --- a/src/services/shipCustomizationsService.ts +++ b/src/services/shipCustomizationsService.ts @@ -137,15 +137,13 @@ export const handleSetShipDecorations = async ( roomToPlaceIn.MaxCapacity += meta.capacityCost; await personalRooms.save(); - if (!config.unlockAllShipDecorations) { - const inventory = await getInventory(accountId); - if (deco.Sockets !== undefined) { - addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: deco.Sockets, ItemCount: 1 }]); - } else { - addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: 1 }]); - } - await inventory.save(); + const inventory = await getInventory(accountId); + if (deco.Sockets !== undefined) { + addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: deco.Sockets, ItemCount: 1 }]); + } else { + addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: 1 }]); } + await inventory.save(); return { DecoId: placedDecoration.RemoveId, @@ -155,15 +153,13 @@ export const handleSetShipDecorations = async ( }; } - if (!config.unlockAllShipDecorations) { - const inventory = await getInventory(accountId); - if (placedDecoration.Sockets !== undefined) { - addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: placedDecoration.Sockets, ItemCount: -1 }]); - } else { - addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: -1 }]); - } - await inventory.save(); + const inventory = await getInventory(accountId); + if (placedDecoration.Sockets !== undefined) { + addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: placedDecoration.Sockets, ItemCount: -1 }]); + } else { + addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: -1 }]); } + await inventory.save(); //place decoration const decoId = new Types.ObjectId(); @@ -221,12 +217,10 @@ export const handleResetShipDecorations = async ( } // refund item - if (!config.unlockAllShipDecorations) { - if (deco.Sockets !== undefined) { - addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: deco.Sockets, ItemCount: 1 }]); - } else { - addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: 1 }]); - } + if (deco.Sockets !== undefined) { + addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: deco.Sockets, ItemCount: 1 }]); + } else { + addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: 1 }]); } // refund capacity diff --git a/static/webui/index.html b/static/webui/index.html index 2ad2751d..f27a1aad 100644 --- a/static/webui/index.html +++ b/static/webui/index.html @@ -108,9 +108,9 @@
-
+ - +
@@ -459,6 +459,23 @@
+
+
+
+
+
+
+ + + +
+ + +
+
+
+
+
@@ -469,6 +486,7 @@ +
@@ -979,10 +997,6 @@
-
- - -
@@ -1387,6 +1401,7 @@ + diff --git a/static/webui/script.js b/static/webui/script.js index 4dc98212..7e77d3d7 100644 --- a/static/webui/script.js +++ b/static/webui/script.js @@ -976,6 +976,40 @@ function updateInventory() { }; } + document.getElementById("ShipDecorations-list").innerHTML = ""; + data.ShipDecorations.forEach(item => { + if (item.ItemCount > 0) { + const tr = document.createElement("tr"); + tr.setAttribute("data-item-type", item.ItemType); + { + const td = document.createElement("td"); + td.textContent = itemMap[item.ItemType]?.name ?? item.ItemType; + if (item.ItemCount > 1) { + td.innerHTML += + " 🗍 " + parseInt(item.ItemCount) + ""; + } + tr.appendChild(td); + } + { + const td = document.createElement("td"); + td.classList = "text-end text-nowrap"; + { + const a = document.createElement("a"); + a.href = "#"; + a.onclick = function (event) { + event.preventDefault(); + removeCountItems(item.ItemType, item.ItemCount); + }; + a.title = loc("code_remove"); + a.innerHTML = ``; + td.appendChild(a); + } + tr.appendChild(td); + } + document.getElementById("ShipDecorations-list").appendChild(tr); + } + }); + // Populate quests route document.getElementById("QuestKeys-list").innerHTML = ""; window.allQuestKeys.forEach(questKey => { @@ -1232,7 +1266,8 @@ function updateInventory() { td.textContent = itemMap[item.ItemType]?.name ?? item.ItemType; td.innerHTML += " ★ 0/" + maxRank + ""; if (item.ItemCount > 1) { - td.innerHTML += " 🗍 " + parseInt(item.ItemCount) + ""; + td.innerHTML += + " 🗍 " + parseInt(item.ItemCount) + ""; } tr.appendChild(td); } @@ -2147,7 +2182,9 @@ function addMissingEquipment(categories) { ) ) { if (!webUiModularWeapons.includes(elm.getAttribute("data-key"))) { - requests.push({ ItemType: elm.getAttribute("data-key"), ItemCount: 1 }); + let ItemCount = 1; + if (category == "ShipDecorations") ItemCount = 100; + requests.push({ ItemType: elm.getAttribute("data-key"), ItemCount }); } } }); @@ -2667,13 +2704,13 @@ function setEvolutionProgress(requests) { }); } -function doAcquireMiscItems() { - const uniqueName = getKey(document.getElementById("miscitem-type")); +function doAcquireCountItems(category) { + const uniqueName = getKey(document.getElementById(category + "-type")); if (!uniqueName) { - $("#miscitem-type").addClass("is-invalid").focus(); + $(`#acquire-type-${category}`).addClass("is-invalid").focus(); return; } - const count = parseInt($("#miscitem-count").val()); + const count = parseInt($(`#${category}-count`).val()); if (count != 0) { revalidateAuthz().then(() => { $.post({ @@ -2691,11 +2728,30 @@ function doAcquireMiscItems() { } else { toast(loc("code_succRemoved")); } + if (category != "miscitem") updateInventory(); }); }); } } +function removeCountItems(uniqueName, count) { + revalidateAuthz().then(() => { + $.post({ + url: "/custom/addItems?" + window.authz, + contentType: "application/json", + data: JSON.stringify([ + { + ItemType: uniqueName, + ItemCount: count * -1 + } + ]) + }).done(function () { + toast(loc("code_succRemoved")); + updateInventory(); + }); + }); +} + function addItemByItemType() { const ItemType = document.getElementById("typeName-type").value; // Must start with "/Lotus/", contain only A–Z letters, no "//", and not end with "/" diff --git a/static/webui/translations/de.js b/static/webui/translations/de.js index d370142c..4ebc952b 100644 --- a/static/webui/translations/de.js +++ b/static/webui/translations/de.js @@ -103,12 +103,14 @@ dict = { inventory_kubrowPets: `Bestien`, inventory_evolutionProgress: `Incarnon-Entwicklungsfortschritte`, inventory_Boosters: `Booster`, + inventory_shipDecorations: `Schiffsdekorationen`, inventory_bulkAddSuits: `Fehlende Warframes hinzufügen`, inventory_bulkAddWeapons: `Fehlende Waffen hinzufügen`, inventory_bulkAddSpaceSuits: `Fehlende Archwings hinzufügen`, inventory_bulkAddSpaceWeapons: `Fehlende Archwing-Waffen hinzufügen`, inventory_bulkAddSentinels: `Fehlende Wächter hinzufügen`, inventory_bulkAddSentinelWeapons: `Fehlende Wächter-Waffen hinzufügen`, + inventory_bulkAddShipDecorations: `[UNTRANSLATED] Add Missing Ship Decorations`, inventory_bulkAddEvolutionProgress: `Fehlende Incarnon-Entwicklungsfortschritte hinzufügen`, inventory_bulkRankUpSuits: `Alle Warframes auf Max. Rang`, inventory_bulkRankUpWeapons: `Alle Waffen auf Max. Rang`, @@ -198,7 +200,6 @@ dict = { cheats_dontSubtractVoidTraces: `Void-Spuren nicht verbrauchen`, cheats_dontSubtractConsumables: `Verbrauchsgegenstände (Ausrüstung) nicht verbrauchen`, cheats_unlockAllShipFeatures: `Alle Schiffs-Funktionen freischalten`, - cheats_unlockAllShipDecorations: `Alle Schiffsdekorationen freischalten`, cheats_unlockAllFlavourItems: `Alle Sammlerstücke freischalten`, cheats_unlockAllSkins: `Alle Skins freischalten`, cheats_unlockAllCapturaScenes: `Alle Photora-Szenen freischalten`, diff --git a/static/webui/translations/en.js b/static/webui/translations/en.js index 5f82beca..f6e8a232 100644 --- a/static/webui/translations/en.js +++ b/static/webui/translations/en.js @@ -102,12 +102,14 @@ dict = { inventory_kubrowPets: `Beasts`, inventory_evolutionProgress: `Incarnon Evolution Progress`, inventory_Boosters: `Boosters`, + inventory_shipDecorations: `Ship Decorations`, inventory_bulkAddSuits: `Add Missing Warframes`, inventory_bulkAddWeapons: `Add Missing Weapons`, inventory_bulkAddSpaceSuits: `Add Missing Archwings`, inventory_bulkAddSpaceWeapons: `Add Missing Archwing Weapons`, inventory_bulkAddSentinels: `Add Missing Sentinels`, inventory_bulkAddSentinelWeapons: `Add Missing Sentinel Weapons`, + inventory_bulkAddShipDecorations: `Add Missing Ship Decorations`, inventory_bulkAddEvolutionProgress: `Add Missing Incarnon Evolution Progress`, inventory_bulkRankUpSuits: `Max Rank All Warframes`, inventory_bulkRankUpWeapons: `Max Rank All Weapons`, @@ -197,7 +199,6 @@ dict = { cheats_dontSubtractVoidTraces: `Don't Subtract Void Traces`, cheats_dontSubtractConsumables: `Don't Subtract Consumables`, cheats_unlockAllShipFeatures: `Unlock All Ship Features`, - cheats_unlockAllShipDecorations: `Unlock All Ship Decorations`, cheats_unlockAllFlavourItems: `Unlock All Flavor Items`, cheats_unlockAllSkins: `Unlock All Skins`, cheats_unlockAllCapturaScenes: `Unlock All Captura Scenes`, diff --git a/static/webui/translations/es.js b/static/webui/translations/es.js index 337cc27a..85681352 100644 --- a/static/webui/translations/es.js +++ b/static/webui/translations/es.js @@ -103,12 +103,14 @@ dict = { inventory_kubrowPets: `Bestias`, inventory_evolutionProgress: `Progreso de evolución Incarnon`, inventory_Boosters: `Potenciadores`, + inventory_shipDecorations: `Decoraciones de nave`, inventory_bulkAddSuits: `Agregar Warframes faltantes`, inventory_bulkAddWeapons: `Agregar armas faltantes`, inventory_bulkAddSpaceSuits: `Agregar Archwings faltantes`, inventory_bulkAddSpaceWeapons: `Agregar armas Archwing faltantes`, inventory_bulkAddSentinels: `Agregar centinelas faltantes`, inventory_bulkAddSentinelWeapons: `Agregar armas de centinela faltantes`, + inventory_bulkAddShipDecorations: `[UNTRANSLATED] Add Missing Ship Decorations`, inventory_bulkAddEvolutionProgress: `Completar el progreso de evolución Incarnon faltante`, inventory_bulkRankUpSuits: `Maximizar rango de todos los Warframes`, inventory_bulkRankUpWeapons: `Maximizar rango de todas las armas`, @@ -198,7 +200,6 @@ dict = { cheats_dontSubtractVoidTraces: `No descontar vestigios del Vacío`, cheats_dontSubtractConsumables: `No restar consumibles`, cheats_unlockAllShipFeatures: `Desbloquear todas las funciones de nave`, - cheats_unlockAllShipDecorations: `Desbloquear todas las decoraciones de nave`, cheats_unlockAllFlavourItems: `Desbloquear todos los ítems estéticos`, cheats_unlockAllSkins: `Desbloquear todas las skins`, cheats_unlockAllCapturaScenes: `Desbloquear todas las escenas de Captura`, diff --git a/static/webui/translations/fr.js b/static/webui/translations/fr.js index 15d4be30..bd37c748 100644 --- a/static/webui/translations/fr.js +++ b/static/webui/translations/fr.js @@ -103,12 +103,14 @@ dict = { inventory_kubrowPets: `Bêtes`, inventory_evolutionProgress: `Progrès de l'évolution Incarnon`, inventory_Boosters: `Boosters`, + inventory_shipDecorations: `Décorations du vaisseau`, inventory_bulkAddSuits: `Ajouter les Warframes manquantes`, inventory_bulkAddWeapons: `Ajouter les armes manquantes`, inventory_bulkAddSpaceSuits: `Ajouter les Archwings manquants`, inventory_bulkAddSpaceWeapons: `Ajouter les armes d'Archwing manquantes`, inventory_bulkAddSentinels: `Ajouter les Sentinelles manquantes`, inventory_bulkAddSentinelWeapons: `Ajouter les armes de Sentinelles manquantes`, + inventory_bulkAddShipDecorations: `[UNTRANSLATED] Add Missing Ship Decorations`, inventory_bulkAddEvolutionProgress: `Ajouter les évolutions Incarnon manquantes`, inventory_bulkRankUpSuits: `Toutes les Warframes au rang max`, inventory_bulkRankUpWeapons: `Toutes les armes au rang max`, @@ -198,7 +200,6 @@ dict = { cheats_dontSubtractVoidTraces: `Ne pas consommer de Void Traces`, cheats_dontSubtractConsumables: `Ne pas retirer de consommables`, cheats_unlockAllShipFeatures: `Débloquer tous les segments du vaisseau`, - cheats_unlockAllShipDecorations: `Débloquer toutes les décorations du vaisseau`, cheats_unlockAllFlavourItems: `Débloquer tous les Flavor Items`, cheats_unlockAllSkins: `Débloquer tous les skins`, cheats_unlockAllCapturaScenes: `Débloquer toutes les scènes captura`, diff --git a/static/webui/translations/ru.js b/static/webui/translations/ru.js index c1157079..229107d1 100644 --- a/static/webui/translations/ru.js +++ b/static/webui/translations/ru.js @@ -103,12 +103,14 @@ dict = { inventory_kubrowPets: `Звери`, inventory_evolutionProgress: `Прогресс эволюции Инкарнонов`, inventory_Boosters: `Бустеры`, + inventory_shipDecorations: `Украшения корабля`, inventory_bulkAddSuits: `Добавить отсутствующие Варфреймы`, inventory_bulkAddWeapons: `Добавить отсутствующее оружие`, inventory_bulkAddSpaceSuits: `Добавить отсутствующие Арчвинги`, inventory_bulkAddSpaceWeapons: `Добавить отсутствующее оружие Арчвингов`, inventory_bulkAddSentinels: `Добавить отсутствующих Стражей`, inventory_bulkAddSentinelWeapons: `Добавить отсутствующее оружие Стражей`, + inventory_bulkAddShipDecorations: `Добавить отсутствующие украшения корабля`, inventory_bulkAddEvolutionProgress: `Добавить отсутствующий прогресс эволюции Инкарнонов`, inventory_bulkRankUpSuits: `Макс. ранг всех Варфреймов`, inventory_bulkRankUpWeapons: `Макс. ранг всего оружия`, @@ -198,7 +200,6 @@ dict = { cheats_dontSubtractVoidTraces: `Не вычитать количество Отголосков Бездны`, cheats_dontSubtractConsumables: `Не вычитать количество расходников`, cheats_unlockAllShipFeatures: `Разблокировать все функции корабля`, - cheats_unlockAllShipDecorations: `Разблокировать все украшения корабля`, cheats_unlockAllFlavourItems: `Разблокировать все уникальные предметы`, cheats_unlockAllSkins: `Разблокировать все скины`, cheats_unlockAllCapturaScenes: `Разблокировать все сцены Каптуры`, diff --git a/static/webui/translations/uk.js b/static/webui/translations/uk.js index 7981eae1..836b5d40 100644 --- a/static/webui/translations/uk.js +++ b/static/webui/translations/uk.js @@ -103,12 +103,14 @@ dict = { inventory_kubrowPets: `Тварини`, inventory_evolutionProgress: `Прогрес еволюції Інкарнонів`, inventory_Boosters: `Посилення`, + inventory_shipDecorations: `Прикраси судна`, inventory_bulkAddSuits: `Додати відсутні Ворфрейми`, inventory_bulkAddWeapons: `Додати відсутню зброю`, inventory_bulkAddSpaceSuits: `Додати відсутні Арквінґи`, inventory_bulkAddSpaceWeapons: `Додати відсутню зброю Арквінґів`, inventory_bulkAddSentinels: `Додати відсутніх Вартових`, inventory_bulkAddSentinelWeapons: `Додати відсутню зброю Вартових`, + inventory_bulkAddShipDecorations: `[UNTRANSLATED] Add Missing Ship Decorations`, inventory_bulkAddEvolutionProgress: `Додати відсутній прогрес еволюції Інкарнонів`, inventory_bulkRankUpSuits: `Макс. рівень всіх Ворфреймів`, inventory_bulkRankUpWeapons: `Макс. рівень всієї зброї`, @@ -198,7 +200,6 @@ dict = { cheats_dontSubtractVoidTraces: `Не вираховувати кількість Відлуння`, cheats_dontSubtractConsumables: `Не вираховувати кількість витратних матеріалів`, cheats_unlockAllShipFeatures: `Розблокувати всі функції судна`, - cheats_unlockAllShipDecorations: `Розблокувати всі прикраси судна`, cheats_unlockAllFlavourItems: `Розблокувати всі унікальні предмети`, cheats_unlockAllSkins: `Розблокувати всі скіни`, cheats_unlockAllCapturaScenes: `Розблокувати всі сцени Світлописця`, diff --git a/static/webui/translations/zh.js b/static/webui/translations/zh.js index 4b806799..0e5e12ad 100644 --- a/static/webui/translations/zh.js +++ b/static/webui/translations/zh.js @@ -103,12 +103,14 @@ dict = { inventory_kubrowPets: `动物同伴`, inventory_evolutionProgress: `灵化之源进度`, inventory_Boosters: `加成器`, + inventory_shipDecorations: `飞船装饰`, inventory_bulkAddSuits: `添加缺失战甲`, inventory_bulkAddWeapons: `添加缺失武器`, inventory_bulkAddSpaceSuits: `添加缺失载具`, inventory_bulkAddSpaceWeapons: `添加缺失载具武器`, inventory_bulkAddSentinels: `添加缺失守护`, inventory_bulkAddSentinelWeapons: `添加缺失守护武器`, + inventory_bulkAddShipDecorations: `[UNTRANSLATED] Add Missing Ship Decorations`, inventory_bulkAddEvolutionProgress: `添加缺失的灵化之源进度`, inventory_bulkRankUpSuits: `所有战甲升满级`, inventory_bulkRankUpWeapons: `所有武器升满级`, @@ -198,7 +200,6 @@ dict = { cheats_dontSubtractVoidTraces: `虚空光体无消耗`, cheats_dontSubtractConsumables: `消耗物品使用时无损耗`, cheats_unlockAllShipFeatures: `解锁所有飞船功能`, - cheats_unlockAllShipDecorations: `解锁所有飞船装饰`, cheats_unlockAllFlavourItems: `解锁所有装饰物品`, cheats_unlockAllSkins: `解锁所有外观`, cheats_unlockAllCapturaScenes: `解锁所有Captura场景`, -- 2.47.2 From 394a3cd4287de3f111fc19ab407f747f53cfffd8 Mon Sep 17 00:00:00 2001 From: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com> Date: Sun, 14 Sep 2025 17:38:12 +0200 Subject: [PATCH 2/5] lint --- src/controllers/api/inventoryController.ts | 2 +- src/services/shipCustomizationsService.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/controllers/api/inventoryController.ts b/src/controllers/api/inventoryController.ts index ce6bb775..bf053d7c 100644 --- a/src/controllers/api/inventoryController.ts +++ b/src/controllers/api/inventoryController.ts @@ -10,7 +10,7 @@ import { equipmentKeys } from "../../types/inventoryTypes/inventoryTypes.ts"; import type { IPolarity } from "../../types/inventoryTypes/commonInventoryTypes.ts"; import { ArtifactPolarity } from "../../types/inventoryTypes/commonInventoryTypes.ts"; import type { ICountedItem } from "warframe-public-export-plus"; -import { ExportCustoms, ExportFlavour, ExportResources } from "warframe-public-export-plus"; +import { ExportCustoms, ExportFlavour } from "warframe-public-export-plus"; import { applyCheatsToInfestedFoundry, handleSubsumeCompletion } from "../../services/infestedFoundryService.ts"; import { addEmailItem, diff --git a/src/services/shipCustomizationsService.ts b/src/services/shipCustomizationsService.ts index d018b73b..073b6156 100644 --- a/src/services/shipCustomizationsService.ts +++ b/src/services/shipCustomizationsService.ts @@ -14,7 +14,6 @@ import type { import { logger } from "../utils/logger.ts"; import { Types } from "mongoose"; import { addFusionTreasures, addShipDecorations, getInventory } from "./inventoryService.ts"; -import { config } from "./configService.ts"; import { Guild } from "../models/guildModel.ts"; import { hasGuildPermission } from "./guildService.ts"; import { GuildPermission } from "../types/guildTypes.ts"; -- 2.47.2 From d04534f168cb69205f1ecae18c9501738b284e2c Mon Sep 17 00:00:00 2001 From: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com> Date: Sun, 14 Sep 2025 17:07:03 +0200 Subject: [PATCH 3/5] feat(webui): ship decorations Re #2361 --- config-vanilla.json | 1 - src/controllers/api/inventoryController.ts | 11 +-- .../custom/getItemListsController.ts | 11 ++- src/services/configService.ts | 6 +- src/services/shipCustomizationsService.ts | 38 +++++------ static/webui/index.html | 25 +++++-- static/webui/script.js | 68 +++++++++++++++++-- static/webui/translations/de.js | 3 + static/webui/translations/en.js | 3 + static/webui/translations/es.js | 3 + static/webui/translations/fr.js | 3 + static/webui/translations/ru.js | 3 + static/webui/translations/uk.js | 3 + static/webui/translations/zh.js | 3 + 14 files changed, 131 insertions(+), 50 deletions(-) diff --git a/config-vanilla.json b/config-vanilla.json index 56f93879..887a2141 100644 --- a/config-vanilla.json +++ b/config-vanilla.json @@ -11,7 +11,6 @@ "administratorNames": [], "autoCreateAccount": true, "skipTutorial": false, - "unlockAllShipDecorations": false, "unlockAllSkins": false, "fullyStockedVendors": false, "skipClanKeyCrafting": false, diff --git a/src/controllers/api/inventoryController.ts b/src/controllers/api/inventoryController.ts index f131c3f0..f4a9cfb1 100644 --- a/src/controllers/api/inventoryController.ts +++ b/src/controllers/api/inventoryController.ts @@ -10,7 +10,7 @@ import { equipmentKeys } from "../../types/inventoryTypes/inventoryTypes.ts"; import type { IPolarity } from "../../types/inventoryTypes/commonInventoryTypes.ts"; import { ArtifactPolarity } from "../../types/inventoryTypes/commonInventoryTypes.ts"; import type { ICountedItem } from "warframe-public-export-plus"; -import { ExportCustoms, ExportResources } from "warframe-public-export-plus"; +import { ExportCustoms } from "warframe-public-export-plus"; import { applyCheatsToInfestedFoundry, handleSubsumeCompletion } from "../../services/infestedFoundryService.ts"; import { addEmailItem, @@ -321,15 +321,6 @@ export const getInventoryResponse = async ( } } - if (config.unlockAllShipDecorations) { - inventoryResponse.ShipDecorations = []; - for (const [uniqueName, item] of Object.entries(ExportResources)) { - if (item.productCategory == "ShipDecorations") { - inventoryResponse.ShipDecorations.push({ ItemType: uniqueName, ItemCount: 999_999 }); - } - } - } - if (config.worldState?.baroTennoConRelay) { [ "/Lotus/Types/Items/Events/TennoConRelay2022EarlyAccess", diff --git a/src/controllers/custom/getItemListsController.ts b/src/controllers/custom/getItemListsController.ts index 3296ad1c..4088f8a1 100644 --- a/src/controllers/custom/getItemListsController.ts +++ b/src/controllers/custom/getItemListsController.ts @@ -64,6 +64,7 @@ interface ItemLists { TechProjects: ListedItem[]; VaultDecoRecipes: ListedItem[]; FlavourItems: ListedItem[]; + ShipDecorations: ListedItem[]; //circuitGameModes: ListedItem[]; } @@ -105,7 +106,8 @@ const getItemListsController: RequestHandler = (req, response) => { Abilities: [], TechProjects: [], VaultDecoRecipes: [], - FlavourItems: [] + FlavourItems: [], + ShipDecorations: [] /*circuitGameModes: [ { uniqueName: "Survival", @@ -233,7 +235,12 @@ const getItemListsController: RequestHandler = (req, response) => { } } } - if ( + if (item.productCategory == "ShipDecorations") { + res.ShipDecorations.push({ + uniqueName: uniqueName, + name: name + }); + } else if ( name && uniqueName.substring(0, 30) != "/Lotus/Types/Game/Projections/" && uniqueName != "/Lotus/Types/Gameplay/EntratiLab/Resources/EntratiLanthornBundle" diff --git a/src/services/configService.ts b/src/services/configService.ts index 18348357..238cb368 100644 --- a/src/services/configService.ts +++ b/src/services/configService.ts @@ -21,7 +21,6 @@ export interface IConfig { administratorNames?: string[]; autoCreateAccount?: boolean; skipTutorial?: boolean; - unlockAllShipDecorations?: boolean; unlockAllSkins?: boolean; fullyStockedVendors?: boolean; skipClanKeyCrafting?: boolean; @@ -127,8 +126,9 @@ export const configRemovedOptionsKeys = [ "noDojoResearchCosts", "noDojoResearchTime", "fastClanAscension", - "unlockAllDecoRecipes", - "unlockAllFlavourItems" + "unlockAllFlavourItems", + "unlockAllShipDecorations", + "unlockAllDecoRecipes" ]; export const configPath = path.join(repoDir, args.configPath ?? "config.json"); diff --git a/src/services/shipCustomizationsService.ts b/src/services/shipCustomizationsService.ts index 2358fe41..d018b73b 100644 --- a/src/services/shipCustomizationsService.ts +++ b/src/services/shipCustomizationsService.ts @@ -137,15 +137,13 @@ export const handleSetShipDecorations = async ( roomToPlaceIn.MaxCapacity += meta.capacityCost; await personalRooms.save(); - if (!config.unlockAllShipDecorations) { - const inventory = await getInventory(accountId); - if (deco.Sockets !== undefined) { - addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: deco.Sockets, ItemCount: 1 }]); - } else { - addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: 1 }]); - } - await inventory.save(); + const inventory = await getInventory(accountId); + if (deco.Sockets !== undefined) { + addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: deco.Sockets, ItemCount: 1 }]); + } else { + addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: 1 }]); } + await inventory.save(); return { DecoId: placedDecoration.RemoveId, @@ -155,15 +153,13 @@ export const handleSetShipDecorations = async ( }; } - if (!config.unlockAllShipDecorations) { - const inventory = await getInventory(accountId); - if (placedDecoration.Sockets !== undefined) { - addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: placedDecoration.Sockets, ItemCount: -1 }]); - } else { - addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: -1 }]); - } - await inventory.save(); + const inventory = await getInventory(accountId); + if (placedDecoration.Sockets !== undefined) { + addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: placedDecoration.Sockets, ItemCount: -1 }]); + } else { + addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: -1 }]); } + await inventory.save(); //place decoration const decoId = new Types.ObjectId(); @@ -221,12 +217,10 @@ export const handleResetShipDecorations = async ( } // refund item - if (!config.unlockAllShipDecorations) { - if (deco.Sockets !== undefined) { - addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: deco.Sockets, ItemCount: 1 }]); - } else { - addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: 1 }]); - } + if (deco.Sockets !== undefined) { + addFusionTreasures(inventory, [{ ItemType: itemType, Sockets: deco.Sockets, ItemCount: 1 }]); + } else { + addShipDecorations(inventory, [{ ItemType: itemType, ItemCount: 1 }]); } // refund capacity diff --git a/static/webui/index.html b/static/webui/index.html index a3449f8a..3e9713ce 100644 --- a/static/webui/index.html +++ b/static/webui/index.html @@ -108,9 +108,9 @@
-
+ - +
@@ -474,6 +474,21 @@
+
+
+
+
+
+ + + +
+ + +
+
+
+
@@ -486,6 +501,7 @@ +
@@ -996,10 +1012,6 @@
-
- - -
@@ -1401,6 +1413,7 @@ + diff --git a/static/webui/script.js b/static/webui/script.js index bd0107c2..168bc9cd 100644 --- a/static/webui/script.js +++ b/static/webui/script.js @@ -1043,6 +1043,40 @@ function updateInventory() { }; } + document.getElementById("ShipDecorations-list").innerHTML = ""; + data.ShipDecorations.forEach(item => { + if (item.ItemCount > 0) { + const tr = document.createElement("tr"); + tr.setAttribute("data-item-type", item.ItemType); + { + const td = document.createElement("td"); + td.textContent = itemMap[item.ItemType]?.name ?? item.ItemType; + if (item.ItemCount > 1) { + td.innerHTML += + " 🗍 " + parseInt(item.ItemCount) + ""; + } + tr.appendChild(td); + } + { + const td = document.createElement("td"); + td.classList = "text-end text-nowrap"; + { + const a = document.createElement("a"); + a.href = "#"; + a.onclick = function (event) { + event.preventDefault(); + removeCountItems(item.ItemType, item.ItemCount); + }; + a.title = loc("code_remove"); + a.innerHTML = ``; + td.appendChild(a); + } + tr.appendChild(td); + } + document.getElementById("ShipDecorations-list").appendChild(tr); + } + }); + // Populate quests route document.getElementById("QuestKeys-list").innerHTML = ""; window.allQuestKeys.forEach(questKey => { @@ -1304,7 +1338,8 @@ function updateInventory() { td.textContent = itemMap[item.ItemType]?.name ?? item.ItemType; td.innerHTML += " ★ 0/" + maxRank + ""; if (item.ItemCount > 1) { - td.innerHTML += " 🗍 " + parseInt(item.ItemCount) + ""; + td.innerHTML += + " 🗍 " + parseInt(item.ItemCount) + ""; } tr.appendChild(td); } @@ -2228,7 +2263,9 @@ function addMissingEquipment(categories) { ) ) { if (!webUiModularWeapons.includes(elm.getAttribute("data-key"))) { - requests.push({ ItemType: elm.getAttribute("data-key"), ItemCount: 1 }); + let ItemCount = 1; + if (category == "ShipDecorations") ItemCount = 100; + requests.push({ ItemType: elm.getAttribute("data-key"), ItemCount }); } } }); @@ -2748,13 +2785,13 @@ function setEvolutionProgress(requests) { }); } -function doAcquireMiscItems() { - const uniqueName = getKey(document.getElementById("miscitem-type")); +function doAcquireCountItems(category) { + const uniqueName = getKey(document.getElementById(category + "-type")); if (!uniqueName) { - $("#miscitem-type").addClass("is-invalid").focus(); + $(`#acquire-type-${category}`).addClass("is-invalid").focus(); return; } - const count = parseInt($("#miscitem-count").val()); + const count = parseInt($(`#${category}-count`).val()); if (count != 0) { revalidateAuthz().then(() => { $.post({ @@ -2772,11 +2809,30 @@ function doAcquireMiscItems() { } else { toast(loc("code_succRemoved")); } + if (category != "miscitem") updateInventory(); }); }); } } +function removeCountItems(uniqueName, count) { + revalidateAuthz().then(() => { + $.post({ + url: "/custom/addItems?" + window.authz, + contentType: "application/json", + data: JSON.stringify([ + { + ItemType: uniqueName, + ItemCount: count * -1 + } + ]) + }).done(function () { + toast(loc("code_succRemoved")); + updateInventory(); + }); + }); +} + function addItemByItemType() { const ItemType = document.getElementById("typeName-type").value; // Must start with "/Lotus/", contain only A–Z letters, no "//", and not end with "/" diff --git a/static/webui/translations/de.js b/static/webui/translations/de.js index 6d65f15d..0191a906 100644 --- a/static/webui/translations/de.js +++ b/static/webui/translations/de.js @@ -109,6 +109,7 @@ dict = { inventory_evolutionProgress: `Incarnon-Entwicklungsfortschritte`, inventory_Boosters: `Booster`, inventory_flavourItems: `Sammlerstücke`, + inventory_shipDecorations: `Schiffsdekorationen`, inventory_bulkAddSuits: `Fehlende Warframes hinzufügen`, inventory_bulkAddWeapons: `Fehlende Waffen hinzufügen`, inventory_bulkAddSpaceSuits: `Fehlende Archwings hinzufügen`, @@ -116,6 +117,7 @@ dict = { inventory_bulkAddSentinels: `Fehlende Wächter hinzufügen`, inventory_bulkAddSentinelWeapons: `Fehlende Wächter-Waffen hinzufügen`, inventory_bulkAddFlavourItems: `[UNTRANSLATED] Add Missing Flavour Items`, + inventory_bulkAddShipDecorations: `[UNTRANSLATED] Add Missing Ship Decorations`, inventory_bulkAddEvolutionProgress: `Fehlende Incarnon-Entwicklungsfortschritte hinzufügen`, inventory_bulkRankUpSuits: `Alle Warframes auf Max. Rang`, inventory_bulkRankUpWeapons: `Alle Waffen auf Max. Rang`, @@ -206,6 +208,7 @@ dict = { cheats_dontSubtractConsumables: `Verbrauchsgegenstände (Ausrüstung) nicht verbrauchen`, cheats_unlockAllShipFeatures: `Alle Schiffs-Funktionen freischalten`, cheats_unlockAllShipDecorations: `Alle Schiffsdekorationen freischalten`, + cheats_unlockAllFlavourItems: `Alle Sammlerstücke freischalten`, cheats_unlockAllSkins: `Alle Skins freischalten`, cheats_unlockAllCapturaScenes: `Alle Photora-Szenen freischalten`, cheats_universalPolarityEverywhere: `Universelle Polarität überall`, diff --git a/static/webui/translations/en.js b/static/webui/translations/en.js index f9e42b8f..ac1cb584 100644 --- a/static/webui/translations/en.js +++ b/static/webui/translations/en.js @@ -108,6 +108,7 @@ dict = { inventory_evolutionProgress: `Incarnon Evolution Progress`, inventory_Boosters: `Boosters`, inventory_flavourItems: `Flavour Items`, + inventory_shipDecorations: `Ship Decorations`, inventory_bulkAddSuits: `Add Missing Warframes`, inventory_bulkAddWeapons: `Add Missing Weapons`, inventory_bulkAddSpaceSuits: `Add Missing Archwings`, @@ -115,6 +116,7 @@ dict = { inventory_bulkAddSentinels: `Add Missing Sentinels`, inventory_bulkAddSentinelWeapons: `Add Missing Sentinel Weapons`, inventory_bulkAddFlavourItems: `Add Missing Flavour Items`, + inventory_bulkAddShipDecorations: `Add Missing Ship Decorations`, inventory_bulkAddEvolutionProgress: `Add Missing Incarnon Evolution Progress`, inventory_bulkRankUpSuits: `Max Rank All Warframes`, inventory_bulkRankUpWeapons: `Max Rank All Weapons`, @@ -205,6 +207,7 @@ dict = { cheats_dontSubtractConsumables: `Don't Subtract Consumables`, cheats_unlockAllShipFeatures: `Unlock All Ship Features`, cheats_unlockAllShipDecorations: `Unlock All Ship Decorations`, + cheats_unlockAllFlavourItems: `Unlock All Flavor Items`, cheats_unlockAllSkins: `Unlock All Skins`, cheats_unlockAllCapturaScenes: `Unlock All Captura Scenes`, cheats_universalPolarityEverywhere: `Universal Polarity Everywhere`, diff --git a/static/webui/translations/es.js b/static/webui/translations/es.js index c21ab29a..18336d75 100644 --- a/static/webui/translations/es.js +++ b/static/webui/translations/es.js @@ -109,6 +109,7 @@ dict = { inventory_evolutionProgress: `Progreso de evolución Incarnon`, inventory_Boosters: `Potenciadores`, inventory_flavourItems: `Ítems estéticos`, + inventory_shipDecorations: `Decoraciones de nave`, inventory_bulkAddSuits: `Agregar Warframes faltantes`, inventory_bulkAddWeapons: `Agregar armas faltantes`, inventory_bulkAddSpaceSuits: `Agregar Archwings faltantes`, @@ -116,6 +117,7 @@ dict = { inventory_bulkAddSentinels: `Agregar centinelas faltantes`, inventory_bulkAddSentinelWeapons: `Agregar armas de centinela faltantes`, inventory_bulkAddFlavourItems: `[UNTRANSLATED] Add Missing Flavour Items`, + inventory_bulkAddShipDecorations: `[UNTRANSLATED] Add Missing Ship Decorations`, inventory_bulkAddEvolutionProgress: `Completar el progreso de evolución Incarnon faltante`, inventory_bulkRankUpSuits: `Maximizar rango de todos los Warframes`, inventory_bulkRankUpWeapons: `Maximizar rango de todas las armas`, @@ -206,6 +208,7 @@ dict = { cheats_dontSubtractConsumables: `No restar consumibles`, cheats_unlockAllShipFeatures: `Desbloquear todas las funciones de nave`, cheats_unlockAllShipDecorations: `Desbloquear todas las decoraciones de nave`, + cheats_unlockAllFlavourItems: `Desbloquear todos los ítems estéticos`, cheats_unlockAllSkins: `Desbloquear todas las skins`, cheats_unlockAllCapturaScenes: `Desbloquear todas las escenas de Captura`, cheats_universalPolarityEverywhere: `Polaridad universal en todas partes`, diff --git a/static/webui/translations/fr.js b/static/webui/translations/fr.js index ec4fae6f..f4a844f2 100644 --- a/static/webui/translations/fr.js +++ b/static/webui/translations/fr.js @@ -109,6 +109,7 @@ dict = { inventory_evolutionProgress: `Progrès de l'évolution Incarnon`, inventory_Boosters: `Boosters`, inventory_flavourItems: `[UNTRANSLATED] Flavour Items`, + inventory_shipDecorations: `Décorations du vaisseau`, inventory_bulkAddSuits: `Ajouter les Warframes manquantes`, inventory_bulkAddWeapons: `Ajouter les armes manquantes`, inventory_bulkAddSpaceSuits: `Ajouter les Archwings manquants`, @@ -116,6 +117,7 @@ dict = { inventory_bulkAddSentinels: `Ajouter les Sentinelles manquantes`, inventory_bulkAddSentinelWeapons: `Ajouter les armes de Sentinelles manquantes`, inventory_bulkAddFlavourItems: `[UNTRANSLATED] Add Missing Flavour Items`, + inventory_bulkAddShipDecorations: `[UNTRANSLATED] Add Missing Ship Decorations`, inventory_bulkAddEvolutionProgress: `Ajouter les évolutions Incarnon manquantes`, inventory_bulkRankUpSuits: `Toutes les Warframes au rang max`, inventory_bulkRankUpWeapons: `Toutes les armes au rang max`, @@ -206,6 +208,7 @@ dict = { cheats_dontSubtractConsumables: `Ne pas retirer de consommables`, cheats_unlockAllShipFeatures: `Débloquer tous les segments du vaisseau`, cheats_unlockAllShipDecorations: `Débloquer toutes les décorations du vaisseau`, + cheats_unlockAllFlavourItems: `Débloquer tous les Flavor Items`, cheats_unlockAllSkins: `Débloquer tous les skins`, cheats_unlockAllCapturaScenes: `Débloquer toutes les scènes captura`, cheats_universalPolarityEverywhere: `Polarités universelles partout`, diff --git a/static/webui/translations/ru.js b/static/webui/translations/ru.js index 6aae5bac..9412fda7 100644 --- a/static/webui/translations/ru.js +++ b/static/webui/translations/ru.js @@ -109,6 +109,7 @@ dict = { inventory_evolutionProgress: `Прогресс эволюции Инкарнонов`, inventory_Boosters: `Бустеры`, inventory_flavourItems: `Уникальные предметы`, + inventory_shipDecorations: `Украшения корабля`, inventory_bulkAddSuits: `Добавить отсутствующие Варфреймы`, inventory_bulkAddWeapons: `Добавить отсутствующее оружие`, inventory_bulkAddSpaceSuits: `Добавить отсутствующие Арчвинги`, @@ -116,6 +117,7 @@ dict = { inventory_bulkAddSentinels: `Добавить отсутствующих Стражей`, inventory_bulkAddSentinelWeapons: `Добавить отсутствующее оружие Стражей`, inventory_bulkAddFlavourItems: `Добавить отсутствующие Уникальные предметы`, + inventory_bulkAddShipDecorations: `Добавить отсутствующие украшения корабля`, inventory_bulkAddEvolutionProgress: `Добавить отсутствующий прогресс эволюции Инкарнонов`, inventory_bulkRankUpSuits: `Макс. ранг всех Варфреймов`, inventory_bulkRankUpWeapons: `Макс. ранг всего оружия`, @@ -206,6 +208,7 @@ dict = { cheats_dontSubtractConsumables: `Не вычитать количество расходников`, cheats_unlockAllShipFeatures: `Разблокировать все функции корабля`, cheats_unlockAllShipDecorations: `Разблокировать все украшения корабля`, + cheats_unlockAllFlavourItems: `Разблокировать все уникальные предметы`, cheats_unlockAllSkins: `Разблокировать все скины`, cheats_unlockAllCapturaScenes: `Разблокировать все сцены Каптуры`, cheats_universalPolarityEverywhere: `Универсальная полярность везде`, diff --git a/static/webui/translations/uk.js b/static/webui/translations/uk.js index de48e9b1..5a06be1b 100644 --- a/static/webui/translations/uk.js +++ b/static/webui/translations/uk.js @@ -109,6 +109,7 @@ dict = { inventory_evolutionProgress: `Прогрес еволюції Інкарнонів`, inventory_Boosters: `Посилення`, inventory_flavourItems: `Унікальні предмети`, + inventory_shipDecorations: `Прикраси судна`, inventory_bulkAddSuits: `Додати відсутні Ворфрейми`, inventory_bulkAddWeapons: `Додати відсутню зброю`, inventory_bulkAddSpaceSuits: `Додати відсутні Арквінґи`, @@ -116,6 +117,7 @@ dict = { inventory_bulkAddSentinels: `Додати відсутніх Вартових`, inventory_bulkAddSentinelWeapons: `Додати відсутню зброю Вартових`, inventory_bulkAddFlavourItems: `[UNTRANSLATED] Add Missing Flavour Items`, + inventory_bulkAddShipDecorations: `[UNTRANSLATED] Add Missing Ship Decorations`, inventory_bulkAddEvolutionProgress: `Додати відсутній прогрес еволюції Інкарнонів`, inventory_bulkRankUpSuits: `Макс. рівень всіх Ворфреймів`, inventory_bulkRankUpWeapons: `Макс. рівень всієї зброї`, @@ -206,6 +208,7 @@ dict = { cheats_dontSubtractConsumables: `Не вираховувати кількість витратних матеріалів`, cheats_unlockAllShipFeatures: `Розблокувати всі функції судна`, cheats_unlockAllShipDecorations: `Розблокувати всі прикраси судна`, + cheats_unlockAllFlavourItems: `Розблокувати всі унікальні предмети`, cheats_unlockAllSkins: `Розблокувати всі скіни`, cheats_unlockAllCapturaScenes: `Розблокувати всі сцени Світлописця`, cheats_universalPolarityEverywhere: `Будь-яка полярність скрізь`, diff --git a/static/webui/translations/zh.js b/static/webui/translations/zh.js index 3b20fded..8a2d290d 100644 --- a/static/webui/translations/zh.js +++ b/static/webui/translations/zh.js @@ -109,6 +109,7 @@ dict = { inventory_evolutionProgress: `灵化之源进度`, inventory_Boosters: `加成器`, inventory_flavourItems: `装饰物品`, + inventory_shipDecorations: `飞船装饰`, inventory_bulkAddSuits: `添加缺失战甲`, inventory_bulkAddWeapons: `添加缺失武器`, inventory_bulkAddSpaceSuits: `添加缺失载具`, @@ -116,6 +117,7 @@ dict = { inventory_bulkAddSentinels: `添加缺失守护`, inventory_bulkAddSentinelWeapons: `添加缺失守护武器`, inventory_bulkAddFlavourItems: `[UNTRANSLATED] Add Missing Flavour Items`, + inventory_bulkAddShipDecorations: `[UNTRANSLATED] Add Missing Ship Decorations`, inventory_bulkAddEvolutionProgress: `添加缺失的灵化之源进度`, inventory_bulkRankUpSuits: `所有战甲升满级`, inventory_bulkRankUpWeapons: `所有武器升满级`, @@ -206,6 +208,7 @@ dict = { cheats_dontSubtractConsumables: `消耗物品使用时无损耗`, cheats_unlockAllShipFeatures: `解锁所有飞船功能`, cheats_unlockAllShipDecorations: `解锁所有飞船装饰`, + cheats_unlockAllFlavourItems: `解锁所有装饰物品`, cheats_unlockAllSkins: `解锁所有外观`, cheats_unlockAllCapturaScenes: `解锁所有Captura场景`, cheats_universalPolarityEverywhere: `全局万用极性`, -- 2.47.2 From 20080d5fcdbca019a1c65cc5e29a3aa0d0cd86e5 Mon Sep 17 00:00:00 2001 From: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com> Date: Sun, 14 Sep 2025 17:38:12 +0200 Subject: [PATCH 4/5] lint --- src/services/shipCustomizationsService.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/services/shipCustomizationsService.ts b/src/services/shipCustomizationsService.ts index d018b73b..073b6156 100644 --- a/src/services/shipCustomizationsService.ts +++ b/src/services/shipCustomizationsService.ts @@ -14,7 +14,6 @@ import type { import { logger } from "../utils/logger.ts"; import { Types } from "mongoose"; import { addFusionTreasures, addShipDecorations, getInventory } from "./inventoryService.ts"; -import { config } from "./configService.ts"; import { Guild } from "../models/guildModel.ts"; import { hasGuildPermission } from "./guildService.ts"; import { GuildPermission } from "../types/guildTypes.ts"; -- 2.47.2 From a88b1202d34b04f03c45518b62e29ab106c70431 Mon Sep 17 00:00:00 2001 From: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com> Date: Mon, 15 Sep 2025 12:59:14 +0200 Subject: [PATCH 5/5] update-translations --- static/webui/translations/de.js | 1 - static/webui/translations/en.js | 1 - static/webui/translations/es.js | 1 - static/webui/translations/fr.js | 1 - static/webui/translations/ru.js | 1 - static/webui/translations/uk.js | 1 - static/webui/translations/zh.js | 1 - 7 files changed, 7 deletions(-) diff --git a/static/webui/translations/de.js b/static/webui/translations/de.js index 526c388b..5e2f33fa 100644 --- a/static/webui/translations/de.js +++ b/static/webui/translations/de.js @@ -207,7 +207,6 @@ dict = { cheats_dontSubtractVoidTraces: `Void-Spuren nicht verbrauchen`, cheats_dontSubtractConsumables: `Verbrauchsgegenstände (Ausrüstung) nicht verbrauchen`, cheats_unlockAllShipFeatures: `Alle Schiffs-Funktionen freischalten`, - cheats_unlockAllFlavourItems: `Alle Sammlerstücke freischalten`, cheats_unlockAllSkins: `Alle Skins freischalten`, cheats_unlockAllCapturaScenes: `Alle Photora-Szenen freischalten`, cheats_universalPolarityEverywhere: `Universelle Polarität überall`, diff --git a/static/webui/translations/en.js b/static/webui/translations/en.js index 24c964b9..03c1e6f2 100644 --- a/static/webui/translations/en.js +++ b/static/webui/translations/en.js @@ -206,7 +206,6 @@ dict = { cheats_dontSubtractVoidTraces: `Don't Subtract Void Traces`, cheats_dontSubtractConsumables: `Don't Subtract Consumables`, cheats_unlockAllShipFeatures: `Unlock All Ship Features`, - cheats_unlockAllFlavourItems: `Unlock All Flavor Items`, cheats_unlockAllSkins: `Unlock All Skins`, cheats_unlockAllCapturaScenes: `Unlock All Captura Scenes`, cheats_universalPolarityEverywhere: `Universal Polarity Everywhere`, diff --git a/static/webui/translations/es.js b/static/webui/translations/es.js index 1251fa97..b6f6918f 100644 --- a/static/webui/translations/es.js +++ b/static/webui/translations/es.js @@ -207,7 +207,6 @@ dict = { cheats_dontSubtractVoidTraces: `No descontar vestigios del Vacío`, cheats_dontSubtractConsumables: `No restar consumibles`, cheats_unlockAllShipFeatures: `Desbloquear todas las funciones de nave`, - cheats_unlockAllFlavourItems: `Desbloquear todos los ítems estéticos`, cheats_unlockAllSkins: `Desbloquear todas las skins`, cheats_unlockAllCapturaScenes: `Desbloquear todas las escenas de Captura`, cheats_universalPolarityEverywhere: `Polaridad universal en todas partes`, diff --git a/static/webui/translations/fr.js b/static/webui/translations/fr.js index 9b3ee157..42480b1a 100644 --- a/static/webui/translations/fr.js +++ b/static/webui/translations/fr.js @@ -207,7 +207,6 @@ dict = { cheats_dontSubtractVoidTraces: `Ne pas consommer de Void Traces`, cheats_dontSubtractConsumables: `Ne pas retirer de consommables`, cheats_unlockAllShipFeatures: `Débloquer tous les segments du vaisseau`, - cheats_unlockAllFlavourItems: `Débloquer tous les Flavor Items`, cheats_unlockAllSkins: `Débloquer tous les skins`, cheats_unlockAllCapturaScenes: `Débloquer toutes les scènes captura`, cheats_universalPolarityEverywhere: `Polarités universelles partout`, diff --git a/static/webui/translations/ru.js b/static/webui/translations/ru.js index 34fc1150..3249bca6 100644 --- a/static/webui/translations/ru.js +++ b/static/webui/translations/ru.js @@ -207,7 +207,6 @@ dict = { cheats_dontSubtractVoidTraces: `Не вычитать количество Отголосков Бездны`, cheats_dontSubtractConsumables: `Не вычитать количество расходников`, cheats_unlockAllShipFeatures: `Разблокировать все функции корабля`, - cheats_unlockAllFlavourItems: `Разблокировать все уникальные предметы`, cheats_unlockAllSkins: `Разблокировать все скины`, cheats_unlockAllCapturaScenes: `Разблокировать все сцены Каптуры`, cheats_universalPolarityEverywhere: `Универсальная полярность везде`, diff --git a/static/webui/translations/uk.js b/static/webui/translations/uk.js index a4c4efbe..cbe8086b 100644 --- a/static/webui/translations/uk.js +++ b/static/webui/translations/uk.js @@ -207,7 +207,6 @@ dict = { cheats_dontSubtractVoidTraces: `Не вираховувати кількість Відлуння`, cheats_dontSubtractConsumables: `Не вираховувати кількість витратних матеріалів`, cheats_unlockAllShipFeatures: `Розблокувати всі функції судна`, - cheats_unlockAllFlavourItems: `Розблокувати всі унікальні предмети`, cheats_unlockAllSkins: `Розблокувати всі скіни`, cheats_unlockAllCapturaScenes: `Розблокувати всі сцени Світлописця`, cheats_universalPolarityEverywhere: `Будь-яка полярність скрізь`, diff --git a/static/webui/translations/zh.js b/static/webui/translations/zh.js index 468e2517..87e35451 100644 --- a/static/webui/translations/zh.js +++ b/static/webui/translations/zh.js @@ -207,7 +207,6 @@ dict = { cheats_dontSubtractVoidTraces: `虚空光体无消耗`, cheats_dontSubtractConsumables: `消耗物品使用时无损耗`, cheats_unlockAllShipFeatures: `解锁所有飞船功能`, - cheats_unlockAllFlavourItems: `解锁所有装饰物品`, cheats_unlockAllSkins: `解锁所有外观`, cheats_unlockAllCapturaScenes: `解锁所有Captura场景`, cheats_universalPolarityEverywhere: `全局万用极性`, -- 2.47.2