184 files changed, 351 insertions, 133 deletions

diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
index f22286c305f..9c13ad59bc5 100644
--- a/dep/CMakeLists.txt
+++ b/dep/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/acelite/CMakeLists.txt b/dep/acelite/CMakeLists.txt
index c394d5313a9..8bf3fadbe3f 100644
--- a/dep/acelite/CMakeLists.txt
+++ b/dep/acelite/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/bzip2/CMakeLists.txt b/dep/bzip2/CMakeLists.txt
index f8f5cf27b95..945e1a2f5ea 100644
--- a/dep/bzip2/CMakeLists.txt
+++ b/dep/bzip2/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/jemalloc/CMakeLists.txt b/dep/jemalloc/CMakeLists.txt
index b39f9e58301..74253127efa 100644
--- a/dep/jemalloc/CMakeLists.txt
+++ b/dep/jemalloc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
diff --git a/dep/libmpq/CMakeLists.txt b/dep/libmpq/CMakeLists.txt
index ef2fccdc9ba..a18d8b15d8b 100644
--- a/dep/libmpq/CMakeLists.txt
+++ b/dep/libmpq/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 6296351f52f..4e81308119f 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -868,6 +868,31 @@ LOCK TABLES `character_queststatus_rewarded` WRITE;
 UNLOCK TABLES;
 
 --
