diff --git a/sql/mangos.sql b/sql/mangos.sql index dc4cc2b0c..9f997595b 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, - `required_8294_01_mangos_playercreateinfo_action` bit(1) default NULL + `required_8310_01_mangos_spell_proc_event` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -17953,7 +17953,8 @@ INSERT INTO `spell_proc_event` VALUES (63108, 0x00000000, 5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (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), -(63730, 0x00000000, 6, 0x00000800, 0x00000004, 0x00000000, 0x00000000, 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); /*!40000 ALTER TABLE `spell_proc_event` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/8310_01_mangos_spell_proc_event.sql b/sql/updates/8310_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..932a1f9bd --- /dev/null +++ b/sql/updates/8310_01_mangos_spell_proc_event.sql @@ -0,0 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_8294_01_mangos_playercreateinfo_action required_8310_01_mangos_spell_proc_event bit; + +DELETE FROM `spell_proc_event` WHERE `entry` IN (64928); +INSERT INTO `spell_proc_event` VALUES +(64928, 0x00000000, 11, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 602620106..fbe6d7a4d 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -262,6 +262,7 @@ pkgdata_DATA = \ 8253_02_mangos_spell_proc_event.sql \ 8254_01_mangos_spell_proc_event.sql \ 8294_01_mangos_playercreateinfo_action.sql \ + 8310_01_mangos_spell_proc_event.sql \ README ## Additional files to include when running 'make dist' @@ -504,4 +505,5 @@ EXTRA_DIST = \ 8253_02_mangos_spell_proc_event.sql \ 8254_01_mangos_spell_proc_event.sql \ 8294_01_mangos_playercreateinfo_action.sql \ + 8310_01_mangos_spell_proc_event.sql \ README diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 833f26fba..791f82b2b 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5910,6 +5910,13 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu triggered_spell_id = 58879; break; } + // Shaman T8 Elemental 4P Bonus + case 64928: + { + basepoints0 = int32( triggerAmount * damage / 100 ); + triggered_spell_id = 64930; // Electrified + break; + } } // Storm, Earth and Fire if (dummySpell->SpellIconID == 3063) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ca056a673..a3274636c 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 "8309" + #define REVISION_NR "8310" #endif // __REVISION_NR_H__