pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 19:10:25 +00:00
Code Issues Actions 1 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/mob.cpp
+17 -17
View File
@@ -5715,7 +5715,7 @@ void Mob::ClearItemFactionBonuses() {
FACTION_VALUE Mob::GetSpecialFactionCon(Mob* iOther) {
if (!iOther)
return FACTION_INDIFFERENT;
return FACTION_INDIFFERENTLY;
iOther = iOther->GetOwnerOrSelf();
Mob* self = this->GetOwnerOrSelf();
@@ -5726,9 +5726,9 @@ FACTION_VALUE Mob::GetSpecialFactionCon(Mob* iOther) {
int iOtherPrimaryFaction = iOther->GetPrimaryFaction();
if (selfPrimaryFaction >= 0 && selfAIcontrolled)
return FACTION_INDIFFERENT;
return FACTION_INDIFFERENTLY;
if (iOther->GetPrimaryFaction() >= 0)
return FACTION_INDIFFERENT;
return FACTION_INDIFFERENTLY;
/* special values:
-2 = indiff to player, ally to AI on special values, indiff to AI
-3 = dub to player, ally to AI on special values, indiff to AI
@@ -5748,27 +5748,27 @@ FACTION_VALUE Mob::GetSpecialFactionCon(Mob* iOther) {
if (selfAIcontrolled && iOtherAIControlled)
return FACTION_ALLY;
else
return FACTION_INDIFFERENT;
return FACTION_INDIFFERENTLY;
case -3: // -3 = dub to player, ally to AI on special values, indiff to AI
if (selfAIcontrolled && iOtherAIControlled)
return FACTION_ALLY;
else
return FACTION_DUBIOUS;
return FACTION_DUBIOUSLY;
case -4: // -4 = atk to player, ally to AI on special values, indiff to AI
if (selfAIcontrolled && iOtherAIControlled)
return FACTION_ALLY;
else
return FACTION_SCOWLS;
case -5: // -5 = indiff to player, indiff to AI
return FACTION_INDIFFERENT;
return FACTION_INDIFFERENTLY;
case -6: // -6 = dub to player, indiff to AI
if (selfAIcontrolled && iOtherAIControlled)
return FACTION_INDIFFERENT;
return FACTION_INDIFFERENTLY;
else
return FACTION_DUBIOUS;
return FACTION_DUBIOUSLY;
case -7: // -7 = atk to player, indiff to AI
if (selfAIcontrolled && iOtherAIControlled)
return FACTION_INDIFFERENT;
return FACTION_INDIFFERENTLY;
else
return FACTION_SCOWLS;
case -8: // -8 = indiff to players, ally to AI on same value, indiff to AI
@@ -5776,25 +5776,25 @@ FACTION_VALUE Mob::GetSpecialFactionCon(Mob* iOther) {
if (selfPrimaryFaction == iOtherPrimaryFaction)
return FACTION_ALLY;
else
return FACTION_INDIFFERENT;
return FACTION_INDIFFERENTLY;
}
else
return FACTION_INDIFFERENT;
return FACTION_INDIFFERENTLY;
case -9: // -9 = dub to players, ally to AI on same value, indiff to AI
if (selfAIcontrolled && iOtherAIControlled) {
if (selfPrimaryFaction == iOtherPrimaryFaction)
return FACTION_ALLY;
else
return FACTION_INDIFFERENT;
return FACTION_INDIFFERENTLY;
}
else
return FACTION_DUBIOUS;
return FACTION_DUBIOUSLY;
case -10: // -10 = atk to players, ally to AI on same value, indiff to AI
if (selfAIcontrolled && iOtherAIControlled) {
if (selfPrimaryFaction == iOtherPrimaryFaction)
return FACTION_ALLY;
else
return FACTION_INDIFFERENT;
return FACTION_INDIFFERENTLY;
}
else
return FACTION_SCOWLS;
@@ -5806,7 +5806,7 @@ FACTION_VALUE Mob::GetSpecialFactionCon(Mob* iOther) {
return FACTION_SCOWLS;
}
else
return FACTION_INDIFFERENT;
return FACTION_INDIFFERENTLY;
case -12: // -12 = dub to players, ally to AI on same value, atk to AI
if (selfAIcontrolled && iOtherAIControlled) {
if (selfPrimaryFaction == iOtherPrimaryFaction)
@@ -5817,7 +5817,7 @@ FACTION_VALUE Mob::GetSpecialFactionCon(Mob* iOther) {
}
else
return FACTION_DUBIOUS;
return FACTION_DUBIOUSLY;
case -13: // -13 = atk to players, ally to AI on same value, atk to AI
if (selfAIcontrolled && iOtherAIControlled) {
if (selfPrimaryFaction == iOtherPrimaryFaction)
@@ -5828,7 +5828,7 @@ FACTION_VALUE Mob::GetSpecialFactionCon(Mob* iOther) {
else
return FACTION_SCOWLS;
default:
return FACTION_INDIFFERENT;
return FACTION_INDIFFERENTLY;
}
}