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

[Feature] EQ2-style implied targeting for spells. (#2032)

Browse Source 
* Implemented EQ2-style implied targeting for spells.

* Fixed nullptr w\ target that has no target
This commit is contained in:
catapultam-habeo 2022-03-06 18:25:40 -08:00 committed by GitHub
parent afc32afb02
commit eca2ed0321
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/ruletypes.h
View File

@ -414,6 +414,7 @@ RULE_BOOL(Spells, HOTsScaleWithHealAmt, false, "Allow HealAmt stat to affect HoT
RULE_BOOL(Spells, CompoundLifetapHeals, true, "True: Lifetap heals calculate damage bonuses and then heal bonuses. False: Lifetaps heal using the amount damaged to mob.")
RULE_BOOL(Spells, UseFadingMemoriesMaxLevel, false, "Enables to limit field in spell data to set the max level that over which an NPC will ignore fading memories effect and not lose aggro.")
RULE_BOOL(Spells, FixBeaconHeading, false, "Beacon spells use casters heading to fix live bug. False: Live like heading always 0.")
RULE_BOOL(Spells, UseSpellImpliedTargeting, false, "Replicates EQ2-style targeting behavior for spells. Spells will 'pass through' inappropriate targets to target's target if it is appropriate.")
RULE_CATEGORY_END()
RULE_CATEGORY(Combat)

18
zone/spells.cpp
View File

@ -179,6 +179,24 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
return false;
}
//Goal of Spells:UseSpellImpliedTargeting is to replicate the EQ2 feature where spells will 'pass through' invalid targets to target's target to try to find a valid target.
if (RuleB(Spells,UseSpellImpliedTargeting) && IsClient()) {
Mob* spell_target = entity_list.GetMobID(target_id);
if (spell_target && spell_target->GetTarget()) {
// If either this is beneficial and the target is not a player or player's pet or vis versa
if ((IsBeneficialSpell(spell_id) && (!(spell_target->IsClient() || (spell_target->HasOwner() && spell_target->GetOwner()->IsClient()))))
|| (IsDetrimentalSpell(spell_id) && (spell_target->IsClient() || (spell_target->HasOwner() && spell_target->GetOwner()->IsClient())))) {
//Check if the target's target is a valid target; we can use DoCastingChecksOnTarget() here because we can let it handle the failure as vanilla would
if (DoCastingChecksOnTarget(true, spell_id, spell_target->GetTarget())) {
target_id = spell_target->GetTarget()->GetID();
} else {
//Just return false here because we are going to fail the next check block anyway if we reach this point.
return false;
}
}
}
}
if (!DoCastingChecksOnCaster(spell_id, slot) ||
!DoCastingChecksZoneRestrictions(true, spell_id) ||
!DoCastingChecksOnTarget(true, spell_id, entity_list.GetMobID(target_id))) {