Placed cheap checks in isPossible() more expensive in isUseful()

combat en mounted are both HasUnitFlag checks, which are cheap calls to make.
This commit is contained in:
bash
2025-09-29 00:06:56 +02:00
committed by GitHub
parent df77668b4b
commit aaa9e1a42c

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());
} }