186 files changed, 235 insertions, 325 deletions

diff --git a/sql/updates/5270_world_scripts.sql b/sql/updates/3.1.3_old/5270_world_script_waypoint.sql
index 8ddc30c0396..176bab334c9 100644
--- a/sql/updates/5270_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5270_world_script_waypoint.sql
@@ -26,5 +26,3 @@ INSERT INTO script_waypoint VALUES
 (24156,24,2298.05, -6041.56, 2.01465, 0, ''),
 (24156,25,2307.53, -6031.23, 2.93796, 0, ''),
 (24156,26,2309.46, -6024.45, 3.65369, 5000, '');
-
-UPDATE creature_template SET ScriptName = 'npc_plaguehound_tracker' WHERE entry = 24156;
diff --git a/sql/updates/3.1.3_old/5270_world_scriptname.sql b/sql/updates/3.1.3_old/5270_world_scriptname.sql
new file mode 100644
index 00000000000..03280970c22
--- /dev/null
+++ b/sql/updates/3.1.3_old/5270_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE creature_template SET ScriptName = 'npc_plaguehound_tracker' WHERE entry = 24156;
diff --git a/sql/updates/5305_world_scripts.sql b/sql/updates/3.1.3_old/5305_world_scriptname.sql
index 0aa6bce7726..0aa6bce7726 100644
--- a/sql/updates/5305_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5305_world_scriptname.sql
diff --git a/sql/updates/3.1.3_old/5314_world_script_target.sql b/sql/updates/3.1.3_old/5314_world_script_target.sql
new file mode 100644
index 00000000000..564230fa163
--- /dev/null
+++ b/sql/updates/3.1.3_old/5314_world_script_target.sql
@@ -0,0 +1,6 @@
+DELETE FROM `spell_script_target` WHERE `entry` IN (62427,62374,62399);
+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
+(62427, 1, 33109), # Load into Catapult
+(62374, 1, 33060), # Pursued
+(62374, 1, 33109),
+(62399, 1, 33139); # Overload Circuit
diff --git a/sql/updates/3.1.3_old/5314_world_scriptname.sql b/sql/updates/3.1.3_old/5314_world_scriptname.sql
new file mode 100644
index 00000000000..db260ccfe31
--- /dev/null
+++ b/sql/updates/3.1.3_old/5314_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE creature_template SET scriptname = "spell_pool_of_tar" WHERE entry = 33090;
diff --git a/sql/updates/3.1.3_old/5314_world_spell_linked_spell.sql b/sql/updates/3.1.3_old/5314_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..65f9c1b7acf
--- /dev/null
+++ b/sql/updates/3.1.3_old/5314_world_spell_linked_spell.sql
@@ -0,0 +1,5 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-62475,62427);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(-62475,-62399, 0, 'System Shutdown'),
+(-62475, 62472, 0, 'System Shutdown'), #inform, not correct spell
+( 62427, 62340, 2, 'Load into Catapult - Passenger Loaded');
diff --git a/sql/updates/5321_world_spell_proc_event.sql b/sql/updates/3.1.3_old/5321_world_spell_proc_event.sql
index 7403b781685..7403b781685 100644
--- a/sql/updates/5321_world_spell_proc_event.sql
+++ b/sql/updates/3.1.3_old/5321_world_spell_proc_event.sql
diff --git a/sql/updates/5330_world_spell_proc_event.sql b/sql/updates/3.1.3_old/5330_world_spell_proc_event.sql
index ae05ed2dddd..ae05ed2dddd 100644
--- a/sql/updates/5330_world_spell_proc_event.sql
+++ b/sql/updates/3.1.3_old/5330_world_spell_proc_event.sql
diff --git a/sql/updates/5332_world_scripts_dk.sql b/sql/updates/3.1.3_old/5332_world_ainame.sql
index 566cf997f0e..566cf997f0e 100644
--- a/sql/updates/5332_world_scripts_dk.sql
+++ b/sql/updates/3.1.3_old/5332_world_ainame.sql
diff --git a/sql/updates/5352_8399_world_spell_elixir.sql b/sql/updates/3.1.3_old/5352_world_spell_elixir.sql
index 64d250c8fe1..6e225e12864 100644
--- a/sql/updates/5352_8399_world_spell_elixir.sql
+++ b/sql/updates/3.1.3_old/5352_world_spell_elixir.sql
@@ -1,3 +1,4 @@
+-- mangos rev 8399
 -- ALTER TABLE db_version CHANGE COLUMN required_8397_02_mangos_spell_threat required_8399_01_mangos_spell_elixir bit;
 
 -- Well Fed (SPELLFAMILY_POTION)
diff --git a/sql/updates/5353_8397_characters_character_spell.sql b/sql/updates/3.1.3_old/5353_characters_character_spell.sql
index bc22b817685..354cb1fa569 100644
--- a/sql/updates/5353_8397_characters_character_spell.sql
+++ b/sql/updates/3.1.3_old/5353_characters_character_spell.sql
@@ -1,3 +1,4 @@
+-- mangos rev 8397
 -- ALTER TABLE character_db_version CHANGE COLUMN required_8339_02_characters_character_battleground_data required_8397_03_characters_character_spell bit;
 
 UPDATE IGNORE character_spell SET spell=7386 WHERE spell IN (7405,8380,11596,11597,25225,47467);
diff --git a/sql/updates/5353_8397_world_spell_threat.sql b/sql/updates/3.1.3_old/5353_world_spell_threat.sql
index bd5d4fbaf30..0a3c441369c 100644
--- a/sql/updates/5353_8397_world_spell_threat.sql
+++ b/sql/updates/3.1.3_old/5353_world_spell_threat.sql
@@ -1,3 +1,4 @@
+-- mangos rev 8397
 -- ALTER TABLE db_version CHANGE COLUMN required_8397_01_mangos_spell_chain required_8397_02_mangos_spell_threat bit;
 
 DELETE FROM spell_threat WHERE entry IN (7405,8380,11596,11597,25225);
diff --git a/sql/updates/5354_8402_characters_guild_bank_eventlog.sql b/sql/updates/3.1.3_old/5354_characters_guild_bank_eventlog.sql
index 24e7f95bbdc..8263b053fab 100644
--- a/sql/updates/5354_8402_characters_guild_bank_eventlog.sql
+++ b/sql/updates/3.1.3_old/5354_characters_guild_bank_eventlog.sql
@@ -1,3 +1,4 @@
+-- mangos rev 8402
 -- ALTER TABLE character_db_version CHANGE COLUMN required_8402_01_characters_guild_eventlog required_8402_02_characters_guild_bank_eventlog bit;
 
 
diff --git a/sql/updates/5354_8402_characters_guild_eventlog.sql b/sql/updates/3.1.3_old/5354_characters_guild_eventlog.sql
index 8aa72225b3d..65cfcf142a5 100644
--- a/sql/updates/5354_8402_characters_guild_eventlog.sql
+++ b/sql/updates/3.1.3_old/5354_characters_guild_eventlog.sql
@@ -1,3 +1,4 @@
+-- mangos rev 8402
 -- ALTER TABLE character_db_version CHANGE COLUMN required_8397_03_characters_character_spell required_8402_01_characters_guild_eventlog bit;
 
 
diff --git a/sql/updates/5360_8409_characters_guild.sql b/sql/updates/3.1.3_old/5360_characters_guild.sql
index 503570504fb..fd6849e5b59 100644
--- a/sql/updates/5360_8409_characters_guild.sql
+++ b/sql/updates/3.1.3_old/5360_characters_guild.sql
@@ -1,3 +1,4 @@
+-- mangos rev 8409
 -- ALTER TABLE character_db_version CHANGE COLUMN required_8402_02_characters_guild_bank_eventlog required_8409_01_characters_guild bit;
 
 
diff --git a/sql/updates/5361_8412_world_trinity_string.sql b/sql/updates/3.1.3_old/5361_world_trinity_string.sql
index 63ba25094fa..bfacdc8d0cd 100644
--- a/sql/updates/5361_8412_world_trinity_string.sql
+++ b/sql/updates/3.1.3_old/5361_world_trinity_string.sql
@@ -1,3 +1,4 @@
+-- mangos rev 8412
 -- ALTER TABLE db_version CHANGE COLUMN required_8399_01_mangos_spell_elixir required_8412_01_mangos_mangos_string bit;
 
 DELETE FROM trinity_string WHERE entry IN(512,513);
diff --git a/sql/updates/3.1.3_old/5403_world_scriptname.sql b/sql/updates/3.1.3_old/5403_world_scriptname.sql
new file mode 100644
index 00000000000..08b77928237
--- /dev/null
+++ b/sql/updates/3.1.3_old/5403_world_scriptname.sql
@@ -0,0 +1 @@
+update creature_template set ScriptName = 'boss_kologarn' where entry = 32930;
diff --git a/sql/updates/5403_world_scripts_ulduar.sql b/sql/updates/3.1.3_old/5403_world_spell_linked_spell.sql
index 7ffe25e058d..86c1b19aef3 100644
--- a/sql/updates/5403_world_scripts_ulduar.sql
+++ b/sql/updates/3.1.3_old/5403_world_spell_linked_spell.sql
@@ -1,5 +1,3 @@
-update creature_template set ScriptName = 'boss_kologarn' where entry = 32930;
-
 DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-62475,62427);
 INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
 (-62475,-62399, 0, 'System Shutdown - Overload Circuit'),
diff --git a/sql/updates/5410_world_sql_dbc.sql b/sql/updates/3.1.3_old/5410_world_spell_dbc.sql
index 31f648dcad4..31f648dcad4 100644
--- a/sql/updates/5410_world_sql_dbc.sql
+++ b/sql/updates/3.1.3_old/5410_world_spell_dbc.sql
diff --git a/sql/updates/5416_world_spell_dbc.sql b/sql/updates/3.1.3_old/5416_world_spell_dbc.sql
index 15af83e4c05..15af83e4c05 100644
--- a/sql/updates/5416_world_spell_dbc.sql
+++ b/sql/updates/3.1.3_old/5416_world_spell_dbc.sql
diff --git a/sql/updates/5426_8416_world_spell_learn_spell.sql b/sql/updates/3.1.3_old/5426_world_spell_learn_spell.sql
index 4057fb65350..235ffebfe26 100644
--- a/sql/updates/5426_8416_world_spell_learn_spell.sql
+++ b/sql/updates/3.1.3_old/5426_world_spell_learn_spell.sql
@@ -1,3 +1,4 @@
+-- mangos rev 8416
 -- ALTER TABLE db_version CHANGE COLUMN required_8412_01_mangos_mangos_string required_8416_01_mangos_spell_learn_spell bit;
 
 /* All form passives */
diff --git a/sql/updates/5435_world_spell_script_target.sql b/sql/updates/3.1.3_old/5435_world_spell_script_target.sql
index c449fcae8b6..c449fcae8b6 100644
--- a/sql/updates/5435_world_spell_script_target.sql
+++ b/sql/updates/3.1.3_old/5435_world_spell_script_target.sql
diff --git a/sql/updates/5441_world_spell_bonus_data.sql b/sql/updates/3.1.3_old/5441_world_spell_bonus_data.sql
index a51c550aec8..a51c550aec8 100644
--- a/sql/updates/5441_world_spell_bonus_data.sql
+++ b/sql/updates/3.1.3_old/5441_world_spell_bonus_data.sql
diff --git a/sql/updates/5445_world.sql b/sql/updates/3.1.3_old/5445_world_spell_enchant_proc_data.sql
index b2ee1cab216..a4d885a690d 100644
--- a/sql/updates/5445_world.sql
+++ b/sql/updates/3.1.3_old/5445_world_spell_enchant_proc_data.sql
@@ -1,8 +1,3 @@
-DELETE FROM `spell_proc_event` WHERE `entry` IN(47569, 47570);
-INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
-( 47569, 0x00,   6, 0x00004000, 0x00000000, 0x00000000, 0x00004000, 0x00000000,   0,   0,   0), -- Improved Shadowform (Rank 1)
-( 47570, 0x00,   6, 0x00004000, 0x00000000, 0x00000000, 0x00004000, 0x00000000,   0,   0,   0); -- Improved Shadowform (Rank 2)
-
 DELETE FROM `spell_enchant_proc_data` WHERE `entry` IN(803, 912, 1894, 1898, 1899, 1900, 2673, 2675, 3225, 3239, 3241, 3273, 3368, 3369, 3789, 3869);
 INSERT INTO spell_enchant_proc_data (`entry`, `customChance`, `PPMChance`,`procEx`) VALUES 
  -- Fiery Weapon
diff --git a/sql/updates/3.1.3_old/5445_world_spell_proc_event.sql b/sql/updates/3.1.3_old/5445_world_spell_proc_event.sql
new file mode 100644
index 00000000000..eca1f2baba1
--- /dev/null
+++ b/sql/updates/3.1.3_old/5445_world_spell_proc_event.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN(47569, 47570);
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+( 47569, 0x00,   6, 0x00004000, 0x00000000, 0x00000000, 0x00004000, 0x00000000,   0,   0,   0), -- Improved Shadowform (Rank 1)
+( 47570, 0x00,   6, 0x00004000, 0x00000000, 0x00000000, 0x00004000, 0x00000000,   0,   0,   0); -- Improved Shadowform (Rank 2)
diff --git a/sql/updates/5447_world.sql b/sql/updates/3.1.3_old/5447_world_spell_linked_spell.sql
index 962cb8496ea..962cb8496ea 100644
--- a/sql/updates/5447_world.sql
+++ b/sql/updates/3.1.3_old/5447_world_spell_linked_spell.sql
diff --git a/sql/updates/5448_world_scripts_ulduar.sql b/sql/updates/3.1.3_old/5448_world_spell_script_target.sql
index d293e711747..d1c5ed46006 100644
--- a/sql/updates/5448_world_scripts_ulduar.sql
+++ b/sql/updates/3.1.3_old/5448_world_spell_script_target.sql
@@ -2,5 +2,3 @@ DELETE FROM `spell_script_target` WHERE `entry` IN (62056,63985);
 INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
 (63985, 1, 32934), # Stone Grip
 (62056, 1, 32934);