+-- Table structure for table `character_queststatus_seasonal`
+--
+
+DROP TABLE IF EXISTS `character_queststatus_seasonal`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_queststatus_seasonal` (
+  `guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
+  `quest` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Quest Identifier',
+  `event` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Event Identifier',
+  PRIMARY KEY (`guid`,`quest`),
+  KEY `idx_guid` (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_queststatus_seasonal`
+--
+
+LOCK TABLES `character_queststatus_seasonal` WRITE;
+/*!40000 ALTER TABLE `character_queststatus_seasonal` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_queststatus_seasonal` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
 -- Table structure for table `character_queststatus_weekly`
 --
 
@@ -2198,5 +2223,3 @@ UNLOCK TABLES;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2011-04-04 21:03:41
diff --git a/sql/updates/world/2011_11_24_00_world_version.sql b/sql/old/3.3.5a/2011_11_24_00_world_version.sql
index ad2396f29e1..ad2396f29e1 100644
--- a/sql/updates/world/2011_11_24_00_world_version.sql
+++ b/sql/old/3.3.5a/2011_11_24_00_world_version.sql
diff --git a/sql/updates/world/2011_11_25_00_world_quest_template.sql b/sql/old/3.3.5a/2011_11_25_00_world_quest_template.sql
index eee92a3761b..eee92a3761b 100644
--- a/sql/updates/world/2011_11_25_00_world_quest_template.sql
+++ b/sql/old/3.3.5a/2011_11_25_00_world_quest_template.sql
diff --git a/sql/updates/world/2011_11_25_01_world_quest_template.sql b/sql/old/3.3.5a/2011_11_25_01_world_quest_template.sql
index f7e4555f093..f7e4555f093 100644
--- a/sql/updates/world/2011_11_25_01_world_quest_template.sql
+++ b/sql/old/3.3.5a/2011_11_25_01_world_quest_template.sql
diff --git a/sql/updates/world/2011_11_25_02_world_creature.sql b/sql/old/3.3.5a/2011_11_25_02_world_creature.sql
index 0b26187f196..0b26187f196 100644
--- a/sql/updates/world/2011_11_25_02_world_creature.sql
+++ b/sql/old/3.3.5a/2011_11_25_02_world_creature.sql
diff --git a/sql/updates/world/2011_11_26_00_world_quest_template.sql b/sql/old/3.3.5a/2011_11_26_00_world_quest_template.sql
index 6a7834e0a76..6a7834e0a76 100644
--- a/sql/updates/world/2011_11_26_00_world_quest_template.sql
+++ b/sql/old/3.3.5a/2011_11_26_00_world_quest_template.sql
diff --git a/sql/updates/world/2011_11_26_01_world_quest_template.sql b/sql/old/3.3.5a/2011_11_26_01_world_quest_template.sql
index 5b08d57860b..5b08d57860b 100644
--- a/sql/updates/world/2011_11_26_01_world_quest_template.sql
+++ b/sql/old/3.3.5a/2011_11_26_01_world_quest_template.sql
diff --git a/sql/updates/world/2011_11_26_02_world_spell_group.sql b/sql/old/3.3.5a/2011_11_26_02_world_spell_group.sql
index 71ad2eaf9fb..71ad2eaf9fb 100644
--- a/sql/updates/world/2011_11_26_02_world_spell_group.sql
+++ b/sql/old/3.3.5a/2011_11_26_02_world_spell_group.sql
diff --git a/sql/updates/world/2011_11_26_03_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_11_26_03_world_spell_proc_event.sql
index 36837be8ab6..36837be8ab6 100644
--- a/sql/updates/world/2011_11_26_03_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2011_11_26_03_world_spell_proc_event.sql
diff --git a/sql/updates/world/2011_11_26_04_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_11_26_04_world_achievement_criteria_data.sql
index b037bf58349..b037bf58349 100644
--- a/sql/updates/world/2011_11_26_04_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2011_11_26_04_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2011_11_26_04_world_disables.sql b/sql/old/3.3.5a/2011_11_26_04_world_disables.sql
index 4722f248656..4722f248656 100644
--- a/sql/updates/world/2011_11_26_04_world_disables.sql
+++ b/sql/old/3.3.5a/2011_11_26_04_world_disables.sql
diff --git a/sql/updates/world/2011_11_26_05_world_ulduar_gameobject.sql b/sql/old/3.3.5a/2011_11_26_05_world_ulduar_gameobject.sql
index 60ba0aefbeb..60ba0aefbeb 100644
--- a/sql/updates/world/2011_11_26_05_world_ulduar_gameobject.sql
+++ b/sql/old/3.3.5a/2011_11_26_05_world_ulduar_gameobject.sql
diff --git a/sql/updates/world/2011_11_26_06_world_sai.sql b/sql/old/3.3.5a/2011_11_26_06_world_sai.sql
index 9396222e8be..9396222e8be 100644
--- a/sql/updates/world/2011_11_26_06_world_sai.sql
+++ b/sql/old/3.3.5a/2011_11_26_06_world_sai.sql
diff --git a/sql/updates/world/2011_11_27_00_world_creature_template.sql b/sql/old/3.3.5a/2011_11_27_00_world_creature_template.sql
index f29586ea142..f29586ea142 100644
--- a/sql/updates/world/2011_11_27_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2011_11_27_00_world_creature_template.sql
diff --git a/sql/updates/world/2011_11_27_00_world_spell_script.sql b/sql/old/3.3.5a/2011_11_27_00_world_spell_script.sql
index 5411d660c2b..5411d660c2b 100644
--- a/sql/updates/world/2011_11_27_00_world_spell_script.sql
+++ b/sql/old/3.3.5a/2011_11_27_00_world_spell_script.sql
diff --git a/sql/updates/world/2011_11_28_00_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_11_28_00_world_achievement_criteria_data.sql
index 9fea807a97c..9fea807a97c 100644
--- a/sql/updates/world/2011_11_28_00_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2011_11_28_00_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2011_11_29_00_world_spell_script.sql b/sql/old/3.3.5a/2011_11_29_00_world_spell_script.sql
index ff87ebff788..ff87ebff788 100644
--- a/sql/updates/world/2011_11_29_00_world_spell_script.sql
+++ b/sql/old/3.3.5a/2011_11_29_00_world_spell_script.sql
diff --git a/sql/updates/world/2011_12_03_00_world_gameobject.sql b/sql/old/3.3.5a/2011_12_03_00_world_gameobject.sql
index 5707ee28d12..5707ee28d12 100644
--- a/sql/updates/world/2011_12_03_00_world_gameobject.sql
+++ b/sql/old/3.3.5a/2011_12_03_00_world_gameobject.sql
diff --git a/sql/updates/world/2011_12_08_00_world_gossip.sql b/sql/old/3.3.5a/2011_12_08_00_world_gossip.sql
index f6195d9d66e..f6195d9d66e 100644
--- a/sql/updates/world/2011_12_08_00_world_gossip.sql
+++ b/sql/old/3.3.5a/2011_12_08_00_world_gossip.sql
diff --git a/sql/updates/world/2011_12_08_00_world_player_factionchange_achievement.sql b/sql/old/3.3.5a/2011_12_08_00_world_player_factionchange_achievement.sql
index 7a19fa2cad0..7a19fa2cad0 100644
--- a/sql/updates/world/2011_12_08_00_world_player_factionchange_achievement.sql
+++ b/sql/old/3.3.5a/2011_12_08_00_world_player_factionchange_achievement.sql
diff --git a/sql/updates/world/2011_12_08_01_world_creature_template_addon.sql b/sql/old/3.3.5a/2011_12_08_01_world_creature_template_addon.sql
index e8a464146e0..e8a464146e0 100644
--- a/sql/updates/world/2011_12_08_01_world_creature_template_addon.sql
+++ b/sql/old/3.3.5a/2011_12_08_01_world_creature_template_addon.sql
diff --git a/sql/updates/world/2011_12_10_00_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_12_10_00_world_spell_proc_event.sql
index 957a2e76b70..957a2e76b70 100644
--- a/sql/updates/world/2011_12_10_00_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2011_12_10_00_world_spell_proc_event.sql
diff --git a/sql/updates/world/2011_12_10_01_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_12_10_01_world_achievement_criteria_data.sql
index 70e4a4fc544..70e4a4fc544 100644
--- a/sql/updates/world/2011_12_10_01_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2011_12_10_01_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2011_12_12_00_world_spell_bonus_data.sql b/sql/old/3.3.5a/2011_12_12_00_world_spell_bonus_data.sql
index cb728e70dd9..cb728e70dd9 100644
--- a/sql/updates/world/2011_12_12_00_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2011_12_12_00_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2011_12_13_00_world_misc.sql b/sql/old/3.3.5a/2011_12_13_00_world_misc.sql
index 13958e75761..13958e75761 100644
--- a/sql/updates/world/2011_12_13_00_world_misc.sql
+++ b/sql/old/3.3.5a/2011_12_13_00_world_misc.sql
diff --git a/sql/updates/world/2011_12_13_01_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_12_13_01_world_achievement_criteria_data.sql
index 89bbfc7126d..89bbfc7126d 100644
--- a/sql/updates/world/2011_12_13_01_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2011_12_13_01_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2011_12_13_02_world_creature_template_addon.sql b/sql/old/3.3.5a/2011_12_13_02_world_creature_template_addon.sql
index f1dc473bdd7..f1dc473bdd7 100644
--- a/sql/updates/world/2011_12_13_02_world_creature_template_addon.sql
+++ b/sql/old/3.3.5a/2011_12_13_02_world_creature_template_addon.sql
diff --git a/sql/updates/world/2011_12_14_00_world_command.sql b/sql/old/3.3.5a/2011_12_14_00_world_command.sql
index e871a82d89d..e871a82d89d 100644
--- a/sql/updates/world/2011_12_14_00_world_command.sql
+++ b/sql/old/3.3.5a/2011_12_14_00_world_command.sql
diff --git a/sql/updates/world/2011_12_14_01_world_gameobject_template.sql b/sql/old/3.3.5a/2011_12_14_01_world_gameobject_template.sql
index 52c04703acc..52c04703acc 100644
--- a/sql/updates/world/2011_12_14_01_world_gameobject_template.sql
+++ b/sql/old/3.3.5a/2011_12_14_01_world_gameobject_template.sql
diff --git a/sql/updates/world/2011_12_16_00_world_creature_template.sql b/sql/old/3.3.5a/2011_12_16_00_world_creature_template.sql
index 3ff9d630c54..3ff9d630c54 100644
--- a/sql/updates/world/2011_12_16_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2011_12_16_00_world_creature_template.sql
diff --git a/sql/updates/world/2011_12_16_00_world_spell_bonus_data.sql b/sql/old/3.3.5a/2011_12_16_00_world_spell_bonus_data.sql
index 5864b9ac042..5864b9ac042 100644
--- a/sql/updates/world/2011_12_16_00_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2011_12_16_00_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2011_12_17_00_world_creature.sql b/sql/old/3.3.5a/2011_12_17_00_world_creature.sql
index 0126561da01..0126561da01 100644
--- a/sql/updates/world/2011_12_17_00_world_creature.sql
+++ b/sql/old/3.3.5a/2011_12_17_00_world_creature.sql
diff --git a/sql/updates/world/2011_12_17_00_world_gameobject.sql b/sql/old/3.3.5a/2011_12_17_00_world_gameobject.sql
index 98752a1b7ec..98752a1b7ec 100644
--- a/sql/updates/world/2011_12_17_00_world_gameobject.sql
+++ b/sql/old/3.3.5a/2011_12_17_00_world_gameobject.sql
diff --git a/sql/updates/world/2011_12_18_00_world_creature_addon.sql b/sql/old/3.3.5a/2011_12_18_00_world_creature_addon.sql
index 5df7f000b06..5df7f000b06 100644
--- a/sql/updates/world/2011_12_18_00_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2011_12_18_00_world_creature_addon.sql
diff --git a/sql/updates/world/2011_12_18_01_world_gossip.sql b/sql/old/3.3.5a/2011_12_18_01_world_gossip.sql
index eb76ffe4009..eb76ffe4009 100644
--- a/sql/updates/world/2011_12_18_01_world_gossip.sql
+++ b/sql/old/3.3.5a/2011_12_18_01_world_gossip.sql
diff --git a/sql/updates/world/2011_12_18_02_world_spell_script_names.sql b/sql/old/3.3.5a/2011_12_18_02_world_spell_script_names.sql
index c5f9a4376df..c5f9a4376df 100644
--- a/sql/updates/world/2011_12_18_02_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2011_12_18_02_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_12_18_03_world_trinity_string.sql b/sql/old/3.3.5a/2011_12_18_03_world_trinity_string.sql
index d26cc356cff..d26cc356cff 100644
--- a/sql/updates/world/2011_12_18_03_world_trinity_string.sql
+++ b/sql/old/3.3.5a/2011_12_18_03_world_trinity_string.sql
diff --git a/sql/updates/world/2011_12_18_04_world_misc.sql b/sql/old/3.3.5a/2011_12_18_04_world_misc.sql
index 3404e4f285f..3404e4f285f 100644
--- a/sql/updates/world/2011_12_18_04_world_misc.sql
+++ b/sql/old/3.3.5a/2011_12_18_04_world_misc.sql
diff --git a/sql/updates/world/2011_12_18_05_world_misc.sql b/sql/old/3.3.5a/2011_12_18_05_world_misc.sql
index b8435c4211e..b8435c4211e 100644
--- a/sql/updates/world/2011_12_18_05_world_misc.sql
+++ b/sql/old/3.3.5a/2011_12_18_05_world_misc.sql
diff --git a/sql/updates/world/2011_12_18_06_world_sai.sql b/sql/old/3.3.5a/2011_12_18_06_world_sai.sql
index 2fce176cd0f..2fce176cd0f 100644
--- a/sql/updates/world/2011_12_18_06_world_sai.sql
+++ b/sql/old/3.3.5a/2011_12_18_06_world_sai.sql
diff --git a/sql/updates/world/2011_12_18_07_world_conditions.sql b/sql/old/3.3.5a/2011_12_18_07_world_conditions.sql
index ef669dd2dbb..ef669dd2dbb 100644
--- a/sql/updates/world/2011_12_18_07_world_conditions.sql
+++ b/sql/old/3.3.5a/2011_12_18_07_world_conditions.sql
diff --git a/sql/updates/world/2011_12_19_00_world_conditions.sql b/sql/old/3.3.5a/2011_12_19_00_world_conditions.sql
index a56151a9f8f..a56151a9f8f 100644
--- a/sql/updates/world/2011_12_19_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2011_12_19_00_world_conditions.sql
diff --git a/sql/updates/world/2011_12_19_01_world_quest_template.sql b/sql/old/3.3.5a/2011_12_19_01_world_quest_template.sql
index c04fdddfe97..c04fdddfe97 100644
--- a/sql/updates/world/2011_12_19_01_world_quest_template.sql
+++ b/sql/old/3.3.5a/2011_12_19_01_world_quest_template.sql
diff --git a/sql/updates/world/2011_12_19_02_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2011_12_19_02_world_achievement_criteria_data.sql
index af7b0a9361b..af7b0a9361b 100644
--- a/sql/updates/world/2011_12_19_02_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2011_12_19_02_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2011_12_24_00_world_misc.sql b/sql/old/3.3.5a/2011_12_24_00_world_misc.sql
index 5e070d0771e..5e070d0771e 100644
--- a/sql/updates/world/2011_12_24_00_world_misc.sql
+++ b/sql/old/3.3.5a/2011_12_24_00_world_misc.sql
diff --git a/sql/updates/world/2011_12_24_00_world_spell_proc_event.sql b/sql/old/3.3.5a/2011_12_24_00_world_spell_proc_event.sql
index f25fa4c4856..f25fa4c4856 100644
--- a/sql/updates/world/2011_12_24_00_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2011_12_24_00_world_spell_proc_event.sql
diff --git a/sql/updates/world/2011_12_24_01_world_mail_loot_template.sql b/sql/old/3.3.5a/2011_12_24_01_world_mail_loot_template.sql
index 2fc05e9cf17..2fc05e9cf17 100644
--- a/sql/updates/world/2011_12_24_01_world_mail_loot_template.sql
+++ b/sql/old/3.3.5a/2011_12_24_01_world_mail_loot_template.sql
diff --git a/sql/updates/world/2011_12_25_00_world_areatrigger_scriptnames.sql b/sql/old/3.3.5a/2011_12_25_00_world_areatrigger_scriptnames.sql
index 2a16394c7fe..2a16394c7fe 100644
--- a/sql/updates/world/2011_12_25_00_world_areatrigger_scriptnames.sql
+++ b/sql/old/3.3.5a/2011_12_25_00_world_areatrigger_scriptnames.sql
diff --git a/sql/updates/world/2011_12_25_00_world_gameobject_scriptnames.sql b/sql/old/3.3.5a/2011_12_25_00_world_gameobject_scriptnames.sql
index c545550e129..c545550e129 100644
--- a/sql/updates/world/2011_12_25_00_world_gameobject_scriptnames.sql
+++ b/sql/old/3.3.5a/2011_12_25_00_world_gameobject_scriptnames.sql
diff --git a/sql/updates/world/2011_12_25_00_world_misc.sql b/sql/old/3.3.5a/2011_12_25_00_world_misc.sql
index 8f1d3c44ceb..8f1d3c44ceb 100644
--- a/sql/updates/world/2011_12_25_00_world_misc.sql
+++ b/sql/old/3.3.5a/2011_12_25_00_world_misc.sql
diff --git a/sql/updates/world/2011_12_25_00_world_sai.sql b/sql/old/3.3.5a/2011_12_25_00_world_sai.sql
index d0f1572d708..d0f1572d708 100644
--- a/sql/updates/world/2011_12_25_00_world_sai.sql
+++ b/sql/old/3.3.5a/2011_12_25_00_world_sai.sql
diff --git a/sql/updates/world/2011_12_25_00_world_spell_script_names.sql b/sql/old/3.3.5a/2011_12_25_00_world_spell_script_names.sql
index dc42056f84c..dc42056f84c 100644
--- a/sql/updates/world/2011_12_25_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2011_12_25_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2011_12_25_01_world_areatrigger_scriptnames.sql b/sql/old/3.3.5a/2011_12_25_01_world_areatrigger_scriptnames.sql
index ebed9976f44..ebed9976f44 100644
--- a/sql/updates/world/2011_12_25_01_world_areatrigger_scriptnames.sql
+++ b/sql/old/3.3.5a/2011_12_25_01_world_areatrigger_scriptnames.sql
diff --git a/sql/updates/world/2011_12_25_01_world_misc.sql b/sql/old/3.3.5a/2011_12_25_01_world_misc.sql
index 9e4d7e6c058..9e4d7e6c058 100644
--- a/sql/updates/world/2011_12_25_01_world_misc.sql
+++ b/sql/old/3.3.5a/2011_12_25_01_world_misc.sql
diff --git a/sql/updates/world/2011_12_25_01_world_sai.sql b/sql/old/3.3.5a/2011_12_25_01_world_sai.sql
index 8ae439ffe67..8ae439ffe67 100644
--- a/sql/updates/world/2011_12_25_01_world_sai.sql
+++ b/sql/old/3.3.5a/2011_12_25_01_world_sai.sql
diff --git a/sql/updates/world/2011_12_25_02_world_areatrigger_scriptnames.sql b/sql/old/3.3.5a/2011_12_25_02_world_areatrigger_scriptnames.sql
index 78a1fbc98c9..78a1fbc98c9 100644
--- a/sql/updates/world/2011_12_25_02_world_areatrigger_scriptnames.sql
+++ b/sql/old/3.3.5a/2011_12_25_02_world_areatrigger_scriptnames.sql
diff --git a/sql/updates/world/2011_12_25_02_world_misc.sql b/sql/old/3.3.5a/2011_12_25_02_world_misc.sql
index ee2fd9c1964..ee2fd9c1964 100644
--- a/sql/updates/world/2011_12_25_02_world_misc.sql
+++ b/sql/old/3.3.5a/2011_12_25_02_world_misc.sql
diff --git a/sql/updates/world/2011_12_25_02_world_sai.sql b/sql/old/3.3.5a/2011_12_25_02_world_sai.sql
index f0d69b04964..f0d69b04964 100644
--- a/sql/updates/world/2011_12_25_02_world_sai.sql
+++ b/sql/old/3.3.5a/2011_12_25_02_world_sai.sql
diff --git a/sql/updates/world/2011_12_25_03_world_misc.sql b/sql/old/3.3.5a/2011_12_25_03_world_misc.sql
index a8967354a3d..a8967354a3d 100644
--- a/sql/updates/world/2011_12_25_03_world_misc.sql
+++ b/sql/old/3.3.5a/2011_12_25_03_world_misc.sql
diff --git a/sql/updates/world/2011_12_25_03_world_sai.sql b/sql/old/3.3.5a/2011_12_25_03_world_sai.sql
index e53c9f72e38..e53c9f72e38 100644
--- a/sql/updates/world/2011_12_25_03_world_sai.sql
+++ b/sql/old/3.3.5a/2011_12_25_03_world_sai.sql
diff --git a/sql/updates/world/2011_12_26_00_world_sai.sql b/sql/old/3.3.5a/2011_12_26_00_world_sai.sql
index 616ced60147..616ced60147 100644
--- a/sql/updates/world/2011_12_26_00_world_sai.sql
+++ b/sql/old/3.3.5a/2011_12_26_00_world_sai.sql
diff --git a/sql/updates/world/2011_12_26_01_world_sai.sql b/sql/old/3.3.5a/2011_12_26_01_world_sai.sql
index 50283820dc8..50283820dc8 100644
--- a/sql/updates/world/2011_12_26_01_world_sai.sql
+++ b/sql/old/3.3.5a/2011_12_26_01_world_sai.sql
diff --git a/sql/updates/world/2011_12_26_02_world_sai.sql b/sql/old/3.3.5a/2011_12_26_02_world_sai.sql
index 6da23e21875..6da23e21875 100644
--- a/sql/updates/world/2011_12_26_02_world_sai.sql
+++ b/sql/old/3.3.5a/2011_12_26_02_world_sai.sql
diff --git a/sql/updates/world/2011_12_26_03_world_sai.sql b/sql/old/3.3.5a/2011_12_26_03_world_sai.sql
index 07333e50a91..07333e50a91 100644
--- a/sql/updates/world/2011_12_26_03_world_sai.sql
+++ b/sql/old/3.3.5a/2011_12_26_03_world_sai.sql
diff --git a/sql/updates/world/2011_12_26_04_world_sai.sql b/sql/old/3.3.5a/2011_12_26_04_world_sai.sql
index c508773c51a..c508773c51a 100644
--- a/sql/updates/world/2011_12_26_04_world_sai.sql
+++ b/sql/old/3.3.5a/2011_12_26_04_world_sai.sql
diff --git a/sql/updates/world/2011_12_26_05_world_sai.sql b/sql/old/3.3.5a/2011_12_26_05_world_sai.sql
index 0155c3ad39b..0155c3ad39b 100644
--- a/sql/updates/world/2011_12_26_05_world_sai.sql
+++ b/sql/old/3.3.5a/2011_12_26_05_world_sai.sql
diff --git a/sql/updates/world/2011_12_26_06_world_sai.sql b/sql/old/3.3.5a/2011_12_26_06_world_sai.sql
index 6335bd9f475..6335bd9f475 100644
--- a/sql/updates/world/2011_12_26_06_world_sai.sql
+++ b/sql/old/3.3.5a/2011_12_26_06_world_sai.sql
diff --git a/sql/updates/world/2011_12_26_07_world_sai.sql b/sql/old/3.3.5a/2011_12_26_07_world_sai.sql
index ffe55b0e5f9..ffe55b0e5f9 100644
--- a/sql/updates/world/2011_12_26_07_world_sai.sql
+++ b/sql/old/3.3.5a/2011_12_26_07_world_sai.sql
diff --git a/sql/updates/world/2011_12_26_08_world_sai.sql b/sql/old/3.3.5a/2011_12_26_08_world_sai.sql
index 6633e97f2b4..6633e97f2b4 100644
--- a/sql/updates/world/2011_12_26_08_world_sai.sql
+++ b/sql/old/3.3.5a/2011_12_26_08_world_sai.sql
diff --git a/sql/updates/world/2012_01_02_00_world_sai.sql b/sql/old/3.3.5a/2012_01_02_00_world_sai.sql
index 3b9abd4c746..3b9abd4c746 100644
--- a/sql/updates/world/2012_01_02_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_01_02_00_world_sai.sql
diff --git a/sql/updates/world/2012_01_02_01_world_game_event.sql b/sql/old/3.3.5a/2012_01_02_01_world_game_event.sql
index 11267a6b296..11267a6b296 100644
--- a/sql/updates/world/2012_01_02_01_world_game_event.sql
+++ b/sql/old/3.3.5a/2012_01_02_01_world_game_event.sql
diff --git a/sql/updates/world/2012_01_02_02_world_creature_template.sql b/sql/old/3.3.5a/2012_01_02_02_world_creature_template.sql
index ed95c4450fd..ed95c4450fd 100644
--- a/sql/updates/world/2012_01_02_02_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_01_02_02_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_02_03_world_creature_onkill_reputation.sql b/sql/old/3.3.5a/2012_01_02_03_world_creature_onkill_reputation.sql
index 282fc58dd3b..282fc58dd3b 100644
--- a/sql/updates/world/2012_01_02_03_world_creature_onkill_reputation.sql
+++ b/sql/old/3.3.5a/2012_01_02_03_world_creature_onkill_reputation.sql
diff --git a/sql/updates/world/2012_01_03_00_world_gossip_menu.sql b/sql/old/3.3.5a/2012_01_03_00_world_gossip_menu.sql
index 9e9bba43b1a..9e9bba43b1a 100644
--- a/sql/updates/world/2012_01_03_00_world_gossip_menu.sql
+++ b/sql/old/3.3.5a/2012_01_03_00_world_gossip_menu.sql
diff --git a/sql/updates/world/2012_01_03_01_world_quest_template.sql b/sql/old/3.3.5a/2012_01_03_01_world_quest_template.sql
index f35ea3be65b..f35ea3be65b 100644
--- a/sql/updates/world/2012_01_03_01_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_01_03_01_world_quest_template.sql
diff --git a/sql/updates/world/2012_01_03_02_world_sai.sql b/sql/old/3.3.5a/2012_01_03_02_world_sai.sql
index 61ae8aab575..61ae8aab575 100644
--- a/sql/updates/world/2012_01_03_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_01_03_02_world_sai.sql
diff --git a/sql/updates/world/2012_01_03_03_world_creature_template.sql b/sql/old/3.3.5a/2012_01_03_03_world_creature_template.sql
index 29d0e802abe..29d0e802abe 100644
--- a/sql/updates/world/2012_01_03_03_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_01_03_03_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_03_04_world_gameobject_questrelation.sql b/sql/old/3.3.5a/2012_01_03_04_world_gameobject_questrelation.sql
index 519fa99e2d5..519fa99e2d5 100644
--- a/sql/updates/world/2012_01_03_04_world_gameobject_questrelation.sql
+++ b/sql/old/3.3.5a/2012_01_03_04_world_gameobject_questrelation.sql
diff --git a/sql/updates/world/2012_01_03_05_world_creature.sql b/sql/old/3.3.5a/2012_01_03_05_world_creature.sql
index b30ca2d5ef4..b30ca2d5ef4 100644
--- a/sql/updates/world/2012_01_03_05_world_creature.sql
+++ b/sql/old/3.3.5a/2012_01_03_05_world_creature.sql
diff --git a/sql/updates/world/2012_01_03_06_world_sai.sql b/sql/old/3.3.5a/2012_01_03_06_world_sai.sql
index 858dc3f498d..858dc3f498d 100644
--- a/sql/updates/world/2012_01_03_06_world_sai.sql
+++ b/sql/old/3.3.5a/2012_01_03_06_world_sai.sql
diff --git a/sql/updates/world/2012_01_03_07_world_creature.sql b/sql/old/3.3.5a/2012_01_03_07_world_creature.sql
index 5098901b564..5098901b564 100644
--- a/sql/updates/world/2012_01_03_07_world_creature.sql
+++ b/sql/old/3.3.5a/2012_01_03_07_world_creature.sql
diff --git a/sql/updates/characters/2012_01_04_00_characters_character_queststatus_seasonal.sql b/sql/old/3.3.5a/2012_01_04_00_characters_character_queststatus_seasonal.sql
index f9ae71b65a7..f9ae71b65a7 100644
--- a/sql/updates/characters/2012_01_04_00_characters_character_queststatus_seasonal.sql
+++ b/sql/old/3.3.5a/2012_01_04_00_characters_character_queststatus_seasonal.sql
diff --git a/sql/updates/world/2012_01_04_00_world_gossip_menu.sql b/sql/old/3.3.5a/2012_01_04_00_world_gossip_menu.sql
index cf11ba74eb2..cf11ba74eb2 100644
--- a/sql/updates/world/2012_01_04_00_world_gossip_menu.sql
+++ b/sql/old/3.3.5a/2012_01_04_00_world_gossip_menu.sql
diff --git a/sql/updates/world/2012_01_04_01_world_game_event_seasonal_questrelation.sql b/sql/old/3.3.5a/2012_01_04_01_world_game_event_seasonal_questrelation.sql
index 9746a358e8a..9746a358e8a 100644
--- a/sql/updates/world/2012_01_04_01_world_game_event_seasonal_questrelation.sql
+++ b/sql/old/3.3.5a/2012_01_04_01_world_game_event_seasonal_questrelation.sql
diff --git a/sql/updates/world/2012_01_04_02_world_achievements.sql b/sql/old/3.3.5a/2012_01_04_02_world_achievements.sql
index cbd5efa3cd6..cbd5efa3cd6 100644
--- a/sql/updates/world/2012_01_04_02_world_achievements.sql
+++ b/sql/old/3.3.5a/2012_01_04_02_world_achievements.sql
diff --git a/sql/updates/world/2012_01_04_02_world_sai.sql b/sql/old/3.3.5a/2012_01_04_02_world_sai.sql
index 70cb3fc9a04..70cb3fc9a04 100644
--- a/sql/updates/world/2012_01_04_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_01_04_02_world_sai.sql
diff --git a/sql/updates/world/2012_01_04_03_world_spell_script_names.sql b/sql/old/3.3.5a/2012_01_04_03_world_spell_script_names.sql
index f8ae3db6ad3..f8ae3db6ad3 100644
--- a/sql/updates/world/2012_01_04_03_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_01_04_03_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_01_04_04_world_creature.sql b/sql/old/3.3.5a/2012_01_04_04_world_creature.sql
index 58970cd03c7..58970cd03c7 100644
--- a/sql/updates/world/2012_01_04_04_world_creature.sql
+++ b/sql/old/3.3.5a/2012_01_04_04_world_creature.sql
diff --git a/sql/updates/world/2012_01_04_04_world_creature_template.sql b/sql/old/3.3.5a/2012_01_04_04_world_creature_template.sql
index 6131c439fdb..6131c439fdb 100644
--- a/sql/updates/world/2012_01_04_04_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_01_04_04_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_04_05_world_waypoint_data.sql b/sql/old/3.3.5a/2012_01_04_05_world_waypoint_data.sql
index 2ad787b36ca..2ad787b36ca 100644
--- a/sql/updates/world/2012_01_04_05_world_waypoint_data.sql
+++ b/sql/old/3.3.5a/2012_01_04_05_world_waypoint_data.sql
diff --git a/sql/updates/world/2012_01_04_06_world_waypoint_data.sql b/sql/old/3.3.5a/2012_01_04_06_world_waypoint_data.sql
index c4cefc87c63..c4cefc87c63 100644
--- a/sql/updates/world/2012_01_04_06_world_waypoint_data.sql
+++ b/sql/old/3.3.5a/2012_01_04_06_world_waypoint_data.sql
diff --git a/sql/updates/world/2012_01_04_07_world_gossip_menu.sql b/sql/old/3.3.5a/2012_01_04_07_world_gossip_menu.sql
index 9e9bba43b1a..9e9bba43b1a 100644
--- a/sql/updates/world/2012_01_04_07_world_gossip_menu.sql
+++ b/sql/old/3.3.5a/2012_01_04_07_world_gossip_menu.sql
diff --git a/sql/updates/world/2012_01_04_08_world_gossip_menu.sql b/sql/old/3.3.5a/2012_01_04_08_world_gossip_menu.sql
index 826ca19e99f..826ca19e99f 100644
--- a/sql/updates/world/2012_01_04_08_world_gossip_menu.sql
+++ b/sql/old/3.3.5a/2012_01_04_08_world_gossip_menu.sql
diff --git a/sql/updates/world/2012_01_04_09_world_gossip_menu.sql b/sql/old/3.3.5a/2012_01_04_09_world_gossip_menu.sql
index b95eb723d03..b95eb723d03 100644
--- a/sql/updates/world/2012_01_04_09_world_gossip_menu.sql
+++ b/sql/old/3.3.5a/2012_01_04_09_world_gossip_menu.sql
diff --git a/sql/updates/world/2012_01_04_10_world_gossip_menu.sql b/sql/old/3.3.5a/2012_01_04_10_world_gossip_menu.sql
index b41f74e8050..b41f74e8050 100644
--- a/sql/updates/world/2012_01_04_10_world_gossip_menu.sql
+++ b/sql/old/3.3.5a/2012_01_04_10_world_gossip_menu.sql
diff --git a/sql/updates/world/2012_01_04_11_world_gossip_menu.sql b/sql/old/3.3.5a/2012_01_04_11_world_gossip_menu.sql
index 4356f9c7a0a..4356f9c7a0a 100644
--- a/sql/updates/world/2012_01_04_11_world_gossip_menu.sql
+++ b/sql/old/3.3.5a/2012_01_04_11_world_gossip_menu.sql
diff --git a/sql/updates/world/2012_01_04_12_world_gosip_menu.sql b/sql/old/3.3.5a/2012_01_04_12_world_gosip_menu.sql
index a57dc7bcdba..a57dc7bcdba 100644
--- a/sql/updates/world/2012_01_04_12_world_gosip_menu.sql
+++ b/sql/old/3.3.5a/2012_01_04_12_world_gosip_menu.sql
diff --git a/sql/updates/world/2012_01_04_13_world_gossip_menu.sql b/sql/old/3.3.5a/2012_01_04_13_world_gossip_menu.sql
index 5a102db3f08..5a102db3f08 100644
--- a/sql/updates/world/2012_01_04_13_world_gossip_menu.sql
+++ b/sql/old/3.3.5a/2012_01_04_13_world_gossip_menu.sql
diff --git a/sql/updates/world/2012_01_04_14_world_gossip_menu.sql b/sql/old/3.3.5a/2012_01_04_14_world_gossip_menu.sql
index be28d634899..be28d634899 100644
--- a/sql/updates/world/2012_01_04_14_world_gossip_menu.sql
+++ b/sql/old/3.3.5a/2012_01_04_14_world_gossip_menu.sql
diff --git a/sql/updates/world/2012_01_04_15_world_gossip_menu.sql b/sql/old/3.3.5a/2012_01_04_15_world_gossip_menu.sql
index 38d449640f2..38d449640f2 100644
--- a/sql/updates/world/2012_01_04_15_world_gossip_menu.sql
+++ b/sql/old/3.3.5a/2012_01_04_15_world_gossip_menu.sql
diff --git a/sql/updates/world/2012_01_05_00_world_script_texts.sql b/sql/old/3.3.5a/2012_01_05_00_world_script_texts.sql
index 2fcaaf83e49..2fcaaf83e49 100644
--- a/sql/updates/world/2012_01_05_00_world_script_texts.sql
+++ b/sql/old/3.3.5a/2012_01_05_00_world_script_texts.sql
diff --git a/sql/updates/world/2012_01_05_01_world_gameobject.sql b/sql/old/3.3.5a/2012_01_05_01_world_gameobject.sql
index 15b2f5dc408..15b2f5dc408 100644
--- a/sql/updates/world/2012_01_05_01_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_01_05_01_world_gameobject.sql
diff --git a/sql/updates/world/2012_01_05_02_world_gameobject_template.sql b/sql/old/3.3.5a/2012_01_05_02_world_gameobject_template.sql
index 022c82d539d..022c82d539d 100644
--- a/sql/updates/world/2012_01_05_02_world_gameobject_template.sql
+++ b/sql/old/3.3.5a/2012_01_05_02_world_gameobject_template.sql
diff --git a/sql/updates/world/2012_01_05_03_world_creature_model_info.sql b/sql/old/3.3.5a/2012_01_05_03_world_creature_model_info.sql
index 8da923db96b..8da923db96b 100644
--- a/sql/updates/world/2012_01_05_03_world_creature_model_info.sql
+++ b/sql/old/3.3.5a/2012_01_05_03_world_creature_model_info.sql
diff --git a/sql/updates/world/2012_01_05_04_world_gameobject.sql b/sql/old/3.3.5a/2012_01_05_04_world_gameobject.sql
index 4090eb0c123..4090eb0c123 100644
--- a/sql/updates/world/2012_01_05_04_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_01_05_04_world_gameobject.sql
diff --git a/sql/updates/world/2012_01_05_05_world_creature.sql b/sql/old/3.3.5a/2012_01_05_05_world_creature.sql
index b902db64ee6..b902db64ee6 100644
--- a/sql/updates/world/2012_01_05_05_world_creature.sql
+++ b/sql/old/3.3.5a/2012_01_05_05_world_creature.sql
diff --git a/sql/updates/world/2012_01_05_06_world_spell_script_names.sql b/sql/old/3.3.5a/2012_01_05_06_world_spell_script_names.sql
index 1a22c2916bb..1a22c2916bb 100644
--- a/sql/updates/world/2012_01_05_06_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_01_05_06_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_01_05_07_world_creature_template.sql b/sql/old/3.3.5a/2012_01_05_07_world_creature_template.sql
index b3f0c8aeec6..b3f0c8aeec6 100644
--- a/sql/updates/world/2012_01_05_07_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_01_05_07_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_05_08_world_creature_template.sql b/sql/old/3.3.5a/2012_01_05_08_world_creature_template.sql
index e62617c0914..e62617c0914 100644
--- a/sql/updates/world/2012_01_05_08_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_01_05_08_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_05_09_world_waypoint_data.sql b/sql/old/3.3.5a/2012_01_05_09_world_waypoint_data.sql
index 6299472a263..6299472a263 100644
--- a/sql/updates/world/2012_01_05_09_world_waypoint_data.sql
+++ b/sql/old/3.3.5a/2012_01_05_09_world_waypoint_data.sql
diff --git a/sql/updates/world/2012_01_05_10_world_creature_template.sql b/sql/old/3.3.5a/2012_01_05_10_world_creature_template.sql
index a3d8d2432b5..a3d8d2432b5 100644
--- a/sql/updates/world/2012_01_05_10_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_01_05_10_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_05_11_world_creature_onkill_reputation.sql b/sql/old/3.3.5a/2012_01_05_11_world_creature_onkill_reputation.sql
index 047c0453608..047c0453608 100644
--- a/sql/updates/world/2012_01_05_11_world_creature_onkill_reputation.sql
+++ b/sql/old/3.3.5a/2012_01_05_11_world_creature_onkill_reputation.sql
diff --git a/sql/updates/world/2012_01_05_12_world_game_event_seasonal_questrelation.sql b/sql/old/3.3.5a/2012_01_05_12_world_game_event_seasonal_questrelation.sql
index ad6013b0edf..ad6013b0edf 100644
--- a/sql/updates/world/2012_01_05_12_world_game_event_seasonal_questrelation.sql
+++ b/sql/old/3.3.5a/2012_01_05_12_world_game_event_seasonal_questrelation.sql
diff --git a/sql/updates/world/2012_01_05_13_world_creature_transport.sql b/sql/old/3.3.5a/2012_01_05_13_world_creature_transport.sql
index 3acb70a4442..3acb70a4442 100644
--- a/sql/updates/world/2012_01_05_13_world_creature_transport.sql
+++ b/sql/old/3.3.5a/2012_01_05_13_world_creature_transport.sql
diff --git a/sql/updates/world/2012_01_05_14_world_command.sql b/sql/old/3.3.5a/2012_01_05_14_world_command.sql
index d890ab5509c..d890ab5509c 100644
--- a/sql/updates/world/2012_01_05_14_world_command.sql
+++ b/sql/old/3.3.5a/2012_01_05_14_world_command.sql
diff --git a/sql/updates/world/2012_01_05_14_world_creature_template.sql b/sql/old/3.3.5a/2012_01_05_14_world_creature_template.sql
index 331a533812d..331a533812d 100644
--- a/sql/updates/world/2012_01_05_14_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_01_05_14_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_06_00_world_creature_template_addon.sql b/sql/old/3.3.5a/2012_01_06_00_world_creature_template_addon.sql
index 0ebc498ac03..0ebc498ac03 100644
--- a/sql/updates/world/2012_01_06_00_world_creature_template_addon.sql
+++ b/sql/old/3.3.5a/2012_01_06_00_world_creature_template_addon.sql
diff --git a/sql/updates/world/2012_01_06_00_world_misc.sql b/sql/old/3.3.5a/2012_01_06_00_world_misc.sql
index 5cc96ef17a8..5cc96ef17a8 100644
--- a/sql/updates/world/2012_01_06_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_01_06_00_world_misc.sql
diff --git a/sql/updates/world/2012_01_06_01_world_creature_template.sql b/sql/old/3.3.5a/2012_01_06_01_world_creature_template.sql
index c089209c16f..c089209c16f 100644
--- a/sql/updates/world/2012_01_06_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_01_06_01_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_06_02_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_01_06_02_world_achievement_criteria_data.sql
index 9e6dddfb949..9e6dddfb949 100644
--- a/sql/updates/world/2012_01_06_02_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_01_06_02_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2012_01_06_03_world_item_loot_template.sql b/sql/old/3.3.5a/2012_01_06_03_world_item_loot_template.sql
index e1d6cd94525..e1d6cd94525 100644
--- a/sql/updates/world/2012_01_06_03_world_item_loot_template.sql
+++ b/sql/old/3.3.5a/2012_01_06_03_world_item_loot_template.sql
diff --git a/sql/updates/world/2012_01_06_04_world_creature_questrelation.sql b/sql/old/3.3.5a/2012_01_06_04_world_creature_questrelation.sql
index e1dce65f3bc..e1dce65f3bc 100644
--- a/sql/updates/world/2012_01_06_04_world_creature_questrelation.sql
+++ b/sql/old/3.3.5a/2012_01_06_04_world_creature_questrelation.sql
diff --git a/sql/updates/world/2012_01_06_05_world_creature_template.sql b/sql/old/3.3.5a/2012_01_06_05_world_creature_template.sql
index 412fab4dab2..412fab4dab2 100644
--- a/sql/updates/world/2012_01_06_05_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_01_06_05_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_06_06_world_quest_template.sql b/sql/old/3.3.5a/2012_01_06_06_world_quest_template.sql
index 4f58452d980..4f58452d980 100644
--- a/sql/updates/world/2012_01_06_06_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_01_06_06_world_quest_template.sql
diff --git a/sql/updates/world/2012_01_06_07_world_sai.sql b/sql/old/3.3.5a/2012_01_06_07_world_sai.sql
index 5d322367250..5d322367250 100644
--- a/sql/updates/world/2012_01_06_07_world_sai.sql
+++ b/sql/old/3.3.5a/2012_01_06_07_world_sai.sql
diff --git a/sql/updates/world/2012_01_06_08_world_creature_template.sql b/sql/old/3.3.5a/2012_01_06_08_world_creature_template.sql
index d59a5551f14..d59a5551f14 100644
--- a/sql/updates/world/2012_01_06_08_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_01_06_08_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_06_09_world_creature_questrelation.sql b/sql/old/3.3.5a/2012_01_06_09_world_creature_questrelation.sql
index c2af677f047..c2af677f047 100644
--- a/sql/updates/world/2012_01_06_09_world_creature_questrelation.sql
+++ b/sql/old/3.3.5a/2012_01_06_09_world_creature_questrelation.sql
diff --git a/sql/updates/world/2012_01_06_10_world_creature_template.sql b/sql/old/3.3.5a/2012_01_06_10_world_creature_template.sql
index c121fd7424b..c121fd7424b 100644
--- a/sql/updates/world/2012_01_06_10_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_01_06_10_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_06_11_world_sai.sql b/sql/old/3.3.5a/2012_01_06_11_world_sai.sql
index c785030b93e..c785030b93e 100644
--- a/sql/updates/world/2012_01_06_11_world_sai.sql
+++ b/sql/old/3.3.5a/2012_01_06_11_world_sai.sql
diff --git a/sql/updates/world/2012_01_06_12_world_sai.sql b/sql/old/3.3.5a/2012_01_06_12_world_sai.sql
index b9c1319347d..b9c1319347d 100644
--- a/sql/updates/world/2012_01_06_12_world_sai.sql
+++ b/sql/old/3.3.5a/2012_01_06_12_world_sai.sql
diff --git a/sql/updates/world/2012_01_07_00_world_creature_addon.sql b/sql/old/3.3.5a/2012_01_07_00_world_creature_addon.sql
index 83e1efbac80..83e1efbac80 100644
--- a/sql/updates/world/2012_01_07_00_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2012_01_07_00_world_creature_addon.sql
diff --git a/sql/updates/world/2012_01_07_01_world_creature_template.sql b/sql/old/3.3.5a/2012_01_07_01_world_creature_template.sql
index deba1c596f0..deba1c596f0 100644
--- a/sql/updates/world/2012_01_07_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_01_07_01_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_07_02_world_gameobject_template.sql b/sql/old/3.3.5a/2012_01_07_02_world_gameobject_template.sql
index 438a49d969a..438a49d969a 100644
--- a/sql/updates/world/2012_01_07_02_world_gameobject_template.sql
+++ b/sql/old/3.3.5a/2012_01_07_02_world_gameobject_template.sql
diff --git a/sql/updates/world/2012_01_07_03_world_creature_template.sql b/sql/old/3.3.5a/2012_01_07_03_world_creature_template.sql
index fdbdfc5a689..fdbdfc5a689 100644
--- a/sql/updates/world/2012_01_07_03_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_01_07_03_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_07_04_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_01_07_04_world_creature_loot_template.sql
index 6855308ed82..6855308ed82 100644
--- a/sql/updates/world/2012_01_07_04_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_01_07_04_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_01_07_05_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_01_07_05_world_creature_loot_template.sql
index 5ffdb8f6261..5ffdb8f6261 100644
--- a/sql/updates/world/2012_01_07_05_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_01_07_05_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_01_08_00_world_version.sql b/sql/updates/world/2012_01_08_00_world_version.sql
new file mode 100644
index 00000000000..721fea914f1
--- /dev/null
+++ b/sql/updates/world/2012_01_08_00_world_version.sql
@@ -0,0 +1 @@
+UPDATE `version` SET `db_version`='TDB 335.11.45' LIMIT 1;
diff --git a/sql/updates/world/2012_01_08_01_world_sai.sql b/sql/updates/world/2012_01_08_01_world_sai.sql
new file mode 100644
index 00000000000..fcdc21662c0
--- /dev/null
+++ b/sql/updates/world/2012_01_08_01_world_sai.sql
@@ -0,0 +1,24 @@
+-- UPDATE Blood Knight Dawnstar Gossip
+SET @ENTRY    := 17832;
+SET @GOSSIPID := 7486;
+SET @TEXTID   := 9070;
+-- Creature Gossip_menu_id Update from sniff    
+UPDATE `creature_template` SET `gossip_menu_id`=@GOSSIPID WHERE `entry`=@ENTRY; 
+-- Gossip Menu insert from sniff
+DELETE FROM `gossip_menu` WHERE `entry`=@GOSSIPID AND `text_id`=@TEXTID;    
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (@GOSSIPID,@TEXTID);
+-- Creature Gossip_menu_option Update from sniff
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (@GOSSIPID) AND `id` IN (0);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`) VALUES   
+(@GOSSIPID,0,0, 'Take Blood Knight Insignia',1,1,0,0,0,0, '');
+-- Gossip option Conditions
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIPID;    
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES   
+(15,@GOSSIPID,0,0,9,9692,0,0,0,'','Show gossip option if player has quest 9692 but not complete'),  
+(15,@GOSSIPID,0,0,26,24226,1,0,0,'','Show gossip option if player does not have item 24226');
+-- SAI for Blood Knight Dawnstar
+UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@ENTRY AND `source_type`=0);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,@GOSSIPID,0,0,0,56,24226,1,0,0,0,0,7,0,0,0,0,0,0,0,'Blood Knight Dawnstar - On Gossip option select - Create Blood Knight Insignia'),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Blood Knight Dawnstar - On Gossip option select - Close Gossip');
diff --git a/sql/updates/world/2012_01_08_02_world_creature_template.sql b/sql/updates/world/2012_01_08_02_world_creature_template.sql
new file mode 100644
index 00000000000..a544118aa4f
--- /dev/null
+++ b/sql/updates/world/2012_01_08_02_world_creature_template.sql
@@ -0,0 +1,4 @@
+-- Template updates for creature 30081 (Efrem the Faithful)
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=30081; -- Efrem the Faithful
+-- Model data 26827 (creature 30081 (Efrem the Faithful))
+UPDATE `creature_model_info` SET `bounding_radius`=0.3672,`combat_reach`=1.8,`gender`=0 WHERE `modelid`=26827; -- Efrem the Faithful
diff --git a/sql/updates/world/2012_01_08_03_world_gossip_menu.sql b/sql/updates/world/2012_01_08_03_world_gossip_menu.sql
new file mode 100644
index 00000000000..6555d25fbc3
--- /dev/null
+++ b/sql/updates/world/2012_01_08_03_world_gossip_menu.sql
@@ -0,0 +1,51 @@
+-- Creature Gossip_menu_option Update from sniff
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (9301,9512,9615) AND `id`=0;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`) VALUES
+(9301,0,0, 'Come on, Budd. Time to play with the ice trolls!',1,1,0,0,0,0, ''),
+(9512,0,0, 'Unchain and control Flamebringer.',1,1,0,0,0,0, ''),
+(9615,0,0, 'Shake Drakuru''s outstretched hand.',1,1,0,0,0,0, '');
+
+-- Gossip Menu insert from sniff
+DELETE FROM `gossip_menu` WHERE `entry`=9633 AND `text_id`=13034;
+DELETE FROM `gossip_menu` WHERE `entry`=9490 AND `text_id`=12773;
+DELETE FROM `gossip_menu` WHERE `entry`=9622 AND `text_id`=13011;
+DELETE FROM `gossip_menu` WHERE `entry`=9416 AND `text_id`=12659;
+DELETE FROM `gossip_menu` WHERE `entry`=9301 AND `text_id`=12617;
+DELETE FROM `gossip_menu` WHERE `entry`=9615 AND `text_id` IN (12998,12999,13001);
+DELETE FROM `gossip_menu` WHERE `entry`=9604 AND `text_id`=12966;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(9633,13034),
+(9490,12773),
+(9622,13011),
+(9416,12659),
+(9301,12617),
+(9615,12998),
+(9615,12999),
+(9615,13001),
+(9604,12966);
+
+-- Creature Gossip_menu_id Update from sniff
+UPDATE `creature_template` SET `gossip_menu_id`=9633 WHERE `entry`=26868;
+UPDATE `creature_template` SET `gossip_menu_id`=9821 WHERE `entry`=29740;
+UPDATE `creature_template` SET `gossip_menu_id`=9490 WHERE `entry`=27262;
+UPDATE `creature_template` SET `gossip_menu_id`=9622 WHERE `entry`=26519;
+UPDATE `creature_template` SET `gossip_menu_id`=9416 WHERE `entry`=26604;
+UPDATE `creature_template` SET `gossip_menu_id`=9301 WHERE `entry`=26422;
+UPDATE `creature_template` SET `gossip_menu_id`=9615 WHERE `entry`=26423;
+UPDATE `creature_template` SET `gossip_menu_id`=9604 WHERE `entry`=26424;
+
+-- Conditions
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=9615 AND `SourceEntry` IN (12998,12999,13001);
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=9632 AND `SourceEntry`=13033;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=9633 AND `SourceEntry`=13034;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (9301,9512,9615) AND `SourceEntry`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,9615,12998,0,1,50001,0,0,0,'','Drakuru has different gossip if player has aura 50001'),
+(14,9615,12999,0,11,50001,0,0,0,'','Drakuru has gossip only if player has not aura 50001'),
+(14,9615,13001,0,8,11989,0,0,0,'','Drakuru has different gossip if player has quest 11989 rewarded'),
+(14,9632,13033,0,14,12178,0,0,0,'','Hidetrader Jun''ik has gossip only if player has not taken quest 12178'),
+(14,9633,13034,0,14,12436,0,0,0,'','Provisioner Lorkran has gossip only if player has not taken quest 12436'),
+(15,9301,0,0,9,11984,0,0,0,'','Budd - Show gossip option if player has taken quest 11984'),
+(15,9512,0,0,9,12259,0,0,0,'','Flamebringer - Show gossip option if player has taken quest 12259'),
+(15,9512,0,1,9,12255,0,0,0,'','Flamebringer - Show gossip option if player has taken quest 12255'),
+(15,9615,0,0,1,50001,0,0,0,'','Drakuru - Show gossip option if player has aura 50001');
diff --git a/sql/updates/world/2012_01_08_04_world_quest_template.sql b/sql/updates/world/2012_01_08_04_world_quest_template.sql
new file mode 100644
index 00000000000..fdc3c401302
--- /dev/null
+++ b/sql/updates/world/2012_01_08_04_world_quest_template.sql
@@ -0,0 +1,2 @@
+-- Update quest 13093 (sharable/repeatable quest)
+UPDATE `quest_template` SET `PrevQuestId`=13092,`Flags`=`Flags`|8192,`SpecialFlags`=1,`OfferRewardText`='Choose your fate, $N.',`RequestItemsText`='Bring me more vrykul bones and we will influence the fates in your favor.' WHERE `id`=13093;
diff --git a/sql/updates/world/2012_01_08_05_world_conditions.sql b/sql/updates/world/2012_01_08_05_world_conditions.sql
new file mode 100644
index 00000000000..b8e43e7d0e2
--- /dev/null
+++ b/sql/updates/world/2012_01_08_05_world_conditions.sql
@@ -0,0 +1,10 @@
+-- Slaves to Saronite add conditions for Horde version 10
+SET @QUEST_A := 13300;
+SET @QUEST_H := 13302;
+SET @GOSSIP := 10137;
+
+-- Only show gossip if player is on quest Slaves to Saronite
+DELETE FROM `conditions` WHERE `SourceGroup`=@GOSSIP AND `ConditionValue1` IN (@QUEST_A,@QUEST_H);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`COMMENT`) VALUES
+(15,@GOSSIP,0,0,9,@QUEST_A,0,0,0,'',"Only show first gossip if player is on quest Slaves to Saronite Alliance"),
+(15,@GOSSIP,0,0,9,@QUEST_H,0,0,0,'',"Only show first gossip if player is on quest Slaves to Saronite Horde");
\ No newline at end of file
diff --git a/sql/updates/world/2012_01_08_06_world_creature_text.sql b/sql/updates/world/2012_01_08_06_world_creature_text.sql
new file mode 100644
index 00000000000..31331faaa95
--- /dev/null
+++ b/sql/updates/world/2012_01_08_06_world_creature_text.sql
@@ -0,0 +1,9 @@
+-- Remove old script text for boss_balinda.cpp "Not sure if the text actually exist"
+DELETE FROM `script_texts` WHERE `entry` IN (-1810023,-1810024);
+-- Add new creature_text for Captain Balinda Stonehearth <Stormpike Captain>
+DELETE FROM `creature_text` WHERE `entry`=11949;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(11949,0,0, 'Begone, uncouth scum! The Alliance shall prevail in Alterac Valley!',14,0,100,0,0,0, 'Captain Balinda Stonehearth'), -- Aggro
+(11949,1,0, 'Filthy Frostwolf cowards! If you want a fight, you''ll have to come to me!',14,0,100,0,0,0, 'Captain Balinda Stonehearth'), -- Reset
+-- (Alliance players receives Stormpike's Salvation buff (+20% health points for 2 minutes))
+(11949,2,0, 'Take heart, Alliance! Throw these villains from Alterac Valley!',14,0,100,0,0,0, 'Captain Balinda Stonehearth');
diff --git a/sql/updates/world/2012_01_08_07_world_creature_text.sql b/sql/updates/world/2012_01_08_07_world_creature_text.sql
new file mode 100644
index 00000000000..0cb9601a156
--- /dev/null
+++ b/sql/updates/world/2012_01_08_07_world_creature_text.sql
@@ -0,0 +1,8 @@
+-- Remove old script text for boss_galvangar.cpp "Not sure if the text actually exist"
+DELETE FROM `script_texts` WHERE `entry` IN (-1810021,-1810022);
+-- Add new creature_text for Captain Galvangar
+DELETE FROM `creature_text` WHERE `entry`=11947;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(11947,0,0, 'Die! Your kind has no place in Alterac Valley!',14,0,100,0,0,0, 'Captain Galvangar'), -- Aggro
+(11947,1,0, 'I''ll never fall for that, fool! If you want a battle it will be on my terms and in my lair!',14,0,100,0,0,0, 'Captain Galvangar'), -- Reset
+(11947,2,0, 'Now is the time to attack! For the Horde!',14,0,100,0,0,0, 'Captain Galvangar'); -- Casting Fury of the Frostwolf
diff --git a/sql/updates/world/2012_01_08_08_world_creature_text.sql b/sql/updates/world/2012_01_08_08_world_creature_text.sql
new file mode 100644
index 00000000000..7c4a1f9ba7d
--- /dev/null
+++ b/sql/updates/world/2012_01_08_08_world_creature_text.sql
@@ -0,0 +1,17 @@
+-- Remove old script text for boss_drekthar.cpp "Not sure if the text actually exist"
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1810007 AND -1810000;
+-- Add new creature_text for Drek'Thar
+DELETE FROM `creature_text` WHERE `entry`=11946;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+-- Aggro
+(11946,0,0, 'Stormpike filth! In my keep?! Slay them all!',14,0,100,0,0,0, 'Drek''Thar'),
+-- Reset
+(11946,1,0, 'You seek to draw the General of the Frostwolf legion out from his fortress? PREPOSTEROUS!',14,0,100,0,0,0, 'Drek''Thar'),
+-- Raid wipe
+(11946,2,0, 'Stormpike weaklings, face me in my fortress - if you dare!',14,0,100,0,0,0, 'Drek''Thar'),
+-- Combat
+(11946,3,0, 'Your attacks are slowed by the cold, I think!',14,0,100,0,0,0, 'Drek''Thar'),
+(11946,3,1, 'Today, you will meet your ancestors!',14,0,100,0,0,0, 'Drek''Thar'),
+(11946,3,2, 'If you will not leave Alterac Valley on your own, then the Frostwolves will force you out!',14,0,100,0,0,0, 'Drek''Thar'),
+(11946,3,3, 'You cannot defeat the Frostwolf clan!',14,0,100,0,0,0, 'Drek''Thar'),
+(11946,3,4, 'You are no match for the strength of the Horde!',14,0,100,0,0,0, 'Drek''Thar');
diff --git a/sql/updates/world/2012_01_08_09_world_creature_text.sql b/sql/updates/world/2012_01_08_09_world_creature_text.sql
new file mode 100644
index 00000000000..0cb4f4df29e
--- /dev/null
+++ b/sql/updates/world/2012_01_08_09_world_creature_text.sql
@@ -0,0 +1,20 @@
+-- Remove old script text for boss_vanndar.cpp "Not sure if the text actually exist"
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1810018 AND -181008;
+-- Add new creature_text for Vanndar Stormpike
+DELETE FROM `creature_text` WHERE `entry`=11948;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+-- Aggro
+(11948,0,0, 'Soldiers of Stormpike, your General is under attack! I require aid! Come! Come! Slay these mangy Frostwolf dogs.',14,0,100,0,0,0, 'Vanndar Stormpike'),
+-- Reset
+(11948,1,0, 'You''ll never get me out of me bunker, heathens!',14,0,100,0,0,0, 'Vanndar Stormpike'),
+(11948,1,1, 'Why don''t ya try again without yer cheap tactics, pansies! Or are you too chicken?',14,0,100,0,0,0, 'Vanndar Stormpike'),
+-- Combat
+(11948,2,0, 'I will tell you this much...Alterac Valley will be ours.',14,0,100,0,0,0, 'Vanndar Stormpike'),
+(11948,2,1, 'Your attacks are weak! Go practice on some rabbits and come back when you''re stronger.',14,0,100,0,0,0, 'Vanndar Stormpike'),
+(11948,2,2, 'We will not be swayed from our mission!',14,0,100,0,0,0, 'Vanndar Stormpike'),
+(11948,2,3, 'It''ll take more than you rabble to bring me down!',14,0,100,0,0,0, 'Vanndar Stormpike'),
+(11948,2,4, 'We, the Alliance, will prevail!',14,0,100,0,0,0, 'Vanndar Stormpike'),
+(11948,2,5, 'The Stormpike clan bows to no one, especially the horde!',14,0,100,0,0,0, 'Vanndar Stormpike'),
+(11948,2,6, 'Is that the best you can do?',14,0,100,0,0,0, 'Vanndar Stormpike'),
+-- Said with a spell cast (Alliance players receive 10/20/30% damage/size increases, gained by turning in [Polished Armor Scraps]
+(11948,3,0, 'Take no prisoners! Drive these heathens from our lands!',14,0,100,0,0,0, 'Vanndar Stormpike');
diff --git a/sql/updates/world/2012_01_08_11_world_creature_text.sql b/sql/updates/world/2012_01_08_11_world_creature_text.sql
new file mode 100644
index 00000000000..ae4e544b3f7
--- /dev/null
+++ b/sql/updates/world/2012_01_08_11_world_creature_text.sql
@@ -0,0 +1,9 @@
+-- Remove old script text for eversong_woods.cpp
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000640 AND -1000637;
+-- Master Kelerun Bloodmourn <Blood Knight> say text
+DELETE FROM `creature_text` WHERE `entry`=17807;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(17807,0,0, 'Let the trial begin, Bloodwrath, attack!',14,0,100,0,0,0, 'Master Kelerun Bloodmourn'),
+(17807,1,0, 'Champion Lightrend, make me proud!',14,0,100,0,0,0, 'Master Kelerun Bloodmourn'),
+(17807,2,0, 'Show this upstart how a real Blood Knight fights, Swiftblade!',14,0,100,0,0,0, 'Master Kelerun Bloodmourn'),
+(17807,3,0, 'Show $N the meaning of pain, Sunstriker!',14,0,100,0,0,0, 'Master Kelerun Bloodmourn');
diff --git a/sql/updates/world/2012_01_08_12_world_creature_text.sql b/sql/updates/world/2012_01_08_12_world_creature_text.sql
new file mode 100644
index 00000000000..13b452e7b6a
--- /dev/null
+++ b/sql/updates/world/2012_01_08_12_world_creature_text.sql
@@ -0,0 +1,6 @@
+-- Twilight Corrupter say text
+DELETE FROM `creature_text` WHERE `entry`=15625;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(15625,0,0, 'Come, $N. See what the Nightmare brings...',14,0,100,0,0,0, 'Twilight Corrupter'),
+(15625,1,0, 'The Nightmare cannot be stopped!',14,0,100,0,0,0, 'Twilight Corrupter'),
+(15625,2,0, 'Twilight Corrupter squeezes the last bit of life out of $N and swallows their soul.',16,0,100,0,0,0, 'Twilight Corrupter');
diff --git a/sql/updates/world/2012_01_08_13_world_creature_text.sql b/sql/updates/world/2012_01_08_13_world_creature_text.sql
new file mode 100644
index 00000000000..83e9f70f049
--- /dev/null
+++ b/sql/updates/world/2012_01_08_13_world_creature_text.sql
@@ -0,0 +1,7 @@
+-- NPC talk text insert from sniff "Orgrimmar Zeppelin Masters"
+DELETE FROM `creature_text` WHERE `entry` IN (12136,26537,9564,34765) AND `groupid`=0;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(12136,0,0, 'The zeppelin to Grom''gol has just arrived! All aboard for Stranglethorn!',14,0,100,0,0,0, 'Snurk Bucksquick'),
+(26537,0,0, 'The zeppelin to Warsong Hold has just arrived! All aboard for Borean Tundra!',14,0,100,0,0,0, 'Greeb Ramrocket'),
+(9564,0,0, 'The zeppelin to Undercity has just arrived! All aboard for Tirisfal Glades!',14,0,100,0,0,0, 'Frezza'),
+(34765,0,0, 'The zeppelin to Thunder Bluff has arrived! All aboard for a smooth ride across the Barrens!',14,0,100,0,0,0, 'Zelli Hotnozzle');
diff --git a/sql/updates/world/2012_01_08_14_world_creature_text.sql b/sql/updates/world/2012_01_08_14_world_creature_text.sql
new file mode 100644
index 00000000000..d62ac5fdd20
--- /dev/null
+++ b/sql/updates/world/2012_01_08_14_world_creature_text.sql
@@ -0,0 +1,15 @@
+-- Remove old script text for arathi_highlands.cpp
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000273 AND -1000264;
+-- Add new creature_text for Professor Phizzlethorpe <Blackwater Raiders>
+DELETE FROM `creature_text` WHERE `entry`=2768;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(2768,0,0, 'Ok, $N. Follow me to the cave where I''ll attempt to harness the power of the rune stone into these goggles.',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_PROGRESS_1'),
+(2768,1,0, 'I discovered this cave on our first day here. I believe the energy in the stone can be used to our advantage.',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_PROGRESS_2'),
+(2768,2,0, 'I''ll begin drawing energy from the stone. Your job, $N, is to defend me. This place is cursed... trust me.',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_PROGRESS_3'),
+(2768,3,0, '%s begins tinkering with the goggles before the stone.',16,0,100,0,0,0, 'Professor Phizzlethorpe - EMOTE_PROGRESS_4'),
+(2768,4,0, 'Help!!! Get these things off me so I can get my work done!',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_AGGRO'),
+(2768,5,0, 'Almost done! Just a little longer!',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_PROGRESS_5'),
+(2768,6,0, 'I''ve done it! I have harnessed the power of the stone into the goggles! Let''s get out of here!',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_PROGRESS_6'),
+(2768,7,0, 'Phew! Glad to be back from that creepy cave.',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_PROGRESS_7'),
+(2768,8,0, '%s hands one glowing goggles over to Doctor Draxlegauge.',16,0,100,0,0,0, 'Professor Phizzlethorpe - EMOTE_PROGRESS_8'),
+(2768,9,0, 'Doctor Draxlegauge will give you further instructions, $N. Many thanks for your help!',12,0,100,0,0,0, 'Professor Phizzlethorpe - SAY_PROGRESS_9');
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c372d12418b..7c2ebe9906c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 561ee50f439..2b6c553e10b 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
diff --git a/src/server/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h
index 0b91b6e8ddb..501959d67f9 100644
--- a/src/server/game/AI/CoreAI/GameObjectAI.h
+++ b/src/server/game/AI/CoreAI/GameObjectAI.h
@@ -50,6 +50,7 @@ class GameObjectAI
         virtual void Destroyed(Player* /*player*/, uint32 /*eventId*/) {}
         virtual void SetData(uint32 /*id*/, uint32 /*value*/) {}
         virtual void OnGameEvent(bool /*start*/, uint16 /*eventId*/) {}
+        virtual void OnStateChanged(uint32 state) { }
 };
 
 class NullGameObjectAI : public GameObjectAI
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index 09d70204a7b..1a26e241c5e 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -937,6 +937,11 @@ void SmartGameObjectAI::OnGameEvent(bool start, uint16 eventId)
     GetScript()->ProcessEventsFor(start ? SMART_EVENT_GAME_EVENT_START : SMART_EVENT_GAME_EVENT_END, NULL, eventId);
 }
 
+void SmartGameObjectAI::OnStateChanged(uint32 state)
+{
+    GetScript()->ProcessEventsFor(SMART_EVENT_GO_STATE_CHANGED, NULL, state);
+}
+
 class SmartTrigger : public AreaTriggerScript
 {
     public:
diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h
index b33bfebf912..297ac88fbb0 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.h
+++ b/src/server/game/AI/SmartScripts/SmartAI.h
@@ -253,6 +253,7 @@ public:
     void SetData(uint32 id, uint32 value);
     void SetScript9(SmartScriptHolder& e, uint32 entry, Unit* invoker);
     void OnGameEvent(bool start, uint16 eventId);
+    void OnStateChanged(uint32 state);
 
 protected:
     GameObject* const go;
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp
index d0c62f8092d..9cea61c0d2b 100644
--- a/src/server/game/AI/SmartScripts/SmartScript.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScript.cpp
@@ -1780,6 +1780,20 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
             // TODO: Resume path when reached jump location
             break;
         }
+        case SMART_ACTION_GO_SET_LOOT_STATE:
+        {
+            ObjectList* targets = GetTargets(e, unit);
+            
+            if (!targets)
+                return;
+                
+            for (ObjectList::const_iterator itr = targets->begin(); itr != targets->end(); ++itr)
+                if (IsGameObject(*itr))
+                    (*itr)->ToGameObject()->SetLootState((LootState)e.action.setGoLootState.state);
+
+            delete targets;
+            break;
+        }
         case SMART_ACTION_SEND_GOSSIP_MENU:
         {
             if (!GetBaseObject())
@@ -2602,6 +2616,13 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui
             ProcessAction(e, NULL, var0);
             break;
         }
+        case SMART_EVENT_GO_STATE_CHANGED:
+        {
+            if (e.event.goStateChanged.state != var0)
+                return;
+            ProcessAction(e, unit, var0, var1);
+            break;
+        }
         default:
             sLog->outErrorDb("SmartScript::ProcessEvent: Unhandled Event type %u", e.GetEventType());
             break;
diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
index 63595b2439f..15423c7aff2 100644
--- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
@@ -478,6 +478,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e)
                         return false;
                     break;
                 }
+            case SMART_EVENT_GO_STATE_CHANGED:
             case SMART_EVENT_TIMED_EVENT_TRIGGERED:
             case SMART_EVENT_INSTANCE_PLAYER_ENTER:
             case SMART_EVENT_TRANSPORT_RELOCATE:
diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h
index 7cf290affe3..6b99a7dc5be 100644
--- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h
+++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h
@@ -154,8 +154,9 @@ enum SMART_EVENT
     SMART_EVENT_IS_BEHIND_TARGET         = 67,      //1             // cooldownMin, CooldownMax
     SMART_EVENT_GAME_EVENT_START         = 68,      //1             // game_event.Entry
     SMART_EVENT_GAME_EVENT_END           = 69,      //1             // game_event.Entry
+    SMART_EVENT_GO_STATE_CHANGED         = 70,      //                 go state    
 
-    SMART_EVENT_END                      = 70,
+    SMART_EVENT_END                      = 71,
 };
 
 struct SmartEvent
@@ -347,6 +348,11 @@ struct SmartEvent
         
         struct
         {
+            uint32 state;
+        } goStateChanged;
+        
+        struct
+        {
             uint32 param1;
             uint32 param2;
             uint32 param3;
@@ -466,8 +472,9 @@ enum SMART_ACTION
     SMART_ACTION_REMOVE_DYNAMIC_FLAG                = 96,     // Flags
     SMART_ACTION_JUMP_TO_POS                        = 97,     // speedXY, speedZ, targetX, targetY, targetZ
     SMART_ACTION_SEND_GOSSIP_MENU                   = 98,     // menuId, optionId
+    SMART_ACTION_GO_SET_LOOT_STATE                  = 99,     // state
 
-    SMART_ACTION_END                                = 99,
+    SMART_ACTION_END                                = 100,
 };
 
 struct SmartAction
@@ -873,6 +880,11 @@ struct SmartAction
 
         struct
         {
+            uint32 state;
+        } setGoLootState;
+        
+        struct
+        {
             uint32 param1;
             uint32 param2;
             uint32 param3;
@@ -1137,6 +1149,7 @@ const uint32 SmartAIEventMask[SMART_EVENT_END][2] =
     {SMART_EVENT_IS_BEHIND_TARGET,          SMART_SCRIPT_TYPE_MASK_CREATURE },
     {SMART_EVENT_GAME_EVENT_START,          SMART_SCRIPT_TYPE_MASK_CREATURE + SMART_SCRIPT_TYPE_MASK_GAMEOBJECT },
     {SMART_EVENT_GAME_EVENT_END,            SMART_SCRIPT_TYPE_MASK_CREATURE + SMART_SCRIPT_TYPE_MASK_GAMEOBJECT },
+    {SMART_EVENT_GO_STATE_CHANGED,          SMART_SCRIPT_TYPE_MASK_GAMEOBJECT },
 
 };
 
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index decbc49d3fe..22f001d0224 100755
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -1864,3 +1864,9 @@ void GameObject::SetDestructibleState(GameObjectDestructibleState state, Player*
         }
     }
 }
+
+void GameObject::SetLootState(LootState s)
+{
+    m_lootState = s;
+    AI()->OnStateChanged(s);
+}
\ No newline at end of file
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index 910b9129e45..9298c5affee 100755
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -713,7 +713,7 @@ class GameObject : public WorldObject, public GridObject<GameObject>
         void Use(Unit* user);
 
         LootState getLootState() const { return m_lootState; }
-        void SetLootState(LootState s) { m_lootState = s; }
+        void SetLootState(LootState s);
 
         uint16 GetLootMode() { return m_LootMode; }
         bool HasLootMode(uint16 lootMode) { return m_LootMode & lootMode; }
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 6854a68ac1d..e9a1ac0e64f 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -16657,6 +16657,7 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder)
     _LoadInstanceTimeRestrictions(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADINSTANCELOCKTIMES));
     _LoadBGData(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOADBGDATA));
 
