*Merge.

--HG-- branch : trunk
2009-02-15 11:57:00 -06:00
parent b3bc31a69f b66d68ceae
commit 419b749520
6 changed files with 37 additions and 5 deletions
@@ -5050,6 +5050,22 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                    }
                    break;
                }
+                case 47977:                                     // Magic Broom
+                {
+                    if(!unitTarget)                  
+                        return;
+
+                    if(unitTarget)
+                    {
+                        switch(((Player*)unitTarget)->GetBaseSkillValue(762))
+                        {
+                        case 75: unitTarget->CastSpell(unitTarget, 42680, true); break;;
+                        case 150: case 225: case 300: unitTarget->CastSpell(unitTarget, 42683, true); break;
+                        default: break;
+                        }
+                    }
+                    break;
+                }
                case 41931:
                {
                    if(m_caster->GetTypeId() != TYPEID_PLAYER)
@@ -2263,6 +2263,7 @@ void SpellMgr::LoadSpellCustomAttr()
        case 44869: // Spectral Blast
        case 45027: // Revitalize
        case 45976: // Muru Portal Channel
+        case 39365: // Thundering Storm
            spellInfo->MaxAffectedTargets = 1;
            break;
        case 41376: // Spite