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

[Spells] Target's Target Combat Range Rule (#2274)

Browse Source
This commit is contained in:
Kinglykrab 2022-06-24 19:04:52 -04:00 committed by GitHub
parent 059a4b7568
commit 28b07d635a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/ruletypes.h
View File

@ -417,6 +417,7 @@ RULE_BOOL(Spells, UseSpellImpliedTargeting, false, "Replicates EQ2-style targeti
RULE_BOOL(Spells, BuffsFadeOnDeath, true, "Disable to keep buffs from fading on death") RULE_BOOL(Spells, BuffsFadeOnDeath, true, "Disable to keep buffs from fading on death")
RULE_BOOL(Spells, IllusionsAlwaysPersist, false, "Allows Illusions to persist beyond death and zoning always.") RULE_BOOL(Spells, IllusionsAlwaysPersist, false, "Allows Illusions to persist beyond death and zoning always.")
RULE_BOOL(Spells, UseItemCastMessage, false, "Enable to use the \"item begins to glow\" messages when casting from an item.") RULE_BOOL(Spells, UseItemCastMessage, false, "Enable to use the \"item begins to glow\" messages when casting from an item.")
RULE_BOOL(Spells, TargetsTargetRequiresCombatRange, true, "Disable to remove combat range requirement from Target's Target Spell Target Type")
RULE_CATEGORY_END() RULE_CATEGORY_END()
RULE_CATEGORY(Combat) RULE_CATEGORY(Combat)

7
zone/spells.cpp
View File

@ -2197,11 +2197,14 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
case ST_TargetsTarget: case ST_TargetsTarget:
{ {
Mob *spell_target_tot = spell_target ? spell_target->GetTarget() : nullptr; Mob *spell_target_tot = spell_target ? spell_target->GetTarget() : nullptr;
if(!spell_target_tot) if (!spell_target_tot) {
return false; return false;
}
//Verfied from live - Target's Target needs to be in combat range to recieve the effect //Verfied from live - Target's Target needs to be in combat range to recieve the effect
if (!CombatRange(spell_target)) if (RuleB(Spells, TargetsTargetRequiresCombatRange) && !CombatRange(spell_target)) {
return false; return false;
}
spell_target = spell_target_tot; spell_target = spell_target_tot;
CastAction = SingleTarget; CastAction = SingleTarget;