pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 02:11:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bots] Fix AE range calculation (#4683)

Browse Source 
- Certain AE types weren't properly calculating their AE range and would base off the actual AE range for targeted types rather than the spells range itself
This commit is contained in:
nytmyr 2025-02-15 15:41:08 -06:00 committed by GitHub
parent 3b399dfac5
commit 02e2f6771c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
zone/bot.cpp
View File

@ -9708,6 +9708,7 @@ bool Bot::CastChecks(uint16 spell_id, Mob* tar, uint16 spell_type, bool precheck
}
//LogBotSpellChecksDetail("{} says, 'Doing CanCastSpellType checks of {} on {}.'", GetCleanName(), GetSpellName(spell_id), tar->GetCleanName());
if (!CanCastSpellType(spell_type, spell_id, tar)) {
LogBotSpellChecksDetail("{} says, 'Cancelling cast of {} on {} due to CanCastSpellType.'", GetCleanName(), GetSpellName(spell_id), tar->GetCleanName());
return false;
}
@ -11994,7 +11995,7 @@ bool Bot::HasRequiredLoSForPositioning(Mob* tar) {
bool Bot::HasValidAETarget(Bot* caster, uint16 spell_id, uint16 spell_type, Mob* tar) {
int spell_range = caster->GetActSpellRange(spell_id, spells[spell_id].range);
int spell_ae_range = caster->GetActSpellRange(spell_id, spells[spell_id].aoe_range);
int spell_ae_range = caster->GetAOERange(spell_id);
int target_count = 0;
for (auto& close_mob : caster->m_close_mobs) {
@ -12005,6 +12006,18 @@ bool Bot::HasValidAETarget(Bot* caster, uint16 spell_id, uint16 spell_type, Mob*
}
switch (spell_type) {
case BotSpellTypes::AELull:
if (m->GetSpecialAbility(SpecialAbility::PacifyImmunity)) {
continue;
}
break;
case BotSpellTypes::AEMez:
if (m->GetSpecialAbility(SpecialAbility::MesmerizeImmunity)) {
continue;
}
break;
case BotSpellTypes::AEDispel:
if (m->GetSpecialAbility(SpecialAbility::DispellImmunity)) {
continue;
@ -13134,11 +13147,9 @@ bool Bot::IsImmuneToBotSpell(uint16 spell_id, Mob* caster) {
(
IsEffectInSpell(spell_id, SE_Root) ||
IsEffectInSpell(spell_id, SE_MovementSpeed)
)
) {
if (GetSpecialAbility(SpecialAbility::SnareImmunity)) {
return true;
}
)
) {
return true;
}
if (IsLifetapSpell(spell_id)) {

17
zone/botspellsai.cpp
View File

@ -1068,10 +1068,8 @@ std::vector<BotSpell_wPriority> Bot::GetPrioritizedBotSpellsBySpellType(Bot* cas
if (
caster->IsCommandedSpell() ||
!AE ||
(
BotSpellTypeRequiresAEChecks(spell_type) &&
caster->HasValidAETarget(caster, bot_spell_list[i].spellid, spell_type, tar)
)
!BotSpellTypeRequiresAEChecks(spell_type) ||
caster->HasValidAETarget(caster, bot_spell_list[i].spellid, spell_type, tar)
) {
BotSpell_wPriority bot_spell;
bot_spell.SpellId = bot_spell_list[i].spellid;
@ -1433,7 +1431,8 @@ Mob* Bot::GetFirstIncomingMobToMez(Bot* caster, int16 spell_id, uint16 spell_typ
Mob* result = nullptr;
if (caster && caster->GetOwner()) {
int spell_range = (!AE ? caster->GetActSpellRange(spell_id, spells[spell_id].range) : caster->GetActSpellRange(spell_id, spells[spell_id].aoe_range));
int spell_range = caster->GetActSpellRange(spell_id, spells[spell_id].range);
int spell_ae_range = caster->GetAOERange(spell_id);
int buff_count = 0;
NPC* npc = nullptr;
@ -1464,7 +1463,7 @@ Mob* Bot::GetFirstIncomingMobToMez(Bot* caster, int16 spell_id, uint16 spell_typ
}
if (IsPBAESpell(spell_id)) {
if (spell_range < Distance(caster->GetPosition(), m->GetPosition())) {
if (spell_ae_range < Distance(caster->GetPosition(), m->GetPosition())) {
continue;
}
}
@ -2732,7 +2731,11 @@ bool Bot::IsValidSpellRange(uint16 spell_id, Mob* tar) {
float range = spells[spell_id].range + GetRangeDistTargetSizeMod(tar);
if (IsAnyAESpell(spell_id)) {
if (
spells[spell_id].target_type != ST_AETargetHateList &&
!IsTargetableAESpell(spell_id) &&
IsAnyAESpell(spell_id)
) {
range = GetAOERange(spell_id);
}