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

Scripts/Spells: Fix shaman Lava Surge proc

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/5b57722211dbb6a63c84119fc141304970c80312)
This commit is contained in:
hondacrx
2022-03-04 17:43:21 -05:00
parent 8c6e487e5a
commit 3143cf5c9d
1 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/Spells/Shaman.cs
+33 -2
View File
@@ -24,6 +24,7 @@ using Game.Scripting;
using Game.Spells; using Game.Spells;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
namespace Scripts.Spells.Shaman namespace Scripts.Spells.Shaman
{ {
@@ -916,7 +917,7 @@ namespace Scripts.Spells.Shaman
{ {
public override bool Validate(SpellInfo spellInfo) public override bool Validate(SpellInfo spellInfo)
{ {
return ValidateSpellInfo(SpellIds.PathOfFlamesTalent, SpellIds.PathOfFlamesSpread); return ValidateSpellInfo(SpellIds.PathOfFlamesTalent, SpellIds.PathOfFlamesSpread, SpellIds.LavaSurge);
} }
void HandleScript(uint effIndex) void HandleScript(uint effIndex)
@@ -929,9 +930,28 @@ namespace Scripts.Spells.Shaman
} }
} }
void EnsureLavaSurgeCanBeImmediatelyConsumed()
{
Unit caster = GetCaster();
Aura lavaSurge = caster.GetAura(SpellIds.LavaSurge);
if (lavaSurge != null)
{
if (!GetSpell().m_appliedMods.Contains(lavaSurge))
{
uint chargeCategoryId = GetSpellInfo().ChargeCategoryId;
// Ensure we have at least 1 usable charge after cast to allow next cast immediately
if (!caster.GetSpellHistory().HasCharge(chargeCategoryId))
caster.GetSpellHistory().RestoreCharge(chargeCategoryId);
}
}
}
public override void Register() public override void Register()
{ {
OnEffectHitTarget.Add(new EffectHandler(HandleScript, 0, SpellEffectName.TriggerMissile)); OnEffectHitTarget.Add(new EffectHandler(HandleScript, 0, SpellEffectName.TriggerMissile));
AfterCast.Add(new CastHandler(EnsureLavaSurgeCanBeImmediatelyConsumed));
} }
} }
@@ -967,7 +987,17 @@ namespace Scripts.Spells.Shaman
{ {
public override bool Validate(SpellInfo spellInfo) public override bool Validate(SpellInfo spellInfo)
{ {
return ValidateSpellInfo(SpellIds.LavaSurge); return ValidateSpellInfo(SpellIds.LavaSurge, SpellIds.IgneousPotential);
}
bool CheckProcChance(AuraEffect aurEff, ProcEventInfo eventInfo)
{
int procChance = aurEff.GetAmount();
AuraEffect igneousPotential = GetTarget().GetAuraEffect(SpellIds.IgneousPotential, 0);
if (igneousPotential != null)
procChance += igneousPotential.GetAmount();
return RandomHelper.randChance(procChance);
} }
void HandleEffectProc(AuraEffect aurEff, ProcEventInfo eventInfo) void HandleEffectProc(AuraEffect aurEff, ProcEventInfo eventInfo)
@@ -978,6 +1008,7 @@ namespace Scripts.Spells.Shaman
public override void Register() public override void Register()
{ {
DoCheckEffectProc.Add(new CheckEffectProcHandler(CheckProcChance, 0, AuraType.Dummy));
OnEffectProc.Add(new EffectProcHandler(HandleEffectProc, 0, AuraType.Dummy)); OnEffectProc.Add(new EffectProcHandler(HandleEffectProc, 0, AuraType.Dummy));
} }
} }