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

Aggresive water elemental

Browse Source
This commit is contained in:
Yunfan Li
2024-08-14 18:28:14 +08:00
parent 2ddaae9ef0
commit 2a5b7dcb61
4 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/PlayerbotAI.cpp
View File

@@ -5742,3 +5742,28 @@ uint32 PlayerbotAI::GetReactDelay()
return base * multiplier; return base * multiplier;
} }
void PlayerbotAI::PetFollow()
{
Pet* pet = bot->GetPet();
if (!pet)
return;
pet->AttackStop();
pet->InterruptNonMeleeSpells(false);
pet->ClearInPetCombat();
pet->GetMotionMaster()->MoveFollow(bot, PET_FOLLOW_DIST, pet->GetFollowAngle());
if (pet->ToPet())
pet->ToPet()->ClearCastWhenWillAvailable();
CharmInfo* charmInfo = pet->GetCharmInfo();
if (!charmInfo)
return;
charmInfo->SetCommandState(COMMAND_FOLLOW);
charmInfo->SetIsCommandAttack(false);
charmInfo->SetIsAtStay(false);
charmInfo->SetIsReturning(true);
charmInfo->SetIsCommandFollow(true);
charmInfo->SetIsFollowing(false);
charmInfo->RemoveStayPosition();
charmInfo->SetForcedSpell(0);
charmInfo->SetForcedTargetGUID();
}

2
src/PlayerbotAI.h
View File

@@ -560,6 +560,8 @@ public:
std::vector<const Quest*> GetCurrentIncompleteQuests(); std::vector<const Quest*> GetCurrentIncompleteQuests();
std::set<uint32> GetAllCurrentQuestIds(); std::set<uint32> GetAllCurrentQuestIds();
std::set<uint32> GetCurrentIncompleteQuestIds(); std::set<uint32> GetCurrentIncompleteQuestIds();
void PetFollow();
private: private:
static void _fillGearScoreData(Player* player, Item* item, std::vector<uint32>* gearScore, uint32& twoHandScore, bool mixed = false); static void _fillGearScoreData(Player* player, Item* item, std::vector<uint32>* gearScore, uint32& twoHandScore, bool mixed = false);
bool IsTellAllowed(PlayerbotSecurityLevel securityLevel = PLAYERBOT_SECURITY_ALLOW_ALL); bool IsTellAllowed(PlayerbotSecurityLevel securityLevel = PLAYERBOT_SECURITY_ALLOW_ALL);

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

@@ -62,6 +62,11 @@ bool FollowChatShortcutAction::Execute(Event event)
true, priority); true, priority);
} }
if (Pet* pet = bot->GetPet())
{
botAI->PetFollow();
}
if (moved) if (moved)
{ {
botAI->TellMaster("Following"); botAI->TellMaster("Following");

4
src/strategy/actions/UseMeetingStoneAction.cpp
View File

@@ -79,9 +79,7 @@ bool SummonAction::Execute(Event event)
if (Pet* pet = bot->GetPet()) if (Pet* pet = bot->GetPet())
{ {
pet->SetReactState(REACT_PASSIVE); botAI->PetFollow();
pet->GetCharmInfo()->SetIsCommandFollow(true);
pet->GetCharmInfo()->IsReturning();
} }
if (master->GetSession()->GetSecurity() >= SEC_PLAYER) if (master->GetSession()->GetSecurity() >= SEC_PLAYER)