diff --git a/sql/mangos.sql b/sql/mangos.sql index 2669ac002..d5546addb 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_8909_01_mangos_spell_proc_event` bit(1) default NULL + `required_8912_01_mangos_spell_proc_event` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -18387,7 +18387,8 @@ INSERT INTO `spell_proc_event` VALUES (64928, 0x00000000, 11, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (64976, 0x00000000, 4, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0.000000, 0.000000, 0), (65661, 0x00000000, 15, 0x00400010, 0x20020004, 0x00000000, 0x00000010, 0x00000000, 0.000000, 100.000000,0), -(64127, 0x00000000, 6, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); +(64127, 0x00000000, 6, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), +(67353, 0x00000000, 7, 0x00008000, 0x00100500, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); /*!40000 ALTER TABLE `spell_proc_event` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/8912_01_mangos_spell_proc_event.sql b/sql/updates/8912_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..7bad5c098 --- /dev/null +++ b/sql/updates/8912_01_mangos_spell_proc_event.sql @@ -0,0 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_8909_01_mangos_spell_proc_event required_8912_01_mangos_spell_proc_event bit; + +DELETE FROM `spell_proc_event` WHERE `entry` IN (67353); +INSERT INTO `spell_proc_event` VALUES +(67353, 0x00000000, 7, 0x00008000, 0x00100500, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 67c343088..5424680f9 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -187,6 +187,7 @@ pkgdata_DATA = \ 8899_01_mangos_spell_proc_event.sql \ 8908_01_mangos_spell_chain.sql \ 8909_01_mangos_spell_proc_event.sql \ + 8912_01_mangos_spell_proc_event.sql \ README ## Additional files to include when running 'make dist' @@ -354,4 +355,5 @@ EXTRA_DIST = \ 8899_01_mangos_spell_proc_event.sql \ 8908_01_mangos_spell_chain.sql \ 8909_01_mangos_spell_proc_event.sql \ + 8912_01_mangos_spell_proc_event.sql \ README diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 32213b74f..c8f30b104 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -6919,8 +6919,16 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB } case SPELLFAMILY_DRUID: { + // Leader of the Pack + if (auraSpellInfo->Id == 24932) + { + if (triggerAmount == 0) + return false; + basepoints[0] = triggerAmount * GetMaxHealth() / 100; + trigger_spell_id = 34299; + } // Druid Forms Trinket - if (auraSpellInfo->Id==37336) + else if (auraSpellInfo->Id==37336) { switch(m_form) { @@ -6934,15 +6942,17 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB return false; } } - //else if (auraSpellInfo->Id==40363)// Entangling Roots () - // trigger_spell_id = ????; - // Leader of the Pack - else if (auraSpellInfo->Id == 24932) + // Druid T9 Feral Relic (Lacerate, Swipe, Mangle, and Shred) + else if (auraSpellInfo->Id==67353) { - if (triggerAmount == 0) - return false; - basepoints[0] = triggerAmount * GetMaxHealth() / 100; - trigger_spell_id = 34299; + switch(m_form) + { + case FORM_CAT: trigger_spell_id = 67355; break; + case FORM_BEAR: + case FORM_DIREBEAR: trigger_spell_id = 67354; break; + default: + return false; + } } break; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 521cea727..43a47a5c3 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 "8911" + #define REVISION_NR "8912" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 6c61fe5c4..d6de31072 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_8909_01_mangos_spell_proc_event" + #define REVISION_DB_MANGOS "required_8912_01_mangos_spell_proc_event" #define REVISION_DB_REALMD "required_8728_01_realmd_account" #endif // __REVISION_SQL_H__