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

More castcheck improvements

Browse Source
This commit is contained in:
nytmyr
2024-12-12 08:01:15 -06:00
parent 1aa71598a0
commit f715924b99
3 changed files with 50 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/botspellsai.cpp
+1 -22
View File
@@ -207,7 +207,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 spellType, uint16 subTarge
break;
case BotSpellTypes::Charm:
if (tar->IsCharmed() || !tar->IsNPC() || tar->GetSpecialAbility(SpecialAbility::CharmImmunity)) {
if (HasPet() || tar->IsCharmed() || !tar->IsNPC() || tar->GetSpecialAbility(SpecialAbility::CharmImmunity)) {
return false;
}
@@ -596,27 +596,6 @@ bool Bot::AIDoSpellCast(int32 i, Mob* tar, int32 mana_cost, uint32* oDontDoAgain
} else
dist2 = DistanceSquared(m_Position, tar->GetPosition());
//if (
// (
// (
// (
// (spells[AIBot_spells[i].spellid].target_type==ST_GroupTeleport && AIBot_spells[i].type == BotSpellTypes::RegularHeal) ||
// spells[AIBot_spells[i].spellid].target_type ==ST_AECaster ||
// spells[AIBot_spells[i].spellid].target_type ==ST_Group ||
// spells[AIBot_spells[i].spellid].target_type ==ST_AEBard ||
// (
// tar == this && spells[AIBot_spells[i].spellid].target_type != ST_TargetsTarget
// )
// ) &&
// dist2 <= spells[AIBot_spells[i].spellid].aoe_range*spells[AIBot_spells[i].spellid].aoe_range
// ) ||
// dist2 <= GetActSpellRange(AIBot_spells[i].spellid, spells[AIBot_spells[i].spellid].range)*GetActSpellRange(AIBot_spells[i].spellid, spells[AIBot_spells[i].spellid].range)
// ) &&
// (
// mana_cost <= GetMana() ||
// IsBotNonSpellFighter()
// )
//) {
if (IsValidSpellRange(AIBot_spells[i].spellid, tar) && (mana_cost <= GetMana() || IsBotNonSpellFighter())) {
casting_spell_AIindex = i;
LogAI("spellid [{}] tar [{}] mana [{}] Name [{}]", AIBot_spells[i].spellid, tar->GetName(), mana_cost, spells[AIBot_spells[i].spellid].name);