+    GetSession()->SetPlayer(this);
     MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
     if (!mapEntry || !IsPositionValid())
     {
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index 7e4bebaab95..b3531d585c3 100755
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -359,6 +359,7 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId)
     {
         if (!_me->SetCharmedBy(unit, CHARM_TYPE_VEHICLE))
             ASSERT(false);
+        unit->ToPlayer()->SetMover(this->GetBase());
     }
 
     if (_me->IsInWorld())
@@ -410,7 +411,10 @@ void Vehicle::RemovePassenger(Unit* unit)
     unit->ClearUnitState(UNIT_STAT_ONVEHICLE);
 
     if (_me->GetTypeId() == TYPEID_UNIT && unit->GetTypeId() == TYPEID_PLAYER && seat->first == 0 && seat->second.SeatInfo->m_flags & VEHICLE_SEAT_FLAG_CAN_CONTROL)
+    {
         _me->RemoveCharmedBy(unit);
+        unit->ToPlayer()->SetMover(unit->ToPlayer());
+    }
 
     if (_me->IsInWorld())
     {
diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
index fd649175f76..35276bb1d0a 100644
--- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
@@ -776,6 +776,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
     // "GetAccountId() == db stored account id" checked in LoadFromDB (prevent login not own character using cheating tools)
     if (!pCurrChar->LoadFromDB(GUID_LOPART(playerGuid), holder))
     {
+        SetPlayer(NULL);
         KickPlayer();                                       // disconnect client, player no set to session and it will not deleted or saved at kick
         delete pCurrChar;                                   // delete it manually
         delete holder;                                      // delete all unprocessed queries
@@ -784,9 +785,6 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
     }
 
     pCurrChar->GetMotionMaster()->Initialize();
-
-    SetPlayer(pCurrChar);
-
     pCurrChar->SendDungeonDifficulty(false);
 
     WorldPacket data(SMSG_LOGIN_VERIFY_WORLD, 20);
diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
index 0c54a37c362..7d1233c8f70 100755
--- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
@@ -473,10 +473,7 @@ void WorldSession::HandleSetActiveMoverOpcode(WorldPacket &recv_data)
     if (GetPlayer()->IsInWorld())
     {
         if (_player->m_mover->GetGUID() != guid)
-        {
             sLog->outError("HandleSetActiveMoverOpcode: incorrect mover guid: mover is " UI64FMTD " (%s - Entry: %u) and should be " UI64FMTD, guid, GetLogNameForGuid(guid), GUID_ENPART(guid), _player->m_mover->GetGUID());
-            GetPlayer()->SetMover(GetPlayer());
-        }
     }
 }
 
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 58a37e75b2c..1d3c657f50a 100755
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -3104,6 +3104,8 @@ void AuraEffect::HandleModPossess(AuraApplication const* aurApp, uint8 mode, boo
     {
         target->RemoveCharmedBy(caster);
         caster->ToPlayer()->SetMover(caster);
+        if (target->GetTypeId() == TYPEID_PLAYER)
+            target->ToPlayer()->SetMover(target);
     }
 }
 
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index f76dbd7be47..d864ce2d606 100755
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -3829,6 +3829,9 @@ void Spell::SendSpellGo()
         castFlags |= CAST_FLAG_UNKNOWN_19;                   // same as in SMSG_SPELL_START
     }
 
