diff options
| -rw-r--r-- | sql/FULL/world_spell_full.sql | 6 | ||||
| -rw-r--r-- | sql/updates/5994_world_spells.sql | 5 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 14 |
3 files changed, 23 insertions, 2 deletions
diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql index c71c6f57954..1e0ca938615 100644 --- a/sql/FULL/world_spell_full.sql +++ b/sql/FULL/world_spell_full.sql @@ -1718,11 +1718,13 @@ INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus` (20467, 0.25, -1, 0.16, -1, 'Paladin - Judgement of Command'), (53733, 0.22, -1, 0.14, -1, 'Paladin - Judgement of Corruption'), (20267, 0.1, -1, 0.1, -1, 'Paladin - Judgement of Light Proc'), -(20187, 0.4, -1, 0.25, -1, 'Paladin - Judgement of Righteousness'), +-- (20187, 0.4, -1, 0.25, -1, 'Paladin - Judgement of Righteousness'), +(20187, 0, 0, 0, 0, 'Paladin - Judgement of Righteousness'), (53726, 0.25, -1, 0.16, -1, 'Paladin - Judgement of the Martyr Enemy'), (53725, 0.0833, -1, 0.0533, -1, 'Paladin - Judgement of the Martyr Self'), (31804, 0.22, -1, 0.14, -1, 'Paladin - Judgement of Vengeance'), -(54158, 0.25, -1, 0.16, -1, 'Paladin - Jugdement (Seal of Light, Seal of Wisdom, Seal of Justice)'), +-- (54158, 0.25, -1, 0.16, -1, 'Paladin - Judgement (Seal of Light, Seal of Wisdom, Seal of Justice)'), +(54158, 0, 0, 0, 0, 'Paladin - Judgement (Seal of Light, Seal of Wisdom, Seal of Justice)') (58597, 0.75, -1, -1, -1, 'Paladin - Sacred Shield'), (53601, 0.75, -1, -1, -1, 'Paladin - Sacred Shield'), (31893, 0, 0, 0, 0, 'Paladin - Seal of Blood Proc Enemy'), diff --git a/sql/updates/5994_world_spells.sql b/sql/updates/5994_world_spells.sql new file mode 100644 index 00000000000..306c0dd9ba9 --- /dev/null +++ b/sql/updates/5994_world_spells.sql @@ -0,0 +1,5 @@ + +DELETE FROM `spell_bonus_data` WHERE `entry` IN (20187,54158); +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(20187, 0, 0, 0, 0, 'Paladin - Judgement of Righteousness'), +(54158, 0, 0, 0, 0, 'Paladin - Judgement (Seal of Light, Seal of Wisdom, Seal of Justice)'); diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 38a55322ebd..dac6a13bef8 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -647,6 +647,20 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) { damage += int32(m_caster->GetShieldBlockValue() * 1.3f); } + // Judgement of Righteousness + else if (m_spellInfo->Id == 20187) + { + float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK); + float sp = m_caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellInfo)); + damage += int32(0.25f*ap + 0.4f*sp); + } + // Judgement of Wisdom, Light, Justice + else if (m_spellInfo->SpellFamilyFlags[0]&0x00800000) + { + float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK); + float sp = m_caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellInfo)); + damage += int32(0.16f*ap + 0.25f*sp); + } break; } case SPELLFAMILY_DEATHKNIGHT: |