Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Changed channel triggered spells to inherit positive/negative status from main spells

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/16135b5096716eee7f7a9a364713e267a5c4bfa0)
This commit is contained in:
hondacrx
2021-03-17 13:45:36 -04:00
parent 127aff8573
commit 369c4526be
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Spell.cs
+17 -12
View File
@@ -538,7 +538,7 @@ namespace Game.Spells
break; break;
case SpellTargetCheckTypes.Entry: case SpellTargetCheckTypes.Entry:
case SpellTargetCheckTypes.Default: case SpellTargetCheckTypes.Default:
range = m_spellInfo.GetMaxRange(m_spellInfo.IsPositive(), m_caster, this); range = m_spellInfo.GetMaxRange(IsPositive(), m_caster, this);
break; break;
default: default:
Cypher.Assert(false, "Spell.SelectImplicitNearbyTargets: received not implemented selection check type"); Cypher.Assert(false, "Spell.SelectImplicitNearbyTargets: received not implemented selection check type");
@@ -1614,7 +1614,7 @@ namespace Game.Spells
// Calculate hit result // Calculate hit result
if (m_originalCaster != null) if (m_originalCaster != null)
{ {
targetInfo.missCondition = m_originalCaster.SpellHitResult(target, m_spellInfo, m_canReflect && !(m_spellInfo.IsPositive() && m_caster.IsFriendlyTo(target))); targetInfo.missCondition = m_originalCaster.SpellHitResult(target, m_spellInfo, m_canReflect && !(IsPositive() && m_caster.IsFriendlyTo(target)));
if (m_skipCheck && targetInfo.missCondition != SpellMissInfo.Immune) if (m_skipCheck && targetInfo.missCondition != SpellMissInfo.Immune)
targetInfo.missCondition = SpellMissInfo.None; targetInfo.missCondition = SpellMissInfo.None;
} }
@@ -1802,7 +1802,7 @@ namespace Game.Spells
if (unit.IsAlive() != target.alive) if (unit.IsAlive() != target.alive)
return; return;
if (GetState() == SpellState.Delayed && !m_spellInfo.IsPositive() && (GameTime.GetGameTimeMS() - target.timeDelay) <= unit.LastSanctuaryTime) if (GetState() == SpellState.Delayed && !IsPositive() && (GameTime.GetGameTimeMS() - target.timeDelay) <= unit.LastSanctuaryTime)
return; // No missinfo in that case return; // No missinfo in that case
// Get original caster (if exist) and calculate damage/healing from him data // Get original caster (if exist) and calculate damage/healing from him data
@@ -2016,7 +2016,7 @@ namespace Game.Spells
m_hitMask |= hitMask; m_hitMask |= hitMask;
// spellHitTarget can be null if spell is missed in DoSpellHitOnUnit // spellHitTarget can be null if spell is missed in DoSpellHitOnUnit
if (missInfo != SpellMissInfo.Evade && spellHitTarget && !m_caster.IsFriendlyTo(unit) && (!m_spellInfo.IsPositive() || m_spellInfo.HasEffect(SpellEffectName.Dispel))) if (missInfo != SpellMissInfo.Evade && spellHitTarget && !m_caster.IsFriendlyTo(unit) && (!IsPositive() || m_spellInfo.HasEffect(SpellEffectName.Dispel)))
{ {
m_caster.CombatStart(unit, m_spellInfo.HasInitialAggro()); m_caster.CombatStart(unit, m_spellInfo.HasInitialAggro());
@@ -2103,7 +2103,7 @@ namespace Game.Spells
// @todo this cause soul transfer bugged // @todo this cause soul transfer bugged
// 63881 - Malady of the Mind jump spell (Yogg-Saron) // 63881 - Malady of the Mind jump spell (Yogg-Saron)
// 45034 - Curse of Boundless Agony jump spell (Kalecgos) // 45034 - Curse of Boundless Agony jump spell (Kalecgos)
if (m_spellInfo.HasHitDelay() && unit.IsPlayer() && !m_spellInfo.IsPositive() && m_spellInfo.Id != 63881 && m_spellInfo.Id != 45034) if (m_spellInfo.HasHitDelay() && unit.IsPlayer() && !IsPositive() && m_spellInfo.Id != 63881 && m_spellInfo.Id != 45034)
return SpellMissInfo.Evade; return SpellMissInfo.Evade;
// assisting case, healing and resurrection // assisting case, healing and resurrection
@@ -2364,7 +2364,7 @@ namespace Game.Spells
float range = 0; float range = 0;
if (channelAuraMask != 0) if (channelAuraMask != 0)
{ {
range = m_spellInfo.GetMaxRange(m_spellInfo.IsPositive()); range = m_spellInfo.GetMaxRange(IsPositive());
Player modOwner = m_caster.GetSpellModOwner(); Player modOwner = m_caster.GetSpellModOwner();
if (modOwner != null) if (modOwner != null)
modOwner.ApplySpellMod(m_spellInfo, SpellModOp.Range, ref range, this); modOwner.ApplySpellMod(m_spellInfo, SpellModOp.Range, ref range, this);
@@ -2908,9 +2908,9 @@ namespace Game.Spells
if (procAttacker == 0) if (procAttacker == 0)
{ {
if (m_spellInfo.DmgClass == SpellDmgClass.Magic) if (m_spellInfo.DmgClass == SpellDmgClass.Magic)
procAttacker = m_spellInfo.IsPositive() ? ProcFlags.DoneSpellMagicDmgClassPos : ProcFlags.DoneSpellMagicDmgClassNeg; procAttacker = IsPositive() ? ProcFlags.DoneSpellMagicDmgClassPos : ProcFlags.DoneSpellMagicDmgClassNeg;
else else
procAttacker = m_spellInfo.IsPositive() ? ProcFlags.DoneSpellNoneDmgClassPos : ProcFlags.DoneSpellNoneDmgClassNeg; procAttacker = IsPositive() ? ProcFlags.DoneSpellNoneDmgClassPos : ProcFlags.DoneSpellNoneDmgClassNeg;
} }
ProcFlagsHit hitMask = m_hitMask; ProcFlagsHit hitMask = m_hitMask;
@@ -3136,9 +3136,9 @@ namespace Game.Spells
if (procAttacker == 0) if (procAttacker == 0)
{ {
if (m_spellInfo.DmgClass == SpellDmgClass.Magic) if (m_spellInfo.DmgClass == SpellDmgClass.Magic)
procAttacker = m_spellInfo.IsPositive() ? ProcFlags.DoneSpellMagicDmgClassPos : ProcFlags.DoneSpellMagicDmgClassNeg; procAttacker = IsPositive() ? ProcFlags.DoneSpellMagicDmgClassPos : ProcFlags.DoneSpellMagicDmgClassNeg;
else else
procAttacker = m_spellInfo.IsPositive() ? ProcFlags.DoneSpellNoneDmgClassPos : ProcFlags.DoneSpellNoneDmgClassNeg; procAttacker = IsPositive() ? ProcFlags.DoneSpellNoneDmgClassPos : ProcFlags.DoneSpellNoneDmgClassNeg;
} }
m_originalCaster.ProcSkillsAndAuras(null, procAttacker, ProcFlags.None, ProcFlagsSpellType.MaskAll, ProcFlagsSpellPhase.Finish, m_hitMask, this, null, null); m_originalCaster.ProcSkillsAndAuras(null, procAttacker, ProcFlags.None, ProcFlagsSpellType.MaskAll, ProcFlagsSpellPhase.Finish, m_hitMask, this, null, null);
@@ -4380,7 +4380,7 @@ namespace Game.Spells
continue; continue;
// positive spells distribute threat among all units that are in combat with target, like healing // positive spells distribute threat among all units that are in combat with target, like healing
if (m_spellInfo.IsPositive()) if (IsPositive())
target.GetThreatManager().ForwardThreatForAssistingMe(m_caster, threatToAdd, m_spellInfo); target.GetThreatManager().ForwardThreatForAssistingMe(m_caster, threatToAdd, m_spellInfo);
// for negative spells threat gets distributed among affected targets // for negative spells threat gets distributed among affected targets
else else
@@ -4391,7 +4391,7 @@ namespace Game.Spells
target.GetThreatManager().AddThreat(m_caster, threatToAdd, m_spellInfo, true); target.GetThreatManager().AddThreat(m_caster, threatToAdd, m_spellInfo, true);
} }
} }
Log.outDebug(LogFilter.Spells, "Spell {0}, added an additional {1} threat for {2} {3} target(s)", m_spellInfo.Id, threat, m_spellInfo.IsPositive() ? "assisting" : "harming", m_UniqueTargetInfo.Count); Log.outDebug(LogFilter.Spells, "Spell {0}, added an additional {1} threat for {2} {3} target(s)", m_spellInfo.Id, threat, IsPositive() ? "assisting" : "harming", m_UniqueTargetInfo.Count);
} }
void HandleEffects(Unit pUnitTarget, Item pItemTarget, GameObject pGOTarget, uint i, SpellEffectHandleMode mode) void HandleEffects(Unit pUnitTarget, Item pItemTarget, GameObject pGOTarget, uint i, SpellEffectHandleMode mode)
@@ -6708,6 +6708,11 @@ namespace Game.Spells
return true; return true;
} }
bool IsPositive()
{
return m_spellInfo.IsPositive() && (m_triggeredByAuraSpell == null || m_triggeredByAuraSpell.IsPositive());
}
bool IsNeedSendToClient() bool IsNeedSendToClient()
{ {
return m_SpellVisual.SpellXSpellVisualID != 0 || m_SpellVisual.ScriptVisualID != 0 || m_spellInfo.IsChanneled() || return m_SpellVisual.SpellXSpellVisualID != 0 || m_SpellVisual.ScriptVisualID != 0 || m_spellInfo.IsChanneled() ||