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

Core/Spells: Don't ignore power costs and reagents for spells triggered by SPELL_EFFECT_TRIGGER_SPELL, SPELL_EFFECT_TRIGGER_MISSILE, SPELL_EFFECT_FORCE_CAST, SPELL_AURA_PERIODIC_TRIGGER_SPELL, SPELL_AURA_PROC_TRIGGER_SPELL and fixed implementation of SPELL_ATTR6_DO_NOT_CONSUME_RESOURCES

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/54a83b4b689b7d2bbddb91fc79319dd806da8cc0)
This commit is contained in:
Hondacrx
2025-05-25 11:04:24 -04:00
parent 9b75d3255d
commit 486d80ceb9
5 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/Spells/SpellConst.cs
+1 -1
View File
@@ -1907,7 +1907,7 @@ namespace Framework.Constants
NotAnAttack = 0x04, /*Nyi*/ // Not An Attack NotAnAttack = 0x04, /*Nyi*/ // Not An Attack
CanAssistImmunePc = 0x08, // Can Assist Immune Pc CanAssistImmunePc = 0x08, // Can Assist Immune Pc
IgnoreForModTimeRate = 0x10, /*Nyi, Time Rate Not Implemented*/ // Ignore For Mod Time Rate IgnoreForModTimeRate = 0x10, /*Nyi, Time Rate Not Implemented*/ // Ignore For Mod Time Rate
DoNotConsumeResources = 0x20, // Do Not Consume Resources DoNotConsumeResources = 0x20, // Do Not Consume Resources Requires power/reagents to cast but doesn't consume them
FloatingCombatTextOnCast = 0x40, // Floating Combat Text On Cast (Client Only) FloatingCombatTextOnCast = 0x40, // Floating Combat Text On Cast (Client Only)
AuraIsWeaponProc = 0x80, // Aura Is Weapon Proc AuraIsWeaponProc = 0x80, // Aura Is Weapon Proc
DoNotChainToCrowdControlledTargets = 0x100, // Do Not Chain To Crowd-Controlled Targets Description Implicit Targeting (Chaining And Area Targeting) Will Not Impact Crowd Controlled Targets DoNotChainToCrowdControlledTargets = 0x100, // Do Not Chain To Crowd-Controlled Targets Description Implicit Targeting (Chaining And Area Targeting) Will Not Impact Crowd Controlled Targets
Source/Game/Spells/Auras/Aura.cs
+8 -5
View File
@@ -350,12 +350,15 @@ namespace Game.Spells
m_lastProcAttemptTime = (DateTime.Now - TimeSpan.FromSeconds(10)); m_lastProcAttemptTime = (DateTime.Now - TimeSpan.FromSeconds(10));
m_lastProcSuccessTime = (DateTime.Now - TimeSpan.FromSeconds(120)); m_lastProcSuccessTime = (DateTime.Now - TimeSpan.FromSeconds(120));
foreach (SpellPowerRecord power in m_spellInfo.PowerCosts) if (!m_spellInfo.HasAttribute(SpellAttr6.DoNotConsumeResources))
if (power != null && (power.ManaPerSecond != 0 || power.PowerPctPerSecond > 0.0f)) {
m_periodicCosts.Add(power); foreach (SpellPowerRecord power in m_spellInfo.PowerCosts)
if (power != null && (power.ManaPerSecond != 0 || power.PowerPctPerSecond > 0.0f))
m_periodicCosts.Add(power);
if (!m_periodicCosts.Empty()) if (!m_periodicCosts.Empty())
m_timeCla = 1 * Time.InMilliseconds; m_timeCla = 1 * Time.InMilliseconds;
}
m_maxDuration = CalcMaxDuration(createInfo.Caster); m_maxDuration = CalcMaxDuration(createInfo.Caster);
m_duration = m_maxDuration; m_duration = m_maxDuration;
Source/Game/Spells/Auras/AuraEffect.cs
+6 -2
View File
@@ -5143,7 +5143,7 @@ namespace Game.Spells
Unit triggerCaster = triggeredSpellInfo.NeedsToBeTriggeredByCaster(m_spellInfo) ? caster : target; Unit triggerCaster = triggeredSpellInfo.NeedsToBeTriggeredByCaster(m_spellInfo) ? caster : target;
if (triggerCaster != null) if (triggerCaster != null)
{ {
triggerCaster.CastSpell(target, triggerSpellId, new CastSpellExtraArgs(this)); triggerCaster.CastSpell(target, triggerSpellId, new CastSpellExtraArgs(TriggerCastFlags.FullMask & ~(TriggerCastFlags.IgnorePowerCost | TriggerCastFlags.IgnoreReagentCost)).TriggeringAura = this);
Log.outDebug(LogFilter.Spells, "AuraEffect.HandlePeriodicTriggerSpellAuraTick: Spell {0} Trigger {1}", GetId(), triggeredSpellInfo.Id); Log.outDebug(LogFilter.Spells, "AuraEffect.HandlePeriodicTriggerSpellAuraTick: Spell {0} Trigger {1}", GetId(), triggeredSpellInfo.Id);
} }
} }
@@ -5167,6 +5167,7 @@ namespace Game.Spells
if (triggerCaster != null) if (triggerCaster != null)
{ {
CastSpellExtraArgs args = new(this); CastSpellExtraArgs args = new(this);
args.SetTriggerFlags(TriggerCastFlags.FullMask & ~(TriggerCastFlags.IgnorePowerCost | TriggerCastFlags.IgnoreReagentCost));
for (int i = 0; i < SpellConst.MaxEffects; ++i) for (int i = 0; i < SpellConst.MaxEffects; ++i)
args.AddSpellMod(SpellValueMod.BasePoint0 + i, GetAmount()); args.AddSpellMod(SpellValueMod.BasePoint0 + i, GetAmount());
@@ -5712,7 +5713,9 @@ namespace Game.Spells
if (triggeredSpellInfo != null) if (triggeredSpellInfo != null)
{ {
Log.outDebug(LogFilter.Spells, $"AuraEffect.HandleProcTriggerSpellAuraProc: Triggering spell {triggeredSpellInfo.Id} from aura {GetId()} proc"); Log.outDebug(LogFilter.Spells, $"AuraEffect.HandleProcTriggerSpellAuraProc: Triggering spell {triggeredSpellInfo.Id} from aura {GetId()} proc");
triggerCaster.CastSpell(triggerTarget, triggeredSpellInfo.Id, new CastSpellExtraArgs(this).SetTriggeringSpell(eventInfo.GetProcSpell())); triggerCaster.CastSpell(triggerTarget, triggeredSpellInfo.Id, new CastSpellExtraArgs(this)
.SetTriggeringSpell(eventInfo.GetProcSpell())
.SetTriggerFlags(TriggerCastFlags.FullMask & ~(TriggerCastFlags.IgnorePowerCost | TriggerCastFlags.IgnoreReagentCost)));
} }
else if (triggerSpellId != 0 && GetAuraType() != AuraType.Dummy) else if (triggerSpellId != 0 && GetAuraType() != AuraType.Dummy)
Log.outError(LogFilter.Spells, $"AuraEffect.HandleProcTriggerSpellAuraProc: Spell {GetId()} has non-existent spell {triggerSpellId} in EffectTriggered[{GetEffIndex()}] and is therefore not triggered."); Log.outError(LogFilter.Spells, $"AuraEffect.HandleProcTriggerSpellAuraProc: Spell {GetId()} has non-existent spell {triggerSpellId} in EffectTriggered[{GetEffIndex()}] and is therefore not triggered.");
@@ -5736,6 +5739,7 @@ namespace Game.Spells
if (triggeredSpellInfo != null) if (triggeredSpellInfo != null)
{ {
CastSpellExtraArgs args = new(this); CastSpellExtraArgs args = new(this);
args.SetTriggerFlags(TriggerCastFlags.FullMask & ~(TriggerCastFlags.IgnorePowerCost | TriggerCastFlags.IgnoreReagentCost));
args.SetTriggeringSpell(eventInfo.GetProcSpell()); args.SetTriggeringSpell(eventInfo.GetProcSpell());
args.AddSpellMod(SpellValueMod.BasePoint0, GetAmount()); args.AddSpellMod(SpellValueMod.BasePoint0, GetAmount());
triggerCaster.CastSpell(triggerTarget, triggerSpellId, args); triggerCaster.CastSpell(triggerTarget, triggerSpellId, args);
Source/Game/Spells/Spell.cs
+3 -3
View File
@@ -4716,7 +4716,7 @@ namespace Game.Spells
if (unitCaster == null) if (unitCaster == null)
return; return;
if (m_CastItem != null || m_triggeredByAuraSpell != null) if (m_CastItem != null || m_spellInfo.HasAttribute(SpellAttr6.DoNotConsumeResources))
return; return;
//Don't take power if the spell is cast while .cheat power is enabled. //Don't take power if the spell is cast while .cheat power is enabled.
@@ -4774,7 +4774,7 @@ namespace Game.Spells
if (unitCaster == null) if (unitCaster == null)
return; return;
if (m_CastItem != null || m_triggeredByAuraSpell != null) if (m_CastItem != null || m_spellInfo.HasAttribute(SpellAttr6.DoNotConsumeResources))
return; return;
//Don't take power if the spell is cast while .cheat power is enabled. //Don't take power if the spell is cast while .cheat power is enabled.
@@ -4868,7 +4868,7 @@ namespace Game.Spells
return; return;
// do not take reagents for these item casts // do not take reagents for these item casts
if (m_CastItem != null && m_CastItem.GetTemplate().HasFlag(ItemFlags.NoReagentCost)) if ((m_CastItem != null && m_CastItem.GetTemplate().HasFlag(ItemFlags.NoReagentCost)) || m_spellInfo.HasAttribute(SpellAttr6.DoNotConsumeResources))
return; return;
Player p_caster = m_caster.ToPlayer(); Player p_caster = m_caster.ToPlayer();
Source/Game/Spells/SpellEffects.cs
+3 -3
View File
@@ -309,7 +309,7 @@ namespace Game.Spells
targets.Update(caster); // refresh pointers stored in targets targets.Update(caster); // refresh pointers stored in targets
// original caster guid only for GO cast // original caster guid only for GO cast
CastSpellExtraArgs args = new(TriggerCastFlags.FullMask); CastSpellExtraArgs args = new(TriggerCastFlags.FullMask & ~(TriggerCastFlags.IgnorePowerCost | TriggerCastFlags.IgnoreReagentCost));
args.SetOriginalCaster(originalCaster); args.SetOriginalCaster(originalCaster);
args.OriginalCastId = originalCastId; args.OriginalCastId = originalCastId;
args.OriginalCastItemLevel = itemLevel; args.OriginalCastItemLevel = itemLevel;
@@ -389,7 +389,7 @@ namespace Game.Spells
} }
} }
CastSpellExtraArgs args = new(TriggerCastFlags.FullMask); CastSpellExtraArgs args = new(TriggerCastFlags.FullMask & ~(TriggerCastFlags.IgnorePowerCost | TriggerCastFlags.IgnoreReagentCost));
args.SetOriginalCaster(m_originalCasterGUID); args.SetOriginalCaster(m_originalCasterGUID);
args.SetTriggeringSpell(this); args.SetTriggeringSpell(this);
args.SetCustomArg(m_customArg); args.SetCustomArg(m_customArg);
@@ -464,7 +464,7 @@ namespace Game.Spells
return; return;
} }
CastSpellExtraArgs args = new(TriggerCastFlags.FullMask); CastSpellExtraArgs args = new(TriggerCastFlags.FullMask & ~(TriggerCastFlags.IgnorePowerCost | TriggerCastFlags.IgnoreReagentCost));
args.SetTriggeringSpell(this); args.SetTriggeringSpell(this);
// set basepoints for trigger with value effect // set basepoints for trigger with value effect
if (effectInfo.Effect == SpellEffectName.ForceCastWithValue) if (effectInfo.Effect == SpellEffectName.ForceCastWithValue)