+    if (m_targets.HasTraj())
+        castFlags |= CAST_FLAG_ADJUST_MISSILE;
+
     WorldPacket data(SMSG_SPELL_GO, 50);                    // guess size
 
     if (m_CastItem)
@@ -3871,11 +3874,10 @@ void Spell::SendSpellGo()
             }
         }
     }
-
-    if (castFlags & CAST_FLAG_UNKNOWN_18)
+    if (castFlags & CAST_FLAG_ADJUST_MISSILE)
     {
-        data << float(0);
-        data << uint32(0);
+        data << m_targets.GetElevation();
+        data << uint32(m_targets.GetSpeedXY()*m_targets.GetSpeedZ()*2);
     }
 
     if (castFlags & CAST_FLAG_AMMO)
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index 6b7c73ad32b..2bbc04d6a3b 100755
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -55,7 +55,7 @@ enum SpellCastFlags
     CAST_FLAG_UNKNOWN_15         = 0x00004000,
     CAST_FLAG_UNKNOWN_16         = 0x00008000,
     CAST_FLAG_UNKNOWN_17         = 0x00010000,
-    CAST_FLAG_UNKNOWN_18         = 0x00020000,
+    CAST_FLAG_ADJUST_MISSILE     = 0x00020000,
     CAST_FLAG_UNKNOWN_19         = 0x00040000,
     CAST_FLAG_UNKNOWN_20         = 0x00080000,
     CAST_FLAG_UNKNOWN_21         = 0x00100000,
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
index d3083146967..1292cdaee17 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
@@ -27,8 +27,9 @@ enum Spells
 
 enum Yells
 {
-    YELL_AGGRO                                    = -1810023,
-    YELL_EVADE                                    = -1810024
+    YELL_AGGRO                                   = 0,
+    YELL_EVADE                                   = 1,
+    YELL_SALVATION                               = 2,
 };
 
 enum Creatures
