diff options
| author | n0n4m3 <none@none> | 2010-02-15 19:09:17 +0100 |
|---|---|---|
| committer | n0n4m3 <none@none> | 2010-02-15 19:09:17 +0100 |
| commit | feea2417c3036fc98163ad9bfcfe067bf7a620db (patch) | |
| tree | 31cdd1239bdbe93069e92199666ff01f35fadd8a | |
| parent | ebc5ce6810a65c49f572215b3d6d5e1253a84e7c (diff) | |
Fix talent Shockwave and typo in comment.
--HG--
branch : trunk
| -rw-r--r-- | src/game/Spell.cpp | 4 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 82ce7220f54..3451e75c571 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -3015,7 +3015,7 @@ void Spell::handle_immediate() int32 duration = GetSpellDuration(m_spellInfo); if (duration) { - //apply haste mods + // Apply haste mods m_caster->ModSpellCastTime(m_spellInfo, duration, this); // Apply duration mod if(Player* modOwner = m_caster->GetSpellModOwner()) @@ -4628,7 +4628,7 @@ SpellCastResult Spell::CheckCast(bool strict) return SPELL_FAILED_ONLY_BATTLEGROUNDS; // do not allow spells to be cast in arenas - // - with greater than 15 min CD without SPELL_ATTR_EX4_USABLE_IN_ARENA flag + // - with greater than 10 min CD without SPELL_ATTR_EX4_USABLE_IN_ARENA flag // - with SPELL_ATTR_EX4_NOT_USABLE_IN_ARENA flag if ((m_spellInfo->AttributesEx4 & SPELL_ATTR_EX4_NOT_USABLE_IN_ARENA) || GetSpellRecoveryTime(m_spellInfo) > 10 * MINUTE * IN_MILISECONDS && !(m_spellInfo->AttributesEx4 & SPELL_ATTR_EX4_USABLE_IN_ARENA)) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index aca99cce779..ccf3abe022d 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -427,19 +427,19 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) case SPELLFAMILY_WARRIOR: { // Bloodthirst - if(m_spellInfo->SpellFamilyFlags[1] & 0x400) + if (m_spellInfo->SpellFamilyFlags[1] & 0x400) damage = uint32(damage * (m_caster->GetTotalAttackPowerValue(BASE_ATTACK)) / 100); // Shield Slam - else if(m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category == 1209) + else if (m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category == 1209) damage += int32(m_caster->GetShieldBlockValue()); // Victory Rush - else if(m_spellInfo->SpellFamilyFlags[1] & 0x100) + else if (m_spellInfo->SpellFamilyFlags[1] & 0x100) { damage = uint32(damage * m_caster->GetTotalAttackPowerValue(BASE_ATTACK) / 100); m_caster->ModifyAuraState(AURA_STATE_WARRIOR_VICTORY_RUSH, false); } - // Shockwave ${$m3/100*$AP} - else if(m_spellInfo->SpellFamilyFlags[1] & 0x00008000) + // Shockwave + else if (m_spellInfo->Id == 46968) { int32 pct = m_caster->CalculateSpellDamage(m_spellInfo, 2, m_spellInfo->EffectBasePoints[2], unitTarget); if (pct > 0) |