diff options
| -rw-r--r-- | sql/mangos.sql | 3 | ||||
| -rw-r--r-- | sql/updates/7209_01_mangos_spell_bonus_data.sql | 5 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 8 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
4 files changed, 16 insertions, 2 deletions
diff --git a/sql/mangos.sql b/sql/mangos.sql index a7a33184493..6cd60c935d8 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -22,7 +22,7 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, - `required_7207_02_mangos_gameobject` bit(1) default NULL + `required_7209_01_mangos_spell_bonus_data` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -17287,6 +17287,7 @@ INSERT INTO `spell_bonus_data` VALUES ('53719', '0.25', '0', '0.16', 'Paladin - Seal of The Martyr Enemy Proc'), ('53718', '0.25', '0', '0.16', 'Paladin - Seal of The Martyr Self Proc'), ('25742', '0.07', '0', '0.039', 'Paladin - Seal of Righteousness Dummy Proc'), +('53595', '0', '0', '0','Paladin - Hammer of the Righteous'), ('31803', '0', '0.013', '0.15', 'Paladin - Holy Vengeance'), ('52042', '0.045', '0', '0', 'Shaman - Healing Stream Totem Triggered Heal'), ('32546', '0.8068', '0', '0', 'Priest - Binding Heal'), diff --git a/sql/updates/7209_01_mangos_spell_bonus_data.sql b/sql/updates/7209_01_mangos_spell_bonus_data.sql new file mode 100644 index 00000000000..bbd36b3e636 --- /dev/null +++ b/sql/updates/7209_01_mangos_spell_bonus_data.sql @@ -0,0 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_7207_02_mangos_gameobject required_7209_01_mangos_spell_bonus_data bit; + +DELETE FROM `spell_bonus_data` WHERE `entry` IN (53595); +INSERT INTO `spell_bonus_data` VALUES +('53595', '0', '0', '0','Paladin - Hammer of the Righteous');
\ No newline at end of file diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index e51c2733be9..149e996a185 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -639,6 +639,14 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) m_caster->SpellBaseDamageBonusForVictim(GetSpellSchoolMask(m_spellInfo), unitTarget); damage += int32(ap * 0.15f) + int32(holy * 15 / 100); } + // Hammer of the Righteous + else if(m_spellInfo->SpellFamilyFlags&0x0004000000000000LL) + { + // Add main hand dps * effect[2] amount + float averange = (m_caster->GetFloatValue(UNIT_FIELD_MINDAMAGE) + m_caster->GetFloatValue(UNIT_FIELD_MAXDAMAGE)) / 2; + int32 count = m_caster->CalculateSpellDamage(m_spellInfo, 2, m_spellInfo->EffectBasePoints[2], unitTarget); + damage += count * int32(averange * 1000) / m_caster->GetAttackTime(BASE_ATTACK); + } break; } } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 83106d8bd32..0fc46b32fd1 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 "7208" + #define REVISION_NR "7209" #endif // __REVISION_NR_H__ |