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

[Bots] Fix pets causing aggro (#4677)

Browse Source 
- Adds the rule `Aggro, AggroBotPets`
This commit is contained in:
nytmyr 2025-02-15 15:02:38 -06:00 committed by GitHub
parent b0c951bd6e
commit 3ba113a91d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/ruletypes.h
View File

@ -713,6 +713,7 @@ RULE_INT(Aggro, BardAggroCap, 40, "per song bard aggro cap.")
RULE_INT(Aggro, InitialAggroBonus, 100, "Initial Aggro Bonus, Default: 100")
RULE_INT(Aggro, InitialPetAggroBonus, 100, "Initial Pet Aggro Bonus, Default 100")
RULE_STRING(Aggro, ExcludedFleeAllyFactionIDs, "0|5013|5014|5023|5032", "Common Faction IDs that are excluded from faction checks in EntityList::FleeAllyCount")
RULE_BOOL(Aggro, AggroBotPets, false, "If enabled, NPCs will aggro bot pets")
RULE_CATEGORY_END()
RULE_CATEGORY(TaskSystem)

43
zone/aggro.cpp
View File

@ -405,18 +405,13 @@ bool Mob::CheckWillAggro(Mob *mob) {
return false;
}
Mob *pet_owner = mob->GetOwner();
if (
pet_owner &&
pet_owner->IsClient() &&
(
!RuleB(Aggro, AggroPlayerPets) ||
pet_owner->CastToClient()->GetGM() ||
mob->GetSpecialAbility(SpecialAbility::AggroImmunity)
)
) {
Mob* pet_owner = mob->GetOwner();
if (pet_owner && pet_owner->IsOfClientBot()) {
if (mob->IsPetAggroExempt(pet_owner)) {
return false;
}
}
if (IsNPC() && mob->IsNPC() && mob->GetSpecialAbility(SpecialAbility::NPCAggroImmunity)) {
return false;
@ -582,6 +577,34 @@ bool Mob::CheckWillAggro(Mob *mob) {
return false;
}
bool Mob::IsPetAggroExempt(Mob* pet_owner) {
if (!pet_owner) {
return false;
}
bool exempt_client_pet = pet_owner->IsClient() && !RuleB(Aggro, AggroPlayerPets);
bool exempt_bot_pet = pet_owner->IsBot() && !RuleB(Aggro, AggroBotPets);
if (exempt_client_pet || exempt_bot_pet) {
return true;
}
Mob* ultimate_owner = GetUltimateOwner();
Client* client_owner = (ultimate_owner && ultimate_owner->IsClient())
? ultimate_owner->CastToClient()
: nullptr;
if (client_owner && client_owner->GetGM()) {
return true;
}
if (GetSpecialAbility(SpecialAbility::AggroImmunity)) {
return true;
}
return false;
}
int EntityList::FleeAllyCount(Mob* attacker, Mob* skipped)
{
// Return a list of how many NPCs of the same faction or race are within aggro range of the given exclude Mob.

1
zone/mob.h
View File

@ -1289,6 +1289,7 @@ public:
void SetLooting(uint16 val) { entity_id_being_looted = val; }
bool CheckWillAggro(Mob *mob);
bool IsPetAggroExempt(Mob *pet_owner);
void InstillDoubt(Mob *who);
bool Charmed() const { return type_of_pet == petCharmed; }