From 6ed729116ac5964aca65150747a458ffbbc3739d Mon Sep 17 00:00:00 2001 From: NoFantasy Date: Fri, 26 Feb 2010 23:51:42 +0100 Subject: [PATCH] [9463] Add script effect of spell 45691 and dummy effect of 45685 Signed-off-by: NoFantasy --- src/game/SpellEffects.cpp | 27 +++++++++++++++++++++++++++ src/shared/revision_nr.h | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index b6d89045213..28c810d9f0c 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -1213,6 +1213,15 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx) return; } + case 45685: // Magnataur On Death 2 + { + m_caster->RemoveAurasDueToSpell(45673); + m_caster->RemoveAurasDueToSpell(45672); + m_caster->RemoveAurasDueToSpell(45677); + m_caster->RemoveAurasDueToSpell(45681); + m_caster->RemoveAurasDueToSpell(45683); + return; + } case 45990: // Collect Oil { if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT) @@ -5413,6 +5422,24 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx) return; } + case 45691: // Magnataur On Death 1 + { + // assuming caster is creature, if not, then return + if (m_caster->GetTypeId() != TYPEID_UNIT) + return; + + Player* pPlayer = ((Creature*)m_caster)->GetLootRecipient(); + + if (!pPlayer) + return; + + if (pPlayer->HasAura(45674) || pPlayer->HasAura(45675) || pPlayer->HasAura(45678) || pPlayer->HasAura(45682) || pPlayer->HasAura(45684)) + pPlayer->CastSpell(pPlayer, 45686, true); + + m_caster->CastSpell(m_caster, 45685, true); + + return; + } case 46203: // Goblin Weather Machine { if (!unitTarget) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ce087aa5ea0..02c9b5f9c7a 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 "9462" + #define REVISION_NR "9463" #endif // __REVISION_NR_H__