aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQAston <none@none>2009-04-14 20:21:16 +0200
committerQAston <none@none>2009-04-14 20:21:16 +0200
commitb966e63f73ca1a34173964de91a66c0d8f3e7aaf (patch)
treeb1df341048dd30ca7c9289226f6c9ddee721d4ad /src
parent7d2e5c31a850d2a42fbe0f4a344b496235989af5 (diff)
*Fix Fan of Knives.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/SpellAuras.cpp2
-rw-r--r--src/game/SpellEffects.cpp8
2 files changed, 9 insertions, 1 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index e0d52abf3b9..9e5906cecf8 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -6176,7 +6176,7 @@ void AuraEffect::PeriodicTick()
// Haunting Spirits
if (GetId() == 7057)
{
- m_target->CastSpell((Unit*) , m_amount , true);
+ m_target->CastSpell((Unit*)NULL , m_amount , true);
m_amplitude = irand (0 , 60 ) + 30;
m_amplitude *= IN_MILISECONDS;
break;
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index fee53a2aafe..54e1841b681 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -4126,6 +4126,14 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
if(m_caster->GetTypeId()==TYPEID_PLAYER)
((Player*)m_caster)->AddComboPoints(unitTarget, 1);
}
+ // Fan of Knives
+ if(m_spellInfo->SpellFamilyFlags[1] & 0x40000)
+ {
+ // 50% more damage with daggers
+ if (Item* item = ((Player*)m_caster)->GetWeaponForAttack(m_attackType))
+ if (item->GetProto()->SubClass == ITEM_SUBCLASS_WEAPON_DAGGER)
+ totalDamagePercentMod *= 1.5f;
+ }
// Mutilate (for each hand)
else if(m_spellInfo->SpellFamilyFlags[1] & 0x6)
{