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: execute macros via keyboard shortcuts; support numeric /cast spell IDs

Browse source 
Two companion improvements for the macro system:

- Keyboard shortcut handler now executes MACRO slots (1-0 keys) by running
  the first line of their text as a command, same as left-click
- /cast now accepts a numeric spell ID or #ID prefix (e.g. /cast 133,
  /cast #133) in addition to spell names — enables standard WoW macro
  syntax and direct spell ID testing
This commit is contained in:
Kelsi 2026-03-18 02:14:10 -07:00
parent 2c86fb4fa6
commit 8abb65a813
1 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/ui/game_screen.cpp
View file

@ -2833,6 +2833,15 @@ void GameScreen::processTargetInput(game::GameHandler& gameHandler) {
gameHandler.castSpell(bar[slotIdx].id, target);
} else if (bar[slotIdx].type == game::ActionBarSlot::ITEM && bar[slotIdx].id != 0) {
gameHandler.useItemById(bar[slotIdx].id);
} else if (bar[slotIdx].type == game::ActionBarSlot::MACRO) {
const std::string& macroTxt = gameHandler.getMacroText(bar[slotIdx].id);
if (!macroTxt.empty()) {
size_t nl = macroTxt.find('\n');
std::string firstLine = (nl != std::string::npos) ? macroTxt.substr(0, nl) : macroTxt;
strncpy(chatInputBuffer, firstLine.c_str(), sizeof(chatInputBuffer) - 1);
chatInputBuffer[sizeof(chatInputBuffer) - 1] = '\0';
sendChatMessage(gameHandler);
}
}
}
}
@ -6027,6 +6036,25 @@ void GameScreen::sendChatMessage(game::GameHandler& gameHandler) {
while (!spellArg.empty() && spellArg.front() == ' ') spellArg.erase(spellArg.begin());
while (!spellArg.empty() && spellArg.back() == ' ') spellArg.pop_back();
// Support numeric spell ID: /cast 133 or /cast #133
{
std::string numStr = spellArg;
if (!numStr.empty() && numStr.front() == '#') numStr.erase(numStr.begin());
bool isNumeric = !numStr.empty() &&
std::all_of(numStr.begin(), numStr.end(),
[](unsigned char c){ return std::isdigit(c); });
if (isNumeric) {
uint32_t spellId = 0;
try { spellId = static_cast<uint32_t>(std::stoul(numStr)); } catch (...) {}
if (spellId != 0) {
uint64_t targetGuid = gameHandler.hasTarget() ? gameHandler.getTargetGuid() : 0;
gameHandler.castSpell(spellId, targetGuid);
}
chatInputBuffer[0] = '\0';
return;
}
}
// Parse optional "(Rank N)" suffix: "Fireball(Rank 3)" or "Fireball (Rank 3)"
int requestedRank = -1; // -1 = highest rank
std::string spellName = spellArg;