yolinlin/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots synced 2025-11-29 15:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update NonCombatActions.cpp

Browse Source 
This is better, even though aura check is tiny more expensive then most. Placing them into isUseful() is kinda confusing.
This commit is contained in:
bash
2025-09-29 00:14:28 +02:00
committed by GitHub
parent aaa9e1a42c
commit 972e2604ce
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/strategy/actions/NonCombatActions.cpp
View File

@@ -51,15 +51,15 @@ bool DrinkAction::isUseful()
{ {
return UseItemAction::isUseful() && return UseItemAction::isUseful() &&
AI_VALUE2(bool, "has mana", "self target") && AI_VALUE2(bool, "has mana", "self target") &&
AI_VALUE2(uint8, "mana", "self target") < 100 && AI_VALUE2(uint8, "mana", "self target") < 100;
!botAI->HasAnyAuraOf(GetTarget(), "dire bear form", "bear form", "cat form", "travel form",
"aquatic form","flight form", "swift flight form", nullptr) &&
} }
bool DrinkAction::isPossible() bool DrinkAction::isPossible()
{ {
return !bot->IsInCombat() && return !bot->IsInCombat() &&
!bot->IsMounted() && !bot->IsMounted() &&
!botAI->HasAnyAuraOf(GetTarget(), "dire bear form", "bear form", "cat form", "travel form",
"aquatic form","flight form", "swift flight form", nullptr) &&
(botAI->HasCheat(BotCheatMask::food) || UseItemAction::isPossible()); (botAI->HasCheat(BotCheatMask::food) || UseItemAction::isPossible());
} }
@@ -105,14 +105,14 @@ bool EatAction::Execute(Event event)
bool EatAction::isUseful() bool EatAction::isUseful()
{ {
return UseItemAction::isUseful() && return UseItemAction::isUseful() &&
AI_VALUE2(uint8, "health", "self target") < 100 && AI_VALUE2(uint8, "health", "self target") < 100;
!botAI->HasAnyAuraOf(GetTarget(), "dire bear form", "bear form", "cat form", "travel form",
"aquatic form","flight form", "swift flight form", nullptr) &&
} }
bool EatAction::isPossible() bool EatAction::isPossible()
{ {
return !bot->IsInCombat() && return !bot->IsInCombat() &&
!bot->IsMounted() && !bot->IsMounted() &&
!botAI->HasAnyAuraOf(GetTarget(), "dire bear form", "bear form", "cat form", "travel form",
"aquatic form","flight form", "swift flight form", nullptr) &&
(botAI->HasCheat(BotCheatMask::food) || UseItemAction::isPossible()); (botAI->HasCheat(BotCheatMask::food) || UseItemAction::isPossible());
} }