diff --git a/sql/mangos.sql b/sql/mangos.sql index 43de214e5..47a61a1a5 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_11501_02_mangos_spell_bonus_data` bit(1) default NULL + `required_11503_01_mangos_spell_proc_event` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -17587,6 +17587,7 @@ INSERT INTO `spell_proc_event` VALUES (70761, 0x00, 10, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (70830, 0x00, 11, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0), (70841, 0x00, 5, 0x00000004, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), +(70854, 0x00, 4, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000010, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (71174, 0x00, 7, 0x00001000, 0x00000000, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (71176, 0x00, 7, 0x00200002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (71178, 0x00, 7, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0.000000, 0.000000, 0), diff --git a/sql/updates/11503_01_mangos_spell_proc_event.sql b/sql/updates/11503_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..30ac8f7e7 --- /dev/null +++ b/sql/updates/11503_01_mangos_spell_proc_event.sql @@ -0,0 +1,6 @@ +ALTER TABLE db_version CHANGE COLUMN required_11501_02_mangos_spell_bonus_data required_11503_01_mangos_spell_proc_event bit; + +/*Item - Warrior T10 Melee 2P Bonus*/ +DELETE FROM `spell_proc_event` WHERE entry = 70854; +INSERT INTO `spell_proc_event` VALUES +(70854, 0x00, 4, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000010, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 7fc698e0e..a81105f5a 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2978,6 +2978,12 @@ void Spell::cast(bool skipCheck) if (m_caster->HasAura(58375)) // Glyph of Blocking AddTriggeredSpell(58374); // Glyph of Blocking } + // Bloodsurge (triggered), Sudden Death (triggered) + else if (m_spellInfo->Id == 46916 || m_spellInfo->Id == 52437) + // Item - Warrior T10 Melee 4P Bonus + if (Aura *aur = m_caster->GetAura(70847, EFFECT_INDEX_0)) + if (roll_chance_i(aur->GetModifier()->m_amount)) + AddTriggeredSpell(70849); // Extra Charge! break; } case SPELLFAMILY_PRIEST: diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 1dd815309..ec84ef8d1 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 "11502" + #define REVISION_NR "11503" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index bdbb1f6cd..b57ffb31d 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_11436_01_characters_character_queststatus" - #define REVISION_DB_MANGOS "required_11501_02_mangos_spell_bonus_data" + #define REVISION_DB_MANGOS "required_11503_01_mangos_spell_proc_event" #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version" #endif // __REVISION_SQL_H__