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

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

Browse source 
Macros with /castsequence were treated as having no primary spell, so
they showed no icon, cooldown, range, power, or tooltip on the action
bar. Now both resolveMacroPrimarySpellId() and the icon derivation
code recognize /castsequence commands, strip the reset= spec, and
use comma-separation to find the first spell in the sequence. This
gives /castsequence macros the same visual indicators as /cast macros.
This commit is contained in:
Kelsi 2026-03-20 08:43:19 -07:00
parent a5609659c7
commit 87e1ac7cdd
1 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/ui/game_screen.cpp
View file

@ -8652,15 +8652,28 @@ uint32_t GameScreen::resolveMacroPrimarySpellId(uint32_t macroId, game::GameHand
for (const auto& cmdLine : allMacroCommands(macroText)) {
std::string cl = cmdLine;
for (char& c : cl) c = static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
if (cl.rfind("/cast ", 0) != 0) continue;
bool isCast = (cl.rfind("/cast ", 0) == 0);
bool isCastSeq = (cl.rfind("/castsequence ", 0) == 0);
if (!isCast && !isCastSeq) continue;
size_t sp2 = cmdLine.find(' ');
if (sp2 == std::string::npos) continue;
std::string spellArg = cmdLine.substr(sp2 + 1);
// Strip conditionals [...]
if (!spellArg.empty() && spellArg.front() == '[') {
size_t ce = spellArg.find(']');
if (ce != std::string::npos) spellArg = spellArg.substr(ce + 1);
}
size_t semi = spellArg.find(';');
// Strip reset= spec for castsequence
if (isCastSeq) {
std::string tmp = spellArg;
while (!tmp.empty() && tmp.front() == ' ') tmp.erase(tmp.begin());
if (tmp.rfind("reset=", 0) == 0) {
size_t spAfter = tmp.find(' ');
if (spAfter != std::string::npos) spellArg = tmp.substr(spAfter + 1);
}
}
// Take first alternative before ';' (for /cast) or first spell before ',' (for /castsequence)
size_t semi = spellArg.find(isCastSeq ? ',' : ';');
if (semi != std::string::npos) spellArg = spellArg.substr(0, semi);
size_t ss = spellArg.find_first_not_of(" \t!");
if (ss != std::string::npos) spellArg = spellArg.substr(ss);
@ -8849,12 +8862,14 @@ void GameScreen::renderActionBar(game::GameHandler& gameHandler) {
if (!macroText.empty()) {
std::string showArg = getMacroShowtooltipArg(macroText);
if (showArg.empty() || showArg == "__auto__") {
// No explicit #showtooltip arg — derive spell from first /cast line
// No explicit #showtooltip arg — derive spell from first /cast or /castsequence line
for (const auto& cmdLine : allMacroCommands(macroText)) {
if (cmdLine.size() < 6) continue;
std::string cl = cmdLine;
for (char& c : cl) c = static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
if (cl.rfind("/cast ", 0) != 0 && cl != "/cast") continue;
bool isCastCmd = (cl.rfind("/cast ", 0) == 0 || cl == "/cast");
bool isCastSeqCmd = (cl.rfind("/castsequence ", 0) == 0);
if (!isCastCmd && !isCastSeqCmd) continue;
size_t sp2 = cmdLine.find(' ');
if (sp2 == std::string::npos) continue;
showArg = cmdLine.substr(sp2 + 1);
@ -8863,9 +8878,18 @@ void GameScreen::renderActionBar(game::GameHandler& gameHandler) {
size_t ce = showArg.find(']');
if (ce != std::string::npos) showArg = showArg.substr(ce + 1);
}
// Take first alternative before ';'
size_t semi = showArg.find(';');
if (semi != std::string::npos) showArg = showArg.substr(0, semi);
// Strip reset= spec for castsequence
if (isCastSeqCmd) {
std::string tmp = showArg;
while (!tmp.empty() && tmp.front() == ' ') tmp.erase(tmp.begin());
if (tmp.rfind("reset=", 0) == 0) {
size_t spA = tmp.find(' ');
if (spA != std::string::npos) showArg = tmp.substr(spA + 1);
}
}
// First alternative: ';' for /cast, ',' for /castsequence
size_t sep = showArg.find(isCastSeqCmd ? ',' : ';');
if (sep != std::string::npos) showArg = showArg.substr(0, sep);
// Trim and strip '!'
size_t ss = showArg.find_first_not_of(" \t!");
if (ss != std::string::npos) showArg = showArg.substr(ss);