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

Cleanup DetermineSpellTargets->ST_GroupNoPets

Browse Source
This commit is contained in:
nytmyr
2025-02-02 08:37:50 -06:00
parent 8a31caab6b
commit 32a7c01f33
1 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spells.cpp
+15 -37
View File
@@ -2173,47 +2173,25 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
case ST_Group: case ST_Group:
case ST_GroupNoPets: case ST_GroupNoPets:
{ {
if ( spell_target = this; // Default to self
IsClient() && CastToClient()->TGB() &&
IsTGBCompatibleSpell(spell_id) && bool tgb_enabled = (IsClient() && CastToClient()->TGB()) ||
(slot != CastingSlot::Item || RuleB(Spells, AllowItemTGB)) (IsBot() && RuleB(Bots, EnableBotTGB));
) { bool tgb_compatible = IsTGBCompatibleSpell(spell_id);
if ( bool item_tgb_allowed = (slot != CastingSlot::Item || RuleB(Spells, AllowItemTGB));
!target ||
target->IsCorpse() || if (tgb_enabled && tgb_compatible && item_tgb_allowed) {
( bool valid_target = target && !target->IsCorpse() &&
target->IsNPC() && (!target->IsNPC() ||
!(target->GetOwner() && target->GetOwner()->IsClient()) (target->GetOwner() && target->GetOwner()->IsOfClientBot()));
)
) { if (valid_target) {
spell_target = this;
}
else {
spell_target = target; spell_target = target;
} }
} }
else if (
IsBot() && RuleB(Bots, EnableBotTGB) &&
IsTGBCompatibleSpell(spell_id) &&
(slot != CastingSlot::Item || RuleB(Spells, AllowItemTGB))
) {
if (
!spell_target ||
spell_target->IsCorpse() ||
(
spell_target->IsNPC() &&
!(spell_target->GetOwner() && spell_target->GetOwner()->IsOfClientBot())
)
) {
spell_target = this;
}
}
else {
spell_target = this;
}
if (spell_target && spell_target->IsPet() && spells[spell_id].target_type == ST_GroupNoPets){ if (spell_target && spell_target->IsPet() && spells[spell_id].target_type == ST_GroupNoPets) {
MessageString(Chat::Red,NO_CAST_ON_PET); MessageString(Chat::Red, NO_CAST_ON_PET);
return false; return false;
} }