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

Repair aggro so CallsForHelp are completed before mob charges.

Browse Source
This commit is contained in:
Noudess 2020-05-20 16:08:42 -04:00
parent 3ebbcd84d4
commit 4e8764b6b9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/mob_ai.cpp
View File

@ -1319,7 +1319,7 @@ void Mob::AI_Process() {
FaceTarget(); FaceTarget();
} }
} }
else if (AI_movement_timer->Check() && target) { else if (AI_movement_timer->Check() && target && CastToNPC()->GetCombatEvent()) {
if (!IsRooted()) { if (!IsRooted()) {
LogAI("Pursuing [{}] while engaged", target->GetName()); LogAI("Pursuing [{}] while engaged", target->GetName());
RunTo(target->GetX(), target->GetY(), target->GetZ()); RunTo(target->GetX(), target->GetY(), target->GetZ());

12
zone/special_attacks.cpp
View File

@ -192,7 +192,7 @@ void Mob::DoSpecialAttackDamage(Mob *who, EQ::skills::SkillType skill, int32 bas
DoAttack(who, my_hit); DoAttack(who, my_hit);
who->AddToHateList(this, hate, 0, false); who->AddToHateList(this, hate, 0);
if (my_hit.damage_done > 0 && aabonuses.SkillAttackProc[0] && aabonuses.SkillAttackProc[1] == skill && if (my_hit.damage_done > 0 && aabonuses.SkillAttackProc[0] && aabonuses.SkillAttackProc[1] == skill &&
IsValidSpell(aabonuses.SkillAttackProc[2])) { IsValidSpell(aabonuses.SkillAttackProc[2])) {
float chance = aabonuses.SkillAttackProc[0] / 1000.0f; float chance = aabonuses.SkillAttackProc[0] / 1000.0f;
@ -870,7 +870,7 @@ void Mob::DoArcheryAttackDmg(Mob *other, const EQ::ItemInstance *RangeWeapon, co
} }
if (IsClient() && !CastToClient()->GetFeigned()) if (IsClient() && !CastToClient()->GetFeigned())
other->AddToHateList(this, hate, 0, false); other->AddToHateList(this, hate, 0);
other->Damage(this, TotalDmg, SPELL_UNKNOWN, EQ::skills::SkillArchery); other->Damage(this, TotalDmg, SPELL_UNKNOWN, EQ::skills::SkillArchery);
@ -1200,9 +1200,9 @@ void NPC::DoRangedAttackDmg(Mob* other, bool Launch, int16 damage_mod, int16 cha
if (TotalDmg > 0) { if (TotalDmg > 0) {
TotalDmg += TotalDmg * damage_mod / 100; TotalDmg += TotalDmg * damage_mod / 100;
other->AddToHateList(this, TotalDmg, 0, false); other->AddToHateList(this, TotalDmg, 0);
} else { } else {
other->AddToHateList(this, 0, 0, false); other->AddToHateList(this, 0, 0);
} }
other->Damage(this, TotalDmg, SPELL_UNKNOWN, skillInUse); other->Damage(this, TotalDmg, SPELL_UNKNOWN, skillInUse);
@ -1384,7 +1384,7 @@ void Mob::DoThrowingAttackDmg(Mob *other, const EQ::ItemInstance *RangeWeapon, c
} }
if (IsClient() && !CastToClient()->GetFeigned()) if (IsClient() && !CastToClient()->GetFeigned())
other->AddToHateList(this, WDmg, 0, false); other->AddToHateList(this, WDmg, 0);
other->Damage(this, TotalDmg, SPELL_UNKNOWN, EQ::skills::SkillThrowing); other->Damage(this, TotalDmg, SPELL_UNKNOWN, EQ::skills::SkillThrowing);
@ -2158,7 +2158,7 @@ void Mob::DoMeleeSkillAttackDmg(Mob *other, uint16 weapon_damage, EQ::skills::Sk
CanSkillProc = false; // Disable skill procs CanSkillProc = false; // Disable skill procs
} }
other->AddToHateList(this, hate, 0, false); other->AddToHateList(this, hate, 0);
if (damage > 0 && aabonuses.SkillAttackProc[0] && aabonuses.SkillAttackProc[1] == skillinuse && if (damage > 0 && aabonuses.SkillAttackProc[0] && aabonuses.SkillAttackProc[1] == skillinuse &&
IsValidSpell(aabonuses.SkillAttackProc[2])) { IsValidSpell(aabonuses.SkillAttackProc[2])) {
float chance = aabonuses.SkillAttackProc[0] / 1000.0f; float chance = aabonuses.SkillAttackProc[0] / 1000.0f;