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

[Commands] Cleanup #aggro Command. (#1799)

Browse Source 
- Cleanup messages and logic.
- Cleanup constant names and references.
- Cleanup aggro description methods.
This commit is contained in:
Kinglykrab
2021-11-21 10:12:12 -05:00
committed by GitHub
parent 04fda24c8e
commit b9214bfdee
16 changed files with 512 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spells.cpp
+4 -4
View File
@@ -6181,13 +6181,13 @@ void Mob::BeamDirectional(uint16 spell_id, int16 resist_adjust)
auto fac = (*iter)->GetReverseFactionCon(this);
if (beneficial_targets) {
// only affect mobs we would assist.
if (!(fac <= FACTION_AMIABLE)) {
if (!(fac <= FACTION_AMIABLY)) {
++iter;
continue;
}
} else {
// affect mobs that are on our hate list, or which have bad faction with us
if (!(CheckAggro(*iter) || fac == FACTION_THREATENLY || fac == FACTION_SCOWLS)) {
if (!(CheckAggro(*iter) || fac == FACTION_THREATENINGLY || fac == FACTION_SCOWLS)) {
++iter;
continue;
}
@@ -6256,13 +6256,13 @@ void Mob::ConeDirectional(uint16 spell_id, int16 resist_adjust)
auto fac = (*iter)->GetReverseFactionCon(this);
if (beneficial_targets) {
// only affect mobs we would assist.
if (!(fac <= FACTION_AMIABLE)) {
if (!(fac <= FACTION_AMIABLY)) {
++iter;
continue;
}
} else {
// affect mobs that are on our hate list, or which have bad faction with us
if (!(CheckAggro(*iter) || fac == FACTION_THREATENLY || fac == FACTION_SCOWLS)) {
if (!(CheckAggro(*iter) || fac == FACTION_THREATENINGLY || fac == FACTION_SCOWLS)) {
++iter;
continue;
}