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

pet react state & reach target for autoshoot

Browse Source
This commit is contained in:
Yunfan Li
2023-07-14 16:58:50 +08:00
parent 63573b5c7e
commit 86f7a6e9d1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/strategy/actions/AttackAction.cpp
View File

@@ -104,19 +104,18 @@ bool AttackAction::Attack(Unit* target, bool with_pet /*true*/)
if (Pet* pet = bot->GetPet()) if (Pet* pet = bot->GetPet())
{ {
if (with_pet) { if (with_pet) {
pet->SetReactState(REACT_DEFENSIVE);
pet->SetTarget(target->GetGUID()); pet->SetTarget(target->GetGUID());
pet->GetCharmInfo()->SetCommandState(COMMAND_ATTACK); pet->GetCharmInfo()->SetCommandState(COMMAND_ATTACK);
pet->GetCharmInfo()->SetIsCommandAttack(true); pet->GetCharmInfo()->SetIsCommandAttack(true);
pet->AI()->AttackStart(target); pet->AI()->AttackStart(target);
pet->SetReactState(REACT_DEFENSIVE);
} else { } else {
pet->SetReactState(REACT_PASSIVE);
pet->GetCharmInfo()->SetCommandState(COMMAND_FOLLOW); pet->GetCharmInfo()->SetCommandState(COMMAND_FOLLOW);
pet->GetCharmInfo()->SetIsCommandFollow(true); pet->GetCharmInfo()->SetIsCommandFollow(true);
pet->GetCharmInfo()->IsReturning(); pet->GetCharmInfo()->IsReturning();
pet->GetMotionMaster()->MoveFollow(bot, PET_FOLLOW_DIST, pet->GetFollowAngle()); pet->GetMotionMaster()->MoveFollow(bot, PET_FOLLOW_DIST, pet->GetFollowAngle());
pet->SetReactState(REACT_PASSIVE);
} }
} }

3
src/strategy/actions/ReachTargetActions.cpp
View File

@@ -16,8 +16,9 @@ bool ReachTargetAction::Execute(Event event)
bool ReachTargetAction::isUseful() bool ReachTargetAction::isUseful()
{ {
// do not move while casting // do not move while casting
if (bot->IsNonMeleeSpellCast(true)) if (bot->GetCurrentSpell(CURRENT_CHANNELED_SPELL) != nullptr) {
return false; return false;
}
return AI_VALUE2(float, "distance", GetTargetName()) > (distance + sPlayerbotAIConfig->contactDistance); return AI_VALUE2(float, "distance", GetTargetName()) > (distance + sPlayerbotAIConfig->contactDistance);
} }