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

[Attack target] Fix

Browse Source
This commit is contained in:
Yunfan Li
2024-06-04 22:42:48 +08:00
parent 5f40c39e5e
commit be3b2c82f8
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/strategy/values/AttackersValue.cpp
View File

@@ -23,24 +23,25 @@ GuidVector AttackersValue::Calculate()
if (Group* group = bot->GetGroup()) if (Group* group = bot->GetGroup())
AddAttackersOf(group, targets); AddAttackersOf(group, targets);
RemoveNonThreating(targets);
// prioritized target // prioritized target
GuidVector prioritizedTargets = AI_VALUE(GuidVector, "prioritized targets"); GuidVector prioritizedTargets = AI_VALUE(GuidVector, "prioritized targets");
for (ObjectGuid target : prioritizedTargets) { for (ObjectGuid target : prioritizedTargets) {
Unit* unit = botAI->GetUnit(target); Unit* unit = botAI->GetUnit(target);
if (unit) { if (unit && IsValidTarget(unit, bot)) {
targets.insert(unit); targets.insert(unit);
} }
} }
if (Group* group = bot->GetGroup()) { if (Group* group = bot->GetGroup()) {
ObjectGuid skullGuid = group->GetTargetIcon(4); ObjectGuid skullGuid = group->GetTargetIcon(4);
Unit* skullTarget = botAI->GetUnit(skullGuid); Unit* skullTarget = botAI->GetUnit(skullGuid);
if (skullTarget) { if (skullTarget && IsValidTarget(skullTarget, bot)) {
targets.insert(skullTarget); targets.insert(skullTarget);
} }
} }
RemoveNonThreating(targets);
for (Unit* unit : targets) for (Unit* unit : targets)
result.push_back(unit->GetGUID()); result.push_back(unit->GetGUID());
@@ -130,7 +131,7 @@ bool AttackersValue::hasRealThreat(Unit *attacker)
attacker->IsAlive() && attacker->IsAlive() &&
!attacker->IsPolymorphed() && !attacker->IsPolymorphed() &&
// !attacker->isInRoots() && // !attacker->isInRoots() &&
!attacker->IsFriendlyTo(bot) && !attacker->IsFriendlyTo(bot);
(attacker->GetThreatMgr().getCurrentVictim() || dynamic_cast<Player*>(attacker)); (attacker->GetThreatMgr().getCurrentVictim() || dynamic_cast<Player*>(attacker));
} }