phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-23 15:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 41

feat: add mounted/swimming/flying/stealthed/channeling macro conditionals

Browse source 
Add commonly-used WoW macro conditionals that were missing:
- [mounted]/[nomounted] — checks isMounted() state
- [swimming]/[noswimming] — checks SWIMMING movement flag
- [flying]/[noflying] — checks CAN_FLY + FLYING movement flags
- [stealthed]/[nostealthed] — checks UNIT_FLAG_SNEAKING (0x02000000)
- [channeling]/[nochanneling] — checks if currently channeling a spell

These are essential for common macros like mount/dismount toggles,
rogue opener macros, and conditional cast sequences.
This commit is contained in:
Kelsi 2026-03-20 06:13:27 -07:00
parent 6b7975107e
commit d7059c66dc
1 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/ui/game_screen.cpp
View file

@ -5742,6 +5742,32 @@ static std::string evaluateMacroConditionals(const std::string& rawArg,
if (c == "harm" || c == "nohelp") { return unitHostile(effTarget()); }
if (c == "help" || c == "noharm") { return !unitHostile(effTarget()); }
// mounted / nomounted
if (c == "mounted") return gameHandler.isMounted();
if (c == "nomounted") return !gameHandler.isMounted();
// swimming / noswimming
if (c == "swimming") return gameHandler.isSwimming();
if (c == "noswimming") return !gameHandler.isSwimming();
// flying / noflying (CAN_FLY + FLYING flags active)
if (c == "flying") return gameHandler.isPlayerFlying();
if (c == "noflying") return !gameHandler.isPlayerFlying();
// channeling / nochanneling
if (c == "channeling") return gameHandler.isCasting() && gameHandler.isChanneling();
if (c == "nochanneling") return !(gameHandler.isCasting() && gameHandler.isChanneling());
// stealthed / nostealthed (unit flag 0x02000000 = UNIT_FLAG_SNEAKING)
auto isStealthedFn = [&]() -> bool {
auto pe = gameHandler.getEntityManager().getEntity(gameHandler.getPlayerGuid());
if (!pe) return false;
auto pu = std::dynamic_pointer_cast<game::Unit>(pe);
return pu && (pu->getUnitFlags() & 0x02000000u) != 0;
};
if (c == "stealthed") return isStealthedFn();
if (c == "nostealthed") return !isStealthedFn();
// noform / nostance — player is NOT in a shapeshift/stance
if (c == "noform" || c == "nostance") {
for (const auto& a : gameHandler.getPlayerAuras())