332 files changed, 4052 insertions, 221 deletions

diff --git a/revision.h.in.cmake b/revision.h.in.cmake
index eab0437c600..214b18762ca 100644
--- a/revision.h.in.cmake
+++ b/revision.h.in.cmake
@@ -5,7 +5,7 @@
  #define _BRANCH                    "@rev_branch@"
  #define _SOURCE_DIRECTORY          "@CMAKE_SOURCE_DIR@"
  #define _MYSQL_EXECUTABLE          "@MYSQL_EXECUTABLE@"
- #define _FULL_DATABASE             "TDB_full_335.58_2015_03_21.sql"
+ #define _FULL_DATABASE             "TDB_full_world_335.59_2015_07_14.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2015 TrinityCore"
  #define VER_FILEVERSION            0,0,0
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 2ad3b17b9f9..5f2448049d0 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -549,4 +549,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-03-21 21:48:22
+-- Dump completed on 2015-07-14  1:06:49
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index f3c76ce2a79..588ed0063db 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2511,7 +2511,7 @@ CREATE TABLE `updates` (
 
 LOCK TABLES `updates` WRITE;
 /*!40000 ALTER TABLE `updates` DISABLE KEYS */;
-INSERT INTO `updates` VALUES ('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_01_characters.sql','894F08B70449A5481FFAF394EE5571D7FC4D8A3A','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_02_characters.sql','97D7BE0CAADC79F3F11B9FD296B8C6CD40FE593B','ARCHIVED','2015-03-21 21:44:51',0), ('2015_06_26_00_characters_335.sql','f8230a59a9e878a6f54f421d6621f1595bd93861','RELEASED','2015-03-21 21:44:51',0);
+INSERT INTO `updates` VALUES ('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_01_characters.sql','894F08B70449A5481FFAF394EE5571D7FC4D8A3A','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_02_characters.sql','97D7BE0CAADC79F3F11B9FD296B8C6CD40FE593B','ARCHIVED','2015-03-21 21:44:51',0),('2015_06_26_00_characters_335.sql','C2CC6E50AFA1ACCBEBF77CC519AAEB09F3BBAEBC','ARCHIVED','2015-07-13 23:49:22',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2596,4 +2596,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-06-25 17:43:13
+-- Dump completed on 2015-07-14  1:06:50
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 6f65e52a784..e2277d77a65 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -145,16 +145,16 @@ DROP TABLE IF EXISTS `areatrigger_teleport`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `areatrigger_teleport` (
-  `id` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Identifier',
-  `name` text,
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
   `target_map` smallint(5) unsigned NOT NULL DEFAULT '0',
   `target_position_x` float NOT NULL DEFAULT '0',
   `target_position_y` float NOT NULL DEFAULT '0',
   `target_position_z` float NOT NULL DEFAULT '0',
   `target_orientation` float NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`id`),
-  FULLTEXT KEY `name` (`name`)
+  PRIMARY KEY (`ID`),
+  FULLTEXT KEY `name` (`Name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Trigger System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -166,7 +166,7 @@ DROP TABLE IF EXISTS `battleground_template`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `battleground_template` (
-  `id` mediumint(8) unsigned NOT NULL,
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `MinPlayersPerTeam` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MaxPlayersPerTeam` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MinLvl` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -179,7 +179,7 @@ CREATE TABLE `battleground_template` (
   `Weight` tinyint(3) unsigned NOT NULL DEFAULT '1',
   `ScriptName` char(64) NOT NULL DEFAULT '',
   `Comment` char(32) NOT NULL,
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -354,13 +354,13 @@ DROP TABLE IF EXISTS `creature_equip_template`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature_equip_template` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `id` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `itemEntry1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `itemEntry2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `itemEntry3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `CreatureID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ID` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `ItemID1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ItemID2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ItemID3` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`entry`,`id`)
+  PRIMARY KEY (`CreatureID`,`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -372,8 +372,8 @@ DROP TABLE IF EXISTS `creature_formations`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature_formations` (
-  `leaderGUID` int(10) unsigned NOT NULL,
-  `memberGUID` int(10) unsigned NOT NULL,
+  `leaderGUID` int(10) unsigned NOT NULL DEFAULT '0',
+  `memberGUID` int(10) unsigned NOT NULL DEFAULT '0',
   `dist` float unsigned NOT NULL,
   `angle` float unsigned NOT NULL,
   `groupAI` int(10) unsigned NOT NULL,
@@ -413,12 +413,12 @@ DROP TABLE IF EXISTS `creature_model_info`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature_model_info` (
-  `modelid` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `bounding_radius` float NOT NULL DEFAULT '0',
-  `combat_reach` float NOT NULL DEFAULT '0',
-  `gender` tinyint(3) unsigned NOT NULL DEFAULT '2',
-  `modelid_other_gender` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`modelid`)
+  `DisplayID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `BoundingRadius` float NOT NULL DEFAULT '0',
+  `CombatReach` float NOT NULL DEFAULT '0',
+  `Gender` tinyint(3) unsigned NOT NULL DEFAULT '2',
+  `DisplayID_Other_Gender` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`DisplayID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Creature System (Model related info)';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -459,6 +459,21 @@ CREATE TABLE `creature_questender` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `creature_questitem`
+--
+
+DROP TABLE IF EXISTS `creature_questitem`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `creature_questitem` (
+  `CreatureEntry` int(10) unsigned NOT NULL DEFAULT '0',
+  `Idx` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemId` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`CreatureEntry`,`Idx`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `creature_queststarter`
 --
 
@@ -571,12 +586,6 @@ CREATE TABLE `creature_template` (
   `DamageModifier` float NOT NULL DEFAULT '1',
   `ExperienceModifier` float NOT NULL DEFAULT '1',
   `RacialLeader` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `questItem1` int(10) unsigned NOT NULL DEFAULT '0',
-  `questItem2` int(10) unsigned NOT NULL DEFAULT '0',
-  `questItem3` int(10) unsigned NOT NULL DEFAULT '0',
-  `questItem4` int(10) unsigned NOT NULL DEFAULT '0',
-  `questItem5` int(10) unsigned NOT NULL DEFAULT '0',
-  `questItem6` int(10) unsigned NOT NULL DEFAULT '0',
   `movementId` int(11) unsigned NOT NULL DEFAULT '0',
   `RegenHealth` tinyint(3) unsigned NOT NULL DEFAULT '1',
   `mechanic_immune_mask` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1056,6 +1065,21 @@ CREATE TABLE `gameobject` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `gameobject_addon`
+--
+
+DROP TABLE IF EXISTS `gameobject_addon`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gameobject_addon` (
+  `guid` int(10) unsigned NOT NULL DEFAULT '0',
+  `invisibilityType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `invisibilityValue` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `gameobject_loot_template`
 --
 
@@ -1092,6 +1116,21 @@ CREATE TABLE `gameobject_questender` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `gameobject_questitem`
+--
+
+DROP TABLE IF EXISTS `gameobject_questitem`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gameobject_questitem` (
+  `GameObjectEntry` int(10) unsigned NOT NULL DEFAULT '0',
+  `Idx` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemId` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`GameObjectEntry`,`Idx`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `gameobject_queststarter`
 --
 
@@ -1123,36 +1162,30 @@ CREATE TABLE `gameobject_template` (
   `faction` smallint(5) unsigned NOT NULL DEFAULT '0',
   `flags` int(10) unsigned NOT NULL DEFAULT '0',
   `size` float NOT NULL DEFAULT '1',
-  `questItem1` int(11) unsigned NOT NULL DEFAULT '0',
-  `questItem2` int(11) unsigned NOT NULL DEFAULT '0',
-  `questItem3` int(11) unsigned NOT NULL DEFAULT '0',
-  `questItem4` int(11) unsigned NOT NULL DEFAULT '0',
-  `questItem5` int(11) unsigned NOT NULL DEFAULT '0',
-  `questItem6` int(11) unsigned NOT NULL DEFAULT '0',
-  `data0` int(10) unsigned NOT NULL DEFAULT '0',
-  `data1` int(11) NOT NULL DEFAULT '-1',
-  `data2` int(10) unsigned NOT NULL DEFAULT '0',
-  `data3` int(10) unsigned NOT NULL DEFAULT '0',
-  `data4` int(10) unsigned NOT NULL DEFAULT '0',
-  `data5` int(10) unsigned NOT NULL DEFAULT '0',
-  `data6` int(11) NOT NULL DEFAULT '-1',
-  `data7` int(10) unsigned NOT NULL DEFAULT '0',
-  `data8` int(10) unsigned NOT NULL DEFAULT '0',
-  `data9` int(10) unsigned NOT NULL DEFAULT '0',
-  `data10` int(10) unsigned NOT NULL DEFAULT '0',
-  `data11` int(10) unsigned NOT NULL DEFAULT '0',
-  `data12` int(10) unsigned NOT NULL DEFAULT '0',
-  `data13` int(10) unsigned NOT NULL DEFAULT '0',
-  `data14` int(10) unsigned NOT NULL DEFAULT '0',
-  `data15` int(10) unsigned NOT NULL DEFAULT '0',
-  `data16` int(10) unsigned NOT NULL DEFAULT '0',
-  `data17` int(10) unsigned NOT NULL DEFAULT '0',
-  `data18` int(10) unsigned NOT NULL DEFAULT '0',
-  `data19` int(10) unsigned NOT NULL DEFAULT '0',
-  `data20` int(10) unsigned NOT NULL DEFAULT '0',
-  `data21` int(10) unsigned NOT NULL DEFAULT '0',
-  `data22` int(10) unsigned NOT NULL DEFAULT '0',
-  `data23` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data0` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data1` int(11) NOT NULL DEFAULT '0',
+  `Data2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data4` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data5` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data6` int(11) NOT NULL DEFAULT '0',
+  `Data7` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data8` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data9` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data10` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data11` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data12` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data13` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data14` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data15` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data16` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data17` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data18` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data19` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data20` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data21` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data22` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data23` int(10) unsigned NOT NULL DEFAULT '0',
   `AIName` char(64) NOT NULL DEFAULT '',
   `ScriptName` varchar(64) NOT NULL DEFAULT '',
   `VerifiedBuild` smallint(5) DEFAULT '0',
@@ -1456,13 +1489,13 @@ CREATE TABLE `lfg_dungeon_rewards` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `lfg_entrances`
+-- Table structure for table `lfg_dungeon_template`
 --
 
-DROP TABLE IF EXISTS `lfg_entrances`;
+DROP TABLE IF EXISTS `lfg_dungeon_template`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `lfg_entrances` (
+CREATE TABLE `lfg_dungeon_template` (
   `dungeonId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Unique id from LFGDungeons.dbc',
   `name` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
   `position_x` float NOT NULL DEFAULT '0',
@@ -2087,7 +2120,7 @@ CREATE TABLE `npc_text` (
   `text0_1` longtext,
   `BroadcastTextID0` mediumint(6) NOT NULL DEFAULT '0',
   `lang0` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob0` float NOT NULL DEFAULT '0',
+  `Probability0` float NOT NULL DEFAULT '0',
   `em0_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em0_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em0_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2098,7 +2131,7 @@ CREATE TABLE `npc_text` (
   `text1_1` longtext,
   `BroadcastTextID1` mediumint(6) NOT NULL DEFAULT '0',
   `lang1` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob1` float NOT NULL DEFAULT '0',
+  `Probability1` float NOT NULL DEFAULT '0',
   `em1_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em1_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em1_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2109,7 +2142,7 @@ CREATE TABLE `npc_text` (
   `text2_1` longtext,
   `BroadcastTextID2` mediumint(6) NOT NULL DEFAULT '0',
   `lang2` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob2` float NOT NULL DEFAULT '0',
+  `Probability2` float NOT NULL DEFAULT '0',
   `em2_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em2_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em2_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2120,7 +2153,7 @@ CREATE TABLE `npc_text` (
   `text3_1` longtext,
   `BroadcastTextID3` mediumint(6) NOT NULL DEFAULT '0',
   `lang3` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob3` float NOT NULL DEFAULT '0',
+  `Probability3` float NOT NULL DEFAULT '0',
   `em3_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em3_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em3_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2131,7 +2164,7 @@ CREATE TABLE `npc_text` (
   `text4_1` longtext,
   `BroadcastTextID4` mediumint(6) NOT NULL DEFAULT '0',
   `lang4` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob4` float NOT NULL DEFAULT '0',
+  `Probability4` float NOT NULL DEFAULT '0',
   `em4_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em4_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em4_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2142,7 +2175,7 @@ CREATE TABLE `npc_text` (
   `text5_1` longtext,
   `BroadcastTextID5` mediumint(6) NOT NULL DEFAULT '0',
   `lang5` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob5` float NOT NULL DEFAULT '0',
+  `Probability5` float NOT NULL DEFAULT '0',
   `em5_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em5_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em5_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2153,7 +2186,7 @@ CREATE TABLE `npc_text` (
   `text6_1` longtext,
   `BroadcastTextID6` mediumint(6) NOT NULL DEFAULT '0',
   `lang6` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob6` float NOT NULL DEFAULT '0',
+  `Probability6` float NOT NULL DEFAULT '0',
   `em6_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em6_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em6_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2164,7 +2197,7 @@ CREATE TABLE `npc_text` (
   `text7_1` longtext,
   `BroadcastTextID7` mediumint(6) NOT NULL DEFAULT '0',
   `lang7` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob7` float NOT NULL DEFAULT '0',
+  `Probability7` float NOT NULL DEFAULT '0',
   `em7_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em7_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em7_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2184,13 +2217,13 @@ DROP TABLE IF EXISTS `npc_trainer`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `npc_trainer` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `spell` mediumint(8) NOT NULL DEFAULT '0',
-  `spellcost` int(10) unsigned NOT NULL DEFAULT '0',
-  `reqskill` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `reqskillvalue` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `reqlevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`entry`,`spell`)
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `SpellID` mediumint(8) NOT NULL DEFAULT '0',
+  `MoneyCost` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReqSkillLine` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReqSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReqLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`SpellID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2237,11 +2270,11 @@ DROP TABLE IF EXISTS `page_text`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `page_text` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `text` longtext NOT NULL,
-  `next_page` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Text` longtext NOT NULL,
+  `NextPageID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`entry`)
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Item System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2439,9 +2472,9 @@ DROP TABLE IF EXISTS `player_xp_for_level`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `player_xp_for_level` (
-  `lvl` tinyint(3) unsigned NOT NULL,
-  `xp_for_next_level` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`lvl`)
+  `Level` tinyint(3) unsigned NOT NULL,
+  `Experience` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`Level`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2541,15 +2574,15 @@ DROP TABLE IF EXISTS `points_of_interest`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `points_of_interest` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `x` float NOT NULL DEFAULT '0',
-  `y` float NOT NULL DEFAULT '0',
-  `icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `flags` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `data` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `icon_name` text NOT NULL,
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PositionX` float NOT NULL DEFAULT '0',
+  `PositionY` float NOT NULL DEFAULT '0',
+  `Icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Flags` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Data` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Name` text NOT NULL,
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`entry`)
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2664,17 +2697,17 @@ DROP TABLE IF EXISTS `quest_poi`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `quest_poi` (
-  `questId` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestID` int(10) unsigned NOT NULL DEFAULT '0',
   `id` int(10) unsigned NOT NULL DEFAULT '0',
-  `objIndex` int(11) NOT NULL DEFAULT '0',
-  `mapid` int(10) unsigned NOT NULL DEFAULT '0',
+  `ObjectiveIndex` int(11) NOT NULL DEFAULT '0',
+  `MapID` int(10) unsigned NOT NULL DEFAULT '0',
   `WorldMapAreaId` int(10) unsigned NOT NULL DEFAULT '0',
-  `FloorId` int(10) unsigned NOT NULL DEFAULT '0',
-  `unk3` int(10) unsigned NOT NULL DEFAULT '0',
-  `unk4` int(10) unsigned NOT NULL DEFAULT '0',
+  `Floor` int(10) unsigned NOT NULL DEFAULT '0',
+  `Priority` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`questId`,`id`),
-  KEY `idx` (`questId`,`id`)
+  PRIMARY KEY (`QuestID`,`id`),
+  KEY `idx` (`QuestID`,`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2686,14 +2719,14 @@ DROP TABLE IF EXISTS `quest_poi_points`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `quest_poi_points` (
-  `questId` int(10) unsigned NOT NULL DEFAULT '0',
-  `id` int(10) unsigned NOT NULL DEFAULT '0',
-  `idx` int(10) unsigned NOT NULL DEFAULT '0',
-  `x` int(11) NOT NULL DEFAULT '0',
-  `y` int(11) NOT NULL DEFAULT '0',
+  `QuestID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Idx1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Idx2` int(10) unsigned NOT NULL DEFAULT '0',
+  `X` int(11) NOT NULL DEFAULT '0',
+  `Y` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`questId`,`id`,`idx`),
-  KEY `questId_id` (`questId`,`id`)
+  PRIMARY KEY (`QuestID`,`Idx1`,`Idx2`),
+  KEY `questId_id` (`QuestID`,`Idx1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2705,30 +2738,19 @@ DROP TABLE IF EXISTS `quest_template`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `quest_template` (
-  `Id` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `Method` tinyint(3) unsigned NOT NULL DEFAULT '2',
-  `Level` smallint(3) NOT NULL DEFAULT '1',
+  `QuestLevel` smallint(3) NOT NULL DEFAULT '1',
   `MinLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MaxLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `ZoneOrSort` smallint(6) NOT NULL DEFAULT '0',
-  `Type` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SuggestedPlayers` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `QuestSortID` smallint(6) NOT NULL DEFAULT '0',
+  `QuestType` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SuggestedGroupNum` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `LimitTime` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredClasses` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredRaces` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredSkillId` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredSkillPoints` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredFactionId1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredFactionId2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredFactionValue1` mediumint(8) NOT NULL DEFAULT '0',
   `RequiredFactionValue2` mediumint(8) NOT NULL DEFAULT '0',
-  `RequiredMinRepFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredMaxRepFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredMinRepValue` mediumint(8) NOT NULL DEFAULT '0',
-  `RequiredMaxRepValue` mediumint(8) NOT NULL DEFAULT '0',
-  `PrevQuestId` mediumint(8) NOT NULL DEFAULT '0',
-  `NextQuestId` mediumint(8) NOT NULL DEFAULT '0',
-  `ExclusiveGroup` mediumint(8) NOT NULL DEFAULT '0',
   `NextQuestIdChain` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `RewardXPId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RewardOrRequiredMoney` int(11) NOT NULL DEFAULT '0',
@@ -2737,63 +2759,58 @@ CREATE TABLE `quest_template` (
   `RewardSpellCast` int(11) NOT NULL DEFAULT '0',
   `RewardHonor` int(11) NOT NULL DEFAULT '0',
   `RewardHonorMultiplier` float NOT NULL DEFAULT '0',
-  `RewardMailTemplateId` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardMailDelay` int(11) unsigned NOT NULL DEFAULT '0',
   `SourceItemId` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `SourceItemCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `SourceSpellId` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpecialFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RewardTitleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RewardTitle` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RequiredPlayerKills` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RewardTalents` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RewardArenaPoints` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardItemId1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardItemId2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardItemId3` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardItemId4` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardItemCount1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardItemCount2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardItemCount3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardItemCount4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId3` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId4` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId5` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId6` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount5` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount6` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardFactionId1` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionId2` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionId3` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionId4` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionId5` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionValueId1` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueId2` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueId3` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueId4` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueId5` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride1` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride2` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride3` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride4` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride5` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardItem1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardItem2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardItem3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardItem4` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardAmount1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardAmount2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardAmount3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardAmount4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID4` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID5` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID6` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity6` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardFactionID1` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
+  `RewardFactionID2` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
+  `RewardFactionID3` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
+  `RewardFactionID4` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
+  `RewardFactionID5` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
+  `RewardFactionValue1` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionValue2` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionValue3` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionValue4` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionValue5` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionOverride1` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionOverride2` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionOverride3` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionOverride4` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionOverride5` mediumint(8) NOT NULL DEFAULT '0',
   `PointMapId` smallint(5) unsigned NOT NULL DEFAULT '0',
   `PointX` float NOT NULL DEFAULT '0',
   `PointY` float NOT NULL DEFAULT '0',
   `PointOption` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Title` text,
-  `Objectives` text,
-  `Details` text,
+  `LogTitle` text,
+  `LogDescription` text,
+  `QuestDescription` text,
   `EndText` text,
   `OfferRewardText` text,
   `RequestItemsText` text,
-  `CompletedText` text,
+  `QuestCompletionLog` text,
   `RequiredNpcOrGo1` mediumint(8) NOT NULL DEFAULT '0',
   `RequiredNpcOrGo2` mediumint(8) NOT NULL DEFAULT '0',
   `RequiredNpcOrGo3` mediumint(8) NOT NULL DEFAULT '0',
@@ -2846,11 +2863,40 @@ CREATE TABLE `quest_template` (
   `OfferRewardEmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0',
   `OfferRewardEmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`Id`)
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Quest System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `quest_template_addon`
+--
+
+DROP TABLE IF EXISTS `quest_template_addon`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_template_addon` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `MaxLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `AllowableClasses` int(10) unsigned NOT NULL DEFAULT '0',
+  `SourceSpellID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PrevQuestID` mediumint(8) NOT NULL DEFAULT '0',
+  `NextQuestID` mediumint(8) NOT NULL DEFAULT '0',
+  `ExclusiveGroup` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardMailTemplateID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardMailDelay` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredSkillID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredSkillPoints` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredMinRepFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredMaxRepFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredMinRepValue` mediumint(8) NOT NULL DEFAULT '0',
+  `RequiredMaxRepValue` mediumint(8) NOT NULL DEFAULT '0',
+  `ProvidedItemCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpecialFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `reference_loot_template`
 --
 
@@ -3443,15 +3489,15 @@ DROP TABLE IF EXISTS `spell_target_position`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_target_position` (
-  `id` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Identifier',
-  `effIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `target_map` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `target_position_x` float NOT NULL DEFAULT '0',
-  `target_position_y` float NOT NULL DEFAULT '0',
-  `target_position_z` float NOT NULL DEFAULT '0',
-  `target_orientation` float NOT NULL DEFAULT '0',
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Identifier',
+  `EffectIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PositionX` float NOT NULL DEFAULT '0',
+  `PositionY` float NOT NULL DEFAULT '0',
+  `PositionZ` float NOT NULL DEFAULT '0',
+  `Orientation` float NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`id`,`effIndex`)
+  PRIMARY KEY (`ID`,`EffectIndex`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Spell System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -3705,4 +3751,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-03-22 20:02:11
+-- Dump completed on 2015-07-14  1:06:51
diff --git a/sql/updates/characters/2015_06_26_00_characters_335.sql b/sql/old/3.3.5a/characters/58_2015_03_21/2015_06_26_00_characters_335.sql
index ea997fad252..ea997fad252 100644
--- a/sql/updates/characters/2015_06_26_00_characters_335.sql
+++ b/sql/old/3.3.5a/characters/58_2015_03_21/2015_06_26_00_characters_335.sql
diff --git a/sql/updates/world/2015_03_21_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_21_00_world.sql
index d1eee836dd0..d1eee836dd0 100644
--- a/sql/updates/world/2015_03_21_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_21_00_world.sql
diff --git a/sql/updates/world/2015_03_21_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_21_01_world.sql
index 82b5304ef7b..82b5304ef7b 100644
--- a/sql/updates/world/2015_03_21_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_21_01_world.sql
diff --git a/sql/updates/world/2015_03_21_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_21_02_world.sql
index 831bf907912..831bf907912 100644
--- a/sql/updates/world/2015_03_21_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_21_02_world.sql
diff --git a/sql/updates/world/2015_03_22_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_00_world.sql
index 97ecb115bc2..97ecb115bc2 100644
--- a/sql/updates/world/2015_03_22_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_00_world.sql
diff --git a/sql/updates/world/2015_03_22_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_01_world.sql
index 07e759465dc..07e759465dc 100644
--- a/sql/updates/world/2015_03_22_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_01_world.sql
diff --git a/sql/updates/world/2015_03_22_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_02_world.sql
index 4fd3f5b8e25..4fd3f5b8e25 100644
--- a/sql/updates/world/2015_03_22_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_02_world.sql
diff --git a/sql/updates/world/2015_03_22_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_03_world.sql
index 8b59ea0824c..8b59ea0824c 100644
--- a/sql/updates/world/2015_03_22_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_03_world.sql
diff --git a/sql/updates/world/2015_03_22_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_04_world.sql
index d468134a279..d468134a279 100644
--- a/sql/updates/world/2015_03_22_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_04_world.sql
diff --git a/sql/updates/world/2015_03_22_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_05_world.sql
index 6e81be445da..6e81be445da 100644
--- a/sql/updates/world/2015_03_22_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_05_world.sql
diff --git a/sql/updates/world/2015_03_22_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_06_world.sql
index db8227afff8..db8227afff8 100644
--- a/sql/updates/world/2015_03_22_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_06_world.sql
diff --git a/sql/updates/world/2015_03_22_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_07_world.sql
index 1e5c6607bee..1e5c6607bee 100644
--- a/sql/updates/world/2015_03_22_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_07_world.sql
diff --git a/sql/updates/world/2015_03_23_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_00_world.sql
index 32f90e439d6..32f90e439d6 100644
--- a/sql/updates/world/2015_03_23_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_00_world.sql
diff --git a/sql/updates/world/2015_03_23_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_01_world.sql
index d6f8d4591ff..d6f8d4591ff 100644
--- a/sql/updates/world/2015_03_23_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_01_world.sql
diff --git a/sql/updates/world/2015_03_23_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_02_world.sql
index 3bc255d569e..3bc255d569e 100644
--- a/sql/updates/world/2015_03_23_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_02_world.sql
diff --git a/sql/updates/world/2015_03_23_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_03_world.sql
index bb0a1609876..bb0a1609876 100644
--- a/sql/updates/world/2015_03_23_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_03_world.sql
diff --git a/sql/updates/world/2015_03_23_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_04_world.sql
index 1425f517d0a..1425f517d0a 100644
--- a/sql/updates/world/2015_03_23_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_04_world.sql
diff --git a/sql/updates/world/2015_03_23_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_05_world.sql
index e574ff22bea..e574ff22bea 100644
--- a/sql/updates/world/2015_03_23_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_05_world.sql
diff --git a/sql/updates/world/2015_03_23_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_06_world.sql
index e8820a341e2..e8820a341e2 100644
--- a/sql/updates/world/2015_03_23_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_06_world.sql
diff --git a/sql/updates/world/2015_03_23_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_07_world.sql
index ca9bffaf728..ca9bffaf728 100644
--- a/sql/updates/world/2015_03_23_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_07_world.sql
diff --git a/sql/updates/world/2015_03_23_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_08_world.sql
index c7837c47d9d..c7837c47d9d 100644
--- a/sql/updates/world/2015_03_23_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_08_world.sql
diff --git a/sql/updates/world/2015_03_23_09_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_09_world.sql
index d90f7fc9249..d90f7fc9249 100644
--- a/sql/updates/world/2015_03_23_09_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_09_world.sql
diff --git a/sql/updates/world/2015_03_23_10_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_10_world.sql
index d83e5c212a0..d83e5c212a0 100644
--- a/sql/updates/world/2015_03_23_10_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_10_world.sql
diff --git a/sql/updates/world/2015_03_23_11_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_11_world.sql
index 2d3b346d18e..2d3b346d18e 100644
--- a/sql/updates/world/2015_03_23_11_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_11_world.sql
diff --git a/sql/updates/world/2015_03_23_12_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_12_world.sql
index 2471e9bdcf1..2471e9bdcf1 100644
--- a/sql/updates/world/2015_03_23_12_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_12_world.sql
diff --git a/sql/updates/world/2015_03_23_13_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_13_world.sql
index 7e42213583f..7e42213583f 100644
--- a/sql/updates/world/2015_03_23_13_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_13_world.sql
diff --git a/sql/updates/world/2015_03_24_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_00_world.sql
index 752272710b4..752272710b4 100644
--- a/sql/updates/world/2015_03_24_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_00_world.sql
diff --git a/sql/updates/world/2015_03_24_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_01_world.sql
index 31034d87c4a..31034d87c4a 100644
--- a/sql/updates/world/2015_03_24_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_01_world.sql
diff --git a/sql/updates/world/2015_03_24_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_02_world.sql
index b9a49dcc9ba..b9a49dcc9ba 100644
--- a/sql/updates/world/2015_03_24_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_02_world.sql
diff --git a/sql/updates/world/2015_03_24_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_03_world.sql
index 3012bb6b82a..3012bb6b82a 100644
--- a/sql/updates/world/2015_03_24_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_03_world.sql
diff --git a/sql/updates/world/2015_03_24_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_04_world.sql
index 74488cd00bd..74488cd00bd 100644
--- a/sql/updates/world/2015_03_24_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_04_world.sql
diff --git a/sql/updates/world/2015_03_24_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_05_world.sql
index c9faf951751..c9faf951751 100644
--- a/sql/updates/world/2015_03_24_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_05_world.sql
diff --git a/sql/updates/world/2015_03_25_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_00_world.sql
index 06d4910fe05..06d4910fe05 100644
--- a/sql/updates/world/2015_03_25_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_00_world.sql
diff --git a/sql/updates/world/2015_03_25_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_01_world.sql
index 29dd214f262..29dd214f262 100644
--- a/sql/updates/world/2015_03_25_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_01_world.sql
diff --git a/sql/updates/world/2015_03_25_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_02_world.sql
index 10b8903f3fb..10b8903f3fb 100644
--- a/sql/updates/world/2015_03_25_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_02_world.sql
diff --git a/sql/updates/world/2015_03_25_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_03_world.sql
index 3706bde1b71..3706bde1b71 100644
--- a/sql/updates/world/2015_03_25_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_03_world.sql
diff --git a/sql/updates/world/2015_03_25_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_04_world.sql
index 017a0162c5d..017a0162c5d 100644
--- a/sql/updates/world/2015_03_25_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_04_world.sql
diff --git a/sql/updates/world/2015_03_26_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_26_00_world.sql
index ab759e628f6..ab759e628f6 100644
--- a/sql/updates/world/2015_03_26_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_26_00_world.sql
diff --git a/sql/updates/world/2015_03_26_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_26_01_world.sql
index afd0d99691a..afd0d99691a 100644
--- a/sql/updates/world/2015_03_26_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_26_01_world.sql
diff --git a/sql/updates/world/2015_03_26_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_26_02_world.sql
index 4ae68387d8e..4ae68387d8e 100644
--- a/sql/updates/world/2015_03_26_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_26_02_world.sql
diff --git a/sql/updates/world/2015_03_28_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_28_00_world.sql
index af58d0ecf83..af58d0ecf83 100644
--- a/sql/updates/world/2015_03_28_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_28_00_world.sql
diff --git a/sql/updates/world/2015_03_28_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_28_01_world.sql
index e1d6e6d63dc..e1d6e6d63dc 100644
--- a/sql/updates/world/2015_03_28_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_28_01_world.sql
diff --git a/sql/updates/world/2015_03_30_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_00_world.sql
index 10bb642f8a1..10bb642f8a1 100644
--- a/sql/updates/world/2015_03_30_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_00_world.sql
diff --git a/sql/updates/world/2015_03_30_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_01_world.sql
index 2e62c6cfba3..2e62c6cfba3 100644
--- a/sql/updates/world/2015_03_30_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_01_world.sql
diff --git a/sql/updates/world/2015_03_30_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_02_world.sql
index e75ccb04142..e75ccb04142 100644
--- a/sql/updates/world/2015_03_30_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_02_world.sql
diff --git a/sql/updates/world/2015_03_30_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_03_world.sql
index 5c8497edc05..5c8497edc05 100644
--- a/sql/updates/world/2015_03_30_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_03_world.sql
diff --git a/sql/updates/world/2015_04_01_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_01_00_world.sql
index 68d43c08415..68d43c08415 100644
--- a/sql/updates/world/2015_04_01_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_01_00_world.sql
diff --git a/sql/updates/world/2015_04_01_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_01_01_world.sql
index b53c739e2dd..b53c739e2dd 100644
--- a/sql/updates/world/2015_04_01_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_01_01_world.sql
diff --git a/sql/updates/world/2015_04_02_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_02_00_world.sql
index 683e5c01250..683e5c01250 100644
--- a/sql/updates/world/2015_04_02_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_02_00_world.sql
diff --git a/sql/updates/world/2015_04_02_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_02_01_world.sql
index 135ad4aba65..135ad4aba65 100644
--- a/sql/updates/world/2015_04_02_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_02_01_world.sql
diff --git a/sql/updates/world/2015_04_03_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_00_world.sql
index b7471bb9b77..b7471bb9b77 100644
--- a/sql/updates/world/2015_04_03_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_00_world.sql
diff --git a/sql/updates/world/2015_04_03_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_01_world.sql
index 18bb069439a..18bb069439a 100644
--- a/sql/updates/world/2015_04_03_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_01_world.sql
diff --git a/sql/updates/world/2015_04_03_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_02_world.sql
index 30198348624..30198348624 100644
--- a/sql/updates/world/2015_04_03_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_02_world.sql
diff --git a/sql/updates/world/2015_04_03_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_03_world.sql
index 175fdcb89ca..175fdcb89ca 100644
--- a/sql/updates/world/2015_04_03_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_03_world.sql
diff --git a/sql/updates/world/2015_04_03_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_04_world.sql
index 2f50193e413..2f50193e413 100644
--- a/sql/updates/world/2015_04_03_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_04_world.sql
diff --git a/sql/updates/world/2015_04_03_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_05_world.sql
index e56d0d607d6..e56d0d607d6 100644
--- a/sql/updates/world/2015_04_03_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_05_world.sql
diff --git a/sql/updates/world/2015_04_03_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_06_world.sql
index 77d7a82d9bb..77d7a82d9bb 100644
--- a/sql/updates/world/2015_04_03_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_06_world.sql
diff --git a/sql/updates/world/2015_04_04_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_00_world.sql
index 6b6621136e0..6b6621136e0 100644
--- a/sql/updates/world/2015_04_04_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_00_world.sql
diff --git a/sql/updates/world/2015_04_04_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_01_world.sql
index 78036014011..78036014011 100644
--- a/sql/updates/world/2015_04_04_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_01_world.sql
diff --git a/sql/updates/world/2015_04_04_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_02_world.sql
index 1cc2cb61ea3..1cc2cb61ea3 100644
--- a/sql/updates/world/2015_04_04_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_02_world.sql
diff --git a/sql/updates/world/2015_04_04_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_03_world.sql
index 78e5f2b50b5..78e5f2b50b5 100644
--- a/sql/updates/world/2015_04_04_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_03_world.sql
diff --git a/sql/updates/world/2015_04_04_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_04_world.sql
index 58314391994..58314391994 100644
--- a/sql/updates/world/2015_04_04_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_04_world.sql
diff --git a/sql/updates/world/2015_04_04_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_05_world.sql
index dccc4f0c082..dccc4f0c082 100644
--- a/sql/updates/world/2015_04_04_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_05_world.sql
diff --git a/sql/updates/world/2015_04_04_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_06_world.sql
index 16034938010..16034938010 100644
--- a/sql/updates/world/2015_04_04_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_06_world.sql
diff --git a/sql/updates/world/2015_04_05_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_00_world.sql
index d37c91586bf..d37c91586bf 100644
--- a/sql/updates/world/2015_04_05_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_00_world.sql
diff --git a/sql/updates/world/2015_04_05_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_01_world.sql
index 8b8d98fc558..8b8d98fc558 100644
--- a/sql/updates/world/2015_04_05_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_01_world.sql
diff --git a/sql/updates/world/2015_04_05_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_02_world.sql
index 7b6816fc41e..7b6816fc41e 100644
--- a/sql/updates/world/2015_04_05_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_02_world.sql
diff --git a/sql/updates/world/2015_04_05_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_03_world.sql
index 261dd6c2a9f..261dd6c2a9f 100644
--- a/sql/updates/world/2015_04_05_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_03_world.sql
diff --git a/sql/updates/world/2015_04_05_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_04_world.sql
index 12fabf12d97..12fabf12d97 100644
--- a/sql/updates/world/2015_04_05_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_04_world.sql
diff --git a/sql/updates/world/2015_04_05_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_05_world.sql
index 4d23ec8a4c4..4d23ec8a4c4 100644
--- a/sql/updates/world/2015_04_05_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_05_world.sql
diff --git a/sql/updates/world/2015_04_05_06_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_06_world_335.sql
index ed7071282ab..ed7071282ab 100644
--- a/sql/updates/world/2015_04_05_06_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_06_world_335.sql
diff --git a/sql/updates/world/2015_04_05_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_07_world.sql
index af5fb8a8390..af5fb8a8390 100644
--- a/sql/updates/world/2015_04_05_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_07_world.sql
diff --git a/sql/updates/world/2015_04_06_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_00_world.sql
index 7ba78d72963..7ba78d72963 100644
--- a/sql/updates/world/2015_04_06_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_00_world.sql
diff --git a/sql/updates/world/2015_04_06_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_01_world.sql
index 2b82c2e3210..2b82c2e3210 100644
--- a/sql/updates/world/2015_04_06_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_01_world.sql
diff --git a/sql/updates/world/2015_04_06_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_02_world.sql
index 3e04c2250bf..3e04c2250bf 100644
--- a/sql/updates/world/2015_04_06_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_02_world.sql
diff --git a/sql/updates/world/2015_04_06_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_03_world.sql
index 1241c231ec2..1241c231ec2 100644
--- a/sql/updates/world/2015_04_06_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_03_world.sql
diff --git a/sql/updates/world/2015_04_06_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_04_world.sql
index 0b6adc4f550..0b6adc4f550 100644
--- a/sql/updates/world/2015_04_06_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_04_world.sql
diff --git a/sql/updates/world/2015_04_06_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_05_world.sql
index d6e63790a36..d6e63790a36 100644
--- a/sql/updates/world/2015_04_06_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_05_world.sql
diff --git a/sql/updates/world/2015_04_07_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_07_00_world.sql
index e5cec5e1812..e5cec5e1812 100644
--- a/sql/updates/world/2015_04_07_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_07_00_world.sql
diff --git a/sql/updates/world/2015_04_07_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_07_02_world.sql
index f7df3a0fecc..f7df3a0fecc 100644
--- a/sql/updates/world/2015_04_07_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_07_02_world.sql
diff --git a/sql/updates/world/2015_04_08_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_08_00_world.sql
index f2e13c01bd8..f2e13c01bd8 100644
--- a/sql/updates/world/2015_04_08_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_08_00_world.sql
diff --git a/sql/updates/world/2015_04_08_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_08_01_world.sql
index b96621a1fd7..b96621a1fd7 100644
--- a/sql/updates/world/2015_04_08_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_08_01_world.sql
diff --git a/sql/updates/world/2015_04_09_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_00_world.sql
index 75b342ffd00..75b342ffd00 100644
--- a/sql/updates/world/2015_04_09_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_00_world.sql
diff --git a/sql/updates/world/2015_04_09_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_01_world.sql
index 55da6309cbc..55da6309cbc 100644
--- a/sql/updates/world/2015_04_09_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_01_world.sql
diff --git a/sql/updates/world/2015_04_09_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_02_world.sql
index e6951cbef50..e6951cbef50 100644
--- a/sql/updates/world/2015_04_09_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_02_world.sql
diff --git a/sql/updates/world/2015_04_09_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_03_world.sql
index 041c517b861..041c517b861 100644
--- a/sql/updates/world/2015_04_09_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_03_world.sql
diff --git a/sql/updates/world/2015_04_10_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_10_00_world.sql
index 9ca98f0f428..9ca98f0f428 100644
--- a/sql/updates/world/2015_04_10_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_10_00_world.sql
diff --git a/sql/updates/world/2015_04_10_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_10_01_world.sql
index 7ef397fd6cc..7ef397fd6cc 100644
--- a/sql/updates/world/2015_04_10_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_10_01_world.sql
diff --git a/sql/updates/world/2015_04_11_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_00_world.sql
index b5f9dcc48db..b5f9dcc48db 100644
--- a/sql/updates/world/2015_04_11_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_00_world.sql
diff --git a/sql/updates/world/2015_04_11_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_01_world.sql
index cf227f03976..cf227f03976 100644
--- a/sql/updates/world/2015_04_11_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_01_world.sql
diff --git a/sql/updates/world/2015_04_11_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_02_world.sql
index 8e8d850bb17..8e8d850bb17 100644
--- a/sql/updates/world/2015_04_11_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_02_world.sql
diff --git a/sql/updates/world/2015_04_11_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_03_world.sql
index e2f0d055e3b..e2f0d055e3b 100644
--- a/sql/updates/world/2015_04_11_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_03_world.sql
diff --git a/sql/updates/world/2015_04_12_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_12_01_world.sql
index 527d453fe2e..527d453fe2e 100644
--- a/sql/updates/world/2015_04_12_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_12_01_world.sql
diff --git a/sql/updates/world/2015_04_12_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_12_02_world.sql
index 6c885b61505..6c885b61505 100644
--- a/sql/updates/world/2015_04_12_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_12_02_world.sql
diff --git a/sql/updates/world/2015_04_12_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_12_03_world.sql
index 619e48341ac..619e48341ac 100644
--- a/sql/updates/world/2015_04_12_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_12_03_world.sql
diff --git a/sql/updates/world/2015_04_13_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_13_00_world.sql
index 99484e55f87..99484e55f87 100644
--- a/sql/updates/world/2015_04_13_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_13_00_world.sql
diff --git a/sql/updates/world/2015_04_18_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_00_world.sql
index 36901a352ea..36901a352ea 100644
--- a/sql/updates/world/2015_04_18_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_00_world.sql
diff --git a/sql/updates/world/2015_04_18_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_01_world.sql
index 707335c490e..707335c490e 100644
--- a/sql/updates/world/2015_04_18_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_01_world.sql
diff --git a/sql/updates/world/2015_04_18_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_02_world.sql
index 6a299828e26..6a299828e26 100644
--- a/sql/updates/world/2015_04_18_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_02_world.sql
diff --git a/sql/updates/world/2015_04_18_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_03_world.sql
index cc6d3d65dea..cc6d3d65dea 100644
--- a/sql/updates/world/2015_04_18_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_03_world.sql
diff --git a/sql/updates/world/2015_04_18_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_04_world.sql
index cad194dafae..cad194dafae 100644
--- a/sql/updates/world/2015_04_18_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_04_world.sql
diff --git a/sql/updates/world/2015_04_18_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_05_world.sql
index b61ff01bdfc..b61ff01bdfc 100644
--- a/sql/updates/world/2015_04_18_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_05_world.sql
diff --git a/sql/updates/world/2015_04_18_05_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_05_world_335.sql
index b81ab654016..b81ab654016 100644
--- a/sql/updates/world/2015_04_18_05_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_05_world_335.sql
diff --git a/sql/updates/world/2015_04_18_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_06_world.sql
index aa532de444b..aa532de444b 100644
--- a/sql/updates/world/2015_04_18_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_06_world.sql
diff --git a/sql/updates/world/2015_04_18_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_07_world.sql
index 4edef92c8ad..4edef92c8ad 100644
--- a/sql/updates/world/2015_04_18_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_07_world.sql
diff --git a/sql/updates/world/2015_04_18_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_08_world.sql
index 43fd6f2edb5..43fd6f2edb5 100644
--- a/sql/updates/world/2015_04_18_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_08_world.sql
diff --git a/sql/updates/world/2015_04_19_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_19_00_world.sql
index 9a11cc65e77..9a11cc65e77 100644
--- a/sql/updates/world/2015_04_19_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_19_00_world.sql
diff --git a/sql/updates/world/2015_04_19_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_19_01_world.sql
index 41f1629fef9..41f1629fef9 100644
--- a/sql/updates/world/2015_04_19_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_19_01_world.sql
diff --git a/sql/updates/world/2015_04_19_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_19_02_world.sql
index c29783ca265..c29783ca265 100644
--- a/sql/updates/world/2015_04_19_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_19_02_world.sql
diff --git a/sql/updates/world/2015_04_23_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_23_00_world.sql
index d89aef32ca2..d89aef32ca2 100644
--- a/sql/updates/world/2015_04_23_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_23_00_world.sql
diff --git a/sql/updates/world/2015_04_23_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_23_01_world.sql
index f9da048bdb6..f9da048bdb6 100644
--- a/sql/updates/world/2015_04_23_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_23_01_world.sql
diff --git a/sql/updates/world/2015_04_24_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_24_00_world.sql
index 17f3c09e31e..17f3c09e31e 100644
--- a/sql/updates/world/2015_04_24_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_24_00_world.sql
diff --git a/sql/updates/world/2015_04_26_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_00_world.sql
index 5c13aab122a..5c13aab122a 100644
--- a/sql/updates/world/2015_04_26_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_00_world.sql
diff --git a/sql/updates/world/2015_04_26_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_01_world.sql
index b7c45c1f987..b7c45c1f987 100644
--- a/sql/updates/world/2015_04_26_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_01_world.sql
diff --git a/sql/updates/world/2015_04_26_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_02_world.sql
index ea20aae2f7a..ea20aae2f7a 100644
--- a/sql/updates/world/2015_04_26_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_02_world.sql
diff --git a/sql/updates/world/2015_04_26_03_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_03_world_335.sql
index 47e7cc7336f..47e7cc7336f 100644
--- a/sql/updates/world/2015_04_26_03_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_03_world_335.sql
diff --git a/sql/updates/world/2015_04_26_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_04_world.sql
index 2f8698932b5..2f8698932b5 100644
--- a/sql/updates/world/2015_04_26_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_04_world.sql
diff --git a/sql/updates/world/2015_04_26_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_05_world.sql
index d870128a55d..d870128a55d 100644
--- a/sql/updates/world/2015_04_26_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_05_world.sql
diff --git a/sql/updates/world/2015_04_26_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_06_world.sql
index 014c19cd96e..014c19cd96e 100644
--- a/sql/updates/world/2015_04_26_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_06_world.sql
diff --git a/sql/updates/world/2015_04_26_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_07_world.sql
index e23229e7f49..e23229e7f49 100644
--- a/sql/updates/world/2015_04_26_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_07_world.sql
diff --git a/sql/updates/world/2015_04_26_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_08_world.sql
index be53b1ebc60..be53b1ebc60 100644
--- a/sql/updates/world/2015_04_26_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_08_world.sql
diff --git a/sql/updates/world/2015_04_26_09_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_09_world.sql
index e450fd5c64e..e450fd5c64e 100644
--- a/sql/updates/world/2015_04_26_09_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_09_world.sql
diff --git a/sql/updates/world/2015_04_27_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_27_00_world.sql
index 01db583444e..01db583444e 100644
--- a/sql/updates/world/2015_04_27_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_27_00_world.sql
diff --git a/sql/updates/world/2015_04_27_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_27_01_world.sql
index af4f0fc4faf..af4f0fc4faf 100644
--- a/sql/updates/world/2015_04_27_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_27_01_world.sql
diff --git a/sql/updates/world/2015_04_28_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_00_world.sql
index ee651b8473c..ee651b8473c 100644
--- a/sql/updates/world/2015_04_28_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_00_world.sql
diff --git a/sql/updates/world/2015_04_28_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_01_world.sql
index 3de29012072..3de29012072 100644
--- a/sql/updates/world/2015_04_28_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_01_world.sql
diff --git a/sql/updates/world/2015_04_28_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_02_world.sql
index c3eebf4ad7a..c3eebf4ad7a 100644
--- a/sql/updates/world/2015_04_28_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_02_world.sql
diff --git a/sql/updates/world/2015_04_28_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_03_world.sql
index fac605b9f06..fac605b9f06 100644
--- a/sql/updates/world/2015_04_28_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_03_world.sql
diff --git a/sql/updates/world/2015_04_29_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_29_00_world.sql
index 14ff30d9e14..14ff30d9e14 100644
--- a/sql/updates/world/2015_04_29_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_29_00_world.sql
diff --git a/sql/updates/world/2015_04_29_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_29_01_world.sql
index e8ec2fb4ae8..e8ec2fb4ae8 100644
--- a/sql/updates/world/2015_04_29_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_29_01_world.sql
diff --git a/sql/updates/world/2015_05_01_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_00_world.sql
index 779d7368d85..779d7368d85 100644
--- a/sql/updates/world/2015_05_01_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_00_world.sql
diff --git a/sql/updates/world/2015_05_01_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_01_world.sql
index 8c33ba7714d..8c33ba7714d 100644
--- a/sql/updates/world/2015_05_01_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_01_world.sql
diff --git a/sql/updates/world/2015_05_01_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_02_world.sql
index 480b3d70009..480b3d70009 100644
--- a/sql/updates/world/2015_05_01_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_02_world.sql
diff --git a/sql/updates/world/2015_05_01_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_03_world.sql
index dd528f8d704..dd528f8d704 100644
--- a/sql/updates/world/2015_05_01_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_03_world.sql
diff --git a/sql/updates/world/2015_05_01_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_04_world.sql
index a84fde8bb5c..a84fde8bb5c 100644
--- a/sql/updates/world/2015_05_01_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_04_world.sql
diff --git a/sql/updates/world/2015_05_01_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_05_world.sql
index a7a4edc673b..a7a4edc673b 100644
--- a/sql/updates/world/2015_05_01_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_05_world.sql
diff --git a/sql/updates/world/2015_05_01_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_06_world.sql
index 602e4be700c..602e4be700c 100644
--- a/sql/updates/world/2015_05_01_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_06_world.sql
diff --git a/sql/updates/world/2015_05_01_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_07_world.sql
index ac088727f79..ac088727f79 100644
--- a/sql/updates/world/2015_05_01_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_07_world.sql
diff --git a/sql/updates/world/2015_05_01_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_08_world.sql
index b41400f7d7c..b41400f7d7c 100644
--- a/sql/updates/world/2015_05_01_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_08_world.sql
diff --git a/sql/updates/world/2015_05_02_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_02_00_world.sql
index cbcf6bf17e5..cbcf6bf17e5 100644
--- a/sql/updates/world/2015_05_02_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_02_00_world.sql
diff --git a/sql/updates/world/2015_05_02_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_02_01_world.sql
index 62c525b249d..62c525b249d 100644
--- a/sql/updates/world/2015_05_02_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_02_01_world.sql
diff --git a/sql/updates/world/2015_05_04_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_04_00_world.sql
index ca6f5657346..ca6f5657346 100644
--- a/sql/updates/world/2015_05_04_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_04_00_world.sql
diff --git a/sql/updates/world/2015_05_09_00_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_00_world_335.sql
index 003fa276542..003fa276542 100644
--- a/sql/updates/world/2015_05_09_00_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_00_world_335.sql
diff --git a/sql/updates/world/2015_05_09_01_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_01_world_335.sql
index 68f578812f8..68f578812f8 100644
--- a/sql/updates/world/2015_05_09_01_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_01_world_335.sql
diff --git a/sql/updates/world/2015_05_09_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_02_world.sql
index e2e45095730..e2e45095730 100644
--- a/sql/updates/world/2015_05_09_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_02_world.sql
diff --git a/sql/updates/world/2015_05_09_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_03_world.sql
index 137ae636800..137ae636800 100644
--- a/sql/updates/world/2015_05_09_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_03_world.sql
diff --git a/sql/updates/world/2015_05_09_04_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_04_world_335.sql
index 814459be957..814459be957 100644
--- a/sql/updates/world/2015_05_09_04_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_04_world_335.sql
diff --git a/sql/updates/world/2015_05_09_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_05_world.sql
index 41576ac375c..41576ac375c 100644
--- a/sql/updates/world/2015_05_09_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_05_world.sql
diff --git a/sql/updates/world/2015_05_09_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_06_world.sql
index 5038deab480..5038deab480 100644
--- a/sql/updates/world/2015_05_09_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_06_world.sql
diff --git a/sql/updates/world/2015_05_09_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_07_world.sql
index 459c0c3e1f8..459c0c3e1f8 100644
--- a/sql/updates/world/2015_05_09_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_07_world.sql
diff --git a/sql/updates/world/2015_05_09_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_08_world.sql
index 4c6ed7ef6ab..4c6ed7ef6ab 100644
--- a/sql/updates/world/2015_05_09_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_08_world.sql
diff --git a/sql/updates/world/2015_05_09_09_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_09_world.sql
index 77c55e87dfd..77c55e87dfd 100644
--- a/sql/updates/world/2015_05_09_09_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_09_world.sql
diff --git a/sql/updates/world/2015_05_09_10_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_10_world.sql
index 06b5eb9cd88..06b5eb9cd88 100644
--- a/sql/updates/world/2015_05_09_10_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_10_world.sql
diff --git a/sql/updates/world/2015_05_09_11_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_11_world.sql
index c09cb1c9850..c09cb1c9850 100644
--- a/sql/updates/world/2015_05_09_11_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_11_world.sql
diff --git a/sql/updates/world/2015_05_09_12_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_12_world.sql
index d2e488cc026..d2e488cc026 100644
--- a/sql/updates/world/2015_05_09_12_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_12_world.sql
diff --git a/sql/updates/world/2015_05_11_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_00_world.sql
index 5e8485202fa..5e8485202fa 100644
--- a/sql/updates/world/2015_05_11_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_00_world.sql
diff --git a/sql/updates/world/2015_05_11_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_01_world.sql
index d90a5fef88d..d90a5fef88d 100644
--- a/sql/updates/world/2015_05_11_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_01_world.sql
diff --git a/sql/updates/world/2015_05_11_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_02_world.sql
index 7ec5f4870ce..7ec5f4870ce 100644
--- a/sql/updates/world/2015_05_11_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_02_world.sql
diff --git a/sql/updates/world/2015_05_11_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_03_world.sql
index b0df32b2a92..b0df32b2a92 100644
--- a/sql/updates/world/2015_05_11_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_03_world.sql
diff --git a/sql/updates/world/2015_05_11_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_04_world.sql
index df59976ae41..df59976ae41 100644
--- a/sql/updates/world/2015_05_11_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_04_world.sql
diff --git a/sql/updates/world/2015_05_11_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_05_world.sql
index 82bff616123..82bff616123 100644
--- a/sql/updates/world/2015_05_11_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_05_world.sql
diff --git a/sql/updates/world/2015_05_11_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_06_world.sql
index f4a5fe6dd0a..f4a5fe6dd0a 100644
--- a/sql/updates/world/2015_05_11_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_06_world.sql
diff --git a/sql/updates/world/2015_05_11_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_07_world.sql
index e35aa8e454b..e35aa8e454b 100644
--- a/sql/updates/world/2015_05_11_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_07_world.sql
diff --git a/sql/updates/world/2015_05_11_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_08_world.sql
index d6bcc834780..d6bcc834780 100644
--- a/sql/updates/world/2015_05_11_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_08_world.sql
diff --git a/sql/updates/world/2015_05_12_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_12_01_world.sql
index 4d9ce60f51c..4d9ce60f51c 100644
--- a/sql/updates/world/2015_05_12_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_12_01_world.sql
diff --git a/sql/updates/world/2015_05_12_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_12_02_world.sql
index 02f95b73494..02f95b73494 100644
--- a/sql/updates/world/2015_05_12_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_12_02_world.sql
diff --git a/sql/updates/world/2015_05_12_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_12_03_world.sql
index 2bcfa9d091b..2bcfa9d091b 100644
--- a/sql/updates/world/2015_05_12_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_12_03_world.sql
diff --git a/sql/updates/world/2015_05_16_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_16_00_world.sql
index 4a77cdd90fe..4a77cdd90fe 100644
--- a/sql/updates/world/2015_05_16_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_16_00_world.sql
diff --git a/sql/updates/world/2015_05_17_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_17_00_world.sql
index 67a5c7635ae..67a5c7635ae 100644
--- a/sql/updates/world/2015_05_17_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_17_00_world.sql
diff --git a/sql/updates/world/2015_05_17_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_17_01_world.sql
index 88e0e0e4f0a..88e0e0e4f0a 100644
--- a/sql/updates/world/2015_05_17_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_17_01_world.sql
diff --git a/sql/updates/world/2015_05_19_00_world_2015_04_05_07.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_19_00_world_2015_04_05_07.sql
index 2e603ee893b..2e603ee893b 100644
--- a/sql/updates/world/2015_05_19_00_world_2015_04_05_07.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_19_00_world_2015_04_05_07.sql
diff --git a/sql/updates/world/2015_05_19_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_19_01_world.sql
index 83dfb06b6fd..83dfb06b6fd 100644
--- a/sql/updates/world/2015_05_19_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_19_01_world.sql
diff --git a/sql/updates/world/2015_05_19_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_19_02_world.sql
index 6194278061e..6194278061e 100644
--- a/sql/updates/world/2015_05_19_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_19_02_world.sql
diff --git a/sql/updates/world/2015_05_20_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_00_world.sql
index da59eb2ed07..da59eb2ed07 100644
--- a/sql/updates/world/2015_05_20_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_00_world.sql
diff --git a/sql/updates/world/2015_05_20_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_01_world.sql
index 332458a4afb..332458a4afb 100644
--- a/sql/updates/world/2015_05_20_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_01_world.sql
diff --git a/sql/updates/world/2015_05_20_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_02_world.sql
index 0540f17eed6..0540f17eed6 100644
--- a/sql/updates/world/2015_05_20_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_02_world.sql
diff --git a/sql/updates/world/2015_05_20_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_03_world.sql
index 70abf4ee1af..70abf4ee1af 100644
--- a/sql/updates/world/2015_05_20_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_03_world.sql
diff --git a/sql/updates/world/2015_05_20_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_04_world.sql
index 863f0b86d50..863f0b86d50 100644
--- a/sql/updates/world/2015_05_20_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_04_world.sql
diff --git a/sql/updates/world/2015_05_20_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_05_world.sql
index 0e678b593aa..0e678b593aa 100644
--- a/sql/updates/world/2015_05_20_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_05_world.sql
diff --git a/sql/updates/world/2015_05_20_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_06_world.sql
index 257ab83e266..257ab83e266 100644
--- a/sql/updates/world/2015_05_20_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_06_world.sql
diff --git a/sql/updates/world/2015_05_20_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_07_world.sql
index 21c090c3103..21c090c3103 100644
--- a/sql/updates/world/2015_05_20_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_07_world.sql
diff --git a/sql/updates/world/2015_05_20_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_08_world.sql
index 42ea7da2159..42ea7da2159 100644
--- a/sql/updates/world/2015_05_20_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_08_world.sql
diff --git a/sql/updates/world/2015_05_20_09_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_09_world.sql
index bef8f966737..bef8f966737 100644
--- a/sql/updates/world/2015_05_20_09_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_09_world.sql
diff --git a/sql/updates/world/2015_05_21_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_00_world.sql
index c076920bbba..c076920bbba 100644
--- a/sql/updates/world/2015_05_21_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_00_world.sql
diff --git a/sql/updates/world/2015_05_21_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_01_world.sql
index 9468a3d8073..9468a3d8073 100644
--- a/sql/updates/world/2015_05_21_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_01_world.sql
diff --git a/sql/updates/world/2015_05_21_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_02_world.sql
index 6dd265a1a3f..6dd265a1a3f 100644
--- a/sql/updates/world/2015_05_21_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_02_world.sql
diff --git a/sql/updates/world/2015_05_21_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_03_world.sql
index 70fb2687b8c..70fb2687b8c 100644
--- a/sql/updates/world/2015_05_21_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_03_world.sql
diff --git a/sql/updates/world/2015_05_22_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_00_world.sql
index 2949d0eca4a..2949d0eca4a 100644
--- a/sql/updates/world/2015_05_22_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_00_world.sql
diff --git a/sql/updates/world/2015_05_22_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_01_world.sql
index 676fa999ebb..676fa999ebb 100644
--- a/sql/updates/world/2015_05_22_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_01_world.sql
diff --git a/sql/updates/world/2015_05_22_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_02_world.sql
index f4322c6c2ba..f4322c6c2ba 100644
--- a/sql/updates/world/2015_05_22_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_02_world.sql
diff --git a/sql/updates/world/2015_05_22_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_03_world.sql
index 31ba798f2da..31ba798f2da 100644
--- a/sql/updates/world/2015_05_22_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_03_world.sql
diff --git a/sql/updates/world/2015_05_22_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_04_world.sql
index f99479a6042..f99479a6042 100644
--- a/sql/updates/world/2015_05_22_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_04_world.sql
diff --git a/sql/updates/world/2015_05_22_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_05_world.sql
index 076c8fe22de..076c8fe22de 100644
--- a/sql/updates/world/2015_05_22_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_05_world.sql
diff --git a/sql/updates/world/2015_05_22_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_06_world.sql
index 939ee2dbc7a..939ee2dbc7a 100644
--- a/sql/updates/world/2015_05_22_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_06_world.sql
diff --git a/sql/updates/world/2015_05_22_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_07_world.sql
index fbc99492240..fbc99492240 100644
--- a/sql/updates/world/2015_05_22_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_07_world.sql
diff --git a/sql/updates/world/2015_05_22_08_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_08_world_335.sql
index 9cdb7edf295..9cdb7edf295 100644
--- a/sql/updates/world/2015_05_22_08_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_08_world_335.sql
diff --git a/sql/updates/world/2015_05_22_09_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_09_world.sql
index e24e207cd3c..e24e207cd3c 100644
--- a/sql/updates/world/2015_05_22_09_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_09_world.sql
diff --git a/sql/updates/world/2015_05_22_10_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_10_world.sql
index a87647f1cd7..a87647f1cd7 100644
--- a/sql/updates/world/2015_05_22_10_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_10_world.sql
diff --git a/sql/updates/world/2015_05_22_11_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_11_world.sql
index 01122a6bc57..01122a6bc57 100644
--- a/sql/updates/world/2015_05_22_11_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_11_world.sql
diff --git a/sql/updates/world/2015_05_22_12_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_12_world.sql
index 84b5918e7f4..84b5918e7f4 100644
--- a/sql/updates/world/2015_05_22_12_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_12_world.sql
diff --git a/sql/updates/world/2015_05_22_13_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_13_world.sql
index db90e99cf4d..db90e99cf4d 100644
--- a/sql/updates/world/2015_05_22_13_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_13_world.sql
diff --git a/sql/updates/world/2015_05_22_14_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_14_world.sql
index 43bbacd2d1a..43bbacd2d1a 100644
--- a/sql/updates/world/2015_05_22_14_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_14_world.sql
diff --git a/sql/updates/world/2015_05_22_15_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_15_world.sql
index c2a90abf892..c2a90abf892 100644
--- a/sql/updates/world/2015_05_22_15_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_15_world.sql
diff --git a/sql/updates/world/2015_05_23_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_00_world.sql
index 914b721b2ed..914b721b2ed 100644
--- a/sql/updates/world/2015_05_23_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_00_world.sql
diff --git a/sql/updates/world/2015_05_23_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_01_world.sql
index 44c17b81f48..44c17b81f48 100644
--- a/sql/updates/world/2015_05_23_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_01_world.sql
diff --git a/sql/updates/world/2015_05_23_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_02_world.sql
index b00fa1c2d86..b00fa1c2d86 100644
--- a/sql/updates/world/2015_05_23_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_02_world.sql
diff --git a/sql/updates/world/2015_05_23_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_03_world.sql
index ace8253bbde..ace8253bbde 100644
--- a/sql/updates/world/2015_05_23_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_03_world.sql
diff --git a/sql/updates/world/2015_05_24_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_00_world.sql
index 946c20339cb..946c20339cb 100644
--- a/sql/updates/world/2015_05_24_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_00_world.sql
diff --git a/sql/updates/world/2015_05_24_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_01_world.sql
index b8e343d9840..b8e343d9840 100644
--- a/sql/updates/world/2015_05_24_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_01_world.sql
diff --git a/sql/updates/world/2015_05_24_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_02_world.sql
index 7f8cd3a457f..7f8cd3a457f 100644
--- a/sql/updates/world/2015_05_24_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_02_world.sql
diff --git a/sql/updates/world/2015_05_24_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_03_world.sql
index e4283fae295..e4283fae295 100644
--- a/sql/updates/world/2015_05_24_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_03_world.sql
diff --git a/sql/updates/world/2015_05_24_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_04_world.sql
index 70cc65fb490..70cc65fb490 100644
--- a/sql/updates/world/2015_05_24_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_04_world.sql
diff --git a/sql/updates/world/2015_05_24_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_05_world.sql
index 2b3641b257c..2b3641b257c 100644
--- a/sql/updates/world/2015_05_24_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_05_world.sql
diff --git a/sql/updates/world/2015_05_24_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_06_world.sql
index 756b2d569cf..756b2d569cf 100644
--- a/sql/updates/world/2015_05_24_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_06_world.sql
diff --git a/sql/updates/world/2015_05_24_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_07_world.sql
index af7e82b8087..af7e82b8087 100644
--- a/sql/updates/world/2015_05_24_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_07_world.sql
diff --git a/sql/updates/world/2015_05_24_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_08_world.sql
index d8bc19aaffb..d8bc19aaffb 100644
--- a/sql/updates/world/2015_05_24_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_08_world.sql
diff --git a/sql/updates/world/2015_05_25_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_25_00_world.sql
index 4b1cc48da5a..4b1cc48da5a 100644
--- a/sql/updates/world/2015_05_25_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_25_00_world.sql
diff --git a/sql/updates/world/2015_05_26_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_00_world.sql
index cc1a6810764..cc1a6810764 100644
--- a/sql/updates/world/2015_05_26_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_00_world.sql
diff --git a/sql/updates/world/2015_05_26_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_01_world.sql
index b1dd41196a6..b1dd41196a6 100644
--- a/sql/updates/world/2015_05_26_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_01_world.sql
diff --git a/sql/updates/world/2015_05_26_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_02_world.sql
index d56e45a1514..d56e45a1514 100644
--- a/sql/updates/world/2015_05_26_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_02_world.sql
diff --git a/sql/updates/world/2015_05_26_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_03_world.sql
index 30b5103caa8..30b5103caa8 100644
--- a/sql/updates/world/2015_05_26_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_03_world.sql
diff --git a/sql/updates/world/2015_05_26_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_04_world.sql
index 39728f515ee..39728f515ee 100644
--- a/sql/updates/world/2015_05_26_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_04_world.sql
diff --git a/sql/updates/world/2015_05_26_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_05_world.sql
index d7ef0e17204..d7ef0e17204 100644
--- a/sql/updates/world/2015_05_26_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_05_world.sql
diff --git a/sql/updates/world/2015_05_26_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_06_world.sql
index 09010f2475b..09010f2475b 100644
--- a/sql/updates/world/2015_05_26_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_06_world.sql
diff --git a/sql/updates/world/2015_05_27_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_27_00_world.sql
index 8f0f712ea27..8f0f712ea27 100644
--- a/sql/updates/world/2015_05_27_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_27_00_world.sql
diff --git a/sql/updates/world/2015_05_27_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_27_01_world.sql
index 0c706304d60..0c706304d60 100644
--- a/sql/updates/world/2015_05_27_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_27_01_world.sql
diff --git a/sql/updates/world/2015_05_28_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_28_00_world.sql
index e8bdb13ddb5..e8bdb13ddb5 100644
--- a/sql/updates/world/2015_05_28_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_28_00_world.sql
diff --git a/sql/updates/world/2015_05_28_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_28_01_world.sql
index 1199e250c47..1199e250c47 100644
--- a/sql/updates/world/2015_05_28_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_28_01_world.sql
diff --git a/sql/updates/world/2015_05_28_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_28_02_world.sql
index 1376088c3e1..1376088c3e1 100644
--- a/sql/updates/world/2015_05_28_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_28_02_world.sql
diff --git a/sql/updates/world/2015_05_29_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_29_00_world.sql
index 0f3c69c0b4d..0f3c69c0b4d 100644
--- a/sql/updates/world/2015_05_29_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_29_00_world.sql
diff --git a/sql/updates/world/2015_05_29_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_29_01_world.sql
index ce03049c9a9..ce03049c9a9 100644
--- a/sql/updates/world/2015_05_29_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_29_01_world.sql
diff --git a/sql/updates/world/2015_05_30_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_00_world.sql
index df213688ba7..df213688ba7 100644
--- a/sql/updates/world/2015_05_30_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_00_world.sql
diff --git a/sql/updates/world/2015_05_30_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_01_world.sql
index 5a3a2208d7d..5a3a2208d7d 100644
--- a/sql/updates/world/2015_05_30_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_01_world.sql
diff --git a/sql/updates/world/2015_05_30_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_02_world.sql
index 0dd7eb3bcab..0dd7eb3bcab 100644
--- a/sql/updates/world/2015_05_30_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_02_world.sql
diff --git a/sql/updates/world/2015_05_30_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_03_world.sql
index 634705b846f..634705b846f 100644
--- a/sql/updates/world/2015_05_30_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_03_world.sql
diff --git a/sql/updates/world/2015_05_31_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_00_world.sql
index 090cff4b41b..090cff4b41b 100644
--- a/sql/updates/world/2015_05_31_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_00_world.sql
diff --git a/sql/updates/world/2015_05_31_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_01_world.sql
index 151c7865bbc..151c7865bbc 100644
--- a/sql/updates/world/2015_05_31_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_01_world.sql
diff --git a/sql/updates/world/2015_05_31_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_02_world.sql
index fdc14ab4b6f..fdc14ab4b6f 100644
--- a/sql/updates/world/2015_05_31_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_02_world.sql
diff --git a/sql/updates/world/2015_05_31_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_03_world.sql
index e786e71191c..e786e71191c 100644
--- a/sql/updates/world/2015_05_31_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_03_world.sql
diff --git a/sql/updates/world/2015_05_31_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_04_world.sql
index 94785d6d356..94785d6d356 100644
--- a/sql/updates/world/2015_05_31_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_04_world.sql
diff --git a/sql/updates/world/2015_05_31_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_05_world.sql
index bba678d60d6..bba678d60d6 100644
--- a/sql/updates/world/2015_05_31_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_05_world.sql
diff --git a/sql/updates/world/2015_06_01_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_01_00_world.sql
index 8ba1d65ec52..8ba1d65ec52 100644
--- a/sql/updates/world/2015_06_01_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_01_00_world.sql
diff --git a/sql/updates/world/2015_06_01_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_01_01_world.sql
index 6edab0cd995..6edab0cd995 100644
--- a/sql/updates/world/2015_06_01_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_01_01_world.sql
diff --git a/sql/updates/world/2015_06_02_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_02_00_world.sql
index 671a776367f..671a776367f 100644
--- a/sql/updates/world/2015_06_02_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_02_00_world.sql
diff --git a/sql/updates/world/2015_06_03_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_03_00_world.sql
index 31461906117..31461906117 100644
--- a/sql/updates/world/2015_06_03_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_03_00_world.sql
diff --git a/sql/updates/world/2015_06_03_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_03_01_world.sql
index 6315df93149..6315df93149 100644
--- a/sql/updates/world/2015_06_03_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_03_01_world.sql
diff --git a/sql/updates/world/2015_06_04_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_04_00_world.sql
index da4814af332..da4814af332 100644
--- a/sql/updates/world/2015_06_04_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_04_00_world.sql
diff --git a/sql/updates/world/2015_06_04_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_04_01_world.sql
index e70f226f5f4..e70f226f5f4 100644
--- a/sql/updates/world/2015_06_04_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_04_01_world.sql
diff --git a/sql/updates/world/2015_06_06_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_00_world.sql
index ba065a944bf..ba065a944bf 100644
--- a/sql/updates/world/2015_06_06_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_00_world.sql
diff --git a/sql/updates/world/2015_06_06_01_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_01_world_335.sql
index b8dc057cf34..b8dc057cf34 100644
--- a/sql/updates/world/2015_06_06_01_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_01_world_335.sql
diff --git a/sql/updates/world/2015_06_06_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_02_world.sql
index 509fe6a33b0..509fe6a33b0 100644
--- a/sql/updates/world/2015_06_06_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_02_world.sql
diff --git a/sql/updates/world/2015_06_06_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_03_world.sql
index 641217fffc0..641217fffc0 100644
--- a/sql/updates/world/2015_06_06_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_03_world.sql
diff --git a/sql/updates/world/2015_06_06_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_04_world.sql
index 8cb198d4c6f..8cb198d4c6f 100644
--- a/sql/updates/world/2015_06_06_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_04_world.sql
diff --git a/sql/updates/world/2015_06_06_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_05_world.sql
index 463b5c8e76a..463b5c8e76a 100644
--- a/sql/updates/world/2015_06_06_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_05_world.sql
diff --git a/sql/updates/world/2015_06_06_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_06_world.sql
index 374ace5e9f6..374ace5e9f6 100644
--- a/sql/updates/world/2015_06_06_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_06_world.sql
diff --git a/sql/updates/world/2015_06_06_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_07_world.sql
index c5132143a5b..c5132143a5b 100644
--- a/sql/updates/world/2015_06_06_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_07_world.sql
diff --git a/sql/updates/world/2015_06_06_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_08_world.sql
index 6e11c906871..6e11c906871 100644
--- a/sql/updates/world/2015_06_06_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_08_world.sql
diff --git a/sql/updates/world/2015_06_06_09_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_09_world.sql
index 388541fa522..388541fa522 100644
--- a/sql/updates/world/2015_06_06_09_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_09_world.sql
diff --git a/sql/updates/world/2015_06_06_10_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_10_world.sql
index c1740acf6b4..c1740acf6b4 100644
--- a/sql/updates/world/2015_06_06_10_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_10_world.sql
diff --git a/sql/updates/world/2015_06_06_11_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_11_world.sql
index 5edc822af3c..5edc822af3c 100644
--- a/sql/updates/world/2015_06_06_11_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_11_world.sql
diff --git a/sql/updates/world/2015_06_06_12_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_12_world.sql
index 06ff734a74c..06ff734a74c 100644
--- a/sql/updates/world/2015_06_06_12_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_12_world.sql
diff --git a/sql/updates/world/2015_06_06_13_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_13_world_335.sql
index 01801523945..01801523945 100644
--- a/sql/updates/world/2015_06_06_13_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_13_world_335.sql
diff --git a/sql/updates/world/2015_06_08_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_08_00_world.sql
index c375b89aa72..c375b89aa72 100644
--- a/sql/updates/world/2015_06_08_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_08_00_world.sql
diff --git a/sql/updates/world/2015_06_11_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_11_00_world.sql
index 2e5e4786c13..2e5e4786c13 100644
--- a/sql/updates/world/2015_06_11_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_11_00_world.sql
diff --git a/sql/updates/world/2015_06_12_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_12_00_world.sql
index 2ed3766deae..2ed3766deae 100644
--- a/sql/updates/world/2015_06_12_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_12_00_world.sql
diff --git a/sql/updates/world/2015_06_13_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_13_00_world.sql
index b360ce4e3bc..b360ce4e3bc 100644
--- a/sql/updates/world/2015_06_13_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_13_00_world.sql
diff --git a/sql/updates/world/2015_06_13_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_13_01_world.sql
index d0833aca0c2..d0833aca0c2 100644
--- a/sql/updates/world/2015_06_13_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_13_01_world.sql
diff --git a/sql/updates/world/2015_06_14_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_14_00_world.sql
index 07a6dd72f35..07a6dd72f35 100644
--- a/sql/updates/world/2015_06_14_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_14_00_world.sql
diff --git a/sql/updates/world/2015_06_21_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_21_00_world.sql
index 709f78fca92..709f78fca92 100644
--- a/sql/updates/world/2015_06_21_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_21_00_world.sql
diff --git a/sql/updates/world/2015_06_23_00_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_23_00_world_335.sql
index fd7132491b0..fd7132491b0 100644
--- a/sql/updates/world/2015_06_23_00_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_23_00_world_335.sql
diff --git a/sql/updates/world/2015_06_23_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_23_01_world.sql
index 2e42d16cd7b..2e42d16cd7b 100644
--- a/sql/updates/world/2015_06_23_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_23_01_world.sql
diff --git a/sql/updates/world/2015_06_23_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_23_02_world.sql
index adcbb40f7d1..adcbb40f7d1 100644
--- a/sql/updates/world/2015_06_23_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_23_02_world.sql
diff --git a/sql/updates/world/2015_06_25_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_25_00_world.sql
index 56e8aa61c9b..56e8aa61c9b 100644
--- a/sql/updates/world/2015_06_25_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_25_00_world.sql
diff --git a/sql/updates/world/2015_06_26_00_world_2015_06_13_00.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_26_00_world_2015_06_13_00.sql
index 1df4461fe38..1df4461fe38 100644
--- a/sql/updates/world/2015_06_26_00_world_2015_06_13_00.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_26_00_world_2015_06_13_00.sql
diff --git a/sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_26_01_world_2015_05_15_00.sql
index 06e2bdda370..06e2bdda370 100644
--- a/sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_26_01_world_2015_05_15_00.sql
diff --git a/sql/updates/world/2015_06_26_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_26_02_world.sql
index 2e4c22ab110..2e4c22ab110 100644
--- a/sql/updates/world/2015_06_26_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_26_02_world.sql
diff --git a/sql/updates/world/2015_06_28_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_00_world.sql
index 3991d639615..3991d639615 100644
--- a/sql/updates/world/2015_06_28_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_00_world.sql
diff --git a/sql/updates/world/2015_06_28_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_01_world.sql
index 4f591bc293c..4f591bc293c 100644
--- a/sql/updates/world/2015_06_28_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_01_world.sql
diff --git a/sql/updates/world/2015_06_28_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_02_world.sql
index 0b376442393..0b376442393 100644
--- a/sql/updates/world/2015_06_28_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_02_world.sql
diff --git a/sql/updates/world/2015_06_28_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_03_world.sql
index ff6dfc6330f..ff6dfc6330f 100644
--- a/sql/updates/world/2015_06_28_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_03_world.sql
diff --git a/sql/updates/world/2015_06_28_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_04_world.sql
index 9e96b40fa0b..9e96b40fa0b 100644
--- a/sql/updates/world/2015_06_28_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_04_world.sql
diff --git a/sql/updates/world/2015_06_28_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_05_world.sql
index b01701a74bd..b01701a74bd 100644
--- a/sql/updates/world/2015_06_28_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_05_world.sql
diff --git a/sql/updates/world/2015_06_28_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_06_world.sql
index f8937aaf081..f8937aaf081 100644
--- a/sql/updates/world/2015_06_28_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_06_world.sql
diff --git a/sql/updates/world/2015_06_28_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_07_world.sql
index 20bddf5597c..20bddf5597c 100644
--- a/sql/updates/world/2015_06_28_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_07_world.sql
diff --git a/sql/updates/world/2015_06_29_00_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_29_00_world_335.sql
index c515264e0a7..c515264e0a7 100644
--- a/sql/updates/world/2015_06_29_00_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_29_00_world_335.sql
diff --git a/sql/updates/world/2015_07_01_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_00_world.sql
index 1ab4caae8c9..1ab4caae8c9 100644
--- a/sql/updates/world/2015_07_01_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_00_world.sql
diff --git a/sql/updates/world/2015_07_01_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_01_world.sql
index 483f3539f29..483f3539f29 100644
--- a/sql/updates/world/2015_07_01_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_01_world.sql
diff --git a/sql/updates/world/2015_07_01_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_02_world.sql
index 59238432ba9..59238432ba9 100644
--- a/sql/updates/world/2015_07_01_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_02_world.sql
diff --git a/sql/updates/world/2015_07_01_03_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_03_world_335.sql
index 4fde11a51aa..4fde11a51aa 100644
--- a/sql/updates/world/2015_07_01_03_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_03_world_335.sql
diff --git a/sql/updates/world/2015_07_06_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_06_00_world.sql
index 28d6b45e019..28d6b45e019 100644
--- a/sql/updates/world/2015_07_06_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_06_00_world.sql
diff --git a/sql/updates/world/2015_07_11_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_11_00_world.sql
index 968be928b13..968be928b13 100644
--- a/sql/updates/world/2015_07_11_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_11_00_world.sql
diff --git a/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_00_world.sql
new file mode 100644
index 00000000000..6b39023b2d5
--- /dev/null
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_00_world.sql
@@ -0,0 +1,15 @@
+--
+DELETE FROM `gameobject_template` WHERE `entry`=175622;
+INSERT INTO `gameobject_template` (`entry`, `type`, `displayId`, `name`, `size`, `data3`, `data6`, `VerifiedBuild`) VALUES
+(175622,6,477,'Rookery Egg Spawner',1,15745,-1,-18019);
+
+SET @ENTRY   := 10161;  -- NPC entry
+SET @SPELL1  := 15750;  -- Rookery Whelp Spawn-in Spell
+SET @obj     := 175622; -- Rookery Egg Spawner
+UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY;
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry`=@obj;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=1 AND `entryorguid`=@obj;
+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,0,54,0,100,0,0,0,0,0,11,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Rookery Whelp - On spawn - Cast Rookery Whelp Spawn-in Spell'),
+(@obj,1,0,0,63,0,100,0,0,0,0,0,99,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Rookery Egg Spawner - Jsut created - SET_LOOT_STATE 3');
diff --git a/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_01_world.sql
new file mode 100644
index 00000000000..26a5a94bd83
--- /dev/null
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_01_world.sql
@@ -0,0 +1,3 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN (13410, 13411);
+UPDATE `quest_template_addon` SET `AllowableClasses`=32 WHERE `id` IN (13410, 13411);
diff --git a/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_02_world.sql
new file mode 100644
index 00000000000..1bd9a94034a
--- /dev/null
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_02_world.sql
@@ -0,0 +1,39 @@
+--
+DELETE FROM `gameobject` WHERE `guid`=43131;
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (164820, 164821, 164822, 164823, 164824, 164825);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (164819, 164820, 164821, 164822, 164823, 164824, 164825) AND `source_type`=1;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (16481900,16481901,16481902,16481903,16481904,16481905) AND `source_type`=9;
+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
+(164819, 1, 0, 0, 70, 0, 100, 1, 2, 0, 0, 0, 87, 16481900, 16481901, 16481902, 16481903, 16481904, 16481905, 1, 0, 0, 0, 0, 0, 0, 0, 'Dark Keeper Portrait - ON_STATE_CHANGED - Random action list'),
+(16481900, 9, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 50, 164820, 999990, 0, 0, 0, 0, 8, 0, 0, 0, 831.54,-339.529,-46.682,0.802851, 'Dark Keeper Portrait - action list - Summon Dark Keeper Nameplate'),
+(16481900, 9, 1, 0, 0, 0, 100, 1, 2000, 2000, 0, 0, 106, 16, 0, 0, 0, 0, 0, 20, 164820, 20, 0, 0, 0, 0, 0, 'Dark Keeper Nameplate - action list - Remove flags'),
+(16481900, 9, 2, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9437, 8, 0, 0, 0, 0, 8, 0, 0, 0, 914.054688, -164.124573, -49.760696, 2.162512, 'Dark Keeper Portrait - action list - Summon Dark Keeper Vorfalk'),
+(16481900, 9, 3, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9445, 8, 0, 0, 0, 0, 8, 0, 0, 0, 916.78241, -163.221985, -49.760696, 2.222960, 'Dark Keeper Portrait - action list - Summon Dark guard'),
+(16481900, 9, 4, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9445, 8, 0, 0, 0, 0, 8, 0, 0, 0, 912.515259, -166.480469, -49.760696, 2.222960, 'Dark Keeper Portrait - action list - Summon Dark guard'),
+(16481901, 9, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 50, 164821, 999990, 0, 0, 0, 0, 8, 0, 0, 0, 831.54,-339.529,-46.682,0.802851, 'Dark Keeper Portrait - action list - Summon Dark Keeper Nameplate'),
+(16481901, 9, 1, 0, 0, 0, 100, 1, 2000, 2000, 0, 0, 106, 16, 0, 0, 0, 0, 0, 20, 164821, 20, 0, 0, 0, 0, 0, 'Dark Keeper Nameplate - action list - Remove flags'),
+(16481901, 9, 2, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9438, 8, 0, 0, 0, 0, 8, 0, 0, 0, 812.245789, -348.875336, -50.578079, 0.710542, 'Dark Keeper Portrait - action list - Summon Dark Keeper Bethek'),
+(16481901, 9, 3, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9445, 8, 0, 0, 0, 0, 8, 0, 0, 0, 809.894714, -348.221252, -50.578079, 0.713424, 'Dark Keeper Portrait - action list - Summon Dark guard'),
+(16481901, 9, 4, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9445, 8, 0, 0, 0, 0, 8, 0, 0, 0, 812.574646, -351.317627, -50.578079, 0.713424, 'Dark Keeper Portrait - action list - Summon Dark guard'),
+(16481902, 9, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 50, 164822, 999990, 0, 0, 0, 0, 8, 0, 0, 0, 831.54,-339.529,-46.682,0.802851, 'Dark Keeper Portrait - action list - Summon Dark Keeper Nameplate'),
+(16481902, 9, 1, 0, 0, 0, 100, 1, 2000, 2000, 0, 0, 106, 16, 0, 0, 0, 0, 0, 20, 164822, 20, 0, 0, 0, 0, 0, 'Dark Keeper Nameplate - action list - Remove flags'),
+(16481902, 9, 2, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9439, 8, 0, 0, 0, 0, 8, 0, 0, 0, 888.483093, -361.707306, -49.935787, 0.612107, 'Dark Keeper Portrait - action list - Summon Dark Keeper Uggel'),
+(16481902, 9, 3, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9445, 8, 0, 0, 0, 0, 8, 0, 0, 0, 886.981873, -360.477570, -49.935787, 0.612107, 'Dark Keeper Portrait - action list - Summon Dark guard'),
+(16481902, 9, 4, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9445, 8, 0, 0, 0, 0, 8, 0, 0, 0, 888.820007, -363.745789, -49.935787, 0.612107, 'Dark Keeper Portrait - action list - Summon Dark guard'),
+(16481903, 9, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 50, 164823, 999990, 0, 0, 0, 0, 8, 0, 0, 0, 831.54,-339.529,-46.682,0.802851, 'Dark Keeper Portrait - action list - Summon Dark Keeper Nameplate'),
+(16481903, 9, 1, 0, 0, 0, 100, 1, 2000, 2000, 0, 0, 106, 16, 0, 0, 0, 0, 0, 20, 164823, 20, 0, 0, 0, 0, 0, 'Dark Keeper Nameplate - action list - Remove flags'),
+(16481903, 9, 2, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9441, 8, 0, 0, 0, 0, 8, 0, 0, 0, 545.018250, -214.378723, -35.546509, 0.339364, 'Dark Keeper Portrait - action list - Summon Dark Keeper Zimrel'),
+(16481903, 9, 3, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9445, 8, 0, 0, 0, 0, 8, 0, 0, 0, 543.336975, -211.983978, -35.511829, 0.401620, 'Dark Keeper Portrait - action list - Summon Dark guard'),
+(16481903, 9, 4, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9445, 8, 0, 0, 0, 0, 8, 0, 0, 0, 546.018433, -217.407089, -35.570370, 0.505293, 'Dark Keeper Portrait - action list - Summon Dark guard'),
+(16481904, 9, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 50, 164824, 999990, 0, 0, 0, 0, 8, 0, 0, 0, 831.54,-339.529,-46.682,0.802851, 'Dark Keeper Portrait - action list - Summon Dark Keeper Nameplate'),
+(16481904, 9, 1, 0, 0, 0, 100, 1, 2000, 2000, 0, 0, 106, 16, 0, 0, 0, 0, 0, 20, 164824, 20, 0, 0, 0, 0, 0, 'Dark Keeper Nameplate - action list - Remove flags'),
+(16481904, 9, 2, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9442, 8, 0, 0, 0, 0, 8, 0, 0, 0, 659.373108, 2.659090, -60.058517, 0.990563, 'Dark Keeper Portrait - action list - Summon Dark Keeper Ofgut'),
+(16481904, 9, 3, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9445, 8, 0, 0, 0, 0, 8, 0, 0, 0, 658.681152, 5.299511, -60.058456, 0.990563, 'Dark Keeper Portrait - action list - Summon Dark guard'),
+(16481904, 9, 4, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9445, 8, 0, 0, 0, 0, 8, 0, 0, 0, 661.902344, 2.769512, -60.058456, 0.990563, 'Dark Keeper Portrait - action list - Summon Dark guard'),
+(16481904, 9, 5, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9445, 8, 0, 0, 0, 0, 8, 0, 0, 0, 659.791687, -0.450377, -60.058517, 0.990563, 'Dark Keeper Portrait - action list - Summon Dark guard'),
+(16481904, 9, 6, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9445, 8, 0, 0, 0, 0, 8, 0, 0, 0, 656.212524, 2.171975, -60.058456, 0.99056, 'Dark Keeper Portrait - action list - Summon Dark guard'),
+(16481905, 9, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 50, 164825, 999990, 0, 0, 0, 0, 8, 0, 0, 0, 831.54,-339.529,-46.682,0.802851, 'Dark Keeper Portrait - action list - Summon Dark Keeper Nameplate'),
+(16481905, 9, 1, 0, 0, 0, 100, 1, 2000, 2000, 0, 0, 106, 16, 0, 0, 0, 0, 0, 20, 164825, 20, 0, 0, 0, 0, 0, 'Dark Keeper Nameplate - action list - Remove flags'),
+(16481905, 9, 2, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9443, 8, 0, 0, 0, 0, 8, 0, 0, 0, 804.041260, -247.344772, -43.302856, 2.606160, 'Dark Keeper Portrait - action list - Summon Dark Keeper Pelver'),
+(16481905, 9, 3, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9445, 8, 0, 0, 0, 0, 8, 0, 0, 0, 805.992065, -246.460281, -43.302856, 2.525251, 'Dark Keeper Portrait - action list - Summon Dark guard'),
+(16481905, 9, 4, 0, 0, 0, 100, 1, 0, 0, 0, 0, 12, 9445, 8, 0, 0, 0, 0, 8, 0, 0, 0, 803.904053, -249.407654, -43.302856, 2.525251, 'Dark Keeper Portrait - action list - Summon Dark guard');
diff --git a/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_03_world.sql
new file mode 100644
index 00000000000..7051069c121
--- /dev/null
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_03_world.sql
@@ -0,0 +1,25 @@
+--
+UPDATE `creature_text` SET `type`=14 WHERE `Entry` IN (31397) AND `id` IN (5, 6, 7);
+UPDATE `smart_scripts` SET `action_type`=83, `action_param1`=1, `target_type`=1, `comment`="Saronite Mine Slave - On Script - remove npc flag"  WHERE `entryorguid` IN (3139700) AND `source_type`=9 AND `id` IN (1);
+UPDATE `smart_scripts` SET `action_type`=87, `action_param1`=3139700, `action_param2`=3139701  WHERE `entryorguid` IN (31397) AND `source_type`=0 AND `id` IN (0);
+DELETE FROM `smart_scripts` WHERE `entryorguid`=3139701 AND `source_type`=9;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=3139700 AND `source_type`=9 AND `id`>2;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=31397 AND `source_type`=0 AND `id`>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 
+(3139701, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Saronite Mine Slave  - action list - close gossip'),
+(3139701, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 2, 14, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Saronite Mine Slave  - action list - set faction'),
+(3139701, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Saronite Mine Slave  - action list - say text1'),
+(3139701, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Saronite Mine Slave  - action list - Attack'),
+(3139701, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 8599, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Saronite Mine Slave  - action list - cast Enrage'),
+(31397, 0, 1, 0, 0, 0, 100, 0, 1000, 1000, 14000, 14000, 11, 3148, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Saronite Mine Slave  - IC - cast Head Crack'),
+(31397, 0, 2, 0, 1, 0, 15, 0, 10000, 30000, 50000, 70000, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Saronite Mine Slave  - OOC - Say text2'),
+(3139700, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 7027.581543, 1894.517334, 529.414001, 0, 'Saronite Mine Slave  - action list - move to pos'),
+(3139700, 9, 4, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Saronite Mine Slave  - action list - despawn');
+
+DELETE FROM `creature_text` WHERE `entry` IN(31397) AND `groupid`=1;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`,`BroadcastTextId`) VALUES
+(31397,1,0,'Please, no more.',12,1,100,0,0,0,'Saronite Mine Slave', 32506),
+(31397,1,1,'Hit me again and you''ll regret it!',12,1,100,0,0,0,'Saronite Mine Slave', 32507),
+(31397,1,2,'Ow!',12,1,100,0,0,0,'Saronite Mine Slave', 32508),
+(31397,1,3,'I''m sorry. I''ll work harder.',12,1,100,0,0,0,'Saronite Mine Slave', 32509),
+(31397,1,4,'Soon the master will reclaim me!',12,1,100,0,0,0,'Saronite Mine Slave', 32510);
diff --git a/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_04_world.sql
new file mode 100644
index 00000000000..92d33488e9a
--- /dev/null
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_04_world.sql
@@ -0,0 +1,94 @@
+--
+UPDATE `gameobject_template` SET `AIName` = 'SmartGameObjectAI' WHERE `entry`=181058;
+UPDATE `creature_template` SET  `AIName` = 'SmartAI' WHERE `entry` IN (16059, 16053, 16051, 16050, 16049, 16052, 16054, 16055, 16058);
+DELETE FROM `smart_scripts` WHERE `entryorguid`=181058 AND `source_type`=1;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (18105800, 18105801, 18105802, 18105803, 18105804, 18105805, 18105806, 18105807, 18105808) AND `source_type`=9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (16059, 16053, 16051, 16050, 16049, 16052, 16054, 16055, 16058) 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
+(181058, 1, 0, 0, 63, 0, 100, 0, 0, 0, 0, 0, 88, 18105800, 18105801, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Banner of Provocation - Action list - Random Action list'),
+(18105800, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 12, 16053, 6, 240000, 0, 0, 0, 8, 0, 0, 0, 581.311523, -198.221954, -53.569504, 0.534245, 'Banner of Provocation - Action list - Summon unit'),
+(18105800, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 12, 16050, 6, 240000, 0, 0, 0, 8, 0, 0, 0, 595.331116, -207.562607, -53.427147, 1.512066, 'Banner of Provocation - Action list - Summon unit'),
+(18105800, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 12, 16052, 6, 240000, 0, 0, 0, 8, 0, 0, 0, 609.827820, -206.808533, -53.379620, 2.175728, 'Banner of Provocation - Action list - Summon unit'),
+(18105800, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 12, 16055, 6, 240000, 0, 0, 0, 8, 0, 0, 0, 618.482727, -196.314209, -53.240608, 2.926569, 'Banner of Provocation - Action list - Summon unit'),
+(18105801, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 12, 16051, 6, 240000, 0, 0, 0, 8, 0, 0, 0, 581.311523, -198.221954, -53.569504, 0.534245, 'Banner of Provocation - Action list - Summon unit'),
+(18105801, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 12, 16049, 6, 240000, 0, 0, 0, 8, 0, 0, 0, 595.331116, -207.562607, -53.427147, 1.512066, 'Banner of Provocation - Action list - Summon unit'),
+(18105801, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 12, 16054, 6, 240000, 0, 0, 0, 8, 0, 0, 0, 609.827820, -206.808533, -53.379620, 2.175728, 'Banner of Provocation - Action list - Summon unit'),
+(18105801, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 12, 16058, 6, 240000, 0, 0, 0, 8, 0, 0, 0, 618.482727, -196.314209, -53.240608, 2.926569, 'Banner of Provocation - Action list - Summon unit'),
+(181058, 1, 1, 2, 77, 0, 100, 1, 1, 4, 0, 0, 12, 16059, 6, 120000, 0, 0, 0, 8, 0, 0, 0, 606.113098, -199.239075, -53.441307, 0, 'Banner of Provocation - On counter set - Summon unit'),
+(181058, 1, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 44, 2, 0, 0, 0, 0, 0, 20, 181059, 90, 0, 0, 0, 0, 0,'Banner of Provocation - On counter set - Set to phase 2'),
+-- npc=16059
+(16059, 0, 0, 0, 1, 0, 100, 1, 100, 100, 0, 0, 11, 27578, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Theldren - IC - Battle Shout'),
+(16059, 0, 1, 0, 0, 0, 100, 0, 1000, 1000, 35000, 35000, 11, 27579, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Theldren - IC - Demoralizing Shout'),
+(16059, 0, 2, 0, 0, 0, 100, 0, 5000, 5000, 15000, 15000, 11, 27581, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Theldren - IC - Disarm '),
+(16059, 0, 3, 0, 2, 0, 100, 1, 20, 35, 0, 0, 11, 15503, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Theldren - IC - Heal '),
+(16059, 0, 4, 0, 0, 0, 100, 0, 7000, 7000, 9000, 9000, 11, 19134, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0,'Theldren - IC - Fear random target '),
+(16059, 0, 5, 0, 0, 0, 100, 0, 8000, 8000, 9000, 9000, 11, 27584, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Theldren - IC - Hamstring '),
+(16059, 0, 6, 0, 0, 0, 100, 0, 0, 0, 14000, 14000, 11, 27577, 2, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0,'Theldren - IC - Charge random target '),
+(16059, 0, 7, 0, 0, 0, 100, 0, 3000, 3000, 12000, 12000, 11, 27580, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Theldren - IC - Mortal Strike '),
+(16059, 0, 8, 0, 4, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Theldren - aggro -  text'),
+(16059, 0, 9, 10, 63, 0, 100, 0, 0, 0, 0, 0, 33, 16166, 0, 0, 0, 0, 0, 18, 90, 0, 0, 0, 0, 0, 0,'Theldren - Just summoned - kill credit'),
+(16059, 0, 10, 0, 61, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 60, 0, 0, 0, 0, 0, 0,'Theldren - Just summoned - Attack'),
+-- npc=16053
+(16053, 0, 0, 0, 1, 0, 100, 1, 100, 100, 0, 0, 11, 15786, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Totem'),
+(16053, 0, 1, 0, 0, 0, 100, 0, 1000, 1000, 15000, 15000, 11, 27623, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Fire totem'),
+(16053, 0, 2, 0, 0, 0, 100, 0, 5000, 5000, 9000, 9000, 11, 21401, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Frost shhock'),
+(16053, 0, 3, 0, 0, 0, 100, 0, 10000, 10000, 15000, 15000, 11, 15503, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Drink Healing Potion'), 
+(16053, 0, 4, 0, 0, 0, 100, 0, 7000, 7000, 12000, 12000, 11, 27624, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Lesser Healing Wave'),
+(16053, 0, 5, 0, 63, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 60, 0, 0, 0, 0, 0, 0,'Just summoned - Attack'),
+(16053, 0, 6, 0, 6, 0, 100, 0, 0, 0, 0, 0, 63, 1, 1, 0, 0, 0, 0, 20, 181058, 90, 0, 0, 0, 0, 0,'On death - Add +1 to the gob counter'),
+-- npc=16051
+(16051, 0, 0, 0, 0, 0, 100, 0, 1000, 1000, 6000, 7000, 11, 15241, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Scorch'),
+(16051, 0, 1, 0, 0, 0, 100, 0, 4000, 4000, 8000, 9000, 11, 11829, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Flamestrike'),
+(16051, 0, 2, 0, 0, 0, 100, 0, 12000, 15000, 20000, 25000, 11, 13323, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Polymorph'), 
+(16051, 0, 3, 0, 0, 0, 100, 0, 6000, 8000, 10000, 15000, 11, 17273, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Pyroblast'),
+(16051, 0, 4, 0, 63, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 60, 0, 0, 0, 0, 0, 0,'Just summoned - Attack'),
+(16051, 0, 5, 0, 6, 0, 100, 0, 0, 0, 0, 0, 63, 1, 1, 0, 0, 0, 0, 20, 181058, 90, 0, 0, 0, 0, 0,'On death - Add +1 to the gob counter'),
+-- npc=16050
+(16050, 0, 0, 0, 0, 0, 100, 0, 3000, 3000, 5000, 5000, 11, 27611, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Eviscerate'),
+(16050, 0, 1, 0, 0, 0, 100, 0, 1000, 1000, 7000, 7000, 11, 12540, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Gouge'),
+(16050, 0, 2, 0, 0, 0, 100, 0, 5000, 5000, 9000, 9000, 11, 27613, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'kick'),
+(16050, 0, 3, 0, 0, 0, 100, 0, 5000, 5000, 9000, 9000, 11, 27615, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0,'Kidney Shot'),
+(16050, 0, 4, 0, 0, 0, 100, 0, 8000, 8000, 8000, 8000, 11, 14873, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Sinister Strike'),
+(16050, 0, 5, 0, 63, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 60, 0, 0, 0, 0, 0, 0,'Just summoned - Attack'),
+(16050, 0, 6, 0, 6, 0, 100, 0, 0, 0, 0, 0, 63, 1, 1, 0, 0, 0, 0, 20, 181058, 90, 0, 0, 0, 0, 0,'On death - Add +1 to the gob counter'),
+-- npc=16049
+(16049, 0, 0, 0, 0, 0, 100, 0, 5000, 5000, 8000, 8000, 11, 15503, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Heal'),
+(16049, 0, 1, 0, 0, 0, 100, 0, 1000, 1000, 7500, 7500, 11, 11428, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Stuneed'),
+(16049, 0, 2, 0, 0, 0, 100, 0, 5000, 5000, 15000, 15000, 11, 27620, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0,'silence'),
+(16049, 0, 3, 0, 0, 0, 100, 0, 5000, 5000, 7000, 7000, 11, 27673, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,''),
+(16049, 0, 4, 0, 63, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 60, 0, 0, 0, 0, 0, 0,'Just summoned - Attack'),
+(16049, 0, 5, 0, 6, 0, 100, 0, 0, 0, 0, 0, 63, 1, 1, 0, 0, 0, 0, 20, 181058, 90, 0, 0, 0, 0, 0,'On death - Add +1 to the gob counter'),
+-- npc=16052
+(16052, 0, 0, 0, 0, 0, 100, 0, 5000, 5000, 8000, 8000, 11, 15503, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Heal'),
+(16052, 0, 1, 0, 0, 0, 100, 0, 3000, 3000, 7500, 7500, 11, 27632, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Aimed Shot'),
+(16052, 0, 2, 0, 0, 0, 100, 0, 5000, 5000, 9000, 9000, 11, 27634, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Concussive Shot'),
+(16052, 0, 3, 0, 0, 0, 100, 0, 5000, 5000, 7000, 7000, 11, 18651, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Multi-Shot'),
+(16052, 0, 4, 0, 0, 0, 100, 1, 0, 0, 0, 0, 11, 19561, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Summon Gnashjaw'),
+(16052, 0, 5, 0, 63, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 60, 0, 0, 0, 0, 0, 0,'Just summoned - Attack'),
+(16052, 0, 6, 0, 6, 0, 100, 0, 0, 0, 0, 0, 63, 1, 1, 0, 0, 0, 0, 20, 181058, 90, 0, 0, 0, 0, 0,'On death - Add +1 to the gob counter'),
+-- npc=16054
+(16054, 0, 0, 0, 0, 0, 100, 0, 5000, 5000, 8000, 8000, 11, 27677, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Recombobulate'),
+(16054, 0, 1, 0, 0, 0, 100, 0, 1000, 1000, 7500, 7500, 11, 27603, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Goblin Dragon Gun'),
+(16054, 0, 2, 0, 0, 0, 100, 0, 10000, 10000, 20000, 20000, 11, 8209, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Explosive Sheep'),
+(16054, 0, 3, 0, 0, 0, 100, 0, 5000, 5000, 7000, 7000, 11, 19784, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Dark Iron Bomb'),
+(16054, 0, 4, 0, 63, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 60, 0, 0, 0, 0, 0, 0,'Just summoned - Attack'),
+(16054, 0, 5, 0, 6, 0, 100, 0, 0, 0, 0, 0, 63, 1, 1, 0, 0, 0, 0, 20, 181058, 90, 0, 0, 0, 0, 0,'On death - Add +1 to the gob counter'),
+-- npc=16055
+(16055, 0, 0, 0, 0, 0, 100, 0, 5000, 5000, 8000, 8000, 11, 27608, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Flash Heal'),
+(16055, 0, 1, 0, 0, 0, 100, 0, 3000, 3000, 12000, 12000, 11, 20697, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Power Word: Shield'),
+(16055, 0, 2, 0, 0, 0, 100, 0, 10000, 10000, 15000, 15000, 11, 23895, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Renew'),
+(16055, 0, 3, 0, 0, 0, 100, 0, 5000, 5000, 7000, 7000, 11, 30898, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Shadow Word: Pain'),
+(16055, 0, 4, 0, 63, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 60, 0, 0, 0, 0, 0, 0,'Just summoned - Attack'),
+(16055, 0, 5, 0, 6, 0, 100, 0, 0, 0, 0, 0, 63, 1, 1, 0, 0, 0, 0, 20, 181058, 90, 0, 0, 0, 0, 0,'On death - Add +1 to the gob counter'),
+-- npc=16058
+(16058, 0, 0, 0, 0, 0, 100, 0, 5000, 5000, 8000, 8000, 11, 27618, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Blizzard'),
+(16058, 0, 1, 0, 0, 0, 100, 0, 3000, 3000, 12000, 12000, 11, 12557, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Cone of Cold'),
+(16058, 0, 2, 0, 0, 0, 100, 0, 7000, 7000, 5000, 5000, 11, 36990, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,'Frostbolt'),
+(16058, 0, 3, 0, 0, 0, 100, 0, 25000, 25000, 25000, 25000, 11, 45438, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,'Ice Block'),
+(16058, 0, 4, 0, 63, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 60, 0, 0, 0, 0, 0, 0,'Just summoned - Attack'),
+(16058, 0, 5, 0, 6, 0, 100, 0, 0, 0, 0, 0, 63, 1, 1, 0, 0, 0, 0, 20, 181058, 90, 0, 0, 0, 0, 0,'On death - Add +1 to the gob counter');
+DELETE FROM `creature_text` WHERE `entry`=16059;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES 
+(16059,0,0, 'I''m going to kick yer ugly head in!',14,0,100,0,0,0,11953,0,''),
+(16059,0,1, 'You want a fight? A fight you''ll get!',14,0,100,0,0,0,11952,0,''),
+(16059,0,2, 'I crush weaklings like you every day! Bring it on!',14,0,100,0,0,0,11954,0,'');
diff --git a/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_05_world.sql
new file mode 100644
index 00000000000..a2fb34e9d7d
--- /dev/null
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_05_world.sql
@@ -0,0 +1,34 @@
+--
+UPDATE `smart_scripts` SET `target_type`=15, `target_param2`=50, `target_param3`=0  WHERE `entryorguid`=164911 AND `source_Type`=1 AND `id`=0;
+UPDATE `smart_scripts` SET `target_type`=11, `target_param2`=50, `target_param3`=0  WHERE `entryorguid`=164911 AND `source_Type`=1 AND `id`=1;
+UPDATE `smart_scripts` SET `target_type`=11, `target_param2`=50, `target_param3`=0  WHERE `entryorguid`=164911 AND `source_Type`=1 AND `id`=2;
+UPDATE `smart_scripts` SET  `target_type`=11, `target_param2`=50, `target_param3`=0  WHERE `entryorguid`=9537 AND `source_Type`=0 AND `id`=4;
+UPDATE `smart_scripts` SET  `target_type`=11, `target_param2`=50, `target_param3`=0  WHERE `entryorguid`=9537 AND `source_Type`=0 AND `id`=16;
+UPDATE `smart_scripts` SET  `target_param1`=50  WHERE `entryorguid`=9537 AND `source_Type`=0 AND `id`=18;
+UPDATE `smart_scripts` SET  `target_type`=11, `target_param2`=50, `target_param3`=0  WHERE `entryorguid`=-71997 AND `source_Type`=0 AND `id`=10;
+UPDATE `smart_scripts` SET  `target_type`=11, `target_param2`=50, `target_param3`=0  WHERE `entryorguid`=-71997 AND `source_Type`=0 AND `id`=11;
+UPDATE `smart_scripts` SET  `target_param1`=50  WHERE `entryorguid`=-71997 AND `source_Type`=0 AND `id`=13;
+UPDATE `smart_scripts` SET  `target_type`=11, `target_param2`=50, `target_param3`=0  WHERE `entryorguid`=-71998 AND `source_Type`=0 AND `id`=10;
+UPDATE `smart_scripts` SET  `target_type`=11, `target_param2`=50, `target_param3`=0  WHERE `entryorguid`=-71998 AND `source_Type`=0 AND `id`=11;
+UPDATE `smart_scripts` SET  `target_param1`=50  WHERE `entryorguid`=-71998 AND source_Type=0 AND id=13;
+UPDATE `smart_scripts` SET  `target_type`=11, `target_param2`=50, `target_param3`=0  WHERE `entryorguid`=-71999 AND `source_Type`=0 AND `id`=10;
+UPDATE `smart_scripts` SET  `target_type`=11, `target_param2`=50, `target_param3`=0  WHERE `entryorguid`=-71999 AND `source_Type`=0 AND `id`=11;
+UPDATE `smart_scripts` SET  `target_param1`=50  WHERE `entryorguid`=-71999 AND `source_Type`=0 AND `id`=13;
+UPDATE `smart_scripts` SET `action_param6`=2  WHERE `entryorguid`=9537 AND `source_Type`=0 AND `id`=7;
+UPDATE `smart_scripts` SET `action_param6`=2  WHERE `entryorguid`=-71997 AND `source_Type`=0 AND `id`=4;
+UPDATE `smart_scripts` SET `action_param6`=2  WHERE `entryorguid`=-71998 AND `source_Type`=0 AND `id`=4;
+UPDATE `smart_scripts` SET `action_param6`=2  WHERE `entryorguid`=-71999 AND `source_Type`=0 AND `id`=4;
+UPDATE `smart_scripts` SET `link`=2  WHERE `entryorguid`=9537 AND `source_Type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `link`=3  WHERE `entryorguid`=-71997 AND `source_Type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `link`=3  WHERE `entryorguid`=-71998 AND `source_Type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `link`=3  WHERE `entryorguid`=-71999 AND `source_Type`=0 AND `id`=1; 
+
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`IN(9537) AND `id`=2;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`IN(-71997,-71998,-71999) AND `id`=3;
+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
+(9537,   0, 2 ,0, 61, 0, 100, 0, 0, 0, 0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Hurley Blackbreath - On spawn - react passif'),
+(-71997, 0, 3 ,0, 61, 0, 100, 0, 0, 0, 0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackbreath Crony - On spawn- react passif'),
+(-71998, 0, 3 ,0, 61, 0, 100, 0, 0, 0, 0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackbreath Crony - On spawn - react passif'),
+(-71999, 0, 3 ,0, 61, 0, 100, 0, 0, 0, 0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackbreath Crony - On spawn - react passif');
+
+UPDATE `creature_template` SET `unit_flags`=33344 WHERE `entry`=9543;
diff --git a/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_06_world.sql
new file mode 100644
index 00000000000..5a0db2b9ec5
--- /dev/null
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_06_world.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `gossip_menu_option` SET `action_menu_id`=4382 WHERE `menu_id`=4346 AND `id`=1;
+UPDATE `gossip_menu_option` SET `action_menu_id`=4383 WHERE `menu_id`=4346 AND `id`=2;
diff --git a/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_07_world.sql
new file mode 100644
index 00000000000..0a74a4c018d
--- /dev/null
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_07_world.sql
@@ -0,0 +1,14 @@
+--
+UPDATE `creature` SET `phaseMask`=1 WHERE `guid` IN (88806, 88792, 88802, 88788, 88777, 88778, 88804, 88790, 88800, 88786, 88803, 88789, 88797, 88783, 88796, 88782, 88799, 88785, 88784, 88798);
+DELETE FROM `creature` WHERE `guid` IN (129856, 129855, 129857, 129858, 129864);
+
+SET @GUID := 6341;  -- 3 free gob guid set by TC
+DELETE FROM `gameobject` WHERE `guid`IN (@GUID, @GUID+1, @GUID+2);
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(@GUID+0,196871,571,1,1,8121.33,794.503,481.288,-1.797,0,0,-0.782608,0.622515,180,100,1),
+(@GUID+1,196871,571,1,1,5644.50,2107.415,798.054,4.5902,0,0,-0.782608,0.622515,180,100,1),
+(@GUID+2,196871,571,1,1,5660.98,2106.137,798.054,4.5902,0,0,-0.782608,0.622515,180,100,1);
+
+DELETE FROM `gameobject_addon` WHERE `guid` IN (164446,164447, 6135, 6134);
+INSERT INTO `gameobject_addon` (`guid`, `invisibilityType`, `invisibilityValue`) VALUES 
+(@GUID+1,8,1000), (@GUID+2,8,1000), (6135,9,1000), (6134,9,1000);
diff --git a/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_08_world.sql
new file mode 100644
index 00000000000..c30dfc9c375
--- /dev/null
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_08_world.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid`=18759 AND `source_type`=0;
diff --git a/sql/old/3.3.5a/world/58_2015_03_21/2015_07_13_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_13_00_world.sql
new file mode 100644
index 00000000000..384699449f4
--- /dev/null
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_13_00_world.sql
@@ -0,0 +1,398 @@
+-- Howling Fjord - Wyrmskol
+-- 1.
+SET @NPC := 104907;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=832.9526,`position_y`=-4900.833,`position_z`=2.292943 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,832.9526,-4900.833,2.292943,0,0,0,0,100,0),
+(@PATH,2,833.7026,-4894.833,2.042943,0,0,0,0,100,0),
+(@PATH,3,834.7026,-4887.833,1.292943,0,0,0,0,100,0),
+(@PATH,4,836.7026,-4871.333,2.042943,0,0,0,0,100,0),
+(@PATH,5,837.6712,-4864.411,2.218289,0,0,0,0,100,0),
+(@PATH,6,834.9212,-4855.161,2.718289,0,0,0,0,100,0),
+(@PATH,7,833.6712,-4849.161,3.218289,0,0,0,0,100,0),
+(@PATH,8,832.6712,-4845.411,3.718289,0,0,0,0,100,0),
+(@PATH,9,833.3871,-4848.325,3.284828,0,0,0,0,100,0),
+(@PATH,10,834.6371,-4853.075,2.784828,0,0,0,0,100,0),
+(@PATH,11,836.6371,-4860.575,2.284828,0,0,0,0,100,0),
+(@PATH,12,837.5208,-4864.751,2.011053,0,0,0,0,100,0),
+(@PATH,13,836.0208,-4876.501,1.511053,0,0,0,0,100,0),
+(@PATH,14,833.2708,-4897.251,2.011053,0,0,0,0,100,0),
+(@PATH,15,832.8204,-4900.963,2.558359,0,0,0,0,100,0),
+(@PATH,16,837.8204,-4908.463,3.058359,0,0,0,0,100,0),
+(@PATH,17,840.5704,-4912.713,3.308359,0,0,0,0,100,0),
+(@PATH,18,842.8204,-4915.713,4.058359,0,0,0,0,100,0),
+(@PATH,19,845.3204,-4919.963,4.558359,0,0,0,0,100,0),
+(@PATH,20,852.834,-4931.051,4.537304,0,0,0,0,100,0),
+(@PATH,21,865.834,-4948.301,4.037304,0,0,0,0,100,0),
+(@PATH,22,869.4553,-4953.051,3.750921,0,0,0,0,100,0),
+(@PATH,23,875.4553,-4956.801,3.250921,0,0,0,0,100,0),
+(@PATH,24,878.4553,-4958.551,2.750921,0,0,0,0,100,0),
+(@PATH,25,882.7053,-4961.301,2.000921,0,0,0,0,100,0),
+(@PATH,26,878.4462,-4958.602,2.705121,0,0,0,0,100,0),
+(@PATH,27,876.1962,-4957.352,3.205121,0,0,0,0,100,0),
+(@PATH,28,869.2432,-4952.792,3.942354,0,0,0,0,100,0),
+(@PATH,29,859.7432,-4940.292,4.442354,0,0,0,0,100,0),
+(@PATH,30,852.5776,-4930.71,4.488802,0,0,0,0,100,0),
+(@PATH,31,842.3276,-4915.21,3.988802,0,0,0,0,100,0),
+(@PATH,32,840.0776,-4911.96,3.238802,0,0,0,0,100,0),
+(@PATH,33,837.3276,-4907.71,2.988802,0,0,0,0,100,0);
+
+-- 2.
+SET @NPC := 105806;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=991.1062,`position_y`=-4830.96,`position_z`=17.1903 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,991.1062,-4830.96,17.1903,0,0,0,0,100,0),
+(@PATH,2,992.1062,-4829.71,17.1903,0,0,0,0,100,0),
+(@PATH,3,999.1062,-4822.46,17.1903,0,0,0,0,100,0),
+(@PATH,4,999.361,-4822.228,17.19029,0,0,0,0,100,0),
+(@PATH,5,1001.111,-4820.478,17.19029,0,0,0,0,100,0),
+(@PATH,6,1005.111,-4815.728,17.19029,0,0,0,0,100,0),
+(@PATH,7,1006.861,-4813.978,17.19029,0,0,0,0,100,0),
+(@PATH,8,1007.611,-4812.978,17.19029,0,0,0,0,100,0),
+(@PATH,9,1000.811,-4820.833,17.1903,0,0,0,0,100,0),
+(@PATH,10,999.0606,-4822.333,17.1903,0,0,0,0,100,0),
+(@PATH,11,991.9886,-4830.128,17.1903,0,0,0,0,100,0),
+(@PATH,12,990.9886,-4831.128,17.1903,0,0,0,0,100,0),
+(@PATH,13,989.9886,-4832.128,17.1903,0,0,0,0,100,0),
+(@PATH,14,989.2386,-4832.878,17.1903,0,0,0,0,100,0);
+
+-- 3.
+SET @NPC := 105798;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=924.4086,`position_y`=-4838.904,`position_z`=6.411173 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,924.4086,-4838.904,6.411173,0,0,0,0,100,0),
+(@PATH,2,924.1586,-4840.654,6.411173,0,0,0,0,100,0),
+(@PATH,3,911.9665,-4838.748,6.289279,0,0,0,0,100,0),
+(@PATH,4,907.4665,-4828.998,6.789279,0,0,0,0,100,0),
+(@PATH,5,907.2181,-4828.92,6.567353,0,0,0,0,100,0),
+(@PATH,6,906.4681,-4827.67,6.817353,0,0,0,0,100,0),
+(@PATH,7,906.7062,-4827.532,6.844745,0,0,0,0,100,0),
+(@PATH,8,903.7062,-4827.532,6.844745,0,0,0,0,100,0),
+(@PATH,9,905.2062,-4831.282,6.344745,0,0,0,0,100,0),
+(@PATH,10,908.2062,-4839.532,6.094745,0,0,0,0,100,0),
+(@PATH,11,908.4603,-4839.719,5.910981,0,0,0,0,100,0),
+(@PATH,12,908.9603,-4840.719,5.910981,0,0,0,0,100,0),
+(@PATH,13,924.6008,-4838.925,6.675292,0,0,0,0,100,0),
+(@PATH,14,924.8508,-4836.925,7.425292,0,0,0,0,100,0),
+(@PATH,15,925.1008,-4833.925,8.675291,0,0,0,0,100,0),
+(@PATH,16,925.3508,-4832.675,8.925291,0,0,0,0,100,0),
+(@PATH,17,925.3508,-4832.175,9.175291,0,0,0,0,100,0),
+(@PATH,18,925.1008,-4831.175,9.175291,0,0,0,0,100,0),
+(@PATH,19,925.3508,-4830.675,8.925291,0,0,0,0,100,0),
+(@PATH,20,925.8508,-4827.425,8.925291,0,0,0,0,100,0),
+(@PATH,21,925.8508,-4826.925,8.925291,0,0,0,0,100,0),
+(@PATH,22,926.1008,-4826.175,8.925291,0,0,0,0,100,0),
+(@PATH,23,926.6008,-4822.175,8.925291,0,0,0,0,100,0),
+(@PATH,24,927.5,-4816.937,9.10537,0,0,0,0,100,0),
+(@PATH,25,924.0263,-4816.295,9.076832,0,0,0,0,100,0),
+(@PATH,26,924.0263,-4820.545,9.076832,0,0,0,0,100,0),
+(@PATH,27,924.2763,-4824.295,9.076832,0,0,0,0,100,0),
+(@PATH,28,924.2763,-4826.045,9.076832,0,0,0,0,100,0),
+(@PATH,29,924.2763,-4827.045,9.076832,0,0,0,0,100,0),
+(@PATH,30,924.5263,-4829.795,9.076832,0,0,0,0,100,0),
+(@PATH,31,924.5263,-4831.545,9.326832,0,0,0,0,100,0),
+(@PATH,32,924.5263,-4833.295,9.076832,0,0,0,0,100,0),
+(@PATH,33,924.5263,-4836.545,7.576832,0,0,0,0,100,0),
+(@PATH,34,924.7763,-4838.795,6.576832,0,0,0,0,100,0);
+
+DELETE FROM `creature_addon` WHERE `guid`=104797;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(104797,0,0,0,1,27, '');
+
+-- 4.
+SET @NPC := 105510;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=928.6401,`position_y`=-4950.189,`position_z`=2.880867 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,928.6401,-4950.189,2.880867,0,0,0,0,100,0),
+(@PATH,2,926.8901,-4949.689,2.880867,0,0,0,0,100,0),
+(@PATH,3,926.1401,-4950.939,2.380867,0,0,0,0,100,0),
+(@PATH,4,924.8901,-4951.439,2.380867,0,0,0,0,100,0),
+(@PATH,5,923.3901,-4953.689,2.130867,0,0,0,0,100,0),
+(@PATH,6,923.3901,-4953.939,1.630867,0,0,0,0,100,0),
+(@PATH,7,923.1401,-4957.189,3.130867,0,0,0,0,100,0),
+(@PATH,8,923.1401,-4958.439,3.380867,0,0,0,0,100,0),
+(@PATH,9,923.6401,-4959.689,3.630867,0,0,0,0,100,0),
+(@PATH,10,923.1401,-4960.689,3.380867,0,0,0,0,100,0),
+(@PATH,11,921.8901,-4963.689,3.380867,0,0,0,0,100,0),
+(@PATH,12,920.8901,-4966.189,3.380867,0,0,0,0,100,0),
+(@PATH,13,919.8901,-4968.439,3.380867,0,0,0,0,100,0),
+(@PATH,14,917.8901,-4973.689,3.380867,0,0,0,0,100,0),
+(@PATH,15,917.8533,-4973.872,3.371433,0,0,0,0,100,0),
+(@PATH,16,917.3533,-4975.122,3.621433,0,0,0,0,100,0),
+(@PATH,17,917.6033,-4974.122,3.621433,0,0,0,0,100,0),
+(@PATH,18,920.1033,-4968.372,3.371433,0,0,0,0,100,0),
+(@PATH,19,921.1033,-4966.122,3.371433,0,0,0,0,100,0),
+(@PATH,20,921.8533,-4963.872,3.371433,0,0,0,0,100,0),
+(@PATH,21,922.8533,-4960.622,3.371433,0,0,0,0,100,0),
+(@PATH,22,923.6033,-4959.622,3.621433,0,0,0,0,100,0),
+(@PATH,23,924.3533,-4957.872,3.371433,0,0,0,0,100,0),
+(@PATH,24,925.3533,-4955.372,2.121433,0,0,0,0,100,0),
+(@PATH,25,926.0581,-4950.71,2.163225,0,0,0,0,100,0),
+(@PATH,26,922.1503,-4948.315,2.218931,0,0,0,0,100,0),
+(@PATH,27,926.5681,-4950.268,2.852909,0,0,0,0,100,0);
+
+-- 5.
+SET @NPC := 105803;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=1020.718,`position_y`=-4964.679,`position_z`=8.971722 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,1020.718,-4964.679,8.971722,0,0,0,0,100,0),
+(@PATH,2,1015.468,-4973.929,8.471722,0,0,0,0,100,0),
+(@PATH,3,1015.241,-4974.018,8.366907,0,0,0,0,100,0),
+(@PATH,4,1013.741,-4976.268,8.116907,0,0,0,0,100,0),
+(@PATH,5,1012.491,-4975.768,7.866907,0,0,0,0,100,0),
+(@PATH,6,1010.491,-4975.268,7.616907,0,0,0,0,100,0),
+(@PATH,7,1009.491,-4975.268,7.366907,0,0,0,0,100,0),
+(@PATH,8,1008.241,-4975.268,7.116907,0,0,0,0,100,0),
+(@PATH,9,1001.241,-4974.768,6.616907,0,0,0,0,100,0),
+(@PATH,10,1000.241,-4975.768,6.616907,0,0,0,0,100,0),
+(@PATH,11,995.9764,-4972.892,6.077339,0,0,0,0,100,0),
+(@PATH,12,986.4764,-4962.892,5.577339,0,0,0,0,100,0),
+(@PATH,13,982.9764,-4959.142,5.077339,0,0,0,0,100,0),
+(@PATH,14,978.9764,-4954.892,4.577339,0,0,0,0,100,0),
+(@PATH,15,979.0667,-4954.604,4.314516,0,0,0,0,100,0),
+(@PATH,16,978.0667,-4953.604,4.314516,0,0,0,0,100,0),
+(@PATH,17,981.6317,-4935.452,4.541917,0,0,0,0,100,0),
+(@PATH,18,992.8817,-4931.952,5.041917,0,0,0,0,100,0),
+(@PATH,19,999.0505,-4930.004,5.220732,0,0,0,0,100,0),
+(@PATH,20,1004.551,-4931.504,5.720732,0,0,0,0,100,0),
+(@PATH,21,1009.301,-4932.504,6.220732,0,0,0,0,100,0),
+(@PATH,22,1009.646,-4932.741,6.460849,0,0,0,0,100,0),
+(@PATH,23,1012.396,-4933.491,6.960849,0,0,0,0,100,0),
+(@PATH,24,1015.146,-4938.741,7.710849,0,0,0,0,100,0),
+(@PATH,25,1017.646,-4943.741,7.960849,0,0,0,0,100,0),
+(@PATH,26,1019.896,-4948.241,8.710849,0,0,0,0,100,0),
+(@PATH,27,1022.146,-4952.741,9.460849,0,0,0,0,100,0),
+(@PATH,28,1022.264,-4952.971,9.396458,0,0,0,0,100,0),
+(@PATH,29,1023.264,-4954.971,9.646458,0,0,0,0,100,0);
+
+-- visualspells
+-- Dragonflayer Death Weaver SAI
+SET @ENTRY := 23658;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,1,0,100,0,1000,1000,1000,1000,11,43159,0,0,0,0,0,19,24158,30,0,0,0,0,0,"Dragonflayer Death Weaver - Out of Combat - Cast 'Soul Infusion'");
+-- remove rndmmovement
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE  `guid`=104386;
+
+-- 6.
+SET @NPC := 105801;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=1033.632,`position_y`=-5027.26,`position_z`=10.98902 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,1033.632,-5027.26,10.98902,0,0,0,0,100,0),
+(@PATH,2,1040.969,-5052.146,10.95943,0,0,0,0,100,0),
+(@PATH,3,1041.719,-5055.146,10.95943,0,0,0,0,100,0),
+(@PATH,4,1044.219,-5064.146,10.95943,0,0,0,0,100,0),
+(@PATH,5,1046.595,-5071.466,10.83414,0,0,0,0,100,0),
+(@PATH,6,1051.095,-5071.216,10.83414,0,0,0,0,100,0),
+(@PATH,7,1053.345,-5071.216,10.83414,0,0,0,0,100,0),
+(@PATH,8,1055.595,-5070.966,10.58414,0,0,0,0,100,0),
+(@PATH,9,1057.095,-5070.966,10.58414,0,0,0,0,100,0),
+(@PATH,10,1059.345,-5070.716,10.58414,0,0,0,0,100,0),
+(@PATH,11,1059.584,-5070.768,10.60721,0,0,0,0,100,0),
+(@PATH,12,1062.334,-5070.768,10.60721,0,0,0,0,100,0),
+(@PATH,13,1066.834,-5072.018,11.10721,0,0,0,0,100,0),
+(@PATH,14,1077.334,-5069.018,11.35721,0,0,0,0,100,0),
+(@PATH,15,1077.834,-5068.768,10.60721,0,0,0,0,100,0),
+(@PATH,16,1087.084,-5064.268,10.60721,0,0,0,0,100,0),
+(@PATH,17,1093.334,-5060.768,10.35721,0,0,0,0,100,0),
+(@PATH,18,1083.835,-5057.688,10.86776,0,0,0,0,100,0),
+(@PATH,19,1080.085,-5057.438,10.36776,0,0,0,0,100,0),
+(@PATH,20,1066.835,-5060.938,10.36776,0,0,0,0,100,0),
+(@PATH,21,1062.081,-5070.768,10.56456,0,0,0,0,100,0),
+(@PATH,22,1059.331,-5070.768,10.56456,0,0,0,0,100,0),
+(@PATH,23,1057.081,-5071.018,10.56456,0,0,0,0,100,0),
+(@PATH,24,1055.581,-5071.018,10.56456,0,0,0,0,100,0),
+(@PATH,25,1053.331,-5071.018,10.81456,0,0,0,0,100,0),
+(@PATH,26,1051.331,-5071.268,10.81456,0,0,0,0,100,0),
+(@PATH,27,1046.227,-5071.43,10.92623,0,0,0,0,100,0),
+(@PATH,28,1044.227,-5064.18,10.92623,0,0,0,0,100,0),
+(@PATH,29,1041.727,-5055.18,10.92623,0,0,0,0,100,0),
+(@PATH,30,1041.615,-5054.926,11.01639,0,0,0,0,100,0),
+(@PATH,31,1040.615,-5051.926,10.76639,0,0,0,0,100,0),
+(@PATH,32,1033.615,-5027.426,11.01639,0,0,0,0,100,0),
+(@PATH,33,1033.632,-5027.26,10.98902,0,0,0,0,100,0);
+
+-- 7.
+SET @NPC := 101388;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=953.4445,`position_y`=-5022.563,`position_z`=6.194824 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,953.4445,-5022.563,6.194824,0,0,0,0,100,0),
+(@PATH,2,952.6945,-5023.813,6.194824,0,0,0,0,100,0),
+(@PATH,3,960.9445,-5029.063,5.944824,0,0,0,0,100,0),
+(@PATH,4,962.4445,-5029.813,6.194824,0,0,0,0,100,0),
+(@PATH,5,966.4445,-5032.313,6.194824,0,0,0,0,100,0),
+(@PATH,6,971.4445,-5035.563,6.194824,0,0,0,0,100,0),
+(@PATH,7,981.3123,-5041.753,6.079709,0,0,0,0,100,0),
+(@PATH,8,984.0623,-5037.503,6.079709,0,0,0,0,100,0),
+(@PATH,9,985.8123,-5035.003,5.579709,0,0,0,0,100,0),
+(@PATH,10,988.8123,-5030.003,5.079709,0,0,0,0,100,0),
+(@PATH,11,995.8123,-5019.753,4.079709,0,0,0,0,100,0),
+(@PATH,12,996.3123,-5017.253,3.829709,0,0,0,0,100,0),
+(@PATH,13,959.4459,-5012.519,6.297375,0,0,0,0,100,0),
+(@PATH,14,953.4459,-5022.269,6.047375,0,0,0,0,100,0);
+
+-- 8.
+SET @NPC := 113647;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=655.2243,`position_y`=-4943.861,`position_z`=6.125971 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,8469,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,655.2243,-4943.861,6.125971,0,0,0,0,100,0),
+(@PATH,2,651.4743,-4931.361,6.625971,0,0,0,0,100,0),
+(@PATH,3,650.2243,-4927.861,7.375971,0,0,0,0,100,0),
+(@PATH,4,649.9743,-4926.111,8.125971,0,0,0,0,100,0),
+(@PATH,5,648.9743,-4923.111,8.625971,0,0,0,0,100,0),
+(@PATH,6,648.4743,-4921.111,9.125971,0,0,0,0,100,0),
+(@PATH,7,647.9743,-4919.361,9.875971,0,0,0,0,100,0),
+(@PATH,8,647.2243,-4917.361,10.62597,0,0,0,0,100,0),
+(@PATH,9,646.2314,-4914.236,12.35588,0,0,0,0,100,0),
+(@PATH,10,645.2314,-4912.486,13.10588,0,0,0,0,100,0),
+(@PATH,11,644.2314,-4910.736,14.35588,0,0,0,0,100,0),
+(@PATH,12,642.4814,-4907.486,16.60588,0,0,0,0,100,0),
+(@PATH,13,641.4814,-4905.736,18.10588,0,0,0,0,100,0),
+(@PATH,14,640.4814,-4903.986,19.60588,0,0,0,0,100,0),
+(@PATH,15,639.3942,-4902.131,20.73806,0,0,0,0,100,0),
+(@PATH,16,639.1442,-4901.131,21.23806,0,0,0,0,100,0),
+(@PATH,17,638.8942,-4900.131,21.98806,0,0,0,0,100,0),
+(@PATH,18,638.6442,-4899.131,22.48806,0,0,0,0,100,0),
+(@PATH,19,638.3942,-4898.131,23.23806,0,0,0,0,100,0),
+(@PATH,20,637.6442,-4896.381,24.48806,0,0,0,0,100,0),
+(@PATH,21,637.6442,-4895.381,24.98806,0,0,0,0,100,0),
+(@PATH,22,637.3942,-4894.631,25.73806,0,0,0,0,100,0),
+(@PATH,23,637.1442,-4893.631,26.23806,0,0,0,0,100,0),
+(@PATH,24,636.8942,-4892.631,26.98806,0,0,0,0,100,0),
+(@PATH,25,636.3942,-4890.631,27.73806,0,0,0,0,100,0),
+(@PATH,26,636.1442,-4889.881,28.48806,0,0,0,0,100,0),
+(@PATH,27,635.8942,-4888.881,29.23806,0,0,0,0,100,0),
+(@PATH,28,635.6442,-4887.881,29.98806,0,0,0,0,100,0),
+(@PATH,29,635.6986,-4888.498,29.41977,0,0,0,0,100,0),
+(@PATH,30,635.4486,-4887.748,29.91977,0,0,0,0,100,0),
+(@PATH,31,635.1986,-4886.998,30.66977,0,0,0,0,100,0),
+(@PATH,32,631.4691,-4887.98,30.75117,0,0,0,0,100,0),
+(@PATH,33,632.4691,-4889.73,29.50117,0,0,0,0,100,0),
+(@PATH,34,633.4691,-4891.48,28.75117,0,0,0,0,100,0),
+(@PATH,35,634.4691,-4893.23,27.00117,0,0,0,0,100,0),
+(@PATH,36,635.4691,-4894.98,25.50117,0,0,0,0,100,0),
+(@PATH,37,636.4691,-4896.48,25.00117,0,0,0,0,100,0),
+(@PATH,38,637.2191,-4898.23,23.50117,0,0,0,0,100,0),
+(@PATH,39,637.9691,-4899.98,22.25117,0,0,0,0,100,0),
+(@PATH,40,638.9691,-4901.73,21.25117,0,0,0,0,100,0),
+(@PATH,41,639.2169,-4901.832,21.10294,0,0,0,0,100,0),
+(@PATH,42,640.2169,-4903.582,19.60294,0,0,0,0,100,0),
+(@PATH,43,641.2169,-4905.332,18.10294,0,0,0,0,100,0),
+(@PATH,44,641.9669,-4907.082,17.10294,0,0,0,0,100,0),
+(@PATH,45,642.9669,-4908.832,15.85294,0,0,0,0,100,0),
+(@PATH,46,643.7169,-4910.332,14.60294,0,0,0,0,100,0),
+(@PATH,47,644.9669,-4913.082,13.10294,0,0,0,0,100,0),
+(@PATH,48,645.9669,-4914.832,11.85294,0,0,0,0,100,0),
+(@PATH,49,646.9669,-4916.582,10.85294,0,0,0,0,100,0),
+(@PATH,50,647.8633,-4917.849,10.43143,0,0,0,0,100,0),
+(@PATH,51,648.3633,-4919.849,9.431431,0,0,0,0,100,0),
+(@PATH,52,649.1133,-4922.849,8.931431,0,0,0,0,100,0),
+(@PATH,53,649.3633,-4924.849,8.181431,0,0,0,0,100,0),
+(@PATH,54,650.1133,-4927.599,7.681431,0,0,0,0,100,0),
+(@PATH,55,650.6133,-4930.349,6.931431,0,0,0,0,100,0),
+(@PATH,56,651.8633,-4935.099,6.431431,0,0,0,0,100,0),
+(@PATH,57,653.776,-4943.458,5.970608,0,0,0,0,100,0),
+(@PATH,58,644.6491,-4957.902,5.843118,0,0,0,0,100,0),
+(@PATH,59,634.1491,-4968.652,5.093118,0,0,0,0,100,0),
+(@PATH,60,619.8991,-4983.652,4.843118,0,0,0,0,100,0),
+(@PATH,61,616.7938,-4986.155,4.304571,0,0,0,0,100,0),
+(@PATH,62,596.7675,-4983.58,4.695544,0,0,0,0,100,0),
+(@PATH,63,576.0175,-4976.83,4.945544,0,0,0,0,100,0),
+(@PATH,64,572.2675,-4975.58,5.695544,0,0,0,0,100,0),
+(@PATH,65,572.0885,-4975.668,5.86325,0,0,0,0,100,0),
+(@PATH,66,571.5885,-4975.418,6.11325,0,0,0,0,100,0),
+(@PATH,67,567.5885,-4976.668,6.86325,0,0,0,0,100,0),
+(@PATH,68,564.0885,-4977.918,7.36325,0,0,0,0,100,0),
+(@PATH,69,561.3385,-4978.668,7.86325,0,0,0,0,100,0),
+(@PATH,70,559.3385,-4979.168,8.61325,0,0,0,0,100,0),
+(@PATH,71,557.3385,-4979.918,9.11325,0,0,0,0,100,0),
+(@PATH,72,555.0521,-4980.638,10.00597,0,0,0,0,100,0),
+(@PATH,73,551.3021,-4981.138,10.50597,0,0,0,0,100,0),
+(@PATH,74,548.5521,-4981.388,11.25597,0,0,0,0,100,0),
+(@PATH,75,545.3079,-4981.789,11.84596,0,0,0,0,100,0),
+(@PATH,76,543.8079,-4979.289,12.84596,0,0,0,0,100,0),
+(@PATH,77,542.3079,-4976.539,14.84596,0,0,0,0,100,0),
+(@PATH,78,541.3079,-4974.789,15.59596,0,0,0,0,100,0),
+(@PATH,79,540.5579,-4973.039,16.59596,0,0,0,0,100,0),
+(@PATH,80,539.5579,-4971.539,17.34596,0,0,0,0,100,0),
+(@PATH,81,538.5579,-4970.039,17.84596,0,0,0,0,100,0),
+(@PATH,82,537.5579,-4968.289,18.84596,0,0,0,0,100,0),
+(@PATH,83,536.5579,-4966.539,19.84596,0,0,0,0,100,0),
+(@PATH,84,535.0579,-4963.789,21.09596,0,0,0,0,100,0),
+(@PATH,85,534.0579,-4962.039,22.09596,0,0,0,0,100,0),
+(@PATH,86,534.0902,-4962.266,21.93852,0,0,0,0,100,0),
+(@PATH,87,533.3402,-4960.766,22.93852,0,0,0,0,100,0),
+(@PATH,88,532.0902,-4961.516,22.93852,0,0,0,0,100,0),
+(@PATH,89,533.8402,-4964.016,21.18852,0,0,0,0,100,0),
+(@PATH,90,534.8402,-4965.766,20.18852,0,0,0,0,100,0),
+(@PATH,91,535.8402,-4967.516,19.43852,0,0,0,0,100,0),
+(@PATH,92,536.8402,-4968.766,18.68852,0,0,0,0,100,0),
+(@PATH,93,537.5902,-4970.516,18.18852,0,0,0,0,100,0),
+(@PATH,94,538.5902,-4972.266,17.18852,0,0,0,0,100,0),
+(@PATH,95,539.606,-4973.961,16.58982,0,0,0,0,100,0),
+(@PATH,96,540.356,-4974.461,16.08982,0,0,0,0,100,0),
+(@PATH,97,542.606,-4976.711,14.58982,0,0,0,0,100,0),
+(@PATH,98,544.356,-4978.461,13.33982,0,0,0,0,100,0),
+(@PATH,99,547.356,-4981.461,11.58982,0,0,0,0,100,0),
+(@PATH,100,547.6256,-4981.252,11.30922,0,0,0,0,100,0),
+(@PATH,101,548.6256,-4982.502,11.05922,0,0,0,0,100,0),
+(@PATH,102,551.6256,-4981.752,10.30922,0,0,0,0,100,0),
+(@PATH,103,554.3756,-4981.002,9.809217,0,0,0,0,100,0),
+(@PATH,104,558.1256,-4980.002,9.059217,0,0,0,0,100,0),
+(@PATH,105,560.1256,-4979.502,8.559217,0,0,0,0,100,0),
+(@PATH,106,558.3359,-4979.884,8.813904,0,0,0,0,100,0),
+(@PATH,107,560.3359,-4979.384,8.313904,0,0,0,0,100,0),
+(@PATH,108,560.8359,-4979.134,8.063904,0,0,0,0,100,0),
+(@PATH,109,564.3359,-4978.134,7.313903,0,0,0,0,100,0),
+(@PATH,110,567.0859,-4977.134,6.813903,0,0,0,0,100,0),
+(@PATH,111,569.8359,-4976.134,6.063903,0,0,0,0,100,0),
+(@PATH,112,570.0482,-4976.134,5.998487,0,0,0,0,100,0),
+(@PATH,113,571.0482,-4975.884,5.748487,0,0,0,0,100,0),
+(@PATH,114,573.7982,-4976.884,5.498487,0,0,0,0,100,0),
+(@PATH,115,576.5482,-4978.134,4.998487,0,0,0,0,100,0),
+(@PATH,116,580.0482,-4979.384,4.498487,0,0,0,0,100,0),
+(@PATH,117,590.3996,-4983.531,3.958145,0,0,0,0,100,0),
+(@PATH,118,599.1496,-4984.781,4.458145,0,0,0,0,100,0),
+(@PATH,119,619.5626,-4987.873,4.363738,0,0,0,0,100,0),
+(@PATH,120,624.5626,-4981.873,4.863738,0,0,0,0,100,0),
+(@PATH,121,630.5004,-4975.25,5.408068,0,0,0,0,100,0),
+(@PATH,122,644.4115,-4961.025,5.549562,0,0,0,0,100,0),
+(@PATH,123,655.3062,-4943.986,6.128833,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=113647;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(113647, 113647, 0, 0, 2, 0, 0),
+(113647, 113648, 4, 0, 2, 0, 0);
diff --git a/sql/old/3.3.5a/world/58_2015_03_21/2015_07_13_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_13_01_world.sql
new file mode 100644
index 00000000000..f2d691b3b82
--- /dev/null
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_13_01_world.sql
@@ -0,0 +1,441 @@
+-- Howling Ford - Baleheim
+
+-- 1.
+SET @NPC := 105427;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=1561.077,`position_y`=-5299.635,`position_z`=201.7604 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,1561.077,-5299.635,201.7604,0,0,0,0,100,0),
+(@PATH,2,1571.522,-5299.381,201.9658,0.04711876,0,0,0,100,0),
+(@PATH,3,1556.678,-5299.724,201.5954,0,0,0,0,100,0),
+(@PATH,4,1555.473,-5293.783,202.0718,0,0,0,0,100,0),
+(@PATH,5,1554.473,-5287.783,201.8218,0,0,0,0,100,0),
+(@PATH,6,1553.723,-5283.283,202.0718,0,0,0,0,100,0),
+(@PATH,7,1552.223,-5277.033,201.5718,0,0,0,0,100,0),
+(@PATH,8,1552.223,-5275.033,201.3218,0,0,0,0,100,0),
+(@PATH,9,1551.973,-5272.033,200.5718,0,0,0,0,100,0),
+(@PATH,10,1551.258,-5267.803,200.185,0,0,0,0,100,0),
+(@PATH,11,1554.758,-5257.553,199.435,0,0,0,0,100,0),
+(@PATH,12,1555.758,-5253.803,198.685,0,0,0,0,100,0),
+(@PATH,13,1556.758,-5251.053,198.185,0,0,0,0,100,0),
+(@PATH,14,1557.758,-5248.053,197.435,0,0,0,0,100,0),
+(@PATH,15,1558.88,-5245.146,196.3539,0,0,0,0,100,0),
+(@PATH,16,1558.88,-5242.146,195.6039,0,0,0,0,100,0),
+(@PATH,17,1559.63,-5237.396,195.1039,0,0,0,0,100,0),
+(@PATH,18,1559.86,-5233.974,194.6031,0,0,0,0,100,0),
+(@PATH,19,1559.11,-5231.224,193.8531,0,0,0,0,100,0),
+(@PATH,20,1557.86,-5227.224,193.1031,0,0,0,0,100,0),
+(@PATH,21,1557.11,-5224.474,192.3531,0,0,0,0,100,0),
+(@PATH,22,1556.61,-5222.474,191.8531,0,0,0,0,100,0),
+(@PATH,23,1555.36,-5218.724,191.1031,0,0,0,0,100,0),
+(@PATH,24,1554.86,-5215.974,190.3531,0,0,0,0,100,0),
+(@PATH,25,1551.61,-5204.474,189.8531,0,0,0,0,100,0),
+(@PATH,26,1550.081,-5199.936,189.4463,0,0,0,0,100,0),
+(@PATH,27,1543.581,-5195.186,190.1963,0,0,0,0,100,0),
+(@PATH,28,1539.081,-5191.686,190.6963,0,0,0,0,100,0),
+(@PATH,29,1532.888,-5186.81,191.1922,0,0,0,0,100,0),
+(@PATH,30,1519.388,-5181.31,190.4422,0,0,0,0,100,0),
+(@PATH,31,1511.437,-5178.014,190.0339,0,0,0,0,100,0),
+(@PATH,32,1501.937,-5179.514,189.7839,0,0,0,0,100,0),
+(@PATH,33,1490.024,-5181.557,189.5792,0,0,0,0,100,0),
+(@PATH,34,1469.024,-5187.307,189.0792,0,0,0,0,100,0),
+(@PATH,35,1459.077,-5186.193,189.7157,0,0,0,0,100,0),
+(@PATH,36,1457.077,-5185.943,189.9657,0,0,0,0,100,0),
+(@PATH,37,1456.577,-5185.943,190.2157,0,0,0,0,100,0),
+(@PATH,38,1453.577,-5186.443,191.4657,0,0,0,0,100,0),
+(@PATH,39,1453.481,-5186.764,191.6214,0,0,0,0,100,0),
+(@PATH,40,1456.481,-5186.514,190.1214,0,0,0,0,100,0),
+(@PATH,41,1457.481,-5186.514,190.1214,0,0,0,0,100,0),
+(@PATH,42,1458.481,-5186.514,189.8714,0,0,0,0,100,0),
+(@PATH,43,1461.231,-5187.514,189.3714,0,0,0,0,100,0),
+(@PATH,44,1465.014,-5188.682,188.9621,0,0,0,0,100,0),
+(@PATH,45,1459.388,-5198.137,189.6352,0,0,0,0,100,0),
+(@PATH,46,1446.638,-5207.387,190.1352,0,0,0,0,100,0),
+(@PATH,47,1443.388,-5209.887,190.6352,0,0,0,0,100,0),
+(@PATH,48,1440.138,-5212.137,191.3852,0,0,0,0,100,0),
+(@PATH,49,1439.874,-5212.509,191.4967,0,0,0,0,100,0),
+(@PATH,50,1438.374,-5213.509,192.2467,0,0,0,0,100,0),
+(@PATH,51,1437.624,-5216.759,192.9967,0,0,0,0,100,0),
+(@PATH,52,1436.624,-5220.509,193.4967,0,0,0,0,100,0),
+(@PATH,53,1435.874,-5223.509,194.2467,0,0,0,0,100,0),
+(@PATH,54,1435.624,-5224.759,194.7467,0,0,0,0,100,0),
+(@PATH,55,1433.624,-5226.759,195.4967,0,0,0,0,100,0),
+(@PATH,56,1432.624,-5229.009,196.4967,0,0,0,0,100,0),
+(@PATH,57,1432.124,-5231.009,197.2467,0,0,0,0,100,0),
+(@PATH,58,1432.124,-5233.009,197.7467,0,0,0,0,100,0),
+(@PATH,59,1432.156,-5233.357,198.068,0,0,0,0,100,0),
+(@PATH,60,1431.406,-5235.107,198.818,0,0,0,0,100,0),
+(@PATH,61,1430.906,-5242.107,201.568,0,0,0,0,100,0),
+(@PATH,62,1430.906,-5243.107,201.568,0,0,0,0,100,0),
+(@PATH,63,1434.406,-5243.857,202.818,0,0,0,0,100,0),
+(@PATH,64,1433.817,-5253.724,205.7995,0,0,0,0,100,0),
+(@PATH,65,1434.067,-5254.724,205.7995,0,0,0,0,100,0),
+(@PATH,66,1434.567,-5255.224,206.2995,0,0,0,0,100,0),
+(@PATH,67,1435.067,-5256.724,206.2995,0,0,0,0,100,0),
+(@PATH,68,1435.817,-5257.724,206.5495,0,0,0,0,100,0),
+(@PATH,69,1439.067,-5265.974,207.0495,0,0,0,0,100,0),
+(@PATH,70,1439.567,-5266.974,206.7995,0,0,0,0,100,0),
+(@PATH,71,1440.317,-5267.474,207.0495,0,0,0,0,100,0),
+(@PATH,72,1441.067,-5267.974,206.7995,0,0,0,0,100,0),
+(@PATH,73,1443.456,-5270.874,206.9769,0,0,0,0,100,0),
+(@PATH,74,1466.157,-5273.644,206.4446,0,0,0,0,100,0),
+(@PATH,75,1481.157,-5273.894,206.1946,0,0,0,0,100,0),
+(@PATH,76,1487.907,-5273.894,206.4446,0,0,0,0,100,0),
+(@PATH,77,1499.916,-5274.196,206.7411,0,0,0,0,100,0),
+(@PATH,78,1510.666,-5269.196,205.9911,0,0,0,0,100,0),
+(@PATH,79,1516.916,-5266.696,205.4911,0,0,0,0,100,0),
+(@PATH,80,1521.416,-5264.446,204.9911,0,0,0,0,100,0),
+(@PATH,81,1526.284,-5264.774,203.6901,0,0,0,0,100,0),
+(@PATH,82,1528.034,-5265.024,203.1901,0,0,0,0,100,0),
+(@PATH,83,1530.034,-5266.274,202.4401,0,0,0,0,100,0),
+(@PATH,84,1539.034,-5267.024,201.1901,0,0,0,0,100,0),
+(@PATH,85,1541.784,-5267.524,200.9401,0,0,0,0,100,0),
+(@PATH,86,1545.871,-5267.189,200.2871,0,0,0,0,100,0),
+(@PATH,87,1550.121,-5270.939,200.2871,0,0,0,0,100,0),
+(@PATH,88,1551.371,-5273.439,201.0371,0,0,0,0,100,0),
+(@PATH,89,1552.121,-5274.689,201.2871,0,0,0,0,100,0),
+(@PATH,90,1551.774,-5279.828,201.8945,0,0,0,0,100,0),
+(@PATH,91,1549.524,-5288.328,201.1445,0,0,0,0,100,0),
+(@PATH,92,1551.274,-5292.578,201.1445,0,0,0,0,100,0),
+(@PATH,93,1551.409,-5292.688,201.2267,0,0,0,0,100,0),
+(@PATH,94,1551.409,-5293.688,201.2267,0,0,0,0,100,0),
+(@PATH,95,1555.409,-5296.188,201.7267,0,0,0,0,100,0),
+(@PATH,96,1561.142,-5299.583,201.7539,0,0,0,0,100,0),
+(@PATH,97,1571.522,-5299.381,201.9658,0.04711876,0,0,0,100,0);
+
+-- 2.
+SET @NPC := 114753;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=1601.395,`position_y`=-4968.979,`position_z`=144.1384 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,1601.395,-4968.979,144.1384,0,0,0,0,100,0),
+(@PATH,2,1600.757,-4963.54,144.4538,0,0,0,0,100,0),
+(@PATH,3,1602.757,-4961.29,144.7038,0,0,0,0,100,0),
+(@PATH,4,1605.507,-4958.54,145.4538,0,0,0,0,100,0),
+(@PATH,5,1611.448,-4952.011,145.7336,0,0,0,0,100,0),
+(@PATH,6,1622.198,-4951.261,144.9836,0,0,0,0,100,0),
+(@PATH,7,1626.198,-4951.011,144.4836,0,0,0,0,100,0),
+(@PATH,8,1623.184,-4951.196,144.7398,0,0,0,0,100,0),
+(@PATH,9,1614.434,-4951.446,145.4898,0,0,0,0,100,0),
+(@PATH,10,1611.246,-4952.017,145.6747,0,0,0,0,100,0),
+(@PATH,11,1603.246,-4960.517,144.9247,0,0,0,0,100,0),
+(@PATH,12,1600.839,-4963.714,144.0903,0,0,0,0,100,0),
+(@PATH,13,1602.839,-4977.214,143.8403,0,0,0,0,100,0),
+(@PATH,14,1601.395,-4968.979,144.1384,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=114753;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(114753, 114753, 0, 0, 2, 0, 0),
+(114753, 100322, 2, 90, 0, 0, 0);
+
+-- 3.
+SET @NPC := 114761;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=1499.107,`position_y`=-4958.632,`position_z`=121.1436 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,1499.107,-4958.632,121.1436,0,0,0,0,100,0),
+(@PATH,2,1505.996,-4954.564,121.3016,0,0,0,0,100,0),
+(@PATH,3,1496.012,-4960.557,120.816,0,0,0,0,100,0),
+(@PATH,4,1495.029,-4961.049,120.3304,0.3665192,0,0,0,100,0),
+(@PATH,5,1499.107,-4958.632,121.1436,0,0,0,0,100,0);
+
+-- 4.
+SET @NPC := 114759;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=1511.549,`position_y`=-4924.131,`position_z`=124.3161 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,1511.549,-4924.131,124.3161,0,0,0,0,100,0),
+(@PATH,2,1512.337,-4927.372,126.3721,0,0,0,0,100,0),
+(@PATH,3,1512.587,-4928.872,127.6221,0,0,0,0,100,0),
+(@PATH,4,1513.087,-4930.872,128.1221,0,0,0,0,100,0),
+(@PATH,5,1513.479,-4932.331,128.9914,0,0,0,0,100,0),
+(@PATH,6,1512.951,-4930.13,128.2168,0,0,0,0,100,0),
+(@PATH,7,1512.701,-4929.13,127.7168,0,0,0,0,100,0),
+(@PATH,8,1512.451,-4928.13,126.4668,0,0,0,0,100,0),
+(@PATH,9,1512.201,-4926.63,125.9668,0,0,0,0,100,0),
+(@PATH,10,1511.451,-4923.63,124.2168,0,0,0,0,100,0),
+(@PATH,11,1510.923,-4922.429,123.4422,5.044002,0,0,0,100,0),
+(@PATH,12,1511.549,-4924.131,124.3161,0,0,0,0,100,0);
+
+-- 5.
+SET @NPC := 114748;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=1649.139,`position_y`=-4848.134,`position_z`=127.4596 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,1649.139,-4848.134,127.4596,0,0,0,0,100,0),
+(@PATH,2,1649.104,-4847.937,127.5568,0,0,0,0,100,0),
+(@PATH,3,1641.558,-4840.375,127.2656,0,0,0,0,100,0),
+(@PATH,4,1634.903,-4838.598,126.964,0,0,0,0,100,0),
+(@PATH,5,1635.027,-4838.845,126.7835,0,0,0,0,100,0),
+(@PATH,6,1635.286,-4838.562,126.933,0,0,0,0,100,0),
+(@PATH,7,1641.655,-4840.305,127.2741,0,0,0,0,100,0),
+(@PATH,8,1649.497,-4847.935,127.6258,0,0,0,0,100,0);
+
+-- 6.
+SET @NPC := 114942;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=1718.106,`position_y`=-4883.712,`position_z`=125.9529 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,1718.106,-4883.712,125.9529,0,0,0,0,100,0),
+(@PATH,2,1720.21,-4882.47,127.2277,0,0,0,0,100,0),
+(@PATH,3,1723.46,-4882.72,128.9778,0,0,0,0,100,0),
+(@PATH,4,1728.71,-4882.72,130.2278,0,0,0,0,100,0),
+(@PATH,5,1731.24,-4882.965,130.3452,0,0,0,0,100,0),
+(@PATH,6,1740.042,-4883.115,130.3452,0,0,0,0,100,0),
+(@PATH,7,1742.042,-4883.115,130.3452,0,0,0,0,100,0),
+(@PATH,8,1745.486,-4883.223,130.3452,0,0,0,0,100,0),
+(@PATH,9,1751.762,-4883.266,130.3452,0,0,0,0,100,0),
+(@PATH,10,1754.512,-4883.266,130.3452,0,0,0,0,100,0),
+(@PATH,11,1757.878,-4883.357,130.3452,0,0,0,0,100,0),
+(@PATH,12,1764.046,-4883.471,130.3452,0,0,0,0,100,0),
+(@PATH,13,1767.296,-4883.471,130.3452,0,0,0,0,100,0),
+(@PATH,14,1768.796,-4883.471,130.3452,0,0,0,0,100,0),
+(@PATH,15,1770.296,-4883.471,130.3452,0,0,0,0,100,0),
+(@PATH,16,1770.667,-4883.514,130.3452,0,0,0,0,100,0),
+(@PATH,17,1771.917,-4883.514,130.3452,0,0,0,0,100,0),
+(@PATH,18,1778.08,-4883.535,130.2061,0,0,0,0,100,0),
+(@PATH,19,1779.58,-4883.535,130.2061,0,0,0,0,100,0),
+(@PATH,20,1780.83,-4883.535,130.2061,0,0,0,0,100,0),
+(@PATH,21,1784.352,-4883.44,129.4088,0,0,0,0,100,0),
+(@PATH,22,1785.852,-4883.44,129.1588,0,0,0,0,100,0),
+(@PATH,23,1789.852,-4883.44,126.9088,0,0,0,0,100,0),
+(@PATH,24,1789.939,-4883.641,126.5849,0,0,0,0,100,0),
+(@PATH,25,1791.439,-4883.641,126.3349,0,0,0,0,100,0),
+(@PATH,26,1791.059,-4883.561,125.9662,0,0,0,0,100,0),
+(@PATH,27,1790.803,-4883.574,126.1703,0,0,0,0,100,0),
+(@PATH,28,1789.803,-4883.574,126.9203,0,0,0,0,100,0),
+(@PATH,29,1785.803,-4883.574,129.1703,0,0,0,0,100,0),
+(@PATH,30,1785.512,-4883.579,129.3584,0,0,0,0,100,0),
+(@PATH,31,1784.012,-4883.579,129.6084,0,0,0,0,100,0),
+(@PATH,32,1781.012,-4883.579,130.1084,0,0,0,0,100,0),
+(@PATH,33,1779.762,-4883.579,130.3584,0,0,0,0,100,0),
+(@PATH,34,1779.507,-4883.542,130.3221,0,0,0,0,100,0),
+(@PATH,35,1777.757,-4883.542,130.3221,0,0,0,0,100,0),
+(@PATH,36,1771.58,-4883.485,130.3452,0,0,0,0,100,0),
+(@PATH,37,1770.33,-4883.485,130.3452,0,0,0,0,100,0),
+(@PATH,38,1769.08,-4883.485,130.3452,0,0,0,0,100,0),
+(@PATH,39,1767.58,-4883.485,130.3452,0,0,0,0,100,0),
+(@PATH,40,1763.704,-4883.377,130.3452,0,0,0,0,100,0),
+(@PATH,41,1757.67,-4883.315,130.3452,0,0,0,0,100,0),
+(@PATH,42,1754.92,-4883.315,130.3452,0,0,0,0,100,0),
+(@PATH,43,1751.469,-4883.236,130.3452,0,0,0,0,100,0),
+(@PATH,44,1745.172,-4883.166,130.3452,0,0,0,0,100,0),
+(@PATH,45,1742.672,-4883.166,130.3452,0,0,0,0,100,0),
+(@PATH,46,1739.547,-4883.013,130.3452,0,0,0,0,100,0),
+(@PATH,47,1732.047,-4883.013,130.3452,0,0,0,0,100,0),
+(@PATH,48,1730.942,-4882.714,130.2043,0,0,0,0,100,0),
+(@PATH,49,1729.192,-4882.714,130.2043,0,0,0,0,100,0),
+(@PATH,50,1723.942,-4882.714,129.2043,0,0,0,0,100,0),
+(@PATH,51,1719.913,-4882.498,127.0959,0,0,0,0,100,0),
+(@PATH,52,1717.163,-4882.748,126.3459,0,0,0,0,100,0),
+(@PATH,53,1712.663,-4883.248,126.8459,0,0,0,0,100,0),
+(@PATH,54,1718.106,-4883.712,125.9529,0,0,0,0,100,0);
+
+-- 7.
+SET @NPC := 114944;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=1905.927,`position_y`=-4879.938,`position_z`=172.084 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,1905.927,-4879.938,172.084,0,0,0,0,100,0),
+(@PATH,2,1899.677,-4882.188,171.334,0,0,0,0,100,0),
+(@PATH,3,1896.927,-4883.188,170.834,0,0,0,0,100,0),
+(@PATH,4,1896.593,-4883.376,170.5366,0,0,0,0,100,0),
+(@PATH,5,1896.093,-4883.376,170.2866,0,0,0,0,100,0),
+(@PATH,6,1893.093,-4883.626,169.7866,0,0,0,0,100,0),
+(@PATH,7,1890.093,-4883.876,169.0366,0,0,0,0,100,0),
+(@PATH,8,1888.093,-4883.876,168.2866,0,0,0,0,100,0),
+(@PATH,9,1886.093,-4883.876,167.7866,0,0,0,0,100,0),
+(@PATH,10,1884.093,-4884.126,167.0366,0,0,0,0,100,0),
+(@PATH,11,1882.093,-4884.126,166.0366,0,0,0,0,100,0),
+(@PATH,12,1880.093,-4884.126,165.0366,0,0,0,0,100,0),
+(@PATH,13,1878.093,-4884.126,164.0366,0,0,0,0,100,0),
+(@PATH,14,1876.343,-4884.126,163.2866,0,0,0,0,100,0),
+(@PATH,15,1874.343,-4884.126,162.2866,0,0,0,0,100,0),
+(@PATH,16,1872.343,-4884.376,161.5366,0,0,0,0,100,0),
+(@PATH,17,1871.343,-4884.376,161.0366,0,0,0,0,100,0),
+(@PATH,18,1869.343,-4884.376,160.0366,0,0,0,0,100,0),
+(@PATH,19,1867.343,-4884.626,159.0366,0,0,0,0,100,0),
+(@PATH,20,1866.343,-4884.626,158.5366,0,0,0,0,100,0),
+(@PATH,21,1864.343,-4884.626,157.2866,0,0,0,0,100,0),
+(@PATH,22,1862.343,-4884.876,156.2866,0,0,0,0,100,0),
+(@PATH,23,1860.343,-4884.876,155.2866,0,0,0,0,100,0),
+(@PATH,24,1858.343,-4884.876,154.2866,0,0,0,0,100,0),
+(@PATH,25,1858.171,-4884.888,153.8452,0,0,0,0,100,0),
+(@PATH,26,1857.171,-4884.888,153.5952,0,0,0,0,100,0),
+(@PATH,27,1855.171,-4884.638,152.3452,0,0,0,0,100,0),
+(@PATH,28,1852.171,-4884.388,151.3452,0,0,0,0,100,0),
+(@PATH,29,1850.421,-4884.138,150.5952,0,0,0,0,100,0),
+(@PATH,30,1848.421,-4883.888,149.5952,0,0,0,0,100,0),
+(@PATH,31,1846.421,-4883.638,148.5952,0,0,0,0,100,0),
+(@PATH,32,1846.197,-4883.707,148.4949,0,0,0,0,100,0),
+(@PATH,33,1845.447,-4883.707,148.2449,0,0,0,0,100,0),
+(@PATH,34,1843.697,-4883.957,146.9949,0,0,0,0,100,0),
+(@PATH,35,1842.697,-4883.957,146.2449,0,0,0,0,100,0),
+(@PATH,36,1840.697,-4884.207,145.2449,0,0,0,0,100,0),
+(@PATH,37,1837.697,-4884.457,143.9949,0,0,0,0,100,0),
+(@PATH,38,1835.947,-4884.707,143.2449,0,0,0,0,100,0),
+(@PATH,39,1833.947,-4884.957,142.2449,0,0,0,0,100,0),
+(@PATH,40,1832.947,-4884.957,141.7449,0,0,0,0,100,0),
+(@PATH,41,1830.947,-4885.207,140.4949,0,0,0,0,100,0),
+(@PATH,42,1828.947,-4885.457,139.4949,0,0,0,0,100,0),
+(@PATH,43,1826.947,-4885.707,138.4949,0,0,0,0,100,0),
+(@PATH,44,1826.772,-4885.628,138.2459,0,0,0,0,100,0),
+(@PATH,45,1826.022,-4885.628,137.9959,0,0,0,0,100,0),
+(@PATH,46,1823.022,-4885.378,136.7459,0,0,0,0,100,0),
+(@PATH,47,1821.272,-4885.378,136.2459,0,0,0,0,100,0),
+(@PATH,48,1819.272,-4885.128,135.4959,0,0,0,0,100,0),
+(@PATH,49,1819.344,-4885.267,135.4447,0,0,0,0,100,0),
+(@PATH,50,1821.344,-4885.517,135.9447,0,0,0,0,100,0),
+(@PATH,51,1823.094,-4885.517,136.6947,0,0,0,0,100,0),
+(@PATH,52,1825.094,-4885.767,137.6947,0,0,0,0,100,0),
+(@PATH,53,1825.52,-4885.686,138.0349,0,0,0,0,100,0),
+(@PATH,54,1826.27,-4885.686,138.2849,0,0,0,0,100,0),
+(@PATH,55,1828.27,-4885.436,139.0349,0,0,0,0,100,0),
+(@PATH,56,1830.27,-4885.186,140.0349,0,0,0,0,100,0),
+(@PATH,57,1832.27,-4884.936,141.2849,0,0,0,0,100,0),
+(@PATH,58,1834.27,-4884.686,142.2849,0,0,0,0,100,0),
+(@PATH,59,1836.02,-4884.686,143.0349,0,0,0,0,100,0),
+(@PATH,60,1837.02,-4884.686,143.5349,0,0,0,0,100,0),
+(@PATH,61,1838.77,-4884.436,144.7849,0,0,0,0,100,0),
+(@PATH,62,1840.77,-4884.186,145.7849,0,0,0,0,100,0),
+(@PATH,63,1842.77,-4883.936,147.0349,0,0,0,0,100,0),
+(@PATH,64,1844.77,-4883.686,148.0349,0,0,0,0,100,0),
+(@PATH,65,1845.081,-4883.799,148.281,0,0,0,0,100,0),
+(@PATH,66,1845.831,-4883.549,148.531,0,0,0,0,100,0),
+(@PATH,67,1847.831,-4883.799,149.281,0,0,0,0,100,0),
+(@PATH,68,1849.831,-4884.049,150.281,0,0,0,0,100,0),
+(@PATH,69,1851.581,-4884.549,151.031,0,0,0,0,100,0),
+(@PATH,70,1853.581,-4884.549,152.031,0,0,0,0,100,0),
+(@PATH,71,1855.581,-4884.799,153.031,0,0,0,0,100,0),
+(@PATH,72,1857.403,-4885.068,153.9602,0,0,0,0,100,0),
+(@PATH,73,1859.403,-4884.818,154.7102,0,0,0,0,100,0),
+(@PATH,74,1861.403,-4884.818,155.7102,0,0,0,0,100,0),
+(@PATH,75,1863.403,-4884.818,156.7102,0,0,0,0,100,0),
+(@PATH,76,1865.403,-4884.568,157.9602,0,0,0,0,100,0),
+(@PATH,77,1867.403,-4884.568,158.9602,0,0,0,0,100,0),
+(@PATH,78,1869.403,-4884.568,159.9602,0,0,0,0,100,0),
+(@PATH,79,1871.403,-4884.318,160.9602,0,0,0,0,100,0),
+(@PATH,80,1872.403,-4884.318,161.7102,0,0,0,0,100,0),
+(@PATH,81,1874.403,-4884.318,162.4602,0,0,0,0,100,0),
+(@PATH,82,1876.153,-4884.318,163.4602,0,0,0,0,100,0),
+(@PATH,83,1877.153,-4884.318,163.9602,0,0,0,0,100,0),
+(@PATH,84,1880.153,-4884.318,164.9602,0,0,0,0,100,0),
+(@PATH,85,1882.153,-4884.068,165.9602,0,0,0,0,100,0),
+(@PATH,86,1884.153,-4884.068,166.9602,0,0,0,0,100,0),
+(@PATH,87,1886.153,-4884.068,167.7102,0,0,0,0,100,0),
+(@PATH,88,1888.153,-4883.818,168.4602,0,0,0,0,100,0),
+(@PATH,89,1890.153,-4883.818,168.9602,0,0,0,0,100,0),
+(@PATH,90,1893.153,-4883.568,169.7102,0,0,0,0,100,0),
+(@PATH,91,1896.27,-4883.222,170.7779,0,0,0,0,100,0),
+(@PATH,92,1898.27,-4882.722,171.2779,0,0,0,0,100,0),
+(@PATH,93,1902.02,-4881.222,171.7779,0,0,0,0,100,0),
+(@PATH,94,1907.52,-4879.472,172.2779,0,0,0,0,100,0),
+(@PATH,95,1905.927,-4879.938,172.084,0,0,0,0,100,0),
+(@PATH,96,1899.677,-4882.188,171.334,0,0,0,0,100,0),
+(@PATH,97,1896.927,-4883.188,170.834,0,0,0,0,100,0);
+
+-- visuals
+-- Cyclothar SAI
+SET @ENTRY := 24235;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,25,0,100,0,0,0,0,0,11,43312,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cyclothar - On Reset - Cast 'Elemental Prison (Cosmetic)'");
+
+-- Wind Tamer SAI
+SET @ENTRY := 24236;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,25,0,100,0,0,0,0,0,11,43320,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wind Tamer - On Reset - Cast 'Windwarden Channeling'");
+
+-- Camp Winterhoof Wind Rider SAI
+SET @GUID := -102741;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=24142;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@GUID 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
+(@GUID,0,0,0,1,0,100,0,3000,5000,3000,5000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Camp Winterhoof Wind Rider - Out of Combat - Play Emote 1");
+
+-- Camp Winterhoof Wind Rider SAI
+SET @GUID := -102745;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=24142;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@GUID 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
+(@GUID,0,0,0,1,0,100,0,3000,5000,3000,5000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Camp Winterhoof Wind Rider - Out of Combat - Play Emote 1");
+
+-- 8.
+SET @NPC := 100710;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2535.262,`position_y`=-3926.417,`position_z`=272.4942 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,2535.262,-3926.417,272.4942,0,0,0,0,100,0),
+(@PATH,2,2536.262,-3924.667,272.9942,0,0,0,0,100,0),
+(@PATH,3,2537.512,-3921.917,273.7442,0,0,0,0,100,0),
+(@PATH,4,2538.012,-3920.417,274.2442,0,0,0,0,100,0),
+(@PATH,5,2539.012,-3918.667,274.9942,0,0,0,0,100,0),
+(@PATH,6,2540.262,-3915.917,275.7442,0,0,0,0,100,0),
+(@PATH,7,2541.262,-3914.167,276.4942,0,0,0,0,100,0),
+(@PATH,8,2540.505,-3915.667,275.8498,0,0,0,0,100,0),
+(@PATH,9,2541.505,-3913.917,276.5998,0,0,0,0,100,0),
+(@PATH,10,2541.505,-3913.667,276.8498,0,0,0,0,100,0),
+(@PATH,11,2543.005,-3911.917,277.3498,0,0,0,0,100,0),
+(@PATH,12,2544.255,-3910.417,278.3498,0,0,0,0,100,0),
+(@PATH,13,2545.255,-3909.167,278.8498,0,0,0,0,100,0),
+(@PATH,14,2546.505,-3907.667,279.5998,0,0,0,0,100,0),
+(@PATH,15,2547.005,-3906.917,280.0998,0,0,0,0,100,0),
+(@PATH,16,2548.255,-3905.417,280.8498,0,0,0,0,100,0),
+(@PATH,17,2549.005,-3904.667,281.5998,0,0,0,0,100,0),
+(@PATH,18,2549.203,-3904.302,281.7696,0,0,0,0,100,0),
+(@PATH,19,2550.203,-3903.302,282.2696,0,0,0,0,100,0),
+(@PATH,20,2550.953,-3902.802,282.7696,0,0,0,0,100,0),
+(@PATH,21,2552.953,-3902.302,283.5196,0,0,0,0,100,0),
+(@PATH,22,2555.203,-3901.052,285.5196,0,0,0,0,100,0),
+(@PATH,23,2555.605,-3900.629,285.9603,0,0,0,0,100,0),
+(@PATH,24,2557.605,-3899.879,286.7103,0,0,0,0,100,0),
+(@PATH,25,2559.355,-3899.879,287.7103,0,0,0,0,100,0),
+(@PATH,26,2562.355,-3899.629,288.7103,0,0,0,0,100,0),
+(@PATH,27,2561.653,-3899.828,288.6268,0,0,0,0,100,0),
+(@PATH,28,2559.903,-3899.828,287.8768,0,0,0,0,100,0),
+(@PATH,29,2559.016,-3899.898,287.2452,3.176786,0,0,0,100,0),
+(@PATH,30,2557.399,-3899.966,286.1906,0,0,0,0,100,0),
+(@PATH,31,2554.774,-3901.154,284.9332,0,0,0,0,100,0),
+(@PATH,32,2553.024,-3901.904,284.1832,0,0,0,0,100,0),
+(@PATH,33,2550.035,-3903.224,282.2341,0,0,0,0,100,0),
+(@PATH,34,2548.785,-3904.974,281.2341,0,0,0,0,100,0),
+(@PATH,35,2547.535,-3906.474,280.2341,0,0,0,0,100,0),
+(@PATH,36,2546.535,-3907.974,279.7341,0,0,0,0,100,0),
+(@PATH,37,2545.785,-3908.474,279.2341,0,0,0,0,100,0),
+(@PATH,38,2544.035,-3910.724,277.9841,0,0,0,0,100,0),
+(@PATH,39,2542.785,-3912.224,277.2341,0,0,0,0,100,0),
+(@PATH,40,2541.275,-3913.808,276.6663,0,0,0,0,100,0),
+(@PATH,41,2540.525,-3915.558,275.9163,0,0,0,0,100,0),
+(@PATH,42,2539.275,-3918.308,274.9163,0,0,0,0,100,0),
+(@PATH,43,2538.275,-3920.058,274.1663,0,0,0,0,100,0),
+(@PATH,44,2537.775,-3921.558,273.6663,0,0,0,0,100,0),
+(@PATH,45,2536.275,-3924.308,273.1663,0,0,0,0,100,0),
+(@PATH,46,2535.525,-3926.058,272.4163,0,0,0,0,100,0),
+(@PATH,47,2534.525,-3927.808,271.9163,0,0,0,0,100,0);
diff --git a/sql/updates/auth/dummy b/sql/updates/auth/dummy
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/sql/updates/auth/dummy
diff --git a/sql/updates/characters/dummy b/sql/updates/characters/dummy
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/sql/updates/characters/dummy
diff --git a/sql/updates/world/2015_07_14_00_world.sql b/sql/updates/world/2015_07_14_00_world.sql
new file mode 100644
index 00000000000..8a4b9bed801
--- /dev/null
+++ b/sql/updates/world/2015_07_14_00_world.sql
@@ -0,0 +1 @@
+UPDATE `version` SET `db_version`='TDB 335.59', `cache_id`=59 LIMIT 1;
diff --git a/sql/updates/world/2015_07_14_01_world_335.sql b/sql/updates/world/2015_07_14_01_world_335.sql
new file mode 100644
index 00000000000..6e7ddfdc768
--- /dev/null
+++ b/sql/updates/world/2015_07_14_01_world_335.sql
@@ -0,0 +1,36 @@
+--
+UPDATE `quest_template_addon` SET `AllowableClasses`=128 WHERE `id`=10068;
+UPDATE `quest_template_addon` SET `AllowableClasses`=2 WHERE `id`=10069;
+UPDATE `quest_template_addon` SET `AllowableClasses`=4 WHERE `id`=10070;
+UPDATE `quest_template_addon` SET `AllowableClasses`=8 WHERE `id`=10071;
+UPDATE `quest_template_addon` SET `AllowableClasses`=16 WHERE `id`=10072;
+UPDATE `quest_template_addon` SET `AllowableClasses`=256 WHERE `id`=10073;
+
+UPDATE `creature_queststarter` SET `quest`=10068 WHERE `id`=15279 AND `quest`=10069;
+UPDATE `creature_queststarter` SET `quest`=10069 WHERE `id`=15280 AND `quest`=10068;
+UPDATE `creature_queststarter` SET `quest`=10073 WHERE `id`=15283 AND `quest`=10073;
+UPDATE `creature_queststarter` SET `quest`=10072 WHERE `id`=15284 AND `quest`=10070;
+UPDATE `creature_queststarter` SET `quest`=10071 WHERE `id`=15285 AND `quest`=10071;
+UPDATE `creature_queststarter` SET `quest`=10070 WHERE `id`=15513 AND `quest`=10072;
+UPDATE `locales_quest` SET 
+`Title_loc2`="Veilleur du puits Solanian",
+`Title_loc3`="Brunnenbehüter Solanian",
+`Title_loc6`="Vigía del pozo Solanian",
+`Title_loc7`="Vigía del pozo Solanian",
+`Title_loc8`="Хранитель Колодца Соланиан",
+`Details_loc2`="Et maintenant, je voudrais que vous fassiez quelque chose.$B$BLe veilleur du puits Solanian a besoin de vos services. C’est quelqu’un avec qui vous avez intérêt à bien vous entendre.$B$BIl vous attend sur la plate-forme extérieure. Lorsque vous serez dans ses appartements, prenez la rampe, elle y conduit.",
+`Details_loc3`="Erweist mir jetzt bitte einen Gefallen.$B$BBrunnenbehüter Solanian braucht Eure Unterstützung. Ihr würdet gut daran tun, Euch bei ihm beliebt zu machen.$B$BEr erwartet Euch auf der äußeren Plattform, geht einfach den Aufgang in diesem Raum hinauf.",
+`Details_loc6`="Y ahora, necesito que hagas algo.$B$BEl vigía del pozo Solanian necesita tus servicios. No te vendría mal congraciarte con él.$B$BTe espera en la plataforma exterior hasta la que lleva la rampa de su cámara.",
+`Details_loc7`="Y ahora, necesito que hagas algo.$B$BEl vigía del pozo Solanian necesita tus servicios. No te vendría mal congraciarte con él.$B$BTe espera en la plataforma exterior hasta la que lleva la rampa de su cámara.",
+`Details_loc8`="А теперь мне нужно, чтобы ты кое-что $g.$B$BХранителю Колодца Соланиану нужна твоя помощь. Тебе будет полезно заслужить его благосклонность.$B$BОн ждет тебя на внешней платформе, на которую выходит пандус из этого зала.",
+`Objectives_loc2`="Parlez au veilleur du puits Solanian à la Flèche solaire sur l'île de Haut-soleil.",
+`Objectives_loc3`="Sprecht mit Brunnenbehüter Solanian im Sonnenturm auf der Insel der Sonnenwanderer.",
+`Objectives_loc6`="Habla con el vigía del pozo Solanian en La Aguja del Sol, en la Isla del Caminante del Sol.",
+`Objectives_loc7`="Habla con el vigía del pozo Solanian en La Aguja del Sol, en la Isla del Caminante del Sol.",
+`Objectives_loc8`="Поговорите с хранителем Колодца Соланианом в Солнечном Шпиле на острове Солнечного Скитальца.",
+`OfferRewardText_loc2`="Ah bien, $gun:une; $c. Je t'attendais.$B$BJ'ai quelques tâches pour vous qui vous iront à merveille.",
+`OfferRewardText_loc3`="Ah, wie schön, ein $c. Ich habe Euch bereits erwartet.$B$BIch hätte da ein paar Aufgaben zu vergeben, für die Ihr Euch besonders gut eignet.",
+`OfferRewardText_loc6`="Ah bien, $gun:una; $c. Te he estado esperando.$B$BTengo unas tareas que son especialmente adecuadas para ti.",
+`OfferRewardText_loc7`="Ah bien, $gun:una; $c. Te he estado esperando.$B$BTengo unas tareas que son especialmente adecuadas para ti.",
+`OfferRewardText_loc8`="Я ждал тебя, $c.У меня есть несколько поручений, для выполнения которых ты подходишь как нельзя лучше."
+WHERE `id` IN (10068, 10069, 10070, 10071, 10072, 10073);
diff --git a/sql/updates/world/2015_07_14_02_world.sql b/sql/updates/world/2015_07_14_02_world.sql
new file mode 100644
index 00000000000..ba49c5cec27
--- /dev/null
+++ b/sql/updates/world/2015_07_14_02_world.sql
@@ -0,0 +1,485 @@
+-- Howling Fjord - Gjalerbron
+
+-- 1.
+SET @NPC := 113342;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2501.755,`position_y`=-3568.42,`position_z`=222.9102 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,2501.755,-3568.42,222.9102,0,0,0,0,100,0),
+(@PATH,2,2499.755,-3567.42,224.1602,0,0,0,0,100,0),
+(@PATH,3,2495.505,-3565.67,226.1602,0,0,0,0,100,0),
+(@PATH,4,2493.505,-3564.67,227.1602,0,0,0,0,100,0),
+(@PATH,5,2488.639,-3562.622,228.8573,0,0,0,0,100,0),
+(@PATH,6,2482.639,-3563.372,230.8573,0,0,0,0,100,0),
+(@PATH,7,2475.889,-3564.122,231.8573,0,0,0,0,100,0),
+(@PATH,8,2475.572,-3564.243,231.7151,0,0,0,0,100,0),
+(@PATH,9,2474.572,-3564.493,231.7151,0,0,0,0,100,0),
+(@PATH,10,2473.572,-3567.743,231.7151,0,0,0,0,100,0),
+(@PATH,11,2469.884,-3576.921,232.2649,0,0,0,0,100,0),
+(@PATH,12,2471.134,-3581.421,232.2649,0,0,0,0,100,0),
+(@PATH,13,2472.681,-3587.46,232.3761,0,0,0,0,100,0),
+(@PATH,14,2473.681,-3592.96,232.3761,0,0,0,0,100,0),
+(@PATH,15,2474.181,-3595.46,232.8761,0,0,0,0,100,0),
+(@PATH,16,2481.325,-3600.102,233.5942,0,0,0,0,100,0),
+(@PATH,17,2483.575,-3601.102,233.5942,0,0,0,0,100,0),
+(@PATH,18,2485.575,-3601.602,233.8442,0,0,0,0,100,0),
+(@PATH,19,2487.575,-3603.352,233.8442,0,0,0,0,100,0),
+(@PATH,20,2488.825,-3602.352,234.3442,0,0,0,0,100,0),
+(@PATH,21,2493.506,-3605.231,235.1139,0,0,0,0,100,0),
+(@PATH,22,2495.006,-3604.731,235.1139,0,0,0,0,100,0),
+(@PATH,23,2503.756,-3602.231,235.3639,0,0,0,0,100,0),
+(@PATH,24,2512.578,-3598.366,236.8767,0,0,0,0,100,0),
+(@PATH,25,2507.878,-3596.56,235.0778,0,0,0,0,100,0),
+(@PATH,26,2504.628,-3596.56,234.8278,0,0,0,0,100,0),
+(@PATH,27,2499.878,-3596.56,233.8278,0,0,0,0,100,0),
+(@PATH,28,2494.378,-3596.56,233.8278,0,0,0,0,100,0),
+(@PATH,29,2491.676,-3596.64,233.2812,0,0,0,0,100,0),
+(@PATH,30,2485.676,-3596.64,233.2812,0,0,0,0,100,0),
+(@PATH,31,2484.926,-3596.64,233.2812,0,0,0,0,100,0),
+(@PATH,32,2479.926,-3596.39,233.0312,0,0,0,0,100,0),
+(@PATH,33,2475.176,-3597.64,233.0312,0,0,0,0,100,0),
+(@PATH,34,2473.016,-3596.576,232.996,0,0,0,0,100,0),
+(@PATH,35,2468.016,-3596.326,233.496,0,0,0,0,100,0),
+(@PATH,36,2461.266,-3595.826,233.996,0,0,0,0,100,0),
+(@PATH,37,2453.266,-3595.326,233.496,0,0,0,0,100,0),
+(@PATH,38,2450.361,-3596.058,231.9992,0,0,0,0,100,0),
+(@PATH,39,2443.861,-3592.558,233.2492,0,0,0,0,100,0),
+(@PATH,40,2440.258,-3590.566,233.3241,0,0,0,0,100,0),
+(@PATH,41,2435.508,-3574.816,233.5741,0,0,0,0,100,0),
+(@PATH,42,2434.758,-3572.816,233.8241,0,0,0,0,100,0),
+(@PATH,43,2435.491,-3574.709,233.6983,0,0,0,0,100,0),
+(@PATH,44,2434.741,-3572.459,233.6983,0,0,0,0,100,0),
+(@PATH,45,2434.741,-3571.959,233.6983,0,0,0,0,100,0),
+(@PATH,46,2439.241,-3559.209,233.1983,0,0,0,0,100,0),
+(@PATH,47,2439.991,-3557.209,233.1983,0,0,0,0,100,0),
+(@PATH,48,2440.806,-3555.347,233.2106,0,0,0,0,100,0),
+(@PATH,49,2451.806,-3550.597,232.4606,0,0,0,0,100,0),
+(@PATH,50,2452.069,-3550.532,232.0738,0,0,0,0,100,0),
+(@PATH,51,2452.319,-3550.282,232.0738,0,0,0,0,100,0),
+(@PATH,52,2456.819,-3549.782,231.8238,0,0,0,0,100,0),
+(@PATH,53,2467.569,-3548.782,231.5738,0,0,0,0,100,0),
+(@PATH,54,2470.308,-3548.582,231.3048,0,0,0,0,100,0),
+(@PATH,55,2480.308,-3557.082,230.5548,0,0,0,0,100,0),
+(@PATH,56,2483.965,-3560.342,229.8904,0,0,0,0,100,0),
+(@PATH,57,2488.715,-3562.342,228.6404,0,0,0,0,100,0),
+(@PATH,58,2493.215,-3564.342,227.1404,0,0,0,0,100,0),
+(@PATH,59,2495.465,-3565.092,226.3904,0,0,0,0,100,0),
+(@PATH,60,2499.434,-3566.969,224.2053,0,0,0,0,100,0),
+(@PATH,61,2501.934,-3568.719,222.7053,0,0,0,0,100,0),
+(@PATH,62,2505.184,-3570.969,220.7053,0,0,0,0,100,0),
+(@PATH,63,2506.934,-3571.969,219.4553,0,0,0,0,100,0),
+(@PATH,64,2511.684,-3575.219,216.7053,0,0,0,0,100,0),
+(@PATH,65,2511.874,-3575.241,216.445,0,0,0,0,100,0),
+(@PATH,66,2512.874,-3575.991,215.695,0,0,0,0,100,0),
+(@PATH,67,2515.124,-3576.241,214.445,0,0,0,0,100,0),
+(@PATH,68,2517.624,-3576.741,213.445,0,0,0,0,100,0),
+(@PATH,69,2520.124,-3576.991,212.195,0,0,0,0,100,0),
+(@PATH,70,2522.874,-3577.491,211.695,0,0,0,0,100,0),
+(@PATH,71,2523.13,-3577.638,211.5331,0,0,0,0,100,0),
+(@PATH,72,2524.13,-3577.638,211.0331,0,0,0,0,100,0),
+(@PATH,73,2525.13,-3577.138,210.5331,0,0,0,0,100,0),
+(@PATH,74,2529.13,-3574.888,208.2831,0,0,0,0,100,0),
+(@PATH,75,2531.13,-3573.888,206.7831,0,0,0,0,100,0),
+(@PATH,76,2534.438,-3572.193,204.9505,0,0,0,0,100,0),
+(@PATH,77,2535.688,-3570.693,204.4505,0,0,0,0,100,0),
+(@PATH,78,2536.938,-3569.193,203.2005,0,0,0,0,100,0),
+(@PATH,79,2540.188,-3567.943,203.9505,0,0,0,0,100,0),
+(@PATH,80,2538.972,-3570.76,203.6387,0,0,0,0,100,0),
+(@PATH,81,2538.722,-3571.51,203.1387,0,0,0,0,100,0),
+(@PATH,82,2537.222,-3572.51,204.3887,0,0,0,0,100,0),
+(@PATH,83,2531.722,-3575.76,207.1387,0,0,0,0,100,0),
+(@PATH,84,2529.972,-3576.76,208.6387,0,0,0,0,100,0),
+(@PATH,85,2525.404,-3579.122,211.1523,0,0,0,0,100,0),
+(@PATH,86,2524.404,-3579.122,211.4023,0,0,0,0,100,0),
+(@PATH,87,2522.904,-3578.872,212.1523,0,0,0,0,100,0),
+(@PATH,88,2519.404,-3578.622,212.6523,0,0,0,0,100,0),
+(@PATH,89,2517.154,-3578.372,213.6523,0,0,0,0,100,0),
+(@PATH,90,2513.154,-3578.122,215.6523,0,0,0,0,100,0),
+(@PATH,91,2512.871,-3577.98,215.7943,0,0,0,0,100,0),
+(@PATH,92,2512.121,-3577.73,216.2943,0,0,0,0,100,0),
+(@PATH,93,2510.871,-3576.73,217.0443,0,0,0,0,100,0),
+(@PATH,94,2506.871,-3572.98,219.5443,0,0,0,0,100,0),
+(@PATH,95,2504.871,-3571.23,221.0443,0,0,0,0,100,0);
+
+-- 2.
+SET @NPC := 113274;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2516.7,`position_y`=-3495.182,`position_z`=183.9918 WHERE `guid`=@NPC;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `guid`=113077;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,2516.7,-3495.182,183.9918,0,0,0,0,100,0),
+(@PATH,2,2519.719,-3493.263,183.9918,0,0,0,0,100,0),
+(@PATH,3,2522.104,-3491.2,183.9918,0,0,0,0,100,0),
+(@PATH,4,2524.47,-3489.153,183.9918,0,0,0,0,100,0),
+(@PATH,5,2526.83,-3487.111,183.9918,0,0,0,0,100,0),
+(@PATH,6,2581.487,-3434.617,184.1113,0,0,0,0,100,0),
+(@PATH,7,2584.247,-3433.337,183.9863,0,0,0,0,100,0),
+(@PATH,8,2586.973,-3432.073,184.006,0,0,0,0,100,0),
+(@PATH,9,2589.731,-3430.795,184.006,0,0,0,0,100,0),
+(@PATH,10,2612.574,-3413.761,184.0111,0,0,0,0,100,0),
+(@PATH,11,2609.64,-3417.018,184.0111,0,0,0,0,100,0),
+(@PATH,12,2607.123,-3418.982,184.0111,0,0,0,0,100,0),
+(@PATH,13,2604.612,-3420.941,184.0111,0,0,0,0,100,0),
+(@PATH,14,2602.101,-3422.9,184.0111,0,0,0,0,100,0),
+(@PATH,15,2599.603,-3424.85,184.006,0,0,0,0,100,0),
+(@PATH,16,2597.094,-3426.807,184.006,0,0,0,0,100,0),
+(@PATH,17,2593.947,-3428.84,184.006,0,0,0,0,100,0),
+(@PATH,18,2591.159,-3430.133,184.006,0,0,0,0,100,0),
+(@PATH,19,2588.356,-3431.432,184.006,0,0,0,0,100,0),
+(@PATH,20,2579.965,-3435.322,184.1113,0,0,0,0,100,0),
+(@PATH,21,2577.173,-3436.616,184.1928,0,0,0,0,100,0),
+(@PATH,22,2574.39,-3437.906,184.2363,0,0,0,0,100,0),
+(@PATH,23,2574.267,-3438.134,184.2363,0,0,0,0,100,0),
+(@PATH,24,2571.836,-3440.247,184.3784,0,0,0,0,100,0),
+(@PATH,25,2569.411,-3442.354,184.3813,0,0,0,0,100,0),
+(@PATH,26,2566.968,-3444.478,184.4863,0,0,0,0,100,0),
+(@PATH,27,2564.521,-3446.605,184.4823,0,0,0,0,100,0),
+(@PATH,28,2562.082,-3448.725,184.522,0,0,0,0,100,0),
+(@PATH,29,2559.635,-3450.852,184.522,0,0,0,0,100,0),
+(@PATH,30,2557.766,-3452.477,184.397,0,0,0,0,100,0),
+(@PATH,31,2556.465,-3454.182,184.397,0,0,0,0,100,0),
+(@PATH,32,2554.545,-3456.59,184.2937,0,0,0,0,100,0),
+(@PATH,33,2552.637,-3458.984,184.2759,0,0,0,0,100,0),
+(@PATH,34,2550.712,-3461.399,184.147,0,0,0,0,100,0),
+(@PATH,35,2548.791,-3463.809,184.147,0,0,0,0,100,0),
+(@PATH,36,2546.865,-3466.225,184.147,0,0,0,0,100,0),
+(@PATH,37,2544.962,-3468.613,184.0523,0,0,0,0,100,0),
+(@PATH,38,2543.022,-3471.046,184.0523,0,0,0,0,100,0),
+(@PATH,39,2541.11,-3473.446,184.0523,0,0,0,0,100,0),
+(@PATH,40,2539.186,-3475.86,184.0523,0,0,0,0,100,0),
+(@PATH,41,2536.791,-3478.493,184.0523,0,0,0,0,100,0),
+(@PATH,42,2534.468,-3480.503,184.0523,0,0,0,0,100,0),
+(@PATH,43,2532.135,-3482.521,183.9918,0,0,0,0,100,0),
+(@PATH,44,2529.801,-3484.541,183.9918,0,0,0,0,100,0),
+(@PATH,45,2527.47,-3486.557,183.9918,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=113274;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(113274, 113274, 0, 0, 2, 0, 0),
+(113274, 113077, 3, 270, 0, 0, 0);
+
+-- 3.
+SET @NPC := 113083;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2409.898,`position_y`=-3546.609,`position_z`=170.2105 WHERE `guid`=@NPC;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=2409.898,`position_y`=-3546.609,`position_z`=170.2105 WHERE `guid`=113273;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,2409.898,-3546.609,170.2105,0,0,0,0,100,0),
+(@PATH,2,2413.148,-3544.359,170.9605,0,0,0,0,100,0),
+(@PATH,3,2416.648,-3542.109,171.7105,0,0,0,0,100,0),
+(@PATH,4,2418.898,-3540.359,172.7105,0,0,0,0,100,0),
+(@PATH,5,2422.398,-3538.109,173.4605,0,0,0,0,100,0),
+(@PATH,6,2424.648,-3536.609,173.9605,0,0,0,0,100,0),
+(@PATH,7,2426.148,-3535.609,174.7105,0,0,0,0,100,0),
+(@PATH,8,2428.648,-3533.859,175.4605,0,0,0,0,100,0),
+(@PATH,9,2430.398,-3532.609,175.9605,0,0,0,0,100,0),
+(@PATH,10,2432.898,-3531.109,176.9605,0,0,0,0,100,0),
+(@PATH,11,2434.398,-3529.859,177.4605,0,0,0,0,100,0),
+(@PATH,12,2436.898,-3528.109,178.2105,0,0,0,0,100,0),
+(@PATH,13,2437.144,-3527.977,178.3683,0,0,0,0,100,0),
+(@PATH,14,2437.894,-3527.477,178.6183,0,0,0,0,100,0),
+(@PATH,15,2440.144,-3525.727,179.1183,0,0,0,0,100,0),
+(@PATH,16,2443.394,-3523.227,179.8683,0,0,0,0,100,0),
+(@PATH,17,2446.394,-3521.227,180.6183,0,0,0,0,100,0),
+(@PATH,18,2454.883,-3514.455,180.8099,0,0,0,0,100,0),
+(@PATH,19,2456.883,-3499.705,180.3099,0,0,0,0,100,0),
+(@PATH,20,2460.045,-3479.571,180.2735,0,0,0,0,100,0),
+(@PATH,21,2459.795,-3473.571,179.5235,0,0,0,0,100,0),
+(@PATH,22,2459.545,-3461.821,179.2735,0,0,0,0,100,0),
+(@PATH,23,2459.63,-3458.596,178.5748,0,0,0,0,100,0),
+(@PATH,24,2462.13,-3454.096,177.8248,0,0,0,0,100,0),
+(@PATH,25,2463.38,-3451.846,176.8248,0,0,0,0,100,0),
+(@PATH,26,2465.38,-3448.346,176.3248,0,0,0,0,100,0),
+(@PATH,27,2466.38,-3446.596,175.3248,0,0,0,0,100,0),
+(@PATH,28,2466.527,-3446.192,175.0262,0,0,0,0,100,0),
+(@PATH,29,2467.027,-3445.692,175.0262,0,0,0,0,100,0),
+(@PATH,30,2470.777,-3444.442,174.0262,0,0,0,0,100,0),
+(@PATH,31,2474.527,-3443.442,173.2762,0,0,0,0,100,0),
+(@PATH,32,2481.972,-3441.013,173.08,0,0,0,0,100,0),
+(@PATH,33,2482.222,-3439.013,172.33,0,0,0,0,100,0),
+(@PATH,34,2483.722,-3433.513,171.58,0,0,0,0,100,0),
+(@PATH,35,2484.722,-3429.513,171.08,0,0,0,0,100,0),
+(@PATH,36,2485.855,-3426.088,170.4742,0,0,0,0,100,0),
+(@PATH,37,2487.355,-3423.588,169.7242,0,0,0,0,100,0),
+(@PATH,38,2489.105,-3420.338,168.7242,0,0,0,0,100,0),
+(@PATH,39,2490.355,-3418.588,168.2242,0,0,0,0,100,0),
+(@PATH,40,2491.855,-3416.088,167.4742,0,0,0,0,100,0),
+(@PATH,41,2492.855,-3414.338,166.7242,0,0,0,0,100,0),
+(@PATH,42,2492.111,-3415.889,167.2861,0,0,0,0,100,0),
+(@PATH,43,2493.111,-3414.139,166.5361,0,0,0,0,100,0),
+(@PATH,44,2493.861,-3413.139,166.2861,0,0,0,0,100,0),
+(@PATH,45,2497.111,-3409.389,165.7861,0,0,0,0,100,0),
+(@PATH,46,2498.611,-3408.139,165.2861,0,0,0,0,100,0),
+(@PATH,47,2509.015,-3397.053,165.1292,0,0,0,0,100,0),
+(@PATH,48,2511.015,-3396.303,165.8792,0,0,0,0,100,0),
+(@PATH,49,2512.765,-3395.553,166.6292,0,0,0,0,100,0),
+(@PATH,50,2515.515,-3394.553,167.1292,0,0,0,0,100,0),
+(@PATH,51,2517.515,-3393.803,167.6292,0,0,0,0,100,0),
+(@PATH,52,2519.015,-3393.053,168.3792,0,0,0,0,100,0),
+(@PATH,53,2520.765,-3392.303,168.8792,0,0,0,0,100,0),
+(@PATH,54,2524.515,-3390.803,169.6292,0,0,0,0,100,0),
+(@PATH,55,2527.265,-3389.803,170.3792,0,0,0,0,100,0),
+(@PATH,56,2530.608,-3388.245,170.6913,0,0,0,0,100,0),
+(@PATH,57,2533.358,-3381.745,169.9413,0,0,0,0,100,0),
+(@PATH,58,2536.358,-3373.745,169.4413,0,0,0,0,100,0),
+(@PATH,59,2539.358,-3366.245,169.1913,0,0,0,0,100,0),
+(@PATH,60,2541.123,-3362.343,168.4306,0,0,0,0,100,0),
+(@PATH,61,2549.873,-3360.593,169.4306,0,0,0,0,100,0),
+(@PATH,62,2557.373,-3358.843,169.9306,0,0,0,0,100,0),
+(@PATH,63,2565.655,-3356.532,170.4937,0,0,0,0,100,0),
+(@PATH,64,2571.155,-3354.032,170.9937,0,0,0,0,100,0),
+(@PATH,65,2582.39,-3348.977,171.2713,0,0,0,0,100,0),
+(@PATH,66,2583.39,-3346.227,170.5213,0,0,0,0,100,0),
+(@PATH,67,2584.14,-3343.477,169.7713,0,0,0,0,100,0),
+(@PATH,68,2585.89,-3338.977,169.0213,0,0,0,0,100,0),
+(@PATH,69,2586.89,-3335.977,168.5213,0,0,0,0,100,0),
+(@PATH,70,2587.89,-3333.227,168.0213,0,0,0,0,100,0),
+(@PATH,71,2588.009,-3333.02,167.6715,0,0,0,0,100,0),
+(@PATH,72,2589.009,-3329.77,167.1715,0,0,0,0,100,0),
+(@PATH,73,2588.759,-3326.77,166.6715,0,0,0,0,100,0),
+(@PATH,74,2588.759,-3320.77,165.9215,0,0,0,0,100,0),
+(@PATH,75,2588.509,-3316.02,165.4215,0,0,0,0,100,0),
+(@PATH,76,2588.509,-3312.02,164.9215,0,0,0,0,100,0),
+(@PATH,77,2588.509,-3308.02,164.4215,0,0,0,0,100,0),
+(@PATH,78,2588.64,-3307.914,164.3826,0,0,0,0,100,0),
+(@PATH,79,2588.64,-3311.914,164.8826,0,0,0,0,100,0),
+(@PATH,80,2588.64,-3315.914,165.3826,0,0,0,0,100,0),
+(@PATH,81,2588.64,-3320.664,165.8826,0,0,0,0,100,0),
+(@PATH,82,2588.89,-3326.664,166.6326,0,0,0,0,100,0),
+(@PATH,83,2588.784,-3326.838,166.9327,0,0,0,0,100,0),
+(@PATH,84,2588.784,-3329.838,167.4327,0,0,0,0,100,0),
+(@PATH,85,2587.534,-3333.588,168.1827,0,0,0,0,100,0),
+(@PATH,86,2586.534,-3336.588,168.6827,0,0,0,0,100,0),
+(@PATH,87,2585.284,-3341.088,169.4327,0,0,0,0,100,0),
+(@PATH,88,2584.284,-3343.838,169.9327,0,0,0,0,100,0),
+(@PATH,89,2583.534,-3345.838,170.6827,0,0,0,0,100,0),
+(@PATH,90,2582.199,-3349.277,171.084,0,0,0,0,100,0),
+(@PATH,91,2569.699,-3354.777,170.584,0,0,0,0,100,0),
+(@PATH,92,2565.326,-3356.905,170.5084,0,0,0,0,100,0),
+(@PATH,93,2556.576,-3358.905,169.7584,0,0,0,0,100,0),
+(@PATH,94,2551.076,-3360.155,169.2584,0,0,0,0,100,0),
+(@PATH,95,2542.326,-3362.155,168.5084,0,0,0,0,100,0),
+(@PATH,96,2542.184,-3362.333,168.613,0,0,0,0,100,0),
+(@PATH,97,2540.934,-3362.583,168.613,0,0,0,0,100,0),
+(@PATH,98,2538.934,-3367.333,169.363,0,0,0,0,100,0),
+(@PATH,99,2535.934,-3375.333,169.613,0,0,0,0,100,0),
+(@PATH,100,2532.434,-3383.833,170.363,0,0,0,0,100,0),
+(@PATH,101,2530.398,-3388.359,170.766,0,0,0,0,100,0),
+(@PATH,102,2526.648,-3390.109,170.016,0,0,0,0,100,0),
+(@PATH,103,2523.898,-3391.109,169.516,0,0,0,0,100,0),
+(@PATH,104,2520.148,-3392.359,168.766,0,0,0,0,100,0),
+(@PATH,105,2518.648,-3393.109,168.016,0,0,0,0,100,0),
+(@PATH,106,2516.648,-3394.109,167.516,0,0,0,0,100,0),
+(@PATH,107,2513.898,-3395.109,166.766,0,0,0,0,100,0),
+(@PATH,108,2512.148,-3395.859,166.266,0,0,0,0,100,0),
+(@PATH,109,2510.398,-3396.609,165.516,0,0,0,0,100,0),
+(@PATH,110,2510.091,-3396.895,165.5809,0,0,0,0,100,0),
+(@PATH,111,2508.841,-3397.395,165.0809,0,0,0,0,100,0),
+(@PATH,112,2497.341,-3409.395,165.8309,0,0,0,0,100,0),
+(@PATH,113,2494.591,-3412.395,166.3309,0,0,0,0,100,0),
+(@PATH,114,2494.342,-3412.521,166.4294,0,0,0,0,100,0),
+(@PATH,115,2493.592,-3413.271,166.6794,0,0,0,0,100,0),
+(@PATH,116,2492.592,-3415.021,166.9294,0,0,0,0,100,0),
+(@PATH,117,2491.342,-3416.771,167.6794,0,0,0,0,100,0),
+(@PATH,118,2490.092,-3419.021,168.4294,0,0,0,0,100,0),
+(@PATH,119,2489.092,-3420.771,169.1794,0,0,0,0,100,0),
+(@PATH,120,2487.092,-3424.271,169.9294,0,0,0,0,100,0),
+(@PATH,121,2486.833,-3424.437,170.1901,0,0,0,0,100,0),
+(@PATH,122,2485.583,-3426.437,170.6901,0,0,0,0,100,0),
+(@PATH,123,2484.833,-3430.187,171.1901,0,0,0,0,100,0),
+(@PATH,124,2483.583,-3434.937,171.9401,0,0,0,0,100,0),
+(@PATH,125,2482.583,-3438.687,172.6901,0,0,0,0,100,0),
+(@PATH,126,2481.763,-3441.144,173.2768,0,0,0,0,100,0),
+(@PATH,127,2473.513,-3443.644,173.7768,0,0,0,0,100,0),
+(@PATH,128,2469.513,-3444.894,174.5268,0,0,0,0,100,0),
+(@PATH,129,2466.883,-3445.901,175.383,0,0,0,0,100,0),
+(@PATH,130,2465.383,-3448.401,176.383,0,0,0,0,100,0),
+(@PATH,131,2464.383,-3450.151,176.883,0,0,0,0,100,0),
+(@PATH,132,2462.633,-3453.401,177.383,0,0,0,0,100,0),
+(@PATH,133,2461.633,-3455.151,178.133,0,0,0,0,100,0),
+(@PATH,134,2459.663,-3458.749,178.7932,0,0,0,0,100,0),
+(@PATH,135,2459.913,-3462.749,179.0432,0,0,0,0,100,0),
+(@PATH,136,2460.163,-3474.499,179.7932,0,0,0,0,100,0),
+(@PATH,137,2460.068,-3479.866,180.2007,0,0,0,0,100,0),
+(@PATH,138,2455.318,-3513.116,180.7007,0,0,0,0,100,0),
+(@PATH,139,2454.722,-3514.727,180.6916,0,0,0,0,100,0),
+(@PATH,140,2444.722,-3522.477,180.1916,0,0,0,0,100,0),
+(@PATH,141,2441.472,-3524.727,179.4416,0,0,0,0,100,0),
+(@PATH,142,2438.972,-3526.727,178.9416,0,0,0,0,100,0),
+(@PATH,143,2438.851,-3526.818,178.6737,0,0,0,0,100,0),
+(@PATH,144,2437.601,-3527.818,178.4237,0,0,0,0,100,0),
+(@PATH,145,2435.851,-3528.818,177.9237,0,0,0,0,100,0),
+(@PATH,146,2434.351,-3530.068,177.1737,0,0,0,0,100,0),
+(@PATH,147,2431.851,-3531.818,176.4237,0,0,0,0,100,0),
+(@PATH,148,2430.101,-3532.818,175.6737,0,0,0,0,100,0),
+(@PATH,149,2427.601,-3534.568,174.9237,0,0,0,0,100,0),
+(@PATH,150,2426.101,-3535.568,174.4237,0,0,0,0,100,0),
+(@PATH,151,2423.851,-3537.068,173.9237,0,0,0,0,100,0),
+(@PATH,152,2421.351,-3538.818,173.1737,0,0,0,0,100,0),
+(@PATH,153,2418.851,-3540.568,172.1737,0,0,0,0,100,0),
+(@PATH,154,2415.601,-3542.818,171.4237,0,0,0,0,100,0),
+(@PATH,155,2412.101,-3545.068,170.6737,0,0,0,0,100,0),
+(@PATH,156,2408.851,-3547.318,169.9237,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=113083;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(113083, 113083, 0, 0, 2, 0, 0),
+(113083, 113273, 3, 270, 0, 0, 0);
+
+-- 4.
+SET @NPC := 113341;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2665.083,`position_y`=-3408.349,`position_z`=191.3293 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,2665.083,-3408.349,191.3293,0,0,0,0,100,0),
+(@PATH,2,2663.833,-3408.849,190.5793,0,0,0,0,100,0),
+(@PATH,3,2658.583,-3410.849,188.3293,0,0,0,0,100,0),
+(@PATH,4,2651.291,-3413.096,185.2252,0,0,0,0,100,0),
+(@PATH,5,2645.547,-3411.715,184.4178,0,0,0,0,100,0),
+(@PATH,6,2657.797,-3409.465,188.1678,0,0,0,0,100,0),
+(@PATH,7,2658.169,-3409.456,188.2587,0,0,0,0,100,0),
+(@PATH,8,2660.169,-3408.956,189.2587,0,0,0,0,100,0),
+(@PATH,9,2663.919,-3409.456,190.5087,0,0,0,0,100,0),
+(@PATH,10,2666.669,-3409.956,192.0087,0,0,0,0,100,0),
+(@PATH,11,2671.881,-3410.748,193.7789,0,0,0,0,100,0),
+(@PATH,12,2674.881,-3413.248,196.0289,0,0,0,0,100,0),
+(@PATH,13,2679.381,-3416.498,198.0289,0,0,0,0,100,0),
+(@PATH,14,2679.491,-3416.702,198.1739,0,0,0,0,100,0),
+(@PATH,15,2679.991,-3416.952,198.6739,0,0,0,0,100,0),
+(@PATH,16,2680.491,-3418.702,199.9239,0,0,0,0,100,0),
+(@PATH,17,2681.241,-3421.202,201.6739,0,0,0,0,100,0),
+(@PATH,18,2682.491,-3424.452,204.4239,0,0,0,0,100,0),
+(@PATH,19,2683.241,-3426.452,205.6739,0,0,0,0,100,0),
+(@PATH,20,2684.436,-3428.615,207.8167,0,0,0,0,100,0),
+(@PATH,21,2684.936,-3429.865,208.8167,0,0,0,0,100,0),
+(@PATH,22,2685.686,-3432.115,210.8167,0,0,0,0,100,0),
+(@PATH,23,2687.186,-3435.865,213.8167,0,0,0,0,100,0),
+(@PATH,24,2687.9,-3437.695,215.7477,0,0,0,0,100,0),
+(@PATH,25,2690.65,-3441.695,218.7477,0,0,0,0,100,0),
+(@PATH,26,2691.9,-3443.445,220.2477,0,0,0,0,100,0),
+(@PATH,27,2693.9,-3446.445,221.2477,0,0,0,0,100,0),
+(@PATH,28,2695.4,-3448.445,221.9977,0,0,0,0,100,0),
+(@PATH,29,2695.485,-3448.735,222.0516,0,0,0,0,100,0),
+(@PATH,30,2695.985,-3449.235,222.3016,0,0,0,0,100,0),
+(@PATH,31,2697.985,-3449.985,223.0516,0,0,0,0,100,0),
+(@PATH,32,2700.485,-3450.485,223.3016,0,0,0,0,100,0),
+(@PATH,33,2703.235,-3451.735,223.0516,0,0,0,0,100,0),
+(@PATH,34,2706.735,-3452.985,223.0516,0,0,0,0,100,0),
+(@PATH,35,2710.288,-3454.03,223.3291,0,0,0,0,100,0),
+(@PATH,36,2718.038,-3448.78,223.0791,0,0,0,0,100,0),
+(@PATH,37,2721.205,-3446.615,223.2215,0,0,0,0,100,0),
+(@PATH,38,2719.455,-3442.365,223.2215,0,0,0,0,100,0),
+(@PATH,39,2717.705,-3438.115,223.2215,0,0,0,0,100,0),
+(@PATH,40,2716.955,-3436.365,222.9715,0,0,0,0,100,0),
+(@PATH,41,2715.399,-3432.048,223.0326,0,0,0,0,100,0),
+(@PATH,42,2711.149,-3427.048,222.2826,0,0,0,0,100,0),
+(@PATH,43,2707.399,-3422.298,221.5326,0,0,0,0,100,0),
+(@PATH,44,2705.424,-3419.88,221.4566,0,0,0,0,100,0),
+(@PATH,45,2702.674,-3415.63,221.4566,0,0,0,0,100,0),
+(@PATH,46,2701.174,-3412.63,222.2066,0,0,0,0,100,0),
+(@PATH,47,2699.174,-3409.38,222.2066,0,0,0,0,100,0),
+(@PATH,48,2699.021,-3409.206,222.4398,0,0,0,0,100,0),
+(@PATH,49,2698.021,-3407.456,223.1898,0,0,0,0,100,0),
+(@PATH,50,2698.021,-3405.706,223.6898,0,0,0,0,100,0),
+(@PATH,51,2697.521,-3402.206,223.6898,0,0,0,0,100,0),
+(@PATH,52,2697.021,-3398.456,224.9398,0,0,0,0,100,0),
+(@PATH,53,2697.045,-3398.296,225.0154,0,0,0,0,100,0),
+(@PATH,54,2696.795,-3395.296,225.2654,0,0,0,0,100,0),
+(@PATH,55,2696.795,-3394.296,225.2654,0,0,0,0,100,0),
+(@PATH,56,2697.045,-3389.796,226.0154,0,0,0,0,100,0),
+(@PATH,57,2697.159,-3386.208,226.225,0,0,0,0,100,0),
+(@PATH,58,2695.997,-3386.356,226.5057,0,0,0,0,100,0),
+(@PATH,59,2695.997,-3389.356,226.0057,0,0,0,0,100,0),
+(@PATH,60,2696.497,-3394.356,225.2557,0,0,0,0,100,0),
+(@PATH,61,2696.831,-3394.611,225.1375,0,0,0,0,100,0),
+(@PATH,62,2696.831,-3396.361,224.8875,0,0,0,0,100,0),
+(@PATH,63,2697.331,-3398.611,224.8875,0,0,0,0,100,0),
+(@PATH,64,2698.081,-3402.111,223.6375,0,0,0,0,100,0),
+(@PATH,65,2698.581,-3405.611,223.6375,0,0,0,0,100,0),
+(@PATH,66,2699.331,-3408.861,222.3875,0,0,0,0,100,0),
+(@PATH,67,2700.081,-3412.611,222.3875,0,0,0,0,100,0),
+(@PATH,68,2700.483,-3412.841,222.3442,0,0,0,0,100,0),
+(@PATH,69,2700.483,-3413.091,222.0942,0,0,0,0,100,0),
+(@PATH,70,2702.483,-3416.091,221.3442,0,0,0,0,100,0),
+(@PATH,71,2704.983,-3420.091,221.5942,0,0,0,0,100,0),
+(@PATH,72,2706.733,-3422.591,221.5942,0,0,0,0,100,0),
+(@PATH,73,2709.733,-3427.341,222.0942,0,0,0,0,100,0),
+(@PATH,74,2712.233,-3431.341,222.3442,0,0,0,0,100,0),
+(@PATH,75,2712.983,-3432.091,222.5942,0,0,0,0,100,0),
+(@PATH,76,2715.483,-3435.841,222.8442,0,0,0,0,100,0),
+(@PATH,77,2715.552,-3436.219,222.9191,0,0,0,0,100,0),
+(@PATH,78,2716.052,-3436.719,222.9191,0,0,0,0,100,0),
+(@PATH,79,2716.052,-3438.469,222.9191,0,0,0,0,100,0),
+(@PATH,80,2716.302,-3441.469,222.9191,0,0,0,0,100,0),
+(@PATH,81,2717.052,-3447.969,223.1691,0,0,0,0,100,0),
+(@PATH,82,2717.471,-3452.978,223.527,0,0,0,0,100,0),
+(@PATH,83,2707.967,-3459.347,223.6461,0,0,0,0,100,0),
+(@PATH,84,2706.967,-3458.597,223.3961,0,0,0,0,100,0),
+(@PATH,85,2702.217,-3454.847,223.3961,0,0,0,0,100,0),
+(@PATH,86,2698.717,-3452.597,223.6461,0,0,0,0,100,0),
+(@PATH,87,2697.217,-3451.597,223.3961,0,0,0,0,100,0),
+(@PATH,88,2694.388,-3449.521,222.1394,0,0,0,0,100,0),
+(@PATH,89,2693.138,-3447.521,221.3894,0,0,0,0,100,0),
+(@PATH,90,2691.138,-3444.271,220.1394,0,0,0,0,100,0),
+(@PATH,91,2690.138,-3442.271,219.1394,0,0,0,0,100,0),
+(@PATH,92,2688.837,-3440.164,217.5647,0,0,0,0,100,0),
+(@PATH,93,2687.837,-3437.664,215.5647,0,0,0,0,100,0),
+(@PATH,94,2687.087,-3435.914,213.8147,0,0,0,0,100,0),
+(@PATH,95,2685.837,-3432.164,211.0647,0,0,0,0,100,0),
+(@PATH,96,2685.087,-3429.914,208.8147,0,0,0,0,100,0),
+(@PATH,97,2684.689,-3429.572,208.5935,0,0,0,0,100,0),
+(@PATH,98,2684.439,-3428.572,207.8435,0,0,0,0,100,0),
+(@PATH,99,2683.939,-3426.322,206.0935,0,0,0,0,100,0),
+(@PATH,100,2683.689,-3424.322,204.5935,0,0,0,0,100,0),
+(@PATH,101,2683.189,-3421.322,202.3435,0,0,0,0,100,0),
+(@PATH,102,2682.299,-3417.771,200.1351,0,0,0,0,100,0),
+(@PATH,103,2680.549,-3416.021,198.3851,0,0,0,0,100,0),
+(@PATH,104,2675.799,-3411.771,196.3851,0,0,0,0,100,0),
+(@PATH,105,2674.497,-3410.42,195.1767,0,0,0,0,100,0),
+(@PATH,106,2672.997,-3410.17,194.1767,0,0,0,0,100,0),
+(@PATH,107,2667.247,-3408.67,192.4267,0,0,0,0,100,0);
+
+-- emotes
+DELETE FROM `creature_addon` WHERE `guid` IN (113076, 113199, 113079, 113200, 113078, 113202, 113080, 113203, 113084, 113206, 113085, 113082, 113205);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(113076, 0,0,0,1,69, ''),
+(113199, 0,0,0,1,69, ''),
+(113079, 0,0,0,1,69, ''),
+(113200, 0,0,0,1,69, ''),
+(113078, 0,0,0,1,69, ''),
+(113202, 0,0,0,1,69, ''),
+(113080, 0,0,0,1,69, ''),
+(113203, 0,0,0,1,69, ''),
+(113084, 0,0,0,1,69, ''),
+(113206, 0,0,0,1,69, ''),
+(113085, 0,0,0,1,69, ''),
+(113082, 0,0,0,1,69, ''),
+(113205, 0,0,0,1,69, '');
+
+SET @NPC := 99450;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2117.282,`position_y`=-2976.297,`position_z`=149.0083 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,2117.282,-2976.297,149.0083,0,0,0,0,100,0),
+(@PATH,2,2121.753,-2973.399,148.937,0,0,0,0,100,0),
+(@PATH,3,2127.775,-2975.117,148.7337,0,0,0,0,100,0),
+(@PATH,4,2129.135,-2979.465,148.9836,0,0,0,0,100,0),
+(@PATH,5,2126.795,-2984.026,149.0223,0,0,0,0,100,0),
+(@PATH,6,2121.726,-2985.183,149.0083,0,0,0,0,100,0),
+(@PATH,7,2118.201,-2982.285,149.0083,0,0,0,0,100,0),
+(@PATH,8,2117.281,-2976.291,149.0083,0,0,0,0,100,0);
diff --git a/sql/updates/world/2015_07_14_03_world.sql b/sql/updates/world/2015_07_14_03_world.sql
new file mode 100644
index 00000000000..31d3496a13b
--- /dev/null
+++ b/sql/updates/world/2015_07_14_03_world.sql
@@ -0,0 +1,2 @@
+-- Invis Aggrobehaviour
+UPDATE `spell_dbc` SET `AttributesEx3`=`AttributesEx3`|0x00020000 WHERE `Id`=35009;
diff --git a/sql/updates/world/2015_07_14_04_world.sql b/sql/updates/world/2015_07_14_04_world.sql
new file mode 100644
index 00000000000..9bf0289cf70
--- /dev/null
+++ b/sql/updates/world/2015_07_14_04_world.sql
@@ -0,0 +1,9 @@
+-- 
+-- Deathless Watcher SAI
+SET @ENTRY := 24013;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,25,0,100,0,0,0,0,0,90,9,0,0,0,0,0,1,0,0,0,0,0,0,0,"Deathless Watcher - On Reset - Set Flag Standstate Submerged"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,91,9,0,0,0,0,0,1,0,0,0,0,0,0,0,"Deathless Watcher - On Aggro - Remove Flag Standstate Submerged");
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `id`=24013;
diff --git a/sql/updates/world/2015_07_14_05_world.sql b/sql/updates/world/2015_07_14_05_world.sql
new file mode 100644
index 00000000000..7c2faf1c52d
--- /dev/null
+++ b/sql/updates/world/2015_07_14_05_world.sql
@@ -0,0 +1,14 @@
+-- 
+-- Bloodpaw Warrior SAI
+SET @ENTRY := 27342;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=1;
+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,1,0,1,0,100,0,2000,4000,55000,65000,75,6742,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodpaw Warrior - Out of Combat - Add Aura 'Bloodlust'");
+
+-- Bloodpaw Marauder SAI
+SET @ENTRY := 27340;
+UPDATE `creature_template` SET `AIName`="SmartAI" 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,0,1,0,100,0,2000,4000,55000,65000,75,6742,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bloodpaw Marauder - Out of Combat - Add Aura 'Bloodlust'");
diff --git a/sql/updates/world/2015_07_15_00_world.sql b/sql/updates/world/2015_07_15_00_world.sql
new file mode 100644
index 00000000000..fb7a0799f86
--- /dev/null
+++ b/sql/updates/world/2015_07_15_00_world.sql
@@ -0,0 +1,568 @@
+-- Dragonblight - New Hearthglen + Dragon Wastes
+
+UPDATE `smart_scripts` SET `action_param1`=1 WHERE  `entryorguid`=27202 AND `source_type`=0 AND `id`=0 AND `link`=0;
+
+-- 1.
+SET @NPC := 111051;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3097.314,`position_y`=201.7772,`position_z`=82.8672 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3097.314,201.7772,82.8672,0,0,0,0,100,0),
+(@PATH,2,3095.814,201.7772,83.1172,0,0,0,0,100,0),
+(@PATH,3,3083.064,201.5272,83.6172,0,0,0,0,100,0),
+(@PATH,4,3079.064,201.5272,84.3672,0,0,0,0,100,0),
+(@PATH,5,3078.733,201.5618,84.32298,0,0,0,0,100,0),
+(@PATH,6,3076.983,201.5618,84.57298,0,0,0,0,100,0),
+(@PATH,7,3067.483,200.8118,83.82298,0,0,0,0,100,0),
+(@PATH,8,3061.504,200.19,83.48076,0,0,0,0,100,0),
+(@PATH,9,3051.754,199.44,82.98076,0,0,0,0,100,0),
+(@PATH,10,3045.92,198.7205,82.55244,0,0,0,0,100,0),
+(@PATH,11,3037.92,198.7205,82.05244,0,0,0,0,100,0),
+(@PATH,12,3032.92,198.7205,81.55244,0,0,0,0,100,0),
+(@PATH,13,3015.99,198.9897,81.57481,0,0,0,0,100,0),
+(@PATH,14,3009.99,199.9897,81.07481,0,0,0,0,100,0),
+(@PATH,15,3004.99,200.9897,80.57481,0,0,0,0,100,0),
+(@PATH,16,3008.823,200.244,80.83981,0,0,0,0,100,0),
+(@PATH,17,3013.823,199.244,81.58981,0,0,0,0,100,0),
+(@PATH,18,3015.993,198.7468,81.95679,0,0,0,0,100,0),
+(@PATH,19,3039.743,198.7468,82.20679,0,0,0,0,100,0),
+(@PATH,20,3046.347,198.8345,82.82155,0,0,0,0,100,0),
+(@PATH,21,3057.847,199.8345,83.32155,0,0,0,0,100,0),
+(@PATH,22,3061.647,200.3903,83.72079,0,0,0,0,100,0),
+(@PATH,23,3068.397,200.6403,83.97079,0,0,0,0,100,0),
+(@PATH,24,3072.397,201.1403,84.72079,0,0,0,0,100,0),
+(@PATH,25,3077.279,201.5229,84.55926,0,0,0,0,100,0),
+(@PATH,26,3081.279,201.5229,83.80926,0,0,0,0,100,0),
+(@PATH,27,3085.279,201.5229,83.55926,0,0,0,0,100,0),
+(@PATH,28,3095.985,201.9144,82.76643,0,0,0,0,100,0),
+(@PATH,29,3100.985,201.4144,82.26643,0,0,0,0,100,0),
+(@PATH,30,3104.985,200.9144,81.51643,0,0,0,0,100,0),
+(@PATH,31,3111.985,200.1644,81.01643,0,0,0,0,100,0),
+(@PATH,32,3117.735,199.9144,80.51643,0,0,0,0,100,0),
+(@PATH,33,3121.735,199.4144,80.01643,0,0,0,0,100,0),
+(@PATH,34,3126.735,198.9144,79.26643,0,0,0,0,100,0),
+(@PATH,35,3134.341,198.3681,78.92584,0,0,0,0,100,0),
+(@PATH,36,3152.091,199.6181,78.17584,0,0,0,0,100,0),
+(@PATH,37,3156.091,199.8681,77.92584,0,0,0,0,100,0),
+(@PATH,38,3161.091,200.3681,77.42584,0,0,0,0,100,0),
+(@PATH,39,3161.268,200.6497,77.01109,0,0,0,0,100,0),
+(@PATH,40,3163.768,200.8997,77.26109,0,0,0,0,100,0),
+(@PATH,41,3168.268,202.8997,77.76109,0,0,0,0,100,0),
+(@PATH,42,3186.018,211.3997,77.01109,0,0,0,0,100,0),
+(@PATH,43,3188.542,212.8027,76.7966,0,0,0,0,100,0),
+(@PATH,44,3192.042,216.3027,76.2966,0,0,0,0,100,0),
+(@PATH,45,3212.792,238.761,75.90543,0,0,0,0,100,0),
+(@PATH,46,3219.042,250.011,75.40543,0,0,0,0,100,0),
+(@PATH,47,3225.542,262.011,74.65543,0,0,0,0,100,0),
+(@PATH,48,3226.542,264.011,74.15543,0,0,0,0,100,0),
+(@PATH,49,3228.292,267.511,73.40543,0,0,0,0,100,0),
+(@PATH,50,3230.292,271.011,72.40543,0,0,0,0,100,0),
+(@PATH,51,3232.792,275.261,71.65543,0,0,0,0,100,0),
+(@PATH,52,3234.073,277.7794,71.81288,0,0,0,0,100,0),
+(@PATH,53,3237.073,281.7794,72.56288,0,0,0,0,100,0),
+(@PATH,54,3239.823,285.7794,73.56288,0,0,0,0,100,0),
+(@PATH,55,3242.323,289.0294,74.31288,0,0,0,0,100,0),
+(@PATH,56,3257.073,310.0294,74.81288,0,0,0,0,100,0),
+(@PATH,57,3258.073,311.5294,75.56288,0,0,0,0,100,0),
+(@PATH,58,3259.153,313.129,75.61668,0,0,0,0,100,0),
+(@PATH,59,3264.903,320.129,76.11668,0,0,0,0,100,0),
+(@PATH,60,3268.653,324.879,75.61668,0,0,0,0,100,0),
+(@PATH,61,3270.403,327.379,74.86668,0,0,0,0,100,0),
+(@PATH,62,3271.903,329.379,74.11668,0,0,0,0,100,0),
+(@PATH,63,3277.653,336.379,73.61668,0,0,0,0,100,0),
+(@PATH,64,3281.153,341.129,72.86668,0,0,0,0,100,0),
+(@PATH,65,3285.607,346.5189,72.45518,0,0,0,0,100,0),
+(@PATH,66,3303.357,363.5189,72.70518,0,0,0,0,100,0),
+(@PATH,67,3305.602,365.6404,72.97585,0,0,0,0,100,0),
+(@PATH,68,3325.852,373.3904,72.47585,0,0,0,0,100,0),
+(@PATH,69,3330.694,375.6069,71.93503,0,0,0,0,100,0),
+(@PATH,70,3334.444,376.3569,71.18503,0,0,0,0,100,0),
+(@PATH,71,3336.444,376.8569,70.68503,0,0,0,0,100,0),
+(@PATH,72,3338.444,377.1069,69.93503,0,0,0,0,100,0),
+(@PATH,73,3350.944,379.6069,69.18503,0,0,0,0,100,0),
+(@PATH,74,3352.944,380.1069,68.93503,0,0,0,0,100,0),
+(@PATH,75,3355.694,380.6069,68.18503,0,0,0,0,100,0),
+(@PATH,76,3361.694,381.8569,67.43503,0,0,0,0,100,0),
+(@PATH,77,3363.702,382.506,67.33813,0,0,0,0,100,0),
+(@PATH,78,3356.702,381.006,68.08813,0,0,0,0,100,0),
+(@PATH,79,3353.952,380.256,68.58813,0,0,0,0,100,0),
+(@PATH,80,3350.952,379.756,69.33813,0,0,0,0,100,0),
+(@PATH,81,3346.202,378.756,69.83813,0,0,0,0,100,0),
+(@PATH,82,3336.452,376.756,70.58813,0,0,0,0,100,0),
+(@PATH,83,3334.452,376.256,71.33813,0,0,0,0,100,0),
+(@PATH,84,3330.367,375.3779,72.00482,0,0,0,0,100,0),
+(@PATH,85,3324.867,373.1279,72.50482,0,0,0,0,100,0),
+(@PATH,86,3318.617,370.6279,73.25482,0,0,0,0,100,0),
+(@PATH,87,3305.183,365.389,72.8768,0,0,0,0,100,0),
+(@PATH,88,3298.683,359.139,72.3768,0,0,0,0,100,0),
+(@PATH,89,3285.406,346.3057,72.51546,0,0,0,0,100,0),
+(@PATH,90,3280.406,340.0557,73.01546,0,0,0,0,100,0),
+(@PATH,91,3277.156,336.0557,73.76546,0,0,0,0,100,0),
+(@PATH,92,3272.656,330.0557,74.01546,0,0,0,0,100,0),
+(@PATH,93,3270.656,327.8057,74.76546,0,0,0,0,100,0),
+(@PATH,94,3268.906,325.3057,75.51546,0,0,0,0,100,0),
+(@PATH,95,3266.406,322.3057,76.01546,0,0,0,0,100,0),
+(@PATH,96,3258.985,312.77,75.75705,0,0,0,0,100,0),
+(@PATH,97,3257.235,310.52,74.75705,0,0,0,0,100,0),
+(@PATH,98,3254.985,307.27,74.25705,0,0,0,0,100,0),
+(@PATH,99,3240.235,286.27,73.50705,0,0,0,0,100,0),
+(@PATH,100,3238.985,284.52,73.00705,0,0,0,0,100,0),
+(@PATH,101,3236.735,281.27,72.25705,0,0,0,0,100,0),
+(@PATH,102,3233.873,277.4071,72.02361,0,0,0,0,100,0),
+(@PATH,103,3232.373,274.9071,71.27361,0,0,0,0,100,0),
+(@PATH,104,3230.123,270.4071,73.02361,0,0,0,0,100,0),
+(@PATH,105,3228.123,266.9071,73.77361,0,0,0,0,100,0),
+(@PATH,106,3226.123,263.4071,74.27361,0,0,0,0,100,0),
+(@PATH,107,3224.623,260.6571,75.02361,0,0,0,0,100,0),
+(@PATH,108,3216.873,246.1571,75.77361,0,0,0,0,100,0),
+(@PATH,109,3212.646,238.5428,76.13255,0,0,0,0,100,0),
+(@PATH,110,3190.146,214.5428,76.63255,0,0,0,0,100,0),
+(@PATH,111,3188.266,212.4306,76.7549,0,0,0,0,100,0),
+(@PATH,112,3183.766,210.4306,77.5049,0,0,0,0,100,0),
+(@PATH,113,3179.266,208.1806,78.0049,0,0,0,0,100,0),
+(@PATH,114,3166.016,201.9306,77.2549,0,0,0,0,100,0),
+(@PATH,115,3163.59,200.5424,77.43803,0,0,0,0,100,0),
+(@PATH,116,3155.59,199.7924,77.93803,0,0,0,0,100,0),
+(@PATH,117,3152.59,199.5424,78.18803,0,0,0,0,100,0),
+(@PATH,118,3149.59,199.5424,78.93803,0,0,0,0,100,0),
+(@PATH,119,3134.203,198.276,79.24261,0,0,0,0,100,0),
+(@PATH,120,3122.203,199.526,79.74261,0,0,0,0,100,0),
+(@PATH,121,3118.203,199.776,80.49261,0,0,0,0,100,0),
+(@PATH,122,3113.453,200.026,80.99261,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=111051;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(111051, 111051, 0, 0, 2, 0, 0),
+(111051, 111169, 7, 0, 2, 0, 0),
+(111051, 111170, 14, 0, 2, 0, 0);
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid` IN (111169, 111170);
+
+-- 2.
+SET @NPC := 110954;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3304.004,`position_y`=-122.7727,`position_z`=73.01753 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3304.004,-122.7727,73.01753,0,0,0,0,100,0),
+(@PATH,2,3319.027,-148.6648,72.38235,0,0,0,0,100,0),
+(@PATH,3,3323.527,-152.6648,72.13235,0,0,0,0,100,0),
+(@PATH,4,3335.219,-163.2354,72.44555,0,0,0,0,100,0),
+(@PATH,5,3336.969,-165.7354,73.19555,0,0,0,0,100,0),
+(@PATH,6,3340.719,-171.4854,73.44555,0,0,0,0,100,0),
+(@PATH,7,3347.469,-181.2354,73.94555,0,0,0,0,100,0),
+(@PATH,8,3349.921,-184.613,74.75533,0,0,0,0,100,0),
+(@PATH,9,3362.921,-206.863,75.50533,0,0,0,0,100,0),
+(@PATH,10,3364.921,-210.113,76.00533,0,0,0,0,100,0),
+(@PATH,11,3366.921,-213.613,76.75533,0,0,0,0,100,0),
+(@PATH,12,3366.664,-213.1822,76.19576,0,0,0,0,100,0),
+(@PATH,13,3364.664,-209.9322,75.69576,0,0,0,0,100,0),
+(@PATH,14,3361.664,-204.6822,75.19576,0,0,0,0,100,0),
+(@PATH,15,3357.414,-197.1822,74.44576,0,0,0,0,100,0),
+(@PATH,16,3352.664,-189.4322,75.19576,0,0,0,0,100,0),
+(@PATH,17,3349.638,-184.3163,74.51703,0,0,0,0,100,0),
+(@PATH,18,3347.888,-181.8163,74.01703,0,0,0,0,100,0),
+(@PATH,19,3345.138,-177.8163,73.51703,0,0,0,0,100,0),
+(@PATH,20,3337.388,-166.5663,73.01703,0,0,0,0,100,0),
+(@PATH,21,3334.927,-162.9315,72.23009,0,0,0,0,100,0),
+(@PATH,22,3331.177,-159.6815,71.98009,0,0,0,0,100,0),
+(@PATH,23,3319.677,-149.1815,72.23009,0,0,0,0,100,0),
+(@PATH,24,3319.346,-149.0192,72.46732,0,0,0,0,100,0),
+(@PATH,25,3318.846,-148.2692,72.46732,0,0,0,0,100,0),
+(@PATH,26,3305.346,-125.2692,72.96732,0,0,0,0,100,0),
+(@PATH,27,3303.776,-122.4284,73.08718,0,0,0,0,100,0),
+(@PATH,28,3289.361,-101.321,73.01395,0,0,0,0,100,0),
+(@PATH,29,3281.611,-92.07098,72.26395,0,0,0,0,100,0),
+(@PATH,30,3278.611,-88.07098,72.01395,0,0,0,0,100,0),
+(@PATH,31,3264.892,-71.45324,71.77171,0,0,0,0,100,0),
+(@PATH,32,3257.642,-67.95324,71.52171,0,0,0,0,100,0),
+(@PATH,33,3235.607,-56.83378,71.66665,0,0,0,0,100,0),
+(@PATH,34,3231.857,-58.08378,72.41665,0,0,0,0,100,0),
+(@PATH,35,3227.857,-59.33378,72.91665,0,0,0,0,100,0),
+(@PATH,36,3223.107,-60.58378,73.41665,0,0,0,0,100,0),
+(@PATH,37,3218.607,-61.83378,74.16665,0,0,0,0,100,0),
+(@PATH,38,3211.857,-63.83378,74.66665,0,0,0,0,100,0),
+(@PATH,39,3206.546,-65.78079,75.45023,0,0,0,0,100,0),
+(@PATH,40,3199.546,-69.78079,75.95023,0,0,0,0,100,0),
+(@PATH,41,3196.296,-71.78079,76.70023,0,0,0,0,100,0),
+(@PATH,42,3193.796,-73.03079,76.95023,0,0,0,0,100,0),
+(@PATH,43,3188.796,-76.28079,77.70023,0,0,0,0,100,0),
+(@PATH,44,3185.296,-78.28079,78.20023,0,0,0,0,100,0),
+(@PATH,45,3181.796,-80.28079,78.95023,0,0,0,0,100,0),
+(@PATH,46,3181.48,-80.20216,79.14981,0,0,0,0,100,0),
+(@PATH,47,3181.23,-80.45216,79.14981,0,0,0,0,100,0),
+(@PATH,48,3146.48,-77.95216,78.64981,0,0,0,0,100,0),
+(@PATH,49,3144.093,-77.49599,78.68388,0,0,0,0,100,0),
+(@PATH,50,3133.843,-69.49599,79.43388,0,0,0,0,100,0),
+(@PATH,51,3120.843,-58.99599,78.68388,0,0,0,0,100,0),
+(@PATH,52,3117.372,-56.24393,78.32555,0,0,0,0,100,0),
+(@PATH,53,3107.122,-51.99393,77.57555,0,0,0,0,100,0),
+(@PATH,54,3101.622,-49.74393,77.07555,0,0,0,0,100,0),
+(@PATH,55,3099.122,-48.99393,76.57555,0,0,0,0,100,0),
+(@PATH,56,3095.372,-47.49393,76.07555,0,0,0,0,100,0),
+(@PATH,57,3091.622,-45.99393,75.32555,0,0,0,0,100,0),
+(@PATH,58,3080.474,-41.3601,75.43945,0,0,0,0,100,0),
+(@PATH,59,3067.474,-42.6101,74.68945,0,0,0,0,100,0),
+(@PATH,60,3052.724,-44.1101,74.43945,0,0,0,0,100,0),
+(@PATH,61,3045.986,-45.10185,73.82922,0,0,0,0,100,0),
+(@PATH,62,3037.736,-53.35185,73.32922,0,0,0,0,100,0),
+(@PATH,63,3029.236,-61.60185,73.82922,0,0,0,0,100,0),
+(@PATH,64,3029.299,-61.83793,73.84348,0,0,0,0,100,0),
+(@PATH,65,3027.799,-63.58793,73.84348,0,0,0,0,100,0),
+(@PATH,66,3029.799,-70.08793,73.34348,0,0,0,0,100,0),
+(@PATH,67,3032.049,-76.83793,72.84348,0,0,0,0,100,0),
+(@PATH,68,3033.299,-81.33793,72.34348,0,0,0,0,100,0),
+(@PATH,69,3035.799,-88.83793,71.84348,0,0,0,0,100,0),
+(@PATH,70,3037.615,-93.84658,71.53387,0,0,0,0,100,0),
+(@PATH,71,3042.365,-97.59658,72.03387,0,0,0,0,100,0),
+(@PATH,72,3063.115,-112.8466,72.53387,0,0,0,0,100,0),
+(@PATH,73,3069.688,-117.9348,72.68712,0,0,0,0,100,0),
+(@PATH,74,3078.188,-125.1848,73.68712,0,0,0,0,100,0),
+(@PATH,75,3079.688,-126.4348,74.18712,0,0,0,0,100,0),
+(@PATH,76,3081.938,-128.4348,75.18712,0,0,0,0,100,0),
+(@PATH,77,3084.188,-130.4348,75.68712,0,0,0,0,100,0),
+(@PATH,78,3086.438,-132.4348,76.43712,0,0,0,0,100,0),
+(@PATH,79,3089.938,-135.4348,76.93712,0,0,0,0,100,0),
+(@PATH,80,3093.688,-138.6848,77.68712,0,0,0,0,100,0),
+(@PATH,81,3100.438,-144.4348,78.43712,0,0,0,0,100,0),
+(@PATH,82,3094.992,-139.7807,77.4295,0,0,0,0,100,0),
+(@PATH,83,3089.492,-135.0307,76.6795,0,0,0,0,100,0),
+(@PATH,84,3086.742,-132.7807,76.1795,0,0,0,0,100,0),
+(@PATH,85,3083.742,-130.0307,75.4295,0,0,0,0,100,0),
+(@PATH,86,3080.742,-127.5307,74.6795,0,0,0,0,100,0),
+(@PATH,87,3079.242,-126.2807,74.1795,0,0,0,0,100,0),
+(@PATH,88,3077.742,-124.7807,73.1795,0,0,0,0,100,0),
+(@PATH,89,3075.492,-123.0307,72.6795,0,0,0,0,100,0),
+(@PATH,90,3069.613,-117.7452,72.45045,0,0,0,0,100,0),
+(@PATH,91,3042.613,-97.49518,71.95045,0,0,0,0,100,0),
+(@PATH,92,3038.613,-94.49518,71.70045,0,0,0,0,100,0),
+(@PATH,93,3038.275,-94.41074,71.51865,0,0,0,0,100,0),
+(@PATH,94,3037.275,-93.66074,71.51865,0,0,0,0,100,0),
+(@PATH,95,3034.525,-85.16074,72.26865,0,0,0,0,100,0),
+(@PATH,96,3033.025,-79.41074,72.51865,0,0,0,0,100,0),
+(@PATH,97,3031.525,-74.91074,73.01865,0,0,0,0,100,0),
+(@PATH,98,3029.025,-67.41074,73.76865,0,0,0,0,100,0),
+(@PATH,99,3027.747,-63.19135,73.97582,0,0,0,0,100,0),
+(@PATH,100,3032.747,-58.19135,73.72582,0,0,0,0,100,0),
+(@PATH,101,3046.227,-44.84958,74.18223,0,0,0,0,100,0),
+(@PATH,102,3056.227,-43.84958,74.43223,0,0,0,0,100,0),
+(@PATH,103,3070.727,-42.34958,74.93223,0,0,0,0,100,0),
+(@PATH,104,3080.749,-41.29838,75.66859,0,0,0,0,100,0),
+(@PATH,105,3097.249,-48.29838,76.41859,0,0,0,0,100,0),
+(@PATH,106,3100.749,-49.54838,76.91859,0,0,0,0,100,0),
+(@PATH,107,3103.499,-50.54838,77.41859,0,0,0,0,100,0),
+(@PATH,108,3108.999,-52.79838,78.16859,0,0,0,0,100,0),
+(@PATH,109,3117.556,-56.57686,78.39417,0,0,0,0,100,0),
+(@PATH,110,3121.556,-59.57686,79.14417,0,0,0,0,100,0),
+(@PATH,111,3124.556,-62.07686,79.64417,0,0,0,0,100,0),
+(@PATH,112,3136.056,-71.32686,79.14417,0,0,0,0,100,0),
+(@PATH,113,3144.39,-77.77893,78.85022,0,0,0,0,100,0),
+(@PATH,114,3159.14,-78.77893,79.35022,0,0,0,0,100,0),
+(@PATH,115,3181.306,-80.64502,79.26598,0,0,0,0,100,0),
+(@PATH,116,3184.056,-78.89502,78.51598,0,0,0,0,100,0),
+(@PATH,117,3187.306,-76.89502,78.01598,0,0,0,0,100,0),
+(@PATH,118,3191.806,-74.39502,77.26598,0,0,0,0,100,0),
+(@PATH,119,3196.556,-71.64502,76.76598,0,0,0,0,100,0),
+(@PATH,120,3199.056,-70.14502,76.01598,0,0,0,0,100,0),
+(@PATH,121,3202.556,-67.89502,75.26598,0,0,0,0,100,0),
+(@PATH,122,3206.884,-65.36325,75.14902,0,0,0,0,100,0),
+(@PATH,123,3216.384,-62.61325,74.14902,0,0,0,0,100,0),
+(@PATH,124,3222.884,-60.86325,73.39902,0,0,0,0,100,0),
+(@PATH,125,3226.634,-59.61325,73.14902,0,0,0,0,100,0),
+(@PATH,126,3230.384,-58.36325,72.39902,0,0,0,0,100,0),
+(@PATH,127,3235.92,-57.03172,71.59767,0,0,0,0,100,0),
+(@PATH,128,3265.016,-71.74498,72.00586,0,0,0,0,100,0),
+(@PATH,129,3282.766,-93.24498,72.50586,0,0,0,0,100,0),
+(@PATH,130,3289.59,-101.6345,73.0332,0,0,0,0,100,0),
+(@PATH,131,3304.02,-122.7957,73.0175,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=110954;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(110954, 110954, 0, 0, 2, 0, 0),
+(110954, 111173, 8, 0, 2, 0, 0);
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `guid`=111173;
+
+-- 3.
+SET @NPC := 111049;
+SET @PATH := @NPC * 10; 
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3204.118,`position_y`=9.464139,`position_z`=75.35005 WHERE `guid`=@NPC;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=3204.118,`position_y`=9.464139,`position_z`=75.35005 WHERE `guid`=111176;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=3204.118,`position_y`=9.464139,`position_z`=75.35005 WHERE `guid`=111177;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=3204.118,`position_y`=9.464139,`position_z`=75.35005 WHERE `guid`=111175;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3204.118,9.464139,75.35005,0,0,0,0,100,0),
+(@PATH,2,3205.47,15.98113,76.06122,0,0,0,0,100,0),
+(@PATH,3,3207.97,27.73113,76.31122,0,0,0,0,100,0),
+(@PATH,4,3211.72,45.23113,77.06122,0,0,0,0,100,0),
+(@PATH,5,3213.318,49.37894,77.8667,0,0,0,0,100,0),
+(@PATH,6,3214.818,54.12894,78.3667,0,0,0,0,100,0),
+(@PATH,7,3215.568,57.12894,79.1167,0,0,0,0,100,0),
+(@PATH,8,3217.068,61.62894,79.3667,0,0,0,0,100,0),
+(@PATH,9,3218.818,67.12894,80.3667,0,0,0,0,100,0),
+(@PATH,10,3219.818,70.12894,81.1167,0,0,0,0,100,0),
+(@PATH,11,3220.568,72.87894,81.8667,0,0,0,0,100,0),
+(@PATH,12,3221.643,75.57011,82.44968,0,0,0,0,100,0),
+(@PATH,13,3224.393,78.57011,82.69968,0,0,0,0,100,0),
+(@PATH,14,3241.643,97.57011,83.44968,0,0,0,0,100,0),
+(@PATH,15,3246.592,103.0302,83.87857,0,0,0,0,100,0),
+(@PATH,16,3252.592,104.2802,83.12857,0,0,0,0,100,0),
+(@PATH,17,3256.342,105.2802,82.62857,0,0,0,0,100,0),
+(@PATH,18,3259.342,105.7802,81.87857,0,0,0,0,100,0),
+(@PATH,19,3263.342,106.5302,81.37857,0,0,0,0,100,0),
+(@PATH,20,3267.842,107.5302,80.62857,0,0,0,0,100,0),
+(@PATH,21,3271.842,108.5302,80.12857,0,0,0,0,100,0),
+(@PATH,22,3274.592,109.0302,79.62857,0,0,0,0,100,0),
+(@PATH,23,3277.592,109.7802,78.87857,0,0,0,0,100,0),
+(@PATH,24,3280.592,110.2802,78.12857,0,0,0,0,100,0),
+(@PATH,25,3283.592,111.0302,77.62857,0,0,0,0,100,0),
+(@PATH,26,3286.352,111.8738,76.87943,0,0,0,0,100,0),
+(@PATH,27,3290.352,111.8738,76.12943,0,0,0,0,100,0),
+(@PATH,28,3294.352,112.1238,75.62943,0,0,0,0,100,0),
+(@PATH,29,3298.352,112.3738,74.87943,0,0,0,0,100,0),
+(@PATH,30,3302.102,112.3738,74.37943,0,0,0,0,100,0),
+(@PATH,31,3305.102,112.3738,73.87943,0,0,0,0,100,0),
+(@PATH,32,3307.102,112.3738,73.12943,0,0,0,0,100,0),
+(@PATH,33,3309.852,112.3738,72.87943,0,0,0,0,100,0),
+(@PATH,34,3312.852,112.6238,72.12943,0,0,0,0,100,0),
+(@PATH,35,3316.852,112.8738,71.62943,0,0,0,0,100,0),
+(@PATH,36,3318.852,112.8738,70.87943,0,0,0,0,100,0),
+(@PATH,37,3320.852,112.8738,70.37943,0,0,0,0,100,0),
+(@PATH,38,3324.852,113.1238,69.37943,0,0,0,0,100,0),
+(@PATH,39,3334.725,113.7286,69.50629,0,0,0,0,100,0),
+(@PATH,40,3349.225,120.2286,69.00629,0,0,0,0,100,0),
+(@PATH,41,3353.475,122.2286,68.25629,0,0,0,0,100,0),
+(@PATH,42,3363.475,126.7286,68.00629,0,0,0,0,100,0),
+(@PATH,43,3369.216,129.3355,67.4007,0,0,0,0,100,0),
+(@PATH,44,3382.966,135.0855,66.9007,0,0,0,0,100,0),
+(@PATH,45,3387.466,137.0855,66.4007,0,0,0,0,100,0),
+(@PATH,46,3389.966,138.0855,65.6507,0,0,0,0,100,0),
+(@PATH,47,3391.966,138.8355,64.9007,0,0,0,0,100,0),
+(@PATH,48,3394.716,140.0855,64.4007,0,0,0,0,100,0),
+(@PATH,49,3397.466,141.0855,63.90069,0,0,0,0,100,0),
+(@PATH,50,3400.216,142.3355,63.15069,0,0,0,0,100,0),
+(@PATH,51,3403.966,143.8355,62.65069,0,0,0,0,100,0),
+(@PATH,52,3406.716,145.0855,61.90069,0,0,0,0,100,0),
+(@PATH,53,3410.216,146.5855,61.15069,0,0,0,0,100,0),
+(@PATH,54,3410.457,146.9182,60.77554,0,0,0,0,100,0),
+(@PATH,55,3410.957,147.1682,60.52554,0,0,0,0,100,0),
+(@PATH,56,3413.957,147.1682,59.52554,0,0,0,0,100,0),
+(@PATH,57,3417.957,147.6682,58.77554,0,0,0,0,100,0),
+(@PATH,58,3420.957,147.6682,58.02554,0,0,0,0,100,0),
+(@PATH,59,3422.957,147.6682,57.27554,0,0,0,0,100,0),
+(@PATH,60,3425.957,147.9182,57.02554,0,0,0,0,100,0),
+(@PATH,61,3428.707,148.1682,56.27554,0,0,0,0,100,0),
+(@PATH,62,3435.707,148.6682,55.77554,0,0,0,0,100,0),
+(@PATH,63,3439.707,148.9182,55.02554,0,0,0,0,100,0),
+(@PATH,64,3442.707,149.1682,54.52554,0,0,0,0,100,0),
+(@PATH,65,3445.457,149.4182,53.77554,0,0,0,0,100,0),
+(@PATH,66,3447.674,149.3518,53.08506,0,0,0,0,100,0),
+(@PATH,67,3459.174,139.8518,52.58506,0,0,0,0,100,0),
+(@PATH,68,3461.424,137.8518,51.83506,0,0,0,0,100,0),
+(@PATH,69,3462.924,136.6018,51.08506,0,0,0,0,100,0),
+(@PATH,70,3464.924,134.8518,50.08506,0,0,0,0,100,0),
+(@PATH,71,3466.424,133.6018,49.83506,0,0,0,0,100,0),
+(@PATH,72,3467.924,132.3518,48.83506,0,0,0,0,100,0),
+(@PATH,73,3470.174,130.3518,48.08506,0,0,0,0,100,0),
+(@PATH,74,3473.424,127.8518,47.33506,0,0,0,0,100,0),
+(@PATH,75,3480.498,121.4224,47.18571,0,0,0,0,100,0),
+(@PATH,76,3479.248,114.4224,47.93571,0,0,0,0,100,0),
+(@PATH,77,3478.248,110.6724,48.68571,0,0,0,0,100,0),
+(@PATH,78,3477.998,108.6724,49.18571,0,0,0,0,100,0),
+(@PATH,79,3477.248,105.9224,49.68571,0,0,0,0,100,0),
+(@PATH,80,3476.498,101.1724,50.43571,0,0,0,0,100,0),
+(@PATH,81,3474.998,94.17238,50.93571,0,0,0,0,100,0),
+(@PATH,82,3474.048,90.14128,52.04639,0,0,0,0,100,0),
+(@PATH,83,3473.548,88.14128,52.54639,0,0,0,0,100,0),
+(@PATH,84,3473.048,85.14128,53.29639,0,0,0,0,100,0),
+(@PATH,85,3472.548,82.14128,53.79639,0,0,0,0,100,0),
+(@PATH,86,3471.798,79.14128,54.54639,0,0,0,0,100,0),
+(@PATH,87,3471.298,76.39128,54.79639,0,0,0,0,100,0),
+(@PATH,88,3470.798,73.64128,55.79639,0,0,0,0,100,0),
+(@PATH,89,3470.048,69.64128,56.54639,0,0,0,0,100,0),
+(@PATH,90,3469.548,66.64128,57.04639,0,0,0,0,100,0),
+(@PATH,91,3467.798,58.89128,57.79639,0,0,0,0,100,0),
+(@PATH,92,3469.408,81.3713,54.02486,0,0,0,0,100,0),
+(@PATH,93,3466.544,80.8951,54.98119,0,0,0,0,100,0),
+(@PATH,94,3465.019,80.68309,55.57894,0,0,0,0,100,0),
+(@PATH,95,3462.21,80.21594,56.55909,0,0,0,0,100,0),
+(@PATH,96,3458.183,79.50483,56.74107,0,0,0,0,100,0),
+(@PATH,97,3455.251,79.01736,57.25414,0,0,0,0,100,0),
+(@PATH,98,3452.344,78.53384,57.54979,0,0,0,0,100,0),
+(@PATH,99,3449.389,78.04266,57.88622,0,0,0,0,100,0),
+(@PATH,100,3446.469,77.55716,58.35838,0,0,0,0,100,0),
+(@PATH,101,3443.532,77.06879,58.68077,0,0,0,0,100,0),
+(@PATH,102,3440.594,76.58042,58.86436,0,0,0,0,100,0),
+(@PATH,103,3437.662,76.09289,59.09081,0,0,0,0,100,0),
+(@PATH,104,3434.707,75.60166,59.2318,0,0,0,0,100,0),
+(@PATH,105,3431.76,75.11166,59.56713,0,0,0,0,100,0),
+(@PATH,106,3428.82,74.62287,59.87059,0,0,0,0,100,0),
+(@PATH,107,3425.868,74.13203,60.09984,0,0,0,0,100,0),
+(@PATH,108,3422.948,73.64647,60.20043,0,0,0,0,100,0),
+(@PATH,109,3419.998,73.15604,60.26659,0,0,0,0,100,0),
+(@PATH,110,3417.046,72.66521,60.40856,0,0,0,0,100,0),
+(@PATH,111,3414.094,72.17438,60.39159,0,0,0,0,100,0),
+(@PATH,112,3411.139,71.68315,60.49242,0,0,0,0,100,0),
+(@PATH,113,3408.184,71.19193,60.64159,0,0,0,0,100,0),
+(@PATH,114,3409.099,68.8335,60.64159,0,0,0,0,100,0),
+(@PATH,115,3411.684,66.93849,60.64159,0,0,0,0,100,0),
+(@PATH,116,3412.484,65.64385,60.57561,0,0,0,0,100,0),
+(@PATH,117,3413.367,64.55799,60.44646,0,0,0,0,100,0),
+(@PATH,118,3414.696,63.14472,60.37041,0,0,0,0,100,0),
+(@PATH,119,3415.821,61.74331,60.32146,0,0,0,0,100,0),
+(@PATH,120,3416.772,60.17775,60.19646,0,0,0,0,100,0),
+(@PATH,121,3417.788,58.71508,60.19646,0,0,0,0,100,0),
+(@PATH,122,3418.686,57.17812,60.19646,0,0,0,0,100,0),
+(@PATH,123,3419.607,55.69309,60.32146,0,0,0,0,100,0),
+(@PATH,124,3420.03,54.76865,60.32146,0,0,0,0,100,0),
+(@PATH,125,3420.979,53.13712,60.52642,0,0,0,0,100,0),
+(@PATH,126,3420.976,52.08463,60.52617,0,0,0,0,100,0),
+(@PATH,127,3421.843,50.63347,60.63018,0,0,0,0,100,0),
+(@PATH,128,3422.437,49.25807,60.82146,0,0,0,0,100,0),
+(@PATH,129,3422.029,48.15757,60.77752,0,0,0,0,100,0),
+(@PATH,130,3422.841,46.16269,60.82146,0,0,0,0,100,0),
+(@PATH,131,3422.26,45.06837,60.82146,0,0,0,0,100,0),
+(@PATH,132,3423.068,42.39875,60.87688,0,0,0,0,100,0),
+(@PATH,133,3422.673,41.40164,60.85466,0,0,0,0,100,0),
+(@PATH,134,3423.321,39.57,60.94646,0,0,0,0,100,0),
+(@PATH,135,3423.199,38.42225,60.94646,0,0,0,0,100,0),
+(@PATH,136,3423.498,36.50599,60.95378,0,0,0,0,100,0),
+(@PATH,137,3423.645,34.83721,60.84649,0,0,0,0,100,0),
+(@PATH,138,3423.755,32.66412,60.86862,0,0,0,0,100,0),
+(@PATH,139,3423.835,30.63097,60.86862,0,0,0,0,100,0),
+(@PATH,140,3423.879,28.63033,60.94064,0,0,0,0,100,0),
+(@PATH,141,3423.888,26.64286,61.10897,0,0,0,0,100,0),
+(@PATH,142,3423.864,24.66538,61.24362,0,0,0,0,100,0),
+(@PATH,143,3424.006,1.27307,61.94939,0,0,0,0,100,0),
+(@PATH,144,3424.006,-20.47693,62.44939,0,0,0,0,100,0),
+(@PATH,145,3424.256,-24.47693,62.94939,0,0,0,0,100,0),
+(@PATH,146,3424.389,-36.41846,63.03847,0,0,0,0,100,0),
+(@PATH,147,3424.889,-41.41846,62.53847,0,0,0,0,100,0),
+(@PATH,148,3424.889,-46.16846,62.03847,0,0,0,0,100,0),
+(@PATH,149,3425.941,-58.71535,61.96366,0,0,0,0,100,0),
+(@PATH,150,3429.691,-61.71535,62.46366,0,0,0,0,100,0),
+(@PATH,151,3435.191,-65.71535,61.71366,0,0,0,0,100,0),
+(@PATH,152,3437.441,-67.71535,61.21366,0,0,0,0,100,0),
+(@PATH,153,3439.191,-68.96535,60.71366,0,0,0,0,100,0),
+(@PATH,154,3437.223,-67.2487,61.21352,0,0,0,0,100,0),
+(@PATH,155,3433.973,-64.9987,61.96352,0,0,0,0,100,0),
+(@PATH,156,3425.861,-58.53635,62.06436,0,0,0,0,100,0),
+(@PATH,157,3424.611,-40.78635,62.56436,0,0,0,0,100,0),
+(@PATH,158,3424.388,-36.07053,63.0836,0,0,0,0,100,0),
+(@PATH,159,3427.138,-31.82054,63.5836,0,0,0,0,100,0),
+(@PATH,160,3445.592,-3.802267,63.72139,0,0,0,0,100,0),
+(@PATH,161,3448.342,3.697733,63.22139,0,0,0,0,100,0),
+(@PATH,162,3449.342,6.697733,62.47139,0,0,0,0,100,0),
+(@PATH,163,3450.592,10.44773,62.22139,0,0,0,0,100,0),
+(@PATH,164,3451.592,13.94773,61.47139,0,0,0,0,100,0),
+(@PATH,165,3454.842,23.44773,62.22139,0,0,0,0,100,0),
+(@PATH,166,3458.153,32.557,61.3678,0,0,0,0,100,0),
+(@PATH,167,3459.903,37.307,60.8678,0,0,0,0,100,0),
+(@PATH,168,3462.653,44.557,60.1178,0,0,0,0,100,0),
+(@PATH,169,3463.903,48.307,59.6178,0,0,0,0,100,0),
+(@PATH,170,3465.403,51.807,59.1178,0,0,0,0,100,0),
+(@PATH,171,3466.403,54.807,58.3678,0,0,0,0,100,0),
+(@PATH,172,3467.404,56.96931,58.01789,0,0,0,0,100,0),
+(@PATH,173,3468.904,63.96931,57.26789,0,0,0,0,100,0),
+(@PATH,174,3470.154,69.71931,56.51789,0,0,0,0,100,0),
+(@PATH,175,3470.654,73.46931,55.76789,0,0,0,0,100,0),
+(@PATH,176,3471.154,75.46931,55.01789,0,0,0,0,100,0),
+(@PATH,177,3471.654,78.21931,54.51789,0,0,0,0,100,0),
+(@PATH,178,3472.154,81.21931,53.76789,0,0,0,0,100,0),
+(@PATH,179,3473.154,85.21931,53.26789,0,0,0,0,100,0),
+(@PATH,180,3473.654,88.21931,52.51789,0,0,0,0,100,0),
+(@PATH,181,3474.163,89.99994,51.65433,0,0,0,0,100,0),
+(@PATH,182,3474.913,93.99994,51.15433,0,0,0,0,100,0),
+(@PATH,183,3476.163,98.74994,50.40433,0,0,0,0,100,0),
+(@PATH,184,3477.163,104.7499,49.65433,0,0,0,0,100,0),
+(@PATH,185,3477.913,108.2499,49.15433,0,0,0,0,100,0),
+(@PATH,186,3478.413,111.2499,48.65433,0,0,0,0,100,0),
+(@PATH,187,3479.163,114.2499,47.90433,0,0,0,0,100,0),
+(@PATH,189,3480.413,119.9999,47.15433,0,0,0,0,100,0),
+(@PATH,190,3480.561,121.6387,47.18623,0,0,0,0,100,0),
+(@PATH,191,3471.311,129.3887,47.93623,0,0,0,0,100,0),
+(@PATH,192,3469.061,131.3887,48.43623,0,0,0,0,100,0),
+(@PATH,193,3467.561,132.6387,49.43623,0,0,0,0,100,0),
+(@PATH,194,3465.311,134.3887,49.93623,0,0,0,0,100,0),
+(@PATH,195,3463.311,136.1387,50.93623,0,0,0,0,100,0),
+(@PATH,196,3461.061,138.1387,51.93623,0,0,0,0,100,0),
+(@PATH,197,3459.561,139.3887,52.68623,0,0,0,0,100,0),
+(@PATH,198,3456.311,141.8887,53.18623,0,0,0,0,100,0),
+(@PATH,199,3447.302,149.4205,53.46371,0,0,0,0,100,0),
+(@PATH,200,3444.302,149.1705,53.96371,0,0,0,0,100,0),
+(@PATH,201,3441.302,148.9205,54.71371,0,0,0,0,100,0),
+(@PATH,202,3439.302,148.9205,55.21371,0,0,0,0,100,0),
+(@PATH,203,3435.302,148.6705,55.96371,0,0,0,0,100,0),
+(@PATH,204,3427.552,147.9205,56.46371,0,0,0,0,100,0),
+(@PATH,205,3424.552,147.6705,56.96371,0,0,0,0,100,0),
+(@PATH,206,3421.802,147.6705,57.71371,0,0,0,0,100,0),
+(@PATH,207,3419.802,147.6705,58.21371,0,0,0,0,100,0),
+(@PATH,208,3416.802,147.4205,59.21371,0,0,0,0,100,0),
+(@PATH,209,3413.802,147.1705,59.96371,0,0,0,0,100,0),
+(@PATH,210,3410.573,146.7634,60.80497,0,0,0,0,100,0),
+(@PATH,211,3408.823,146.0134,61.30497,0,0,0,0,100,0),
+(@PATH,212,3406.073,144.7634,62.05497,0,0,0,0,100,0),
+(@PATH,213,3402.323,143.2634,62.80497,0,0,0,0,100,0),
+(@PATH,214,3399.573,142.0134,63.30497,0,0,0,0,100,0),
+(@PATH,215,3396.823,141.0134,63.80497,0,0,0,0,100,0),
+(@PATH,216,3393.073,139.2634,64.55497,0,0,0,0,100,0),
+(@PATH,217,3391.323,138.5134,65.30497,0,0,0,0,100,0),
+(@PATH,218,3387.823,137.2634,66.05497,0,0,0,0,100,0),
+(@PATH,219,3383.323,135.2634,66.80497,0,0,0,0,100,0),
+(@PATH,220,3368.959,128.9598,67.73827,0,0,0,0,100,0),
+(@PATH,221,3359.709,124.9598,68.23827,0,0,0,0,100,0),
+(@PATH,222,3350.959,120.9598,68.98827,0,0,0,0,100,0),
+(@PATH,223,3345.459,118.7098,69.48827,0,0,0,0,100,0),
+(@PATH,224,3334.299,113.3885,69.7776,0,0,0,0,100,0),
+(@PATH,225,3326.549,113.1385,69.2776,0,0,0,0,100,0),
+(@PATH,226,3322.549,112.8885,70.0276,0,0,0,0,100,0),
+(@PATH,227,3320.549,112.8885,70.7776,0,0,0,0,100,0),
+(@PATH,228,3318.549,112.8885,71.2776,0,0,0,0,100,0),
+(@PATH,229,3315.549,112.8885,72.0276,0,0,0,0,100,0),
+(@PATH,230,3311.549,112.8885,72.5276,0,0,0,0,100,0),
+(@PATH,231,3307.799,112.6385,73.0276,0,0,0,0,100,0),
+(@PATH,232,3305.799,112.6385,73.5276,0,0,0,0,100,0),
+(@PATH,233,3302.799,112.3885,74.2776,0,0,0,0,100,0),
+(@PATH,234,3299.799,112.3885,74.7776,0,0,0,0,100,0),
+(@PATH,235,3295.799,112.1385,75.5276,0,0,0,0,100,0),
+(@PATH,236,3291.799,112.1385,76.0276,0,0,0,0,100,0),
+(@PATH,237,3287.799,111.8885,76.7776,0,0,0,0,100,0),
+(@PATH,238,3287.523,111.5087,77.03613,0,0,0,0,100,0),
+(@PATH,239,3286.023,111.5087,77.03613,0,0,0,0,100,0),
+(@PATH,240,3283.023,111.0087,77.78613,0,0,0,0,100,0),
+(@PATH,241,3280.023,110.2587,78.53613,0,0,0,0,100,0),
+(@PATH,242,3276.273,109.5087,79.28613,0,0,0,0,100,0),
+(@PATH,243,3273.273,108.7587,79.78613,0,0,0,0,100,0),
+(@PATH,244,3270.273,108.0087,80.28613,0,0,0,0,100,0),
+(@PATH,245,3266.773,107.2587,81.03613,0,0,0,0,100,0),
+(@PATH,246,3260.773,106.2587,81.53613,0,0,0,0,100,0),
+(@PATH,247,3257.023,105.2587,82.28613,0,0,0,0,100,0),
+(@PATH,248,3254.023,104.7587,83.03613,0,0,0,0,100,0),
+(@PATH,249,3250.023,103.7587,83.53613,0,0,0,0,100,0),
+(@PATH,250,3246.363,102.7875,83.76866,0,0,0,0,100,0),
+(@PATH,251,3240.363,96.28754,83.01866,0,0,0,0,100,0),
+(@PATH,252,3223.113,77.28754,82.51866,0,0,0,0,100,0),
+(@PATH,253,3221.356,75.51231,82.20918,0,0,0,0,100,0),
+(@PATH,254,3220.606,72.51231,81.45918,0,0,0,0,100,0),
+(@PATH,255,3219.606,69.76231,80.70918,0,0,0,0,100,0),
+(@PATH,256,3218.606,66.76231,80.20918,0,0,0,0,100,0),
+(@PATH,257,3217.356,63.01231,79.45918,0,0,0,0,100,0),
+(@PATH,258,3215.856,57.51231,79.20918,0,0,0,0,100,0),
+(@PATH,259,3214.606,53.76231,78.45918,0,0,0,0,100,0),
+(@PATH,260,3213.356,50.01231,77.70918,0,0,0,0,100,0),
+(@PATH,261,3211.878,45.40641,76.98198,0,0,0,0,100,0),
+(@PATH,262,3210.378,38.65641,76.23198,0,0,0,0,100,0),
+(@PATH,263,3205.146,15.76002,75.59174,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=111049;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(111049, 111049, 0, 0, 2, 0, 0),
+(111049, 111176, 8, 0, 2, 0, 0),
+(111049, 111177, 8, 70, 2, 0, 0),
+(111049, 111175, 8, 290, 2, 0, 0);
diff --git a/sql/updates/world/2015_07_15_01_world.sql b/sql/updates/world/2015_07_15_01_world.sql
new file mode 100644
index 00000000000..b9b7d92072a
--- /dev/null
+++ b/sql/updates/world/2015_07_15_01_world.sql
@@ -0,0 +1,399 @@
+-- Dragonblight Pathing - Moa'ki Harbor + Azure Dragonshrine
+
+-- 1. rndmmovement
+UPDATE `creature` SET `spawndist`=20 WHERE  `guid` IN (106644, 106699, 106698, 106714, 106736, 131071, 106695, 106720);
+
+-- 2. emotes
+DELETE FROM `creature_addon` WHERE `guid` IN (109020, 109041);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(109020,0,0,0,1,51, ''),
+(109041,0,0,0,1,51, '');
+
+-- 3.
+SET @NPC := 106347;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3328.549,`position_y`=35.32029,`position_z`=68.77303 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3328.549,35.32029,68.77303,0,0,0,0,100,0),
+(@PATH,2,3328.281,35.21631,68.51276,0,0,0,0,100,0),
+(@PATH,3,3328.231,35.3801,68.81226,0,0,0,0,100,0),
+(@PATH,4,3326.481,39.1301,69.56226,0,0,0,0,100,0),
+(@PATH,5,3324.981,42.3801,70.06226,0,0,0,0,100,0),
+(@PATH,6,3323.481,44.8801,70.56226,0,0,0,0,100,0),
+(@PATH,7,3323.24,45.35506,70.7541,0,0,0,0,100,0),
+(@PATH,8,3322.99,45.85506,70.7541,0,0,0,0,100,0),
+(@PATH,9,3321.24,48.35506,71.2541,0,0,0,0,100,0),
+(@PATH,10,3321.963,47.37666,71.00128,0,0,0,0,100,0),
+(@PATH,11,3322.048,47.26694,71.02554,0,0,0,0,100,0),
+(@PATH,12,3323.298,45.51694,70.77554,0,0,0,0,100,0),
+(@PATH,13,3324.798,42.01694,70.02554,0,0,0,0,100,0),
+(@PATH,14,3326.298,39.51694,69.52554,0,0,0,0,100,0);
+
+-- 4. foxus warlock emotes
+DELETE FROM `creature_addon` WHERE `guid` IN (114036, 114035, 114040, 114039, 114041, 114002, 114005, 114003, 113973, 113995, 114000, 113996, 113998, 114038, 113999);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(114036,0,0,0,1,69, ''), 
+(114035,0,0,0,1,69, ''), 
+(114040,0,0,0,1,69, ''), 
+(114039,0,0,0,1,69, ''), 
+(114041,0,0,0,1,69, ''), 
+(114002,0,0,0,1,69, ''), 
+(114005,0,0,0,1,69, ''), 
+(114003,0,0,0,1,69, ''), 
+(113973,0,0,0,1,69, ''), 
+(113995,0,0,0,1,69, ''), 
+(114000,0,0,0,1,69, ''), 
+(113996,0,0,0,1,69, ''), 
+(113998,0,0,0,1,69, ''), 
+(114038,0,0,0,1,69, ''), 
+(113999,0,0,0,1,69, '');
+
+-- 5. mage hunter emotes
+DELETE FROM `creature_addon` WHERE `guid` IN (111759, 111757, 111756, 111758, 111760, 111761, 111802, 111801, 111800);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(111759,0,0,0,1,27, ''), 
+(111757,0,0,0,1,27, ''), 
+(111756,0,0,0,1,27, ''), 
+(111758,0,0,0,1,27, ''), 
+(111760,0,0,0,1,27, ''), 
+(111761,0,0,0,1,27, ''),  
+(111802,0,0,0,1,27, ''), 
+(111801,0,0,0,1,27, ''), 
+(111800,0,0,0,1,27, '');
+
+-- 6. Beefwps
+SET @NPC := 111043;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3357.819,`position_y`=518.5552,`position_z`=78.31688 WHERE `guid`=@NPC;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=3357.819,`position_y`=518.5552,`position_z`=78.31688 WHERE `guid`=111211;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3357.819,518.5552,78.31688,0,0,0,0,100,0),
+(@PATH,2,3364.319,524.5552,78.81688,0,0,0,0,100,0),
+(@PATH,3,3368.569,528.3052,79.31688,0,0,0,0,100,0),
+(@PATH,4,3375.445,534.399,79.33154,0,0,0,0,100,0),
+(@PATH,5,3391.695,551.649,78.83154,0,0,0,0,100,0),
+(@PATH,6,3395.945,555.899,78.08154,0,0,0,0,100,0),
+(@PATH,7,3406.195,566.649,77.58154,0,0,0,0,100,0),
+(@PATH,8,3407.308,568.47,77.32245,0,0,0,0,100,0),
+(@PATH,9,3395.808,585.72,78.07245,0,0,0,0,100,0),
+(@PATH,10,3393.808,588.97,78.32245,0,0,0,0,100,0),
+(@PATH,11,3388.808,596.47,79.07245,0,0,0,0,100,0),
+(@PATH,12,3384.558,603.22,79.57245,0,0,0,0,100,0),
+(@PATH,13,3384.328,603.3331,79.72012,0,0,0,0,100,0),
+(@PATH,14,3383.578,604.5831,79.97012,0,0,0,0,100,0),
+(@PATH,15,3372.078,617.0831,80.47012,0,0,0,0,100,0),
+(@PATH,16,3369.578,619.8331,80.97012,0,0,0,0,100,0),
+(@PATH,17,3354.531,636.454,81.09949,0,0,0,0,100,0),
+(@PATH,18,3352.031,648.204,81.84949,0,0,0,0,100,0),
+(@PATH,19,3351.031,654.954,82.09949,0,0,0,0,100,0),
+(@PATH,20,3347.781,671.454,82.84949,0,0,0,0,100,0),
+(@PATH,21,3347.66,671.6125,82.84419,0,0,0,0,100,0),
+(@PATH,22,3348.41,668.6125,82.09419,0,0,0,0,100,0),
+(@PATH,23,3350.16,658.8625,82.59419,0,0,0,0,100,0),
+(@PATH,24,3351.16,653.1125,82.09419,0,0,0,0,100,0),
+(@PATH,25,3352.91,644.3625,81.59419,0,0,0,0,100,0),
+(@PATH,26,3354.698,636.1382,80.88446,0,0,0,0,100,0),
+(@PATH,27,3371.948,617.3882,80.38446,0,0,0,0,100,0),
+(@PATH,28,3374.698,614.3882,79.88446,0,0,0,0,100,0),
+(@PATH,29,3383.664,604.2737,79.74067,0,0,0,0,100,0),
+(@PATH,30,3387.164,599.2737,79.24067,0,0,0,0,100,0),
+(@PATH,31,3393.164,590.0237,78.49067,0,0,0,0,100,0),
+(@PATH,32,3395.664,586.0237,77.99067,0,0,0,0,100,0),
+(@PATH,33,3398.414,582.0237,77.49067,0,0,0,0,100,0),
+(@PATH,34,3407.336,568.2035,77.34898,0,0,0,0,100,0),
+(@PATH,35,3404.086,564.4535,78.09898,0,0,0,0,100,0),
+(@PATH,36,3394.336,554.4535,78.59898,0,0,0,0,100,0),
+(@PATH,37,3389.836,549.4535,79.09898,0,0,0,0,100,0),
+(@PATH,38,3375.294,534.2694,79.25139,0,0,0,0,100,0),
+(@PATH,39,3365.794,525.7694,78.75139,0,0,0,0,100,0),
+(@PATH,40,3361.294,521.7694,78.25139,0,0,0,0,100,0),
+(@PATH,41,3357.338,518.4061,78.19955,0,0,0,0,100,0),
+(@PATH,42,3353.588,514.9061,78.94955,0,0,0,0,100,0),
+(@PATH,43,3349.838,511.6561,79.44955,0,0,0,0,100,0),
+(@PATH,44,3346.088,508.4061,80.19955,0,0,0,0,100,0),
+(@PATH,45,3343.338,505.9061,80.69955,0,0,0,0,100,0),
+(@PATH,46,3336.588,500.1561,81.19955,0,0,0,0,100,0),
+(@PATH,47,3331.361,495.4106,81.15448,0,0,0,0,100,0),
+(@PATH,48,3311.611,470.6606,80.40448,0,0,0,0,100,0),
+(@PATH,49,3308.507,466.9263,79.84391,0,0,0,0,100,0),
+(@PATH,50,3307.007,463.1763,79.34391,0,0,0,0,100,0),
+(@PATH,51,3304.757,457.6763,78.59391,0,0,0,0,100,0),
+(@PATH,52,3303.257,453.4263,78.09391,0,0,0,0,100,0),
+(@PATH,53,3300.507,446.9263,77.59391,0,0,0,0,100,0),
+(@PATH,54,3298.613,441.5379,76.93367,0,0,0,0,100,0),
+(@PATH,55,3303.113,424.2879,77.43367,0,0,0,0,100,0),
+(@PATH,56,3306.613,411.0379,76.93367,0,0,0,0,100,0),
+(@PATH,57,3307.363,408.0379,76.18367,0,0,0,0,100,0),
+(@PATH,58,3308.363,404.2879,75.93367,0,0,0,0,100,0),
+(@PATH,59,3307.172,408.4494,76.61504,0,0,0,0,100,0),
+(@PATH,60,3306.172,412.1994,77.36504,0,0,0,0,100,0),
+(@PATH,61,3298.596,441.697,77.28619,0,0,0,0,100,0),
+(@PATH,62,3301.596,449.197,77.78619,0,0,0,0,100,0),
+(@PATH,63,3303.596,454.447,78.28619,0,0,0,0,100,0),
+(@PATH,64,3305.346,459.197,78.78619,0,0,0,0,100,0),
+(@PATH,65,3307.346,463.947,79.53619,0,0,0,0,100,0),
+(@PATH,66,3308.805,467.3031,80.26054,0,0,0,0,100,0),
+(@PATH,67,3312.055,471.0531,80.76054,0,0,0,0,100,0),
+(@PATH,68,3318.305,479.0531,81.26054,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=111043;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(111043, 111043, 0, 0, 2, 0, 0),
+(111043, 111211, 7, 0, 0, 0, 0);
+
+-- 7. casting emotes gnomes
+DELETE FROM `creature_addon` WHERE `guid` IN (109040, 109039);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(109040,0,0,0,1,51, ''),
+(109039,0,0,0,1,51, '');
+
+-- 8. Attackemotes for hunter + warlocks (all 3 caves)
+DELETE FROM `creature_addon` WHERE `guid` IN (111789, 111827, 114030, 111796, 111811, 111813, 114029, 111834, 114069, 111812, 114049, 111750, 113966, 111768, 111766, 114010, 111770, 114008, 111769, 111767, 114009, 111734, 111779, 114020, 111776, 111774, 111775, 111747, 111754, 111755, 111753, 113951, 113968, 113969, 113964, 111717, 113967, 111735, 113970, 111728, 113940, 113965, 114006, 111727, 111743, 111763, 111764);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(111789, 0,0,0,1,27, ''),
+(111827, 0,0,0,1,27, ''),
+(114030, 0,0,0,1,27, ''), 
+(111796, 0,0,0,1,27, ''), 
+(111811, 0,0,0,1,27, ''),
+(111813, 0,0,0,1,27, ''),
+(114029, 0,0,0,1,27, ''),
+(111834, 0,0,0,1,27, ''),
+(114069, 0,0,0,1,27, ''),
+(111812, 0,0,0,1,27, ''),
+(114049, 0,0,0,1,27, ''),
+(111750, 0,0,0,1,27, ''),
+(113966, 0,0,0,1,27, ''),
+(111768, 0,0,0,1,27, ''),
+(111766, 0,0,0,1,27, ''),
+(114010, 0,0,0,1,27, ''),
+(111770, 0,0,0,1,27, ''),
+(114008, 0,0,0,1,27, ''),
+(111769, 0,0,0,1,27, ''),
+(111767, 0,0,0,1,27, ''),
+(114009, 0,0,0,1,27, ''),
+(111734, 0,0,0,1,27, ''),
+(111779, 0,0,0,1,27, ''),
+(114020, 0,0,0,1,27, ''),
+(111776, 0,0,0,1,27, ''),
+(111774, 0,0,0,1,27, ''),
+(111775, 0,0,0,1,27, ''),
+(111747, 0,0,0,1,27, ''),
+(111754, 0,0,0,1,27, ''),
+(111755, 0,0,0,1,27, ''),
+(111753, 0,0,0,1,27, ''),
+(113951, 0,0,0,1,27, ''),
+(113968, 0,0,0,1,27, ''),
+(113969, 0,0,0,1,27, ''),
+(113964, 0,0,0,1,27, ''),
+(111717, 0,0,0,1,27, ''),
+(113967, 0,0,0,1,27, ''),
+(111735, 0,0,0,1,27, ''),
+(113970, 0,0,0,1,27, ''),
+(111728, 0,0,0,1,27, ''),
+(113940, 0,0,0,1,27, ''),
+(113965, 0,0,0,1,27, ''),
+(114006, 0,0,0,1,27, ''),
+(111727, 0,0,0,1,27, ''),
+(111743, 0,0,0,1,27, ''),
+(111763, 0,0,0,1,27, ''),
+(111764,0,0,0,1,27, '');
+
+-- 9. Moa'ki Warrior
+SET @NPC := 99801;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2942.45,`position_y`=874.4968,`position_z`=35.30196 WHERE `guid`=@NPC;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=2942.45,`position_y`=874.4968,`position_z`=35.30196 WHERE `guid`=99802;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,2942.45,874.4968,35.30196,0,0,0,0,100,0),
+(@PATH,2,2940.95,874.7468,35.05196,0,0,0,0,100,0),
+(@PATH,3,2938.95,874.4968,34.55196,0,0,0,0,100,0),
+(@PATH,4,2935.95,873.9968,33.55196,0,0,0,0,100,0),
+(@PATH,5,2934.2,873.7468,33.05196,0,0,0,0,100,0),
+(@PATH,6,2932.45,873.4968,32.55196,0,0,0,0,100,0),
+(@PATH,7,2929.45,873.2468,31.80196,0,0,0,0,100,0),
+(@PATH,8,2926.45,872.9968,31.05196,0,0,0,0,100,0),
+(@PATH,9,2923.45,872.4968,30.05196,0,0,0,0,100,0),
+(@PATH,10,2923.197,872.4724,29.89659,0,0,0,0,100,0),
+(@PATH,11,2921.197,872.2224,29.39659,0,0,0,0,100,0),
+(@PATH,12,2919.197,871.7224,28.89659,0,0,0,0,100,0),
+(@PATH,13,2916.447,870.9724,28.14659,0,0,0,0,100,0),
+(@PATH,14,2914.447,870.4724,27.39659,0,0,0,0,100,0),
+(@PATH,15,2910.697,869.9724,26.89659,0,0,0,0,100,0),
+(@PATH,16,2907.697,869.2224,26.14659,0,0,0,0,100,0),
+(@PATH,17,2904.947,868.4724,25.64659,0,0,0,0,100,0),
+(@PATH,18,2902.995,868.2098,24.81467,0,0,0,0,100,0),
+(@PATH,19,2899.995,868.9598,24.31467,0,0,0,0,100,0),
+(@PATH,20,2896.245,869.9598,23.56467,0,0,0,0,100,0),
+(@PATH,21,2893.495,870.7098,23.06467,0,0,0,0,100,0),
+(@PATH,22,2890.495,871.4598,22.56467,0,0,0,0,100,0),
+(@PATH,23,2885.745,872.7098,21.81467,0,0,0,0,100,0),
+(@PATH,24,2885.609,872.7776,21.46217,0,0,0,0,100,0),
+(@PATH,25,2884.109,873.2776,21.21217,0,0,0,0,100,0),
+(@PATH,26,2880.109,873.2776,20.71217,0,0,0,0,100,0),
+(@PATH,27,2873.359,873.2776,20.21217,0,0,0,0,100,0),
+(@PATH,28,2868.175,873.5178,19.47064,0,0,0,0,100,0),
+(@PATH,29,2860.175,880.7678,18.97064,0,0,0,0,100,0),
+(@PATH,30,2857.271,883.4542,18.24871,0,0,0,0,100,0),
+(@PATH,31,2851.021,886.2042,17.74871,0,0,0,0,100,0),
+(@PATH,32,2843.771,889.4542,17.24871,0,0,0,0,100,0),
+(@PATH,33,2843.393,889.6986,17.05721,0,0,0,0,100,0),
+(@PATH,34,2842.643,889.9486,17.05721,0,0,0,0,100,0),
+(@PATH,35,2836.893,892.1986,16.30721,0,0,0,0,100,0),
+(@PATH,36,2829.259,895.6682,16.03611,0,0,0,0,100,0),
+(@PATH,37,2826.259,899.6682,16.78611,0,0,0,0,100,0),
+(@PATH,38,2824.759,901.9182,17.28611,0,0,0,0,100,0),
+(@PATH,39,2823.009,904.1682,18.03611,0,0,0,0,100,0),
+(@PATH,40,2820.759,907.4182,18.78611,0,0,0,0,100,0),
+(@PATH,41,2818.548,910.2606,19.6723,0,0,0,0,100,0),
+(@PATH,42,2815.048,912.5106,20.1723,0,0,0,0,100,0),
+(@PATH,43,2811.798,914.5106,20.4223,0,0,0,0,100,0),
+(@PATH,44,2807.798,917.0106,21.1723,0,0,0,0,100,0),
+(@PATH,45,2804.548,919.2606,21.9223,0,0,0,0,100,0),
+(@PATH,46,2804.113,919.4464,22.19062,0,0,0,0,100,0),
+(@PATH,47,2802.863,920.4464,22.19062,0,0,0,0,100,0),
+(@PATH,48,2802.113,936.1964,22.69062,0,0,0,0,100,0),
+(@PATH,49,2801.614,942.2058,22.90605,0,0,0,0,100,0),
+(@PATH,50,2794.46,955.9167,22.82833,0,0,0,0,100,0),
+(@PATH,51,2789.868,969.0771,22.71787,0,0,0,0,100,0),
+(@PATH,52,2789.86,968.7522,22.44791,0,0,0,0,100,0),
+(@PATH,53,2790.052,968.7579,22.57249,0,0,0,0,100,0),
+(@PATH,54,2794.692,955.4985,22.95527,0,0,0,0,100,0),
+(@PATH,55,2801.604,942.0818,22.84189,0,0,0,0,100,0),
+(@PATH,56,2802.354,929.3318,22.34189,0,0,0,0,100,0),
+(@PATH,57,2803.029,920.1268,22.10619,0,0,0,0,100,0),
+(@PATH,58,2807.279,917.3768,21.60619,0,0,0,0,100,0),
+(@PATH,59,2809.779,916.1268,20.85619,0,0,0,0,100,0),
+(@PATH,60,2813.779,913.3768,20.35619,0,0,0,0,100,0),
+(@PATH,61,2817.029,911.3768,19.85619,0,0,0,0,100,0),
+(@PATH,62,2817.245,910.9927,19.40564,0,0,0,0,100,0),
+(@PATH,63,2818.745,909.9927,19.40564,0,0,0,0,100,0),
+(@PATH,64,2820.995,906.7427,18.40564,0,0,0,0,100,0),
+(@PATH,65,2823.245,903.7427,17.65564,0,0,0,0,100,0),
+(@PATH,66,2825.495,900.7427,17.15564,0,0,0,0,100,0),
+(@PATH,67,2827.245,898.2427,16.65564,0,0,0,0,100,0),
+(@PATH,68,2827.63,897.9916,16.59999,0,0,0,0,100,0),
+(@PATH,69,2829.38,895.2416,16.09999,0,0,0,0,100,0),
+(@PATH,70,2839.38,891.2416,16.59999,0,0,0,0,100,0),
+(@PATH,71,2842.658,889.7286,17.27651,0,0,0,0,100,0),
+(@PATH,72,2849.908,886.7286,17.52651,0,0,0,0,100,0),
+(@PATH,73,2855.408,884.2286,18.27651,0,0,0,0,100,0),
+(@PATH,74,2857.304,883.3358,18.64834,0,0,0,0,100,0),
+(@PATH,75,2861.054,879.8358,18.89834,0,0,0,0,100,0),
+(@PATH,76,2868.077,873.4034,19.59505,0,0,0,0,100,0),
+(@PATH,77,2874.077,873.4034,20.09505,0,0,0,0,100,0),
+(@PATH,78,2879.827,873.4034,20.59505,0,0,0,0,100,0),
+(@PATH,79,2884.046,873.29,21.49246,0,0,0,0,100,0),
+(@PATH,80,2888.046,872.04,22.24246,0,0,0,0,100,0),
+(@PATH,81,2892.546,870.79,22.74246,0,0,0,0,100,0),
+(@PATH,82,2895.546,870.29,23.24246,0,0,0,0,100,0),
+(@PATH,83,2898.296,869.54,23.99246,0,0,0,0,100,0),
+(@PATH,84,2901.296,868.54,24.49246,0,0,0,0,100,0),
+(@PATH,85,2901.368,868.5389,24.78852,0,0,0,0,100,0),
+(@PATH,86,2903.118,868.0389,25.03852,0,0,0,0,100,0),
+(@PATH,87,2906.118,868.7889,25.53852,0,0,0,0,100,0),
+(@PATH,88,2908.868,869.5389,26.28852,0,0,0,0,100,0),
+(@PATH,89,2911.618,870.2889,26.78852,0,0,0,0,100,0),
+(@PATH,90,2915.618,870.7889,27.53852,0,0,0,0,100,0),
+(@PATH,91,2917.618,871.2889,28.28852,0,0,0,0,100,0),
+(@PATH,92,2920.368,872.0389,29.03852,0,0,0,0,100,0),
+(@PATH,93,2920.589,872.1874,29.30408,0,0,0,0,100,0),
+(@PATH,94,2921.339,872.4374,29.55408,0,0,0,0,100,0),
+(@PATH,95,2924.339,872.6874,30.55408,0,0,0,0,100,0),
+(@PATH,96,2927.339,873.1874,31.30408,0,0,0,0,100,0),
+(@PATH,97,2930.089,873.1874,31.80408,0,0,0,0,100,0),
+(@PATH,98,2933.089,873.6874,32.80408,0,0,0,0,100,0),
+(@PATH,99,2935.089,873.9374,33.30408,0,0,0,0,100,0),
+(@PATH,100,2937.089,874.1874,34.05408,0,0,0,0,100,0),
+(@PATH,101,2940.089,874.6874,34.80408,0,0,0,0,100,0),
+(@PATH,102,2940.357,874.6572,35.2282,0,0,0,0,100,0),
+(@PATH,103,2941.357,874.6572,35.4782,0,0,0,0,100,0),
+(@PATH,104,2944.357,874.4072,36.2282,0,0,0,0,100,0),
+(@PATH,105,2947.357,874.1572,36.7282,0,0,0,0,100,0),
+(@PATH,106,2949.107,873.9072,37.4782,0,0,0,0,100,0),
+(@PATH,107,2953.107,873.9072,38.2282,0,0,0,0,100,0),
+(@PATH,108,2955.857,873.6572,38.9782,0,0,0,0,100,0),
+(@PATH,109,2953.459,873.7681,38.4597,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=99801;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(99801, 99801, 0, 0, 2, 0, 0),
+(99801, 99802, 3, 90, 2, 0, 0);
+UPDATE `smart_scripts` SET `action_param1`=1 WHERE  `entryorguid`=27178 AND `source_type`=0 AND `id`=0 AND `link`=1;
+
+-- 10. Moa'ki Warrior
+SET @NPC := 99815;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2734.04,`position_y`=908.0725,`position_z`=3.249194 WHERE `guid`=@NPC;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=2734.04,`position_y`=908.0725,`position_z`=3.249194 WHERE `guid`=99814;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,2734.04,908.0725,3.249194,0,0,0,0,100,0),
+(@PATH,2,2736.54,905.0725,3.749194,0,0,0,0,100,0),
+(@PATH,3,2739.04,901.8225,4.249194,0,0,0,0,100,0),
+(@PATH,4,2740.54,899.8225,4.749194,0,0,0,0,100,0),
+(@PATH,5,2743.79,895.8225,5.249194,0,0,0,0,100,0),
+(@PATH,6,2746.789,892.0921,5.316426,0,0,0,0,100,0),
+(@PATH,7,2765.288,879.248,5.514341,0,0,0,0,100,0),
+(@PATH,8,2788.071,876.0192,5.926539,0,0,0,0,100,0),
+(@PATH,9,2796.821,876.0192,6.676539,0,0,0,0,100,0),
+(@PATH,10,2802.821,876.0192,6.926539,0,0,0,0,100,0),
+(@PATH,11,2806.821,875.7692,7.676539,0,0,0,0,100,0),
+(@PATH,12,2806.909,875.7591,7.908364,0,0,0,0,100,0),
+(@PATH,13,2807.659,875.7591,8.158364,0,0,0,0,100,0),
+(@PATH,14,2810.159,877.7591,8.658364,0,0,0,0,100,0),
+(@PATH,15,2812.159,879.5091,9.158364,0,0,0,0,100,0),
+(@PATH,16,2813.909,880.5091,9.908364,0,0,0,0,100,0),
+(@PATH,17,2816.159,882.2591,10.65836,0,0,0,0,100,0),
+(@PATH,18,2817.659,883.5091,11.40836,0,0,0,0,100,0),
+(@PATH,19,2816.375,882.6917,10.97033,0,0,0,0,100,0),
+(@PATH,20,2818.125,883.9417,11.72033,0,0,0,0,100,0),
+(@PATH,21,2818.875,884.6917,11.72033,0,0,0,0,100,0),
+(@PATH,22,2820.375,885.9417,12.72033,0,0,0,0,100,0),
+(@PATH,23,2821.375,887.4417,12.97033,0,0,0,0,100,0),
+(@PATH,24,2822.875,888.6917,13.72033,0,0,0,0,100,0),
+(@PATH,25,2824.125,890.1917,14.47033,0,0,0,0,100,0),
+(@PATH,26,2825.375,891.6917,15.22033,0,0,0,0,100,0),
+(@PATH,27,2824.66,890.6411,14.79578,0,0,0,0,100,0),
+(@PATH,28,2823.16,889.3911,14.04578,0,0,0,0,100,0),
+(@PATH,29,2821.41,887.3911,13.29578,0,0,0,0,100,0),
+(@PATH,30,2818.638,884.2707,11.69823,0,0,0,0,100,0),
+(@PATH,31,2816.388,882.5207,10.69823,0,0,0,0,100,0),
+(@PATH,32,2813.888,880.7707,9.948226,0,0,0,0,100,0),
+(@PATH,33,2812.638,879.5207,9.448226,0,0,0,0,100,0),
+(@PATH,34,2810.388,877.7707,8.698226,0,0,0,0,100,0),
+(@PATH,35,2807.556,875.8849,7.826558,0,0,0,0,100,0),
+(@PATH,36,2803.556,876.1349,7.076558,0,0,0,0,100,0),
+(@PATH,37,2798.556,876.1349,6.826558,0,0,0,0,100,0),
+(@PATH,38,2790.806,876.3849,6.076558,0,0,0,0,100,0),
+(@PATH,39,2790.671,876.3419,5.86481,0,0,0,0,100,0),
+(@PATH,40,2787.671,876.3419,5.86481,0,0,0,0,100,0),
+(@PATH,41,2764.954,879.5082,5.60566,0,0,0,0,100,0),
+(@PATH,42,2746.52,892.532,5.507929,0,0,0,0,100,0),
+(@PATH,43,2741.77,898.782,4.757929,0,0,0,0,100,0),
+(@PATH,44,2739.27,901.532,4.257929,0,0,0,0,100,0),
+(@PATH,45,2736.77,904.782,3.757929,0,0,0,0,100,0),
+(@PATH,46,2734.27,907.782,3.257929,0,0,0,0,100,0),
+(@PATH,47,2733.933,908.0688,3.006025,0,0,0,0,100,0),
+(@PATH,48,2733.683,908.3188,3.006025,0,0,0,0,100,0),
+(@PATH,49,2732.933,911.3188,2.256025,0,0,0,0,100,0),
+(@PATH,50,2732.183,914.3188,1.756025,0,0,0,0,100,0),
+(@PATH,51,2731.183,918.8188,1.256025,0,0,0,0,100,0),
+(@PATH,52,2728.75,928.4617,0.6681505,0,0,0,0,100,0),
+(@PATH,53,2731.75,918.9617,1.418151,0,0,0,0,100,0),
+(@PATH,54,2732.5,915.2117,1.668151,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=99815;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(99815, 99815, 0, 0, 2, 0, 0),
+(99815, 99814, 3, 90, 2, 0, 0);
diff --git a/sql/updates/world/2015_07_15_02_world.sql b/sql/updates/world/2015_07_15_02_world.sql
new file mode 100644
index 00000000000..07c59a8190b
--- /dev/null
+++ b/sql/updates/world/2015_07_15_02_world.sql
@@ -0,0 +1,1099 @@
+-- Drgaonblight - Woods of Lothalor + Indu'le Village + Moonrest Gardens
+
+-- 1. Woods
+SET @NPC := 117136;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2856.349,`position_y`=1587.259,`position_z`=159.2038 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,2856.349,1587.259,159.2038,0,0,0,0,100,0),
+(@PATH,2,2856.849,1588.009,159.2038,0,0,0,0,100,0),
+(@PATH,3,2859.849,1592.009,158.4538,0,0,0,0,100,0),
+(@PATH,4,2863.099,1597.009,157.9538,0,0,0,0,100,0),
+(@PATH,5,2865.349,1600.259,157.2038,0,0,0,0,100,0),
+(@PATH,6,2867.599,1603.259,156.9538,0,0,0,0,100,0),
+(@PATH,7,2871.599,1609.009,156.4538,0,0,0,0,100,0),
+(@PATH,8,2874.849,1614.009,155.7038,0,0,0,0,100,0),
+(@PATH,9,2877.849,1618.009,155.2038,0,0,0,0,100,0),
+(@PATH,10,2875.091,1614.135,155.5487,0,0,0,0,100,0),
+(@PATH,11,2878.091,1618.385,154.7987,0,0,0,0,100,0),
+(@PATH,12,2878.591,1618.885,154.7987,0,0,0,0,100,0),
+(@PATH,13,2879.341,1621.885,154.2987,0,0,0,0,100,0),
+(@PATH,14,2880.091,1624.635,153.5487,0,0,0,0,100,0),
+(@PATH,15,2880.591,1626.635,153.0487,0,0,0,0,100,0),
+(@PATH,16,2881.341,1629.635,152.0487,0,0,0,0,100,0),
+(@PATH,17,2881.841,1632.385,151.5487,0,0,0,0,100,0),
+(@PATH,18,2882.341,1634.385,151.0487,0,0,0,0,100,0),
+(@PATH,19,2883.091,1637.135,150.2987,0,0,0,0,100,0),
+(@PATH,20,2884.091,1640.885,149.7987,0,0,0,0,100,0),
+(@PATH,21,2886.091,1647.635,149.0487,0,0,0,0,100,0),
+(@PATH,22,2887.591,1653.385,148.5487,0,0,0,0,100,0),
+(@PATH,23,2888.591,1657.385,147.7987,0,0,0,0,100,0),
+(@PATH,24,2888.601,1657.646,147.5282,0,0,0,0,100,0),
+(@PATH,25,2889.101,1659.646,147.2782,0,0,0,0,100,0),
+(@PATH,26,2887.601,1664.396,146.7782,0,0,0,0,100,0),
+(@PATH,27,2886.101,1670.146,146.5282,0,0,0,0,100,0),
+(@PATH,28,2877.101,1702.646,146.0282,0,0,0,0,100,0),
+(@PATH,29,2876.471,1704.117,145.9214,0,0,0,0,100,0),
+(@PATH,30,2865.971,1714.617,146.6714,0,0,0,0,100,0),
+(@PATH,31,2860.471,1720.117,146.9214,0,0,0,0,100,0),
+(@PATH,32,2856.971,1723.617,147.6714,0,0,0,0,100,0),
+(@PATH,33,2854.221,1726.617,148.4214,0,0,0,0,100,0),
+(@PATH,34,2854.013,1726.797,148.4403,0,0,0,0,100,0),
+(@PATH,35,2852.263,1728.547,148.4403,0,0,0,0,100,0),
+(@PATH,36,2850.513,1734.297,147.6903,0,0,0,0,100,0),
+(@PATH,37,2845.263,1753.297,146.9403,0,0,0,0,100,0),
+(@PATH,38,2841.619,1765.818,146.5513,0,0,0,0,100,0),
+(@PATH,39,2838.869,1772.068,146.3013,0,0,0,0,100,0),
+(@PATH,40,2836.369,1777.568,146.8013,0,0,0,0,100,0),
+(@PATH,41,2835.619,1779.568,146.3013,0,0,0,0,100,0),
+(@PATH,42,2832.369,1786.568,146.5513,0,0,0,0,100,0),
+(@PATH,43,2830.869,1790.068,146.3013,0,0,0,0,100,0),
+(@PATH,44,2830.369,1791.068,144.5513,0,0,0,0,100,0),
+(@PATH,45,2830.119,1792.068,143.5513,0,0,0,0,100,0),
+(@PATH,46,2829.619,1792.818,144.3013,0,0,0,0,100,0),
+(@PATH,47,2829.119,1793.818,146.0513,0,0,0,0,100,0),
+(@PATH,48,2828.369,1795.568,146.5513,0,0,0,0,100,0),
+(@PATH,49,2825.869,1801.068,145.5513,0,0,0,0,100,0),
+(@PATH,50,2825.119,1803.068,144.5513,0,0,0,0,100,0),
+(@PATH,51,2824.619,1803.818,143.8013,0,0,0,0,100,0),
+(@PATH,52,2823.869,1805.818,144.5513,0,0,0,0,100,0),
+(@PATH,53,2823.619,1806.568,145.3013,0,0,0,0,100,0),
+(@PATH,54,2823.119,1807.568,146.5513,0,0,0,0,100,0),
+(@PATH,55,2821.561,1811.26,146.7066,0,0,0,0,100,0),
+(@PATH,56,2824.561,1817.51,146.2066,0,0,0,0,100,0),
+(@PATH,57,2827.061,1823.01,145.4566,0,0,0,0,100,0),
+(@PATH,58,2828.561,1826.51,144.9566,0,0,0,0,100,0),
+(@PATH,59,2830.561,1831.01,143.9566,0,0,0,0,100,0),
+(@PATH,60,2832.061,1834.51,143.7066,0,0,0,0,100,0),
+(@PATH,61,2833.311,1837.26,143.2066,0,0,0,0,100,0),
+(@PATH,62,2834.561,1840.01,142.4566,0,0,0,0,100,0),
+(@PATH,63,2834.474,1839.311,142.597,0,0,0,0,100,0),
+(@PATH,64,2833.224,1836.811,143.347,0,0,0,0,100,0),
+(@PATH,65,2831.474,1833.061,143.847,0,0,0,0,100,0),
+(@PATH,66,2830.224,1830.311,144.347,0,0,0,0,100,0),
+(@PATH,67,2828.474,1826.811,144.847,0,0,0,0,100,0),
+(@PATH,68,2826.724,1822.311,145.597,0,0,0,0,100,0),
+(@PATH,69,2824.974,1818.811,146.097,0,0,0,0,100,0),
+(@PATH,70,2821.974,1812.311,146.847,0,0,0,0,100,0),
+(@PATH,71,2822.149,1812.075,146.7974,0,0,0,0,100,0),
+(@PATH,72,2821.649,1811.075,146.5474,0,0,0,0,100,0),
+(@PATH,73,2823.149,1807.325,146.2974,0,0,0,0,100,0),
+(@PATH,74,2823.649,1806.325,145.5474,0,0,0,0,100,0),
+(@PATH,75,2823.899,1805.575,144.5474,0,0,0,0,100,0),
+(@PATH,76,2824.399,1804.575,143.7974,0,0,0,0,100,0),
+(@PATH,77,2825.149,1802.825,144.7974,0,0,0,0,100,0),
+(@PATH,78,2825.649,1801.825,145.7974,0,0,0,0,100,0),
+(@PATH,79,2826.149,1800.825,146.2974,0,0,0,0,100,0),
+(@PATH,80,2828.899,1794.575,146.0474,0,0,0,0,100,0),
+(@PATH,81,2829.399,1793.575,145.2974,0,0,0,0,100,0),
+(@PATH,82,2829.649,1792.825,143.5474,0,0,0,0,100,0),
+(@PATH,83,2830.649,1790.825,145.5474,0,0,0,0,100,0),
+(@PATH,84,2830.899,1790.325,146.2974,0,0,0,0,100,0),
+(@PATH,85,2831.399,1789.325,146.7974,0,0,0,0,100,0),
+(@PATH,86,2833.649,1783.825,146.2974,0,0,0,0,100,0),
+(@PATH,87,2835.899,1778.325,146.7974,0,0,0,0,100,0),
+(@PATH,88,2836.899,1776.575,146.2974,0,0,0,0,100,0),
+(@PATH,89,2841.948,1765.41,146.7317,0,0,0,0,100,0),
+(@PATH,90,2846.448,1748.41,147.4817,0,0,0,0,100,0),
+(@PATH,91,2851.198,1732.16,147.9817,0,0,0,0,100,0),
+(@PATH,92,2851.44,1731.802,147.8846,0,0,0,0,100,0),
+(@PATH,93,2852.44,1728.302,148.3846,0,0,0,0,100,0),
+(@PATH,94,2856.69,1724.052,147.6346,0,0,0,0,100,0),
+(@PATH,95,2858.69,1722.052,147.1346,0,0,0,0,100,0),
+(@PATH,96,2866.19,1714.302,146.6346,0,0,0,0,100,0),
+(@PATH,97,2869.19,1711.552,145.8846,0,0,0,0,100,0),
+(@PATH,98,2876.837,1703.784,145.8906,0,0,0,0,100,0),
+(@PATH,99,2878.837,1696.034,146.3906,0,0,0,0,100,0),
+(@PATH,100,2887.337,1665.534,146.8906,0,0,0,0,100,0),
+(@PATH,101,2889.193,1659.311,147.7064,0,0,0,0,100,0),
+(@PATH,102,2887.693,1654.561,148.4564,0,0,0,0,100,0),
+(@PATH,103,2886.193,1648.561,148.9564,0,0,0,0,100,0),
+(@PATH,104,2884.443,1641.811,149.7064,0,0,0,0,100,0),
+(@PATH,105,2883.193,1637.311,150.4564,0,0,0,0,100,0),
+(@PATH,106,2882.693,1634.561,150.9564,0,0,0,0,100,0),
+(@PATH,107,2882.193,1632.561,151.4564,0,0,0,0,100,0),
+(@PATH,108,2881.443,1629.561,152.2064,0,0,0,0,100,0),
+(@PATH,109,2880.693,1627.561,152.7064,0,0,0,0,100,0),
+(@PATH,110,2880.193,1625.811,153.4564,0,0,0,0,100,0),
+(@PATH,111,2879.443,1622.811,153.9564,0,0,0,0,100,0),
+(@PATH,112,2878.693,1620.061,154.7064,0,0,0,0,100,0),
+(@PATH,113,2878.51,1619.793,154.8954,0,0,0,0,100,0),
+(@PATH,114,2878.26,1618.793,155.1454,0,0,0,0,100,0),
+(@PATH,115,2874.76,1613.793,155.6454,0,0,0,0,100,0),
+(@PATH,116,2871.51,1608.793,156.3954,0,0,0,0,100,0),
+(@PATH,117,2868.01,1604.293,156.6454,0,0,0,0,100,0),
+(@PATH,118,2866.01,1600.793,157.3954,0,0,0,0,100,0),
+(@PATH,119,2863.01,1596.793,157.8954,0,0,0,0,100,0),
+(@PATH,120,2860.26,1592.793,158.6454,0,0,0,0,100,0),
+(@PATH,121,2857.26,1588.543,159.1454,0,0,0,0,100,0),
+(@PATH,122,2857.219,1588.32,159.5233,0,0,0,0,100,0),
+(@PATH,123,2856.719,1587.82,159.5233,0,0,0,0,100,0),
+(@PATH,124,2852.969,1584.32,159.7733,0,0,0,0,100,0),
+(@PATH,125,2848.719,1580.07,160.5233,0,0,0,0,100,0),
+(@PATH,126,2837.219,1569.57,161.2733,0,0,0,0,100,0),
+(@PATH,127,2834.219,1566.82,161.7733,0,0,0,0,100,0),
+(@PATH,128,2834.094,1566.463,161.6562,0,0,0,0,100,0),
+(@PATH,129,2829.844,1562.463,161.1562,0,0,0,0,100,0),
+(@PATH,130,2814.094,1544.713,160.4062,0,0,0,0,100,0),
+(@PATH,131,2809.594,1539.463,159.9062,0,0,0,0,100,0),
+(@PATH,132,2809.271,1539.142,159.6762,0,0,0,0,100,0),
+(@PATH,133,2808.521,1538.392,159.4262,0,0,0,0,100,0),
+(@PATH,134,2807.021,1534.642,158.9262,0,0,0,0,100,0),
+(@PATH,135,2806.021,1531.892,158.1762,0,0,0,0,100,0),
+(@PATH,136,2805.271,1530.142,157.6762,0,0,0,0,100,0),
+(@PATH,137,2803.771,1526.392,157.1762,0,0,0,0,100,0),
+(@PATH,138,2803.271,1524.392,156.6762,0,0,0,0,100,0),
+(@PATH,139,2801.521,1521.142,155.9262,0,0,0,0,100,0),
+(@PATH,140,2800.021,1517.392,155.1762,0,0,0,0,100,0),
+(@PATH,141,2795.555,1505.82,154.9095,0,0,0,0,100,0),
+(@PATH,142,2795.305,1494.82,155.4095,0,0,0,0,100,0),
+(@PATH,143,2795.055,1482.07,155.6595,0,0,0,0,100,0),
+(@PATH,144,2794.805,1472.07,156.4095,0,0,0,0,100,0),
+(@PATH,145,2794.471,1463.688,156.3312,0,0,0,0,100,0),
+(@PATH,146,2794.971,1460.688,155.5812,0,0,0,0,100,0),
+(@PATH,147,2795.221,1458.688,155.0812,0,0,0,0,100,0),
+(@PATH,148,2795.471,1456.688,154.3312,0,0,0,0,100,0),
+(@PATH,149,2795.721,1453.688,153.5812,0,0,0,0,100,0),
+(@PATH,150,2796.221,1450.688,152.8312,0,0,0,0,100,0),
+(@PATH,151,2796.471,1448.938,152.3312,0,0,0,0,100,0),
+(@PATH,152,2796.471,1446.938,151.5812,0,0,0,0,100,0),
+(@PATH,153,2796.721,1444.938,151.0812,0,0,0,0,100,0),
+(@PATH,154,2797.221,1440.938,150.3312,0,0,0,0,100,0),
+(@PATH,155,2797.471,1439.188,149.3312,0,0,0,0,100,0),
+(@PATH,156,2797.721,1437.188,148.5812,0,0,0,0,100,0),
+(@PATH,157,2797.971,1435.188,148.0812,0,0,0,0,100,0),
+(@PATH,158,2798.221,1433.188,147.3312,0,0,0,0,100,0),
+(@PATH,159,2798.166,1432.999,147.353,0,0,0,0,100,0),
+(@PATH,160,2797.916,1434.999,148.103,0,0,0,0,100,0),
+(@PATH,161,2797.666,1436.999,148.603,0,0,0,0,100,0),
+(@PATH,162,2797.416,1438.999,149.353,0,0,0,0,100,0),
+(@PATH,163,2797.166,1440.999,150.353,0,0,0,0,100,0),
+(@PATH,164,2796.916,1442.999,151.103,0,0,0,0,100,0),
+(@PATH,165,2796.416,1446.999,151.603,0,0,0,0,100,0),
+(@PATH,166,2796.416,1448.749,152.353,0,0,0,0,100,0),
+(@PATH,167,2796.166,1450.749,152.853,0,0,0,0,100,0),
+(@PATH,168,2795.916,1453.749,153.603,0,0,0,0,100,0),
+(@PATH,169,2795.416,1456.749,154.353,0,0,0,0,100,0),
+(@PATH,170,2795.166,1458.749,155.103,0,0,0,0,100,0),
+(@PATH,171,2794.916,1460.749,155.603,0,0,0,0,100,0),
+(@PATH,172,2794.664,1463.807,156.3249,0,0,0,0,100,0),
+(@PATH,173,2794.914,1477.807,155.8249,0,0,0,0,100,0),
+(@PATH,174,2794.914,1491.557,155.3249,0,0,0,0,100,0),
+(@PATH,175,2795.164,1501.557,155.0749,0,0,0,0,100,0),
+(@PATH,176,2795.31,1501.878,155.0099,0,0,0,0,100,0),
+(@PATH,177,2795.56,1505.878,154.7599,0,0,0,0,100,0),
+(@PATH,178,2800.31,1518.128,155.5099,0,0,0,0,100,0),
+(@PATH,179,2802.06,1522.378,156.2599,0,0,0,0,100,0),
+(@PATH,180,2803.31,1525.128,157.0099,0,0,0,0,100,0),
+(@PATH,181,2804.81,1528.878,157.5099,0,0,0,0,100,0),
+(@PATH,182,2805.81,1531.628,158.2599,0,0,0,0,100,0),
+(@PATH,183,2807.06,1534.378,159.0099,0,0,0,0,100,0),
+(@PATH,184,2807.293,1534.594,159.2192,0,0,0,0,100,0),
+(@PATH,185,2808.793,1538.344,159.4692,0,0,0,0,100,0),
+(@PATH,186,2812.043,1542.094,160.2192,0,0,0,0,100,0),
+(@PATH,187,2828.293,1560.844,160.9692,0,0,0,0,100,0),
+(@PATH,188,2828.378,1561.043,160.8421,0,0,0,0,100,0),
+(@PATH,189,2829.878,1562.793,161.0921,0,0,0,0,100,0),
+(@PATH,190,2833.628,1566.043,161.8421,0,0,0,0,100,0),
+(@PATH,191,2837.378,1569.543,161.0921,0,0,0,0,100,0),
+(@PATH,192,2847.378,1578.793,160.5921,0,0,0,0,100,0),
+(@PATH,193,2851.628,1583.043,159.8421,0,0,0,0,100,0),
+(@PATH,194,2856.128,1587.043,159.5921,0,0,0,0,100,0),
+(@PATH,195,2856.338,1587.402,159.2415,0,0,0,0,100,0),
+(@PATH,196,2856.838,1587.902,159.2415,0,0,0,0,100,0),
+(@PATH,197,2859.838,1592.152,158.4915,0,0,0,0,100,0),
+(@PATH,198,2863.088,1596.902,157.9915,0,0,0,0,100,0),
+(@PATH,199,2865.588,1600.152,157.2415,0,0,0,0,100,0),
+(@PATH,200,2867.588,1603.402,156.9915,0,0,0,0,100,0),
+(@PATH,201,2871.588,1609.152,156.4915,0,0,0,0,100,0),
+(@PATH,202,2874.838,1613.902,155.7415,0,0,0,0,100,0),
+(@PATH,203,2877.838,1618.152,155.2415,0,0,0,0,100,0);
+
+-- 2. Ta' zinni
+SET @NPC := 113899;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2847.589,`position_y`=1833.015,`position_z`=139.5768 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,2847.589,1833.015,139.5768,0,0,0,0,100,0),
+(@PATH,2,2848.839,1836.765,139.0768,0,0,0,0,100,0),
+(@PATH,3,2850.589,1841.515,138.0768,0,0,0,0,100,0),
+(@PATH,4,2851.589,1845.015,137.8268,0,0,0,0,100,0),
+(@PATH,5,2853.089,1849.765,136.8268,0,0,0,0,100,0),
+(@PATH,6,2855.238,1855.55,136.0215,0,0,0,0,100,0),
+(@PATH,7,2857.988,1856.8,135.2715,0,0,0,0,100,0),
+(@PATH,8,2860.738,1858.3,134.5215,0,0,0,0,100,0),
+(@PATH,9,2865.238,1860.05,134.0215,0,0,0,0,100,0),
+(@PATH,10,2870.488,1862.55,134.5215,0,0,0,0,100,0),
+(@PATH,11,2872.238,1863.55,133.7715,0,0,0,0,100,0),
+(@PATH,12,2873.238,1864.05,133.0215,0,0,0,0,100,0),
+(@PATH,13,2874.988,1864.8,132.2715,0,0,0,0,100,0),
+(@PATH,14,2876.738,1865.55,131.2715,0,0,0,0,100,0),
+(@PATH,15,2876.947,1865.783,131.0452,0,0,0,0,100,0),
+(@PATH,16,2877.947,1866.033,130.7952,0,0,0,0,100,0),
+(@PATH,17,2882.697,1864.533,131.5452,0,0,0,0,100,0),
+(@PATH,18,2887.447,1862.783,131.0452,0,0,0,0,100,0),
+(@PATH,19,2888.947,1862.283,131.5452,0,0,0,0,100,0),
+(@PATH,20,2891.947,1861.283,130.2952,0,0,0,0,100,0),
+(@PATH,21,2892.697,1861.033,129.7952,0,0,0,0,100,0),
+(@PATH,22,2893.697,1860.783,128.7952,0,0,0,0,100,0),
+(@PATH,23,2894.697,1860.533,129.5452,0,0,0,0,100,0),
+(@PATH,24,2895.697,1860.033,130.0452,0,0,0,0,100,0),
+(@PATH,25,2896.697,1859.783,130.7952,0,0,0,0,100,0),
+(@PATH,26,2899.447,1858.783,129.7952,0,0,0,0,100,0),
+(@PATH,27,2900.447,1858.533,129.0452,0,0,0,0,100,0),
+(@PATH,28,2899.692,1858.481,129.6603,0,0,0,0,100,0),
+(@PATH,29,2900.692,1858.231,129.1603,0,0,0,0,100,0),
+(@PATH,30,2901.942,1857.731,128.9103,0,0,0,0,100,0),
+(@PATH,31,2904.692,1855.981,128.1603,0,0,0,0,100,0),
+(@PATH,32,2908.692,1853.481,128.9103,0,0,0,0,100,0),
+(@PATH,33,2922.463,1844.618,129.8401,0,0,0,0,100,0),
+(@PATH,34,2924.713,1841.368,130.5901,0,0,0,0,100,0),
+(@PATH,35,2926.713,1838.118,131.0901,0,0,0,0,100,0),
+(@PATH,36,2927.713,1836.618,131.5901,0,0,0,0,100,0),
+(@PATH,37,2929.963,1833.118,132.0901,0,0,0,0,100,0),
+(@PATH,38,2932.148,1829.933,132.7596,0,0,0,0,100,0),
+(@PATH,39,2933.648,1825.433,133.5096,0,0,0,0,100,0),
+(@PATH,40,2935.148,1821.933,133.7596,0,0,0,0,100,0),
+(@PATH,41,2936.398,1819.183,134.5096,0,0,0,0,100,0),
+(@PATH,42,2936.329,1818.895,134.4582,0,0,0,0,100,0),
+(@PATH,43,2937.329,1816.395,135.2082,0,0,0,0,100,0),
+(@PATH,44,2936.829,1804.895,134.4582,0,0,0,0,100,0),
+(@PATH,45,2936.426,1792.523,134.2393,0,0,0,0,100,0),
+(@PATH,46,2928.676,1786.523,134.7393,0,0,0,0,100,0),
+(@PATH,47,2926.926,1785.273,135.9893,0,0,0,0,100,0),
+(@PATH,48,2925.426,1784.273,136.9893,0,0,0,0,100,0),
+(@PATH,49,2923.176,1782.273,135.7393,0,0,0,0,100,0),
+(@PATH,50,2921.676,1781.273,134.2393,0,0,0,0,100,0),
+(@PATH,51,2920.176,1780.023,132.7393,0,0,0,0,100,0),
+(@PATH,52,2917.676,1778.023,133.2393,0,0,0,0,100,0),
+(@PATH,53,2916.176,1776.773,134.2393,0,0,0,0,100,0),
+(@PATH,54,2913.926,1775.023,134.9893,0,0,0,0,100,0),
+(@PATH,55,2913.46,1774.671,135.3759,0,0,0,0,100,0),
+(@PATH,56,2912.21,1773.671,134.8759,0,0,0,0,100,0),
+(@PATH,57,2900.71,1772.421,135.6259,0,0,0,0,100,0),
+(@PATH,58,2898.71,1772.171,136.1259,0,0,0,0,100,0),
+(@PATH,59,2895.212,1771.508,136.4189,0,0,0,0,100,0),
+(@PATH,60,2892.462,1770.258,137.1689,0,0,0,0,100,0),
+(@PATH,61,2888.712,1768.508,137.9189,0,0,0,0,100,0),
+(@PATH,62,2886.212,1767.508,138.4189,0,0,0,0,100,0),
+(@PATH,63,2884.462,1766.758,139.1689,0,0,0,0,100,0),
+(@PATH,64,2881.712,1765.508,139.6689,0,0,0,0,100,0),
+(@PATH,65,2881.425,1765.528,139.6664,0,0,0,0,100,0),
+(@PATH,66,2880.425,1765.028,139.9164,0,0,0,0,100,0),
+(@PATH,67,2875.675,1768.528,140.4164,0,0,0,0,100,0),
+(@PATH,68,2869.425,1773.028,139.6664,0,0,0,0,100,0),
+(@PATH,69,2863.509,1777.198,140.0486,0,0,0,0,100,0),
+(@PATH,70,2856.009,1784.948,140.7986,0,0,0,0,100,0),
+(@PATH,71,2853.797,1787.424,141.0812,0,0,0,0,100,0),
+(@PATH,72,2853.097,1798.46,141.2018,0,0,0,0,100,0),
+(@PATH,73,2850.904,1812.617,141.2262,0,0,0,0,100,0),
+(@PATH,74,2850.154,1817.617,140.7262,0,0,0,0,100,0),
+(@PATH,75,2848.654,1827.117,140.2262,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=113899;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(113899, 113899, 0, 0, 2, 0, 0),
+(113899, 111823, 3, 90, 2, 0, 0);
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (26280, 26344);
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(26280,0,0,0,1,27, ''),
+(26344,0,0,0,1,27, '');
+
+-- 3. Deranged Indu'le Villager
+SET @NPC := 100043;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3244.186,`position_y`=1513.984,`position_z`=170.5267 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3244.186,1513.984,170.5267,0,0,0,0,100,0),
+(@PATH,2,3237.186,1522.484,170.7767,0,0,0,0,100,0),
+(@PATH,3,3230.436,1530.734,171.2767,0,0,0,0,100,0),
+(@PATH,4,3237.859,1521.501,170.5541,0,0,0,0,100,0),
+(@PATH,5,3244.26,1513.659,170.1406,0,0,0,0,100,0),
+(@PATH,6,3248.01,1498.409,169.6406,0,0,0,0,100,0),
+(@PATH,7,3248.402,1498.378,169.4282,0,0,0,0,100,0),
+(@PATH,8,3248.902,1496.378,169.1782,0,0,0,0,100,0),
+(@PATH,9,3250.152,1481.628,168.9282,0,0,0,0,100,0),
+(@PATH,10,3250.505,1476.892,169.1679,0,0,0,0,100,0),
+(@PATH,11,3250.755,1469.142,169.6679,0,0,0,0,100,0),
+(@PATH,12,3250.755,1466.142,169.9179,0,0,0,0,100,0),
+(@PATH,13,3250.755,1463.142,170.6679,0,0,0,0,100,0),
+(@PATH,14,3250.721,1466.701,169.9852,0,0,0,0,100,0),
+(@PATH,15,3250.721,1469.451,169.7352,0,0,0,0,100,0),
+(@PATH,16,3250.721,1475.451,168.9852,0,0,0,0,100,0),
+(@PATH,17,3250.58,1475.712,169.0303,0,0,0,0,100,0),
+(@PATH,18,3250.58,1477.212,169.0303,0,0,0,0,100,0),
+(@PATH,19,3248.476,1496.626,169.5226,0,0,0,0,100,0),
+(@PATH,20,3247.226,1501.626,170.0226,0,0,0,0,100,0);
+
+-- 4. Indu'le Mystic Visual
+-- Indu'le Mystic SAI
+SET @ENTRY := 26336;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`>=10;
+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,10,11,25,0,100,0,0,0,0,0,75,32423,0,0,0,0,0,1,0,0,0,0,0,0,0,"Indu'le Mystic - On Reset - Add Aura 'Blue Radiation'"),
+(@ENTRY,0,11,0,61,0,100,0,0,0,0,0,11,39550,0,0,0,0,0,1,0,0,0,0,0,0,0,"Indu'le Mystic - On Reset - Cast 'Arcane Channeling'");
+
+-- 5. Deranged Indu'le Villager
+SET @NPC := 100041;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3126.96,`position_y`=1293.866,`position_z`=158.7721 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3126.96,1293.866,158.7721,0,0,0,0,100,0),
+(@PATH,2,3146.06,1321.432,158.7955,0,0,0,0,100,0),
+(@PATH,3,3146.06,1325.182,158.7955,0,0,0,0,100,0),
+(@PATH,4,3150.31,1330.432,158.5455,0,0,0,0,100,0),
+(@PATH,5,3151.31,1331.432,158.5455,0,0,0,0,100,0),
+(@PATH,6,3151.31,1333.432,158.5455,0,0,0,0,100,0),
+(@PATH,7,3152.06,1337.432,158.0455,0,0,0,0,100,0),
+(@PATH,8,3154.06,1338.432,157.7955,0,0,0,0,100,0),
+(@PATH,9,3156.31,1339.182,157.5455,0,0,0,0,100,0),
+(@PATH,10,3158.31,1341.182,157.5455,0,0,0,0,100,0),
+(@PATH,11,3158.545,1341.367,157.3181,0,0,0,0,100,0),
+(@PATH,12,3159.045,1344.367,156.8181,0,0,0,0,100,0),
+(@PATH,13,3160.545,1349.117,156.0681,0,0,0,0,100,0),
+(@PATH,14,3161.545,1351.867,155.3181,0,0,0,0,100,0),
+(@PATH,15,3161.795,1353.617,154.8181,0,0,0,0,100,0),
+(@PATH,16,3162.795,1356.367,154.0681,0,0,0,0,100,0),
+(@PATH,17,3163.795,1359.367,153.5681,0,0,0,0,100,0),
+(@PATH,18,3164.795,1362.117,152.8181,0,0,0,0,100,0),
+(@PATH,19,3165.856,1365.882,151.9305,0,0,0,0,100,0),
+(@PATH,20,3165.106,1368.882,151.4305,0,0,0,0,100,0),
+(@PATH,21,3164.856,1369.882,151.1805,0,0,0,0,100,0),
+(@PATH,22,3163.168,1383.639,150.3603,0,0,0,0,100,0),
+(@PATH,23,3159.668,1396.889,149.6103,0,0,0,0,100,0),
+(@PATH,24,3159.668,1397.889,149.8603,0,0,0,0,100,0),
+(@PATH,25,3158.668,1400.639,150.6103,0,0,0,0,100,0),
+(@PATH,26,3157.283,1404.197,151.2236,0,0,0,0,100,0),
+(@PATH,27,3156.533,1411.947,151.7236,0,0,0,0,100,0),
+(@PATH,28,3155.533,1424.697,151.2236,0,0,0,0,100,0),
+(@PATH,29,3154.572,1430.593,150.8368,0,0,0,0,100,0),
+(@PATH,30,3148.822,1447.343,150.5868,0,0,0,0,100,0),
+(@PATH,31,3146.595,1453.135,150.8087,0,0,0,0,100,0),
+(@PATH,32,3142.095,1460.885,150.8087,0,0,0,0,100,0),
+(@PATH,33,3135.345,1472.635,151.5587,0,0,0,0,100,0),
+(@PATH,34,3135.122,1473.082,151.7024,0,0,0,0,100,0),
+(@PATH,35,3133.622,1475.582,151.7024,0,0,0,0,100,0),
+(@PATH,36,3126.122,1483.582,152.2024,0,0,0,0,100,0),
+(@PATH,37,3113.515,1497.401,152.5099,0,0,0,0,100,0),
+(@PATH,38,3110.765,1502.901,153.2599,0,0,0,0,100,0),
+(@PATH,39,3108.515,1508.151,153.5099,0,0,0,0,100,0),
+(@PATH,40,3106.765,1511.651,154.2599,0,0,0,0,100,0),
+(@PATH,41,3103.515,1518.901,154.7599,0,0,0,0,100,0),
+(@PATH,42,3101.554,1522.729,155.3441,0,0,0,0,100,0),
+(@PATH,43,3101.054,1527.729,155.8441,0,0,0,0,100,0),
+(@PATH,44,3100.804,1532.729,156.3441,0,0,0,0,100,0),
+(@PATH,45,3100.554,1539.479,156.8441,0,0,0,0,100,0),
+(@PATH,46,3100.304,1545.479,157.3441,0,0,0,0,100,0),
+(@PATH,47,3099.449,1555.321,157.6841,0,0,0,0,100,0),
+(@PATH,48,3079.664,1574.581,157.6775,0,0,0,0,100,0),
+(@PATH,49,3052.813,1585.949,157.3968,0,0,0,0,100,0),
+(@PATH,50,3018.021,1584.038,157.1514,0,0,0,0,100,0),
+(@PATH,51,3000.271,1585.538,156.4014,0,0,0,0,100,0),
+(@PATH,52,2994.271,1586.038,156.1514,0,0,0,0,100,0),
+(@PATH,53,2993.949,1586.003,155.8834,0,0,0,0,100,0),
+(@PATH,54,2992.699,1586.003,156.1334,0,0,0,0,100,0),
+(@PATH,55,2976.199,1579.753,155.3834,0,0,0,0,100,0),
+(@PATH,56,2976.037,1579.397,155.2239,0,0,0,0,100,0),
+(@PATH,57,2972.787,1578.147,154.9739,0,0,0,0,100,0),
+(@PATH,58,2969.537,1575.647,154.2239,0,0,0,0,100,0),
+(@PATH,59,2966.787,1573.147,153.7239,0,0,0,0,100,0),
+(@PATH,60,2962.287,1569.397,153.2239,0,0,0,0,100,0),
+(@PATH,61,2959.287,1566.897,152.4739,0,0,0,0,100,0),
+(@PATH,62,2958.891,1566.53,152.3397,0,0,0,0,100,0),
+(@PATH,63,2957.141,1565.03,151.8397,0,0,0,0,100,0),
+(@PATH,64,2952.891,1557.28,151.5897,0,0,0,0,100,0),
+(@PATH,65,2945.898,1543.377,151.6312,0,0,0,0,100,0),
+(@PATH,66,2948.596,1515.54,151.5872,0,0,0,0,100,0),
+(@PATH,67,2957.712,1494.943,151.9908,0,0,0,0,100,0),
+(@PATH,68,2966.525,1471.69,151.3434,0,0,0,0,100,0),
+(@PATH,69,2966.692,1453.166,151.393,0,0,0,0,100,0),
+(@PATH,70,2955.593,1436.157,151.5051,0,0,0,0,100,0),
+(@PATH,71,2937.633,1421.492,151.8211,0,0,0,0,100,0),
+(@PATH,72,2922.334,1406.523,151.9465,0,0,0,0,100,0),
+(@PATH,73,2920.334,1398.023,152.6965,0,0,0,0,100,0),
+(@PATH,74,2919.584,1394.273,152.9465,0,0,0,0,100,0),
+(@PATH,75,2918.834,1391.273,153.9465,0,0,0,0,100,0),
+(@PATH,76,2918.692,1391.122,154.1996,0,0,0,0,100,0),
+(@PATH,77,2918.442,1389.122,154.6996,0,0,0,0,100,0),
+(@PATH,78,2918.942,1386.372,155.4496,0,0,0,0,100,0),
+(@PATH,79,2919.442,1384.622,155.9496,0,0,0,0,100,0),
+(@PATH,80,2920.192,1380.622,156.6996,0,0,0,0,100,0),
+(@PATH,81,2920.442,1378.872,157.1996,0,0,0,0,100,0),
+(@PATH,82,2920.429,1378.551,157.5849,0,0,0,0,100,0),
+(@PATH,83,2920.679,1377.801,157.8349,0,0,0,0,100,0),
+(@PATH,84,2920.179,1374.801,158.3349,0,0,0,0,100,0),
+(@PATH,85,2919.679,1372.801,158.8349,0,0,0,0,100,0),
+(@PATH,86,2918.929,1368.051,159.5849,0,0,0,0,100,0),
+(@PATH,87,2918.179,1364.301,160.0849,0,0,0,0,100,0),
+(@PATH,88,2917.84,1363.903,160.1811,0,0,0,0,100,0),
+(@PATH,89,2917.59,1363.403,160.1811,0,0,0,0,100,0),
+(@PATH,90,2916.84,1353.403,160.9311,0,0,0,0,100,0),
+(@PATH,91,2915.305,1333.434,160.8125,0,0,0,0,100,0),
+(@PATH,92,2915.305,1326.434,160.3125,0,0,0,0,100,0),
+(@PATH,93,2915.305,1321.684,159.5625,0,0,0,0,100,0),
+(@PATH,94,2915.305,1318.684,158.8125,0,0,0,0,100,0),
+(@PATH,95,2915.305,1315.684,158.0625,0,0,0,0,100,0),
+(@PATH,96,2915.305,1312.684,157.3125,0,0,0,0,100,0),
+(@PATH,97,2915.305,1310.684,156.5625,0,0,0,0,100,0),
+(@PATH,98,2915.664,1310.57,156.5071,0,0,0,0,100,0),
+(@PATH,99,2915.664,1310.07,156.0071,0,0,0,0,100,0),
+(@PATH,100,2916.414,1308.32,155.2571,0,0,0,0,100,0),
+(@PATH,101,2917.664,1305.57,154.5071,0,0,0,0,100,0),
+(@PATH,102,2918.914,1302.82,153.7571,0,0,0,0,100,0),
+(@PATH,103,2920.414,1299.07,153.0071,0,0,0,0,100,0),
+(@PATH,104,2921.664,1295.57,152.2571,0,0,0,0,100,0),
+(@PATH,105,2928.093,1280.75,151.4069,0,0,0,0,100,0),
+(@PATH,106,2939.343,1272.75,151.1569,0,0,0,0,100,0),
+(@PATH,107,2952.039,1263.536,151.009,0,0,0,0,100,0),
+(@PATH,108,2962.289,1257.036,150.509,0,0,0,0,100,0),
+(@PATH,109,2968.039,1253.536,150.009,0,0,0,0,100,0),
+(@PATH,110,2978.197,1247.234,149.3385,0,0,0,0,100,0),
+(@PATH,111,2991.994,1240.328,149.4494,0,0,0,0,100,0),
+(@PATH,112,3016.52,1238.816,149.564,0,0,0,0,100,0),
+(@PATH,113,3033.02,1242.066,149.814,0,0,0,0,100,0),
+(@PATH,114,3037.41,1243.237,150.3568,0,0,0,0,100,0),
+(@PATH,115,3044.66,1246.487,150.8568,0,0,0,0,100,0),
+(@PATH,116,3052.66,1249.737,151.3568,0,0,0,0,100,0),
+(@PATH,117,3052.973,1250.125,151.7139,0,0,0,0,100,0),
+(@PATH,118,3056.473,1251.625,152.2139,0,0,0,0,100,0),
+(@PATH,119,3060.473,1252.375,152.7139,0,0,0,0,100,0),
+(@PATH,120,3063.473,1252.375,153.4639,0,0,0,0,100,0),
+(@PATH,121,3065.973,1252.875,154.2139,0,0,0,0,100,0),
+(@PATH,122,3067.973,1253.375,154.7139,0,0,0,0,100,0),
+(@PATH,123,3070.973,1253.875,155.7139,0,0,0,0,100,0),
+(@PATH,124,3073.973,1254.375,156.2139,0,0,0,0,100,0),
+(@PATH,125,3077.973,1254.875,156.9639,0,0,0,0,100,0),
+(@PATH,126,3078.058,1255.08,157.1807,0,0,0,0,100,0),
+(@PATH,127,3079.308,1255.33,157.4307,0,0,0,0,100,0),
+(@PATH,128,3083.058,1258.83,157.9307,0,0,0,0,100,0),
+(@PATH,129,3087.308,1263.08,158.6807,0,0,0,0,100,0),
+(@PATH,130,3099.604,1274.983,158.773,0,0,0,0,100,0);
+
+-- 6. Corrupted Lothalor Ancient
+SET @NPC := 117140;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3027.883,`position_y`=1675.255,`position_z`=150.5858 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3027.883,1675.255,150.5858,0,0,0,0,100,0),
+(@PATH,2,3029.883,1677.005,150.0858,0,0,0,0,100,0),
+(@PATH,3,3044.133,1681.755,149.5858,0,0,0,0,100,0),
+(@PATH,4,3047.133,1682.505,148.8358,0,0,0,0,100,0),
+(@PATH,5,3050.883,1683.505,148.0858,0,0,0,0,100,0),
+(@PATH,6,3063.883,1687.755,147.3358,0,0,0,0,100,0),
+(@PATH,7,3067.633,1689.005,146.8358,0,0,0,0,100,0),
+(@PATH,8,3072.383,1690.505,146.0858,0,0,0,0,100,0),
+(@PATH,9,3072.838,1690.899,146.1686,0,0,0,0,100,0),
+(@PATH,10,3074.588,1691.399,145.9186,0,0,0,0,100,0),
+(@PATH,11,3081.588,1692.649,145.1686,0,0,0,0,100,0),
+(@PATH,12,3103.088,1695.899,145.9186,0,0,0,0,100,0),
+(@PATH,13,3110.838,1697.149,146.4186,0,0,0,0,100,0),
+(@PATH,14,3117.838,1698.149,146.9186,0,0,0,0,100,0),
+(@PATH,15,3121.838,1698.899,147.4186,0,0,0,0,100,0),
+(@PATH,16,3122.006,1699.197,147.5443,0,0,0,0,100,0),
+(@PATH,17,3124.006,1699.447,147.7943,0,0,0,0,100,0),
+(@PATH,18,3127.756,1700.697,148.0443,0,0,0,0,100,0),
+(@PATH,19,3132.506,1702.197,148.7943,0,0,0,0,100,0),
+(@PATH,20,3148.506,1707.447,148.0443,0,0,0,0,100,0),
+(@PATH,21,3151.256,1708.447,147.2943,0,0,0,0,100,0),
+(@PATH,22,3154.006,1709.447,146.7943,0,0,0,0,100,0),
+(@PATH,23,3157.756,1710.697,145.7943,0,0,0,0,100,0),
+(@PATH,24,3160.756,1711.697,145.2943,0,0,0,0,100,0),
+(@PATH,25,3165.506,1713.197,144.5443,0,0,0,0,100,0),
+(@PATH,26,3165.761,1713.305,144.3196,0,0,0,0,100,0),
+(@PATH,27,3167.261,1713.805,144.3196,0,0,0,0,100,0),
+(@PATH,28,3183.761,1707.055,144.8196,0,0,0,0,100,0),
+(@PATH,29,3200.261,1700.305,144.3196,0,0,0,0,100,0),
+(@PATH,30,3204.761,1698.555,143.5696,0,0,0,0,100,0),
+(@PATH,31,3207.511,1697.305,143.0696,0,0,0,0,100,0),
+(@PATH,32,3207.937,1697.012,142.9652,0,0,0,0,100,0),
+(@PATH,33,3209.687,1696.262,142.7152,0,0,0,0,100,0),
+(@PATH,34,3214.187,1694.262,141.7152,0,0,0,0,100,0),
+(@PATH,35,3224.937,1689.512,142.4652,0,0,0,0,100,0),
+(@PATH,36,3229.437,1687.512,143.2152,0,0,0,0,100,0),
+(@PATH,37,3233.937,1685.512,143.7152,0,0,0,0,100,0),
+(@PATH,38,3238.687,1683.262,144.2152,0,0,0,0,100,0),
+(@PATH,39,3238.768,1683.138,144.2682,0,0,0,0,100,0),
+(@PATH,40,3241.518,1681.888,144.7682,0,0,0,0,100,0),
+(@PATH,41,3241.768,1679.888,145.2682,0,0,0,0,100,0),
+(@PATH,42,3242.018,1676.888,146.0182,0,0,0,0,100,0),
+(@PATH,43,3242.268,1673.888,146.5182,0,0,0,0,100,0),
+(@PATH,44,3242.518,1671.888,147.2682,0,0,0,0,100,0),
+(@PATH,45,3243.268,1666.888,147.7682,0,0,0,0,100,0),
+(@PATH,46,3243.518,1664.138,148.5182,0,0,0,0,100,0),
+(@PATH,47,3245.599,1647.204,149.1092,0,0,0,0,100,0),
+(@PATH,48,3249.599,1643.954,148.3592,0,0,0,0,100,0),
+(@PATH,49,3254.099,1639.954,147.6092,0,0,0,0,100,0),
+(@PATH,50,3255.599,1638.704,146.8592,0,0,0,0,100,0),
+(@PATH,51,3259.349,1635.704,146.1092,0,0,0,0,100,0),
+(@PATH,52,3262.099,1633.204,145.6092,0,0,0,0,100,0),
+(@PATH,53,3265.849,1629.704,144.8592,0,0,0,0,100,0),
+(@PATH,54,3268.849,1627.204,144.3592,0,0,0,0,100,0),
+(@PATH,55,3275.599,1621.204,143.8592,0,0,0,0,100,0),
+(@PATH,56,3271.495,1624.821,144.2386,0,0,0,0,100,0),
+(@PATH,57,3266.995,1628.821,144.7386,0,0,0,0,100,0),
+(@PATH,58,3263.245,1632.071,145.4886,0,0,0,0,100,0),
+(@PATH,59,3260.495,1634.571,145.9886,0,0,0,0,100,0),
+(@PATH,60,3257.495,1637.071,146.7386,0,0,0,0,100,0),
+(@PATH,61,3254.495,1639.821,147.7386,0,0,0,0,100,0),
+(@PATH,62,3249.995,1643.571,148.4886,0,0,0,0,100,0),
+(@PATH,63,3245.63,1647.635,149.0679,0,0,0,0,100,0),
+(@PATH,64,3245.13,1651.385,148.3179,0,0,0,0,100,0),
+(@PATH,65,3243.38,1667.135,147.8179,0,0,0,0,100,0),
+(@PATH,66,3243.13,1670.135,147.3179,0,0,0,0,100,0),
+(@PATH,67,3242.63,1673.135,146.5679,0,0,0,0,100,0),
+(@PATH,68,3242.38,1676.135,146.0679,0,0,0,0,100,0),
+(@PATH,69,3242.13,1679.135,145.5679,0,0,0,0,100,0),
+(@PATH,70,3242.099,1676.364,145.9094,0,0,0,0,100,0),
+(@PATH,71,3241.849,1679.364,145.1594,0,0,0,0,100,0),
+(@PATH,72,3241.349,1682.114,144.4094,0,0,0,0,100,0),
+(@PATH,73,3237.849,1683.614,143.9094,0,0,0,0,100,0),
+(@PATH,74,3233.349,1685.614,143.4094,0,0,0,0,100,0),
+(@PATH,75,3225.849,1688.864,142.4094,0,0,0,0,100,0),
+(@PATH,76,3221.599,1690.864,141.6594,0,0,0,0,100,0),
+(@PATH,77,3211.599,1695.364,142.6594,0,0,0,0,100,0),
+(@PATH,78,3211.41,1695.772,142.5507,0,0,0,0,100,0),
+(@PATH,79,3209.41,1696.522,142.8007,0,0,0,0,100,0),
+(@PATH,80,3206.66,1697.772,143.3007,0,0,0,0,100,0),
+(@PATH,81,3203.91,1698.772,144.0507,0,0,0,0,100,0),
+(@PATH,82,3198.41,1701.022,144.8007,0,0,0,0,100,0),
+(@PATH,83,3174.66,1710.772,144.0507,0,0,0,0,100,0),
+(@PATH,84,3167.045,1713.788,144.4697,0,0,0,0,100,0),
+(@PATH,85,3162.295,1712.288,145.2197,0,0,0,0,100,0),
+(@PATH,86,3159.295,1711.288,145.7197,0,0,0,0,100,0),
+(@PATH,87,3156.545,1710.288,146.2197,0,0,0,0,100,0),
+(@PATH,88,3153.795,1709.288,146.9697,0,0,0,0,100,0),
+(@PATH,89,3149.795,1708.038,147.9697,0,0,0,0,100,0),
+(@PATH,90,3146.295,1706.788,148.4697,0,0,0,0,100,0),
+(@PATH,91,3126.545,1700.288,147.9697,0,0,0,0,100,0),
+(@PATH,92,3126.278,1700.021,147.9305,0,0,0,0,100,0),
+(@PATH,93,3123.778,1699.271,147.6805,0,0,0,0,100,0),
+(@PATH,94,3118.778,1698.271,146.9305,0,0,0,0,100,0),
+(@PATH,95,3113.778,1697.521,146.6805,0,0,0,0,100,0),
+(@PATH,96,3105.028,1696.021,145.9305,0,0,0,0,100,0),
+(@PATH,97,3097.278,1695.021,145.4305,0,0,0,0,100,0),
+(@PATH,98,3074.387,1691.2,145.9351,0,0,0,0,100,0),
+(@PATH,99,3069.637,1689.7,146.4351,0,0,0,0,100,0),
+(@PATH,100,3065.887,1688.45,147.1851,0,0,0,0,100,0),
+(@PATH,101,3061.137,1686.95,147.6851,0,0,0,0,100,0),
+(@PATH,102,3049.887,1683.45,148.1851,0,0,0,0,100,0),
+(@PATH,103,3046.137,1682.2,149.4351,0,0,0,0,100,0),
+(@PATH,104,3043.137,1681.45,149.9351,0,0,0,0,100,0),
+(@PATH,105,3029.504,1676.955,150.2377,0,0,0,0,100,0),
+(@PATH,106,3027.504,1674.955,151.2377,0,0,0,0,100,0),
+(@PATH,107,3025.254,1672.705,151.9877,0,0,0,0,100,0),
+(@PATH,108,3023.004,1670.705,152.4877,0,0,0,0,100,0),
+(@PATH,109,3020.754,1668.705,152.9877,0,0,0,0,100,0),
+(@PATH,110,3018.004,1665.955,153.4877,0,0,0,0,100,0),
+(@PATH,111,3015.254,1663.705,154.4877,0,0,0,0,100,0),
+(@PATH,112,3013.754,1662.205,155.4877,0,0,0,0,100,0),
+(@PATH,113,3004.754,1654.205,156.2377,0,0,0,0,100,0),
+(@PATH,114,3004.595,1654.042,156.1276,0,0,0,0,100,0),
+(@PATH,115,3003.345,1653.042,156.3776,0,0,0,0,100,0),
+(@PATH,116,2997.345,1653.042,155.8776,0,0,0,0,100,0),
+(@PATH,117,2992.345,1653.042,155.1276,0,0,0,0,100,0),
+(@PATH,118,2985.345,1652.792,154.6276,0,0,0,0,100,0),
+(@PATH,119,2978.595,1652.792,153.8776,0,0,0,0,100,0),
+(@PATH,120,2974.595,1652.792,153.6276,0,0,0,0,100,0),
+(@PATH,121,2970.595,1652.792,152.8776,0,0,0,0,100,0),
+(@PATH,122,2966.595,1652.792,152.3776,0,0,0,0,100,0),
+(@PATH,123,2954.505,1652.478,151.8357,0,0,0,0,100,0),
+(@PATH,124,2949.505,1653.728,151.0857,0,0,0,0,100,0),
+(@PATH,125,2945.755,1654.728,150.3357,0,0,0,0,100,0),
+(@PATH,126,2941.755,1655.478,149.5857,0,0,0,0,100,0),
+(@PATH,127,2936.755,1656.728,148.8357,0,0,0,0,100,0),
+(@PATH,128,2933.255,1657.478,148.3357,0,0,0,0,100,0),
+(@PATH,129,2928.255,1658.478,147.8357,0,0,0,0,100,0),
+(@PATH,130,2923.505,1659.478,147.0857,0,0,0,0,100,0),
+(@PATH,131,2919.505,1660.478,146.5857,0,0,0,0,100,0),
+(@PATH,132,2910.18,1662.967,145.9415,0,0,0,0,100,0),
+(@PATH,133,2906.43,1666.217,145.1915,0,0,0,0,100,0),
+(@PATH,134,2887.43,1683.717,145.9415,0,0,0,0,100,0),
+(@PATH,135,2884.68,1686.467,146.4415,0,0,0,0,100,0),
+(@PATH,136,2884.797,1686.268,146.0567,0,0,0,0,100,0),
+(@PATH,137,2888.297,1682.768,145.8067,0,0,0,0,100,0),
+(@PATH,138,2894.297,1677.518,145.0567,0,0,0,0,100,0),
+(@PATH,139,2908.047,1664.768,145.5567,0,0,0,0,100,0),
+(@PATH,140,2908.294,1664.457,145.5768,0,0,0,0,100,0),
+(@PATH,141,2910.294,1662.707,146.0768,0,0,0,0,100,0),
+(@PATH,142,2917.044,1660.957,146.5768,0,0,0,0,100,0),
+(@PATH,143,2920.044,1660.457,147.0768,0,0,0,0,100,0),
+(@PATH,144,2927.794,1658.707,147.8268,0,0,0,0,100,0),
+(@PATH,145,2932.544,1657.707,148.3268,0,0,0,0,100,0),
+(@PATH,146,2936.294,1656.707,148.5768,0,0,0,0,100,0),
+(@PATH,147,2940.294,1655.957,149.3268,0,0,0,0,100,0),
+(@PATH,148,2943.294,1655.207,150.0768,0,0,0,0,100,0),
+(@PATH,149,2947.044,1654.207,150.8268,0,0,0,0,100,0),
+(@PATH,150,2951.044,1653.457,151.5768,0,0,0,0,100,0),
+(@PATH,151,2951.341,1653.032,151.6568,0,0,0,0,100,0),
+(@PATH,152,2954.591,1652.532,151.9068,0,0,0,0,100,0),
+(@PATH,153,2968.591,1652.782,152.6568,0,0,0,0,100,0),
+(@PATH,154,2972.591,1652.782,153.1568,0,0,0,0,100,0),
+(@PATH,155,2977.341,1652.782,153.6568,0,0,0,0,100,0),
+(@PATH,156,2983.341,1652.782,154.4068,0,0,0,0,100,0),
+(@PATH,157,2991.341,1653.032,154.9068,0,0,0,0,100,0),
+(@PATH,158,2996.341,1653.032,155.6568,0,0,0,0,100,0),
+(@PATH,159,3001.341,1653.032,156.1568,0,0,0,0,100,0),
+(@PATH,160,3001.542,1653.045,156.0563,0,0,0,0,100,0),
+(@PATH,161,3003.542,1653.045,156.3063,0,0,0,0,100,0),
+(@PATH,162,3006.542,1655.795,155.5563,0,0,0,0,100,0),
+(@PATH,163,3010.292,1659.045,155.0563,0,0,0,0,100,0),
+(@PATH,164,3015.292,1663.795,154.0563,0,0,0,0,100,0),
+(@PATH,165,3018.792,1667.045,153.3063,0,0,0,0,100,0),
+(@PATH,166,3021.042,1669.045,152.8063,0,0,0,0,100,0);
+
+-- 7. Dragonblight Mage Hunter
+SET @NPC := 101653;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3249.54,`position_y`=2495.336,`position_z`=41.3687 WHERE `guid`=@NPC;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=3249.54,`position_y`=2495.336,`position_z`=41.3687 WHERE `guid`=111808;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3249.54,2495.336,41.3687,0,0,0,0,100,0),
+(@PATH,2,3247.784,2497.835,41.32549,0,0,0,0,100,0),
+(@PATH,3,3246.039,2500.317,41.57574,0,0,0,0,100,0),
+(@PATH,4,3243.765,2503.621,41.63885,0,0,0,0,100,0),
+(@PATH,5,3242.897,2506.686,42.08795,0,0,0,0,100,0),
+(@PATH,6,3242.029,2509.75,42.35028,0,0,0,0,100,0),
+(@PATH,7,3241.156,2512.833,42.49152,0,0,0,0,100,0),
+(@PATH,8,3240.284,2515.91,42.68109,0,0,0,0,100,0),
+(@PATH,9,3239.402,2519.024,42.89935,0,0,0,0,100,0),
+(@PATH,10,3238.608,2521.823,43.01495,0,0,0,0,100,0),
+(@PATH,11,3237.81,2525.788,43.5097,0,0,0,0,100,0),
+(@PATH,12,3238.228,2527.319,44.10952,0,0,0,0,100,0),
+(@PATH,13,3238.811,2531.506,44.63812,0,0,0,0,100,0),
+(@PATH,14,3238.982,2532.672,45.19152,0,0,0,0,100,0),
+(@PATH,15,3239.754,2536.995,46.44672,0,0,0,0,100,0),
+(@PATH,16,3239.925,2537.223,46.66315,0,0,0,0,100,0),
+(@PATH,17,3240.774,2542.87,46.6424,0,0,0,0,100,0),
+(@PATH,18,3240.929,2543.77,46.67103,0,0,0,0,100,0),
+(@PATH,19,3241.179,2545.52,46.17103,0,0,0,0,100,0),
+(@PATH,20,3243.802,2550.656,46.20685,0,0,0,0,100,0),
+(@PATH,21,3246.092,2551.326,46.62245,0,0,0,0,100,0),
+(@PATH,22,3249.739,2553.132,46.82648,0,0,0,0,100,0),
+(@PATH,23,3252.717,2554.374,46.80084,0,0,0,0,100,0),
+(@PATH,24,3255.739,2555.634,46.3985,0,0,0,0,100,0),
+(@PATH,25,3257.392,2556.255,46.19845,0,0,0,0,100,0),
+(@PATH,26,3261.364,2557.993,46.04279,0,0,0,0,100,0),
+(@PATH,27,3261.723,2558.14,46.06793,0,0,0,0,100,0),
+(@PATH,28,3262.484,2558.443,46.44879,0,0,0,0,100,0),
+(@PATH,29,3259.649,2557.261,45.92462,0,0,0,0,100,0),
+(@PATH,30,3256.858,2556.097,46.16437,0,0,0,0,100,0),
+(@PATH,31,3255.227,2555.73,46.65943,0,0,0,0,100,0),
+(@PATH,32,3251.336,2553.795,46.72723,0,0,0,0,100,0),
+(@PATH,33,3248.548,2552.632,46.76642,0,0,0,0,100,0),
+(@PATH,34,3245.899,2551.529,46.45856,0,0,0,0,100,0),
+(@PATH,35,3241.96,2548.564,45.88812,0,0,0,0,100,0),
+(@PATH,36,3241.213,2545.438,45.6059,0,0,0,0,100,0),
+(@PATH,37,3241.248,2544.033,46.72429,0,0,0,0,100,0),
+(@PATH,38,3240.605,2541.107,47.42216,0,0,0,0,100,0),
+(@PATH,39,3239.73,2536.885,46.3222,0,0,0,0,100,0),
+(@PATH,40,3239.816,2536.917,46.76496,0,0,0,0,100,0),
+(@PATH,41,3239.566,2535.917,45.51496,0,0,0,0,100,0),
+(@PATH,42,3238.69,2530.889,44.5611,0,0,0,0,100,0),
+(@PATH,43,3238.202,2528.103,44.2962,0,0,0,0,100,0),
+(@PATH,44,3238.193,2526.375,44.04677,0,0,0,0,100,0),
+(@PATH,45,3238.818,2521.086,42.9516,0,0,0,0,100,0),
+(@PATH,46,3239.648,2518.154,42.8244,0,0,0,0,100,0),
+(@PATH,47,3240.475,2515.234,42.6983,0,0,0,0,100,0),
+(@PATH,48,3241.311,2512.285,42.55267,0,0,0,0,100,0),
+(@PATH,49,3242.144,2509.343,42.37787,0,0,0,0,100,0),
+(@PATH,50,3242.942,2506.525,42.07416,0,0,0,0,100,0),
+(@PATH,51,3244.205,2502.925,41.66071,0,0,0,0,100,0),
+(@PATH,52,3245.86,2501.084,41.68626,0,0,0,0,100,0),
+(@PATH,53,3247.701,2497.951,41.32951,0,0,0,0,100,0),
+(@PATH,54,3249.436,2495.482,41.38664,0,0,0,0,100,0),
+(@PATH,55,3251.177,2493.005,41.40324,0,0,0,0,100,0),
+(@PATH,56,3252.918,2490.528,41.55168,0,0,0,0,100,0),
+(@PATH,57,3254.689,2489.256,41.85149,0,0,0,0,100,0),
+(@PATH,58,3255.654,2486.35,41.83318,0,0,0,0,100,0),
+(@PATH,59,3256.631,2483.408,41.76433,0,0,0,0,100,0),
+(@PATH,60,3257.608,2480.464,41.79485,0,0,0,0,100,0),
+(@PATH,61,3258.569,2477.571,41.65385,0,0,0,0,100,0),
+(@PATH,62,3259.544,2474.634,41.51701,0,0,0,0,100,0),
+(@PATH,63,3261.051,2472.938,41.82683,0,0,0,0,100,0),
+(@PATH,64,3260.772,2469.941,41.91692,0,0,0,0,100,0),
+(@PATH,65,3260.499,2467,42.18571,0,0,0,0,100,0),
+(@PATH,66,3260.221,2464.014,41.71806,0,0,0,0,100,0),
+(@PATH,67,3259.942,2461.022,41.49309,0,0,0,0,100,0),
+(@PATH,68,3259.677,2458.177,41.21782,0,0,0,0,100,0),
+(@PATH,69,3259.97,2456.653,41.09612,0,0,0,0,100,0),
+(@PATH,70,3258.444,2455.153,40.83181,0,0,0,0,100,0),
+(@PATH,71,3257.242,2453.706,40.29644,0,0,0,0,100,0),
+(@PATH,72,3254.1,2450.069,39.60124,0,0,0,0,100,0),
+(@PATH,73,3251.918,2447.62,39.26897,0,0,0,0,100,0),
+(@PATH,74,3251.019,2445.633,39.03606,0,0,0,0,100,0),
+(@PATH,75,3248.314,2444.291,38.83647,0,0,0,0,100,0),
+(@PATH,76,3245.607,2442.948,38.51164,0,0,0,0,100,0),
+(@PATH,77,3242.906,2441.608,38.13213,0,0,0,0,100,0),
+(@PATH,78,3240.204,2440.267,38.09355,0,0,0,0,100,0),
+(@PATH,79,3237.515,2438.933,37.79057,0,0,0,0,100,0),
+(@PATH,80,3234.787,2437.579,37.58818,0,0,0,0,100,0),
+(@PATH,81,3232.052,2436.222,37.36251,0,0,0,0,100,0),
+(@PATH,82,3229.354,2434.884,37.16512,0,0,0,0,100,0),
+(@PATH,83,3226.098,2433.842,36.86872,0,0,0,0,100,0),
+(@PATH,84,3223.527,2429.761,36.31184,0,0,0,0,100,0),
+(@PATH,85,3223.332,2427.012,35.90656,0,0,0,0,100,0),
+(@PATH,86,3223.007,2423.796,35.80329,0,0,0,0,100,0),
+(@PATH,87,3222.761,2420.986,35.03156,0,0,0,0,100,0),
+(@PATH,88,3222.67,2419.866,34.95074,0,0,0,0,100,0),
+(@PATH,89,3222.215,2414.667,34.53156,0,0,0,0,100,0),
+(@PATH,90,3222.585,2411.538,34.38386,0,0,0,0,100,0),
+(@PATH,91,3222.955,2408.417,34.33942,0,0,0,0,100,0),
+(@PATH,92,3223.325,2405.291,34.40656,0,0,0,0,100,0),
+(@PATH,93,3223.688,2402.226,34.40656,0,0,0,0,100,0),
+(@PATH,94,3223.757,2401.642,34.40656,0,0,0,0,100,0),
+(@PATH,95,3223.854,2400.822,34.45649,0,0,0,0,100,0),
+(@PATH,96,3223.704,2402.094,34.41949,1.907491,0,0,0,100,0),
+(@PATH,97,3223.371,2404.902,34.40656,0,0,0,0,100,0),
+(@PATH,98,3223.018,2407.881,34.27338,0,0,0,0,100,0),
+(@PATH,99,3222.658,2410.924,34.37507,0,0,0,0,100,0),
+(@PATH,100,3222.188,2414.38,34.53156,0,0,0,0,100,0),
+(@PATH,101,3222.448,2417.364,34.65656,0,0,0,0,100,0),
+(@PATH,102,3222.708,2420.347,34.82319,0,0,0,0,100,0),
+(@PATH,103,3222.798,2422.253,35.76775,0,0,0,0,100,0),
+(@PATH,104,3223.228,2426.303,35.83149,0,0,0,0,100,0),
+(@PATH,105,3223.538,2431.997,36.43073,0,0,0,0,100,0),
+(@PATH,106,3226.257,2433.346,36.79208,0,0,0,0,100,0),
+(@PATH,107,3228.991,2434.703,37.14327,0,0,0,0,100,0),
+(@PATH,108,3231.738,2436.066,37.32479,0,0,0,0,100,0),
+(@PATH,109,3234.458,2437.415,37.67375,0,0,0,0,100,0),
+(@PATH,110,3237.203,2438.777,37.91228,0,0,0,0,100,0),
+(@PATH,111,3239.911,2440.121,38.07597,0,0,0,0,100,0),
+(@PATH,112,3242.646,2441.478,38.11638,0,0,0,0,100,0),
+(@PATH,113,3245.364,2442.826,38.48235,0,0,0,0,100,0),
+(@PATH,114,3247.745,2442.945,38.81718,0,0,0,0,100,0),
+(@PATH,115,3249.769,2445.207,39.08855,0,0,0,0,100,0),
+(@PATH,116,3251.768,2447.441,39.25102,0,0,0,0,100,0),
+(@PATH,117,3253.778,2449.686,39.61699,0,0,0,0,100,0),
+(@PATH,118,3255.782,2451.925,39.98259,0,0,0,0,100,0),
+(@PATH,119,3257.676,2454.054,40.47624,0,0,0,0,100,0),
+(@PATH,120,3259.36,2454.74,40.72893,0,0,0,0,100,0),
+(@PATH,121,3259.639,2457.743,41.15642,0,0,0,0,100,0),
+(@PATH,122,3259.916,2460.717,41.48357,0,0,0,0,100,0),
+(@PATH,123,3260.195,2463.712,41.70927,0,0,0,0,100,0),
+(@PATH,124,3260.463,2466.59,42.35124,0,0,0,0,100,0),
+(@PATH,125,3261.546,2468.533,42.35674,0,0,0,0,100,0),
+(@PATH,126,3260.587,2471.431,41.76701,0,0,0,0,100,0),
+(@PATH,127,3259.62,2474.355,41.53508,0,0,0,0,100,0),
+(@PATH,128,3258.656,2477.27,41.63872,0,0,0,0,100,0),
+(@PATH,129,3257.693,2480.179,41.77104,0,0,0,0,100,0),
+(@PATH,130,3256.725,2483.108,41.87578,0,0,0,0,100,0),
+(@PATH,131,3256.498,2485.439,41.91081,0,0,0,0,100,0),
+(@PATH,132,3254.773,2487.893,41.74675,0,0,0,0,100,0),
+(@PATH,133,3253.035,2490.365,41.61113,0,0,0,0,100,0),
+(@PATH,134,3251.277,2492.866,41.3643,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=101653;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(101653, 101653, 0, 0, 2, 0, 0),
+(101653, 111808, 3, 90, 2, 0, 0);
+
+-- levitating for dummy
+UPDATE `creature_template` SET `InhabitType`=4 WHERE  `entry`=26832;
+
+-- kneelemotes
+DELETE FROM `creature_addon` WHERE `guid`=115057;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(115057,0,0,0x8,1,0, '');
+
+-- 8. Dragonblight Mage Hunter
+SET @NPC := 101647;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3309.655,`position_y`=2685.866,`position_z`=37.56147 WHERE `guid`=@NPC;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=3309.655,`position_y`=2685.866,`position_z`=37.56147 WHERE `guid`=111799;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3309.655,2685.866,37.56147,0,0,0,0,100,0),
+(@PATH,2,3307.381,2683.79,37.43366,0,0,0,0,100,0),
+(@PATH,3,3305.116,2681.713,37.16193,0,0,0,0,100,0),
+(@PATH,4,3303.542,2680.563,37.09797,0,0,0,0,100,0),
+(@PATH,5,3301.671,2678.077,36.98542,0,0,0,0,100,0),
+(@PATH,6,3299.763,2675.542,36.91856,0,0,0,0,100,0),
+(@PATH,7,3297.884,2673.043,36.91856,0,0,0,0,100,0),
+(@PATH,8,3296.002,2670.543,36.91856,0,0,0,0,100,0),
+(@PATH,9,3294.122,2668.044,36.91856,0,0,0,0,100,0),
+(@PATH,10,3292.247,2665.552,36.95589,0,0,0,0,100,0),
+(@PATH,11,3290.969,2664.57,36.95589,0,0,0,0,100,0),
+(@PATH,12,3289.89,2661.572,36.95589,0,0,0,0,100,0),
+(@PATH,13,3287.939,2659.763,36.90929,0,0,0,0,100,0),
+(@PATH,14,3287.745,2655.615,36.84457,0,0,0,0,100,0),
+(@PATH,15,3286.667,2652.621,36.95589,0,0,0,0,100,0),
+(@PATH,16,3285.605,2649.669,36.95589,0,0,0,0,100,0),
+(@PATH,17,3284.536,2646.7,36.95589,0,0,0,0,100,0),
+(@PATH,18,3283.062,2646.839,36.95589,0,0,0,0,100,0),
+(@PATH,19,3283.566,2643.667,36.95589,0,0,0,0,100,0),
+(@PATH,20,3284.072,2640.483,36.95589,0,0,0,0,100,0),
+(@PATH,21,3284.576,2637.308,36.83089,0,0,0,0,100,0),
+(@PATH,22,3285.082,2634.127,36.83089,0,0,0,0,100,0),
+(@PATH,23,3285.59,2630.929,36.80254,0,0,0,0,100,0),
+(@PATH,24,3286.098,2627.732,36.78325,0,0,0,0,100,0),
+(@PATH,25,3286.605,2624.542,36.80254,0,0,0,0,100,0),
+(@PATH,26,3287.11,2621.364,36.80254,0,0,0,0,100,0),
+(@PATH,27,3287.619,2618.154,36.97575,0,0,0,0,100,0),
+(@PATH,28,3287.749,2617.342,36.96025,0,0,0,0,100,0),
+(@PATH,29,3287.878,2616.527,36.75676,0,0,0,0,100,0),
+(@PATH,30,3287.711,2617.576,36.96477,0,0,0,0,100,0),
+(@PATH,31,3287.237,2620.564,36.92754,0,0,0,0,100,0),
+(@PATH,32,3286.757,2623.586,36.80254,0,0,0,0,100,0),
+(@PATH,33,3286.281,2626.581,36.76128,0,0,0,0,100,0),
+(@PATH,34,3285.808,2629.553,36.80254,0,0,0,0,100,0),
+(@PATH,35,3285.332,2632.555,36.80254,0,0,0,0,100,0),
+(@PATH,36,3284.856,2635.548,36.83578,0,0,0,0,100,0),
+(@PATH,37,3284.379,2638.547,36.95589,0,0,0,0,100,0),
+(@PATH,38,3283.906,2641.528,36.95589,0,0,0,0,100,0),
+(@PATH,39,3282.922,2642.217,36.95589,0,0,0,0,100,0),
+(@PATH,40,3284.02,2645.266,36.95589,0,0,0,0,100,0),
+(@PATH,41,3285.111,2648.295,36.95589,0,0,0,0,100,0),
+(@PATH,42,3286.196,2651.31,36.95589,0,0,0,0,100,0),
+(@PATH,43,3287.283,2654.332,36.95589,0,0,0,0,100,0),
+(@PATH,44,3288.363,2657.331,36.63863,0,0,0,0,100,0),
+(@PATH,45,3289.951,2657.276,37.58014,0,0,0,0,100,0),
+(@PATH,46,3290.701,2658.776,39.08014,0,0,0,0,100,0),
+(@PATH,47,3290.416,2659.119,38.98893,0,0,0,0,100,0),
+(@PATH,48,3290.666,2661.369,37.48893,0,0,0,0,100,0),
+(@PATH,49,3291.475,2664.526,36.95589,0,0,0,0,100,0),
+(@PATH,50,3293.363,2667.036,36.91856,0,0,0,0,100,0),
+(@PATH,51,3295.251,2669.545,36.91856,0,0,0,0,100,0),
+(@PATH,52,3297.131,2672.044,36.91856,0,0,0,0,100,0),
+(@PATH,53,3299.018,2674.551,36.91856,0,0,0,0,100,0),
+(@PATH,54,3300.889,2677.038,36.98542,0,0,0,0,100,0),
+(@PATH,55,3302.237,2679.074,36.98542,0,0,0,0,100,0),
+(@PATH,56,3304.474,2681.119,37.08491,0,0,0,0,100,0),
+(@PATH,57,3306.711,2683.164,37.35322,0,0,0,0,100,0),
+(@PATH,58,3308.952,2685.212,37.47089,0,0,0,0,100,0),
+(@PATH,59,3311.189,2687.257,37.76264,0,0,0,0,100,0),
+(@PATH,60,3313.433,2689.311,38.0052,0,0,0,0,100,0),
+(@PATH,61,3315.657,2691.347,38.17683,0,0,0,0,100,0),
+(@PATH,62,3316.266,2693.495,37.96796,0,0,0,0,100,0),
+(@PATH,63,3319.241,2694.128,38.12397,0,0,0,0,100,0),
+(@PATH,64,3322.216,2694.76,38.3017,0,0,0,0,100,0),
+(@PATH,65,3325.18,2695.39,38.35114,0,0,0,0,100,0),
+(@PATH,66,3328.141,2696.019,38.48542,0,0,0,0,100,0),
+(@PATH,67,3331.135,2696.655,38.61042,0,0,0,0,100,0),
+(@PATH,68,3332.212,2696.884,38.61042,0,0,0,0,100,0),
+(@PATH,69,3333.025,2697.056,38.80158,0,0,0,0,100,0),
+(@PATH,70,3329.989,2696.411,38.61042,0,0,0,0,100,0),
+(@PATH,71,3327.034,2695.782,38.36054,0,0,0,0,100,0),
+(@PATH,72,3324.059,2695.149,38.25495,0,0,0,0,100,0),
+(@PATH,73,3321.09,2694.519,38.17377,0,0,0,0,100,0),
+(@PATH,74,3319.666,2695.016,38.06855,0,0,0,0,100,0),
+(@PATH,75,3317.396,2692.941,38.14497,0,0,0,0,100,0),
+(@PATH,76,3315.104,2690.846,38.1103,0,0,0,0,100,0),
+(@PATH,77,3312.783,2688.725,37.99751,0,0,0,0,100,0),
+(@PATH,78,3310.485,2686.624,37.66938,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=101647;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(101647, 101647, 0, 0, 2, 0, 0),
+(101647, 111799, 3, 90, 2, 0, 0);
+
+-- 9. Dragonblight Mage Hunter
+SET @NPC := 101641;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3428.104,`position_y`=2735.986,`position_z`=48.71296 WHERE `guid`=@NPC;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=3428.104,`position_y`=2735.986,`position_z`=48.71296 WHERE `guid`=111771;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3428.104,2735.986,48.71296,0,0,0,0,100,0),
+(@PATH,2,3425.443,2734.516,48.53644,0,0,0,0,100,0),
+(@PATH,3,3422.782,2733.046,48.31248,0,0,0,0,100,0),
+(@PATH,4,3420.109,2731.57,48.01024,0,0,0,0,100,0),
+(@PATH,5,3416.655,2729.232,47.60484,0,0,0,0,100,0),
+(@PATH,6,3413.609,2729.071,47.40611,0,0,0,0,100,0),
+(@PATH,7,3410.579,2728.911,47.14818,0,0,0,0,100,0),
+(@PATH,8,3407.57,2728.752,46.89305,0,0,0,0,100,0),
+(@PATH,9,3404.551,2728.593,46.5117,0,0,0,0,100,0),
+(@PATH,10,3401.51,2728.432,46.12743,0,0,0,0,100,0),
+(@PATH,11,3398.489,2728.273,45.76253,0,0,0,0,100,0),
+(@PATH,12,3395.658,2728.124,45.1761,0,0,0,0,100,0),
+(@PATH,13,3393.825,2728.066,45.12178,0,0,0,0,100,0),
+(@PATH,14,3389.51,2727.801,44.52693,0,0,0,0,100,0),
+(@PATH,15,3386.867,2727.344,44.22895,0,0,0,0,100,0),
+(@PATH,16,3382.715,2727.908,43.73738,0,0,0,0,100,0),
+(@PATH,17,3379.876,2728.978,43.65327,0,0,0,0,100,0),
+(@PATH,18,3377.013,2730.056,43.56892,0,0,0,0,100,0),
+(@PATH,19,3374.167,2731.129,43.64705,0,0,0,0,100,0),
+(@PATH,20,3371.302,2732.209,43.78133,0,0,0,0,100,0),
+(@PATH,21,3368.437,2733.288,43.81526,0,0,0,0,100,0),
+(@PATH,22,3365.587,2734.363,44.07652,0,0,0,0,100,0),
+(@PATH,23,3362.738,2735.437,44.11741,0,0,0,0,100,0),
+(@PATH,24,3359.883,2736.514,44.28306,0,0,0,0,100,0),
+(@PATH,25,3357.022,2737.593,44.57383,0,0,0,0,100,0),
+(@PATH,26,3353.997,2738.707,44.68626,0,0,0,0,100,0),
+(@PATH,27,3351.277,2740.072,44.88865,0,0,0,0,100,0),
+(@PATH,28,3348.575,2741.427,45.23033,0,0,0,0,100,0),
+(@PATH,29,3345.891,2742.774,45.41209,0,0,0,0,100,0),
+(@PATH,30,3343.344,2744.049,45.89647,0,0,0,0,100,0),
+(@PATH,31,3341.882,2745.033,46.25793,0,0,0,0,100,0),
+(@PATH,32,3337.835,2746.815,46.7794,0,0,0,0,100,0),
+(@PATH,33,3336.501,2747.732,47.26428,0,0,0,0,100,0),
+(@PATH,34,3333.486,2748.996,47.77147,0,0,0,0,100,0),
+(@PATH,35,3333.358,2749.061,47.74632,0,0,0,0,100,0),
+(@PATH,36,3332.592,2749.449,47.84582,0,0,0,0,100,0),
+(@PATH,37,3334.399,2748.542,47.55919,0,0,0,0,100,0),
+(@PATH,38,3337.077,2747.199,46.96263,0,0,0,0,100,0),
+(@PATH,39,3339.018,2746.477,46.75876,0,0,0,0,100,0),
+(@PATH,40,3342.365,2744.546,45.89647,0,0,0,0,100,0),
+(@PATH,41,3344.059,2743.823,45.77831,0,0,0,0,100,0),
+(@PATH,42,3347.866,2741.788,45.23179,0,0,0,0,100,0),
+(@PATH,43,3350.572,2740.428,44.9741,0,0,0,0,100,0),
+(@PATH,44,3353.47,2738.932,44.73997,0,0,0,0,100,0),
+(@PATH,45,3356.303,2737.865,44.55296,0,0,0,0,100,0),
+(@PATH,46,3359.149,2736.792,44.26182,0,0,0,0,100,0),
+(@PATH,47,3361.988,2735.723,44.21995,0,0,0,0,100,0),
+(@PATH,48,3364.817,2734.656,44.05455,0,0,0,0,100,0),
+(@PATH,49,3367.636,2733.593,43.83228,0,0,0,0,100,0),
+(@PATH,50,3370.488,2732.518,43.75142,0,0,0,0,100,0),
+(@PATH,51,3373.357,2731.437,43.72078,0,0,0,0,100,0),
+(@PATH,52,3376.19,2730.368,43.66975,0,0,0,0,100,0),
+(@PATH,53,3379.01,2729.305,43.62801,0,0,0,0,100,0),
+(@PATH,54,3382.68,2727.433,43.61934,0,0,0,0,100,0),
+(@PATH,55,3385.647,2727.59,44.01289,0,0,0,0,100,0),
+(@PATH,56,3388.653,2727.749,44.41158,0,0,0,0,100,0),
+(@PATH,57,3391.682,2727.909,44.77693,0,0,0,0,100,0),
+(@PATH,58,3394.659,2728.066,45.20857,0,0,0,0,100,0),
+(@PATH,59,3396.602,2728.118,45.59418,0,0,0,0,100,0),
+(@PATH,60,3400.709,2728.385,46.02562,0,0,0,0,100,0),
+(@PATH,61,3403.696,2728.543,46.40306,0,0,0,0,100,0),
+(@PATH,62,3406.69,2728.701,46.78123,0,0,0,0,100,0),
+(@PATH,63,3409.732,2728.861,47.04063,0,0,0,0,100,0),
+(@PATH,64,3412.678,2729.02,47.28807,0,0,0,0,100,0),
+(@PATH,65,3416.686,2729.679,47.59825,0,0,0,0,100,0),
+(@PATH,66,3419.314,2731.13,47.95763,0,0,0,0,100,0),
+(@PATH,67,3421.962,2732.593,48.25804,0,0,0,0,100,0),
+(@PATH,68,3424.603,2734.052,48.3559,0,0,0,0,100,0),
+(@PATH,69,3427.245,2735.512,48.65607,0,0,0,0,100,0),
+(@PATH,70,3429.927,2736.994,48.8321,0,0,0,0,100,0),
+(@PATH,71,3432.565,2738.451,48.88373,0,0,0,0,100,0),
+(@PATH,72,3435.226,2739.921,49.06432,0,0,0,0,100,0),
+(@PATH,73,3437.894,2741.395,49.15575,0,0,0,0,100,0),
+(@PATH,74,3440.145,2742.745,49.19273,0,0,0,0,100,0),
+(@PATH,75,3442.959,2743.869,49.23497,0,0,0,0,100,0),
+(@PATH,76,3445.774,2744.994,49.33763,0,0,0,0,100,0),
+(@PATH,77,3448.623,2746.132,49.50084,0,0,0,0,100,0),
+(@PATH,78,3451.444,2747.26,49.73448,0,0,0,0,100,0),
+(@PATH,79,3454.29,2748.397,49.99596,0,0,0,0,100,0),
+(@PATH,80,3457.107,2749.522,50.16612,0,0,0,0,100,0),
+(@PATH,81,3459.942,2750.655,50.38133,0,0,0,0,100,0),
+(@PATH,82,3462.752,2751.779,50.59361,0,0,0,0,100,0),
+(@PATH,83,3462.882,2751.83,50.60912,0,0,0,0,100,0),
+(@PATH,84,3463.669,2752.137,50.70372,0,0,0,0,100,0),
+(@PATH,85,3462.899,2751.834,50.65291,-2.511428,0,0,0,100,0),
+(@PATH,86,3459.888,2750.627,50.37498,0,0,0,0,100,0),
+(@PATH,87,3457.07,2749.5,50.16173,0,0,0,0,100,0),
+(@PATH,88,3454.263,2748.379,49.99376,0,0,0,0,100,0),
+(@PATH,89,3451.435,2747.249,49.73326,0,0,0,0,100,0),
+(@PATH,90,3448.594,2746.111,49.50084,0,0,0,0,100,0),
+(@PATH,91,3445.782,2744.991,49.33727,0,0,0,0,100,0),
+(@PATH,92,3443.023,2743.892,49.23009,0,0,0,0,100,0),
+(@PATH,93,3440.526,2742.849,49.25084,0,0,0,0,100,0),
+(@PATH,94,3437.858,2741.375,49.15331,0,0,0,0,100,0),
+(@PATH,95,3435.19,2739.901,49.06615,0,0,0,0,100,0),
+(@PATH,96,3432.551,2738.443,48.88263,0,0,0,0,100,0),
+(@PATH,97,3429.882,2736.969,48.8321,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=101641;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(101641, 101641, 0, 0, 2, 0, 0),
+(101641, 111771, 3, 90, 2, 0, 0);
+
+-- 10. Dragonblight Mage Hunter
+SET @NPC := 111795;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3397.47,`position_y`=2651.581,`position_z`=39.35016 WHERE `guid`=@NPC;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=3397.47,`position_y`=2651.581,`position_z`=39.35016 WHERE `guid`=101644;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3397.47,2651.581,39.35016,0,0,0,0,100,0),
+(@PATH,2,3397.22,2644.831,40.10016,0,0,0,0,100,0),
+(@PATH,3,3396.798,2620.336,39.82126,0,0,0,0,100,0),
+(@PATH,4,3399.798,2599.836,40.32126,0,0,0,0,100,0),
+(@PATH,5,3400.298,2596.086,40.82126,0,0,0,0,100,0),
+(@PATH,6,3400.475,2595.626,41.18766,0,0,0,0,100,0),
+(@PATH,7,3400.725,2594.126,41.18766,0,0,0,0,100,0),
+(@PATH,8,3407.975,2586.126,41.93766,0,0,0,0,100,0),
+(@PATH,9,3410.975,2582.376,42.18766,0,0,0,0,100,0),
+(@PATH,10,3413.475,2579.376,42.93766,0,0,0,0,100,0),
+(@PATH,11,3416.225,2576.376,43.43766,0,0,0,0,100,0),
+(@PATH,12,3416.429,2576.059,43.769,0,0,0,0,100,0),
+(@PATH,13,3416.679,2575.559,44.019,0,0,0,0,100,0),
+(@PATH,14,3422.679,2571.809,44.269,0,0,0,0,100,0),
+(@PATH,15,3428.179,2568.059,44.769,0,0,0,0,100,0),
+(@PATH,16,3438.179,2561.559,45.519,0,0,0,0,100,0),
+(@PATH,17,3440.305,2559.861,45.74776,0,0,0,0,100,0),
+(@PATH,18,3440.555,2542.111,46.24776,0,0,0,0,100,0),
+(@PATH,19,3440.805,2533.111,46.74776,0,0,0,0,100,0),
+(@PATH,20,3441.055,2526.111,47.24776,0,0,0,0,100,0),
+(@PATH,21,3441.322,2525.875,47.48122,0,0,0,0,100,0),
+(@PATH,22,3441.322,2524.375,47.73122,0,0,0,0,100,0),
+(@PATH,23,3446.072,2522.875,48.48122,0,0,0,0,100,0),
+(@PATH,24,3450.072,2521.875,49.23122,0,0,0,0,100,0),
+(@PATH,25,3452.572,2521.125,49.73122,0,0,0,0,100,0),
+(@PATH,26,3455.572,2520.125,50.48122,0,0,0,0,100,0),
+(@PATH,27,3458.322,2519.375,51.23122,0,0,0,0,100,0),
+(@PATH,28,3461.322,2518.375,51.73122,0,0,0,0,100,0),
+(@PATH,29,3461.1,2518.589,51.82127,0,0,0,0,100,0),
+(@PATH,30,3459.35,2519.089,51.07127,0,0,0,0,100,0),
+(@PATH,31,3455.35,2520.339,50.32127,0,0,0,0,100,0),
+(@PATH,32,3452.6,2520.839,49.82127,0,0,0,0,100,0),
+(@PATH,33,3450.1,2521.589,49.07127,0,0,0,0,100,0),
+(@PATH,34,3447.1,2522.589,48.57127,0,0,0,0,100,0),
+(@PATH,35,3442.35,2524.089,47.82127,0,0,0,0,100,0),
+(@PATH,36,3442.223,2524.163,47.5437,0,0,0,0,100,0),
+(@PATH,37,3441.473,2524.663,47.5437,0,0,0,0,100,0),
+(@PATH,38,3441.223,2530.663,46.7937,0,0,0,0,100,0),
+(@PATH,39,3440.973,2538.663,46.5437,0,0,0,0,100,0),
+(@PATH,40,3440.723,2551.413,45.7937,0,0,0,0,100,0),
+(@PATH,41,3440.154,2560.19,45.4841,0,0,0,0,100,0),
+(@PATH,42,3431.154,2566.19,44.9841,0,0,0,0,100,0),
+(@PATH,43,3425.404,2569.94,44.4841,0,0,0,0,100,0),
+(@PATH,44,3418.654,2574.44,43.9841,0,0,0,0,100,0),
+(@PATH,45,3418.408,2574.603,43.66738,0,0,0,0,100,0),
+(@PATH,46,3416.408,2575.853,43.66738,0,0,0,0,100,0),
+(@PATH,47,3413.908,2578.853,42.91738,0,0,0,0,100,0),
+(@PATH,48,3411.408,2581.853,42.16738,0,0,0,0,100,0),
+(@PATH,49,3408.408,2585.603,41.91738,0,0,0,0,100,0),
+(@PATH,50,3401.158,2593.853,41.16738,0,0,0,0,100,0),
+(@PATH,51,3400.958,2594.205,40.95194,0,0,0,0,100,0),
+(@PATH,52,3400.458,2594.455,40.95194,0,0,0,0,100,0),
+(@PATH,53,3399.958,2598.455,40.45194,0,0,0,0,100,0),
+(@PATH,54,3399.458,2602.455,40.20194,0,0,0,0,100,0),
+(@PATH,55,3396.748,2620.664,39.6376,0,0,0,0,100,0),
+(@PATH,56,3397.248,2634.664,40.3876,0,0,0,0,100,0),
+(@PATH,57,3397.248,2646.414,39.6376,0,0,0,0,100,0),
+(@PATH,58,3397.732,2652.038,39.51247,0,0,0,0,100,0),
+(@PATH,59,3400.301,2676.48,39.35812,0,0,0,0,100,0),
+(@PATH,60,3402.051,2685.98,39.85812,0,0,0,0,100,0),
+(@PATH,61,3403.301,2691.98,40.60812,0,0,0,0,100,0),
+(@PATH,62,3402.772,2690.127,40.33588,0,0,0,0,100,0),
+(@PATH,63,3401.772,2684.377,39.83588,0,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=111795;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES 
+(111795, 111795, 0, 0, 2, 0, 0),
+(111795, 101644, 4, 0, 2, 0, 0);
diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 96a25588120..d76d106e81a 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -140,6 +140,30 @@ void CreatureAI::MoveInLineOfSight(Unit* who)
     //    me->GetMotionMaster()->MoveChase(who->GetVictim());
 }
 
+// Distract creature, if player gets too close while stealthed/prowling
+void CreatureAI::TriggerAlert(Unit const* who) const
+{
+    // If there's no target, or target isn't a player do nothing
+    if (!who || who->GetTypeId() != TYPEID_PLAYER)
+        return;
+
+    // If this unit isn't an NPC, is already distracted, is in combat, is confused, stunned or fleeing, do nothing
+    if (me->GetTypeId() != TYPEID_UNIT || me->IsInCombat() || me->HasUnitState(UNIT_STATE_CONFUSED | UNIT_STATE_STUNNED | UNIT_STATE_FLEEING | UNIT_STATE_DISTRACTED))
+        return;
+
+    // Only alert for hostiles!
+    if (me->IsCivilian() || me->HasReactState(REACT_PASSIVE) || !me->IsHostileTo(who) || !me->_IsTargetAcceptable(who))
+        return;
+
+    // Send alert sound (if any) for this creature
+    me->SendAIReaction(AI_REACTION_ALERT);
+
+    // Face the unit (stealthed player) and set distracted state for 5 seconds
+    me->SetFacingTo(me->GetAngle(who->GetPositionX(), who->GetPositionY()));
+    me->StopMoving();
+    me->GetMotionMaster()->MoveDistract(5 * IN_MILLISECONDS);
+}
+
 void CreatureAI::EnterEvadeMode()
 {
     if (!_EnterEvadeMode())
diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
index 2e862c37c0e..33616d076e7 100644
--- a/src/server/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
@@ -89,6 +89,9 @@ class CreatureAI : public UnitAI
         // Called if IsVisible(Unit* who) is true at each who move, reaction at visibility zone enter
         void MoveInLineOfSight_Safe(Unit* who);
 
+        // Trigger Creature "Alert" state (creature can see stealthed unit)
+        void TriggerAlert(Unit const* who) const;
+
         // Called in Creature::Update when deathstate = DEAD. Inherited classes may maniuplate the ability to respawn based on scripted events.
         virtual bool CanRespawn() { return true; }
 
diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
index ed87804474a..f1c53e2f9eb 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
@@ -120,7 +120,13 @@ void npc_escortAI::MoveInLineOfSight(Unit* who)
             {
                 if (!me->GetVictim())
                 {
-                    who->RemoveAurasByType(SPELL_AURA_MOD_STEALTH);
+                    // Clear distracted state on combat
+                    if (me->HasUnitState(UNIT_STATE_DISTRACTED))
+                    {
+                        me->ClearUnitState(UNIT_STATE_DISTRACTED);
+                        me->GetMotionMaster()->Clear();
+                    }
+
                     AttackStart(who);
                 }
                 else if (me->GetMap()->IsDungeon())
diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
index 7fd21a8f791..8985f722cf2 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
@@ -117,7 +117,13 @@ void FollowerAI::MoveInLineOfSight(Unit* who)
             {
                 if (!me->GetVictim())
                 {
-                    who->RemoveAurasByType(SPELL_AURA_MOD_STEALTH);
+                    // Clear distracted state on combat
+                    if (me->HasUnitState(UNIT_STATE_DISTRACTED))
+                    {
+                        me->ClearUnitState(UNIT_STATE_DISTRACTED);
+                        me->GetMotionMaster()->Clear();
+                    }
+
                     AttackStart(who);
                 }
                 else if (me->GetMap()->IsDungeon())
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index 0b040fc519a..1a51bb2d897 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -469,7 +469,13 @@ void SmartAI::MoveInLineOfSight(Unit* who)
         {
             if (!me->GetVictim())
             {
-                who->RemoveAurasByType(SPELL_AURA_MOD_STEALTH);
+                // Clear distracted state on combat
+                if (me->HasUnitState(UNIT_STATE_DISTRACTED))
+                {
+                   me->ClearUnitState(UNIT_STATE_DISTRACTED);
+                   me->GetMotionMaster()->Clear();
+                }
+
                 AttackStart(who);
             }
             else/* if (me->GetMap()->IsDungeon())*/
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 6392c3ee51b..fc55c09bffa 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -1539,7 +1539,7 @@ float WorldObject::GetSightRange(const WorldObject* target) const
     return 0.0f;
 }
 
-bool WorldObject::CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth, bool distanceCheck) const
+bool WorldObject::CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth, bool distanceCheck, bool checkAlert) const
 {
     if (this == obj)
         return true;
@@ -1611,7 +1611,7 @@ bool WorldObject::CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo
     if (obj->IsInvisibleDueToDespawn())
         return false;
 
-    if (!CanDetect(obj, ignoreStealth))
+    if (!CanDetect(obj, ignoreStealth, checkAlert))
         return false;
 
     return true;
@@ -1622,7 +1622,7 @@ bool WorldObject::CanNeverSee(WorldObject const* obj) const
     return GetMap() != obj->GetMap() || !InSamePhase(obj);
 }
 
-bool WorldObject::CanDetect(WorldObject const* obj, bool ignoreStealth) const
+bool WorldObject::CanDetect(WorldObject const* obj, bool ignoreStealth, bool checkAlert) const
 {
     const WorldObject* seer = this;
 
@@ -1637,7 +1637,7 @@ bool WorldObject::CanDetect(WorldObject const* obj, bool ignoreStealth) const
     if (!ignoreStealth && !seer->CanDetectInvisibilityOf(obj))
         return false;
 
-    if (!ignoreStealth && !seer->CanDetectStealthOf(obj))
+    if (!ignoreStealth && !seer->CanDetectStealthOf(obj, checkAlert))
         return false;
 
     return true;
@@ -1674,7 +1674,7 @@ bool WorldObject::CanDetectInvisibilityOf(WorldObject const* obj) const
     return true;
 }
 
-bool WorldObject::CanDetectStealthOf(WorldObject const* obj) const
+bool WorldObject::CanDetectStealthOf(WorldObject const* obj, bool checkAlert) const
 {
     // Combat reach is the minimal distance (both in front and behind),
     //   and it is also used in the range calculation.
@@ -1724,9 +1724,19 @@ bool WorldObject::CanDetectStealthOf(WorldObject const* obj) const
         // Calculate max distance
         float visibilityRange = float(detectionValue) * 0.3f + combatReach;
 
-        if (visibilityRange > MAX_PLAYER_STEALTH_DETECT_RANGE)
+        // If this unit is an NPC then player detect range doesn't apply
+        if (unit && unit->GetTypeId() == TYPEID_PLAYER && visibilityRange > MAX_PLAYER_STEALTH_DETECT_RANGE)
             visibilityRange = MAX_PLAYER_STEALTH_DETECT_RANGE;
 
+        // When checking for alert state, look 8% further, and then 1.5 yards more than that.
+        if (checkAlert)
+            visibilityRange += (visibilityRange * 0.08f) + 1.5f;
+
+        // If checking for alert, and creature's visibility range is greater than aggro distance, No alert
+        Unit const* tunit = obj->ToUnit();
+        if (checkAlert && unit && unit->ToCreature() && visibilityRange >= unit->ToCreature()->GetAttackDistance(tunit) + unit->ToCreature()->m_CombatDistance)
+            return false;
+
         if (distance > visibilityRange)
             return false;
     }
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
index a560afa7f1b..e673e346a5f 100644
--- a/src/server/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
@@ -514,7 +514,7 @@ class WorldObject : public Object, public WorldLocation
         float GetGridActivationRange() const;
         float GetVisibilityRange() const;
         float GetSightRange(WorldObject const* target = NULL) const;
-        bool CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth = false, bool distanceCheck = false) const;
+        bool CanSeeOrDetect(WorldObject const* obj, bool ignoreStealth = false, bool distanceCheck = false, bool checkAlert = false) const;
 
         FlaggedValuesArray32<int32, uint32, StealthType, TOTAL_STEALTH_TYPES> m_stealth;
         FlaggedValuesArray32<int32, uint32, StealthType, TOTAL_STEALTH_TYPES> m_stealthDetect;
@@ -634,9 +634,9 @@ class WorldObject : public Object, public WorldLocation
 
         bool CanNeverSee(WorldObject const* obj) const;
         virtual bool CanAlwaysSee(WorldObject const* /*obj*/) const { return false; }
-        bool CanDetect(WorldObject const* obj, bool ignoreStealth) const;
+        bool CanDetect(WorldObject const* obj, bool ignoreStealth, bool checkAlert = false) const;
         bool CanDetectInvisibilityOf(WorldObject const* obj) const;
-        bool CanDetectStealthOf(WorldObject const* obj) const;
+        bool CanDetectStealthOf(WorldObject const* obj, bool checkAlert = false) const;
 };
 
 namespace Trinity
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 17915e53cfb..b3b757e6a2e 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -288,6 +288,28 @@ Unit::~Unit()
     ASSERT(m_dynObj.empty());
 }
 
+// Check if unit in combat with specific unit
+bool Unit::IsInCombatWith(Unit const* who) const
+{
+    // Check target exists
+    if (!who)
+        return false;
+
+    // Search in threat list
+    ObjectGuid guid = who->GetGUID();
+    for (ThreatContainer::StorageType::const_iterator i = m_ThreatManager.getThreatList().begin(); i != m_ThreatManager.getThreatList().end(); ++i)
+    {
+        HostileReference* ref = (*i);
+
+        // Return true if the unit matches
+        if (ref && ref->getUnitGuid() == guid)
+            return true;
+    }
+
+    // Nothing found, false.
+    return false;
+}
+
 void Unit::Update(uint32 p_time)
 {
     // WARNING! Order of execution here is important, do not change.
@@ -8426,7 +8448,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg
             // Item - Shaman T10 Enhancement 4P Bonus
             if (AuraEffect const* aurEff = GetAuraEffect(70832, 0))
                 if (Aura const* maelstrom = GetAura(53817))
-                    if ((maelstrom->GetStackAmount() == maelstrom->GetSpellInfo()->StackAmount - 1) && roll_chance_i(aurEff->GetAmount()))
+                    if ((maelstrom->GetStackAmount() == maelstrom->GetSpellInfo()->StackAmount) && roll_chance_i(aurEff->GetAmount()))
                         CastSpell(this, 70831, true, castItem, triggeredByAura);
             break;
         }
@@ -9964,15 +9986,11 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
         DoneTotal += int32(DoneAdvertisedBenefit * coeff * factorMod);
     }
 
-    float tmpDamage = float(int32(pdamage) + DoneTotal);
-    // SPELLMOD_DOT will be applied in AuraEffect::HandlePeriodicDamageAurasTick.
-    if (damagetype != DOT)
-    {
-        tmpDamage *= SpellDamagePctDone(victim, spellProto, damagetype);
-        // apply spellmod to Done damage (flat and pct)
-        if (Player* modOwner = GetSpellModOwner())
-            modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_DAMAGE, tmpDamage);
-    }
+    // Done Percentage for DOT is already calculated, no need to do it again. The percentage mod is applied in Aura::HandleAuraSpecificMods.
+    float tmpDamage = (int32(pdamage) + DoneTotal) * (damagetype == DOT ? 1.0f : SpellDamagePctDone(victim, spellProto, damagetype));
+    // apply spellmod to Done damage (flat and pct)
+    if (Player* modOwner = GetSpellModOwner())
+        modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, tmpDamage);
 
     return uint32(std::max(tmpDamage, 0.0f));
 }
@@ -10812,15 +10830,11 @@ uint32 Unit::SpellHealingBonusDone(Unit* victim, SpellInfo const* spellProto, ui
             DoneTotal = 0;
     }
 
-    float heal = float(int32(healamount) + DoneTotal);
-    // SPELLMOD_DOT will be applied in AuraEffect::HandlePeriodicHealAurasTick.
-    if (damagetype != DOT)
-    {
-        heal *= SpellHealingPctDone(victim, spellProto);
-        // apply spellmod to Done amount
-        if (Player* modOwner = GetSpellModOwner())
-            modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_DAMAGE, heal);
-    }
+    // Done Percentage for DOT is already calculated, no need to do it again. The percentage mod is applied in Aura::HandleAuraSpecificMods.
+    float heal = float(int32(healamount) + DoneTotal) * (damagetype == DOT ? 1.0f : SpellHealingPctDone(victim, spellProto));
+    // apply spellmod to Done amount
+    if (Player* modOwner = GetSpellModOwner())
+        modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, heal);
 
     return uint32(std::max(heal, 0.0f));
 }
@@ -11885,8 +11899,8 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo
         if (IsOnVehicle(target) || m_vehicle->GetBase()->IsOnVehicle(target))
             return false;
 
-    // can't attack invisible (ignore stealth for aoe spells) also if the area being looked at is from a spell use the dynamic object created instead of the casting unit.
-    if ((!bySpell || !bySpell->HasAttribute(SPELL_ATTR6_CAN_TARGET_INVISIBLE)) && (obj ? !obj->CanSeeOrDetect(target, bySpell && bySpell->IsAffectingArea()) : !CanSeeOrDetect(target, bySpell && bySpell->IsAffectingArea())))
+    // can't attack invisible (ignore stealth for aoe spells) also if the area being looked at is from a spell use the dynamic object created instead of the casting unit. Ignore stealth if target is player and unit in combat with same player
+    if ((!bySpell || !bySpell->HasAttribute(SPELL_ATTR6_CAN_TARGET_INVISIBLE)) && (obj ? !obj->CanSeeOrDetect(target, bySpell && bySpell->IsAffectingArea()) : !CanSeeOrDetect(target, (bySpell && bySpell->IsAffectingArea()) || (target->GetTypeId() == TYPEID_PLAYER && target->HasStealthAura() && target->IsInCombat() && IsInCombatWith(target)))))
         return false;
 
     // can't attack dead
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index a61b406cbbd..39b1c34be55 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -1480,6 +1480,7 @@ class Unit : public WorldObject
         bool IsInFlight()  const { return HasUnitState(UNIT_STATE_IN_FLIGHT); }
 
         bool IsInCombat()  const { return HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); }
+        bool IsInCombatWith(Unit const* who) const;
         void CombatStart(Unit* target, bool initialAggro = true);
         void SetInCombatState(bool PvP, Unit* enemy = NULL);
         void SetInCombatWith(Unit* enemy);
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp
index d52e559c408..15f3c7811cd 100644
--- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp
@@ -132,8 +132,13 @@ inline void CreatureUnitRelocationWorker(Creature* c, Unit* u)
         return;
 
     if (c->HasReactState(REACT_AGGRESSIVE) && !c->HasUnitState(UNIT_STATE_SIGHTLESS))
+    {
         if (c->IsAIEnabled && c->CanSeeOrDetect(u, false, true))
             c->AI()->MoveInLineOfSight_Safe(u);
+        else
+            if (u->GetTypeId() == TYPEID_PLAYER && u->HasStealthAura() && c->IsAIEnabled && c->CanSeeOrDetect(u, false, true, true))
+                c->AI()->TriggerAlert(u);
+    }
 }
 
 void PlayerRelocationNotifier::Visit(PlayerMapType &m)
diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
index 78d86fb7abb..2aaaa719e94 100755
--- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
@@ -81,12 +81,23 @@ void RotateMovementGenerator::Finalize(Unit* unit)
 
 void DistractMovementGenerator::Initialize(Unit* owner)
 {
+    // Distracted creatures stand up if not standing
+    if (!owner->IsStandState())
+        owner->SetStandState(UNIT_STAND_STATE_STAND);
+
     owner->AddUnitState(UNIT_STATE_DISTRACTED);
 }
 
 void DistractMovementGenerator::Finalize(Unit* owner)
 {
     owner->ClearUnitState(UNIT_STATE_DISTRACTED);
+
+    // If this is a creature, then return orientation to original position (for idle movement creatures)
+    if (owner->GetTypeId() == TYPEID_UNIT && owner->ToCreature())
+    {
+        float angle = owner->ToCreature()->GetHomePosition().GetOrientation();
+        owner->SetFacingTo(angle);
+    }
 }
 
 bool DistractMovementGenerator::Update(Unit* /*owner*/, uint32 time_diff)
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 30c02db9150..a5901e1d2e1 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -2901,6 +2901,14 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect const* triggered
             triggeredByAura->GetBase()->SetDuration(0);
         }
 
+        if (m_caster->GetTypeId() == TYPEID_PLAYER)
+        {
+            m_caster->ToPlayer()->RestoreSpellMods(this);
+            // cleanup after mod system
+            // triggered spell pointer can be not removed in some cases
+            m_caster->ToPlayer()->SetSpellModTakingSpell(this, false);
+        }
+
         SendCastResult(result);
 
         finish(false);
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index c8a908f6930..7baef489865 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -1325,8 +1325,8 @@ public:
 
     static bool HandleMaxSkillCommand(ChatHandler* handler, char const* /*args*/)
     {
-        Player* SelectedPlayer = handler->getSelectedPlayer();
-        if (!SelectedPlayer)
+        Player* player = handler->getSelectedPlayerOrSelf();
+        if (!player)
         {
             handler->SendSysMessage(LANG_NO_CHAR_SELECTED);
             handler->SetSentErrorMessage(true);
@@ -1334,7 +1334,7 @@ public:
         }
 
         // each skills that have max skill value dependent from level seted to current level max skill value
-        SelectedPlayer->UpdateSkillsToMaxSkillsForLevel();
+        player->UpdateSkillsToMaxSkillsForLevel();
         return true;
     }
 
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
index 0b829c2c6dd..620eb54ffa9 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
@@ -123,11 +123,13 @@ class boss_bronjahm : public CreatureScript
 
             void JustSummoned(Creature* summon) override
             {
-                summons.Summon(summon);
-                summon->SetReactState(REACT_PASSIVE);
-                summon->GetMotionMaster()->Clear();
-                summon->GetMotionMaster()->MoveFollow(me, me->GetObjectSize(), 0.0f);
-                summon->CastSpell(summon, SPELL_PURPLE_BANISH_VISUAL, true);
+                if (summon->GetEntry() == NPC_CORRUPTED_SOUL_FRAGMENT)
+                {
+                    summons.Summon(summon);
+                    summon->SetReactState(REACT_PASSIVE);
+                    summon->GetMotionMaster()->MoveFollow(me, me->GetObjectSize(), 0.0f);
+                    summon->CastSpell(summon, SPELL_PURPLE_BANISH_VISUAL, true);
+                }
             }
 
             uint32 GetData(uint32 type) const override
@@ -223,9 +225,15 @@ class npc_corrupted_soul_fragment : public CreatureScript
                 instance = me->GetInstanceScript();
             }
 
+            void IsSummonedBy(Unit* /*summoner*/) override
+            {
+                if (Creature* bronjahm = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_BRONJAHM)))
+                    bronjahm->AI()->JustSummoned(me);
+            }
+
             void MovementInform(uint32 type, uint32 id) override
             {
-                if (type != CHASE_MOTION_TYPE)
+                if (type != FOLLOW_MOTION_TYPE)
                     return;
 
                 if (instance->GetGuidData(DATA_BRONJAHM).GetCounter() != id)
diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index 75df264360f..450dade68f8 100644
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@@ -213,6 +213,8 @@ class spell_hun_chimera_shot : public SpellScriptLoader
                                 basePoint = (aurEff->GetAmount() + aurEff->GetBonusAmount()) * aurEff->GetDonePct();
                                 ApplyPct(basePoint, TickCount * 40);
                                 basePoint = unitTarget->SpellDamageBonusTaken(caster, aura->GetSpellInfo(), basePoint, DOT, aura->GetStackAmount());
+                                if (Player* modOwner = caster->GetSpellModOwner())
+                                    modOwner->ApplySpellMod(aura->GetSpellInfo()->Id, SPELLMOD_DOT, basePoint);
 
                                 aurEff->SetBonusAmount(caster->SpellDamageBonusDone(unitTarget, aurEff->GetSpellInfo(), 0, DOT));
                             }