From 9f4582cb7dfad0d17d4c21314571dc76418c7777 Mon Sep 17 00:00:00 2001 From: kvan7 Date: Thu, 11 Sep 2025 16:31:49 -0500 Subject: [PATCH] [Bug]: DPS calc broken in chinese language Fixes #670 --- renderer/public/data/cmn-Hant/client_strings.js | 3 ++- renderer/public/data/de/client_strings.js | 4 ++-- renderer/public/data/en/client_strings.js | 6 ++++-- renderer/public/data/es/client_strings.js | 5 +++-- renderer/public/data/ja/client_strings.js | 3 ++- renderer/public/data/ko/client_strings.js | 3 ++- renderer/public/data/pt/client_strings.js | 5 +++-- renderer/public/data/ru/client_strings.js | 3 ++- renderer/src/assets/data/interfaces.ts | 1 + renderer/src/parser/Parser.ts | 10 +++++----- 10 files changed, 26 insertions(+), 17 deletions(-) diff --git a/renderer/public/data/cmn-Hant/client_strings.js b/renderer/public/data/cmn-Hant/client_strings.js index a5d28513..29ec6265 100644 --- a/renderer/public/data/cmn-Hant/client_strings.js +++ b/renderer/public/data/cmn-Hant/client_strings.js @@ -126,5 +126,6 @@ export default { GRANTS_SKILL: '賦予技能: ', RELOAD_SPEED: '重新裝填時間: ', FRACTURED_ITEM: '破裂之物', - SANCTIFIED: '聖化的' + SANCTIFIED: '聖化的', + HYPHEN: '到' } diff --git a/renderer/public/data/de/client_strings.js b/renderer/public/data/de/client_strings.js index a222d84a..0fc4c269 100644 --- a/renderer/public/data/de/client_strings.js +++ b/renderer/public/data/de/client_strings.js @@ -126,6 +126,6 @@ export default { GRANTS_SKILL: 'Gewährt Fertigkeit: ', RELOAD_SPEED: 'Nachladezeit: ', FRACTURED_ITEM: 'Brüchiger Gegenstand', - SANCTIFIED: 'Geheiligt' + SANCTIFIED: 'Geheiligt', + HYPHEN: '-' } - diff --git a/renderer/public/data/en/client_strings.js b/renderer/public/data/en/client_strings.js index 17ac7137..800cc6f0 100644 --- a/renderer/public/data/en/client_strings.js +++ b/renderer/public/data/en/client_strings.js @@ -1,7 +1,7 @@ // @ts-check /** @type{import('../../../src/assets/data/interfaces').TranslationDict} */ export default { - // ItemDisplayStringNormal + // ItemDisplayStringNormal RARITY_NORMAL: 'Normal', // ItemDisplayStringMagic RARITY_MAGIC: 'Magic', @@ -229,5 +229,7 @@ export default { // ItemPopupFracturedItem FRACTURED_ITEM: 'Fractured Item', // ItemPopupSanctified - SANCTIFIED: 'Sanctified' + SANCTIFIED: 'Sanctified', + // ItemDisplayWeaponDamageRange + HYPHEN: '-' } diff --git a/renderer/public/data/es/client_strings.js b/renderer/public/data/es/client_strings.js index 056e0d58..f62c0594 100644 --- a/renderer/public/data/es/client_strings.js +++ b/renderer/public/data/es/client_strings.js @@ -125,5 +125,6 @@ export default { GRANTS_SKILL: 'Otorga la habilidad: ', RELOAD_SPEED: 'Tiempo de recarga: ', FRACTURED_ITEM: 'Objeto fracturado', - SANCTIFIED: 'Santificado' -} \ No newline at end of file + SANCTIFIED: 'Santificado', + HYPHEN: '-' +} diff --git a/renderer/public/data/ja/client_strings.js b/renderer/public/data/ja/client_strings.js index f178c86b..7cd37690 100644 --- a/renderer/public/data/ja/client_strings.js +++ b/renderer/public/data/ja/client_strings.js @@ -126,5 +126,6 @@ export default { GRANTS_SKILL: 'スキルを付与: ', RELOAD_SPEED: '再装填時間: ', FRACTURED_ITEM: 'フラクチャーアイテム', - SANCTIFIED: '聖別化' + SANCTIFIED: '聖別化', + HYPHEN: '-' } diff --git a/renderer/public/data/ko/client_strings.js b/renderer/public/data/ko/client_strings.js index 3291ba43..86891804 100644 --- a/renderer/public/data/ko/client_strings.js +++ b/renderer/public/data/ko/client_strings.js @@ -126,5 +126,6 @@ export default { GRANTS_SKILL: '스킬 부여: ', RELOAD_SPEED: '재장전 시간: ', FRACTURED_ITEM: '분열된 아이템', - SANCTIFIED: '축성' + SANCTIFIED: '축성', + HYPHEN: '-' } diff --git a/renderer/public/data/pt/client_strings.js b/renderer/public/data/pt/client_strings.js index 4caa9e43..0b3d90e4 100644 --- a/renderer/public/data/pt/client_strings.js +++ b/renderer/public/data/pt/client_strings.js @@ -1,7 +1,7 @@ // @ts-check /** @type{import('../../../src/assets/data/interfaces').TranslationDict} */ export default { - // ItemDisplayStringNormal + // ItemDisplayStringNormal RARITY_NORMAL: 'Normal', // ItemDisplayStringMagic RARITY_MAGIC: 'Mágico', @@ -226,5 +226,6 @@ export default { GRANTS_SKILL: 'Concede Habilidade: ', RELOAD_SPEED: 'Tempo de Recarregamento: ', FRACTURED_ITEM: 'Item Fixado', - SANCTIFIED: 'Santificado' + SANCTIFIED: 'Santificado', + HYPHEN: '-' } diff --git a/renderer/public/data/ru/client_strings.js b/renderer/public/data/ru/client_strings.js index 10723578..4220fd5a 100644 --- a/renderer/public/data/ru/client_strings.js +++ b/renderer/public/data/ru/client_strings.js @@ -160,5 +160,6 @@ export default { GRANTS_SKILL: 'Дарует умение: ', RELOAD_SPEED: 'Время перезарядки: ', FRACTURED_ITEM: 'Расколотый предмет', - SANCTIFIED: 'Освящено' + SANCTIFIED: 'Освящено', + HYPHEN: '-' } diff --git a/renderer/src/assets/data/interfaces.ts b/renderer/src/assets/data/interfaces.ts index cee4d9ea..5ba56834 100644 --- a/renderer/src/assets/data/interfaces.ts +++ b/renderer/src/assets/data/interfaces.ts @@ -233,6 +233,7 @@ export interface TranslationDict { RELOAD_SPEED: string; FRACTURED_ITEM: string; SANCTIFIED: string; + HYPHEN: string; } export interface Filter { diff --git a/renderer/src/parser/Parser.ts b/renderer/src/parser/Parser.ts index 19a452cf..531a4372 100644 --- a/renderer/src/parser/Parser.ts +++ b/renderer/src/parser/Parser.ts @@ -747,7 +747,7 @@ function parseWeapon(section: string[], item: ParsedItem) { item.weaponPHYSICAL = getRollOrMinmaxAvg( line .slice(_$.PHYSICAL_DAMAGE.length) - .split("-") + .split(_$.HYPHEN) .map((str) => parseInt(str, 10)), ); isParsed = "SECTION_PARSED"; @@ -759,7 +759,7 @@ function parseWeapon(section: string[], item: ParsedItem) { .split(", ") .map((element) => getRollOrMinmaxAvg( - element.split("-").map((str) => parseInt(str, 10)), + element.split(_$.HYPHEN).map((str) => parseInt(str, 10)), ), ) .reduce((sum, x) => sum + x, 0); @@ -773,7 +773,7 @@ function parseWeapon(section: string[], item: ParsedItem) { .split(", ") .map((element) => getRollOrMinmaxAvg( - element.split("-").map((str) => parseInt(str, 10)), + element.split(_$.HYPHEN).map((str) => parseInt(str, 10)), ), ) .reduce((sum, x) => sum + x, 0); @@ -791,7 +791,7 @@ function parseWeapon(section: string[], item: ParsedItem) { .split(", ") .map((element) => getRollOrMinmaxAvg( - element.split("-").map((str) => parseInt(str, 10)), + element.split(_$.HYPHEN).map((str) => parseInt(str, 10)), ), ) .reduce((sum, x) => sum + x, 0); @@ -809,7 +809,7 @@ function parseWeapon(section: string[], item: ParsedItem) { .split(", ") .map((element) => getRollOrMinmaxAvg( - element.split("-").map((str) => parseInt(str, 10)), + element.split(_$.HYPHEN).map((str) => parseInt(str, 10)), ), ) .reduce((sum, x) => sum + x, 0);