From 66ef5c2b9f4379b532ca11da2ac5f70243622cb2 Mon Sep 17 00:00:00 2001 From: nyaoouo <64143453+nyaoouo@users.noreply.github.com> Date: Tue, 10 Jun 2025 01:09:56 +0800 Subject: [PATCH 1/4] add nightwave standing multiplier configuration --- src/services/configService.ts | 1 + src/services/inventoryService.ts | 15 ++++++++++----- static/webui/index.html | 4 ++++ 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/zh.js | 1 + 9 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/services/configService.ts b/src/services/configService.ts index dc8a78bc..701fbada 100644 --- a/src/services/configService.ts +++ b/src/services/configService.ts @@ -65,6 +65,7 @@ interface IConfig { vallisOverride?: string; nightwaveOverride?: string; }; + nightwaveStandingMultliplier?: number; } export const configPath = path.join(repoDir, "config.json"); diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts index 6060f1e9..e27501df 100644 --- a/src/services/inventoryService.ts +++ b/src/services/inventoryService.ts @@ -1772,13 +1772,18 @@ export const addChallenges = ( }) - 1 ]; } - affiliation.Standing += meta.standing!; - if (affiliationMods.length == 0) { - affiliationMods.push({ Tag: nightwaveSyndicateTag }); + let standingToAdd = meta.standing ?? 0; + if (standingToAdd >= 0) { + standingToAdd *= config.nightwaveStandingMultliplier ?? 1; + affiliation.Standing += standingToAdd; + + if (affiliationMods.length == 0) { + affiliationMods.push({ Tag: nightwaveSyndicateTag }); + } + affiliationMods[0].Standing ??= 0; + affiliationMods[0].Standing += standingToAdd; } - affiliationMods[0].Standing ??= 0; - affiliationMods[0].Standing += meta.standing!; } } } diff --git a/static/webui/index.html b/static/webui/index.html index 1b42793e..6ad7fb4a 100644 --- a/static/webui/index.html +++ b/static/webui/index.html @@ -722,6 +722,10 @@ +
+ + +
diff --git a/static/webui/translations/de.js b/static/webui/translations/de.js index eb721391..683a8001 100644 --- a/static/webui/translations/de.js +++ b/static/webui/translations/de.js @@ -163,6 +163,7 @@ dict = { cheats_noDojoResearchTime: `Keine Dojo-Forschungszeit`, cheats_fastClanAscension: `Schneller Clan-Aufstieg`, cheats_spoofMasteryRank: `Gefälschter Meisterschaftsrang (-1 zum deaktivieren)`, + cheats_nightwaveStandingMultliplier: `Nightwave-Ansehen-Multiplikator`, cheats_saveSettings: `Einstellungen speichern`, cheats_account: `Account`, cheats_unlockAllFocusSchools: `Alle Fokus-Schulen freischalten`, diff --git a/static/webui/translations/en.js b/static/webui/translations/en.js index cd718917..7f34351e 100644 --- a/static/webui/translations/en.js +++ b/static/webui/translations/en.js @@ -162,6 +162,7 @@ dict = { cheats_noDojoResearchTime: `No Dojo Research Time`, cheats_fastClanAscension: `Fast Clan Ascension`, cheats_spoofMasteryRank: `Spoofed Mastery Rank (-1 to disable)`, + cheats_nightwaveStandingMultliplier: `Nightwave Standing Multiplier`, cheats_saveSettings: `Save Settings`, cheats_account: `Account`, cheats_unlockAllFocusSchools: `Unlock All Focus Schools`, diff --git a/static/webui/translations/es.js b/static/webui/translations/es.js index 652a850c..bfe65958 100644 --- a/static/webui/translations/es.js +++ b/static/webui/translations/es.js @@ -163,6 +163,7 @@ dict = { cheats_noDojoResearchTime: `Sin tiempo de investigación del dojo`, cheats_fastClanAscension: `Ascenso rápido del clan`, cheats_spoofMasteryRank: `Rango de maestría simulado (-1 para desactivar)`, + cheats_nightwaveStandingMultliplier: `Multiplicador de reputación de Onda Nocturna`, cheats_saveSettings: `Guardar configuración`, cheats_account: `Cuenta`, cheats_unlockAllFocusSchools: `Desbloquear todas las escuelas de enfoque`, diff --git a/static/webui/translations/fr.js b/static/webui/translations/fr.js index 5a61111e..029dbbd0 100644 --- a/static/webui/translations/fr.js +++ b/static/webui/translations/fr.js @@ -163,6 +163,7 @@ dict = { cheats_noDojoResearchTime: `Aucun temps de recherche (Dojo)`, cheats_fastClanAscension: `Ascension de clan rapide`, cheats_spoofMasteryRank: `Rang de maîtrise personnalisé (-1 pour désactiver)`, + cheats_nightwaveStandingMultliplier: `Multiplicateur de standing Ondes Nocturnes`, cheats_saveSettings: `Sauvegarder les paramètres`, cheats_account: `Compte`, cheats_unlockAllFocusSchools: `Débloquer toutes les écoles de focus`, diff --git a/static/webui/translations/ru.js b/static/webui/translations/ru.js index 445c519a..909d536e 100644 --- a/static/webui/translations/ru.js +++ b/static/webui/translations/ru.js @@ -163,6 +163,7 @@ dict = { cheats_noDojoResearchTime: `Мгновенные Исследование Додзё`, cheats_fastClanAscension: `Мгновенное Вознесение Клана`, cheats_spoofMasteryRank: `Подделанный ранг мастерства (-1 для отключения)`, + cheats_nightwaveStandingMultliplier: `Множитель репутации Ночной Волны`, cheats_saveSettings: `Сохранить настройки`, cheats_account: `Аккаунт`, cheats_unlockAllFocusSchools: `Разблокировать все школы фокуса`, diff --git a/static/webui/translations/zh.js b/static/webui/translations/zh.js index d46ce77d..f37120a7 100644 --- a/static/webui/translations/zh.js +++ b/static/webui/translations/zh.js @@ -163,6 +163,7 @@ dict = { cheats_noDojoResearchTime: `无视道场研究时间`, cheats_fastClanAscension: `快速升级氏族`, cheats_spoofMasteryRank: `伪造精通段位(-1为禁用)`, + cheats_nightwaveStandingMultliplier: `午夜电波声望倍率`, cheats_saveSettings: `保存设置`, cheats_account: `账户`, cheats_unlockAllFocusSchools: `解锁所有专精学派`, -- 2.47.2 From 8895b5c9efddb9fc00434b461dc9c0c74b1ac7aa Mon Sep 17 00:00:00 2001 From: ny <64143453+nyaoouo@users.noreply.github.com> Date: Wed, 11 Jun 2025 12:14:29 +0800 Subject: [PATCH 2/4] Remove the machine-generated translations --- static/webui/translations/de.js | 2 +- static/webui/translations/es.js | 2 +- static/webui/translations/fr.js | 2 +- static/webui/translations/ru.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/static/webui/translations/de.js b/static/webui/translations/de.js index 683a8001..0d6ad5b1 100644 --- a/static/webui/translations/de.js +++ b/static/webui/translations/de.js @@ -163,7 +163,7 @@ dict = { cheats_noDojoResearchTime: `Keine Dojo-Forschungszeit`, cheats_fastClanAscension: `Schneller Clan-Aufstieg`, cheats_spoofMasteryRank: `Gefälschter Meisterschaftsrang (-1 zum deaktivieren)`, - cheats_nightwaveStandingMultliplier: `Nightwave-Ansehen-Multiplikator`, + cheats_nightwaveStandingMultliplier: `[UNTRANSLATED] Nightwave Standing Multiplier`, cheats_saveSettings: `Einstellungen speichern`, cheats_account: `Account`, cheats_unlockAllFocusSchools: `Alle Fokus-Schulen freischalten`, diff --git a/static/webui/translations/es.js b/static/webui/translations/es.js index bfe65958..f1e60bcf 100644 --- a/static/webui/translations/es.js +++ b/static/webui/translations/es.js @@ -163,7 +163,7 @@ dict = { cheats_noDojoResearchTime: `Sin tiempo de investigación del dojo`, cheats_fastClanAscension: `Ascenso rápido del clan`, cheats_spoofMasteryRank: `Rango de maestría simulado (-1 para desactivar)`, - cheats_nightwaveStandingMultliplier: `Multiplicador de reputación de Onda Nocturna`, + cheats_nightwaveStandingMultliplier: `[UNTRANSLATED] Nightwave Standing Multiplier`, cheats_saveSettings: `Guardar configuración`, cheats_account: `Cuenta`, cheats_unlockAllFocusSchools: `Desbloquear todas las escuelas de enfoque`, diff --git a/static/webui/translations/fr.js b/static/webui/translations/fr.js index 029dbbd0..61950fe7 100644 --- a/static/webui/translations/fr.js +++ b/static/webui/translations/fr.js @@ -163,7 +163,7 @@ dict = { cheats_noDojoResearchTime: `Aucun temps de recherche (Dojo)`, cheats_fastClanAscension: `Ascension de clan rapide`, cheats_spoofMasteryRank: `Rang de maîtrise personnalisé (-1 pour désactiver)`, - cheats_nightwaveStandingMultliplier: `Multiplicateur de standing Ondes Nocturnes`, + cheats_nightwaveStandingMultliplier: `[UNTRANSLATED] Nightwave Standing Multiplier`, cheats_saveSettings: `Sauvegarder les paramètres`, cheats_account: `Compte`, cheats_unlockAllFocusSchools: `Débloquer toutes les écoles de focus`, diff --git a/static/webui/translations/ru.js b/static/webui/translations/ru.js index 909d536e..fec98516 100644 --- a/static/webui/translations/ru.js +++ b/static/webui/translations/ru.js @@ -163,7 +163,7 @@ dict = { cheats_noDojoResearchTime: `Мгновенные Исследование Додзё`, cheats_fastClanAscension: `Мгновенное Вознесение Клана`, cheats_spoofMasteryRank: `Подделанный ранг мастерства (-1 для отключения)`, - cheats_nightwaveStandingMultliplier: `Множитель репутации Ночной Волны`, + cheats_nightwaveStandingMultliplier: `[UNTRANSLATED] Nightwave Standing Multiplier`, cheats_saveSettings: `Сохранить настройки`, cheats_account: `Аккаунт`, cheats_unlockAllFocusSchools: `Разблокировать все школы фокуса`, -- 2.47.2 From 4b75dbbadf07788422d2d81e78da0ac03db7aa5c Mon Sep 17 00:00:00 2001 From: nyaoouo <64143453+nyaoouo@users.noreply.github.com> Date: Wed, 11 Jun 2025 18:36:53 +0800 Subject: [PATCH 3/4] fix: correct spelling of nightwaveStandingMultiplier in config and translations --- src/services/configService.ts | 2 +- src/services/inventoryService.ts | 2 +- static/webui/index.html | 4 ++-- static/webui/translations/de.js | 2 +- static/webui/translations/en.js | 2 +- static/webui/translations/es.js | 2 +- static/webui/translations/fr.js | 2 +- static/webui/translations/ru.js | 2 +- static/webui/translations/zh.js | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/services/configService.ts b/src/services/configService.ts index 701fbada..1989330a 100644 --- a/src/services/configService.ts +++ b/src/services/configService.ts @@ -65,7 +65,7 @@ interface IConfig { vallisOverride?: string; nightwaveOverride?: string; }; - nightwaveStandingMultliplier?: number; + nightwaveStandingMultiplier?: number; } export const configPath = path.join(repoDir, "config.json"); diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts index e27501df..5ceb711a 100644 --- a/src/services/inventoryService.ts +++ b/src/services/inventoryService.ts @@ -1775,7 +1775,7 @@ export const addChallenges = ( let standingToAdd = meta.standing ?? 0; if (standingToAdd >= 0) { - standingToAdd *= config.nightwaveStandingMultliplier ?? 1; + standingToAdd *= config.nightwaveStandingMultiplier ?? 1; affiliation.Standing += standingToAdd; if (affiliationMods.length == 0) { diff --git a/static/webui/index.html b/static/webui/index.html index 6ad7fb4a..205b75a7 100644 --- a/static/webui/index.html +++ b/static/webui/index.html @@ -723,8 +723,8 @@
- - + +
diff --git a/static/webui/translations/de.js b/static/webui/translations/de.js index 0d6ad5b1..49f789fb 100644 --- a/static/webui/translations/de.js +++ b/static/webui/translations/de.js @@ -163,7 +163,7 @@ dict = { cheats_noDojoResearchTime: `Keine Dojo-Forschungszeit`, cheats_fastClanAscension: `Schneller Clan-Aufstieg`, cheats_spoofMasteryRank: `Gefälschter Meisterschaftsrang (-1 zum deaktivieren)`, - cheats_nightwaveStandingMultliplier: `[UNTRANSLATED] Nightwave Standing Multiplier`, + cheats_nightwaveStandingMultiplier: `[UNTRANSLATED] Nightwave Standing Multiplier`, cheats_saveSettings: `Einstellungen speichern`, cheats_account: `Account`, cheats_unlockAllFocusSchools: `Alle Fokus-Schulen freischalten`, diff --git a/static/webui/translations/en.js b/static/webui/translations/en.js index 7f34351e..6d2e6f6c 100644 --- a/static/webui/translations/en.js +++ b/static/webui/translations/en.js @@ -162,7 +162,7 @@ dict = { cheats_noDojoResearchTime: `No Dojo Research Time`, cheats_fastClanAscension: `Fast Clan Ascension`, cheats_spoofMasteryRank: `Spoofed Mastery Rank (-1 to disable)`, - cheats_nightwaveStandingMultliplier: `Nightwave Standing Multiplier`, + cheats_nightwaveStandingMultiplier: `Nightwave Standing Multiplier`, cheats_saveSettings: `Save Settings`, cheats_account: `Account`, cheats_unlockAllFocusSchools: `Unlock All Focus Schools`, diff --git a/static/webui/translations/es.js b/static/webui/translations/es.js index f1e60bcf..4c7bb9dd 100644 --- a/static/webui/translations/es.js +++ b/static/webui/translations/es.js @@ -163,7 +163,7 @@ dict = { cheats_noDojoResearchTime: `Sin tiempo de investigación del dojo`, cheats_fastClanAscension: `Ascenso rápido del clan`, cheats_spoofMasteryRank: `Rango de maestría simulado (-1 para desactivar)`, - cheats_nightwaveStandingMultliplier: `[UNTRANSLATED] Nightwave Standing Multiplier`, + cheats_nightwaveStandingMultiplier: `[UNTRANSLATED] Nightwave Standing Multiplier`, cheats_saveSettings: `Guardar configuración`, cheats_account: `Cuenta`, cheats_unlockAllFocusSchools: `Desbloquear todas las escuelas de enfoque`, diff --git a/static/webui/translations/fr.js b/static/webui/translations/fr.js index 61950fe7..4b18fe33 100644 --- a/static/webui/translations/fr.js +++ b/static/webui/translations/fr.js @@ -163,7 +163,7 @@ dict = { cheats_noDojoResearchTime: `Aucun temps de recherche (Dojo)`, cheats_fastClanAscension: `Ascension de clan rapide`, cheats_spoofMasteryRank: `Rang de maîtrise personnalisé (-1 pour désactiver)`, - cheats_nightwaveStandingMultliplier: `[UNTRANSLATED] Nightwave Standing Multiplier`, + cheats_nightwaveStandingMultiplier: `[UNTRANSLATED] Nightwave Standing Multiplier`, cheats_saveSettings: `Sauvegarder les paramètres`, cheats_account: `Compte`, cheats_unlockAllFocusSchools: `Débloquer toutes les écoles de focus`, diff --git a/static/webui/translations/ru.js b/static/webui/translations/ru.js index fec98516..7de0f876 100644 --- a/static/webui/translations/ru.js +++ b/static/webui/translations/ru.js @@ -163,7 +163,7 @@ dict = { cheats_noDojoResearchTime: `Мгновенные Исследование Додзё`, cheats_fastClanAscension: `Мгновенное Вознесение Клана`, cheats_spoofMasteryRank: `Подделанный ранг мастерства (-1 для отключения)`, - cheats_nightwaveStandingMultliplier: `[UNTRANSLATED] Nightwave Standing Multiplier`, + cheats_nightwaveStandingMultiplier: `[UNTRANSLATED] Nightwave Standing Multiplier`, cheats_saveSettings: `Сохранить настройки`, cheats_account: `Аккаунт`, cheats_unlockAllFocusSchools: `Разблокировать все школы фокуса`, diff --git a/static/webui/translations/zh.js b/static/webui/translations/zh.js index f37120a7..20e80b5b 100644 --- a/static/webui/translations/zh.js +++ b/static/webui/translations/zh.js @@ -163,7 +163,7 @@ dict = { cheats_noDojoResearchTime: `无视道场研究时间`, cheats_fastClanAscension: `快速升级氏族`, cheats_spoofMasteryRank: `伪造精通段位(-1为禁用)`, - cheats_nightwaveStandingMultliplier: `午夜电波声望倍率`, + cheats_nightwaveStandingMultiplier: `午夜电波声望倍率`, cheats_saveSettings: `保存设置`, cheats_account: `账户`, cheats_unlockAllFocusSchools: `解锁所有专精学派`, -- 2.47.2 From c41f1ff53e080e3be750dc8de1148f85fd631886 Mon Sep 17 00:00:00 2001 From: Sainan <63328889+Sainan@users.noreply.github.com> Date: Wed, 11 Jun 2025 14:28:54 +0200 Subject: [PATCH 4/4] diff reduction --- src/services/inventoryService.ts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts index 5ceb711a..fffafecf 100644 --- a/src/services/inventoryService.ts +++ b/src/services/inventoryService.ts @@ -1773,17 +1773,13 @@ export const addChallenges = ( ]; } - let standingToAdd = meta.standing ?? 0; - if (standingToAdd >= 0) { - standingToAdd *= config.nightwaveStandingMultiplier ?? 1; - affiliation.Standing += standingToAdd; - - if (affiliationMods.length == 0) { - affiliationMods.push({ Tag: nightwaveSyndicateTag }); - } - affiliationMods[0].Standing ??= 0; - affiliationMods[0].Standing += standingToAdd; + const standingToAdd = meta.standing! * (config.nightwaveStandingMultiplier ?? 1); + affiliation.Standing += standingToAdd; + if (affiliationMods.length == 0) { + affiliationMods.push({ Tag: nightwaveSyndicateTag }); } + affiliationMods[0].Standing ??= 0; + affiliationMods[0].Standing += standingToAdd; } } } -- 2.47.2