phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-22 23:30:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: support /use macros for action bar icon and indicators

Browse source 
Macros with /use ItemName (e.g. /use Healthstone, /use Engineering
trinket) had no icon, cooldown, or tooltip on the action bar because
only /cast and /castsequence were recognized. Now the spell resolution
also handles /use by looking up the item name in the item info cache
and finding its on-use spell ID. Added getItemInfoCache() accessor.
This commit is contained in:
Kelsi 2026-03-20 09:08:49 -07:00
parent b960a1cdd5
commit 6bd950e817
2 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/ui/game_screen.cpp
View file

@ -8660,7 +8660,8 @@ uint32_t GameScreen::resolveMacroPrimarySpellId(uint32_t macroId, game::GameHand
for (char& c : cl) c = static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
bool isCast = (cl.rfind("/cast ", 0) == 0);
bool isCastSeq = (cl.rfind("/castsequence ", 0) == 0);
if (!isCast && !isCastSeq) continue;
bool isUse = (cl.rfind("/use ", 0) == 0);
if (!isCast && !isCastSeq && !isUse) continue;
size_t sp2 = cmdLine.find(' ');
if (sp2 == std::string::npos) continue;
std::string spellArg = cmdLine.substr(sp2 + 1);
@ -8688,10 +8689,26 @@ uint32_t GameScreen::resolveMacroPrimarySpellId(uint32_t macroId, game::GameHand
if (spellArg.empty()) continue;
std::string spLow = spellArg;
for (char& c : spLow) c = static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
for (uint32_t sid : gameHandler.getKnownSpells()) {
std::string sn = gameHandler.getSpellName(sid);
for (char& c : sn) c = static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
if (sn == spLow) { result = sid; break; }
if (isUse) {
// /use resolves an item name → find the item's on-use spell ID
for (const auto& [entry, info] : gameHandler.getItemInfoCache()) {
if (!info.valid) continue;
std::string iName = info.name;
for (char& c : iName) c = static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
if (iName == spLow) {
for (const auto& sp : info.spells) {
if (sp.spellId != 0 && sp.spellTrigger == 0) { result = sp.spellId; break; }
}
break;
}
}
} else {
// /cast and /castsequence resolve a spell name
for (uint32_t sid : gameHandler.getKnownSpells()) {
std::string sn = gameHandler.getSpellName(sid);
for (char& c : sn) c = static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
if (sn == spLow) { result = sid; break; }
}
}
break;
}
@ -8875,7 +8892,8 @@ void GameScreen::renderActionBar(game::GameHandler& gameHandler) {
for (char& c : cl) c = static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
bool isCastCmd = (cl.rfind("/cast ", 0) == 0 || cl == "/cast");
bool isCastSeqCmd = (cl.rfind("/castsequence ", 0) == 0);
if (!isCastCmd && !isCastSeqCmd) continue;
bool isUseCmd = (cl.rfind("/use ", 0) == 0);
if (!isCastCmd && !isCastSeqCmd && !isUseCmd) continue;
size_t sp2 = cmdLine.find(' ');
if (sp2 == std::string::npos) continue;
showArg = cmdLine.substr(sp2 + 1);