From ab539a9de6273090d57e38deb06874ec64f98644 Mon Sep 17 00:00:00 2001 From: MrLama Date: Fri, 25 Dec 2009 22:11:04 +0300 Subject: [PATCH] [9068] Include spell 35395 in trigger list for talent 53380 and ranks. Signed-off-by: VladimirMangos Also remove wrong masks from talent 53486 and ranks. Signed-off-by: VladimirMangos --- sql/mangos.sql | 16 ++++++++++------ sql/updates/9068_01_mangos_spell_proc_event.sql | 10 ++++++++++ sql/updates/9068_02_mangos_spell_chain.sql | 14 ++++++++++++++ sql/updates/Makefile.am | 4 ++++ src/shared/revision_nr.h | 2 +- src/shared/revision_sql.h | 2 +- 6 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 sql/updates/9068_01_mangos_spell_proc_event.sql create mode 100644 sql/updates/9068_02_mangos_spell_chain.sql diff --git a/sql/mangos.sql b/sql/mangos.sql index 52f14be03..4349813b7 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_9064_01_mangos_spell_proc_event` bit(1) default NULL + `required_9068_02_mangos_spell_chain` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -15271,6 +15271,13 @@ INSERT INTO spell_chain VALUES (10301,10300,7294,5,0), (27150,10301,7294,6,0), (54043,27150,7294,7,0), +/*Righteous Vengeance*/ +(53380,0,53380,1,0), +(53381,53380,53380,2,0), +(53382,53381,53380,3,0), +/*The Art of War*/ +(53486,0,53486,1,0), +(53488,53486,53486,2,0), /*------------------ -- (185) Cooking ------------------*/ @@ -18368,12 +18375,9 @@ INSERT INTO `spell_proc_event` VALUES (53259, 0x00000000, 9, 0x00000800, 0x00800001, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (53260, 0x00000000, 9, 0x00000800, 0x00800001, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (53290, 0x00000000, 9, 0x00000800, 0x00000001, 0x00000200, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), -(53380, 0x00000000, 10, 0x00800000, 0x00020000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), -(53381, 0x00000000, 10, 0x00800000, 0x00020000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), -(53382, 0x00000000, 10, 0x00800000, 0x00020000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), +(53380, 0x00000000, 10, 0x00800000, 0x00028000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (53397, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), -(53486, 0x00000000, 10, 0x00800000, 0x00028000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), -(53488, 0x00000000, 10, 0x00800000, 0x00028000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), +(53486, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (53501, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (53502, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (53503, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), diff --git a/sql/updates/9068_01_mangos_spell_proc_event.sql b/sql/updates/9068_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..5be35abb0 --- /dev/null +++ b/sql/updates/9068_01_mangos_spell_proc_event.sql @@ -0,0 +1,10 @@ +ALTER TABLE db_version CHANGE COLUMN required_9064_01_mangos_spell_proc_event required_9068_01_mangos_spell_proc_event bit; + +DELETE FROM spell_proc_event WHERE entry IN (53380,53381,53382); +INSERT INTO spell_proc_event VALUES +(53380, 0x00000000, 10, 0x00800000, 0x00028000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); + + +DELETE FROM spell_proc_event WHERE entry IN (53486,53488); +INSERT INTO spell_proc_event VALUES +(53486, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); diff --git a/sql/updates/9068_02_mangos_spell_chain.sql b/sql/updates/9068_02_mangos_spell_chain.sql new file mode 100644 index 000000000..39cb7648b --- /dev/null +++ b/sql/updates/9068_02_mangos_spell_chain.sql @@ -0,0 +1,14 @@ +ALTER TABLE db_version CHANGE COLUMN required_9068_01_mangos_spell_proc_event required_9068_02_mangos_spell_chain bit; + +/*Righteous Vengeance*/ +DELETE FROM spell_chain WHERE first_spell = 53380; +INSERT INTO spell_chain VALUES +(53380, 0, 53380, 1, 0), +(53381, 53380, 53380, 2, 0), +(53382, 53381, 53380, 3, 0); + +/*The Art of War*/ +DELETE FROM spell_chain WHERE first_spell = 53486; +INSERT INTO spell_chain VALUES +(53486, 0, 53486, 1, 0), +(53488, 53486, 53486, 2, 0); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index bd6d6606f..c1d1e00dc 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -220,6 +220,8 @@ pkgdata_DATA = \ 9045_01_mangos_spell_proc_event.sql \ 9045_02_mangos_spell_chain.sql \ 9064_01_mangos_spell_proc_event.sql \ + 9068_01_mangos_spell_proc_event.sql \ + 9068_02_mangos_spell_chain.sql \ README ## Additional files to include when running 'make dist' @@ -420,4 +422,6 @@ EXTRA_DIST = \ 9045_01_mangos_spell_proc_event.sql \ 9045_02_mangos_spell_chain.sql \ 9064_01_mangos_spell_proc_event.sql \ + 9068_01_mangos_spell_proc_event.sql \ + 9068_02_mangos_spell_chain.sql \ README diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 613eac984..46e0d0d44 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 "9067" + #define REVISION_NR "9068" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 15450dd34..7edb64fc3 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_9064_01_mangos_spell_proc_event" + #define REVISION_DB_MANGOS "required_9068_02_mangos_spell_chain" #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist" #endif // __REVISION_SQL_H__