@@ -122,7 +123,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(YELL_AGGRO, me);
+            Talk(YELL_AGGRO);
         }
 
         void JustRespawned()
@@ -185,7 +186,7 @@ public:
                 if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
                 {
                     EnterEvadeMode();
-                    DoScriptText(YELL_EVADE, me);
+                    Talk(YELL_EVADE);
                 }
                 resetTimer = 5 * IN_MILLISECONDS;
             } else resetTimer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
index 959ed88be1c..8b2a95be977 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
@@ -31,14 +31,10 @@ enum Spells
 
 enum Yells
 {
-    YELL_AGGRO                                    = -1810000,
-    YELL_EVADE                                    = -1810001,
-    YELL_RESPAWN                                  = -1810002,
-    YELL_RANDOM1                                  = -1810003,
-    YELL_RANDOM2                                  = -1810004,
-    YELL_RANDOM3                                  = -1810005,
-    YELL_RANDOM4                                  = -1810006,
-    YELL_RANDOM5                                  = -1810007
+    YELL_AGGRO                                    = 0,
+    YELL_EVADE                                    = 1,
+    YELL_RESPAWN                                  = 2,
+    YELL_RANDOM                                   = 3
 };
 
 class boss_drekthar : public CreatureScript
@@ -69,13 +65,13 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(YELL_AGGRO, me);
+            Talk(YELL_AGGRO);
         }
 
         void JustRespawned()
         {
             Reset();
-            DoScriptText(YELL_RESPAWN, me);
+            Talk(YELL_RESPAWN);
         }
 
         void UpdateAI(const uint32 diff)
