Repository navigation
feat(items): every item name comes from the item data (#815 step 5d-2) - #834
Open
ezequielzacca wants to merge 436 commits into
Open
ezequielzacca wants to merge 436 commits into
ezequielzacca wants to merge 436 commits into
Conversation
ezequielzacca
force-pushed
the
feat/item-names-from-data
branch
from
October 22, 2026 00:47
3ee3a1b to
feb93df
Compare
11 tasks
ezequielzacca
force-pushed
the
feat/item-names-from-data
branch
from
October 22, 2026 00:53
feb93df to
949b87a
Compare
This was referenced Oct 22, 2026
…em-tooltip-chain-values # Conflicts: # docs/item-data.md # src/source/Data/GameData/ItemData/ItemDataValidation.cpp # src/source/Data/GameData/ItemData/ItemDescriptionPlaceholders.h # src/source/Data/GameData/ItemData/ItemJsonFormat.cpp # src/source/Engine/Object/ZzzInventory.cpp
…tem-tooltip-third-chain # Conflicts: # docs/item-data.md
…em-tooltip-names # Conflicts: # docs/item-data.md # src/source/Data/GameData/ItemData/ItemDataValidation.cpp # src/source/Data/GameData/ItemData/ItemDescriptionPlaceholders.h # src/source/Data/GameData/ItemData/ItemJsonFormat.cpp
…es-from-data # Conflicts: # docs/item-data.md
…ip-values-to-data # Conflicts: # tests/data/test_item_description_placeholders.cpp
… names its tier's tables The unused-table warning moves out of the placeholder check into ValidateTableUses, run where that check is (Load, Save Items, bmd import). It also warns about a wing whose description names other tables than most of the other wings of its tier, cape tag and group: the tooltip code chose the wings' damage and absorption lines by the tier, so a new wing without them, or a re-tiered wing that keeps its old tier's tables, is pointed out.
…t are the game's "Zwiększa prędkość" as the game's "Increase speed" text has it, and the Imp's Portuguese text without its broken "de % of".
…he gate's lines are formatted
…/item-description-levels
…m-tooltip-chain-texts
…ooltip-values # Conflicts: # src/source/Data/GameData/ItemData/ItemDescriptionPlaceholders.h # tests/data/test_item_description_placeholders.cpp
…oltip-layouts # Conflicts: # src/source/Data/GameData/ItemData/ItemDataValidation.h
…ooltip-durability # Conflicts: # src/source/Data/DataHandler/ItemData/ItemDataHandler.cpp # src/source/Data/GameData/ItemData/ItemDataValidation.h # tests/data/test_item_database_files.cpp
…m-tooltip-shared-texts # Conflicts: # src/bin/Data/Items/Group12_Wing.json # src/source/Data/DataHandler/ItemData/ItemDataHandler.cpp # src/source/Data/GameData/ItemData/ItemDataValidation.cpp # src/source/Data/GameData/ItemData/ItemDataValidation.h # tests/data/test_item_database_files.cpp # tests/data/test_item_description_placeholders.cpp
sven-n
reviewed
Oct 23, 2026
sven-n
left a comment
Owner
There was a problem hiding this comment.
Reviewed the migration of GetItemName and other name consumers to data-backed name lines. No independently actionable defect identified in the inspected code. A particularly important compatibility check is that item names used by quests, mixes, server messages and ground labels remain correct at every item level, not just in the tooltip; please retain those cross-consumer tests. Build not run.
Reviewed with AGENTS.md and docs/CODING_RULES.md as the quality baseline.
…em-tooltip-translations # Conflicts: # src/bin/Data/Items/Group13_Helper.json
…em-tooltip-chain-values # Conflicts: # tests/data/test_item_description_placeholders.cpp
…ooltip-durability
…m-tooltip-shared-texts # Conflicts: # src/bin/Data/Items/Group13_Helper.json
…em-tooltip-translations
…em-tooltip-chain-values
…tem-tooltip-third-chain
…ooltip-durability
…m-tooltip-shared-texts
…em-tooltip-translations
…tem-tooltip-third-chain
…em-tooltip-chain-values
…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.
…em-tooltip-chain-values
…tem-tooltip-third-chain
3 tasks done
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 #833. 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
Step 5d-2 of #815 (data-driven item tooltips; design). Stacked on #833 (→ #830 → … → #813): only the last commit,
feat(items): every item name comes from the item data, is this step.#833 moved the tooltip's item name into the items'
nameLines. Three more copies of the same name chain remained inZzzInventory.cpp, and now each of them reads the name lines too:GetItemName(), used by the mix and quest windows, the server's messages and the control socket. It now callsGetItemNameText(type, level, item), which gives the text of the first name line that holds; without one, it gives the item's name with " +level" above +0. When only the type and level are known, a line's condition on the item's durability or options reads 0, so a Horn of Fenrir is plain "Horn of Fenrir".Removed: the Korean event prize table (
ChaosEventName), the Transformation Ring's monster table (SommonTable), and 12 .resx texts only these chains printed. Texts that a dynamic lookup can still reach stay:Lookup(30 + iMap);Lookup(710/725 + …);Names that change
Only levels that exist on the server are listed (its item definitions' maximum levels). At other levels the old chains also differed, but no such item exists.
Every other tooltip is unchanged for both heroes, in the test and in the game's
tooltip-snapshot. A local comparison of the oldGetItemName()andGetItemNameText(), for every item at levels 0 to 15, gave the differences above.Screenshots
Before (#833) and after this PR.
Bundle of Jewel of Bless (level 1, 20 jewels)
The tooltip named the bundle after the jewel; it now uses the bundle's own name, as the windows and messages do.
The item's name lines (English only)
{ "number": 30, "name": "Bundle of Jewel of Bless", "nameLines": [ { "text": "{name} +{levelPlusOne}", "color": "yellow" } ] }Lost Map +0
The tooltip said "Lost Map +0"; it now names it as the windows did.
The item's name lines (English only)
{ "number": 28, "name": "Lost Map", "nameLines": [ { "text": "{name}", "color": "yellow", "levels": [0, 0] }, { "text": "{name} +{level}", "color": "yellow" } ] }Symbol of Kundun +3
The tooltip said "Kundun mark +3 level"; it now uses the name the windows and the ground labels used.
The item's name lines (English only)
{ "number": 29, "name": "Symbol of Kundun", "nameLines": [ { "text": "{name}", "levels": [0, 0] }, { "text": "{name} +{level}" } ] }The repair window has no screenshot: none of the test characters' repairable items changes its name.
Related issues
Step 5d-2 of #815. Builds on #833, #830, #829, #828, #827, #825, #824, #823, #822, #821, #820, #819, #818, #817, #816 and #813.
Checklist
docs/CODING_RULES.md.docs/build/README.md).tooltip-snapshotof two heroes before and after, and the screenshots above, in both themes for the tooltips.