Repository navigation
fix(items): damage texts without a stray "of", and the Fruits' stat words - #828
Open
ezequielzacca wants to merge 265 commits into
Open
ezequielzacca wants to merge 265 commits into
ezequielzacca wants to merge 265 commits into
Conversation
This was referenced Oct 21, 2026
…ltip-context # Conflicts: # tests/data/CMakeLists.txt
…oltip-layouts # Conflicts: # src/Localization/Game.pl.resx
…ooltip-durability
…m-tooltip-shared-texts # Conflicts: # src/bin/Data/Items/Group13_Helper.json # src/bin/Data/Items/Group14_Potion.json
…em-tooltip-translations # Conflicts: # src/bin/Data/Items/Group13_Helper.json
The tooltip and tooltip-snapshot commands this branch adds were missing from the test's list, so the editor build's "Control protocol serves the documented command vocabulary" counted 36 commands against 34.
Main dropped the 38 "-J" items and renamed the elf (x,50) and Dark Lord lucky (x,66) sets, so the snapshot records 911 items and their new tooltips.
…ooltip-durability # Conflicts: # tests/data/item_tooltip_snapshot.txt # tests/data/test_item_tooltips.cpp
Main dropped the 38 "-J" items and renamed the elf (x,50) and Dark Lord lucky (x,66) sets, so the snapshot records 911 items and their new tooltips.
…m-tooltip-shared-texts
…em-tooltip-translations
A line break inside its text split the row in two and broke the commands table.
…ooltip-durability # Conflicts: # docs/control-socket.md
…m-tooltip-shared-texts
…ooltip-durability
…m-tooltip-shared-texts
…em-tooltip-translations
…em-tooltip-translations
Contributor
Author
|
Thanks. "The damage texts and the Fruits' stat words read right in every language" checks the rendered phrases:
The expected strings are written out in the test, so a later data change can't make it pass by changing both sides. |
3 tasks done
…or every language and the levels Three Polish Fruits texts were from before main corrected them (17fc723): Dowodzenie, "Można użyć po zdjęciu ekwipunku." and "Może być używany przez: Dark Lord". A test now compares the level lines whose texts other code still prints with the game's texts in every language, another that a line is only written at its levels. The levels note says the level variants' lines move into their items later.
…m-tooltip-chain-texts # Conflicts: # tests/data/test_item_database_files.cpp
…ooltip-durability # Conflicts: # docs/item-data.md
…ooltip-durability
…m-tooltip-shared-texts # Conflicts: # src/bin/Data/Items/Group13_Helper.json
…em-tooltip-translations
…ooltip-durability
…m-tooltip-shared-texts
…em-tooltip-translations
…tat words aren't the game's texts
The "i" of "%% increase" leaked into seven translations of "Damage +20% increase effect" ("iefecto", "infeito",
"inувеличение", ...). The level lines' test no longer compares the Fruits' stat words with the game's texts, which
keep the words this step corrects.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This step's own changes: compare with #827. The diff of this PR also holds every earlier step of #815, since a PR from a fork can only target this repository's branches.
Summary
A translation fix in the item tooltips, found in #827. Stacked on #827 (→ #825 → … → #813): only its own commits,
fix(items): damage texts without a stray "of", and the Fruits' stat wordsandfix(items): the Siege Potion's damage line without a stray "i"; …, are this PR. English is unchanged. Since #827, each of these texts lives in one place."Increase/Absorb …% of Damage"
The wings', capes' and pets' damage lines kept the English "of" in seven languages:
That fixes the two shared texts of #827. The Guardian Angel's, Imp's and Horn of Dinorant's lines say the same with a fixed number, and get the same wording. That includes the Imp's "Increase 30% of attacking & Wizardry Dmg", whose Portuguese ended in "de % of".
The Fruits' stat words
The
{stat}values of #827 came from a machine translation that went wrong in three ways:ESPENESTAVITPORENESTAVITBahasa InggrisENGMemerintahKepemimpinanАНГЛЭНЕСТАВЫНОИИЛВКСТРСИЛКомандаКомандованиеENGЕНЕSTAВИТAGIСПРВУЛСИЛКомандаКомандування英語能量史塔體力通用人工智慧敏捷STR力量命令統率RozkazDowodzenieUtosPamumunoGerman and Japanese were right.
The Siege Potion's damage line
The "i" of the old
%%text's "increase" leaked into seven translations of "Damage +20% increase effect" (found in #819's review). It's gone now:#819's test of the level lines compares them with the game's texts in every language; from here it leaves out the Fruits' stat words, which this step corrects while the game's texts keep the old ones (other code prints them).
Not changed
Polish and Tagalog name a few items in English inside a sentence: the "Talisman of Wings of …" texts, "Scroll of Guardian", "Cloak of Invisibility". Those items have no Polish or Tagalog name, so the game shows their names in English there anyway. The texts match that.
The Chinese Fruits shot shows the item name "命令 Fruits". That name comes from the item name code, which step 5d moves. It's fixed there.
Verified
tooltip-snapshotin Russian differs from feat(items): the descriptions' repeated texts are written once #827's in exactly 28 items: the wings and capes, Cape of Lord, Guardian Angel, Imp, Horn of Dinorant and the Fruits.Screenshots
Wing of Storm +15, Russian
Command Fruits +4, Russian and Chinese
The data (the two shared texts and the Fruits' levelValues, after)
{ "damageIncrease": { "en": "Increase {percent}% of Damage", "de": "Erhöht den Schaden um {percent}%", "es": "Aumenta el daño un {percent}%", "id": "Meningkatkan Kerusakan {percent}%", "ja": "ダメージ {percent}%増加", "pl": "Zwiększa obrażenia o {percent}%", "pt": "Aumenta o dano em {percent}%", "ru": "Увеличение урона на {percent}%", "tl": "Dagdagan ang Pinsala nang {percent}%", "uk": "Збільшення шкоди на {percent}%", "zh-TW": "增加 {percent}% 傷害" }, "damageAbsorb": { "en": "Absorb {percent}% of Damage", "de": "Absorbiert {percent}% des Schadens", "es": "Absorbe el {percent}% del daño", "id": "Menyerap {percent}% Kerusakan", "ja": "ダメージ {percent}%吸収", "pl": "Pochłania {percent}% obrażeń", "pt": "Absorve {percent}% do dano", "ru": "Поглощение {percent}% урона", "tl": "Isipsip ang {percent}% ng Pinsala", "uk": "Поглинання {percent}% шкоди", "zh-TW": "吸收{percent}%傷害" } } { "levelValues": { "stat": [ { "en": "ENG", "de": "ENG", "es": "ENE", "id": "ENG", "ja": "エナジー", "pl": "ENG", "pt": "ENE", "ru": "ЭНЕ", "tl": "ENG", "uk": "ЕНЕ", "zh-TW": "能量" }, { "en": "STA", "de": "VIT", "es": "VIT", "id": "STA", "ja": "体力", "pl": "STA", "pt": "VIT", "ru": "ВЫН", "tl": "STA", "uk": "ВИТ", "zh-TW": "體力" }, { "en": "AGI", "de": "BEW", "es": "AGI", "id": "AGI", "ja": "敏捷性", "pl": "AGI", "pt": "AGI", "ru": "ЛВК", "tl": "AGI", "uk": "СПР", "zh-TW": "敏捷" }, { "en": "STR", "de": "STÄ", "es": "FUE", "id": "STR", "ja": "力", "pl": "STR", "pt": "FOR", "ru": "СИЛ", "tl": "STR", "uk": "СИЛ", "zh-TW": "力量" }, { "en": "Command", "de": "Führung", "es": "Dominio", "id": "Kepemimpinan", "ja": "統率", "pl": "Dowodzenie", "pt": "Comando", "ru": "Командование", "tl": "Pamumuno", "uk": "Командування", "zh-TW": "統率" } ] } }Related issues
Part of #815, found in #827.
Checklist
docs/CODING_RULES.md.docs/build/README.md).tooltip-snapshotbefore and after, and the screenshots above in both themes.