From 6081b6a816f1474b9a938f390b5d762cb39017ed Mon Sep 17 00:00:00 2001 From: sanctum32 Date: Mon, 21 Oct 2013 10:26:26 +0300 Subject: [PATCH] [12706] Implement some spells for Ahune encounter Spell entries: 46371, 46372 and 46430 (original author @xfurry) --- src/game/Spell.cpp | 1 + src/game/SpellAuras.cpp | 5 +++-- src/game/SpellEffects.cpp | 16 ++++++++++++++++ src/shared/revision_nr.h | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index c3d1356ea..25d1107c6 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -7892,6 +7892,7 @@ void Spell::GetSpellRangeAndRadius(SpellEffectEntry const* spellEffect, float& r case 45785: // Sinister Reflection Clone (SWP, Kil'jaeden) case 45892: // Sinister Reflection (SWP, Kil'jaeden) case 45976: // Open Portal (SWP, M'uru) + case 46372: // Ice Spear Target Picker (Slave Pens, Ahune) case 47669: // Awaken Subboss (Utgarde Pinnacle) case 48278: // Paralyze (Utgarde Pinnacle) case 50742: // Ooze Combine (Halls of Stone) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 977ac2245..71eb336de 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -8147,8 +8147,9 @@ void Aura::PeriodicDummyTick() // case 46205: break; // // Find Opening Beam End // case 46333: break; -// // Ice Spear Control Aura -// case 46371: break; + case 46371: // Ice Spear Control Aura + target->CastSpell(target, 46372, true, NULL, this); + return; // // Hailstone Chill // case 46458: break; // // Hailstone Chill, Internal diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 4bd49f6c5..933cffbec 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -1953,6 +1953,22 @@ void Spell::EffectDummy(SpellEffectEntry const* effect) return; } + case 46372: // Ice Spear Target Picker + { + if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) + return; + + m_caster->CastSpell(unitTarget, 46359, true); + return; + } + case 46430: // Synch Health + { + if (!unitTarget) + return; + + unitTarget->SetHealth(m_caster->GetHealth()); + return; + } case 46485: // Greatmother's Soulcatcher { if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 1793f01c7..a6348d75e 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12705" + #define REVISION_NR "12706" #endif // __REVISION_NR_H__