-
-update creature_template set scriptname = "boss_flame_leviathan_safety_container" where entry = 33218;
diff --git a/sql/updates/5450_world_spell_proc_event.sql b/sql/updates/3.1.3_old/5450_world_spell_proc_event.sql
index 78bd7fab34e..78bd7fab34e 100644
--- a/sql/updates/5450_world_spell_proc_event.sql
+++ b/sql/updates/3.1.3_old/5450_world_spell_proc_event.sql
diff --git a/sql/updates/5472_world_scripts.sql b/sql/updates/3.1.3_old/5472_world_script_texts.sql
index e144bb85bf5..e144bb85bf5 100644
--- a/sql/updates/5472_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5472_world_script_texts.sql
diff --git a/sql/updates/5475_world_scripts_ulduar.sql b/sql/updates/3.1.3_old/5475_world_spell_script_target.sql
index 8939ee109a7..8939ee109a7 100644
--- a/sql/updates/5475_world_scripts_ulduar.sql
+++ b/sql/updates/3.1.3_old/5475_world_spell_script_target.sql
diff --git a/sql/updates/5524_world_scripts.sql b/sql/updates/3.1.3_old/5524_world_scriptname.sql
index ef5eecc8cfc..b2f940aa2b1 100644
--- a/sql/updates/5524_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5524_world_scriptname.sql
@@ -1,6 +1,2 @@
 update creature_template set ScriptName = 'npc_iruk' where entry = 26219;
 UPDATE creature_template SET ScriptName = 'npc_corastrasza' WHERE entry = 32548;
