diff --git a/sql/mangos.sql b/sql/mangos.sql index db507fd4cc7..2883003654c 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -24,7 +24,7 @@ CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, `cache_id` int(10) default '0', - `required_8882_03_mangos_spell_bonus_data` bit(1) default NULL + `required_8883_02_mangos_spell_bonus_data` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -14043,6 +14043,7 @@ INSERT INTO `spell_bonus_data` VALUES (34861, 0.402, 0, 0, 'Priest - Circle of Healing'), (19236, 0.8068, 0, 0, 'Priest - Desperate Prayer'), (2944, 0, 0.1849, 0, 'Priest - Devouring Plague'), +(63544, 0, 0, 0, 'Priest - Empowered Renew Triggered'), (14914, 0.5711, 0.024, 0, 'Priest - Holy Fire'), (15237, 0.1606, 0, 0, 'Priest - Holy Nova Damage'), (2061, 0.8068, 0, 0, 'Priest - Flash Heal'), @@ -18375,6 +18376,7 @@ INSERT INTO `spell_proc_event` VALUES (63156, 0x00000000, 0, 0x00000001, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (63245, 0x00000000, 5, 0x00000100, 0x00800000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (63320, 0x00000000, 5, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), +(63534, 0x00000000, 6, 0x00000040, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0), (63625, 0x00000000, 6, 0x02000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0.000000, 0.000000, 0), (63730, 0x00000000, 6, 0x00000800, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (64928, 0x00000000, 11, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), diff --git a/sql/updates/8883_01_mangos_spell_proc_event.sql b/sql/updates/8883_01_mangos_spell_proc_event.sql new file mode 100644 index 00000000000..97930df799c --- /dev/null +++ b/sql/updates/8883_01_mangos_spell_proc_event.sql @@ -0,0 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_8882_03_mangos_spell_bonus_data required_8883_01_mangos_spell_proc_event bit; + +DELETE FROM `spell_proc_event` WHERE `entry` IN (63534); +INSERT INTO `spell_proc_event` VALUES +(63534, 0x00000000, 6, 0x00000040, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0); diff --git a/sql/updates/8883_02_mangos_spell_bonus_data.sql b/sql/updates/8883_02_mangos_spell_bonus_data.sql new file mode 100644 index 00000000000..e71cb7335a7 --- /dev/null +++ b/sql/updates/8883_02_mangos_spell_bonus_data.sql @@ -0,0 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_8883_01_mangos_spell_proc_event required_8883_02_mangos_spell_bonus_data bit; + +DELETE FROM spell_bonus_data WHERE entry = 63544; +INSERT INTO spell_bonus_data VALUES +(63544, 0, 0, 0, 'Priest - Empowered Renew Triggered'); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 3323d58bb2f..6036c1c5533 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -178,6 +178,8 @@ pkgdata_DATA = \ 8882_01_mangos_spell_proc_event.sql \ 8882_02_mangos_spell_chain.sql \ 8882_03_mangos_spell_bonus_data.sql \ + 8883_01_mangos_spell_proc_event.sql \ + 8883_02_mangos_spell_bonus_data.sql \ README ## Additional files to include when running 'make dist' @@ -336,4 +338,6 @@ EXTRA_DIST = \ 8882_01_mangos_spell_proc_event.sql \ 8882_02_mangos_spell_chain.sql \ 8882_03_mangos_spell_bonus_data.sql \ + 8883_01_mangos_spell_proc_event.sql \ + 8883_02_mangos_spell_bonus_data.sql \ README diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 7e3737c0bbd..68146479d0c 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5445,6 +5445,21 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu triggered_spell_id = 47753; break; } + // Empowered Renew + case 3021: + { + if (!procSpell) + return false; + + Aura* healingAura = pVictim->GetAura(procSpell->Id,0); + if (!healingAura) + return false; + + int32 healingfromticks = SpellHealingBonus(pVictim, procSpell, (healingAura->GetModifier()->m_amount* GetSpellAuraMaxTicks(procSpell)), DOT); + basepoints0 = healingfromticks * triggerAmount / 100; + triggered_spell_id = 63544; + break; + } // Improved Devouring Plague case 3790: { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b4fc244347b..09d3e9b148d 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 "8882" + #define REVISION_NR "8883" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index b167a46345b..735c5fb2b19 100644 --- a/src/shared/revision_sql.h +++ b/src/shared/revision_sql.h @@ -1,6 +1,6 @@ #ifndef __REVISION_SQL_H__ #define __REVISION_SQL_H__ #define REVISION_DB_CHARACTERS "required_8874_01_characters_character_skills" - #define REVISION_DB_MANGOS "required_8882_03_mangos_spell_bonus_data" + #define REVISION_DB_MANGOS "required_8883_02_mangos_spell_bonus_data" #define REVISION_DB_REALMD "required_8728_01_realmd_account" #endif // __REVISION_SQL_H__