pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-15 04:32:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make inspect buffs LAA optional for target buffs

Browse Source
This commit is contained in:
Michael Cook (mackal) 2015-06-07 22:31:21 -04:00
parent c2e4365214
commit f198ab714f
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/ruletypes.h
View File

@ -345,6 +345,7 @@ RULE_BOOL ( Spells, SwarmPetTargetLock, false) // Use old method of swarm pets t
RULE_BOOL ( Spells, NPC_UseFocusFromSpells, true) // Allow npcs to use most spell derived focus effects. RULE_BOOL ( Spells, NPC_UseFocusFromSpells, true) // Allow npcs to use most spell derived focus effects.
RULE_BOOL ( Spells, NPC_UseFocusFromItems, false) // Allow npcs to use most item derived focus effects. RULE_BOOL ( Spells, NPC_UseFocusFromItems, false) // Allow npcs to use most item derived focus effects.
RULE_BOOL ( Spells, UseAdditiveFocusFromWornSlot, false) // Allows an additive focus effect to be calculated from worn slot. RULE_BOOL ( Spells, UseAdditiveFocusFromWornSlot, false) // Allows an additive focus effect to be calculated from worn slot.
RULE_BOOL ( Spells, AlwaysSendTargetsBuffs, false) // ignore LAA level if true
RULE_CATEGORY_END() RULE_CATEGORY_END()
RULE_CATEGORY( Combat ) RULE_CATEGORY( Combat )

1
utils/sql/git/optional/2015_06_07_SpellsTargetBuffsRule.sql Normal file
View File

@ -0,0 +1 @@
INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Spells:AlwaysSendTargetBuffs', 'false', 'Allows the server to send the targets buffs ignoring the LAA.');

2
zone/client_packet.cpp
View File

@ -12897,7 +12897,7 @@ void Client::Handle_OP_TargetCommand(const EQApplicationPacket *app)
inspect_buffs = group->GetLeadershipAA(groupAAInspectBuffs); inspect_buffs = group->GetLeadershipAA(groupAAInspectBuffs);
} }
} }
if (nt == this || inspect_buffs || (nt->IsClient() && !nt->CastToClient()->GetPVP()) || if (GetGM() || RuleB(Spells, AlwaysSendTargetsBuffs) || nt == this || inspect_buffs || (nt->IsClient() && !nt->CastToClient()->GetPVP()) ||
(nt->IsPet() && nt->GetOwner() && nt->GetOwner()->IsClient() && !nt->GetOwner()->CastToClient()->GetPVP()) || (nt->IsPet() && nt->GetOwner() && nt->GetOwner()->IsClient() && !nt->GetOwner()->CastToClient()->GetPVP()) ||
(nt->IsMerc() && nt->GetOwner() && nt->GetOwner()->IsClient() && !nt->GetOwner()->CastToClient()->GetPVP())) (nt->IsMerc() && nt->GetOwner() && nt->GetOwner()->IsClient() && !nt->GetOwner()->CastToClient()->GetPVP()))
nt->SendBuffsToClient(this); nt->SendBuffsToClient(this);

12
zone/entity.cpp
View File

@ -79,7 +79,7 @@ Client *Entity::CastToClient()
} }
#ifdef _EQDEBUG #ifdef _EQDEBUG
if (!IsClient()) { if (!IsClient()) {
Log.Out(Logs::General, Logs::Error, "CastToClient error (not client)"); Log.Out(Logs::General, Logs::Error, "CastToClient error (not client)");
return 0; return 0;
} }
#endif #endif
@ -268,7 +268,7 @@ const Beacon* Entity::CastToBeacon() const
return static_cast<const Beacon *>(this); return static_cast<const Beacon *>(this);
} }
const Encounter* Entity::CastToEncounter() const const Encounter* Entity::CastToEncounter() const
{ {
return static_cast<const Encounter *>(this); return static_cast<const Encounter *>(this);
} }
@ -565,7 +565,7 @@ void EntityList::AddGroup(Group *group)
uint32 gid = worldserver.NextGroupID(); uint32 gid = worldserver.NextGroupID();
if (gid == 0) { if (gid == 0) {
Log.Out(Logs::General, Logs::Error, Log.Out(Logs::General, Logs::Error,
"Unable to get new group ID from world server. group is going to be broken."); "Unable to get new group ID from world server. group is going to be broken.");
return; return;
} }
@ -594,7 +594,7 @@ void EntityList::AddRaid(Raid *raid)
uint32 gid = worldserver.NextGroupID(); uint32 gid = worldserver.NextGroupID();
if (gid == 0) { if (gid == 0) {
Log.Out(Logs::General, Logs::Error, Log.Out(Logs::General, Logs::Error,
"Unable to get new group ID from world server. group is going to be broken."); "Unable to get new group ID from world server. group is going to be broken.");
return; return;
} }
@ -1428,7 +1428,9 @@ void EntityList::QueueClientsByTarget(Mob *sender, const EQApplicationPacket *ap
if (c != sender) { if (c != sender) {
if (Target == sender) { if (Target == sender) {
if (inspect_buffs) { // if inspect_buffs is true we're sending a mob's buffs to those with the LAA if (inspect_buffs) { // if inspect_buffs is true we're sending a mob's buffs to those with the LAA
if (c->IsRaidGrouped()) { if (c->GetGM() || RuleB(Spells, AlwaysSendTargetsBuffs)) {
Send = true;
} else if (c->IsRaidGrouped()) {
Raid *raid = c->GetRaid(); Raid *raid = c->GetRaid();
if (!raid) if (!raid)
continue; continue;