pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-24 20:02:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Feature] Add Hate Override for Heals (#2485)

Browse Source 
* [Feature] Add Hate Override for Heals

* Formatting

Co-authored-by: Akkadius <akkadius1@gmail.com>
This commit is contained in:
Aeadoin 2022-10-13 22:02:59 -04:00 committed by GitHub
parent 0240a9cc76
commit 1b82e6b283
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zone/aggro.cpp
View File

@ -1372,11 +1372,19 @@ int32 Mob::CheckHealAggroAmount(uint16 spell_id, Mob *target, uint32 heal_possib
break; break;
} }
} }
if (GetOwner() && IsPet())
AggroAmount = AggroAmount * RuleI(Aggro, PetSpellAggroMod) / 100;
if (!ignore_default_buff && IsBuffSpell(spell_id) && IsBeneficialSpell(spell_id)) if (GetOwner() && IsPet()) {
AggroAmount = AggroAmount * RuleI(Aggro, PetSpellAggroMod) / 100;
}
if (!ignore_default_buff && IsBuffSpell(spell_id) && IsBeneficialSpell(spell_id)) {
AggroAmount = IsBardSong(spell_id) ? 2 : 9; AggroAmount = IsBardSong(spell_id) ? 2 : 9;
}
// overrides the hate (ex. Healing Splash), can be negative (but function will return 0).
if (spells[spell_id].hate_added != 0) {
AggroAmount = spells[spell_id].hate_added;
}
if (AggroAmount > 0) { if (AggroAmount > 0) {
int HateMod = RuleI(Aggro, SpellAggroMod); int HateMod = RuleI(Aggro, SpellAggroMod);
@ -1385,7 +1393,7 @@ int32 Mob::CheckHealAggroAmount(uint16 spell_id, Mob *target, uint32 heal_possib
AggroAmount = (AggroAmount * HateMod) / 100; AggroAmount = (AggroAmount * HateMod) / 100;
} }
return std::max(0, AggroAmount); return std::max(0, AggroAmount + spells[spell_id].bonus_hate); //Bonus Hate from spells like Aurora of Morrow
} }
void Mob::AddFeignMemory(Mob* attacker) { void Mob::AddFeignMemory(Mob* attacker) {