Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(NpcBots/bot_ai): Prevent tank/off-tank bots from automatically taunting from other tanks/off-tanks #8

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/server/game/AI/NpcBots/bot_ai.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6600,7 +6600,20 @@ Unit* bot_ai::FindDistantTauntTarget(float maxdist, bool ally) const
return nullptr;

Unit* unit = unitList.size() == 1 ? *unitList.begin() : Acore::Containers::SelectRandomContainerElement(unitList);
return ally ? unit->GetVictim() : unit;

Unit* victim = unit->GetVictim();

// Bots should not taunt from a tank when off-tanking
bool victimIsTank = IsTank(victim);
if (victimIsTank && IsOffTank())
return nullptr;

// Bots should not taunt from an off-tank when tanking
bool victimIsOffTank = victimIsTank && !IsOffTank();
if (victimIsOffTank && IsPointedOffTankingTarget(unit))
return nullptr;

return ally ? victim : unit;
}
//Finds target for Warlock's Mana Drain
//Returns nearby CCed unit with most mana
Expand Down
Loading