From 73d3f210a9df46d3725575663538a69cf58f0fda Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 21 Aug 2010 20:50:38 +0200 Subject: Scripts/Icecrown Citadel: Add script for Deathbringer Saurfang (only missing alliance outro due to need of spawning and moving a transport) Scripts/Icecrown Citadel: Corrected Lord Marrowgar, should no longer target tanks with Bone Spike Graveyard, his Coldflame should now spread properly Core/Scripts: Moved Lady Deathwhisper Mana Barrier handler to scripts Core/Scripts: Allow AuraScript to prevent default effects by effect index Core/Scripts: Added Is25ManRaid() method to ScriptedAI, obviously used to check if raid is 25man Core/Achievements: Pass m_caster to UpdateAchievementCriteria for ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET --HG-- branch : trunk --- src/server/game/Spells/SpellEffects.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/server/game/Spells/SpellEffects.cpp') diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 7bd4924c8a6..7980ad125af 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1847,8 +1847,10 @@ void Spell::EffectForceCast(uint32 i) case 52349: // Overtake unitTarget->CastCustomSpell(unitTarget, spellInfo->Id, &damage, NULL, NULL, true, NULL, NULL, m_originalCasterGUID); return; - //case 72378: // Blood Nova - //case 73058: // Blood Nova + case 72378: // Blood Nova + case 73058: // Blood Nova + spellInfo = sSpellMgr.GetSpellForDifficultyFromSpell(spellInfo, m_caster); + break; } } Unit * caster = GetTriggeredSpellCaster(spellInfo, m_caster, unitTarget); @@ -2629,7 +2631,9 @@ void Spell::EffectHealthLeech(uint32 i) // Do not apply multiplier to damage if it's Death Coil int32 new_damage; - if (m_spellInfo->SpellFamilyFlags[0] & 0x80000) + if (m_spellInfo->SpellFamilyFlags[0] & 0x80000 || + m_spellInfo->Id == 72409 || m_spellInfo->Id == 72447 || // ...or Deathbringer Saurfang's Rune of Blood + m_spellInfo->Id == 72448 || m_spellInfo->Id == 72449) new_damage = damage; else new_damage = int32(damage * multiplier); -- cgit v1.2.3