-
-DELETE FROM `spell_script_target` WHERE entry = 61245;
-INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
-(61245, 1, 32535);
diff --git a/sql/updates/3.1.3_old/5524_world_spell_script_target.sql b/sql/updates/3.1.3_old/5524_world_spell_script_target.sql
new file mode 100644
index 00000000000..418a734807b
--- /dev/null
+++ b/sql/updates/3.1.3_old/5524_world_spell_script_target.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_target` WHERE entry = 61245;
+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
+(61245, 1, 32535);
diff --git a/sql/updates/5532_8433_characters_character_account_data.sql b/sql/updates/3.1.3_old/5532_characters_character_account_data.sql
index a1fad645d2b..1a0e9617204 100644
--- a/sql/updates/5532_8433_characters_character_account_data.sql
+++ b/sql/updates/3.1.3_old/5532_characters_character_account_data.sql
@@ -1,3 +1,4 @@
+-- mangos rev 8433
 -- ALTER TABLE character_db_version CHANGE COLUMN required_8409_01_characters_guild required_8433_01_characters_character_account_data bit;
 
 DROP TABLE IF EXISTS `character_account_data`;
diff --git a/sql/updates/5552_8444_world_trinity_string.sql b/sql/updates/3.1.3_old/5552_world_trinity_string.sql
index 0d41fadfbae..3ee506b84cd 100644
--- a/sql/updates/5552_8444_world_trinity_string.sql
+++ b/sql/updates/3.1.3_old/5552_world_trinity_string.sql
@@ -1,3 +1,4 @@
+-- mangos rev 8444
 -- ALTER TABLE db_version CHANGE COLUMN required_8416_01_mangos_spell_learn_spell required_8444_01_mangos_mangos_string bit;
 
 DELETE FROM trinity_string WHERE entry IN(348,522);
diff --git a/sql/updates/3.1.3_old/5579_world_trinity_string.sql b/sql/updates/3.1.3_old/5579_world_trinity_string.sql
new file mode 100644
index 00000000000..fadf756d58a
--- /dev/null
+++ b/sql/updates/3.1.3_old/5579_world_trinity_string.sql
@@ -0,0 +1,3 @@
+DELETE FROM `trinity_string` WHERE `entry`=326;
+INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`)
+VALUES (326, 'Faction %s (%u) can''nt have reputation.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/sql/updates/5582_world_scripts_dk.sql b/sql/updates/3.1.3_old/5582_world_scriptname.sql
index 84336ba266f..84336ba266f 100644
--- a/sql/updates/5582_world_scripts_dk.sql
+++ b/sql/updates/3.1.3_old/5582_world_scriptname.sql
diff --git a/sql/updates/5595_world_script_text.sql b/sql/updates/3.1.3_old/5595_world_script_texts.sql
index f99352cd22f..f99352cd22f 100644
--- a/sql/updates/5595_world_script_text.sql
+++ b/sql/updates/3.1.3_old/5595_world_script_texts.sql
diff --git a/sql/updates/5610_world_scripts.sql b/sql/updates/3.1.3_old/5610_world_scriptname.sql
index 4111544d18b..afeecbc3a14 100644
--- a/sql/updates/5610_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5610_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `gameobject_template` SET `ScriptName`='go_shallow_grave' WHERE `entry` IN (128308,128403);
diff --git a/sql/updates/5612_world_scripts.sql b/sql/updates/3.1.3_old/5612_world_scriptname.sql
index 809017e6160..e98e3f42853 100644
--- a/sql/updates/5612_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5612_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `creature_template` SET `ScriptName`='npc_razael_and_lyana' WHERE `entry` IN (23778,23998);
diff --git a/sql/updates/5613_world_scripts.sql b/sql/updates/3.1.3_old/5613_world_script_texts.sql
index 7976edfd773..a99051c71f1 100644
--- a/sql/updates/5613_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5613_world_script_texts.sql
@@ -1,7 +1,5 @@
-
-UPDATE `creature_template` SET `ScriptName`='boss_maiden_of_grief' WHERE `entry`=27975;
-
-REPLACE INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
+DELETE FROM `script_texts` WHERE `entry` IN (-1603000,-1603001,-1603002,-1603003,-1603004,-1603005,-1603006);
+INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
    (27975,-1603000,'You shouldn''t have come...now you will die!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13487,1,0,0,'maiden of grief SAY_AGGRO'),
    (27975,-1603001,'Why must it be this way?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13488,1,0,0,'maiden of grief SAY_SLAY_1'),
    (27975,-1603002,'You had it coming!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13489,1,0,0,'maiden of grief SAY_SLAY_2'),
diff --git a/sql/updates/3.1.3_old/5613_world_scriptname.sql b/sql/updates/3.1.3_old/5613_world_scriptname.sql
new file mode 100644
index 00000000000..4333a9c4114
--- /dev/null
+++ b/sql/updates/3.1.3_old/5613_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='boss_maiden_of_grief' WHERE `entry`=27975;
diff --git a/sql/updates/5627_world_scripts.sql b/sql/updates/3.1.3_old/5627_world_scriptname.sql
index ee6c7937941..ce3e18c9601 100644
--- a/sql/updates/5627_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5627_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `creature_template` SET `ScriptName`='npc_gymer' WHERE `entry`=29647;
diff --git a/sql/updates/5628_character_8433_01_characters_character_account_data.sql b/sql/updates/3.1.3_old/5628_characters_character_spell.sql
index 50449a30fee..710244b8fd5 100644
--- a/sql/updates/5628_character_8433_01_characters_character_account_data.sql
+++ b/sql/updates/3.1.3_old/5628_characters_character_spell.sql
@@ -1,4 +1,4 @@
-
+-- mangos rev 8433
 -- ALTER TABLE character_db_version CHANGE COLUMN required_8433_01_characters_character_account_data required_8469_01_characters_character_spell bit;
 
 DELETE FROM character_spell WHERE spell in (
diff --git a/sql/updates/5628_world_8451_01_mangos_spell_proc_event.sql b/sql/updates/3.1.3_old/5628_world_creature_ai_texts.sql
index 0559b422b32..a1b998961a0 100644
--- a/sql/updates/5628_world_8451_01_mangos_spell_proc_event.sql
+++ b/sql/updates/3.1.3_old/5628_world_creature_ai_texts.sql
@@ -1,4 +1,4 @@
-
+-- mangos rev 8451
 -- ALTER TABLE db_version CHANGE COLUMN required_8451_01_mangos_spell_proc_event required_8462_01_mangos_creature_ai_texts bit;
 
 ALTER TABLE creature_ai_texts CHANGE emote emote smallint(5) unsigned NOT NULL default '0';
diff --git a/sql/updates/5637_world_scripts.sql b/sql/updates/3.1.3_old/5637_world_scriptname.sql
index a6ac84e7b5d..5294f926967 100644
--- a/sql/updates/5637_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5637_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `creature_template` SET `ScriptName`='npc_thorim' WHERE `entry`=29445;
diff --git a/sql/updates/5642_realmd.sql b/sql/updates/3.1.3_old/5642_realmd_realmlist.sql
index f1d5575fd18..f1d5575fd18 100644
--- a/sql/updates/5642_realmd.sql
+++ b/sql/updates/3.1.3_old/5642_realmd_realmlist.sql
diff --git a/sql/updates/5670_realmd.sql b/sql/updates/3.1.3_old/5670_realmd_uptime.sql
index ba694028ab6..ba694028ab6 100644
--- a/sql/updates/5670_realmd.sql
+++ b/sql/updates/3.1.3_old/5670_realmd_uptime.sql
diff --git a/sql/updates/5677_world.sql b/sql/updates/3.1.3_old/5677_world_spell_proc_event.sql
index e33ed3c7555..e33ed3c7555 100644
--- a/sql/updates/5677_world.sql
+++ b/sql/updates/3.1.3_old/5677_world_spell_proc_event.sql
diff --git a/sql/updates/3.1.3_old/5684_world_script_texts.sql b/sql/updates/3.1.3_old/5684_world_script_texts.sql
new file mode 100644
index 00000000000..33a035046ce
--- /dev/null
+++ b/sql/updates/3.1.3_old/5684_world_script_texts.sql
@@ -0,0 +1,9 @@
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000488 AND -1000482;
+INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
+   (18210,-1000482,'Look out!',0,0,0,0,'maghar captive SAY_MAG_START'),
+   (18210,-1000483,'Don''t let them escape! Kill the strong one first!',0,0,0,0,'maghar captive SAY_MAG_NO_ESCAPE'),
+   (18210,-1000484,'More of them coming! Watch out!',0,0,0,0,'maghar captive SAY_MAG_MORE'),
+   (18210,-1000485,'Where do you think you''re going? Kill them all!',0,0,0,0,'maghar captive SAY_MAG_MORE_REPLY'),
+   (18210,-1000486,'Ride the lightning, filth!',0,0,0,0,'maghar captive SAY_MAG_LIGHTNING'),
+   (18210,-1000487,'FROST SHOCK!!!',0,0,0,0,'maghar captive SAY_MAG_SHOCK'),
+   (18210,-1000488,'It is best that we split up now, in case they send more after us. Hopefully one of us will make it back to Garrosh. Farewell stranger.',0,0,0,0,'maghar captive SAY_MAG_COMPLETE');
diff --git a/sql/updates/5684_world.sql b/sql/updates/3.1.3_old/5684_world_script_waypoint.sql
index 8fe66a1ca4c..708ad3cad2e 100644
--- a/sql/updates/5684_world.sql
+++ b/sql/updates/3.1.3_old/5684_world_script_waypoint.sql
@@ -1,15 +1,3 @@
-UPDATE `creature_template` SET `ScriptName`='npc_maghar_captive' WHERE `entry`=18210;
-
-DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000488 AND -1000482;
-INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
-   (18210,-1000482,'Look out!',0,0,0,0,'maghar captive SAY_MAG_START'),
-   (18210,-1000483,'Don''t let them escape! Kill the strong one first!',0,0,0,0,'maghar captive SAY_MAG_NO_ESCAPE'),
-   (18210,-1000484,'More of them coming! Watch out!',0,0,0,0,'maghar captive SAY_MAG_MORE'),
-   (18210,-1000485,'Where do you think you''re going? Kill them all!',0,0,0,0,'maghar captive SAY_MAG_MORE_REPLY'),
-   (18210,-1000486,'Ride the lightning, filth!',0,0,0,0,'maghar captive SAY_MAG_LIGHTNING'),
-   (18210,-1000487,'FROST SHOCK!!!',0,0,0,0,'maghar captive SAY_MAG_SHOCK'),
-   (18210,-1000488,'It is best that we split up now, in case they send more after us. Hopefully one of us will make it back to Garrosh. Farewell stranger.',0,0,0,0,'maghar captive SAY_MAG_COMPLETE');
-   
 DELETE FROM `script_waypoint` WHERE `entry`=18210;
 INSERT INTO `script_waypoint` VALUES
    (18210, 0, -1581.410034, 8557.933594, 2.726, 0, ''),
@@ -31,4 +19,4 @@ INSERT INTO `script_waypoint` VALUES
    (18210, 16, -1382.286133, 8539.869141, 11.139, 7500, 'SAY_MAG_COMPLETE'),
    (18210, 17, -1361.224609, 8521.440430, 11.144, 0, ''),
    (18210, 18, -1324.803589, 8510.688477, 13.050, 0, ''),
-   (18210, 19, -1312.075439, 8492.709961, 14.235, 0, '');
\ No newline at end of file
+   (18210, 19, -1312.075439, 8492.709961, 14.235, 0, '');
diff --git a/sql/updates/3.1.3_old/5684_world_scriptname.sql b/sql/updates/3.1.3_old/5684_world_scriptname.sql
new file mode 100644
index 00000000000..4db8f4fcac8
--- /dev/null
+++ b/sql/updates/3.1.3_old/5684_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_maghar_captive' WHERE `entry`=18210;
diff --git a/sql/updates/5688_world_scripts.sql b/sql/updates/3.1.3_old/5688_world_scriptname.sql
index 8e9ae1f2cdc..2274fbf9084 100644
--- a/sql/updates/5688_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5688_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `creature_template` SET `ScriptName`='npc_training_dummy' WHERE `entry`=16111;
diff --git a/sql/updates/3.1.3_old/5696_world_areatrigger_scripts.sql b/sql/updates/3.1.3_old/5696_world_areatrigger_scripts.sql
new file mode 100644
index 00000000000..849bba03ab2
--- /dev/null
+++ b/sql/updates/3.1.3_old/5696_world_areatrigger_scripts.sql
@@ -0,0 +1,3 @@
+-- *Zum'Rah Area Trigger Script, Zum'Rah should become hostile when approached. By totoro.
+DELETE FROM `areatrigger_scripts` WHERE `entry`=962;
+INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES('962','at_zumrah');
diff --git a/sql/updates/3.1.3_old/5696_world_creature_addon_waypoint_data.sql b/sql/updates/3.1.3_old/5696_world_creature_addon_waypoint_data.sql
new file mode 100644
index 00000000000..4f9b4e0ba37
--- /dev/null
+++ b/sql/updates/3.1.3_old/5696_world_creature_addon_waypoint_data.sql
@@ -0,0 +1,15 @@
+-- *TrullyOne/MeanMachine Waypoint System Restored. Patch by XTElite1.
+-- This should be applied to world_script_waypoints.sql ASAP
+ALTER TABLE `creature_addon`
+    ADD `path_id` int(11) unsigned NOT NULL default '0' AFTER `guid`;
+ALTER TABLE `creature_template_addon`
+    ADD `path_id` int(11) unsigned NOT NULL default '0' AFTER `entry`;
+
+ALTER TABLE `waypoint_data` ADD COLUMN `id_old` int(10) unsigned NOT NULL default '0' COMMENT 'Creature GUID' AFTER `wpguid`;
+UPDATE `waypoint_data` SET `id_old`=`id`*0.1;
+
+REPLACE INTO `creature_addon` ( `guid` ) SELECT `id_old` FROM `waypoint_data`;
+
+UPDATE `creature_addon`,`waypoint_data` SET `creature_addon`.`path_id` = `waypoint_data`.`id` WHERE `creature_addon`.`guid`=`waypoint_data`.`id_old`;
+
+ALTER TABLE `waypoint_data` DROP COLUMN `id_old`;
diff --git a/sql/updates/3.1.3_old/5696_world_script_texts.sql b/sql/updates/3.1.3_old/5696_world_script_texts.sql
new file mode 100644
index 00000000000..66a8e6e314d
--- /dev/null
+++ b/sql/updates/3.1.3_old/5696_world_script_texts.sql
@@ -0,0 +1,5 @@
+DELETE FROM `script_texts` WHERE `npc_entry`=17077;
+INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
+   (17077,-1000496,'%s lifts its head into the air, as if listening for something.',0,2,0,0,'ancestral wolf EMOTE_WOLF_LIFT_HEAD'),
+   (17077,-1000497,'%s lets out a howl that rings across the mountains to the north and motions for you to follow.',0,2,0,0,'ancestral wolf EMOTE_WOLF_HOWL'),
+   (17077,-1000498,'Welcome, kind spirit. What has brought you to us?',0,0,0,0,'ancestral wolf SAY_WOLF_WELCOME');
diff --git a/sql/updates/5696_world.sql b/sql/updates/3.1.3_old/5696_world_script_waypoint.sql
index 03fbd286a85..f291c3c54e9 100644
--- a/sql/updates/5696_world.sql
+++ b/sql/updates/3.1.3_old/5696_world_script_waypoint.sql
@@ -1,22 +1,3 @@
-
--- *Zum'Rah Area Trigger Script, Zum'Rah should become hostile when approached. By totoro.
-DELETE FROM `areatrigger_scripts` WHERE `entry`=962;
-INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES('962','at_zumrah');
-
--- *Judgement of Light PPM based, not 100%. By Drevi.
-DELETE FROM `spell_proc_event` WHERE `entry`=20185;
-INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
-( 20185, 0x01,   0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,  15,   0,   0); -- Judgement of Light
-
--- *A Spirit Guide Escort Quest, code from SD2, patch by manuel.
-UPDATE `creature_template` SET `ScriptName`='npc_ancestral_wolf' WHERE `entry`=17077;
-
-DELETE FROM `script_texts` WHERE `npc_entry`=17077;
-INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
-   (17077,-1000496,'%s lifts its head into the air, as if listening for something.',0,2,0,0,'ancestral wolf EMOTE_WOLF_LIFT_HEAD'),
-   (17077,-1000497,'%s lets out a howl that rings across the mountains to the north and motions for you to follow.',0,2,0,0,'ancestral wolf EMOTE_WOLF_HOWL'),
-   (17077,-1000498,'Welcome, kind spirit. What has brought you to us?',0,0,0,0,'ancestral wolf SAY_WOLF_WELCOME');
-
 DELETE FROM `script_waypoint` WHERE `entry`=17077;
 INSERT INTO `script_waypoint` VALUES
    (17077, 0, -16.950142, 3801.409424, 95.064, 5000, 'EMOTE_WOLF_LIFT_HEAD'),
@@ -70,19 +51,3 @@ INSERT INTO `script_waypoint` VALUES
    (17077, 48, 527.722229, 3890.686523, 189.240, 0, ''),
    (17077, 49, 524.637329, 3891.768066, 189.149, 0, ''),
    (17077, 50, 519.146057, 3886.701660, 190.128, 60000, 'SAY_WOLF_WELCOME');
-
--- *TrullyOne/MeanMachine Waypoint System Restored. Patch by XTElite1.
--- This should be applied to world_script_waypoints.sql ASAP
-ALTER TABLE `creature_addon`
-    ADD `path_id` int(11) unsigned NOT NULL default '0' AFTER `guid`;
-ALTER TABLE `creature_template_addon`
-    ADD `path_id` int(11) unsigned NOT NULL default '0' AFTER `entry`;
-
-ALTER TABLE `waypoint_data` ADD COLUMN `id_old` int(10) unsigned NOT NULL default '0' COMMENT 'Creature GUID' AFTER `wpguid`;
-UPDATE `waypoint_data` SET `id_old`=`id`*0.1;
-
-REPLACE INTO `creature_addon` ( `guid` ) SELECT `id_old` FROM `waypoint_data`;
-
-UPDATE `creature_addon`,`waypoint_data` SET `creature_addon`.`path_id` = `waypoint_data`.`id` WHERE `creature_addon`.`guid`=`waypoint_data`.`id_old`;
-
-ALTER TABLE `waypoint_data` DROP COLUMN `id_old`;
diff --git a/sql/updates/3.1.3_old/5696_world_scriptname.sql b/sql/updates/3.1.3_old/5696_world_scriptname.sql
new file mode 100644
index 00000000000..5f7e8d8d1b0
--- /dev/null
+++ b/sql/updates/3.1.3_old/5696_world_scriptname.sql
@@ -0,0 +1,2 @@
+-- *A Spirit Guide Escort Quest, code from SD2, patch by manuel.
+UPDATE `creature_template` SET `ScriptName`='npc_ancestral_wolf' WHERE `entry`=17077;
diff --git a/sql/updates/3.1.3_old/5696_world_spell_proc_event.sql b/sql/updates/3.1.3_old/5696_world_spell_proc_event.sql
new file mode 100644
index 00000000000..280faca03bd
--- /dev/null
+++ b/sql/updates/3.1.3_old/5696_world_spell_proc_event.sql
@@ -0,0 +1,4 @@
+-- *Judgement of Light PPM based, not 100%. By Drevi.
+DELETE FROM `spell_proc_event` WHERE `entry`=20185;
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+( 20185, 0x01,   0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,  15,   0,   0); -- Judgement of Light
diff --git a/sql/updates/5698_world.sql b/sql/updates/3.1.3_old/5698_world_scriptname.sql
index 71ace9fb784..e2e3fb671d5 100644
--- a/sql/updates/5698_world.sql
+++ b/sql/updates/3.1.3_old/5698_world_scriptname.sql
@@ -1 +1 @@
-UPDATE `creature_template` SET `ScriptName`='mob_nerubar_victim' WHERE `entry`=25284;
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='mob_nerubar_victim' WHERE `entry`=25284;
diff --git a/sql/updates/5700_characters.sql b/sql/updates/3.1.3_old/5700_characters_game_event_save.sql
index e410dab3b5f..0118921b8c4 100644
--- a/sql/updates/5700_characters.sql
+++ b/sql/updates/3.1.3_old/5700_characters_game_event_save.sql
@@ -1,3 +1,2 @@
-
 DELETE `game_event_condition_save` FROM `game_event_condition_save` WHERE `event_id` in (22,75,76,77);
 DELETE `game_event_save` FROM `game_event_save` WHERE `event_id` in (22,75,76,77);
diff --git a/sql/updates/3.1.3_old/5700_world_areatrigger_scripts.sql b/sql/updates/3.1.3_old/5700_world_areatrigger_scripts.sql
new file mode 100644
index 00000000000..d4d31b79e8f
--- /dev/null
+++ b/sql/updates/3.1.3_old/5700_world_areatrigger_scripts.sql
@@ -0,0 +1,6 @@
+DELETE FROM `areatrigger_scripts` WHERE `entry`=4016;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES (4016,'at_malfurion_stormrage');
+
+-- Duskwood (already in world_scripts_full.sql)
+DELETE FROM `areatrigger_scripts` WHERE `entry`=4017;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES (4017,'at_twilight_grove');
diff --git a/sql/updates/5700_world.sql b/sql/updates/3.1.3_old/5700_world_script_texts.sql
index 6f370da9f8a..c2b6c484952 100644
--- a/sql/updates/5700_world.sql
+++ b/sql/updates/3.1.3_old/5700_world_script_texts.sql
@@ -1,22 +1,3 @@
-
--- Sunken temple (already in world_scripts_full.sql)
-UPDATE `instance_template` SET `script`='instance_sunken_temple' WHERE `map`=109;
-UPDATE `gameobject_template` SET `ScriptName`='go_atalai_statue' WHERE `entry` IN (148830,148831,148832,148833,148834,148835);
-DELETE FROM `areatrigger_scripts` WHERE `entry`=4016;
-INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES (4016,'at_malfurion_stormrage');
-
--- Duskwood (already in world_scripts_full.sql)
-DELETE FROM `areatrigger_scripts` WHERE `entry`=4017;
-INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES (4017,'at_twilight_grove');
-UPDATE `creature_template` SET `ScriptName`='boss_twilight_corrupter' WHERE `entry`=15625;
-
--- quest data: A pawn on the eternal board
--- Already in world_scripts_full.sql
-UPDATE `gameobject_template` SET `ScriptName`='go_crystalline_tear' WHERE `entry`=180633;
-UPDATE `creature_template` SET `ScriptName`='mob_qiraj_war_spawn' WHERE `entry` IN (15414,15422,15424,15423);
-UPDATE `creature_template` SET `ScriptName`='npc_anachronos_the_ancient' WHERE `entry`=15381;
-UPDATE `creature_template` SET `ScriptName`='npc_anachronos_quest_trigger' WHERE `entry`=15454;
-
 -- Already in world_script_texts.sql
 DELETE FROM `script_texts` WHERE `entry` BETWEEN -1350030 AND -1350000;
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`type`,`emote`,`comment`) VALUES
@@ -51,4 +32,3 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`type`,`emote`
    (15378,-1350028,'We will push them back, Anachronos. This I vow. Uphold the end of this task. Let not your hands falter as you seal our fates behind the barrier.',0,1,'MERITHRA_SAY_2'),
    (15378,-1350029,'Succumb to the endless dream, little ones. Let it consume you!',1,53,'MERITHRA_YELL_1'),
    (15378,-1350030,'glances at her compatriots.',2,2,'MERITHRA_EMOTE_1');
-
diff --git a/sql/updates/3.1.3_old/5700_world_scriptname.sql b/sql/updates/3.1.3_old/5700_world_scriptname.sql
new file mode 100644
index 00000000000..efcc289e268
--- /dev/null
+++ b/sql/updates/3.1.3_old/5700_world_scriptname.sql
@@ -0,0 +1,12 @@
+-- Sunken temple (already in world_scripts_full.sql)
+UPDATE `instance_template` SET `script`='instance_sunken_temple' WHERE `map`=109;
+UPDATE `gameobject_template` SET `ScriptName`='go_atalai_statue' WHERE `entry` IN (148830,148831,148832,148833,148834,148835);
+
+UPDATE `creature_template` SET `ScriptName`='boss_twilight_corrupter' WHERE `entry`=15625;
+
+-- quest data: A pawn on the eternal board
+-- Already in world_scripts_full.sql
+UPDATE `gameobject_template` SET `ScriptName`='go_crystalline_tear' WHERE `entry`=180633;
+UPDATE `creature_template` SET `ScriptName`='mob_qiraj_war_spawn' WHERE `entry` IN (15414,15422,15424,15423);
+UPDATE `creature_template` SET `ScriptName`='npc_anachronos_the_ancient' WHERE `entry`=15381;
+UPDATE `creature_template` SET `ScriptName`='npc_anachronos_quest_trigger' WHERE `entry`=15454;
diff --git a/sql/updates/5701_world_scripts.sql b/sql/updates/3.1.3_old/5701_world_scriptname.sql
index 6560085346f..8ff78ba6589 100644
--- a/sql/updates/5701_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5701_world_scriptname.sql
@@ -1,3 +1,2 @@
-
 UPDATE `gameobject_template` SET `ScriptName`='go_fel_crystalforge' WHERE `entry`=185919;
 UPDATE `gameobject_template` SET `ScriptName`='go_bashir_crystalforge' WHERE `entry`=185921;
diff --git a/sql/updates/5702_world_scripts.sql b/sql/updates/3.1.3_old/5702_world_scriptname.sql
index df6fc98b5c2..79dee43d798 100644
--- a/sql/updates/5702_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5702_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `gameobject_template` SET `ScriptName`='go_southfury_moonstone' WHERE `entry`=185566;
diff --git a/sql/updates/5713_world_prince_taldaram.sql b/sql/updates/3.1.3_old/5713_world_script_texts.sql
index a3f124de2b3..04c168603b1 100644
--- a/sql/updates/5713_world_prince_taldaram.sql
+++ b/sql/updates/3.1.3_old/5713_world_script_texts.sql
@@ -1,8 +1,3 @@
-
-UPDATE `creature_template` SET `ScriptName`='boss_taldaram' WHERE `entry`=29308;
-UPDATE `creature_template` SET `ScriptName`='mob_taldaram_flamesphere' WHERE `entry` IN (30106,31686,31687);
-UPDATE `gameobject_template` SET `ScriptName`='prince_taldaram_sphere' WHERE `entry` IN (193093,193094);
-
 DELETE FROM `script_texts` WHERE `entry` BETWEEN -1619028 AND -1619021;
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
    (29308,-1619021,'I will feast on your remains.',0,0,0,0,'prince taldaram SAY_AGGRO'),
diff --git a/sql/updates/3.1.3_old/5713_world_scriptname.sql b/sql/updates/3.1.3_old/5713_world_scriptname.sql
new file mode 100644
index 00000000000..7b8f0c15685
--- /dev/null
+++ b/sql/updates/3.1.3_old/5713_world_scriptname.sql
@@ -0,0 +1,3 @@
+UPDATE `creature_template` SET `ScriptName`='boss_taldaram' WHERE `entry`=29308;
+UPDATE `creature_template` SET `ScriptName`='mob_taldaram_flamesphere' WHERE `entry` IN (30106,31686,31687);
+UPDATE `gameobject_template` SET `ScriptName`='prince_taldaram_sphere' WHERE `entry` IN (193093,193094);
diff --git a/sql/updates/5714_world_scripts.sql b/sql/updates/3.1.3_old/5714_world_scriptname.sql
index 32a672c2ced..07a8ff5859c 100644
--- a/sql/updates/5714_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5714_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `creature_template` SET `ScriptName`='boss_volazj' WHERE `entry`=29311;
diff --git a/sql/updates/5717_world.sql b/sql/updates/3.1.3_old/5717_world_creature_template.sql
index 6db81936e0c..827732e6be2 100644
--- a/sql/updates/5717_world.sql
+++ b/sql/updates/3.1.3_old/5717_world_creature_template.sql
@@ -1,5 +1,3 @@
-ALTER TABLE `item_template` MODIFY `stackable` int;
-
 ALTER TABLE `creature_template` CHANGE COLUMN `modelid_A` `modelid1` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0;
 ALTER TABLE `creature_template` CHANGE COLUMN `modelid_A2` `modelid2` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0;
 ALTER TABLE `creature_template` CHANGE COLUMN `modelid_H` `modelid3` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0;
diff --git a/sql/updates/3.1.3_old/5717_world_item_template.sql b/sql/updates/3.1.3_old/5717_world_item_template.sql
new file mode 100644
index 00000000000..bc81881e075
--- /dev/null
+++ b/sql/updates/3.1.3_old/5717_world_item_template.sql
@@ -0,0 +1 @@
+ALTER TABLE `item_template` MODIFY `stackable` int;
diff --git a/sql/updates/5724_world_utgarde_pinnacle.sql b/sql/updates/3.1.3_old/5724_world_scriptname.sql
index 86a3dba4460..53914d9a2a7 100644
--- a/sql/updates/5724_world_utgarde_pinnacle.sql
+++ b/sql/updates/3.1.3_old/5724_world_scriptname.sql
@@ -9,4 +9,4 @@ UPDATE `creature_template` SET `ScriptName`='mob_ravenous_furbolg' WHERE `entry`
 UPDATE `creature_template` SET `ScriptName`='mob_ferocious_rhino' WHERE `entry`=26685;
 UPDATE `creature_template` SET `ScriptName`='mob_massive_jormungar' WHERE `entry`=26686;
 UPDATE `instance_template` SET `script`='instance_utgarde_pinnacle' WHERE `map`=575;
-UPDATE `gameobject_template` SET `ScriptName`='go_palehoof_sphere'WHERE `entry`=188593;
\ No newline at end of file
+UPDATE `gameobject_template` SET `ScriptName`='go_palehoof_sphere'WHERE `entry`=188593;
diff --git a/sql/updates/5727_world_spell.sql b/sql/updates/3.1.3_old/5727_world_spell_proc_event.sql
index 2428c0d7130..786a472ff5b 100644
--- a/sql/updates/5727_world_spell.sql
+++ b/sql/updates/3.1.3_old/5727_world_spell_proc_event.sql
@@ -1,4 +1,3 @@
-
 -- *Judgement of Wisdom PPM based, not 100%. By Drevi.
 DELETE FROM `spell_proc_event` WHERE `entry`=20186;
 INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
diff --git a/sql/updates/5736_world.sql b/sql/updates/3.1.3_old/5736_world_script_texts.sql
index 0adb9af7713..9e681fce46e 100644
--- a/sql/updates/5736_world.sql
+++ b/sql/updates/3.1.3_old/5736_world_script_texts.sql
@@ -1,6 +1,3 @@
-
-UPDATE `creature_template` SET `ScriptName`='boss_krik_thir' where `entry`=28684;
-
 DELETE FROM `script_texts` WHERE `entry` BETWEEN -1601003 AND -1601000;
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
    (28684,-1601000, 'This kingdom belongs to the Scourge! Only the dead may enter.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1, 0, 0, 'SAY_AGGRO boss_krik_thir'),
diff --git a/sql/updates/3.1.3_old/5736_world_scriptname.sql b/sql/updates/3.1.3_old/5736_world_scriptname.sql
new file mode 100644
index 00000000000..3330f11a9aa
--- /dev/null
+++ b/sql/updates/3.1.3_old/5736_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='boss_krik_thir' where `entry`=28684;
diff --git a/sql/updates/5747_world_scripts.sql b/sql/updates/3.1.3_old/5747_world_script_texts.sql
index 8ea2664e69e..da7658e7ed5 100644
--- a/sql/updates/5747_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5747_world_script_texts.sql
@@ -1,6 +1,3 @@
-
-UPDATE `creature_template` SET `ScriptName`='boss_moorabi' where entry=29305;
-
 DELETE FROM `script_texts` WHERE `entry` BETWEEN -1604017 AND -1604010;
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
    (29305,-1604010,'We fought back da Scourge. What chance joo be thinkin'' JOO got?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'SAY_AGGRO boss_moorabi'),
diff --git a/sql/updates/3.1.3_old/5747_world_scriptname.sql b/sql/updates/3.1.3_old/5747_world_scriptname.sql
new file mode 100644
index 00000000000..f11a2f80f75
--- /dev/null
+++ b/sql/updates/3.1.3_old/5747_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='boss_moorabi' where entry=29305;
diff --git a/sql/updates/5755_world_scripts.sql b/sql/updates/3.1.3_old/5755_world_scriptname.sql
index 8ce1c788486..48775ec2bd7 100644
--- a/sql/updates/5755_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5755_world_scriptname.sql
@@ -1,4 +1,3 @@
-
 UPDATE `creature_template` SET `ScriptName`='boss_slad_ran' WHERE `entry`=29304;
 UPDATE `creature_template` SET `ScriptName`='boss_gal_darah' WHERE `entry`=29306;
 UPDATE `creature_template` SET `ScriptName`='boss_drakkari_colossus' WHERE `entry`=29307;
diff --git a/sql/updates/5761_world_scripts.sql b/sql/updates/3.1.3_old/5761_world_scriptname.sql
index 7733b84e1dd..19986bc8d77 100644
--- a/sql/updates/5761_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5761_world_scriptname.sql
@@ -1,4 +1,3 @@
-
 UPDATE `creature_template` SET `ScriptName`='mob_slad_ran_viper' WHERE `entry`=29680;
 
 /* Eck the Ferocious */
diff --git a/sql/updates/5772_world_scripts.sql b/sql/updates/3.1.3_old/5772_world_scriptname.sql
index 6547183e950..af97f6e9da3 100644
--- a/sql/updates/5772_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5772_world_scriptname.sql
@@ -1,4 +1,3 @@
-
 /* GUNDRAK */
 UPDATE `instance_template` SET `script`='instance_gundrak' WHERE `map`=604;
 /* Moorabi */
diff --git a/sql/updates/3.1.3_old/5776_world_command.sql b/sql/updates/3.1.3_old/5776_world_command.sql
new file mode 100644
index 00000000000..bf4f4551873
--- /dev/null
+++ b/sql/updates/3.1.3_old/5776_world_command.sql
@@ -0,0 +1,2 @@
+DELETE FROM `command` WHERE `name` = 'account addon';
+INSERT INTO `command` (`name`, `security`, `help`) VALUES ('account addon', 3, 'Syntax: .account addon #addon\nSet expansion addon level allowed. Addon values: 0 - normal, 1 - tbc, 2 - wotlk.');
diff --git a/sql/updates/5776_world_command.sql b/sql/updates/3.1.3_old/5776_world_trinity_string.sql
index 516dad98d3a..2a23becbeaa 100644
--- a/sql/updates/5776_world_command.sql
+++ b/sql/updates/3.1.3_old/5776_world_trinity_string.sql
@@ -1,7 +1,3 @@
-
-DELETE FROM `command` WHERE `name` = 'account addon';
-INSERT INTO `command` (`name`, `security`, `help`) VALUES ('account addon', 3, 'Syntax: .account addon #addon\nSet expansion addon level allowed. Addon values: 0 - normal, 1 - tbc, 2 - wotlk.');
-
 DELETE FROM `trinity_string` WHERE `entry`=61;
 INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES
 (61, 'Up to %u expansion allowed now.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/sql/updates/5795_world_scripts.sql b/sql/updates/3.1.3_old/5795_world_script_texts.sql
index 21d1ba2e7e5..c74dd00e215 100644
--- a/sql/updates/5795_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5795_world_script_texts.sql
@@ -1,47 +1,3 @@
--- Azjol-Nerub
-UPDATE `instance_template` SET `script`='instance_azjol_nerub' WHERE `map`=601;
--- Krik'thir the Gatewatcher
-UPDATE creature_template SET `ScriptName`='npc_watcher_narjil' WHERE `entry`=28729;
-UPDATE creature_template SET `ScriptName`='npc_watcher_silthik' WHERE `entry`=28731;
-UPDATE creature_template SET `ScriptName`='npc_anub_ar_warrior' WHERE `entry`=28732;
-UPDATE creature_template SET `ScriptName`='npc_watcher_gashra' WHERE `entry`=28730;
-UPDATE creature_template SET `ScriptName`='boss_krik_thir' WHERE `entry`=28684;
-UPDATE creature_template SET `ScriptName`='npc_skittering_infector' WHERE `entry`=28736;
-UPDATE creature_template SET `ScriptName`='npc_anub_ar_skirmisher' WHERE `entry`=28734;
-UPDATE creature_template SET `ScriptName`='npc_anub_ar_shadowcaster' WHERE `entry`=28733;
-
--- Halls of Stone
--- scripts
-UPDATE `instance_template` SET `script`='instance_halls_of_stone' WHERE `map`=599;
-UPDATE `creature_template` SET `ScriptName`='boss_krystallus' WHERE `entry`=27977;
-UPDATE `creature_template` SET `ScriptName`='boss_sjonnir' WHERE `entry`=27978;
-UPDATE `creature_template` SET `ScriptName`='mob_tribuna_controller' WHERE `entry`=28234;
-UPDATE `creature_template` SET `ScriptName`='npc_brann_hos' WHERE `entry`=28070;
--- waypoints
-DELETE FROM script_waypoint WHERE `entry`=28070;
-INSERT INTO script_waypoint VALUES
-   (28070, 0, 1053.789795, 476.639343, 207.744, 0, ''),
-   (28070, 1, 1032.293945, 467.623444, 207.736, 0, ''),
-   (28070, 2, 1017.908752, 454.765656, 207.719, 0, ''),
-   (28070, 3, 1004.810120, 441.305115, 207.373, 0, ''),
-   (28070, 4, 988.694214, 424.422485, 207.425, 0, ''),
-   (28070, 5, 984.816345, 422.177917, 205.994, 0, ''),
-   (28070, 6, 977.204468, 420.026917, 205.994, 0, ''),
-   (28070, 7, 962.388123, 421.983307, 205.994, 0, ''),
-   (28070, 8, 950.419556, 416.515198, 205.994, 0, ''),
-   (28070, 9, 943.972290, 403.071228, 205.994, 0, ''),
-   (28070, 10, 947.921936, 387.683563, 205.994, 0, ''),
-   (28070, 11, 946.554749, 383.270782, 205.994, 0, ''),
-   (28070, 12, 944.654724, 380.630859, 207.286, 0, ''),
-   (28070, 13, 941.101563, 377.373413, 207.421, 0, 'reach tribunal, set pause'),
-   (28070, 14, 935.217896, 370.557343, 207.421, 0, ''),
-   (28070, 15, 928.035950, 363.026733, 204.018, 0, ''),
-   (28070, 16, 909.287292, 344.392792, 203.706, 0, ''),
-   (28070, 17, 897.946838, 333.634735, 203.706, 0, 'reach panel'),
-   (28070, 18, 918.914429, 351.312866, 203.706, 0, 'reach floor disc (end event begin)'),
-   (28070, 19, 928.070068, 363.296326, 204.091, 0, 'stealth'),
-   (28070, 20, 934.817627, 370.136261, 207.421, 0, ''),
-   (28070, 21, 941.501465, 377.254456, 207.421, 0, '');
 -- texts
 DELETE FROM `script_texts` WHERE `npc_entry` IN (27977,27978,28070);
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
diff --git a/sql/updates/3.1.3_old/5795_world_script_waypoint.sql b/sql/updates/3.1.3_old/5795_world_script_waypoint.sql
new file mode 100644
index 00000000000..a9436cc35bd
--- /dev/null
+++ b/sql/updates/3.1.3_old/5795_world_script_waypoint.sql
@@ -0,0 +1,25 @@
+-- waypoints
+DELETE FROM script_waypoint WHERE `entry`=28070;
+INSERT INTO script_waypoint VALUES
+   (28070, 0, 1053.789795, 476.639343, 207.744, 0, ''),
+   (28070, 1, 1032.293945, 467.623444, 207.736, 0, ''),
+   (28070, 2, 1017.908752, 454.765656, 207.719, 0, ''),
+   (28070, 3, 1004.810120, 441.305115, 207.373, 0, ''),
+   (28070, 4, 988.694214, 424.422485, 207.425, 0, ''),
+   (28070, 5, 984.816345, 422.177917, 205.994, 0, ''),
+   (28070, 6, 977.204468, 420.026917, 205.994, 0, ''),
+   (28070, 7, 962.388123, 421.983307, 205.994, 0, ''),
+   (28070, 8, 950.419556, 416.515198, 205.994, 0, ''),
+   (28070, 9, 943.972290, 403.071228, 205.994, 0, ''),
+   (28070, 10, 947.921936, 387.683563, 205.994, 0, ''),
+   (28070, 11, 946.554749, 383.270782, 205.994, 0, ''),
+   (28070, 12, 944.654724, 380.630859, 207.286, 0, ''),
+   (28070, 13, 941.101563, 377.373413, 207.421, 0, 'reach tribunal, set pause'),
+   (28070, 14, 935.217896, 370.557343, 207.421, 0, ''),
+   (28070, 15, 928.035950, 363.026733, 204.018, 0, ''),
+   (28070, 16, 909.287292, 344.392792, 203.706, 0, ''),
+   (28070, 17, 897.946838, 333.634735, 203.706, 0, 'reach panel'),
+   (28070, 18, 918.914429, 351.312866, 203.706, 0, 'reach floor disc (end event begin)'),
+   (28070, 19, 928.070068, 363.296326, 204.091, 0, 'stealth'),
+   (28070, 20, 934.817627, 370.136261, 207.421, 0, ''),
+   (28070, 21, 941.501465, 377.254456, 207.421, 0, '');
diff --git a/sql/updates/3.1.3_old/5795_world_scriptname.sql b/sql/updates/3.1.3_old/5795_world_scriptname.sql
new file mode 100644
index 00000000000..90ba20376ca
--- /dev/null
+++ b/sql/updates/3.1.3_old/5795_world_scriptname.sql
@@ -0,0 +1,19 @@
+-- Azjol-Nerub
+UPDATE `instance_template` SET `script`='instance_azjol_nerub' WHERE `map`=601;
+-- Krik'thir the Gatewatcher
+UPDATE creature_template SET `ScriptName`='npc_watcher_narjil' WHERE `entry`=28729;
+UPDATE creature_template SET `ScriptName`='npc_watcher_silthik' WHERE `entry`=28731;
+UPDATE creature_template SET `ScriptName`='npc_anub_ar_warrior' WHERE `entry`=28732;
+UPDATE creature_template SET `ScriptName`='npc_watcher_gashra' WHERE `entry`=28730;
+UPDATE creature_template SET `ScriptName`='boss_krik_thir' WHERE `entry`=28684;
+UPDATE creature_template SET `ScriptName`='npc_skittering_infector' WHERE `entry`=28736;
+UPDATE creature_template SET `ScriptName`='npc_anub_ar_skirmisher' WHERE `entry`=28734;
+UPDATE creature_template SET `ScriptName`='npc_anub_ar_shadowcaster' WHERE `entry`=28733;
+
+-- Halls of Stone
+-- scripts
+UPDATE `instance_template` SET `script`='instance_halls_of_stone' WHERE `map`=599;
+UPDATE `creature_template` SET `ScriptName`='boss_krystallus' WHERE `entry`=27977;
+UPDATE `creature_template` SET `ScriptName`='boss_sjonnir' WHERE `entry`=27978;
+UPDATE `creature_template` SET `ScriptName`='mob_tribuna_controller' WHERE `entry`=28234;
+UPDATE `creature_template` SET `ScriptName`='npc_brann_hos' WHERE `entry`=28070;
diff --git a/sql/updates/5804_characters.sql b/sql/updates/3.1.3_old/5804_characters_characters.sql
index 5a221622bc9..73624b9a7a2 100644
--- a/sql/updates/5804_characters.sql
+++ b/sql/updates/3.1.3_old/5804_characters_characters.sql
@@ -1,4 +1,3 @@
-
 /*
 -- Broken character data blobs lately? Run this!
 -- UPDATE `characters` SET `data`=CONCAT(SUBSTRING_INDEX(`data`,' ',1248), ' ',SUBSTRING_INDEX(`data`,' ',-(1295-1248))) WHERE SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',1295+1),' ',-1) IS NOT NULL;
diff --git a/sql/updates/5807_world_script_texts.sql b/sql/updates/3.1.3_old/5807_world_script_texts.sql
index 55f1dd046df..cf854a053a7 100644
--- a/sql/updates/5807_world_script_texts.sql
+++ b/sql/updates/3.1.3_old/5807_world_script_texts.sql
@@ -1,6 +1,4 @@
-DELETE FROM `script_texts` WHERE `entry` BETWEEN -1618028 AND -1618023;
-
-DELETE FROM `script_texts` WHERE `entry` BETWEEN -1619028 AND -1619021;
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1618028 AND -1618021;
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
    (29308,-1619021,'I will feast on your remains.',0,0,0,0,'prince taldaram SAY_AGGRO'),
    (29308,-1619022,'I will drink no blood before it''s time.',0,0,0,0,'prince taldaram SAY_SLAY_1'),
diff --git a/sql/updates/5813_world_command.sql b/sql/updates/3.1.3_old/5813_world_command.sql
index b9ec2a98d1a..b9ec2a98d1a 100644
--- a/sql/updates/5813_world_command.sql
+++ b/sql/updates/3.1.3_old/5813_world_command.sql
diff --git a/sql/updates/5843_world_scripts.sql b/sql/updates/3.1.3_old/5843_world_scriptname.sql
index 9b02bb0bc56..63d855a9f08 100644
--- a/sql/updates/5843_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5843_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `gameobject_template` SET `ScriptName`='go_blackfathom_fire' WHERE `entry` IN (21118,21119,21120,21121);
diff --git a/sql/updates/3.1.3_old/5848_world_scriptname.sql b/sql/updates/3.1.3_old/5848_world_scriptname.sql
new file mode 100644
index 00000000000..80d36b5c994
--- /dev/null
+++ b/sql/updates/3.1.3_old/5848_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `Scriptname`="boss_flame_leviathan_safety_container" WHERE `entry`=33218;
diff --git a/sql/updates/5860_characters.sql b/sql/updates/3.1.3_old/5860_characters_character_reputation.sql
index c8927604025..c8927604025 100644
--- a/sql/updates/5860_characters.sql
+++ b/sql/updates/3.1.3_old/5860_characters_character_reputation.sql
diff --git a/sql/updates/5864_world_scripts.sql b/sql/updates/3.1.3_old/5864_world_scriptname.sql
index ac2f5c2e90d..740196a8c6c 100644
--- a/sql/updates/5864_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5864_world_scriptname.sql
@@ -1,5 +1,3 @@
-
 UPDATE `creature_template` SET `ScriptName`='boss_drakkari_colossus' WHERE `entry`=29307;
 UPDATE `creature_template` SET `ScriptName`='boss_drakkari_elemental' WHERE `entry`=29573;
 UPDATE `creature_template` SET `ScriptName`='npc_living_mojo' WHERE `entry`=29830;
-
diff --git a/sql/updates/5868_world.sql b/sql/updates/3.1.3_old/5868_world_scriptname.sql
index 93aabe19a03..93aabe19a03 100644
--- a/sql/updates/5868_world.sql
+++ b/sql/updates/3.1.3_old/5868_world_scriptname.sql
diff --git a/sql/updates/5872_world_scripts.sql b/sql/updates/3.1.3_old/5872_world_scriptname.sql
index 4c1ece635b1..3cfc592a67d 100644
--- a/sql/updates/5872_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5872_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `creature_template` SET `ScriptName`='npc_grobbulus_poison_cloud' WHERE `entry`=16363;
diff --git a/sql/updates/5897_world_scripts.sql b/sql/updates/3.1.3_old/5897_world_scriptname.sql
index 6f65496a014..bd06188f8ef 100644
--- a/sql/updates/5897_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5897_world_scriptname.sql
@@ -1,4 +1,3 @@
-
 UPDATE `instance_template` SET `script`='instance_drak_tharon' WHERE `map`=600;
 UPDATE `creature_template` SET `ScriptName`='boss_novos' WHERE `entry`=26631;
 UPDATE `creature_template` SET `ScriptName`='mob_crystal_handler' WHERE `entry`=26627;
diff --git a/sql/updates/5900_world.sql b/sql/updates/3.1.3_old/5900_world_spell_proc_event.sql
index e8f2d144870..676c7fb6393 100644
--- a/sql/updates/5900_world.sql
+++ b/sql/updates/3.1.3_old/5900_world_spell_proc_event.sql
@@ -1,4 +1,3 @@
-
 DELETE FROM `spell_proc_event` WHERE `entry` IN (16086,16544,51523,51524);
 INSERT INTO `spell_proc_event` VALUES
 ( 16086, 0x04,  11, 0x00000020, 0x00000000, 0x00000000, 0x00011000, 0x00000000,   0,   0,   0), -- Improved Fire Nova Totem (Rank 1)
diff --git a/sql/updates/5905_world_script.sql b/sql/updates/3.1.3_old/5905_world_scriptname.sql
index 2d1f44e1242..7c7446d88c1 100644
--- a/sql/updates/5905_world_script.sql
+++ b/sql/updates/3.1.3_old/5905_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `creature_template` SET `ScriptName`='mob_novos_minion' WHERE `entry` IN (27600,27597,27598);
diff --git a/sql/updates/5907_world_scripts.sql b/sql/updates/3.1.3_old/5907_world_scriptname.sql
index 389953a020b..2ca87cac7e8 100644
--- a/sql/updates/5907_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5907_world_scriptname.sql
@@ -1,3 +1,2 @@
-
 UPDATE `creature_template` SET `ScriptName`='mob_malformed_ooze' WHERE `entry`=27981;
 UPDATE `creature_template` SET `ScriptName`='mob_iron_sludge' WHERE `entry`=28165;
diff --git a/sql/updates/5908_world_script.sql b/sql/updates/3.1.3_old/5908_world_scriptname.sql
index 15417eef2f1..29bccbcd9bf 100644
--- a/sql/updates/5908_world_script.sql
+++ b/sql/updates/3.1.3_old/5908_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `creature_template` SET `ScriptName`='npc_apothecary_hanes' WHERE `entry`=23784;
diff --git a/sql/updates/5917_world_script.sql b/sql/updates/3.1.3_old/5917_world_scriptname.sql
index fceaa1e7a85..202bee65847 100644
--- a/sql/updates/5917_world_script.sql
+++ b/sql/updates/3.1.3_old/5917_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `gameobject_template` SET `ScriptName`='ulduar_teleporter' WHERE `entry`=194569;
diff --git a/sql/updates/5920_world_spells.sql b/sql/updates/3.1.3_old/5920_world_spell_bonus_data.sql
index aeeaad05acd..36ec23b1683 100644
--- a/sql/updates/5920_world_spells.sql
+++ b/sql/updates/3.1.3_old/5920_world_spell_bonus_data.sql
@@ -1,4 +1,3 @@
-
 -- Lifebloom Spell Bonus Data
 DELETE FROM `spell_bonus_data` WHERE `entry` IN (33763,33778,48450,48451);
 
diff --git a/sql/updates/5930_world.sql b/sql/updates/3.1.3_old/5930_world_spell_proc_event.sql
index b51f2fb3499..9278514bbbe 100644
--- a/sql/updates/5930_world.sql
+++ b/sql/updates/3.1.3_old/5930_world_spell_proc_event.sql
@@ -1,2 +1 @@
-
 UPDATE `spell_proc_event` SET `procEx`=0 WHERE `entry` IN(17793,17796,17801,17802,17803);
diff --git a/sql/updates/5931_world_script_texts.sql b/sql/updates/3.1.3_old/5931_world_script_texts.sql
index 72651190c7f..04c3ae61d06 100644
--- a/sql/updates/5931_world_script_texts.sql
+++ b/sql/updates/3.1.3_old/5931_world_script_texts.sql
@@ -1,4 +1,3 @@
-
 DELETE FROM `script_texts` WHERE `npc_entry`=28070;
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
    (28070,-1603016,'Now that''s owning your supper!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,14244,1,0,0,'brann SAY_KILL_1'),
diff --git a/sql/updates/5936_world_scripts.sql b/sql/updates/3.1.3_old/5936_world_scriptname.sql
index eb319458a30..a4f44dd78a1 100644
--- a/sql/updates/5936_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5936_world_scriptname.sql
@@ -1,4 +1,3 @@
-
 UPDATE `creature_template` SET `ScriptName`='npc_sinclari_vh' WHERE `entry`=30658;
 UPDATE `creature_template` SET `ScriptName`='npc_teleportation_portal_vh' WHERE `entry`=31011;
 UPDATE `creature_template` SET `ScriptName`='boss_lavanthor' WHERE `entry`=29312;
diff --git a/sql/updates/5950_world.sql b/sql/updates/3.1.3_old/5950_world_spell_linked_spell.sql
index 379469682be..379469682be 100644
--- a/sql/updates/5950_world.sql
+++ b/sql/updates/3.1.3_old/5950_world_spell_linked_spell.sql
diff --git a/sql/updates/5962_world_scripts.sql b/sql/updates/3.1.3_old/5962_world_scriptname.sql
index c52d7091bff..c52d7091bff 100644
--- a/sql/updates/5962_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5962_world_scriptname.sql
diff --git a/sql/updates/5966_world_scripts.sql b/sql/updates/3.1.3_old/5966_world_scriptname.sql
index fa7a9f2d79f..a3c4551b202 100644
--- a/sql/updates/5966_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5966_world_scriptname.sql
@@ -1,4 +1,3 @@
-
 UPDATE `creature_template` SET `ScriptName`='mob_massive_jormungar' WHERE `entry`=26685;
 UPDATE `creature_template` SET `ScriptName`='mob_ferocious_rhino' WHERE `entry`=26686;
 UPDATE `creature_template` SET `ScriptName`='mob_palehoof_orb' WHERE `entry`=26688;
diff --git a/sql/updates/5970_world_scripts.sql b/sql/updates/3.1.3_old/5970_world_scriptname.sql
index 406ba84be0d..73a20b01f8d 100644
--- a/sql/updates/5970_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5970_world_scriptname.sql
@@ -1,3 +1,3 @@
 UPDATE `creature_template` SET `ScriptName`='boss_amanitar' WHERE `entry`=30258;
 UPDATE `creature_template` SET `ScriptName`='mob_amanitar_mushrooms' WHERE `entry` IN (30435,30391);
-UPDATE `creature_template` SET `ScriptName`='boss_hadronox' WHERE `entry`=28921;
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='boss_hadronox' WHERE `entry`=28921;
diff --git a/sql/updates/5971_world_scripts.sql b/sql/updates/3.1.3_old/5971_world_scriptname.sql
index a89b2ec37e7..6e3985bd9bf 100644
--- a/sql/updates/5971_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5971_world_scriptname.sql
@@ -1 +1 @@
-UPDATE `creature_template` SET `ScriptName`='mob_nadox_eggs' WHERE `entry` IN (30172,30173);
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='mob_nadox_eggs' WHERE `entry` IN (30172,30173);
diff --git a/sql/updates/5985_world_scripts.sql b/sql/updates/3.1.3_old/5985_world_scriptname.sql
index af45472758b..665187fd390 100644
--- a/sql/updates/5985_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5985_world_scriptname.sql
@@ -1,2 +1,2 @@
 UPDATE `creature_template` SET `ScriptName`='mob_stalagg' WHERE `entry`=15929;
-UPDATE `creature_template` SET `ScriptName`='mob_feugen' WHERE `entry`=15930;
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='mob_feugen' WHERE `entry`=15930;
diff --git a/sql/updates/5990_world_scripts.sql b/sql/updates/3.1.3_old/5990_world_scriptname.sql
index e5d5b72b93e..f19953090ed 100644
--- a/sql/updates/5990_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5990_world_scriptname.sql
@@ -1 +1 @@
-UPDATE `creature_template` SET `ScriptName`='boss_anub_arak' WHERE `entry`=29120;
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='boss_anub_arak' WHERE `entry`=29120;
diff --git a/sql/updates/5994_world_spells.sql b/sql/updates/3.1.3_old/5994_world_spell_bonus_data.sql
index 80c7fad3720..91555ef5127 100644
--- a/sql/updates/5994_world_spells.sql
+++ b/sql/updates/3.1.3_old/5994_world_spell_bonus_data.sql
@@ -1,4 +1,4 @@
 DELETE FROM `spell_bonus_data` WHERE `entry` IN (20187,54158);
 INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES
 (20187, 0, 0, 0, 0, 'Paladin - Judgement of Righteousness'),
-(54158, 0, 0, 0, 0, 'Paladin - Judgement (Seal of Light, Seal of Wisdom, Seal of Justice)');
\ No newline at end of file
+(54158, 0, 0, 0, 0, 'Paladin - Judgement (Seal of Light, Seal of Wisdom, Seal of Justice)');
diff --git a/sql/updates/5996_world_spells.sql b/sql/updates/3.1.3_old/5996_world_spell_linked_spell.sql
index 5880c8035d3..ce6c02fd881 100644
--- a/sql/updates/5996_world_spells.sql
+++ b/sql/updates/3.1.3_old/5996_world_spell_linked_spell.sql
@@ -1,7 +1,3 @@
--- Fix spell_proc_event for spell Arcane Blast, remove on Arcane Barrage or Arcane Explosion
-DELETE FROM `spell_proc_event` WHERE `entry` = 36032;
-INSERT INTO `spell_proc_event` (entry, SchoolMask, SpellFamilyName, SpellFamilyMask0, SpellFamilyMask1, SpellFamilyMask2, procFlags, procEx, ppmRate, CustomChance, Cooldown) VALUES
-(36032, 0, 3, 0x1000, 0x8000, 0, 0, 0, 0, 0, 0);
 -- Fix removing of Arcane Blast buff caused by Arcane Missiles spell
 DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-5143, -5144, -5145, -8416, -8417, -10211, -10212, -25345, -27075, -38699, -38704, -42843, -42846) AND `spell_effect` = -36032;
 INSERT INTO `spell_linked_spell` (spell_trigger, spell_effect, type, comment) VALUES
@@ -17,4 +13,4 @@ INSERT INTO `spell_linked_spell` (spell_trigger, spell_effect, type, comment) VA
 (-38699, -36032, 0, 'Arcane Missiles Rank 10'),
 (-38704, -36032, 0, 'Arcane Missiles Rank 11'),
 (-42843, -36032, 0, 'Arcane Missiles Rank 12'),
-(-42846, -36032, 0, 'Arcane Missiles Rank 13');
\ No newline at end of file
+(-42846, -36032, 0, 'Arcane Missiles Rank 13');
diff --git a/sql/updates/3.1.3_old/5996_world_spell_proc_event.sql b/sql/updates/3.1.3_old/5996_world_spell_proc_event.sql
new file mode 100644
index 00000000000..59c713d1b9d
--- /dev/null
+++ b/sql/updates/3.1.3_old/5996_world_spell_proc_event.sql
@@ -0,0 +1,4 @@
+-- Fix spell_proc_event for spell Arcane Blast, remove on Arcane Barrage or Arcane Explosion
+DELETE FROM `spell_proc_event` WHERE `entry` = 36032;
+INSERT INTO `spell_proc_event` (entry, SchoolMask, SpellFamilyName, SpellFamilyMask0, SpellFamilyMask1, SpellFamilyMask2, procFlags, procEx, ppmRate, CustomChance, Cooldown) VALUES
+(36032, 0, 3, 0x1000, 0x8000, 0, 0, 0, 0, 0, 0);
diff --git a/sql/updates/5997_world_scripts.sql b/sql/updates/3.1.3_old/5997_world_scriptname.sql
index 7c30a6a22dc..aeb8f5b7159 100644
--- a/sql/updates/5997_world_scripts.sql
+++ b/sql/updates/3.1.3_old/5997_world_scriptname.sql
@@ -1,3 +1,3 @@
 UPDATE `creature_template` SET `ScriptName`='boss_jedoga_shadowseeker' WHERE `entry`='29310';
 UPDATE `creature_template` SET `ScriptName`='mob_jedoga_initiand' WHERE `entry`='30114';
-UPDATE `creature_template` SET `ScriptName`='npc_jedogas_aufseher_trigger' WHERE `entry`='30181';
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='npc_jedogas_aufseher_trigger' WHERE `entry`='30181';
diff --git a/sql/updates/6013_world_scripts.sql b/sql/updates/3.1.3_old/6013_world_scriptname.sql
index 4ed923cacdd..4ed923cacdd 100644
--- a/sql/updates/6013_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6013_world_scriptname.sql
diff --git a/sql/updates/6022_world_scripts.sql b/sql/updates/3.1.3_old/6022_world_scriptname.sql
index 7253c0732a8..7253c0732a8 100644
--- a/sql/updates/6022_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6022_world_scriptname.sql
diff --git a/sql/updates/6030_world_scripts.sql b/sql/updates/3.1.3_old/6030_world_scriptname.sql
index be1ebed259b..25a29f5d41f 100644
--- a/sql/updates/6030_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6030_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `creature_template` SET `ScriptName`='pyrewood_ambush' WHERE `entry`=2058;
diff --git a/sql/updates/6066_world_scripts.sql b/sql/updates/3.1.3_old/6066_world_scriptname.sql
index 655fbaf8a7d..655fbaf8a7d 100644
--- a/sql/updates/6066_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6066_world_scriptname.sql
diff --git a/sql/updates/6071_world_spell_proc_event.sql b/sql/updates/3.1.3_old/6071_world_spell_proc_event.sql
index 3fe9472b34f..3fe9472b34f 100644
--- a/sql/updates/6071_world_spell_proc_event.sql
+++ b/sql/updates/3.1.3_old/6071_world_spell_proc_event.sql
diff --git a/sql/updates/6074_world_scripts.sql b/sql/updates/3.1.3_old/6074_world_scriptname.sql
index e63a8b13c9d..b7ad1542e0a 100644
--- a/sql/updates/6074_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6074_world_scriptname.sql
@@ -1,2 +1 @@
 UPDATE `creature_template` SET `ScriptName`='npc_goblin_prisoner' WHERE `entry`=29446;
-
diff --git a/sql/updates/6077_world_scripts.sql b/sql/updates/3.1.3_old/6077_world_scriptname.sql
index 2f8372e4772..2f8372e4772 100644
--- a/sql/updates/6077_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6077_world_scriptname.sql
diff --git a/sql/updates/6078_world_scripts.sql b/sql/updates/3.1.3_old/6078_world_scriptname.sql
index 4e2387c6bf6..4e2387c6bf6 100644
--- a/sql/updates/6078_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6078_world_scriptname.sql
diff --git a/sql/updates/6079_world_scripts.sql b/sql/updates/3.1.3_old/6079_world_scriptname.sql
index 97d7d197ec1..97d7d197ec1 100644
--- a/sql/updates/6079_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6079_world_scriptname.sql
diff --git a/sql/updates/6091_world_scripts.sql b/sql/updates/3.1.3_old/6091_world_scriptname.sql
index 0420a508f3a..608acb1b0d0 100644
--- a/sql/updates/6091_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6091_world_scriptname.sql
@@ -1,4 +1,3 @@
-
 UPDATE `creature_template` SET `ScriptName`='npc_innkeeper' WHERE `entry` IN
 (32418,32411,29926,30308,31433,32413,30005,29963,31115,31557,29971,18649,15397,6806,6778,16542,17553,19046,16739,16553,11116,9501,
 6740,2352,6739,1247,3934,6727,7714,15433,16458,295,5111,7733,7737,6928,6929,6734,8931,1464,6272,7731,17630,6930,6747,12196,6736,
diff --git a/sql/updates/6097_world_loot_template.sql b/sql/updates/3.1.3_old/6097_world_loot_template.sql
index 6fd28beb0d9..aada38e7ff1 100644
--- a/sql/updates/6097_world_loot_template.sql
+++ b/sql/updates/3.1.3_old/6097_world_loot_template.sql
@@ -1,4 +1,3 @@
-
 -- Currently utilized in the following tables (1 = default, 0 = disabled)
 ALTER TABLE `creature_loot_template` ADD COLUMN `lootmode` SMALLINT UNSIGNED NOT NULL DEFAULT 1 AFTER `ChanceOrQuestChance`;
 ALTER TABLE `gameobject_loot_template` ADD COLUMN `lootmode` SMALLINT UNSIGNED NOT NULL DEFAULT 1 AFTER `ChanceOrQuestChance`;
diff --git a/sql/updates/6109_world_scripts.sql b/sql/updates/3.1.3_old/6109_world_scriptname.sql
index 627e2f34ef1..627e2f34ef1 100644
--- a/sql/updates/6109_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6109_world_scriptname.sql
diff --git a/sql/updates/6110_world_loot_template.sql b/sql/updates/3.1.3_old/6110_world_loot_template.sql
index b0e2de566eb..72f81cb2c94 100644
--- a/sql/updates/6110_world_loot_template.sql
+++ b/sql/updates/3.1.3_old/6110_world_loot_template.sql
@@ -1,2 +1 @@
-
 ALTER TABLE `spell_loot_template` ADD COLUMN `lootmode` SMALLINT UNSIGNED NOT NULL DEFAULT 1 AFTER `ChanceOrQuestChance`;
diff --git a/sql/updates/6129_world_scripts.sql b/sql/updates/3.1.3_old/6129_world_scriptname.sql
index a416edc60ce..a416edc60ce 100644
--- a/sql/updates/6129_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6129_world_scriptname.sql
diff --git a/sql/updates/6131_world_scripts.sql b/sql/updates/3.1.3_old/6131_world_scriptname.sql
index 1387501b30b..1387501b30b 100644
--- a/sql/updates/6131_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6131_world_scriptname.sql
diff --git a/sql/updates/6134_world_scripts.sql b/sql/updates/3.1.3_old/6134_world_scriptname.sql
index 861c7ff6021..861c7ff6021 100644
--- a/sql/updates/6134_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6134_world_scriptname.sql
diff --git a/sql/updates/6142_world_spells.sql b/sql/updates/3.1.3_old/6142_world_spell_proc_event.sql
index 80b522953c2..2dc175fe3fa 100644
--- a/sql/updates/6142_world_spells.sql
+++ b/sql/updates/3.1.3_old/6142_world_spell_proc_event.sql
@@ -1,4 +1,3 @@
-
 DELETE FROM `spell_proc_event` WHERE `entry` IN
 (15318,15272,15320);
 INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
diff --git a/sql/updates/6156_characters.sql b/sql/updates/3.1.3_old/6156_characters_character_aura.sql
index b0e3d4e540f..0fee9d967aa 100644
--- a/sql/updates/6156_characters.sql
+++ b/sql/updates/3.1.3_old/6156_characters_character_aura.sql
@@ -1,8 +1,3 @@
-
 ALTER TABLE `character_aura` MODIFY COLUMN `effect_mask` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
  MODIFY COLUMN `stackcount` TINYINT(3) UNSIGNED NOT NULL DEFAULT 1,
  MODIFY COLUMN `remaincharges` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
-
-ALTER TABLE `pet_aura` MODIFY COLUMN `effect_mask` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
- MODIFY COLUMN `stackcount` TINYINT(3) UNSIGNED NOT NULL DEFAULT 1,
- MODIFY COLUMN `remaincharges` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
diff --git a/sql/updates/3.1.3_old/6156_characters_pet_aura.sql b/sql/updates/3.1.3_old/6156_characters_pet_aura.sql
new file mode 100644
index 00000000000..77287623338
--- /dev/null
+++ b/sql/updates/3.1.3_old/6156_characters_pet_aura.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `pet_aura` MODIFY COLUMN `effect_mask` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0,
+ MODIFY COLUMN `stackcount` TINYINT(3) UNSIGNED NOT NULL DEFAULT 1,
+ MODIFY COLUMN `remaincharges` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0;
diff --git a/sql/updates/6156_world.sql b/sql/updates/3.1.3_old/6156_world_exploration_basexp.sql
index eed5fcddc13..5505f0866f5 100644
--- a/sql/updates/6156_world.sql
+++ b/sql/updates/3.1.3_old/6156_world_exploration_basexp.sql
@@ -1,3 +1,2 @@
-
 -- the (4) in TINYINT(4) is kind of useless here, but whatever. This column should be unsigned.
 ALTER TABLE `exploration_basexp` MODIFY COLUMN `level` TINYINT(4) UNSIGNED NOT NULL DEFAULT 0;
diff --git a/sql/updates/6161_world.sql b/sql/updates/3.1.3_old/6161_world_scriptname.sql
index 6ead256db06..6ead256db06 100644
--- a/sql/updates/6161_world.sql
+++ b/sql/updates/3.1.3_old/6161_world_scriptname.sql
diff --git a/sql/updates/6166_world.sql b/sql/updates/3.1.3_old/6166_world_trinity_string.sql
index fc59c68e22f..fc59c68e22f 100644
--- a/sql/updates/6166_world.sql
+++ b/sql/updates/3.1.3_old/6166_world_trinity_string.sql
diff --git a/sql/updates/6171_world.sql b/sql/updates/3.1.3_old/6171_world_spell_linked_spell.sql
index f3b628e1dda..f3b628e1dda 100644
--- a/sql/updates/6171_world.sql
+++ b/sql/updates/3.1.3_old/6171_world_spell_linked_spell.sql
diff --git a/sql/updates/6173_world_trinity_string.sql b/sql/updates/3.1.3_old/6173_world_trinity_string.sql
index 3fc5debb75f..ab31d794ec4 100644
--- a/sql/updates/6173_world_trinity_string.sql
+++ b/sql/updates/3.1.3_old/6173_world_trinity_string.sql
@@ -1,4 +1,3 @@
-
 DELETE FROM `trinity_string` WHERE `entry`=816;
 INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES
 (816, 'Warning: You''ve entered a no-fly zone and are about to be dismounted!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/sql/updates/3.1.3_old/6176_world_ainame.sql b/sql/updates/3.1.3_old/6176_world_ainame.sql
new file mode 100644
index 00000000000..d2ecfb4305a
--- /dev/null
+++ b/sql/updates/3.1.3_old/6176_world_ainame.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `AIName` = 'AOEAI' WHERE `entry` IN ('23336','23069','23259');
diff --git a/sql/updates/6208_world_scripts.sql b/sql/updates/3.1.3_old/6208_world_scriptname.sql
index 5b7f773b54a..5b7f773b54a 100644
--- a/sql/updates/6208_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6208_world_scriptname.sql
diff --git a/sql/updates/6210_world_scripts.sql b/sql/updates/3.1.3_old/6210_world_scriptname.sql
index 02e4014b9e7..02e4014b9e7 100644
--- a/sql/updates/6210_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6210_world_scriptname.sql
diff --git a/sql/updates/6213_world_scripts.sql b/sql/updates/3.1.3_old/6213_world_script_waypoint.sql
index 8a34414f200..c1cd79039be 100644
--- a/sql/updates/6213_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6213_world_script_waypoint.sql
@@ -1,8 +1,3 @@
-UPDATE `creature_template` SET `ScriptName`='npc_lurgglbr' WHERE `entry`=25208;
-UPDATE `creature_template` SET `ScriptName`='npc_nexus_drake_hatchling' WHERE `entry`=26127;
-UPDATE `creature_template` SET `ScriptName`='npc_nesingwary_trapper' WHERE `entry`=25835;
-UPDATE `item_template` SET `ScriptName`='item_pile_fake_furs' WHERE `entry`=35127;
-
 DELETE FROM `script_waypoint` WHERE `entry`=25208;
 INSERT INTO `script_waypoint` VALUES
    (25208, 0, 4014.01, 6391.91, 29.9735, 17000, ''),
diff --git a/sql/updates/3.1.3_old/6213_world_scriptname.sql b/sql/updates/3.1.3_old/6213_world_scriptname.sql
new file mode 100644
index 00000000000..e3f88d01abf
--- /dev/null
+++ b/sql/updates/3.1.3_old/6213_world_scriptname.sql
@@ -0,0 +1,4 @@
+UPDATE `creature_template` SET `ScriptName`='npc_lurgglbr' WHERE `entry`=25208;
+UPDATE `creature_template` SET `ScriptName`='npc_nexus_drake_hatchling' WHERE `entry`=26127;
+UPDATE `creature_template` SET `ScriptName`='npc_nesingwary_trapper' WHERE `entry`=25835;
+UPDATE `item_template` SET `ScriptName`='item_pile_fake_furs' WHERE `entry`=35127;
diff --git a/sql/updates/6221_world_scripts.sql b/sql/updates/3.1.3_old/6221_world_scriptname.sql
index dd68f4b6f45..dd68f4b6f45 100644
--- a/sql/updates/6221_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6221_world_scriptname.sql
diff --git a/sql/updates/6241_world_quest_template.sql b/sql/updates/3.1.3_old/6241_world_quest_template.sql
index bc1fe74c2c3..bc1fe74c2c3 100644
--- a/sql/updates/6241_world_quest_template.sql
+++ b/sql/updates/3.1.3_old/6241_world_quest_template.sql
diff --git a/sql/updates/6242_world_scripts.sql b/sql/updates/3.1.3_old/6242_world_scriptname.sql
index 6b78a09c1f9..6b78a09c1f9 100644
--- a/sql/updates/6242_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6242_world_scriptname.sql
diff --git a/sql/updates/6246_world_scripts.sql b/sql/updates/3.1.3_old/6246_world_scriptname.sql
index b082693be2b..95018249478 100644
--- a/sql/updates/6246_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6246_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `creature_template` SET `ScriptName`='npc_lunaclaw_spirit' WHERE `entry`=12144;
diff --git a/sql/updates/6247_world_scripts.sql b/sql/updates/3.1.3_old/6247_world_scriptname.sql
index ef19092f6ff..e7e4e5b7b6f 100644
--- a/sql/updates/6247_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6247_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `gameobject_template` SET `ScriptName`='go_arcane_prison' WHERE `entry`=187561;
diff --git a/sql/updates/6253_world_spells.sql b/sql/updates/3.1.3_old/6253_world_spell_linked_spell.sql
index 41fc5c4d44b..69bb4cc12e4 100644
--- a/sql/updates/6253_world_spells.sql
+++ b/sql/updates/3.1.3_old/6253_world_spell_linked_spell.sql
@@ -1,4 +1,3 @@
-
 DELETE FROM `spell_linked_spell` WHERE `spell_trigger` in (33878,33986,33987,48563,48564,33876,33982,33983,48565,48566);
 
 INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
diff --git a/sql/updates/6275_trinity_string.sql b/sql/updates/3.1.3_old/6275_world_trinity_string.sql
index a7f833d7460..f7d897f021b 100644
--- a/sql/updates/6275_trinity_string.sql
+++ b/sql/updates/3.1.3_old/6275_world_trinity_string.sql
@@ -1,2 +1 @@
-
 UPDATE `trinity_string` SET `content_default` = 'Wintergrasp info: %s controlled. Timer: %s. Wartime: %s. Number of Players: (Horde: %u, Alliance: %u)' WHERE `entry` = 768;
diff --git a/sql/updates/3.1.3_old/6277_world_scriptname.sql b/sql/updates/3.1.3_old/6277_world_scriptname.sql
new file mode 100644
index 00000000000..4a91e5df588
--- /dev/null
+++ b/sql/updates/3.1.3_old/6277_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_mageguard_dalaran' WHERE `entry` IN (29254,29255);
diff --git a/sql/updates/6277_world.sql b/sql/updates/3.1.3_old/6277_world_spell_target_position.sql
index 0a514233ba7..b63829a8451 100644
--- a/sql/updates/6277_world.sql
+++ b/sql/updates/3.1.3_old/6277_world_spell_target_position.sql
@@ -1,6 +1,3 @@
-
-UPDATE `creature_template` SET `ScriptName`='npc_mageguard_dalaran' WHERE `entry` IN (29254,29255);
-
 -- positions for Dalaran 'Trespasser!' spell
 DELETE FROM `spell_target_position` WHERE `id` IN (54028,54029);
 INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES
diff --git a/sql/updates/6308_world_scripts.sql b/sql/updates/3.1.3_old/6308_world_scriptname.sql
index 367bf8cf43d..367bf8cf43d 100644
--- a/sql/updates/6308_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6308_world_scriptname.sql
diff --git a/sql/updates/6317_world_scripts.sql b/sql/updates/3.1.3_old/6317_world_scriptname.sql
index 4a3f07041bd..4a3f07041bd 100644
--- a/sql/updates/6317_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6317_world_scriptname.sql
diff --git a/sql/updates/6337_world_spells.sql b/sql/updates/3.1.3_old/6337_world_spell_bonus_data.sql
index 5fea2fcdc5a..14ee43c7b75 100644
--- a/sql/updates/6337_world_spells.sql
+++ b/sql/updates/3.1.3_old/6337_world_spell_bonus_data.sql
@@ -1,4 +1,3 @@
-
 DELETE FROM spell_bonus_data WHERE entry IN (47757, 52986, 52987, 52988); -- Old Penance in DB
 DELETE FROM spell_bonus_data WHERE entry IN (47750, 52983, 52954, 58985, 47666, 52998, 52999, 53000);
 INSERT INTO spell_bonus_data (entry, direct_bonus, dot_bonus, ap_bonus, ap_dot_bonus, comments) VALUES
diff --git a/sql/updates/6357_world_scripts.sql b/sql/updates/3.1.3_old/6357_world_scriptname.sql
index daacbabd05a..bef418ead46 100644
--- a/sql/updates/6357_world_scripts.sql
+++ b/sql/updates/3.1.3_old/6357_world_scriptname.sql
@@ -1,2 +1 @@
-
 UPDATE `gameobject_template` SET `ScriptName`='go_blood_filled_orb' WHERE `entry`=182024;
diff --git a/sql/updates/6372_world_spell_proc_event.sql b/sql/updates/3.1.3_old/6372_world_spell_proc_event.sql
index bd0a1cac476..bd0a1cac476 100644
--- a/sql/updates/6372_world_spell_proc_event.sql
+++ b/sql/updates/3.1.3_old/6372_world_spell_proc_event.sql
diff --git a/sql/updates/3.1.3_old/6374_world_creature_template.sql b/sql/updates/3.1.3_old/6374_world_creature_template.sql
new file mode 100644
index 00000000000..0de6244ddb0
--- /dev/null
+++ b/sql/updates/3.1.3_old/6374_world_creature_template.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `creature_template` ADD `questItem5` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `questItem4`;
+ALTER TABLE `creature_template` ADD `questItem6` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `questItem5`;
diff --git a/sql/updates/6374_world.sql b/sql/updates/3.1.3_old/6374_world_gameobject_template.sql
index a1a8fdf5278..02fd2aed69e 100644
--- a/sql/updates/6374_world.sql
+++ b/sql/updates/3.1.3_old/6374_world_gameobject_template.sql
@@ -1,4 +1,2 @@
-ALTER TABLE `creature_template` ADD `questItem5` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `questItem4`;
-ALTER TABLE `creature_template` ADD `questItem6` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `questItem5`;
 ALTER TABLE `gameobject_template` ADD `questItem5` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `questItem4`;
 ALTER TABLE `gameobject_template` ADD `questItem6` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `questItem5`;
diff --git a/sql/updates/5314_world_scripts_ulduar.sql b/sql/updates/5314_world_scripts_ulduar.sql
deleted file mode 100644
index 6fd54662188..00000000000
--- a/sql/updates/5314_world_scripts_ulduar.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-UPDATE creature_template SET scriptname = "spell_pool_of_tar" WHERE entry = 33090;
-
-DELETE FROM `spell_script_target` WHERE `entry` IN (62427,62374,62399);
-INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
-(62427, 1, 33109), # Load into Catapult
-(62374, 1, 33060), # Pursued
-(62374, 1, 33109),
-(62399, 1, 33139); # Overload Circuit
-
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-62475,62427);
-INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
-(-62475,-62399, 0, 'System Shutdown'),
-(-62475, 62472, 0, 'System Shutdown'), #inform, not correct spell
-( 62427, 62340, 2, 'Load into Catapult - Passenger Loaded');
\ No newline at end of file
diff --git a/sql/updates/5462_world_scripts.sql b/sql/updates/5462_world_scripts.sql
deleted file mode 100644
index 97d2915874d..00000000000
--- a/sql/updates/5462_world_scripts.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (21220,21301);
-INSERT INTO `creature_ai_scripts` () VALUES
-(2122001, 21220, 0, 0, 100, 3, 0, 0, 12500, 12500, 11, 38582, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Priestess - Casts Holy Smite'),
-(2122002, 21220, 2, 0, 100, 2, 50, 0, 0, 0, 11, 38580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Priestess - Casts Greater Heal at 50% HP'),
-(2122003, 21220, 2, 0, 100, 2, 20, 0, 0, 0, 11, 38580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Priestess - Casts Greater Heal at 20% HP'),
-(2122004, 21220, 0, 0, 100, 3, 3600, 3600, 10400, 14200, 11, 38585, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Priestess - Casts Holy Fire'),
-(2122005, 21220, 6, 0, 100, 3, 0, 0, 0, 0, 34, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Priestess - Set Instance Data 1'),
-(2130101, 21301, 0, 0, 100, 3, 14100, 14100, 21000, 21500, 11, 38591, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Shatterer - Casts Shatter Armor'),
-(2130102, 21301, 6, 0, 100, 3, 0, 0, 0, 0, 34, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Coilfang Shatterer - Set Instance Data 1');
diff --git a/sql/updates/5579_world_trinity_string.sql b/sql/updates/5579_world_trinity_string.sql
deleted file mode 100644
index 06b8f43c036..00000000000
--- a/sql/updates/5579_world_trinity_string.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-
-REPLACE INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`)
-VALUES (326, 'Faction %s (%u) can''nt have reputation.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/sql/updates/6176_world_scripts.sql b/sql/updates/6176_world_scripts.sql
deleted file mode 100644
index f88fbdfae72..00000000000
--- a/sql/updates/6176_world_scripts.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-UPDATE `creature_template` SET `AIName` = 'AOEAI' WHERE `entry` IN ('23336','23069','23259');
-UPDATE `creature_template` SET `spell1` = '40029' WHERE `entry` = 23069;
-UPDATE `creature_template` SET `spell1` = '40610' WHERE `entry` = 23259;
-UPDATE `creature_template` SET `spell1` = '40836' WHERE `entry` = 23336;
\ No newline at end of file
diff --git a/sql/updates/6381_world.sql b/sql/updates/6381_world_script_texts.sql
index b51b3ddad7e..e6dbe09bd67 100644
--- a/sql/updates/6381_world.sql
+++ b/sql/updates/6381_world_script_texts.sql
@@ -1,17 +1,3 @@
-DELETE FROM `script_waypoint` WHERE `entry`=26170;
-INSERT INTO `script_waypoint` VALUES
-   (26170,1, 3700.08, 3574.54, 473.322, 0, ''),
-   (26170,2, 3705.94, 3573.63, 476.841, 0, ''),
-   (26170,3, 3714.32, 3572.3,   477.442, 0, ''),
-   (26170,4, 3720.19,3563.44, 477.441,  0, ''),
-   (26170,5, 3721.24,3561.95, 477.44,  0, '');
-
-UPDATE `creature_template` SET `ScriptName`='npc_general_arlos' WHERE `entry`=25250;
-UPDATE `creature_template` SET `ScriptName`='npc_leryssa' WHERE `entry`=25251;
-UPDATE `creature_template` SET `ScriptName`='npc_thassarian' WHERE `entry`=26170;
-UPDATE `creature_template` SET `ScriptName`='npc_image_lich_king' WHERE `entry`=26203;
-UPDATE `creature_template` SET `ScriptName`='npc_counselor_talbot' WHERE `entry`=25301;
-
 DELETE FROM `script_texts` WHERE `entry` IN (-1571004,-1571005,-1571006,-1571007,-1571008,-1571009,-1571010,-1571011,-1571012,-1571013,-1571014,-1571015,-1571016,-1571017,-1571018,-1571019,-1571020,-1571021,-1571022,-1571022,-1571023);
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
     (25301 ,-1571004,'My liege, the infiltration and control of the Alliance power structure by our cultists is well underway.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
diff --git a/sql/updates/6381_world_script_waypoint.sql b/sql/updates/6381_world_script_waypoint.sql
new file mode 100644
index 00000000000..abfe142d0bf
--- /dev/null
+++ b/sql/updates/6381_world_script_waypoint.sql
@@ -0,0 +1,7 @@
+DELETE FROM `script_waypoint` WHERE `entry`=26170;
+INSERT INTO `script_waypoint` VALUES
+   (26170,1, 3700.08, 3574.54, 473.322, 0, ''),
+   (26170,2, 3705.94, 3573.63, 476.841, 0, ''),
+   (26170,3, 3714.32, 3572.3,   477.442, 0, ''),
+   (26170,4, 3720.19,3563.44, 477.441,  0, ''),
+   (26170,5, 3721.24,3561.95, 477.44,  0, '');
diff --git a/sql/updates/6381_world_scriptname.sql b/sql/updates/6381_world_scriptname.sql
new file mode 100644
index 00000000000..75ef3b842d0
--- /dev/null
+++ b/sql/updates/6381_world_scriptname.sql
@@ -0,0 +1,5 @@
+UPDATE `creature_template` SET `ScriptName`='npc_general_arlos' WHERE `entry`=25250;
+UPDATE `creature_template` SET `ScriptName`='npc_leryssa' WHERE `entry`=25251;
+UPDATE `creature_template` SET `ScriptName`='npc_thassarian' WHERE `entry`=26170;
+UPDATE `creature_template` SET `ScriptName`='npc_image_lich_king' WHERE `entry`=26203;
+UPDATE `creature_template` SET `ScriptName`='npc_counselor_talbot' WHERE `entry`=25301;
diff --git a/sql/updates/6389_world.sql b/sql/updates/6389_world_scriptname.sql
index f05e2936588..f05e2936588 100644
--- a/sql/updates/6389_world.sql
+++ b/sql/updates/6389_world_scriptname.sql
diff --git a/sql/updates/6397_world.sql b/sql/updates/6397_world_spell_script_target.sql
index 2d5ef4759c0..2d5ef4759c0 100644
--- a/sql/updates/6397_world.sql
+++ b/sql/updates/6397_world_spell_script_target.sql
diff --git a/sql/updates/6398_world.sql b/sql/updates/6398_world_script_texts.sql
index 78debc46dfe..6f7cbce0ecd 100644
--- a/sql/updates/6398_world.sql
+++ b/sql/updates/6398_world_script_texts.sql
@@ -7,5 +7,3 @@ INSERT INTO `script_texts` (`npc_entry`, `entry`, `content_default`, `content_lo
     (25478,-1571028,'Alright! I am beaten. Your previous archmage is held in a prison, elevated and sealed. Even if you manage to reach her, Salrand herself holds the key. Your mission is folly!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
     (25478,-1571029,'I''ve given you the information, $C ! You''re wasting your time....',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
     (25478,-1571030,'Noooo! This tortue is inhumane! You have what you want... why don''t you just kill me?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'');
-
-UPDATE `creature_template` SET `ScriptName` ='npc_imprisoned_beryl_sorcerer' WHERE `entry` = 25478;
diff --git a/sql/updates/6398_world_scriptname.sql b/sql/updates/6398_world_scriptname.sql
new file mode 100644
index 00000000000..07ea9980ad6
--- /dev/null
+++ b/sql/updates/6398_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName` ='npc_imprisoned_beryl_sorcerer' WHERE `entry` = 25478;
diff --git a/sql/updates/6405_world.sql b/sql/updates/6405_world_spell_script_target.sql
index cfafee3580e..cfafee3580e 100644
--- a/sql/updates/6405_world.sql
+++ b/sql/updates/6405_world_spell_script_target.sql
diff --git a/sql/updates/6420_world_scripts.sql b/sql/updates/6420_world_script_texts.sql
index e832c8a368d..d9e29597238 100644
--- a/sql/updates/6420_world_scripts.sql
+++ b/sql/updates/6420_world_script_texts.sql
@@ -1,8 +1,3 @@
-UPDATE `creature_template` SET `ScriptName`='npc_tyrion' WHERE `entry`=7766;
-UPDATE `creature_template` SET `ScriptName`='npc_tyrion_spybot' WHERE `entry`=8856;
-UPDATE `creature_template` SET `ScriptName`='npc_lord_gregor_lescovar' WHERE `entry`=1754;
-UPDATE `creature_template` SET `ScriptName`='npc_marzon_silent_blade' WHERE `entry`=1755;
-
 DELETE FROM `script_texts` WHERE `entry` IN (-1000499,-1000450,-1000451,-1000452,-1000453,-1000454,-1000455,-1000456,-1000457,-1000458,-1000459,-1000460,-1000461,-1000462,-1000463);
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
    (8856,-1000499,'By your command!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
@@ -20,44 +15,3 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (1754,-1000461,'Hmm, it could be that meddle Shaw. I will see what I can discover. Be off with you. I''ll contact you again soon.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
    (7766,-1000462,'That''s it! That''s what you were waiting for! KILL THEM!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,''),
    (1755,-1000463,'The Defias shall succeed! No meek adventurer will stop us!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'');
-
-DELETE FROM `script_waypoint` WHERE `entry` = 1754;
-INSERT INTO `script_waypoint` VALUES
-   (1754, 1, -8334.89, 394.130, 122.274, 0, ''),
-   (1754, 2, -8335.58, 393.519, 122.275, 0, ''),
-   (1754, 3, -8352.99, 379.932, 122.275, 0, ''),
-   (1754, 4, -8356.65, 385.247, 122.275, 0, ''),
-   (1754, 5, -8364.29, 395.317, 122.275, 0, ''),
-   (1754, 6, -8361.75, 402.852, 122.275, 0, ''),
-   (1754, 7, -8359.94, 410.92, 122.275, 0, ''),
-   (1754, 8, -8362.84, 415.409, 122.275, 0, ''),
-   (1754, 9, -8370.42, 424.6, 122.275, 0, ''),
-   (1754, 10, -8380.45, 437.115, 122.275, 0, ''),
-   (1754, 11, -8386.37, 444.906, 122.275, 0, ''),
-   (1754, 12, -8388.5, 447.314, 123.275, 0, ''),
-   (1754, 13, -8390.25, 449.247, 124.275, 0, ''),
-   (1754, 14, -8392.84, 452.397, 123.761, 0, ''),
-   (1754, 15, -8397.52, 457.326, 123.761, 0, ''),
-   (1754, 16, -8402.42, 461.646, 123.761, 0, ''),
-   (1754, 17, -8409.52, 462.677, 123.761, 0, '');
-
-DELETE FROM `script_waypoint` WHERE `entry` = 8856;
-INSERT INTO `script_waypoint` VALUES
-   (8856, 1, -8409.34, 453.345, 123.761, 0, ''),
-   (8856, 2, -8409.52, 462.677, 123.761, 0, ''),
-   (8856, 3, -8402.42, 461.646, 123.761, 0, ''),
-   (8856, 4, -8397.52, 457.326, 123.761, 0, ''),
-   (8856, 5, -8392.84, 452.397, 123.761, 0, ''),
-   (8856, 6, -8390.25, 449.247, 124.275, 0, ''),
-   (8856, 7, -8388.5, 447.314, 123.275, 0, ''),
-   (8856, 8, -8386.37, 444.906, 122.275, 0, ''),
-   (8856, 9, -8380.45, 437.115, 122.275, 0, ''),
-   (8856, 10, -8370.42, 424.6, 122.275, 0, ''),
-   (8856, 11, -8362.84, 415.409, 122.275, 0, ''),
-   (8856, 12, -8359.94, 410.92, 122.275, 0, ''),
-   (8856, 13, -8361.75, 402.852, 122.275, 0, ''),
-   (8856, 14, -8364.29, 395.317, 122.275, 0, ''),
-   (8856, 15, -8356.65, 385.247, 122.275, 0, ''),
-   (8856, 16, -8352.99, 379.932, 122.275, 0, ''),
-   (8856, 17, -8335.58, 393.519, 122.275, 0, ''),
-   (8856, 18, -8334.89, 394.13, 122.274, 0, ''); 
diff --git a/sql/updates/6420_world_script_waypoint.sql b/sql/updates/6420_world_script_waypoint.sql
new file mode 100644
index 00000000000..b9f989ceb26
--- /dev/null
+++ b/sql/updates/6420_world_script_waypoint.sql
@@ -0,0 +1,40 @@
+DELETE FROM `script_waypoint` WHERE `entry` = 1754;
+INSERT INTO `script_waypoint` VALUES
+   (1754, 1, -8334.89, 394.130, 122.274, 0, ''),
+   (1754, 2, -8335.58, 393.519, 122.275, 0, ''),
+   (1754, 3, -8352.99, 379.932, 122.275, 0, ''),
+   (1754, 4, -8356.65, 385.247, 122.275, 0, ''),
+   (1754, 5, -8364.29, 395.317, 122.275, 0, ''),
+   (1754, 6, -8361.75, 402.852, 122.275, 0, ''),
+   (1754, 7, -8359.94, 410.92, 122.275, 0, ''),
+   (1754, 8, -8362.84, 415.409, 122.275, 0, ''),
+   (1754, 9, -8370.42, 424.6, 122.275, 0, ''),
+   (1754, 10, -8380.45, 437.115, 122.275, 0, ''),
+   (1754, 11, -8386.37, 444.906, 122.275, 0, ''),
+   (1754, 12, -8388.5, 447.314, 123.275, 0, ''),
+   (1754, 13, -8390.25, 449.247, 124.275, 0, ''),
+   (1754, 14, -8392.84, 452.397, 123.761, 0, ''),
+   (1754, 15, -8397.52, 457.326, 123.761, 0, ''),
+   (1754, 16, -8402.42, 461.646, 123.761, 0, ''),
+   (1754, 17, -8409.52, 462.677, 123.761, 0, '');
+
+DELETE FROM `script_waypoint` WHERE `entry` = 8856;
+INSERT INTO `script_waypoint` VALUES
+   (8856, 1, -8409.34, 453.345, 123.761, 0, ''),
+   (8856, 2, -8409.52, 462.677, 123.761, 0, ''),
+   (8856, 3, -8402.42, 461.646, 123.761, 0, ''),
+   (8856, 4, -8397.52, 457.326, 123.761, 0, ''),
+   (8856, 5, -8392.84, 452.397, 123.761, 0, ''),
+   (8856, 6, -8390.25, 449.247, 124.275, 0, ''),
+   (8856, 7, -8388.5, 447.314, 123.275, 0, ''),
+   (8856, 8, -8386.37, 444.906, 122.275, 0, ''),
+   (8856, 9, -8380.45, 437.115, 122.275, 0, ''),
+   (8856, 10, -8370.42, 424.6, 122.275, 0, ''),
+   (8856, 11, -8362.84, 415.409, 122.275, 0, ''),
+   (8856, 12, -8359.94, 410.92, 122.275, 0, ''),
+   (8856, 13, -8361.75, 402.852, 122.275, 0, ''),
+   (8856, 14, -8364.29, 395.317, 122.275, 0, ''),
+   (8856, 15, -8356.65, 385.247, 122.275, 0, ''),
+   (8856, 16, -8352.99, 379.932, 122.275, 0, ''),
+   (8856, 17, -8335.58, 393.519, 122.275, 0, ''),
+   (8856, 18, -8334.89, 394.13, 122.274, 0, ''); 
diff --git a/sql/updates/6420_world_scriptname.sql b/sql/updates/6420_world_scriptname.sql
new file mode 100644
index 00000000000..43b36b2d034
--- /dev/null
+++ b/sql/updates/6420_world_scriptname.sql
@@ -0,0 +1,4 @@
+UPDATE `creature_template` SET `ScriptName`='npc_tyrion' WHERE `entry`=7766;
+UPDATE `creature_template` SET `ScriptName`='npc_tyrion_spybot' WHERE `entry`=8856;
+UPDATE `creature_template` SET `ScriptName`='npc_lord_gregor_lescovar' WHERE `entry`=1754;
+UPDATE `creature_template` SET `ScriptName`='npc_marzon_silent_blade' WHERE `entry`=1755;
diff --git a/sql/updates/6421_world_scripts.sql b/sql/updates/6421_world_script_texts.sql
index 6a995737468..90bfbc13ab3 100644
--- a/sql/updates/6421_world_scripts.sql
+++ b/sql/updates/6421_world_script_texts.sql
@@ -2,6 +2,3 @@ DELETE FROM `script_texts` WHERE `entry` IN (-1571031, -1571032);
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
 (30007,-1571031,'This battle must be seen to be believed! Once a mild-mannered tuskarr fisherman, our next fighter turned to the life of a soulless mercenary when his entire family was wiped out by a vicious pack of lion seals and III-tempered penguins! Now he''s just In It for the gold! Ladies and gentlemen, ORINOKO TUSKBREAKER!!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,13363,1,0,0,''),
 (30020,-1571032,'Whisker! Where are you? Assist me!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'');
-
-UPDATE `creature_template` SET `ScriptName` = 'npc_gurgthock' WHERE `entry`=30007;
-UPDATE `creature_template` SET `ScriptName` = 'npc_orinoko_tuskbreaker' WHERE `entry`=30020;
diff --git a/sql/updates/6421_world_scriptname.sql b/sql/updates/6421_world_scriptname.sql
new file mode 100644
index 00000000000..19b67f40752
--- /dev/null
+++ b/sql/updates/6421_world_scriptname.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `ScriptName` = 'npc_gurgthock' WHERE `entry`=30007;
+UPDATE `creature_template` SET `ScriptName` = 'npc_orinoko_tuskbreaker' WHERE `entry`=30020;
diff --git a/sql/updates/6432_world.sql b/sql/updates/6432_world_command.sql
index 5e96472dc60..a75f880231a 100644
--- a/sql/updates/6432_world.sql
+++ b/sql/updates/6432_world_command.sql
@@ -1,2 +1 @@
 UPDATE `command` SET `help` = 'Syntax: .wg timer $minutes\r\nChange the current timer. Min value = 1, Max value 60 (Wartime), 1440 (Not Wartime)' WHERE `name` = 'wg timer';
-
diff --git a/sql/updates/6433_world_scripts.sql b/sql/updates/6433_world_script_texts.sql
index 5c96cd83955..428e10bfb88 100644
--- a/sql/updates/6433_world_scripts.sql
+++ b/sql/updates/6433_world_script_texts.sql
@@ -1,5 +1,3 @@
-UPDATE `creature_template` SET `ScriptName` = 'npc_korrak_bloodrager' WHERE `entry`=30023;
-
 DELETE FROM `script_texts` WHERE `entry` IN (-1571033 -1571034);
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
 (30007,-1571033,'The champion of the Winterax trolls has challenged you, Treeofdoom! I hope you''re ready!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
diff --git a/sql/updates/6433_world_scriptname.sql b/sql/updates/6433_world_scriptname.sql
new file mode 100644
index 00000000000..4152ffad9e9
--- /dev/null
+++ b/sql/updates/6433_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName` = 'npc_korrak_bloodrager' WHERE `entry`=30023;
diff --git a/sql/updates/6439_world_spells.sql b/sql/updates/6439_world_spell_linked_spell.sql
index 5c99fc10c18..5c99fc10c18 100644
--- a/sql/updates/6439_world_spells.sql
+++ b/sql/updates/6439_world_spell_linked_spell.sql
diff --git a/sql/updates/6445_world_scripts.sql b/sql/updates/6445_world_scriptname.sql
index b17889c792f..b17889c792f 100644
--- a/sql/updates/6445_world_scripts.sql
+++ b/sql/updates/6445_world_scriptname.sql
diff --git a/sql/updates/6447_world_scripts.sql b/sql/updates/6447_world_scriptname.sql
index 8dc3242d153..8dc3242d153 100644
--- a/sql/updates/6447_world_scripts.sql
+++ b/sql/updates/6447_world_scriptname.sql
diff --git a/sql/updates/6452_world_spells.sql b/sql/updates/6452_world_spell_script_target.sql
index 2ad6f262074..b5ff7f4a61a 100644
--- a/sql/updates/6452_world_spells.sql
+++ b/sql/updates/6452_world_spell_script_target.sql
@@ -2,4 +2,3 @@ DELETE FROM `spell_script_target` WHERE `entry` IN (54160,59474);
 INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
 (54160, 1, 29266),
 (59474, 1, 29266);
-
diff --git a/sql/updates/6455_world_scripts.sql b/sql/updates/6455_world_scriptname.sql
index f3c9940c8d5..8721eec94fd 100644
--- a/sql/updates/6455_world_scripts.sql
+++ b/sql/updates/6455_world_scriptname.sql
@@ -1,2 +1 @@
 UPDATE `creature_template` SET `ScriptName`='npc_yggdras' WHERE `entry`=30014;
-
diff --git a/sql/updates/6468_realm_db_version.sql b/sql/updates/6468_realmd_db_version.sql
index cca9e1c800f..cca9e1c800f 100644
--- a/sql/updates/6468_realm_db_version.sql
+++ b/sql/updates/6468_realmd_db_version.sql
diff --git a/sql/updates/6477_world_scripts.sql b/sql/updates/6477_world_script_texts.sql
index 54e2a8e6dbf..e17664d1a24 100644
--- a/sql/updates/6477_world_scripts.sql
+++ b/sql/updates/6477_world_script_texts.sql
@@ -1,4 +1,3 @@
 DELETE FROM `script_texts` WHERE `entry`=-1608000;
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
    (30658,-1608000,'Prision guards, we are leaving! These adventurers are taking over! Go go go',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'');
-