@@ -109,7 +105,7 @@ public:
 
             if (YellTimer <= diff)
             {
-                DoScriptText(RAND(YELL_RANDOM1, YELL_RANDOM2, YELL_RANDOM3, YELL_RANDOM4, YELL_RANDOM5), me);
+                Talk(YELL_RANDOM);
                 YellTimer = urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS); //20 to 30 seconds
             } else YellTimer -= diff;
 
@@ -119,7 +115,7 @@ public:
                 if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
                 {
                     EnterEvadeMode();
-                    DoScriptText(YELL_EVADE, me);
+                    Talk(YELL_EVADE);
                 }
                 ResetTimer = 5 * IN_MILLISECONDS;
             } else ResetTimer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
index 95c16612aef..da53cffc99d 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
@@ -28,8 +28,8 @@ enum Spells
 
 enum Yells
 {
-    YELL_AGGRO                                    = -1810021,
-    YELL_EVADE                                    = -1810022
+    YELL_AGGRO                                    = 0,
+    YELL_EVADE                                    = 1
 };
 
 class boss_galvangar : public CreatureScript
@@ -60,7 +60,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(YELL_AGGRO, me);
+            Talk(YELL_AGGRO);
         }
 
         void JustRespawned()
@@ -109,7 +109,7 @@ public:
                 if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
                 {
                     EnterEvadeMode();
-                    DoScriptText(YELL_EVADE, me);
+                    Talk(YELL_EVADE);
                 }
                 ResetTimer = 5 * IN_MILLISECONDS;
             } else ResetTimer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
