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: add [pet], [nopet], [group], [nogroup] macro conditionals

Browse source 
Add frequently-used macro conditionals for pet and group state:
- [pet]/[nopet] — checks if the player has an active pet (hunters,
  warlocks, DKs). Essential for pet management macros.
- [group]/[nogroup]/[party] — checks if the player is in a party or
  raid. Used for conditional targeting and ability usage.

Updated /macrohelp output to list the new conditionals.
This commit is contained in:
Kelsi 2026-03-20 06:25:02 -07:00
parent a9e0a99f2b
commit 114478271e
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ui/game_screen.cpp
View file

@ -5768,6 +5768,14 @@ static std::string evaluateMacroConditionals(const std::string& rawArg,
if (c == "stealthed") return isStealthedFn();
if (c == "nostealthed") return !isStealthedFn();
// pet / nopet — player has an active pet (hunters, warlocks, DKs)
if (c == "pet") return gameHandler.hasPet();
if (c == "nopet") return !gameHandler.hasPet();
// group / nogroup — player is in a party or raid
if (c == "group" || c == "party") return gameHandler.isInGroup();
if (c == "nogroup") return !gameHandler.isInGroup();
// noform / nostance — player is NOT in a shapeshift/stance
if (c == "noform" || c == "nostance") {
for (const auto& a : gameHandler.getPlayerAuras())
@ -6122,8 +6130,8 @@ void GameScreen::sendChatMessage(game::GameHandler& gameHandler) {
static const char* kMacroHelp[] = {
"--- Macro Conditionals ---",
"Usage: /cast [cond1,cond2] Spell1; [cond3] Spell2; Default",
"State: [combat] [nocombat] [mounted] [nomounted]",
" [swimming] [flying] [stealthed] [channeling]",
"State: [combat] [mounted] [swimming] [flying] [stealthed]",
" [channeling] [pet] [group] (prefix no- to negate)",
"Target: [harm] [help] [exists] [noexists] [dead] [nodead]",
" [target=focus] [target=pet] [target=player]",
"Form: [noform] [nostance] [form:0]",