From 344e37db01baf10e52d1c74240bbfc9985f29630 Mon Sep 17 00:00:00 2001 From: AMelonInsideLemon <166175391+AMelonInsideLemon@users.noreply.github.com> Date: Tue, 12 Aug 2025 18:41:15 +0200 Subject: [PATCH] data-loc-year --- src/services/worldStateService.ts | 25 ++++++++++++++++--------- static/webui/index.html | 20 ++++++++++---------- static/webui/script.js | 3 +++ static/webui/translations/de.js | 10 ++-------- static/webui/translations/en.js | 10 ++-------- static/webui/translations/es.js | 10 ++-------- static/webui/translations/fr.js | 10 ++-------- static/webui/translations/ru.js | 10 ++-------- static/webui/translations/uk.js | 10 ++-------- static/webui/translations/zh.js | 10 ++-------- 10 files changed, 43 insertions(+), 75 deletions(-) diff --git a/src/services/worldStateService.ts b/src/services/worldStateService.ts index e15b3f2d..9520fe54 100644 --- a/src/services/worldStateService.ts +++ b/src/services/worldStateService.ts @@ -1403,7 +1403,14 @@ export const getWorldState = (buildLabel?: string): IWorldState => { KnownCalendarSeasons: [], ...staticWorldState, SyndicateMissions: [...staticWorldState.SyndicateMissions], - InGameMarket: staticWorldState.InGameMarket + InGameMarket: { + LandingPage: { + Categories: staticWorldState.InGameMarket.LandingPage.Categories.map(c => ({ + ...c, + Items: [...c.Items] + })) + } + } }; // Old versions seem to really get hung up on not being able to load these. @@ -1528,7 +1535,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => { Personal: true, Bounty: true, ClampNodeScores: true, - Node: "EventNode28", // Incompateble with Wolf Hunt (2025) + Node: "EventNode28", // Incompatible with Wolf Hunt (2025) MissionKeyName: "/Lotus/Types/Keys/GalleonRobberyAlertB", Desc: "/Lotus/Language/Events/GalleonRobberyEventMissionTitle", Icon: "/Lotus/Interface/Icons/Player/GalleonRobberiesEvent.png", @@ -1806,14 +1813,14 @@ export const getWorldState = (buildLabel?: string): IWorldState => { Personal: true, Bounty: true, ClampNodeScores: true, - Node: "EventNode25", // Incompateble with Hallowed Flame, Hallowed Nightmares + Node: "EventNode25", // Incompatible with Hallowed Flame, Hallowed Nightmares ConcurrentMissionKeyNames: [ "/Lotus/Types/Keys/TacAlertKeyWaterFightB", "/Lotus/Types/Keys/TacAlertKeyWaterFightC", "/Lotus/Types/Keys/TacAlertKeyWaterFightD" ], ConcurrentNodeReqs: [25, 50, 100], - ConcurrentNodes: ["EventNode24", "EventNode34", "EventNode35"], // Incompateble with Hallowed Flame, Hallowed Nightmares + ConcurrentNodes: ["EventNode24", "EventNode34", "EventNode35"], // Incompatible with Hallowed Flame, Hallowed Nightmares MissionKeyName: "/Lotus/Types/Keys/TacAlertKeyWaterFightA", Faction: "FC_CORPUS", Desc: "/Lotus/Language/Alerts/TacAlertWaterFight", @@ -1951,7 +1958,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => { "/Lotus/Types/Keys/WolfTacAlertReduxD" ], ConcurrentNodeReqs: [1, 2, 3], - ConcurrentNodes: ["EventNode28", "EventNode39", "EventNode40"], // Incompateble with Galleon Of Ghouls + ConcurrentNodes: ["EventNode28", "EventNode39", "EventNode40"], // Incompatible with Galleon Of Ghouls MissionKeyName: "/Lotus/Types/Keys/WolfTacAlertReduxA", Faction: "FC_GRINEER", Desc: "/Lotus/Language/Alerts/WolfAlert", @@ -1995,13 +2002,13 @@ export const getWorldState = (buildLabel?: string): IWorldState => { Personal: true, Bounty: true, ClampNodeScores: true, - Node: "EventNode24", // Incompateble with Hallowed Nightmares, Dog Days + Node: "EventNode24", // Incompatible with Hallowed Nightmares, Dog Days ConcurrentMissionKeyNames: [ "/Lotus/Types/Keys/LanternEndlessEventKeyB", "/Lotus/Types/Keys/LanternEndlessEventKeyC" ], ConcurrentNodeReqs: [1, 2], - ConcurrentNodes: ["EventNode25", "EventNode34"], // Incompateble with Hallowed Nightmares, Dog Days + ConcurrentNodes: ["EventNode25", "EventNode34"], // Incompatible with Hallowed Nightmares, Dog Days MissionKeyName: "/Lotus/Types/Keys/LanternEndlessEventKeyA", Faction: "FC_INFESTATION", Desc: "/Lotus/Language/Events/TacAlertHalloweenLantern", @@ -2106,7 +2113,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => { MissionKeyName: "/Lotus/Types/Keys/TacAlertKeyHalloween", ConcurrentMissionKeyNames: ["/Lotus/Types/Keys/TacAlertKeyHalloweenBonus"], ConcurrentNodeReqs: [1], - ConcurrentNodes: ["EventNode24"], // Incompateble with Hallowed Flame, Dog Days + ConcurrentNodes: ["EventNode24"], // Incompatible with Hallowed Flame, Dog Days InterimRewards: [rewards[year][0]], Reward: rewards[year][1] }); @@ -2128,7 +2135,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => { ToolTip: "/Lotus/Language/G1Quests/TacAlertHalloweenToolTip", Icon: "/Lotus/Interface/Icons/JackOLanternColour.png", ClampNodeScores: true, - Node: "EventNode25", // Incompateble with Hallowed Flame, Dog Days + Node: "EventNode25", // Incompatible with Hallowed Flame, Dog Days MissionKeyName: "/Lotus/Types/Keys/TacAlertKeyHalloweenTimeAttack", ScoreVar: "TimeAttackScore", ScoreMaxTag: "Halloween16", diff --git a/static/webui/index.html b/static/webui/index.html index cb79c719..6506950d 100644 --- a/static/webui/index.html +++ b/static/webui/index.html @@ -963,9 +963,9 @@
@@ -980,8 +980,8 @@
@@ -1031,12 +1031,12 @@
- - - - - + + + +
diff --git a/static/webui/script.js b/static/webui/script.js index 0797f65d..e0162266 100644 --- a/static/webui/script.js +++ b/static/webui/script.js @@ -210,6 +210,9 @@ function updateLocElements() { .join(", "); elm.title = `${loc("worldState_incompatibleWith")}: ${incWith}`; }); + document.querySelectorAll("[data-loc-year]").forEach(elm => { + elm.innerHTML = elm.innerHTML.replace("|YEAR|", elm.getAttribute("data-loc-year")); + }); } function setActiveLanguage(lang) { diff --git a/static/webui/translations/de.js b/static/webui/translations/de.js index 126d7dd2..014643f7 100644 --- a/static/webui/translations/de.js +++ b/static/webui/translations/de.js @@ -257,14 +257,8 @@ dict = { worldState_hallowedNightmaresRewards: `[UNTRANSLATED] Hallowed Nightmares Rewards`, worldState_proxyRebellion: `Proxy-Rebellion`, worldState_proxyRebellionRewards: `[UNTRANSLATED] Proxy Rebellion Rewards`, - worldState_from_2025: `[UNTRANSLATED] from 2025`, - worldState_from_2024: `[UNTRANSLATED] from 2024`, - worldState_from_2023: `[UNTRANSLATED] from 2023`, - worldState_pre_2023: `[UNTRANSLATED] pre 2023`, - worldState_from_2019: `[UNTRANSLATED] from 2019`, - worldState_from_2018: `[UNTRANSLATED] from 2018`, - worldState_from_2016: `[UNTRANSLATED] from 2016`, - worldState_from_2015: `[UNTRANSLATED] from 2015`, + worldState_from_year: `[UNTRANSLATED] from |YEAR|`, + worldState_pre_year: `[UNTRANSLATED] pre |YEAR|`, worldState_note: `[UNTRANSLATED] Note`, worldState_incompatibleWith: `[UNTRANSLATED] Incompatible with:`, enabled: `Aktiviert`, diff --git a/static/webui/translations/en.js b/static/webui/translations/en.js index 1c2f00ec..6a5d2086 100644 --- a/static/webui/translations/en.js +++ b/static/webui/translations/en.js @@ -256,14 +256,8 @@ dict = { worldState_hallowedNightmaresRewards: `Hallowed Nightmares Rewards`, worldState_proxyRebellion: `Proxy Rebellion`, worldState_proxyRebellionRewards: `Proxy Rebellion Rewards`, - worldState_from_2025: `from 2025`, - worldState_from_2024: `from 2024`, - worldState_from_2023: `from 2023`, - worldState_pre_2023: `pre 2023`, - worldState_from_2019: `from 2019`, - worldState_from_2018: `from 2018`, - worldState_from_2016: `from 2016`, - worldState_from_2015: `from 2015`, + worldState_from_year: `from |YEAR|`, + worldState_pre_year: `pre |YEAR|`, worldState_note: `Note`, worldState_incompatibleWith: `Incompatible with:`, enabled: `Enabled`, diff --git a/static/webui/translations/es.js b/static/webui/translations/es.js index df8019c0..09930a93 100644 --- a/static/webui/translations/es.js +++ b/static/webui/translations/es.js @@ -257,14 +257,8 @@ dict = { worldState_hallowedNightmaresRewards: `[UNTRANSLATED] Hallowed Nightmares Rewards`, worldState_proxyRebellion: `Rebelión Proxy`, worldState_proxyRebellionRewards: `[UNTRANSLATED] Proxy Rebellion Rewards`, - worldState_from_2025: `[UNTRANSLATED] from 2025`, - worldState_from_2024: `[UNTRANSLATED] from 2024`, - worldState_from_2023: `[UNTRANSLATED] from 2023`, - worldState_pre_2023: `[UNTRANSLATED] pre 2023`, - worldState_from_2019: `[UNTRANSLATED] from 2019`, - worldState_from_2018: `[UNTRANSLATED] from 2018`, - worldState_from_2016: `[UNTRANSLATED] from 2016`, - worldState_from_2015: `[UNTRANSLATED] from 2015`, + worldState_from_year: `[UNTRANSLATED] from |YEAR|`, + worldState_pre_year: `[UNTRANSLATED] pre |YEAR|`, worldState_note: `[UNTRANSLATED] Note`, worldState_incompatibleWith: `[UNTRANSLATED] Incompatible with:`, enabled: `Activado`, diff --git a/static/webui/translations/fr.js b/static/webui/translations/fr.js index 709887d6..ee020125 100644 --- a/static/webui/translations/fr.js +++ b/static/webui/translations/fr.js @@ -257,14 +257,8 @@ dict = { worldState_hallowedNightmaresRewards: `[UNTRANSLATED] Hallowed Nightmares Rewards`, worldState_proxyRebellion: `Rébellion Proxy`, worldState_proxyRebellionRewards: `[UNTRANSLATED] Proxy Rebellion Rewards`, - worldState_from_2025: `[UNTRANSLATED] from 2025`, - worldState_from_2024: `[UNTRANSLATED] from 2024`, - worldState_from_2023: `[UNTRANSLATED] from 2023`, - worldState_pre_2023: `[UNTRANSLATED] pre 2023`, - worldState_from_2019: `[UNTRANSLATED] from 2019`, - worldState_from_2018: `[UNTRANSLATED] from 2018`, - worldState_from_2016: `[UNTRANSLATED] from 2016`, - worldState_from_2015: `[UNTRANSLATED] from 2015`, + worldState_from_year: `[UNTRANSLATED] from |YEAR|`, + worldState_pre_year: `[UNTRANSLATED] pre |YEAR|`, worldState_note: `[UNTRANSLATED] Note`, worldState_incompatibleWith: `[UNTRANSLATED] Incompatible with:`, enabled: `Activé`, diff --git a/static/webui/translations/ru.js b/static/webui/translations/ru.js index 895c945b..de8d72b5 100644 --- a/static/webui/translations/ru.js +++ b/static/webui/translations/ru.js @@ -257,14 +257,8 @@ dict = { worldState_hallowedNightmaresRewards: `Награды Священных Кошмаров`, worldState_proxyRebellion: `Восстание Роботов`, worldState_proxyRebellionRewards: `Награды Восстания Роботов`, - worldState_from_2025: `из 2025`, - worldState_from_2024: `из 2024`, - worldState_from_2023: `из 2023`, - worldState_pre_2023: `до 2023`, - worldState_from_2019: `из 2019`, - worldState_from_2018: `из 2018`, - worldState_from_2016: `из 2016`, - worldState_from_2015: `из 2015`, + worldState_from_year: `из |YEAR|`, + worldState_pre_year: `до |YEAR|`, worldState_note: `Примичание`, worldState_incompatibleWith: `Несовместимо с:`, enabled: `Включено`, diff --git a/static/webui/translations/uk.js b/static/webui/translations/uk.js index 9bf38e28..9d38245a 100644 --- a/static/webui/translations/uk.js +++ b/static/webui/translations/uk.js @@ -257,14 +257,8 @@ dict = { worldState_hallowedNightmaresRewards: `[UNTRANSLATED] Hallowed Nightmares Rewards`, worldState_proxyRebellion: `Повстання роботів`, worldState_proxyRebellionRewards: `[UNTRANSLATED] Proxy Rebellion Rewards`, - worldState_from_2025: `[UNTRANSLATED] from 2025`, - worldState_from_2024: `[UNTRANSLATED] from 2024`, - worldState_from_2023: `[UNTRANSLATED] from 2023`, - worldState_pre_2023: `[UNTRANSLATED] pre 2023`, - worldState_from_2019: `[UNTRANSLATED] from 2019`, - worldState_from_2018: `[UNTRANSLATED] from 2018`, - worldState_from_2016: `[UNTRANSLATED] from 2016`, - worldState_from_2015: `[UNTRANSLATED] from 2015`, + worldState_from_year: `[UNTRANSLATED] from |YEAR|`, + worldState_pre_year: `[UNTRANSLATED] pre |YEAR|`, worldState_note: `[UNTRANSLATED] Note`, worldState_incompatibleWith: `[UNTRANSLATED] Incompatible with:`, enabled: `Увімкнено`, diff --git a/static/webui/translations/zh.js b/static/webui/translations/zh.js index 11bbe3aa..5ffb3ba6 100644 --- a/static/webui/translations/zh.js +++ b/static/webui/translations/zh.js @@ -257,14 +257,8 @@ dict = { worldState_hallowedNightmaresRewards: `[UNTRANSLATED] Hallowed Nightmares Rewards`, worldState_proxyRebellion: `机械叛乱`, worldState_proxyRebellionRewards: `[UNTRANSLATED] Proxy Rebellion Rewards`, - worldState_from_2025: `[UNTRANSLATED] from 2025`, - worldState_from_2024: `[UNTRANSLATED] from 2024`, - worldState_from_2023: `[UNTRANSLATED] from 2023`, - worldState_pre_2023: `[UNTRANSLATED] pre 2023`, - worldState_from_2019: `[UNTRANSLATED] from 2019`, - worldState_from_2018: `[UNTRANSLATED] from 2018`, - worldState_from_2016: `[UNTRANSLATED] from 2016`, - worldState_from_2015: `[UNTRANSLATED] from 2015`, + worldState_from_year: `[UNTRANSLATED] from |YEAR|`, + worldState_pre_year: `[UNTRANSLATED] pre |YEAR|`, worldState_note: `[UNTRANSLATED] Note`, worldState_incompatibleWith: `[UNTRANSLATED] Incompatible with:`, enabled: `启用`,