nchebrov/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots.git synced 2026-01-14 01:19:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Battlegrounds] fix for #424 - flag carrier not fighting back when enemy has flag too and bot is hiding

Browse Source
This commit is contained in:
Fuzz
2024-08-07 23:40:19 +10:00
parent 45ebef049f
commit 27c5d6b19c
5 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/strategy/actions/ChooseTargetActions.cpp
View File

@@ -11,11 +11,11 @@
#include "Playerbots.h"
#include "PossibleRpgTargetsValue.h"
#include "ServerFacade.h"
#include "PvpTriggers.h"
bool AttackEnemyPlayerAction::isUseful()
{
// if carry flag, do not start fight
if (bot->HasAura(23333) || bot->HasAura(23335) || bot->HasAura(34976))
if (PlayerHasFlag::IsCapturingFlag(bot))
return false;
return !sPlayerbotAIConfig->IsPvpProhibited(bot->GetZoneId(), bot->GetAreaId());
@@ -25,7 +25,7 @@ bool AttackEnemyFlagCarrierAction::isUseful()
{
Unit* target = context->GetValue<Unit*>("enemy flag carrier")->Get();
return target && sServerFacade->IsDistanceLessOrEqualThan(sServerFacade->GetDistance2d(bot, target), 75.0f) &&
(bot->HasAura(23333) || bot->HasAura(23335) || bot->HasAura(34976));
PlayerHasFlag::IsCapturingFlag(bot);
}
bool AttackAnythingAction::isUseful()
@@ -124,8 +124,7 @@ bool AttackAnythingAction::isPossible() { return AttackAction::isPossible() && G
bool DpsAssistAction::isUseful()
{
// if carry flag, do not start fight
if (bot->HasAura(23333) || bot->HasAura(23335) || bot->HasAura(34976))
if (PlayerHasFlag::IsCapturingFlag(bot))
return false;
return true;