index 94b5bc9a56c..54fcb9d99c2 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
@@ -19,17 +19,12 @@
 
 enum Yells
 {
-    YELL_AGGRO                                    = -1810008,
-    YELL_EVADE                                    = -1810009,
-    YELL_RESPAWN1                                 = -1810010,
-    YELL_RESPAWN2                                 = -1810011,
-    YELL_RANDOM1                                  = -1810012,
-    YELL_RANDOM2                                  = -1810013,
-    YELL_RANDOM3                                  = -1810014,
-    YELL_RANDOM4                                  = -1810015,
-    YELL_RANDOM5                                  = -1810016,
-    YELL_RANDOM6                                  = -1810017,
-    YELL_RANDOM7                                  = -1810018
+    YELL_AGGRO                                    = 0,
+    YELL_EVADE                                    = 1,
+    YELL_RESPAWN1                                 = -1810010, // no creature_text
+    YELL_RESPAWN2                                 = -1810011, // no creature_text
+    YELL_RANDOM                                   = 2,
+	YELL_SPELL                                    = 3,
 };
 
 enum Spells
@@ -65,7 +60,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(YELL_AGGRO, me);
+            Talk(YELL_AGGRO);
         }
 
         void JustRespawned()
@@ -99,7 +94,7 @@ public:
 
             if (YellTimer <= diff)
             {
-                DoScriptText(RAND(YELL_RANDOM1, YELL_RANDOM2, YELL_RANDOM3, YELL_RANDOM4, YELL_RANDOM5, YELL_RANDOM6, YELL_RANDOM7), me);
+                Talk(YELL_RANDOM);
                 YellTimer = urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS); //20 to 30 seconds
             } else YellTimer -= diff;
 
