pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-19 13:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement spell AI pulling, fix throw stone

Browse Source
This commit is contained in:
nytmyr
2024-12-02 07:32:30 -06:00
parent ead31d2cd4
commit 1af85092f7
5 changed files with 62 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot.cpp
+36 -13
View File
@@ -101,6 +101,7 @@ Bot::Bot(NPCType *npcTypeData, Client* botOwner) : NPC(npcTypeData, nullptr, glm
LoadDefaultBotSettings();
SetCastedSpellType(UINT16_MAX);
SetCommandedSpell(false);
SetPullingSpell(false);
//DisableBotSpellTimers();
// Do this once and only in this constructor
@@ -178,6 +179,7 @@ Bot::Bot(
SetBotCharmer(false);
SetCastedSpellType(UINT16_MAX);
SetCommandedSpell(false);
SetPullingSpell(false);
bool stance_flag = false;
if (!database.botdb.LoadStance(this, stance_flag) && bot_owner) {
@@ -2198,36 +2200,53 @@ void Bot::AI_Process()
// PULLING FLAG (ACTIONABLE RANGE)
if (GetPullingFlag()) {
if (!IsBotNonSpellFighter() && !HOLDING && AI_HasSpells() && AI_EngagedCastCheck()) {
return;
if (!IsBotNonSpellFighter() && !HOLDING && AI_HasSpells()) {
SetPullingSpell(true);
if (AI_EngagedCastCheck()) {
SetPullingSpell(false);
return;
}
SetPullingSpell(false);
}
if (RuleB(Bots, AllowSpellPulling)) {
if (RuleB(Bots, UseSpellPulling)) {
uint16 pullSpell = RuleI(Bots, PullSpellID);
if (tar_distance <= (spells[pullSpell].range * spells[pullSpell].range)) {
if (tar_distance <= spells[pullSpell].range) {
StopMoving();
if (!TargetValidation(tar)) { return; }
CastSpell(pullSpell, tar->GetID());
SetPullingSpell(false);
return;
}
}
else {
//TODO bot rewrite - add casting AI to this
if (atCombatRange && IsBotRanged() && ranged_timer.Check(false)) {
StopMoving(CalculateHeadingToTarget(tar->GetX(), tar->GetY()));
if (atCombatRange) {
if (RuleB(Bots, AllowRangedPulling) && IsBotRanged() && ranged_timer.Check(false)) {
StopMoving(CalculateHeadingToTarget(tar->GetX(), tar->GetY()));
if (BotRangedAttack(tar) && CheckDoubleRangedAttack()) {
BotRangedAttack(tar, true);
if (BotRangedAttack(tar) && CheckDoubleRangedAttack()) {
BotRangedAttack(tar, true);
}
ranged_timer.Start();
SetPullingSpell(false);
return;
}
else if (RuleB(Bots, AllowAISpellPulling) && !IsBotNonSpellFighter() && !HOLDING && AI_HasSpells() && AI_EngagedCastCheck()) {
SetPullingSpell(false);
ranged_timer.Start();
return;
return;
}
}
return;
}
}
@@ -2622,7 +2641,7 @@ void Bot::DoAttackRounds(Mob* target, int hand) {
NPC_FLURRY,
GetCleanName(),
target->GetCleanName()
); //TODO bot rewrite - add output to others hits with flurry message
);
}
}
}
@@ -9357,6 +9376,10 @@ bool Bot::PrecastChecks(Mob* tar, uint16 spellType) {
return false;
}
if (IsPullingSpell() && IsPullingSpellType(spellType)) { //Skip remaining checks for commanded
return true;
}
if (GetManaRatio() < GetSpellTypeMinManaLimit(spellType) || GetManaRatio() > GetSpellTypeMaxManaLimit(spellType)) {
LogBotPreChecksDetail("{} says, 'Cancelling cast of [{}] on [{}] due to GetSpellTypeMinManaLimit or GetSpellTypeMaxManaLimit.'", GetCleanName(), GetSpellTypeNameByID(spellType), tar->GetCleanName()); //deleteme
return false;