diff --git a/sql/mangos.sql b/sql/mangos.sql index 4f5018ebd..bbfa49c7f 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_8988_01_mangos_spell_proc_event` bit(1) default NULL + `required_8992_02_mangos_spell_chain` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -14634,6 +14634,10 @@ INSERT INTO spell_chain VALUES (27067,20910,19306,4,0), (48998,27067,19306,5,0), (48999,48998,19306,6,0), +/*Entrapment*/ +(19184,0,19184,1,0), +(19387,19184,19184,2,0), +(19388,19387,19184,3,0), /*ExplosiveShot*/ (53301,0,53301,1,0), (60051,53301,53301,2,0), @@ -14650,6 +14654,10 @@ INSERT INTO spell_chain VALUES (1499,0,1499,1,0), (14310,1499,1499,2,0), (14311,14310,1499,3,0), +/*Hunting Party*/ +(53290,0,53290,1,0), +(53291,53290,53290,2,0), +(53292,53291,53290,3,0), /*ImmolationTrap*/ (13795,0,13795,1,0), (14302,13795,13795,2,0), @@ -14659,6 +14667,12 @@ INSERT INTO spell_chain VALUES (27023,14305,13795,6,0), (49055,27023,13795,7,0), (49056,49055,13795,8,0), +/**Master Tactician*/ +(34506,0,34506,1,0), +(34507,34506,34506,2,0), +(34508,34507,34506,3,0), +(34838,34508,34506,4,0), +(34839,34838,34506,5,0), /*MongooseBite*/ (1495,0,1495,1,0), (14269,1495,1495,2,0), @@ -15089,7 +15103,7 @@ INSERT INTO spell_chain VALUES /*------------------ --(163)Marksmanship ------------------*/ -/*AimedShot*/ +/*Aimed Shot*/ (19434,0,19434,1,0), (20900,19434,19434,2,0), (20901,20900,19434,3,0), @@ -15099,7 +15113,7 @@ INSERT INTO spell_chain VALUES (27065,20904,19434,7,0), (49049,27065,19434,8,0), (49050,49049,19434,9,0), -/*ArcaneShot*/ +/*Arcane Shot*/ (3044,0,3044,1,0), (14281,3044,3044,2,0), (14282,14281,3044,3,0), @@ -15111,13 +15125,16 @@ INSERT INTO spell_chain VALUES (27019,14287,3044,9,0), (49044,27019,3044,10,0), (49045,49044,3044,11,0), -/*Hunter'sMark*/ +/*Concussive Barrage*/ +(35100,0,35100,1,0), +(35102,35100,35100,2,0), +/*Hunter's Mark*/ (1130,0,1130,1,0), (14323,1130,1130,2,0), (14324,14323,1130,3,0), (14325,14324,1130,4,0), (53338,14325,1130,5,0), -/*KillShot*/ +/*Kill Shot*/ (53351,0,53351,1,0), (61005,53351,53351,2,0), (61006,61005,53351,3,0), @@ -15772,6 +15789,10 @@ INSERT INTO spell_chain VALUES (25289,11551,6673,7,0), (2048,25289,6673,8,0), (47436,2048,6673,9,0), +/*Bloodsurge*/ +(46913,0,46913,1,0), +(46914,46913,46913,2,0), +(46915,46914,46913,3,0), /*Cleave*/ (845,0,845,1,0), (7369,845,845,2,0), @@ -16209,6 +16230,9 @@ INSERT INTO spell_chain VALUES /*Frozen Power*/ (63373,0,63373,1,0), (63374,63373,63373,2,0), +/*Improved Stormstrike*/ +(51521,0,51521,1,0), +(51522,51521,51521,2,0), /*Life Tap*/ (1454,0,1454,1,0), (1455,1454,1454,2,0), @@ -17837,9 +17861,7 @@ INSERT INTO `spell_proc_event` VALUES (18119, 0x00000000, 5, 0x00000000, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (18120, 0x00000000, 5, 0x00000000, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (18820, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0.000000, 0.000000, 0), -(19184, 0x00000000, 9, 0x00000014, 0x00002000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), -(19387, 0x00000000, 9, 0x00000014, 0x00002000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), -(19388, 0x00000000, 9, 0x00000014, 0x00002000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), +(19184, 0x00000000, 9, 0x00000010, 0x00002000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (19572, 0x00000000, 9, 0x00800000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0), (19573, 0x00000000, 9, 0x00800000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0), (20049, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), @@ -17864,6 +17886,7 @@ INSERT INTO `spell_proc_event` VALUES (20500, 0x00000000, 4, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (20501, 0x00000000, 4, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (20705, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), +(20784, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (20911, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000070, 0.000000, 0.000000, 0), (20925, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0.000000, 0.000000, 0), (21185, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 10), @@ -18036,12 +18059,14 @@ INSERT INTO `spell_proc_event` VALUES (34262, 0x00000000, 10, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0.000000, 0.000000, 0), (34320, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (34355, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 3), +(34457, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (34497, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (34498, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (34499, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (34500, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (34502, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (34503, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), +(34506, 0x00000000, 9, 0x0007FA01, 0x00801081, 0x08000201, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (34584, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 30), (34586, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 1.500000, 0.000000, 0), (34598, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45), @@ -18062,8 +18087,7 @@ INSERT INTO `spell_proc_event` VALUES (35080, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 1.000000, 0.000000, 60), (35083, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 60), (35086, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 60), -(35100, 0x00000000, 9, 0x00003001, 0x00000000, 0x00000000, 0x00010140, 0x00000000, 0.000000, 0.000000, 0), -(35102, 0x00000000, 9, 0x00003001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), +(35100, 0x00000000, 9, 0x00001000, 0x00000000, 0x00000001, 0x00000100, 0x00000000, 0.000000, 0.000000, 0), (35121, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (36096, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000800, 0.000000, 0.000000, 0), (36111, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), @@ -18190,9 +18214,7 @@ INSERT INTO `spell_proc_event` VALUES (46854, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (46855, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (46867, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), -(46913, 0x00000000, 4, 0x00000000, 0x00000400, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), -(46914, 0x00000000, 4, 0x00000000, 0x00000400, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), -(46915, 0x00000000, 4, 0x00000000, 0x00000400, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), +(46913, 0x00000000, 4, 0x00000040, 0x00000404, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (46916, 0x00000000, 4, 0x00000000, 0x00000400, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (46951, 0x00000000, 4, 0x00000400, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (46952, 0x00000000, 0, 0x00000400, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), @@ -18271,6 +18293,7 @@ INSERT INTO `spell_proc_event` VALUES (51483, 0x00000001, 11, 0x20000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0), (51485, 0x00000001, 11, 0x20000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0), (51486, 0x00000001, 11, 0x20000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0), +(51521, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 1), (51528, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,12.500000, 0.000000, 0), (51556, 0x00000000, 11, 0x000000C0, 0x00000000, 0x00000010, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (51557, 0x00000000, 11, 0x000000C0, 0x00000000, 0x00000010, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), @@ -18333,9 +18356,7 @@ INSERT INTO `spell_proc_event` VALUES (53256, 0x00000000, 9, 0x00000800, 0x00800001, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (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, 0x7FFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), -(53291, 0x00000000, 9, 0x00000800, 0x7FFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), -(53292, 0x00000000, 9, 0x00000800, 0x7FFFFFFF, 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), diff --git a/sql/updates/8992_01_mangos_spell_proc_event.sql b/sql/updates/8992_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..0a1c795b2 --- /dev/null +++ b/sql/updates/8992_01_mangos_spell_proc_event.sql @@ -0,0 +1,41 @@ +ALTER TABLE db_version CHANGE COLUMN required_8988_01_mangos_spell_proc_event required_8992_01_mangos_spell_proc_event bit; + +/*Ferocious Inspiration*/ +DELETE FROM `spell_proc_event` WHERE `entry` IN (34457); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES +(34457, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); + +/*Frenzy*/ +DELETE FROM `spell_proc_event` WHERE `entry` IN (20784); +INSERT INTO `spell_proc_event` (`entry` ,`SchoolMask` ,`SpellFamilyName` ,`SpellFamilyMask0` ,`SpellFamilyMask1` ,`SpellFamilyMask2` ,`procFlags` ,`procEx` ,`ppmRate` ,`CustomChance` ,`Cooldown`)VALUES +(20784, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); + +/*Master Tactician*/ +DELETE FROM `spell_proc_event` WHERE `entry` IN (34506, 34507, 34508, 34838, 34839); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES +(34506, 0x00000000, 9, 0x0007FA01, 0x00801081, 0x08000201, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); + +/*Hunting Party*/ +DELETE FROM `spell_proc_event` WHERE entry IN (53290, 53291, 53292); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES +(53290, 0x00000000, 9, 0x00000800, 0x00000001, 0x00000200, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); + +/*Bloodsurge*/ +DELETE FROM `spell_proc_event` WHERE `entry` IN (46913, 46914, 46915); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `cooldown`) VALUES +(46913, 0x00000000, 4, 0x00000040, 0x00000404, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); + +/*Entrapment*/ +DELETE FROM `spell_proc_event` WHERE `entry` IN (19184, 19387, 19388); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES +(19184, 0x00000000, 9, 0x00000010, 0x00002000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); + +/*Concussive Barrage*/ +DELETE FROM `spell_proc_event` WHERE `entry` IN (35100, 35102); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES +(35100, 0x00000000, 9, 0x00001000, 0x00000000, 0x00000001, 0x00000100, 0x00000000, 0.000000, 0.000000, 0); + +/*Improved Stormstrike*/ +DELETE FROM `spell_proc_event` WHERE `entry` IN (51521, 51522); +INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES +(51521, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 1); diff --git a/sql/updates/8992_02_mangos_spell_chain.sql b/sql/updates/8992_02_mangos_spell_chain.sql new file mode 100644 index 000000000..06bb4bf8e --- /dev/null +++ b/sql/updates/8992_02_mangos_spell_chain.sql @@ -0,0 +1,43 @@ +ALTER TABLE db_version CHANGE COLUMN required_8992_01_mangos_spell_proc_event required_8992_02_mangos_spell_chain bit; + +/*Master Tactician*/ +DELETE FROM spell_chain WHERE first_spell = 34506; +INSERT INTO spell_chain VALUES +(34506, 0, 34506, 1, 0), +(34507, 34506, 34506, 2, 0), +(34508, 34507, 34506, 3, 0), +(34838, 34508, 34506, 4, 0), +(34839, 34838, 34506, 5, 0); + +/*Hunting Party*/ +DELETE FROM spell_chain WHERE first_spell = 53290; +INSERT INTO spell_chain VALUES +(53290, 0, 53290, 1, 0), +(53291, 53290, 53290, 2, 0), +(53292, 53291, 53290, 3, 0); + +/*Bloodsurge*/ +DELETE FROM spell_chain WHERE first_spell = 53290; +INSERT INTO spell_chain VALUES +(46913, 0, 46913, 1, 0), +(46914, 46913, 46913, 2, 0), +(46915, 46914, 46913, 3, 0); + +/*Entrapment*/ +DELETE FROM spell_chain WHERE first_spell = 19184; +INSERT INTO spell_chain VALUES +(19184, 0, 19184, 1, 0), +(19387, 19184, 19184, 2, 0), +(19388, 19387, 19184, 3, 0); + +/*Concussive Barrage*/ +DELETE FROM spell_chain WHERE first_spell = 35100; +INSERT INTO spell_chain VALUES +(35100, 0, 35100, 1, 0), +(35102, 35100, 35100, 2, 0); + +/*Improved Stormstrike*/ +DELETE FROM spell_chain WHERE first_spell = 51521; +INSERT INTO spell_chain VALUES +(51521, 0, 51521, 1, 0), +(51522, 51521, 51521, 2, 0); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 76cd106e9..29b25f904 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -203,6 +203,8 @@ pkgdata_DATA = \ 8980_01_mangos_spell_bonus_data.sql \ 8981_01_mangos_spell_proc_event.sql \ 8988_01_mangos_spell_proc_event.sql \ + 8992_01_mangos_spell_proc_event.sql \ + 8992_02_mangos_spell_chain.sql \ README ## Additional files to include when running 'make dist' @@ -386,4 +388,6 @@ EXTRA_DIST = \ 8980_01_mangos_spell_bonus_data.sql \ 8981_01_mangos_spell_proc_event.sql \ 8988_01_mangos_spell_proc_event.sql \ + 8992_01_mangos_spell_proc_event.sql \ + 8992_02_mangos_spell_chain.sql \ README diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ea19748cc..f8056e93b 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 "8991" + #define REVISION_NR "8992" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 3ebcea94f..fc771ebd9 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_8988_01_mangos_spell_proc_event" + #define REVISION_DB_MANGOS "required_8992_02_mangos_spell_chain" #define REVISION_DB_REALMD "required_8728_01_realmd_account" #endif // __REVISION_SQL_H__