@@ -109,7 +104,7 @@ public:
                 if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
                 {
                     EnterEvadeMode();
-                    DoScriptText(YELL_EVADE, me);
+                    Talk(YELL_EVADE);
                 }
                 ResetTimer = 5 * IN_MILLISECONDS;
             } else ResetTimer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
index 8b6cbf26de2..e2a9717882b 100644
--- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
+++ b/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
@@ -36,16 +36,16 @@ EndContentData */
 
 enum eEnums
 {
-    SAY_PROGRESS_1      = -1000264,
-    SAY_PROGRESS_2      = -1000265,
-    SAY_PROGRESS_3      = -1000266,
-    EMOTE_PROGRESS_4    = -1000267,
-    SAY_AGGRO           = -1000268,
-    SAY_PROGRESS_5      = -1000269,
-    SAY_PROGRESS_6      = -1000270,
-    SAY_PROGRESS_7      = -1000271,
-    EMOTE_PROGRESS_8    = -1000272,
-    SAY_PROGRESS_9      = -1000273,
+    SAY_PROGRESS_1      = 0,
+    SAY_PROGRESS_2      = 1,
+    SAY_PROGRESS_3      = 2,
+    EMOTE_PROGRESS_4    = 3,
+    SAY_AGGRO           = 4,
+    SAY_PROGRESS_5      = 5,
+    SAY_PROGRESS_6      = 6,
+    SAY_PROGRESS_7      = 7,
+    EMOTE_PROGRESS_8    = 8,
+    SAY_PROGRESS_9      = 9,
 
     QUEST_SUNKEN_TREASURE   = 665,
     MOB_VENGEFUL_SURGE      = 2776
@@ -73,24 +73,24 @@ class npc_professor_phizzlethorpe : public CreatureScript
 
                 switch (uiPointId)
                 {
-                case 4:DoScriptText(SAY_PROGRESS_2, me, player);break;
-                case 5:DoScriptText(SAY_PROGRESS_3, me, player);break;
-                case 8:DoScriptText(EMOTE_PROGRESS_4, me);break;
+				case 4:Talk(SAY_PROGRESS_2, player->GetGUID());break;
+                case 5:Talk(SAY_PROGRESS_3, player->GetGUID());break;
+                case 8:Talk(EMOTE_PROGRESS_4);break;
                 case 9:
                     {
                     me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
                     me->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96f, -2142.49f, 20.15f, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
                     break;
                     }
-                case 10:DoScriptText(SAY_PROGRESS_5, me, player);break;
+                case 10:Talk(SAY_PROGRESS_5, player->GetGUID());break;
                 case 11:
-                    DoScriptText(SAY_PROGRESS_6, me, player);
+                    Talk(SAY_PROGRESS_6, player->GetGUID());
                     SetRun();
                     break;
-                case 19:DoScriptText(SAY_PROGRESS_7, me, player); break;
+                case 19:Talk(SAY_PROGRESS_7, player->GetGUID()); break;
                 case 20:
-                    DoScriptText(EMOTE_PROGRESS_8, me);
-                    DoScriptText(SAY_PROGRESS_9, me, player);
+                    Talk(EMOTE_PROGRESS_8);
+                    Talk(SAY_PROGRESS_9, player->GetGUID());
                     if (player)
                         CAST_PLR(player)->GroupEventHappens(QUEST_SUNKEN_TREASURE, me);
                     break;
@@ -104,7 +104,7 @@ class npc_professor_phizzlethorpe : public CreatureScript
 
             void EnterCombat(Unit* /*who*/)
             {
-                DoScriptText(SAY_AGGRO, me);
+                Talk(SAY_AGGRO);
             }
 
             void UpdateAI(const uint32 diff)
@@ -122,7 +122,7 @@ class npc_professor_phizzlethorpe : public CreatureScript
         {
             if (quest->GetQuestId() == QUEST_SUNKEN_TREASURE)
             {
-                DoScriptText(SAY_PROGRESS_1, creature, player);
+                creature->AI()->Talk(SAY_PROGRESS_1, player->GetGUID());
                 if (npc_escortAI* pEscortAI = CAST_AI(npc_professor_phizzlethorpeAI, (creature->AI())))
                     pEscortAI->Start(false, false, player->GetGUID(), quest);
 
diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/duskwood.cpp
index 872137ee937..5d04489bbca 100644
--- a/src/server/scripts/EasternKingdoms/duskwood.cpp
+++ b/src/server/scripts/EasternKingdoms/duskwood.cpp
@@ -25,6 +25,14 @@ EndScriptData */
 
 #include "ScriptPCH.h"
 
+enum Yells
+{
+    YELL_TWILIGHTCORRUPTOR_RESPAWN                                  = 0,
+    YELL_TWILIGHTCORRUPTOR_AGGRO                                    = 1,
+    YELL_TWILIGHTCORRUPTOR_KILL                                     = 2,
+};
+
+
 /*######
 # at_twilight_grove
 ######*/
@@ -43,11 +51,11 @@ public:
                 TCorrupter->setFaction(14);
                 TCorrupter->SetMaxHealth(832750);
             }
-            if (Unit* CorrupterSpeaker = player->SummonCreature(1, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()-1, 0, TEMPSUMMON_TIMED_DESPAWN, 15000))
+            if (Creature* CorrupterSpeaker = player->SummonCreature(1, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()-1, 0, TEMPSUMMON_TIMED_DESPAWN, 15000))
             {
                 CorrupterSpeaker->SetName("Twilight Corrupter");
                 CorrupterSpeaker->SetVisible(true);
-                CorrupterSpeaker->MonsterYell("Come, $N. See what the Nightmare brings...", 0, player->GetGUID());
+                CorrupterSpeaker->AI()->Talk(YELL_TWILIGHTCORRUPTOR_RESPAWN, player->GetGUID());
             }
         }
         return false;
@@ -89,7 +97,7 @@ public:
         }
         void EnterCombat(Unit* /*who*/)
         {
-            me->MonsterYell("The Nightmare cannot be stopped!", 0, me->GetGUID());
+            Talk(YELL_TWILIGHTCORRUPTOR_AGGRO);
         }
 
         void KilledUnit(Unit* victim)
@@ -97,7 +105,7 @@ public:
             if (victim->GetTypeId() == TYPEID_PLAYER)
             {
                 ++KillCount;
-                me->MonsterTextEmote("Twilight Corrupter squeezes the last bit of life out of $N and swallows their soul.", victim->GetGUID(), true);
+                Talk(YELL_TWILIGHTCORRUPTOR_KILL, victim->GetGUID());
 
                 if (KillCount == 3)
                 {
diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp
index 7c09a740d26..4797774ef49 100644
--- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp
+++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp
@@ -69,10 +69,10 @@ enum eFaction
 
 enum eSays
 {
-    TEXT_SECOND_TRIAL_1               = -1000637,
-    TEXT_SECOND_TRIAL_2               = -1000638,
-    TEXT_SECOND_TRIAL_3               = -1000639,
-    TEXT_SECOND_TRIAL_4               = -1000640,
+    TEXT_SECOND_TRIAL_1               = 0,
+    TEXT_SECOND_TRIAL_2               = 1,
+    TEXT_SECOND_TRIAL_3               = 2,
+    TEXT_SECOND_TRIAL_4               = 3,
 };
 
 struct Locations
@@ -335,16 +335,16 @@ public:
                         switch (paladinPhase)
                         {
                         case 0:
-                            DoScriptText(TEXT_SECOND_TRIAL_1, me);
+                            Talk(TEXT_SECOND_TRIAL_1);
                             break;
                         case 1:
-                            DoScriptText(TEXT_SECOND_TRIAL_2, me);
+                            Talk(TEXT_SECOND_TRIAL_2);
                             break;
                         case 2:
-                            DoScriptText(TEXT_SECOND_TRIAL_3, me);
+                            Talk(TEXT_SECOND_TRIAL_3);
                             break;
                         case 3:
-                            DoScriptText(TEXT_SECOND_TRIAL_4, me);
+                            Talk(TEXT_SECOND_TRIAL_4);
                             break;
                         }
                     }
diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/ghostlands.cpp
index a5a8bd45cfd..412613572f1 100644
--- a/src/server/scripts/EasternKingdoms/ghostlands.cpp
+++ b/src/server/scripts/EasternKingdoms/ghostlands.cpp
@@ -34,45 +34,6 @@ EndContentData */
 #include "ScriptedEscortAI.h"
 
 /*######
-## npc_blood_knight_dawnstar
-######*/
-
-#define GOSSIP_H_BKD "Take Blood Knight Insignia"
-
-class npc_blood_knight_dawnstar : public CreatureScript
-{
-public:
-    npc_blood_knight_dawnstar() : CreatureScript("npc_blood_knight_dawnstar") { }
-
-    bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*uiSender*/, uint32 uiAction)
-    {
-        player->PlayerTalkClass->ClearMenus();
-        if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
-        {
-            ItemPosCountVec dest;
-            uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 24226, 1, NULL);
-            if (msg == EQUIP_ERR_OK)
-            {
-                player->StoreNewItem(dest, 24226, 1, true);
-                player->PlayerTalkClass->ClearMenus();
-            }
-        }
-        return true;
-    }
-
-    bool OnGossipHello(Player* player, Creature* creature)
-    {
-        if (player->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(24226, 1, true))
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_BKD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-
-        player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
-
-        return true;
-    }
-
-};
-
-/*######
 ## npc_budd_nedreck
 ######*/
 
@@ -255,7 +216,6 @@ public:
 
 void AddSC_ghostlands()
 {
-    new npc_blood_knight_dawnstar();
     new npc_budd_nedreck();
     new npc_rathis_tomber();
     new npc_ranger_lilatha();
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 64a7dcb7276..82f71aed030 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 641bf00c678..afeb8af99ba 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/>
-# Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index d596fb3e818..ba5d1649d38 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/>
-# Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt
index 905e9318985..2ff2fd0cf6b 100644
--- a/src/tools/vmap3_extractor/CMakeLists.txt
+++ b/src/tools/vmap3_extractor/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/>
-# Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without