Merge

--HG--
branch : trunk

19 files changed, 233 insertions, 115 deletions

diff --git a/sql/characters.sql b/sql/characters.sql
index 25935727428..d5f965a0b17 100644
--- a/sql/characters.sql
+++ b/sql/characters.sql
@@ -23,7 +23,7 @@
 
 DROP TABLE IF EXISTS `character_db_version`;
 CREATE TABLE `character_db_version` (
-  `required_7932_01_characters_character_pet` bit(1) default NULL
+  `required_7988_07_characters_characters` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
 
 --
@@ -241,10 +241,10 @@ CREATE TABLE `auctionhousebot` (
 -- Data for table `auctionhousebot`
 --
 
-insert  into `auctionhousebot`(`auctionhouse`,`name`,`minitems`,`maxitems`,`mintime`,`maxtime`,`percentgreytradegoods`,`percentwhitetradegoods`,`percentgreentradegoods`,`percentbluetradegoods`,`percentpurpletradegoods`,`percentorangetradegoods`,`percentyellowtradegoods`,`percentgreyitems`,`percentwhiteitems`,`percentgreenitems`,`percentblueitems`,`percentpurpleitems`,`percentorangeitems`,`percentyellowitems`,`minpricegrey`,`maxpricegrey`,`minpricewhite`,`maxpricewhite`,`minpricegreen`,`maxpricegreen`,`minpriceblue`,`maxpriceblue`,`minpricepurple`,`maxpricepurple`,`minpriceorange`,`maxpriceorange`,`minpriceyellow`,`maxpriceyellow`,`minbidpricegrey`,`maxbidpricegrey`,`minbidpricewhite`,`maxbidpricewhite`,`minbidpricegreen`,`maxbidpricegreen`,`minbidpriceblue`,`maxbidpriceblue`,`minbidpricepurple`,`maxbidpricepurple`,`minbidpriceorange`,`maxbidpriceorange`,`minbidpriceyellow`,`maxbidpriceyellow`,`maxstackgrey`,`maxstackwhite`,`maxstackgreen`,`maxstackblue`,`maxstackpurple`,`maxstackorange`,`maxstackyellow`,`buyerpricegrey`,`buyerpricewhite`,`buyerpricegreen`,`buyerpriceblue`,`buyerpricepurple`,`buyerpriceorange`,`buyerpriceyellow`,`buyerbiddinginterval`,`buyerbidsperinterval`) values
-(2,'Alliance',0,0,8,24,0,27,12,10,1,0,0,0,10,30,8,2,0,0,100,150,150,250,800,1400,1250,1750,2250,4550,3250,5550,5250,6550,70,100,70,100,80,100,75,100,80,100,80,100,80,100,0,0,3,2,1,1,1,1,1,5,12,15,20,22,1,1),
-(6,'Horde',0,0,8,24,0,27,12,10,1,0,0,0,10,30,8,2,0,0,100,150,150,250,800,1400,1250,1750,2250,4550,3250,5550,5250,6550,70,100,70,100,80,100,75,100,80,100,80,100,80,100,0,0,3,2,1,1,1,1,1,5,12,15,20,22,1,1),
-(7,'Neutral',0,0,8,24,0,27,12,10,1,0,0,0,10,30,8,2,0,0,100,150,150,250,800,1400,1250,1750,2250,4550,3250,5550,5250,6550,70,100,70,100,80,100,75,100,80,100,80,100,80,100,0,0,3,2,1,1,1,1,1,5,12,15,20,22,1,1);
+insert  into `auctionhousebot`(`auctionhouse`,`name`,`minitems`,`maxitems`,`percentgreytradegoods`,`percentwhitetradegoods`,`percentgreentradegoods`,`percentbluetradegoods`,`percentpurpletradegoods`,`percentorangetradegoods`,`percentyellowtradegoods`,`percentgreyitems`,`percentwhiteitems`,`percentgreenitems`,`percentblueitems`,`percentpurpleitems`,`percentorangeitems`,`percentyellowitems`,`minpricegrey`,`maxpricegrey`,`minpricewhite`,`maxpricewhite`,`minpricegreen`,`maxpricegreen`,`minpriceblue`,`maxpriceblue`,`minpricepurple`,`maxpricepurple`,`minpriceorange`,`maxpriceorange`,`minpriceyellow`,`maxpriceyellow`,`minbidpricegrey`,`maxbidpricegrey`,`minbidpricewhite`,`maxbidpricewhite`,`minbidpricegreen`,`maxbidpricegreen`,`minbidpriceblue`,`maxbidpriceblue`,`minbidpricepurple`,`maxbidpricepurple`,`minbidpriceorange`,`maxbidpriceorange`,`minbidpriceyellow`,`maxbidpriceyellow`,`maxstackgrey`,`maxstackwhite`,`maxstackgreen`,`maxstackblue`,`maxstackpurple`,`maxstackorange`,`maxstackyellow`,`buyerpricegrey`,`buyerpricewhite`,`buyerpricegreen`,`buyerpriceblue`,`buyerpricepurple`,`buyerpriceorange`,`buyerpriceyellow`,`buyerbiddinginterval`,`buyerbidsperinterval`) values
+(2,'Alliance',0,0,0,27,12,10,1,0,0,0,10,30,8,2,0,0,100,150,150,250,800,1400,1250,1750,2250,4550,3250,5550,5250,6550,70,100,70,100,80,100,75,100,80,100,80,100,80,100,0,0,3,2,1,1,1,1,1,5,12,15,20,22,1,1),
+(6,'Horde',0,0,0,27,12,10,1,0,0,0,10,30,8,2,0,0,100,150,150,250,800,1400,1250,1750,2250,4550,3250,5550,5250,6550,70,100,70,100,80,100,75,100,80,100,80,100,80,100,0,0,3,2,1,1,1,1,1,5,12,15,20,22,1,1),
+(7,'Neutral',0,0,0,27,12,10,1,0,0,0,10,30,8,2,0,0,100,150,150,250,800,1400,1250,1750,2250,4550,3250,5550,5250,6550,70,100,70,100,80,100,75,100,80,100,80,100,80,100,0,0,3,2,1,1,1,1,1,5,12,15,20,22,1,1);
 
 --
 -- Table structure for table `bugreport`
diff --git a/sql/mangos.sql b/sql/mangos.sql
index 035bde9ed35..a4fdd9b8956 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `db_version`;
 CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
   `creature_ai_version` varchar(120) default NULL,
-  `required_7980_01_mangos_item_required_target` bit(1) default NULL
+  `required_7988_09_mangos_spell_proc_event` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -13619,7 +13619,7 @@ INSERT INTO spell_chain VALUES
 (33043,33042,31661,4,0),
 (42949,33043,31661,5,0),
 (42950,42949,31661,6,0),
-/*FireBlast*/
+/*Fire Blast*/
 (2136,0,2136,1,0),
 (2137,2136,2136,2,0),
 (2138,2137,2136,3,0),
@@ -13631,7 +13631,7 @@ INSERT INTO spell_chain VALUES
 (27079,27078,2136,9,0),
 (42872,27079,2136,10,0),
 (42873,42872,2136,11,0),
-/*FireWard*/
+/*Fire Ward*/
 (543,0,543,1,0),
 (8457,543,543,2,0),
 (8458,8457,543,3,0),
@@ -13656,6 +13656,9 @@ INSERT INTO spell_chain VALUES
 (38692,27070,133,14,0),
 (42832,38692,133,15,0),
 (42833,42832,133,16,0),
+/*Fiery Payback*/
+(64353,0,64353,1,0),
+(64357,64353,64353,2,0),
 /*Flamestrike*/
 (2120,0,2120,1,0),
 (2121,2120,2120,2,0),
@@ -13921,6 +13924,9 @@ INSERT INTO spell_chain VALUES
 (32546,0,32546,1,0),
 (48119,32546,32546,2,0),
 (48120,48119,32546,3,0),
+/*Body and Soul*/
+(64127,0,64127,1,0),
+(64129,64127,64127,2,0),
 /*Circle of Healing*/
 (34861,0,34861,1,0),
 (34863,34861,34861,2,0),
@@ -13939,6 +13945,10 @@ INSERT INTO spell_chain VALUES
 (25437,19243,19236,7,0),
 (48172,25437,19236,8,0),
 (48173,48172,19236,9,0),
+/*Empowered Renew*/
+(63534,0,63534,1,0),
+(63542,63534,63534,2,0),
+(63543,63542,63534,3,0),
 /*FlashHeal*/
 (2061,0,2061,1,0),
 (9472,2061,2061,2,0),
@@ -14034,6 +14044,10 @@ INSERT INTO spell_chain VALUES
 (20770,10881,2006,5,0),
 (25435,20770,2006,6,0),
 (48171,25435,2006,7,0),
+/*Serendipity*/
+(63730,0,63730,1,0),
+(63733,63730,63730,2,0),
+(63737,63733,63730,3,0),
 /*Smite*/
 (585,0,585,1,0),
 (591,585,585,2,0),
@@ -14060,6 +14074,10 @@ INSERT INTO spell_chain VALUES
 (25467,19280,2944,7,0),
 (48299,25467,2944,8,0),
 (48300,48299,2944,9,0),
+/*Improved Devouring Plague*/
+(63625,0,63625,1,0),
+(63626,63625,63625,2,0),
+(63627,63626,63625,3,0),
 /*Mind Blast*/
 (8092,0,8092,1,0),
 (8102,8092,8092,2,0),
@@ -14178,13 +14196,6 @@ INSERT INTO spell_chain VALUES
 (26998,9898,99,6,0),
 (48559,26998,99,7,0),
 (48560,48559,99,8,0),
-/*Faerie Fire (Feral)*/
-(16857,0,16857,1,0),
-(17390,16857,16857,2,0),
-(17391,17390,16857,3,0),
-(17392,17391,16857,4,0),
-(27011,17392,16857,5,0),
-(48475,27011,16857,6,0),
 /*Ferocious Bite*/
 (22568,0,22568,1,0),
 (22827,22568,22568,2,0),
@@ -14700,13 +14711,6 @@ INSERT INTO spell_chain VALUES
 (49974,49973,49966,9,0),
 (52475,49974,49966,10,0),
 (52476,52475,49966,11,0),
-/*Thunderstomp*/
-(26090,0,26090,1,0),
-(26187,26090,26090,2,0),
-(26188,26187,26090,3,0),
-(27063,26188,26090,4,0),
-(55572,27063,26090,5,0),
-(55573,55572,26090,6,0),
 /*------------------
 --(217)Pet-Raptor
 ------------------*/
@@ -15051,6 +15055,12 @@ INSERT INTO spell_chain VALUES
 (27149,10293,465,8,0),
 (48941,27149,465,9,0),
 (48942,48941,465,10,0),
+/*Divinity*/
+(63646,0,63646,1,0),
+(63647,63646,63646,2,0),
+(63648,63647,63646,3,0),
+(63649,63648,63646,4,0),
+(63650,63649,63646,5,0),
 /*Fire Resistance Aura*/
 (19891,0,19891,1,0),
 (19899,19891,19891,2,0),
@@ -15108,7 +15118,7 @@ INSERT INTO spell_chain VALUES
 (1756,1755,1742,5,0),
 (16697,1756,1742,6,0),
 (27048,16697,1742,7,0),
-/*GreatResistance*/
+/*Great Resistance*/
 (53427,0,53427,1,0),
 (53429,53427,53427,2,0),
 (53430,53429,53427,3,0),
@@ -15122,6 +15132,15 @@ INSERT INTO spell_chain VALUES
 (14921,14920,2649,7,0),
 (27047,14921,2649,8,0),
 (61676,27047,2649,9,0),
+/*Shark Attack*/
+(62759,0,62759,1,0),
+(62760,62759,62759,2,0),
+/*Silverback*/
+(62764,0,62764,1,0),
+(62765,62764,62764,2,0),
+/*Wild Hunt*/
+(62758,0,62758,1,0),
+(62762,62758,62758,2,0),
 /*------------------
 -- (333) Enchanting
 ------------------*/
@@ -15170,6 +15189,9 @@ INSERT INTO spell_chain VALUES
 (28172,17728,2362,4,0),
 (47886,28172,2362,5,0),
 (47888,47886,2362,6,0),
+/*Decimation*/
+(63156,0,63156,1,0),
+(63158,63156,63156,2,0),
 /*DemonArmor*/
 (706,0,706,1,0),
 (1086,706,706,2,0),
@@ -15202,6 +15224,10 @@ INSERT INTO spell_chain VALUES
 (11695,11694,755,7,0),
 (27259,11695,755,8,0),
 (47856,27259,755,9,0),
+/*Nemesis*/
+(63117,0,63117,1,0),
+(63121,63117,63117,2,0),
+(63123,63121,63117,3,0),
 /*RitualofSouls*/
 (29893,0,29893,1,0),
 (58887,29893,29893,2,0),
@@ -15240,13 +15266,6 @@ INSERT INTO spell_chain VALUES
 (603,0,603,1,0),
 (30910,603,603,2,0),
 (47867,30910,603,3,0),
-/*Curse of Recklessness*/
-(704,0,704,1,0),
-(7658,704,704,2,0),
-(7659,7658,704,3,0),
-(11717,7659,704,4,0),
-(27226,11717,704,5,0),
-(57595,27226,704,6,0),
 /*Curse of the Elements*/
 (1490,0,1490,1,0),
 (11721,1490,1490,2,0),
@@ -15312,15 +15331,6 @@ INSERT INTO spell_chain VALUES
 (27243,0,27243,1,0),
 (47835,27243,27243,2,0),
 (47836,47835,27243,3,0),
-/*SiphonLife*/
-(18265,0,18265,1,0),
-(18879,18265,18265,2,0),
-(18880,18879,18265,3,0),
-(18881,18880,18265,4,0),
-(27264,18881,18265,5,0),
-(30911,27264,18265,6,0),
-(47861,30911,18265,7,0),
-(47862,47861,18265,8,0),
 /*UnstableAffliction*/
 (30108,0,30108,1,0),
 (30404,30108,30108,2,0),
@@ -15384,6 +15394,9 @@ INSERT INTO spell_chain VALUES
 (58794,25500,8033,7,0),
 (58795,58794,8033,8,0),
 (58796,58795,8033,9,0),
+/*Frozen Power*/
+(63373,0,63373,1,0),
+(63374,63373,63373,2,0),
 /*Life Tap*/
 (1454,0,1454,1,0),
 (1455,1454,1454,2,0),
@@ -15540,6 +15553,9 @@ INSERT INTO spell_chain VALUES
 /*------------------
 -- (375) Elemental Combat
 ------------------*/
+/*Booming Echoes*/
+(63370,0,63370,1,0),
+(63372,63370,63370,2,0),
 /*Chain Lightning*/
 (421,0,421,1,0),
 (930,421,421,2,0),
@@ -15690,6 +15706,9 @@ INSERT INTO spell_chain VALUES
 (26979,26978,5185,13,0),
 (48377,26979,5185,14,0),
 (48378,48377,5185,15,0),
+/*Improved Barkskin*/
+(63410,0,63410,1,0),
+(63411,63410,63410,2,0),
 /*Lifebloom*/
 (33763,0,33763,1,0),
 (48450,33763,33763,2,0),
@@ -15785,13 +15804,6 @@ INSERT INTO spell_chain VALUES
 (17329,16813,16689,6,9853),
 (27009,17329,16689,7,26989),
 (53312,27009,16689,8,53308),
-/*FaerieFire*/
-(770,0,770,1,0),
-(778,770,770,2,0),
-(9749,778,770,3,0),
-(9907,9749,770,4,0),
-(26993,9907,770,5,0),
-(48476,26993,770,6,0),
 /*Hibernate*/
 (2637,0,2637,1,0),
 (18657,2637,2637,2,0),
@@ -15892,15 +15904,6 @@ INSERT INTO spell_chain VALUES
 (59170,50796,50796,2,0),
 (59171,59170,50796,3,0),
 (59172,59171,50796,4,0),
-/*Conflagrate*/
-(17962,0,17962,1,0),
-(18930,17962,17962,2,0),
-(18931,18930,17962,3,0),
-(18932,18931,17962,4,0),
-(27266,18932,17962,5,0),
-(30912,27266,17962,6,0),
-(47828,30912,17962,7,0),
-(47829,47828,17962,8,0),
 /*Hellfire*/
 (1949,0,1949,1,0),
 (11683,1949,1949,2,0),
@@ -15924,6 +15927,10 @@ INSERT INTO spell_chain VALUES
 (32231,29722,29722,2,0),
 (47837,32231,29722,3,0),
 (47838,47837,29722,4,0),
+/*Molten Skin*/
+(63349,0,63349,1,0),
+(63350,63349,63349,2,0),
+(63351,63350,63349,3,0),
 /*RainofFire*/
 (5740,0,5740,1,0),
 (6219,5740,5740,2,0),
@@ -16087,6 +16094,10 @@ INSERT INTO spell_chain VALUES
 (27841,14819,14752,4,0),
 (25312,27841,14752,5,0),
 (48073,25312,14752,6,0),
+/*Improved Flash Heal*/
+(63504,0,63504,1,0),
+(63505,63504,63504,2,0),
+(63506,63505,63504,3,0),
 /*InnerFire*/
 (588,0,588,1,0),
 (7128,588,588,2,0),
@@ -16239,7 +16250,7 @@ INSERT INTO spell_chain VALUES
 /*------------------
 --(770)Blood
 ------------------*/
-/*BloodBoil*/
+/*Blood Boil*/
 (48721,0,48721,1,0),
 (49939,48721,48721,2,0),
 (49940,49939,48721,3,0),
@@ -16251,14 +16262,26 @@ INSERT INTO spell_chain VALUES
 (49928,49927,45902,4,0),
 (49929,49928,45902,5,0),
 (49930,49929,45902,6,0),
-/*HeartStrike*/
+/*Death Coil*/
+(62900,0,62900,1,0),
+(62901,62900,62900,2,0),
+(62902,62901,62900,3,0),
+(62903,62902,62900,4,0),
+(62904,62903,62900,5,0),
+/*Heart Strike*/
 (55050,0,55050,1,0),
 (55258,55050,55050,2,0),
 (55259,55258,55050,3,0),
 (55260,55259,55050,4,0),
 (55261,55260,55050,5,0),
 (55262,55261,55050,6,0),
-/*ImprovedRuneTap*/
+/*Improved Blood Presence*/
+(50365,0,50365,1,0),
+(50371,50365,50365,2,0),
+/*Improved Death Strike*/
+(62905,0,62905,1,0),
+(62908,62905,62905,2,0),
+/*Improved Rune Tap*/
 (48985,0,48985,1,0),
 (49488,48985,48985,2,0),
 (49489,49488,48985,3,0),
@@ -16291,12 +16314,11 @@ INSERT INTO spell_chain VALUES
 /*HornofWinter*/
 (57330,0,57330,1,0),
 (57623,57330,57330,2,0),
-/*HowlingBlast*/
+/*Howling Blast*/
 (49184,0,49184,1,0),
-(51408,49184,49184,2,0),
-(51409,51408,49184,3,0),
-(51410,51409,49184,4,0),
-(51411,51410,49184,5,0),
+(51409,49184,49184,2,0),
+(51410,51409,49184,3,0),
+(51411,51410,49184,4,0),
 /*IcyTalons*/
 (50880,0,50880,1,0),
 (50884,50880,50880,2,0),
@@ -16309,7 +16331,10 @@ INSERT INTO spell_chain VALUES
 (49903,49896,45477,3,0),
 (49904,49903,45477,4,0),
 (49909,49904,45477,5,0),
-/*ImprovedIcyTouch*/
+/*Improved Frost Presence*/
+(50384,0,50384,1,0),
+(50385,50384,50384,2,0),
+/*Improved Icy Touch*/
 (49175,0,49175,1,0),
 (50031,49175,49175,2,0),
 (51456,50031,49175,3,0),
@@ -16332,7 +16357,7 @@ INSERT INTO spell_chain VALUES
 (49936,43265,43265,2,0),
 (49937,49936,43265,3,0),
 (49938,49937,43265,4,0),
-/*DeathCoil*/
+/*Death Coil*/
 (47541,0,47541,1,0),
 (49892,47541,47541,2,0),
 (49893,49892,47541,3,0),
@@ -16344,12 +16369,13 @@ INSERT INTO spell_chain VALUES
 (45463,49999,49998,3,0),
 (49923,45463,49998,4,0),
 (49924,49923,49998,5,0),
-/*MagicSuppression*/
+/*Improved Unholy Presence*/
+(50391,0,50391,1,0),
+(50392,50391,50391,2,0),
+/*Magic Suppression*/
 (49224,0,49224,1,0),
 (49610,49224,49224,2,0),
 (49611,49610,49224,3,0),
-(49612,49611,49224,4,0),
-(49614,49612,49224,5,0),
 /*Outbreak*/
 (49013,0,49013,1,0),
 (55236,49013,49013,2,0),
@@ -16856,13 +16882,8 @@ INSERT INTO `spell_proc_event` VALUES
 (14892, 0x00000000,  6, 0x10001E00, 0x00010004, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (15088, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (15128, 0x00000004,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(15268, 0x00000020,  6, 0x06080000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (15277, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 6.000000, 0.000000,  0),
 (15286, 0x00000020,  6, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(15323, 0x00000020,  6, 0x06080000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(15324, 0x00000020,  6, 0x06080000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(15325, 0x00000020,  6, 0x06080000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(15326, 0x00000020,  6, 0x06080000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (15337, 0x00000000,  6, 0x00002000, 0x00000002, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (15338, 0x00000000,  6, 0x00002000, 0x00000002, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (15346, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 6.000000, 0.000000,  0),
@@ -16907,12 +16928,7 @@ INSERT INTO `spell_proc_event` VALUES
 (17364, 0x00000008,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (17495, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0.000000, 0.000000,  0),
 (17793, 0x00000000,  5, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
-(17794, 0x00000020,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0.000000, 0.000000,  0),
 (17796, 0x00000000,  5, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
-(17797, 0x00000020,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(17798, 0x00000020,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(17799, 0x00000020,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(17800, 0x00000020,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (17801, 0x00000000,  5, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (17802, 0x00000000,  5, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (17803, 0x00000000,  5, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
@@ -16924,9 +16940,6 @@ INSERT INTO `spell_proc_event` VALUES
 (18120, 0x00000000,  5, 0x000003E5, 0x000010C0, 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),
-(19228, 0x00000000,  0, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(19232, 0x00000000,  9, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(19233, 0x00000000,  9, 0x00000040, 0x00000000, 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),
 (19572, 0x00000000,  9, 0x00800000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000,  0),
@@ -17059,20 +17072,14 @@ INSERT INTO `spell_proc_event` VALUES
 (30675, 0x00000000, 11, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (30678, 0x00000000, 11, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (30679, 0x00000000, 11, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(30680, 0x00000000, 11, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(30681, 0x00000000, 11, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (30701, 0x0000001C,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (30705, 0x0000001C,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (30802, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (30803, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (30804, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (30805, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
-(30806, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
-(30807, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (30808, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (30809, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
-(30810, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
-(30811, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (30823, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 10.500000, 0.000000,  0),
 (30881, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  5),
 (30883, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  5),
@@ -17179,7 +17186,6 @@ INSERT INTO `spell_proc_event` VALUES
 (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),
-(35103, 0x00000000,  9, 0x00003001, 0x00000000, 0x00000000, 0x00000000, 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),
@@ -17324,9 +17330,6 @@ INSERT INTO `spell_proc_event` VALUES
 (47203, 0x00000000,  5, 0x00000008, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (47204, 0x00000000,  5, 0x00000008, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (47205, 0x00000000,  5, 0x00000008, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(47232, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
-(47234, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
-(47235, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (47245, 0x00000020,  5, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (47246, 0x00000020,  5, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (47247, 0x00000020,  5, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
@@ -17344,15 +17347,6 @@ INSERT INTO `spell_proc_event` VALUES
 (47535, 0x00000000,  6, 0x00001800, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (47536, 0x00000000,  6, 0x00001800, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (47537, 0x00000000,  6, 0x00001800, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(47538, 0x00000000,  6, 0x00001800, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(47539, 0x00000000,  6, 0x00001800, 0x00800000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(47549, 0x00000000,  6, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(47551, 0x00000000,  6, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(47552, 0x00000000,  6, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(47555, 0x00000000,  6, 0x00001800, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(47556, 0x00000000,  6, 0x00001800, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(47557, 0x00000000,  6, 0x00001800, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(47572, 0x00000000,  6, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (47580, 0x00000000,  6, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0x00010000, 0.000000, 0.000000,  0),
 (47581, 0x00000000,  6, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0x00010000, 0.000000, 0.000000,  0),
 (47582, 0x00000000,  6, 0x00000000, 0x00000000, 0x00000040, 0x00000000, 0x00010000, 0.000000, 0.000000,  0),
@@ -17393,8 +17387,6 @@ INSERT INTO `spell_proc_event` VALUES
 (49504, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
 (49529, 0x00000000, 15, 0x01400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (49530, 0x00000000, 15, 0x01400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(49531, 0x00000000, 15, 0x01400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(49532, 0x00000000, 15, 0x01400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (49622, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 60),
 (49657, 0x00000000, 15, 0x00000000, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (50781, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
@@ -17478,13 +17470,9 @@ INSERT INTO `spell_proc_event` VALUES
 (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),
-(53293, 0x00000000,  9, 0x00000800, 0x7FFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
-(53294, 0x00000000,  9, 0x00000800, 0x7FFFFFFF, 0x00000000, 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),
-(53383, 0x00000000, 10, 0x00800000, 0x00020000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
-(53384, 0x00000000, 10, 0x00800000, 0x00020000, 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),
 (53501, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000,  0),
@@ -17517,8 +17505,6 @@ INSERT INTO `spell_proc_event` VALUES
 (54939, 0x00000000, 10, 0x00008000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (55380, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
 (55440, 0x00000000, 11, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(55620, 0x00000000, 15, 0x00000001, 0x08000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(55623, 0x00000000, 15, 0x00000001, 0x08000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (55640, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
 (55666, 0x00000000, 15, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (55667, 0x00000000, 15, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
@@ -17531,9 +17517,6 @@ INSERT INTO `spell_proc_event` VALUES
 (55768, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
 (55776, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
 (56218, 0x00000000,  5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(56333, 0x00000000,  9, 0x00000004, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(56336, 0x00000000,  9, 0x00000004, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(56337, 0x00000000,  9, 0x00000004, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (56342, 0x00000000,  9, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (56343, 0x00000000,  9, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (56344, 0x00000000,  9, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
@@ -17560,8 +17543,6 @@ INSERT INTO `spell_proc_event` VALUES
 (58372, 0x00000000,  4, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (58386, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000020, 0.000000, 0.000000,  0),
 (58435, 0x00000000,  5, 0x00000002, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(58436, 0x00000000,  5, 0x00000002, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
-(58437, 0x00000000,  5, 0x00000002, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (58616, 0x00000000, 15, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (58620, 0x00000000, 15, 0x00000000, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (58626, 0x00000000, 15, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
@@ -17820,7 +17801,6 @@ INSERT INTO `spell_bonus_data` VALUES
 ('172', '0', '0.3', '0', 'Warlock - Corruption'),
 ('348', '0.2', '0.2', '0', 'Warlock - Immolate'),
 ('27243', '0.22', '0.25', '0', 'Warlock - Seed of Corruption'),
-('18265', '0', '0.1', '0', 'Warlock - Siphon Life'),
 ('30108', '0', '0.24', '0', 'Warlock - Unstable Affliction'),
 ('31117', '1.8', '0', '0', 'Warlock - Unstable Affliction Dispell'),
 ('17962', '0.4286', '0', '0', 'Warlock - Conflagrate'),
diff --git a/sql/updates/3263_world_scripts_(missing in full).sql b/sql/updates/3263_world_scripts_#missing_in_full.sql
index 942ffd1ccfd..942ffd1ccfd 100644
--- a/sql/updates/3263_world_scripts_(missing in full).sql
+++ b/sql/updates/3263_world_scripts_#missing_in_full.sql
diff --git a/sql/updates/3427_world_scripts_(naxx).sql b/sql/updates/3427_world_scripts_#naxx.sql
index bb437c29669..bb437c29669 100644
--- a/sql/updates/3427_world_scripts_(naxx).sql
+++ b/sql/updates/3427_world_scripts_#naxx.sql
diff --git a/sql/updates/3466_world_scripts_(wintergrasp).sql b/sql/updates/3466_world_scripts_#wintergrasp.sql
index ac757d126de..ac757d126de 100644
--- a/sql/updates/3466_world_scripts_(wintergrasp).sql
+++ b/sql/updates/3466_world_scripts_#wintergrasp.sql
diff --git a/sql/updates/3467_world_spellclick_(dk).sql b/sql/updates/3467_world_spellclick_#dk.sql
index 52cc8eb4459..52cc8eb4459 100644
--- a/sql/updates/3467_world_spellclick_(dk).sql
+++ b/sql/updates/3467_world_spellclick_#dk.sql
diff --git a/sql/updates/3592_world_spell_(dk).sql b/sql/updates/3592_world_spell_#dk.sql
index 4f7c4e294ac..4f7c4e294ac 100644
--- a/sql/updates/3592_world_spell_(dk).sql
+++ b/sql/updates/3592_world_spell_#dk.sql
diff --git a/sql/updates/3593_world_spellclick_(dk).sql b/sql/updates/3593_world_spellclick_#dk.sql
index c0550f03c60..c0550f03c60 100644
--- a/sql/updates/3593_world_spellclick_(dk).sql
+++ b/sql/updates/3593_world_spellclick_#dk.sql
diff --git a/sql/updates/3612_world_spell_(dk).sql b/sql/updates/3612_world_spell_#dk.sql
index 62f8a9b8b7a..62f8a9b8b7a 100644
--- a/sql/updates/3612_world_spell_(dk).sql
+++ b/sql/updates/3612_world_spell_#dk.sql
diff --git a/sql/updates/3643_world_(wintergrasp).sql b/sql/updates/3643_world_#wintergrasp.sql
index 58137883790..58137883790 100644
--- a/sql/updates/3643_world_(wintergrasp).sql
+++ b/sql/updates/3643_world_#wintergrasp.sql
diff --git a/sql/updates/3736_world_spell_(dk).sql b/sql/updates/3736_world_spell_#dk.sql
index 4aa0c6b557c..4aa0c6b557c 100644
--- a/sql/updates/3736_world_spell_(dk).sql
+++ b/sql/updates/3736_world_spell_#dk.sql
diff --git a/sql/updates/3813_world_spell_(dk).sql b/sql/updates/3813_world_spell_#dk.sql
index ee12a70afd0..ee12a70afd0 100644
--- a/sql/updates/3813_world_spell_(dk).sql
+++ b/sql/updates/3813_world_spell_#dk.sql
diff --git a/sql/updates/3856_world_spell_(naxx).sql b/sql/updates/3856_world_spell_#naxx.sql
index 3b3895b3c4d..3b3895b3c4d 100644
--- a/sql/updates/3856_world_spell_(naxx).sql
+++ b/sql/updates/3856_world_spell_#naxx.sql
diff --git a/sql/updates/3873_world_spell_(dk).sql b/sql/updates/3873_world_spell_#dk.sql
index 09d130a4f6b..09d130a4f6b 100644
--- a/sql/updates/3873_world_spell_(dk).sql
+++ b/sql/updates/3873_world_spell_#dk.sql
diff --git a/sql/updates/3886_world_script_(nexus).sql b/sql/updates/3886_world_script_#nexus.sql
index 7495a5f61c1..7495a5f61c1 100644
--- a/sql/updates/3886_world_script_(nexus).sql
+++ b/sql/updates/3886_world_script_#nexus.sql
diff --git a/sql/updates/3914_world_spell_proc_event.sql b/sql/updates/3914_world_spell_proc_event.sql
new file mode 100644
index 00000000000..54ee080f1a4
--- /dev/null
+++ b/sql/updates/3914_world_spell_proc_event.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN (59088, 59089, 58388);
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(59088,	0x00,	4,	0x00000000,	0x00000002,	0x00000000,	0x00010000,	0x00000000,	0,	0,	0), -- Improved Spell Reflection
+(59089,	0x00,	4,	0x00000000,	0x00000002,	0x00000000,	0x00010000,	0x00000000,	0,	0,	0); -- Improved Spell Reflection
\ No newline at end of file
diff --git a/sql/updates/3920_characters_#309-313_converter.sql b/sql/updates/3920_characters_#309-313_converter.sql
new file mode 100644
index 00000000000..812217daf8e
--- /dev/null
+++ b/sql/updates/3920_characters_#309-313_converter.sql
@@ -0,0 +1,67 @@
+
+CREATE TABLE `character_equipmentsets` (
+  `guid` int(11) NOT NULL default '0',
+  `setguid` bigint(20) NOT NULL auto_increment,
+  `setindex` tinyint(4) NOT NULL default '0',
+  `name` varchar(100) NOT NULL,
+  `iconname` varchar(100) NOT NULL,
+  `item0` int(11) NOT NULL default '0',
+  `item1` int(11) NOT NULL default '0',
+  `item2` int(11) NOT NULL default '0',
+  `item3` int(11) NOT NULL default '0',
+  `item4` int(11) NOT NULL default '0',
+  `item5` int(11) NOT NULL default '0',
+  `item6` int(11) NOT NULL default '0',
+  `item7` int(11) NOT NULL default '0',
+  `item8` int(11) NOT NULL default '0',
+  `item9` int(11) NOT NULL default '0',
+  `item10` int(11) NOT NULL default '0',
+  `item11` int(11) NOT NULL default '0',
+  `item12` int(11) NOT NULL default '0',
+  `item13` int(11) NOT NULL default '0',
+  `item14` int(11) NOT NULL default '0',
+  `item15` int(11) NOT NULL default '0',
+  `item16` int(11) NOT NULL default '0',
+  `item17` int(11) NOT NULL default '0',
+  `item18` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`setguid`),
+  UNIQUE KEY `idx_set` (`guid`,`setguid`,`setindex`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
+UPDATE characters SET data = REPLACE(data,'  ',' ');
+UPDATE characters SET data = CONCAT(TRIM(data),' ');
+
+UPDATE `characters` SET `data` = CONCAT(
+	SUBSTRING_INDEX(`data`, ' ', 257 + 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 1), ' ', -261 + 260 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18 + 1), ' ', -261 - 18 + 260 + 18 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*2 + 1), ' ', -261 - 18*2 + 260 + 18*2 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*3 + 1), ' ', -261 - 18*3 + 260 + 18*3 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*4 + 1), ' ', -261 - 18*4 + 260 + 18*4 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*5 + 1), ' ', -261 - 18*5 + 260 + 18*5 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*6 + 1), ' ', -261 - 18*6 + 260 + 18*6 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*7 + 1), ' ', -261 - 18*7 + 260 + 18*7 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*8 + 1), ' ', -261 - 18*8 + 260 + 18*8 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*9 + 1), ' ', -261 - 18*9 + 260 + 18*9 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*10 + 1), ' ', -261 - 18*10 + 260 + 18*10 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*11 + 1), ' ', -261 - 18*11 + 260 + 18*11 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*12 + 1), ' ', -261 - 18*12 + 260 + 18*12 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*13 + 1), ' ', -261 - 18*13 + 260 + 18*13 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*14 + 1), ' ', -261 - 18*14 + 260 + 18*14 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*15 + 1), ' ', -261 - 18*15 + 260 + 18*15 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*16 + 1), ' ', -261 - 18*16 + 260 + 18*16 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*17 + 1), ' ', -261 - 18*17 + 260 + 18*17 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 261 + 18*18 + 1), ' ', -261 - 18*18 + 260 + 18*18 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 837 + 1), ' ', -837 + 600 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 937 + 1), ' ', -937 + 874 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1007 + 1), ' ', -1007 + 1002 - 1), ' ',
+	'0 0 ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1688 + 1), ' ', -1688 + 1008 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1696 + 1), ' ', -1696 + 1691 - 1), ' ',
+	SUBSTRING_INDEX(SUBSTRING_INDEX(`data`, ' ', 1700 + 1), ' ', -1700 + 1699 - 1), ' '
+	)
+WHERE length(SUBSTRING_INDEX(data, ' ', 1700)) < length(data) and length(SUBSTRING_INDEX(data, ' ', 1701)) >= length(data);
+
+UPDATE characters SET data = REPLACE(data,'  ',' ');
+UPDATE characters SET data = CONCAT(TRIM(data),' ');
diff --git a/sql/updates/3920_world_#309-313_converter.sql b/sql/updates/3920_world_#309-313_converter.sql
new file mode 100644
index 00000000000..c0b23c83626
--- /dev/null
+++ b/sql/updates/3920_world_#309-313_converter.sql
@@ -0,0 +1,66 @@
+alter table `item_template`
+    drop column `dmg_type3`,
+    drop column `dmg_max3`,
+    drop column `dmg_min3`,
+    drop column `dmg_type4`,
+    drop column `dmg_max4`,
+    drop column `dmg_min4`,
+    drop column `dmg_type5`,
+    drop column `dmg_max5`,
+    drop column `dmg_min5`;
+
+alter table `creature_template`
+    add column `unk1` int(11) UNSIGNED DEFAULT '0' NOT NULL after `heroic_entry`,
+    add column `unk2` int(11) UNSIGNED DEFAULT '0' NOT NULL after `unk1`,
+    add column `questItem1` int(11) UNSIGNED DEFAULT '0' NOT NULL after `RacialLeader`,
+    add column `questItem2` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem1`,
+    add column `questItem3` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem2`,
+    add column `questItem4` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem3`,
+    add column `movementId` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem4`;
+
+alter table `item_template`
+    add column `HolidayId` int(11) UNSIGNED DEFAULT '0' NOT NULL after `ItemLimitCategory`;
+
+alter table `gameobject_template`
+    add column `unk1` varchar(100) NOT NULL default ''            after `castBarCaption`,
+    add column `questItem1` int(11) UNSIGNED DEFAULT '0' NOT NULL after `size`,
+    add column `questItem2` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem1`,
+    add column `questItem3` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem2`,
+    add column `questItem4` int(11) UNSIGNED DEFAULT '0' NOT NULL after `questItem3`;
+
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (18265);
+
+/* Blackout removed */
+DELETE FROM spell_proc_event WHERE entry IN (15268, 15269, 15323, 15324, 15325, 15326);
+/* Improved Wing Clip removed */
+DELETE FROM spell_proc_event WHERE entry IN (19228, 19232, 19233);
+/* Shadow Mastery, not have charges now */
+DELETE FROM spell_proc_event WHERE entry IN (17794,17797,17798,17799,17800);
+/* Lightning Overload have 3 ranks now, 2 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (30680,30681);
+/* Unleashed Rage have 3 ranks now, 2 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (30806,30807,30810,30811);
+/* Concussive Barrage have 2 ranks now, 1 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (35103);
+/* Demonic Empathy, removed */
+DELETE FROM spell_proc_event WHERE entry IN (47232,47234,47235);
+/* Rapture have 3 ranks now, 2 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (47538,47539);
+/* Psychic Horror have 1 rank now, 1 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (47572);
+/* Sudden Doom have 3 ranks now, 2 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (49531,49532);
+/* Hunting Party have 3 ranks now, 2 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (53293,53294);
+/* Righteous Vengeance have 3 ranks now, 2 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (53383,53384);
+/* Night of the Dead not have charges now */
+DELETE FROM spell_proc_event WHERE entry IN (55620,55623);
+/* Pandemic have 1 rank, 2 dropped */
+DELETE FROM spell_proc_event WHERE entry IN (58436,58437);
+/* Improved Holy Concentration, removed */
+DELETE FROM spell_proc_event WHERE entry IN (47549,47551,47552);
+/* Serendipity, replace by aanother spell ids */
+DELETE FROM spell_proc_event WHERE entry IN (47555,47556,47557);
+/* T.N.T. non triggring now */
+DELETE FROM spell_proc_event WHERE entry IN (56333,56336,56337);
diff --git a/sql/world_spell_full.sql b/sql/world_spell_full.sql
index b0d025ba1c5..0305998be26 100644
--- a/sql/world_spell_full.sql
+++ b/sql/world_spell_full.sql
@@ -1466,7 +1466,6 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
 (58364,	0x00,	4,	0x00000400,	0x00000000,	0x00000000,	0x00000000,	0x00000000,	0,	0,	0), -- Glyph of Revenge
 (58372,	0x00,	4,	0x00000002,	0x00000000,	0x00000000,	0x00000000,	0x00000000,	0,	0,	0), -- Glyph of Hamstring
 (58386,	0x00,	0,	0x00000000,	0x00000000,	0x00000000,	0x00000000,	0x00000020,	0,	0,	0), -- Glyph of Overpower
-(58388,	0x00,	4,	0x00000040,	0x00000000,	0x00000000,	0x00000110,	0x00000000,	0,	0,	0), -- Glyph of Devastate
 (58426,	0x00,	8,	0x00400000,	0x00000000,	0x00000000,	0x00014000,	0x00006001,	0,	0,	0), -- Overkill
 (58435,	0x00,	5,	0x00000002,	0x00000100,	0x00000000,	0x00000000,	0x00000000,	0,	0,	0), -- Pandemic (Rank 1)
 (58436,	0x00,	5,	0x00000002,	0x00000100,	0x00000000,	0x00000000,	0x00000000,	0,	0,	0), -- Pandemic (Rank 2)
@@ -1484,6 +1483,8 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
 (58874,	0x00,	0,	0x00000000,	0x00000000,	0x00000000,	0x00000000,	0x00000040,	0,	0,	0), -- Damage Shield (Rank 2)
 (58901,	0x00,	0,	0x00000000,	0x00000000,	0x00000000,	0x00000000,	0x00000002,	0,	0,	0), -- Tears of Anguish
 (59057,	0x00,	15,	0x00000002,	0x00000000,	0x00000000,	0x00000000,	0x00000000,	0,	0,	0), -- Rime (Rank 3)
+(59088,	0x00,	4,	0x00000000,	0x00000002,	0x00000000,	0x00010000,	0x00000000,	0,	0,	0), -- Improved Spell Reflection
+(59089,	0x00,	4,	0x00000000,	0x00000002,	0x00000000,	0x00010000,	0x00000000,	0,	0,	0), -- Improved Spell Reflection
 (59176,	0x00,	0,	0x00000000,	0x00000000,	0x00000000,	0x00000000,	0x00000002,	0,	0,	0), -- Spell Damping
 (59327,	0x00,	15,	0x08000000,	0x00000000,	0x00000000,	0x00000000,	0x00000000,	0,	0,	0), -- Glyph of Rune Tap
 (59725,	0x00,	0,	0x00000000,	0x00000000,	0x00000000,	0x00000000,	0x00000800,	0,	0,	0), -- Spell Reflection