From 457807eb80c1f774aaba14b9254cc6a1473ca64b Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Wed, 16 Dec 2009 00:49:04 +0300 Subject: [PATCH] [8996] Implement 2 items effect from itemsets 803/-33 Original patch provided by Splinter. --- sql/mangos.sql | 3 ++- sql/updates/8996_01_mangos_spell_proc_event.sql | 6 ++++++ sql/updates/Makefile.am | 2 ++ src/game/Spell.cpp | 3 +++ src/shared/revision_nr.h | 2 +- src/shared/revision_sql.h | 2 +- 6 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 sql/updates/8996_01_mangos_spell_proc_event.sql diff --git a/sql/mangos.sql b/sql/mangos.sql index a625b1367..9468feb9d 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_8995_01_mangos_spell_proc_event` bit(1) default NULL + `required_8996_01_mangos_spell_proc_event` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -18479,6 +18479,7 @@ INSERT INTO `spell_proc_event` VALUES (60770, 0x00000000, 11, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (60818, 0x00000000, 10, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (60826, 0x00000000, 15, 0x01400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), +(61062, 0x00000000, 3, 0x00000000, 0x00000100, 0x00000000, 0x00004000, 0x00010000, 0.000000, 0.000000, 0), (61188, 0x00000000, 5, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (61257, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x000202A8, 0x00010000, 0.000000, 0.000000, 0), (61324, 0x00000000, 10, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), diff --git a/sql/updates/8996_01_mangos_spell_proc_event.sql b/sql/updates/8996_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..6a8d10424 --- /dev/null +++ b/sql/updates/8996_01_mangos_spell_proc_event.sql @@ -0,0 +1,6 @@ +ALTER TABLE db_version CHANGE COLUMN required_8995_01_mangos_spell_proc_event required_8996_01_mangos_spell_proc_event bit; + +DELETE FROM spell_proc_event WHERE entry=61062; +INSERT INTO spell_proc_event VALUES +(61062, 0x00000000, 3, 0x00000000, 0x00000100, 0x00000000, 0x00004000, 0x00010000, 0.000000, 0.000000, 0); + diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 9aeedc2d1..4a0300e6c 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -207,6 +207,7 @@ pkgdata_DATA = \ 8992_02_mangos_spell_chain.sql \ 8993_01_mangos_spell_proc_event.sql \ 8995_01_mangos_spell_proc_event.sql \ + 8996_01_mangos_spell_proc_event.sql \ README ## Additional files to include when running 'make dist' @@ -394,4 +395,5 @@ EXTRA_DIST = \ 8992_02_mangos_spell_chain.sql \ 8993_01_mangos_spell_proc_event.sql \ 8995_01_mangos_spell_proc_event.sql \ + 8996_01_mangos_spell_proc_event.sql \ README diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index f7ce356d2..6467ff854 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -686,6 +686,9 @@ void Spell::prepareDataForTriggerSystem() // Clearcasting trigger need do it else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000200000000) && m_spellInfo->SpellFamilyFlags2 & 0x8) m_canTrigger = true; + // Replenish Mana, item spell with triggered cases (Mana Agate, etc mana gems) + else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000010000000000)) + m_canTrigger = true; break; case SPELLFAMILY_WARLOCK: // For Hellfire Effect / Rain of Fire / Seed of Corruption triggers need do it if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000800000000060)) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ebb9244d7..d2bdd337b 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 "8995" + #define REVISION_NR "8996" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index b3d9549e0..ac8865c84 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_8995_01_mangos_spell_proc_event" + #define REVISION_DB_MANGOS "required_8996_01_mangos_spell_proc_event" #define REVISION_DB_REALMD "required_8728_01_realmd_account" #endif // __REVISION_SQL_H__