mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-31 13:16:39 +00:00
Merge branch 'bot-rewrite' of https://github.com/nytmyr/Server into bot-rewrite
This commit is contained in:
@@ -2086,6 +2086,13 @@ void Bot::AI_Process()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetFollowID(follow_mob->GetID());
|
||||||
|
|
||||||
|
if (!follow_mob || !IsInGroupOrRaid(follow_mob)) {
|
||||||
|
follow_mob = leash_owner;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
SetFollowID(follow_mob->GetID());
|
SetFollowID(follow_mob->GetID());
|
||||||
|
|
||||||
SetBerserkState();
|
SetBerserkState();
|
||||||
@@ -2126,6 +2133,7 @@ void Bot::AI_Process()
|
|||||||
glm::vec3 Goal(0, 0, 0);
|
glm::vec3 Goal(0, 0, 0);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// We have aggro to choose from
|
// We have aggro to choose from
|
||||||
if (IsEngaged()) {
|
if (IsEngaged()) {
|
||||||
if (rest_timer.Enabled()) {
|
if (rest_timer.Enabled()) {
|
||||||
@@ -2332,6 +2340,11 @@ void Bot::AI_Process()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!TargetValidation(tar)) { return; }
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ENGAGED NOT AT COMBAT RANGE
|
// ENGAGED NOT AT COMBAT RANGE
|
||||||
|
|
||||||
else if (!TryPursueTarget(leash_distance, Goal)) {
|
else if (!TryPursueTarget(leash_distance, Goal)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user