nchebrov/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots.git synced 2026-02-18 09:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

attacker value with LOS

Browse Source
This commit is contained in:
Yunfan Li
2023-05-30 01:06:33 +08:00
parent d85b562629
commit 96f439bf22
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ void AttackersValue::RemoveNonThreating(std::set<Unit*>& targets)
for (std::set<Unit*>::iterator tIter = targets.begin(); tIter != targets.end();) for (std::set<Unit*>::iterator tIter = targets.begin(); tIter != targets.end();)
{ {
Unit* unit = *tIter; Unit* unit = *tIter;
if (!IsValidTarget(unit, bot)) if (!IsValidTarget(unit, bot) || !bot->IsWithinLOSInMap(unit))
{ {
std::set<Unit*>::iterator tIter2 = tIter; std::set<Unit*>::iterator tIter2 = tIter;
++tIter; ++tIter;
@@ -129,8 +129,8 @@ bool AttackersValue::IsPossibleTarget(Unit* attacker, Player* bot, float range)
!(attacker->GetGUID().IsPet() && enemy) && !(attacker->GetGUID().IsPet() && enemy) &&
!(attacker->GetCreatureType() == CREATURE_TYPE_CRITTER && !attacker->IsInCombat()) && !(sPlayerbotAIConfig->IsInPvpProhibitedZone(attacker->GetAreaId()) && !(attacker->GetCreatureType() == CREATURE_TYPE_CRITTER && !attacker->IsInCombat()) && !(sPlayerbotAIConfig->IsInPvpProhibitedZone(attacker->GetAreaId()) &&
(attacker->GetGUID().IsPlayer() || attacker->GetGUID().IsPet())) && (!c || (!c->IsInEvadeMode() && ((!isMemberBotGroup && botAI->HasStrategy("attack tagged", BOT_STATE_NON_COMBAT)) || (attacker->GetGUID().IsPlayer() || attacker->GetGUID().IsPet())) && (!c || (!c->IsInEvadeMode() && ((!isMemberBotGroup && botAI->HasStrategy("attack tagged", BOT_STATE_NON_COMBAT)) ||
leaderHasThreat || (!c->hasLootRecipient() && (!c->GetVictim() || c->GetVictim() && ((!c->GetVictim()->IsPlayer() || bot->IsInSameGroupWith(c->GetVictim()->ToPlayer())) || leaderHasThreat || (!c->hasLootRecipient() && (!c->GetVictim() || (c->GetVictim() && ((!c->GetVictim()->IsPlayer() || bot->IsInSameGroupWith(c->GetVictim()->ToPlayer())) ||
(botAI->GetMaster() && c->GetVictim() == botAI->GetMaster())))) || c->isTappedBy(bot)))); (botAI->GetMaster() && c->GetVictim() == botAI->GetMaster()))))) || c->isTappedBy(bot))));
} }
bool AttackersValue::IsValidTarget(Unit *attacker, Player *bot) bool AttackersValue::IsValidTarget(Unit *attacker, Player *bot)