Added missed sql update file for Rev 8613.

Removed hackish non-TrinityCore related 8640_world_creature_template.sql. Proper fix can be found on forum (Accepted Fixes). Don't worry if you used it, it was a harmless hotfix and it will not cause any issue when using proper fix from forum.
Added to world_database missed changes updates.
Minor sql standards cleanup.

--HG--
branch : trunk

5 files changed, 9 insertions, 5 deletions

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index f84a6b76705..f32713e4be6 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -567,6 +567,7 @@ INSERT INTO `command` VALUES
 ('reload areatrigger_teleport',3,'Syntax: .reload areatrigger_teleport\nReload areatrigger_teleport table.'),
 ('reload autobroadcast',3,'Syntax: .reload autobroadcast\nReload autobroadcast table.'),
 ('reload command',3,'Syntax: .reload command\nReload command table.'),
+('reload conditions', 3, 'Reload conditions table.'),
 ('reload config',3,'Syntax: .reload config\r\n\r\nReload config settings (by default stored in trinityd.conf). Not all settings can be change at reload: some new setting values will be ignored until restart, some values will applied with delay or only to new objects/maps, some values will explicitly rejected to change at reload.'),
 ('reload creature_involvedrelation',3,'Syntax: .reload creature_involvedrelation\nReload creature_involvedrelation table.'),
 ('reload creature_linked_respawn',2,'Syntax: .reload creature_linked_respawn\r\nReload creature_linked_respawn table.'),
@@ -624,10 +625,9 @@ INSERT INTO `command` VALUES
 ('reload spell_proc_event',3,'Syntax: .reload spell_proc_event\nReload spell_proc_event table.'),
 ('reload spell_required',3,'Syntax: .reload spell_required\nReload spell_required table.'),
 ('reload spell_scripts',3,'Syntax: .reload spell_scripts\nReload spell_scripts table.'),
-('reload spell_script_target',3,'Syntax: .reload spell_script_target\nReload spell_script_target table.'),
 ('reload spell_target_position',3,'Syntax: .reload spell_target_position\nReload spell_target_position table.'),
 ('reload spell_threats',3,'Syntax: .reload spell_threats\nReload spell_threats table.'),
-('reload creature_template','3','Syntax: .reload creature_template $entry\r\nReload the specified creature\'s template.'),
+('reload creature_template','3','Syntax: .reload creature_template $entry\r\nReload the specified creature''s template.'),
 ('reload trinity_string',3,'Syntax: .reload trinity_string\nReload trinity_string table.'),
 ('reload waypoint_scripts',3,'Syntax: .reload waypoint_scripts\nReload waypoint_scripts table.'),
 ('repairitems',2,'Syntax: .repairitems\r\n\r\nRepair all selected player''s items.'),
@@ -6110,6 +6110,7 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment
 (-59907,     7, 0, 'Lightwell Charges - Suicide'),
 ( 19263, 67801, 2, 'Deterrence'),
 ( 45524, 55095, 0, 'Chains of Ice - Frost Fever'),
+( 20066,-61840, 0, 'Repentance'),
 -- Quest
 ( 40214, 40216, 2, 'Dragonmaw Illusion'),
 ( 40214, 42016, 2, 'Dragonmaw Illusion'),
diff --git a/sql/updates/8568_world_trinity_string.sql b/sql/updates/8568_world_trinity_string.sql
index 029966a4968..c4fdc2f8480 100644
--- a/sql/updates/8568_world_trinity_string.sql
+++ b/sql/updates/8568_world_trinity_string.sql
@@ -1,4 +1,3 @@
 DELETE FROM trinity_string WHERE entry IN (210);
 INSERT INTO trinity_string VALUES
 (210,'Item \'%i\' (with extended cost %i) already in vendor list.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-
diff --git a/sql/updates/8640_world_creature_template.sql b/sql/updates/8640_world_creature_template.sql
deleted file mode 100644
index 2b8e2327274..00000000000
--- a/sql/updates/8640_world_creature_template.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `modelid2` = 0, `WDBVerified` = -11723 WHERE `entry` = 17591;
diff --git a/sql/updates/8658_world_spell_linked_spell.sql b/sql/updates/8658_world_spell_linked_spell.sql
index a05895a955d..59e96ca2ac5 100644
--- a/sql/updates/8658_world_spell_linked_spell.sql
+++ b/sql/updates/8658_world_spell_linked_spell.sql
@@ -1,4 +1,3 @@
 DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=20066;
 INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
 (20066, -61840, 0, 'Repentance');
-
diff --git a/sql/updates/8671_world_spell_linked_spell.sql b/sql/updates/8671_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..d2572727e59
--- /dev/null
+++ b/sql/updates/8671_world_spell_linked_spell.sql
@@ -0,0 +1,6 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (54861,55004)AND `spell_effect` IN (-23335,-23333);
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(54861,-23335,0, 'Drop Flag on Nitro Boost WSG'),
+(54861,-23333,0, 'Drop Flag on Nitro Boost WSG'),
+(55004,-23335,0, 'Drop Flag on Nitro Boost WSG'),
+(55004,-23333,0, 'Drop Flag on Nitro Boost WSG');