From cb297484671518848d0784d1c4c31d749626079c Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Tue, 11 Aug 2009 04:30:09 +0400 Subject: [PATCH] [8349] Include offhand weapon part and aply proper dagger bonus for spell 51723. --- src/game/Spell.cpp | 8 ++++++++ src/game/SpellEffects.cpp | 7 +++++++ src/shared/revision_nr.h | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 16f293a62..728d47d49 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2362,6 +2362,14 @@ void Spell::cast(bool skipCheck) } break; } + case SPELLFAMILY_ROGUE: + // Fan of Knives (main hand) + if (m_spellInfo->Id == 51723 && m_caster->GetTypeId() == TYPEID_PLAYER && + ((Player*)m_caster)->haveOffhandWeapon()) + { + AddTriggeredSpell(52874); // Fan of Knives (offhand) + } + break; case SPELLFAMILY_PALADIN: { // Divine Shield, Divine Protection or Hand of Protection diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 32bc97002..e477f451e 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -4491,6 +4491,13 @@ void Spell::EffectWeaponDmg(uint32 i) if(found) totalDamagePercentMod *= 1.2f; // 120% if poisoned } + // Fan of Knives + else if (m_caster->GetTypeId()==TYPEID_PLAYER && (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0004000000000000))) + { + Item* weapon = ((Player*)m_caster)->GetWeaponForAttack(m_attackType,true); + if (weapon && weapon->GetProto()->SubClass == ITEM_SUBCLASS_WEAPON_DAGGER) + totalDamagePercentMod *= 1.5f; // 150% to daggers + } break; } case SPELLFAMILY_PALADIN: diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 9ec1fa785..b0521f458 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 "8348" + #define REVISION_NR "8349" #endif // __REVISION_NR_H__