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

Scripts/Items: Updated Amalgam's Seventh Spine script - fixed auras lingering after removal and added new case for evokers

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/250984a7b7b9016fc675dd4cfe0d29d164cc61bd)
This commit is contained in:
Hondacrx
2024-08-19 12:27:21 -04:00
parent cf42b5e591
commit 40ba30a61c
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/Spells/Item.cs
+19 -4
View File
@@ -3877,13 +3877,14 @@ namespace Scripts.Spells.Azerite
const uint SpellFragileEchoesPaladin = 225297; const uint SpellFragileEchoesPaladin = 225297;
const uint SpellFragileEchoesDruid = 225298; const uint SpellFragileEchoesDruid = 225298;
const uint SpellFragileEchoesPriestHoly = 225366; const uint SpellFragileEchoesPriestHoly = 225366;
const uint SpellFragileEchoesEvoker = 429020;
public override bool Validate(SpellInfo spellInfo) public override bool Validate(SpellInfo spellInfo)
{ {
return ValidateSpellInfo(SpellFragileEchoesMonk, SpellFragileEchoesShaman, SpellFragileEchoesPriestDiscipline, SpellFragileEchoesPaladin, SpellFragileEchoesDruid, SpellFragileEchoesPriestHoly); return ValidateSpellInfo(SpellFragileEchoesMonk, SpellFragileEchoesShaman, SpellFragileEchoesPriestDiscipline, SpellFragileEchoesPaladin, SpellFragileEchoesDruid, SpellFragileEchoesPriestHoly, SpellFragileEchoesEvoker);
} }
void UpdateSpecAura() void UpdateSpecAura(bool apply)
{ {
Player target = GetUnitOwner().ToPlayer(); Player target = GetUnitOwner().ToPlayer();
if (target == null) if (target == null)
@@ -3891,7 +3892,7 @@ namespace Scripts.Spells.Azerite
void updateAuraIfInCorrectSpec(ChrSpecialization spec, uint aura) void updateAuraIfInCorrectSpec(ChrSpecialization spec, uint aura)
{ {
if (target.GetPrimarySpecialization() != spec) if (!apply || target.GetPrimarySpecialization() != spec)
target.RemoveAurasDueToSpell(aura); target.RemoveAurasDueToSpell(aura);
else if (!target.HasAura(aura)) else if (!target.HasAura(aura))
target.CastSpell(target, aura, GetEffect(0)); target.CastSpell(target, aura, GetEffect(0));
@@ -3915,14 +3916,28 @@ namespace Scripts.Spells.Azerite
case Class.Druid: case Class.Druid:
updateAuraIfInCorrectSpec(ChrSpecialization.DruidRestoration, SpellFragileEchoesDruid); updateAuraIfInCorrectSpec(ChrSpecialization.DruidRestoration, SpellFragileEchoesDruid);
break; break;
case Class.Evoker:
updateAuraIfInCorrectSpec(ChrSpecialization.EvokerPreservation, SpellFragileEchoesEvoker);
break;
default: default:
break; break;
} }
} }
void HandleHeartbeat()
{
UpdateSpecAura(true);
}
void HandleRemove(AuraEffect aurEff, AuraEffectHandleModes mode)
{
UpdateSpecAura(false);
}
public override void Register() public override void Register()
{ {
OnHeartbeat.Add(new(UpdateSpecAura)); OnHeartbeat.Add(new(HandleHeartbeat));
AfterEffectRemove.Add(new(HandleRemove, 0, AuraType.Dummy, AuraEffectHandleModes.Real));
} }
} }