diff --git a/sql/mangos.sql b/sql/mangos.sql index 3cc81adc6..c44cc3e6f 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_8030_03_mangos_npc_trainer` bit(1) default NULL + `required_8050_02_mangos_spell_bonus_data` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -17597,7 +17597,8 @@ INSERT INTO `spell_proc_event` VALUES (61346, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (61356, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (61846, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0.000000, 0.000000, 0), -(61847, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0.000000, 0.000000, 0); +(61847, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0.000000, 0.000000, 0), +(63108, 0x00000000, 5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); /*!40000 ALTER TABLE `spell_proc_event` ENABLE KEYS */; UNLOCK TABLES; @@ -17844,7 +17845,8 @@ INSERT INTO `spell_bonus_data` VALUES ('18938', '0.96', '0', '0', 'Warlock - Dark Pact Rank 3'), ('27265', '0.96', '0', '0', 'Warlock - Dark Pact Rank 4'), ('59092', '0.96', '0', '0', 'Warlock - Dark Pact Rank 5'), -('6229', '0.3', '0', '0', 'Warlock - Shadow Ward'); +('6229', '0.3', '0', '0', 'Warlock - Shadow Ward'), +('63106', '0', '0', '0', 'Warlock - Siphon Life Triggered'); /*!40000 ALTER TABLE `spell_bonus_data` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/8050_01_mangos_spell_proc_event.sql b/sql/updates/8050_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..b36a9670e --- /dev/null +++ b/sql/updates/8050_01_mangos_spell_proc_event.sql @@ -0,0 +1,4 @@ +ALTER TABLE db_version CHANGE COLUMN required_8030_03_mangos_npc_trainer required_8050_01_mangos_spell_proc_event bit; + +DELETE FROM spell_proc_event WHERE entry = 63108; +INSERT INTO spell_proc_event VALUES (63108, 0x00, 5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); \ No newline at end of file diff --git a/sql/updates/8050_02_mangos_spell_bonus_data.sql b/sql/updates/8050_02_mangos_spell_bonus_data.sql new file mode 100644 index 000000000..b3f1fdf87 --- /dev/null +++ b/sql/updates/8050_02_mangos_spell_bonus_data.sql @@ -0,0 +1,4 @@ +ALTER TABLE db_version CHANGE COLUMN required_8050_01_mangos_spell_proc_event required_8050_02_mangos_spell_bonus_data bit; + +DELETE FROM spell_bonus_data WHERE entry = 63106; +INSERT INTO spell_bonus_data VALUES (63106, 0, 0, 0, 'Warlock - Siphon Life Triggered'); \ No newline at end of file diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index c11a80c9e..e4673b84b 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -226,6 +226,8 @@ pkgdata_DATA = \ 8030_01_characters_character_spell.sql \ 8030_02_characters_character_action.sql \ 8030_03_mangos_npc_trainer.sql \ + 8050_01_mangos_spell_proc_event.sql \ + 8050_02_mangos_spell_bonus_data.sql \ README ## Additional files to include when running 'make dist' @@ -432,4 +434,6 @@ EXTRA_DIST = \ 8030_01_characters_character_spell.sql \ 8030_02_characters_character_action.sql \ 8030_03_mangos_npc_trainer.sql \ + 8050_01_mangos_spell_proc_event.sql \ + 8050_02_mangos_spell_bonus_data.sql \ README diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index cb67d009e..4c1f8bd81 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5140,6 +5140,13 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu triggered_spell_id = 37378; break; } + // Siphon Life + case 63108: + { + basepoints0 = int32(damage * triggerAmount / 100); + triggered_spell_id = 63106; + break; + } } break; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 41cfb1377..8ecc7cc23 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 "8049" + #define REVISION_NR "8050" #endif // __REVISION_NR_H__