diff options
| author | silinoron <none@none> | 2010-08-23 15:51:34 -0700 |
|---|---|---|
| committer | silinoron <none@none> | 2010-08-23 15:51:34 -0700 |
| commit | 34384a38326d2fe8152d266566ebcf8dc6fccb3b (patch) | |
| tree | 394ec11bfc79410350286d9ecf164b2f857ed7cd /src | |
| parent | 2a38ba09caf6dc19c904d447c718d17e01b7d068 (diff) | |
Spell 62124 should allow critical hits.
Based on patch by Toni.Shocker (yes, again).
Fixes issue #3554
Also get rid of GuildScript in TODO, as it already exists.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 1 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 2bf023babf8..4bb9cf4dcb3 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -70,7 +70,6 @@ void DoScriptText(int32 textEntry, WorldObject* pSource, Unit *pTarget = NULL); CollisionScript GroupScript ArenaTeamScript - GuildScript */ diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index a7d2dfbacf1..c99f25fc325 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -4138,8 +4138,11 @@ void Spell::EffectTaunt(uint32 /*i*/) if (m_spellInfo->Id == 62124) { int32 damageDone = int32(1 + m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.5f); + bool is_crit = m_caster->isSpellCrit(unitTarget, m_spellInfo, m_spellSchoolMask, m_attackType); + if (is_crit) + damageDone *= 2; m_caster->DealDamage(unitTarget, damageDone, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_HOLY, m_spellInfo, false); - m_caster->SendSpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, damageDone, SPELL_SCHOOL_MASK_HOLY, 0, 0, false, false, false); + m_caster->SendSpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, damageDone, SPELL_SCHOOL_MASK_HOLY, 0, 0, false, false, is_crit); } // Also use this effect to set the taunter's threat to the taunted creature's highest value |