holding check at start of ai process

This commit is contained in:
nytmyr
2024-12-02 21:25:06 -06:00
parent f12e597ff3
commit b69ac7dc21
+5 -5
View File
@@ -2087,7 +2087,7 @@ void Bot::AI_Process()
return; return;
} }
if (raid && r_group == RAID_GROUPLESS) { if (HOLDING || (raid && r_group == RAID_GROUPLESS)) {
glm::vec3 Goal(0, 0, 0); glm::vec3 Goal(0, 0, 0);
TryNonCombatMovementChecks(bot_owner, follow_mob, Goal); TryNonCombatMovementChecks(bot_owner, follow_mob, Goal);
@@ -2269,7 +2269,7 @@ void Bot::AI_Process()
} }
} }
if (!IsBotNonSpellFighter() && !HOLDING && AI_HasSpells() && AI_EngagedCastCheck()) { if (!IsBotNonSpellFighter() && AI_HasSpells() && AI_EngagedCastCheck()) {
return; return;
} }
@@ -2330,6 +2330,7 @@ void Bot::AI_Process()
SetAttackFlag(false); SetAttackFlag(false);
SetCombatRoundForAlerts(false); SetCombatRoundForAlerts(false);
SetAttackingFlag(false); SetAttackingFlag(false);
if (!bot_owner->GetBotPulling()) { if (!bot_owner->GetBotPulling()) {
SetPullingFlag(false); SetPullingFlag(false);
@@ -2345,7 +2346,6 @@ void Bot::AI_Process()
SetTarget(nullptr); SetTarget(nullptr);
if (HasPet() && (GetClass() != Class::Enchanter || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 1)) { if (HasPet() && (GetClass() != Class::Enchanter || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 1)) {
GetPet()->WipeHateList(); GetPet()->WipeHateList();
GetPet()->SetTarget(nullptr); GetPet()->SetTarget(nullptr);
} }
@@ -2360,10 +2360,10 @@ void Bot::AI_Process()
if (TryNonCombatMovementChecks(bot_owner, follow_mob, Goal)) { if (TryNonCombatMovementChecks(bot_owner, follow_mob, Goal)) {
return; return;
} }
if (!HOLDING && AI_HasSpells() && TryIdleChecks(fm_distance)) { if (AI_HasSpells() && TryIdleChecks(fm_distance)) {
return; return;
} }
if (!HOLDING && AI_HasSpells() && TryBardMovementCasts()) { if (AI_HasSpells() && TryBardMovementCasts()) {
return; return;
} }
} }