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

Feature: Bots use flying mounts when player has flight form (#805)

Browse Source 
* Make bots use flying mounts when player goes into flight form

* add && !bot->InBattleground() check

* Final commit
This commit is contained in:
SaW
2024-12-21 13:33:47 +01:00
committed by GitHub
parent beabe5c701
commit 99dd094a5b
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/strategy/actions/CheckMountStateAction.cpp
View File

@@ -71,14 +71,17 @@ bool CheckMountStateAction::Execute(Event event)
if (!bot->GetGroup() || bot->GetGroup()->GetLeaderGUID() != master->GetGUID()) if (!bot->GetGroup() || bot->GetGroup()->GetLeaderGUID() != master->GetGUID())
return false; return false;
auto masterInShapeshiftForm = master->GetShapeshiftForm();
// bool farFromMaster = sServerFacade->GetDistance2d(bot, master) > sPlayerbotAIConfig->sightDistance; // bool farFromMaster = sServerFacade->GetDistance2d(bot, master) > sPlayerbotAIConfig->sightDistance;
if (master->IsMounted() && !bot->IsMounted() && noattackers && shouldMount && !bot->IsInCombat() && if ((master->IsMounted() || masterInShapeshiftForm == FORM_FLIGHT || masterInShapeshiftForm == FORM_FLIGHT_EPIC)
botAI->GetState() != BOT_STATE_COMBAT) && !bot->IsMounted() && noattackers && shouldMount && !bot->IsInCombat() && botAI->GetState() != BOT_STATE_COMBAT)
{ {
return Mount(); return Mount();
} }
if (!master->IsMounted() && bot->IsMounted()) if ((!master->IsMounted() && masterInShapeshiftForm != FORM_FLIGHT && masterInShapeshiftForm != FORM_FLIGHT_EPIC)
&& bot->IsMounted())
{ {
WorldPacket emptyPacket; WorldPacket emptyPacket;
bot->GetSession()->HandleCancelMountAuraOpcode(emptyPacket); bot->GetSession()->HandleCancelMountAuraOpcode(emptyPacket);
@@ -188,12 +191,23 @@ bool CheckMountStateAction::Mount()
botAI->RemoveShapeshift(); botAI->RemoveShapeshift();
botAI->RemoveAura("tree of life"); botAI->RemoveAura("tree of life");
int32 masterSpeed = 59; int32 masterSpeed = 59;
int32 masterMountType = 0;
SpellInfo const* masterSpell = nullptr; SpellInfo const* masterSpell = nullptr;
if (master && !master->GetAuraEffectsByType(SPELL_AURA_MOUNTED).empty() && !bot->InBattleground()) if (master != nullptr && !bot->InBattleground())
{ {
masterSpell = master->GetAuraEffectsByType(SPELL_AURA_MOUNTED).front()->GetSpellInfo(); auto masterInShapeshiftForm = master->GetShapeshiftForm();
masterSpeed = std::max(masterSpell->Effects[1].BasePoints, masterSpell->Effects[2].BasePoints);
if (!master->GetAuraEffectsByType(SPELL_AURA_MOUNTED).empty())
{
masterSpell = master->GetAuraEffectsByType(SPELL_AURA_MOUNTED).front()->GetSpellInfo();
masterSpeed = std::max(masterSpell->Effects[1].BasePoints, masterSpell->Effects[2].BasePoints);
}
else if (masterInShapeshiftForm == FORM_FLIGHT || masterInShapeshiftForm == FORM_FLIGHT_EPIC)
{
masterMountType = 1;
masterSpeed = (masterInShapeshiftForm == FORM_FLIGHT_EPIC) ? 279 : 149;
}
} }
else else
{ {
@@ -261,7 +275,6 @@ bool CheckMountStateAction::Mount()
allSpells[index][effect].push_back(spellId); allSpells[index][effect].push_back(spellId);
} }
int32 masterMountType = 0;
if (masterSpell) if (masterSpell)
{ {
masterMountType = (masterSpell->Effects[1].ApplyAuraName == SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED || masterMountType = (masterSpell->Effects[1].ApplyAuraName == SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED ||