18 files changed, 5 insertions, 6 deletions
diff --git a/sql/updates/6771_world_scriptnames.sql b/sql/updates/6771_world_scriptname.sql
index 07490c90d7a..60796886034 100644
--- a/sql/updates/6771_world_scriptnames.sql
+++ b/sql/updates/6771_world_scriptname.sql
@@ -11,4 +11,3 @@ UPDATE `creature_template` SET `ScriptName`='boss_black_knight' WHERE `entry`=35
 UPDATE `creature_template` SET `ScriptName`='boss_eadric' WHERE `entry`=35119;
 UPDATE `creature_template` SET `ScriptName`='boss_paletress' WHERE `entry`=34928;
 UPDATE `creature_template` SET `ScriptName`='npc_memory' WHERE `entry` IN (35052,35041,35033,35046,35043,35047,35044,35039, 35034, 35049, 35030, 34942, 35050, 35042, 35045, 35037, 35031, 35038, 35029,35048,35032,35028,35040,35036,35051);
-
diff --git a/sql/updates/6782_world_scriptnames.sql b/sql/updates/6782_world_scriptname.sql
index 4b35a3b59b9..4b35a3b59b9 100644
--- a/sql/updates/6782_world_scriptnames.sql
+++ b/sql/updates/6782_world_scriptname.sql
diff --git a/sql/updates/6795_world_creature_template.sql b/sql/updates/6795_world_creature_template.sql
deleted file mode 100644
index f25af34eb68..00000000000
--- a/sql/updates/6795_world_creature_template.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `mindmg` = '97', `maxdmg` = '195', `attackpower` = '35', `minrangedmg` = '72', `maxrangedmg` = '157' WHERE `entry` = 28017;
diff --git a/sql/updates/6799_world_spell_proc_event.sql b/sql/updates/6799_world_spell_proc_event.sql
index 487099eb68b..e333883368f 100644
--- a/sql/updates/6799_world_spell_proc_event.sql
+++ b/sql/updates/6799_world_spell_proc_event.sql
@@ -1 +1 @@
-UPDATE spell_proc_event SET SchoolMask = 4, spellFamilyMask1 = 200776, spellFamilyMask0 = 146800663 WHERE entry = 11129;
+UPDATE `spell_proc_event` SET `SchoolMask`=4,`spellFamilyMask0`=146800663,`spellFamilyMask1`=200776 WHERE `entry`=11129;
diff --git a/sql/updates/6822_world_spell_linked_spell.sql b/sql/updates/6823_world_spell_linked_spell.sql
index 4ff2036f454..4ff2036f454 100644
--- a/sql/updates/6822_world_spell_linked_spell.sql
+++ b/sql/updates/6823_world_spell_linked_spell.sql
diff --git a/sql/updates/6828_world_scriptnames.sql b/sql/updates/6828_world_scriptname.sql
index ed6a27226c8..ed6a27226c8 100644
--- a/sql/updates/6828_world_scriptnames.sql
+++ b/sql/updates/6828_world_scriptname.sql
diff --git a/sql/updates/6857_world_scriptname.sql b/sql/updates/6857_world_scriptname.sql
new file mode 100644
index 00000000000..4a7f5407028
--- /dev/null
+++ b/sql/updates/6857_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='valiant_challenge' WHERE `entry`=33518;
diff --git a/sql/updates/6857_world_scriptnames.sql b/sql/updates/6857_world_scriptnames.sql
deleted file mode 100644
index 23eaf24b35c..00000000000
--- a/sql/updates/6857_world_scriptnames.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName` = 'valiant_challenge' WHERE `entry` = 33518;
diff --git a/sql/updates/6859_world_scriptnames.sql b/sql/updates/6859_world_scriptname.sql
index 5e53cfeb337..5e53cfeb337 100644
--- a/sql/updates/6859_world_scriptnames.sql
+++ b/sql/updates/6859_world_scriptname.sql
diff --git a/sql/updates/6871_world_spell_bonus_data.sql b/sql/updates/6871_world_spell_bonus_data.sql
index 662ed5c533a..b0d18fcb81d 100644
--- a/sql/updates/6871_world_spell_bonus_data.sql
+++ b/sql/updates/6871_world_spell_bonus_data.sql
@@ -1 +1,2 @@
+DELETE FROM `spell_bonus_data` WHERE `entry`=12654;
 INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`,`ap_bonus`, `ap_dot_bonus`,  `comments`) VALUES (12654, 0, 0, 0, 0, 'Mage - Ignite');
diff --git a/sql/updates/6873_world_scriptnames.sql b/sql/updates/6873_world_scriptname.sql
index 3031b9b8652..3031b9b8652 100644
--- a/sql/updates/6873_world_scriptnames.sql
+++ b/sql/updates/6873_world_scriptname.sql
diff --git a/sql/updates/6877_world_script_texts.sql b/sql/updates/6877_world_script_texts.sql
index 607a2455fc3..55bec5acd88 100644
--- a/sql/updates/6877_world_script_texts.sql
+++ b/sql/updates/6877_world_script_texts.sql
@@ -5,4 +5,3 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (349,-1000466,'The Blackrock infestation is thick in these parts. I will do my best to keep the pace. Let''s go!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
    (349,-1000467,'Marshal Marris, sir. Corporal Keeshan of the 12th Sabre Regiment returned from battle and reporting for duty!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
    (349,-1000468,'Brave adventurer, thank you for rescuing me! I am sure Marshal Marris will reward your kind deed.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'');
-
diff --git a/sql/updates/6877_world_scriptnames.sql b/sql/updates/6877_world_scriptname.sql
index 8c57960b4b7..8c57960b4b7 100644
--- a/sql/updates/6877_world_scriptnames.sql
+++ b/sql/updates/6877_world_scriptname.sql
diff --git a/sql/updates/6887_world_scriptnames.sql b/sql/updates/6887_world_scriptname.sql
index 313667ca37e..313667ca37e 100644
--- a/sql/updates/6887_world_scriptnames.sql
+++ b/sql/updates/6887_world_scriptname.sql
diff --git a/sql/updates/6889_world_scriptnames.sql b/sql/updates/6889_world_scriptname.sql
index 71957535bac..71957535bac 100644
--- a/sql/updates/6889_world_scriptnames.sql
+++ b/sql/updates/6889_world_scriptname.sql
diff --git a/sql/updates/6890_world_scriptnames.sql b/sql/updates/6890_world_scriptname.sql
index 821ad8288cc..821ad8288cc 100644
--- a/sql/updates/6890_world_scriptnames.sql
+++ b/sql/updates/6890_world_scriptname.sql
diff --git a/sql/updates/6896_world_scriptnames.sql b/sql/updates/6896_world_scriptname.sql
index 32fd50bc532..32fd50bc532 100644
--- a/sql/updates/6896_world_scriptnames.sql
+++ b/sql/updates/6896_world_scriptname.sql
diff --git a/sql/world.sql b/sql/world.sql
index 6f312c5ddba..2dc073f0b74 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -4788,6 +4788,7 @@ INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`a
 (44614, 0.8571, -1, -1, -1, 'Mage - Frostfire Bolt'),
 (11426, 0.8053, -1, -1, -1, 'Mage - Ice Barrier'),
 (30455, 0.1429, -1, -1, -1, 'Mage - Ice Lance'),
+(12654, 0, 0, 0, 0, 'Mage - Ignite'),
 (44457, 0.4, 0.2, -1, -1, 'Mage - Living Bomb'),
 (1463, 0.8053, -1, -1, -1, 'Mage - Mana Shield'),
 (34913, 0, 0, 0, 0, 'Mage - Molten Armor Triggered Rank 1'),
@@ -5709,7 +5710,7 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
 ( 11095, 0x00,   3, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Improved Scorch (Rank 1)
 ( 11119, 0x04,   3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002,   0,   0,   0), -- Ignite (Rank 1)
 ( 11120, 0x04,   3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002,   0,   0,   0), -- Ignite (Rank 2)
-( 11129, 0x00,   3, 0x00C00017, 0x00000040, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Combustion
+( 11129, 0x04,   3, 0x08c00017, 0x00031048, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Combustion
 ( 11180, 0x10,   3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Winter's Chill (Rank 1)
 ( 11185, 0x00,   3, 0x00000080, 0x00000000, 0x00000000, 0x00050000, 0x00000000,   0,   0,   0), -- Improved Blizzard (Rank 1)
 ( 11255, 0x00,   3, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Improved Counterspell (Rank 1)