TDB 720.00 - 2016/04/18TDB720.00

4 files changed, 532 insertions, 111 deletions

diff --git a/sql/base/dev/DO_NOT_IMPORT_THESE_FILES.txt b/sql/base/dev/DO_NOT_IMPORT_THESE_FILES.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/sql/base/dev/DO_NOT_IMPORT_THESE_FILES.txt
diff --git a/sql/base/dev/README.TXT b/sql/base/dev/README.TXT
deleted file mode 100644
index 2717026f35b..00000000000
--- a/sql/base/dev/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-The file world_database.sql is intended to be used only by travis compile test system, don't import it, you will break your core.
diff --git a/sql/base/dev/hotfixes_database.sql b/sql/base/dev/hotfixes_database.sql
index fd6ddee9266..6f4fb59d5a7 100644
--- a/sql/base/dev/hotfixes_database.sql
+++ b/sql/base/dev/hotfixes_database.sql
@@ -31,13 +31,13 @@ CREATE TABLE `achievement` (
   `Supercedes` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Category` smallint(5) unsigned NOT NULL DEFAULT '0',
   `UIOrder` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `IconID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SharesCriteria` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CriteriaTree` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Faction` tinyint(4) NOT NULL DEFAULT '0',
   `Points` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MinimumCriteria` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -263,6 +263,8 @@ CREATE TABLE `artifact` (
   `SpecID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ArtifactCategoryID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `UiModelSceneID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellVisualKitID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -282,13 +284,13 @@ CREATE TABLE `artifact_appearance` (
   `ModelAlpha` float NOT NULL DEFAULT '0',
   `ShapeshiftDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
   `ArtifactAppearanceSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PlayerConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Unknown` smallint(5) unsigned NOT NULL DEFAULT '0',
   `DisplayIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AppearanceModID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ModifiesShapeshiftFormDisplay` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemAppearanceID` int(10) unsigned NOT NULL DEFAULT '0',
   `AltItemAppearanceID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
@@ -396,6 +398,7 @@ CREATE TABLE `artifact_power` (
   `ArtifactID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MaxRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ArtifactTier` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `RelicType` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
@@ -616,6 +619,8 @@ CREATE TABLE `battle_pet_species` (
   `PetType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Source` tinyint(4) NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CardModelSceneID` int(10) unsigned NOT NULL DEFAULT '0',
+  `LoadoutModelSceneID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -667,6 +672,8 @@ CREATE TABLE `battlemaster_list` (
   `Name` text,
   `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `GameType` text,
+  `ShortDescription` text,
+  `LongDescription` text,
   `MapID1` smallint(6) NOT NULL DEFAULT '0',
   `MapID2` smallint(6) NOT NULL DEFAULT '0',
   `MapID3` smallint(6) NOT NULL DEFAULT '0',
@@ -711,6 +718,8 @@ CREATE TABLE `battlemaster_list_locale` (
   `locale` varchar(4) NOT NULL,
   `Name_lang` text,
   `GameType_lang` text,
+  `ShortDescription_lang` text,
+  `LongDescription_lang` text,
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -913,6 +922,7 @@ CREATE TABLE `chr_classes` (
   `Filename` text,
   `CreateScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `SelectScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `LowResScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CinematicSequenceID` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -922,7 +932,6 @@ CREATE TABLE `chr_classes` (
   `AttackPowerPerStrength` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AttackPowerPerAgility` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RangedAttackPowerPerAgility` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `IconFileDataID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Unk1` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
@@ -992,14 +1001,11 @@ CREATE TABLE `chr_races` (
   `FemaleCustomizeOffset3` float NOT NULL DEFAULT '0',
   `LowResScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `FactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ExplorationSoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MaleDisplayID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `FemaleDisplayID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ResSicknessSpellID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SplashSoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CinematicSequenceID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `UAMaleCreatureSoundDataID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `UAFemaleCreatureSoundDataID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `BaseLanguage` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CreatureType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `TeamID` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -1051,14 +1057,13 @@ CREATE TABLE `chr_specialization` (
   `Name` text,
   `Name2` text,
   `Description` text,
-  `BackgroundFile` text,
-  `SpellIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ClassID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `PetTalentType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Role` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `PrimaryStatOrder` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `AnimReplacementSetID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
@@ -1134,6 +1139,26 @@ CREATE TABLE `chr_upgrade_tier` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `cinematic_camera`
+--
+
+DROP TABLE IF EXISTS `cinematic_camera`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `cinematic_camera` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SoundID` int(10) unsigned NOT NULL DEFAULT '0',
+  `OriginX` float NOT NULL DEFAULT '0',
+  `OriginY` float NOT NULL DEFAULT '0',
+  `OriginZ` float NOT NULL DEFAULT '0',
+  `OriginFacing` float NOT NULL DEFAULT '0',
+  `ModelFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `cinematic_sequences`
 --
 
@@ -1142,7 +1167,7 @@ DROP TABLE IF EXISTS `cinematic_sequences`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `cinematic_sequences` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SoundID` int(10) unsigned NOT NULL DEFAULT '0',
   `Camera1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Camera2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Camera3` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -1225,29 +1250,30 @@ DROP TABLE IF EXISTS `creature_display_info`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature_display_info` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ExtendedDisplayInfoID` int(10) unsigned NOT NULL DEFAULT '0',
   `CreatureModelScale` float NOT NULL DEFAULT '0',
-  `PlayerModelScale` float NOT NULL DEFAULT '0',
+  `ModelID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `NPCSoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SizeClass` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Gender` tinyint(4) NOT NULL DEFAULT '0',
+  `ExtendedDisplayInfoID` int(10) unsigned NOT NULL DEFAULT '0',
   `TextureVariation1` int(10) unsigned NOT NULL DEFAULT '0',
   `TextureVariation2` int(10) unsigned NOT NULL DEFAULT '0',
   `TextureVariation3` int(10) unsigned NOT NULL DEFAULT '0',
-  `PortraitTextureName` text,
-  `PortraitCreatureDisplayInfoID` int(10) unsigned NOT NULL DEFAULT '0',
-  `CreatureGeosetData` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateSpellVisualKitID` int(10) unsigned NOT NULL DEFAULT '0',
-  `InstanceOtherPlayerPetScale` float NOT NULL DEFAULT '0',
-  `ModelID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PortraitTextureFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureModelAlpha` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `NPCSoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PlayerModelScale` float NOT NULL DEFAULT '0',
+  `PortraitCreatureDisplayInfoID` int(10) unsigned NOT NULL DEFAULT '0',
+  `BloodID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ParticleColorID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CreatureGeosetData` int(10) unsigned NOT NULL DEFAULT '0',
   `ObjectEffectPackageID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `AnimReplacementSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CreatureModelAlpha` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `SizeClass` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `BloodID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `Gender` tinyint(4) NOT NULL DEFAULT '0',
-  `Unk700` tinyint(4) NOT NULL DEFAULT '0',
+  `UnarmedWeaponSubclass` tinyint(4) NOT NULL DEFAULT '0',
+  `StateSpellVisualKitID` int(10) unsigned NOT NULL DEFAULT '0',
+  `InstanceOtherPlayerPetScale` float NOT NULL DEFAULT '0',
+  `MountSpellVisualKitID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1293,7 +1319,7 @@ CREATE TABLE `creature_family` (
   `MinScale` float NOT NULL DEFAULT '0',
   `MaxScale` float NOT NULL DEFAULT '0',
   `Name` text,
-  `IconFile` text,
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `SkillLine1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SkillLine2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `PetFoodMask` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -1361,8 +1387,6 @@ CREATE TABLE `creature_model_data` (
   `FoleyMaterialID` int(10) unsigned NOT NULL DEFAULT '0',
   `FootstepEffectID` int(10) unsigned NOT NULL DEFAULT '0',
   `DeathThudEffectID` int(10) unsigned NOT NULL DEFAULT '0',
-  `FootstepShakeSize` int(10) unsigned NOT NULL DEFAULT '0',
-  `DeathThudShakeSize` int(10) unsigned NOT NULL DEFAULT '0',
   `SoundID` int(10) unsigned NOT NULL DEFAULT '0',
   `CreatureGeosetDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
@@ -1436,12 +1460,12 @@ DROP TABLE IF EXISTS `criteria_tree`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `criteria_tree` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `CriteriaID` int(10) unsigned NOT NULL DEFAULT '0',
   `Amount` int(10) unsigned NOT NULL DEFAULT '0',
   `Description` text,
   `Parent` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Operator` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CriteriaID` int(10) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -1586,6 +1610,9 @@ DROP TABLE IF EXISTS `difficulty`;
 CREATE TABLE `difficulty` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
+  `GroupSizeHealthCurveID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `GroupSizeDmgCurveID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `GroupSizeSpellPointsCurveID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `FallbackDifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `InstanceType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MinPlayers` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -1593,9 +1620,6 @@ CREATE TABLE `difficulty` (
   `OldEnumValue` tinyint(4) NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ToggleDifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `GroupSizeHealthCurveID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `GroupSizeDmgCurveID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `GroupSizeSpellPointsCurveID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ItemBonusTreeModID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
@@ -1627,15 +1651,15 @@ DROP TABLE IF EXISTS `dungeon_encounter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `dungeon_encounter` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
   `CreatureDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
   `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SpellIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Bit` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` int(11) NOT NULL DEFAULT '0',
+  `TextureFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1824,6 +1848,7 @@ CREATE TABLE `faction` (
   `ReputationFlags3` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ReputationFlags4` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ParentFactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ParagonFactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ParentFactionCapIn` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ParentFactionCapOut` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Expansion` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -2081,7 +2106,7 @@ CREATE TABLE `garr_class_spec` (
   `NameFemale` text,
   `NameGenderless` text,
   `ClassAtlasID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `GarrFollItemSetID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `GarrFollItemSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Limit` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
@@ -2124,6 +2149,7 @@ CREATE TABLE `garr_follower` (
   `AlliancePortraitIconID` int(10) unsigned NOT NULL DEFAULT '0',
   `HordeAddedBroadcastTextID` int(10) unsigned NOT NULL DEFAULT '0',
   `AllianceAddedBroadcastTextID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
   `HordeGarrFollItemSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `AllianceGarrFollItemSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemLevelWeapon` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2164,6 +2190,7 @@ CREATE TABLE `garr_follower_locale` (
   `locale` varchar(4) NOT NULL,
   `HordeSourceText_lang` text,
   `AllianceSourceText_lang` text,
+  `Name_lang` text,
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2285,11 +2312,11 @@ CREATE TABLE `garr_site_level` (
   `TownHallY` float NOT NULL DEFAULT '0',
   `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SiteID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MovieID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `UpgradeResourceCost` smallint(5) unsigned NOT NULL DEFAULT '0',
   `UpgradeMoneyCost` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `UITextureKitID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MovieID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Level2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -2537,11 +2564,11 @@ CREATE TABLE `holidays` (
   `CalendarFlags8` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CalendarFlags9` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CalendarFlags10` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `HolidayNameID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `HolidayDescriptionID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Priority` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CalendarFilterType` tinyint(4) NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `HolidayNameID` int(10) unsigned NOT NULL DEFAULT '0',
+  `HolidayDescriptionID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2806,6 +2833,7 @@ CREATE TABLE `item_bonus_tree_node` (
   `BonusTreeID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SubTreeID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `BonusListID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemLevelSelectorID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `BonusTreeModID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -2840,6 +2868,7 @@ CREATE TABLE `item_class` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `PriceMod` float NOT NULL DEFAULT '0',
   `Name` text,
+  `OldEnumValue` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -3344,9 +3373,9 @@ CREATE TABLE `item_sparse` (
   `Flags3` int(10) unsigned NOT NULL DEFAULT '0',
   `Unk1` float NOT NULL DEFAULT '0',
   `Unk2` float NOT NULL DEFAULT '0',
+  `BuyCount` int(10) unsigned NOT NULL DEFAULT '0',
   `BuyPrice` int(10) unsigned NOT NULL DEFAULT '0',
   `SellPrice` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllowableClass` int(11) NOT NULL DEFAULT '0',
   `AllowableRace` int(11) NOT NULL DEFAULT '0',
   `RequiredSpell` int(10) unsigned NOT NULL DEFAULT '0',
   `MaxCount` int(10) unsigned NOT NULL DEFAULT '0',
@@ -3381,6 +3410,7 @@ CREATE TABLE `item_sparse` (
   `ArmorDamageModifier` float NOT NULL DEFAULT '0',
   `Duration` int(10) unsigned NOT NULL DEFAULT '0',
   `StatScalingFactor` float NOT NULL DEFAULT '0',
+  `AllowableClass` smallint(6) NOT NULL DEFAULT '0',
   `ItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredSkill` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -3405,13 +3435,14 @@ CREATE TABLE `item_sparse` (
   `ItemSet` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Area` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Map` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `TotemCategory` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SocketBonus` smallint(5) unsigned NOT NULL DEFAULT '0',
   `GemProperties` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemLimitCategory` smallint(5) unsigned NOT NULL DEFAULT '0',
   `HolidayID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredTransmogHolidayID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemNameDescriptionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Quality` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `BuyCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `InventoryType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RequiredLevel` tinyint(4) NOT NULL DEFAULT '0',
   `RequiredHonorRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -3434,7 +3465,6 @@ CREATE TABLE `item_sparse` (
   `PageMaterial` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Material` tinyint(4) NOT NULL DEFAULT '0',
   `Sheath` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `TotemCategory` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SocketColor1` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SocketColor2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SocketColor3` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -3596,7 +3626,7 @@ CREATE TABLE `lfg_dungeons` (
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `TextureFilename` text,
   `Description` text,
-  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinItemLevel` float NOT NULL DEFAULT '0',
   `MaxLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `TargetLevelMax` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MapID` smallint(6) NOT NULL DEFAULT '0',
@@ -3605,6 +3635,7 @@ CREATE TABLE `lfg_dungeons` (
   `LastBossJournalEncounterID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `BonusReputationAmount` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MentorItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MinLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `TargetLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `TargetLevelMin` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -3848,6 +3879,8 @@ CREATE TABLE `map` (
   `MapName` text,
   `MapDescription0` text,
   `MapDescription1` text,
+  `ShortDescription` text,
+  `LongDescription` text,
   `AreaTableID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `LoadingScreenID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CorpseMapID` smallint(6) NOT NULL DEFAULT '0',
@@ -3916,6 +3949,8 @@ CREATE TABLE `map_locale` (
   `MapName_lang` text,
   `MapDescription0_lang` text,
   `MapDescription1_lang` text,
+  `ShortDescription_lang` text,
+  `LongDescription_lang` text,
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3951,16 +3986,16 @@ DROP TABLE IF EXISTS `mount`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `mount` (
   `SpellId` int(10) unsigned NOT NULL DEFAULT '0',
-  `DisplayId` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
   `Description` text,
   `SourceDescription` text,
   `CameraPivotMultiplier` float NOT NULL DEFAULT '0',
   `MountTypeId` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PlayerConditionId` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Source` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionId` int(10) unsigned NOT NULL DEFAULT '0',
+  `UiModelSceneID` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -4023,6 +4058,23 @@ CREATE TABLE `mount_type_x_capability` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `mount_x_display`
+--
+
+DROP TABLE IF EXISTS `mount_x_display`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mount_x_display` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MountID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DisplayID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `movie`
 --
 
@@ -4329,8 +4381,9 @@ CREATE TABLE `player_condition` (
   `PhaseGroupID` int(10) unsigned NOT NULL DEFAULT '0',
   `MinAvgItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
   `MaxAvgItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `Unknown7001` int(11) NOT NULL DEFAULT '0',
-  `Unknown7002` int(11) NOT NULL DEFAULT '0',
+  `MovementFlags1` int(11) NOT NULL DEFAULT '0',
+  `MovementFlags2` int(11) NOT NULL DEFAULT '0',
+  `MainHandItemSubclassMask` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -4474,8 +4527,8 @@ CREATE TABLE `quest_package_item` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `QuestPackageID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ItemCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `FilterType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ItemCount` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -4615,6 +4668,80 @@ CREATE TABLE `scaling_stat_distribution` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `scenario`
+--
+
+DROP TABLE IF EXISTS `scenario`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scenario` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `Data` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `scenario_locale`
+--
+
+DROP TABLE IF EXISTS `scenario_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scenario_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `scenario_step`
+--
+
+DROP TABLE IF EXISTS `scenario_step`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scenario_step` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Description` text,
+  `Name` text,
+  `CriteriaTreeID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ScenarioID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PreviousStepID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `QuestRewardID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Step` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BonusRequiredStepID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `scenario_step_locale`
+--
+
+DROP TABLE IF EXISTS `scenario_step_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scenario_step_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Description_lang` text,
+  `Name_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `scene_script`
 --
 
@@ -4659,10 +4786,10 @@ CREATE TABLE `skill_line` (
   `DisplayName` text,
   `Description` text,
   `AlternateVerb` text,
-  `SpellIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CategoryID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CanLink` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `ParentSkillLineID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -4681,7 +4808,6 @@ CREATE TABLE `skill_line_ability` (
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `RaceMask` int(10) unsigned NOT NULL DEFAULT '0',
   `SupercedesSpell` int(10) unsigned NOT NULL DEFAULT '0',
-  `Unknown703` int(10) unsigned NOT NULL DEFAULT '0',
   `SkillLine` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MinSkillLineRank` smallint(5) unsigned NOT NULL DEFAULT '0',
   `TrivialSkillLineRankHigh` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -4690,6 +4816,7 @@ CREATE TABLE `skill_line_ability` (
   `TradeSkillCategoryID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `AcquireMethod` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `NumSkillUps` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Unknown703` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ClassMask` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -5030,7 +5157,7 @@ CREATE TABLE `spell_duration` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Duration` int(11) NOT NULL DEFAULT '0',
   `MaxDuration` int(11) NOT NULL DEFAULT '0',
-  `DurationPerLevel` smallint(6) NOT NULL DEFAULT '0',
+  `DurationPerLevel` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5044,37 +5171,38 @@ DROP TABLE IF EXISTS `spell_effect`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_effect` (
-  `EffectAmplitude` float NOT NULL DEFAULT '0',
-  `EffectBonusCoefficient` float NOT NULL DEFAULT '0',
-  `EffectChainAmplitude` float NOT NULL DEFAULT '0',
-  `EffectPointsPerResource` float NOT NULL DEFAULT '0',
-  `EffectRealPointsPerLevel` float NOT NULL DEFAULT '0',
   `EffectSpellClassMask1` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectSpellClassMask2` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectSpellClassMask3` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectSpellClassMask4` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectPosFacing` float NOT NULL DEFAULT '0',
-  `BonusCoefficientFromAP` float NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `DifficultyID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `Effect` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectAura` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectAuraPeriod` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectBasePoints` int(11) NOT NULL DEFAULT '0',
-  `EffectChainTargets` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectDieSides` int(11) NOT NULL DEFAULT '0',
-  `EffectItemType` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectMechanic` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectIndex` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectMiscValue` int(11) NOT NULL DEFAULT '0',
   `EffectMiscValueB` int(11) NOT NULL DEFAULT '0',
   `EffectRadiusIndex` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectRadiusMaxIndex` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectTriggerSpell` int(10) unsigned NOT NULL DEFAULT '0',
   `ImplicitTarget1` int(10) unsigned NOT NULL DEFAULT '0',
   `ImplicitTarget2` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `DifficultyID` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectAmplitude` float NOT NULL DEFAULT '0',
+  `EffectAuraPeriod` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectBonusCoefficient` float NOT NULL DEFAULT '0',
+  `EffectChainAmplitude` float NOT NULL DEFAULT '0',
+  `EffectChainTargets` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectDieSides` int(11) NOT NULL DEFAULT '0',
+  `EffectItemType` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectMechanic` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectPointsPerResource` float NOT NULL DEFAULT '0',
+  `EffectRealPointsPerLevel` float NOT NULL DEFAULT '0',
+  `EffectTriggerSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectPosFacing` float NOT NULL DEFAULT '0',
   `EffectAttributes` int(10) unsigned NOT NULL DEFAULT '0',
+  `BonusCoefficientFromAP` float NOT NULL DEFAULT '0',
+  `PvPMultiplier` float NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5369,9 +5497,9 @@ CREATE TABLE `spell_misc` (
   `CastingTimeIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
   `DurationIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RangeIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SpellIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ActiveIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SchoolMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ActiveIconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5592,23 +5720,23 @@ CREATE TABLE `spell_shapeshift_form` (
   `Name` text,
   `WeaponDamageVariance` float NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `AttackIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CombatRoundTime` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CreatureDisplayID1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CreatureDisplayID2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CreatureDisplayID3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CreatureDisplayID4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID5` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID6` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID7` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID8` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MountTypeID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CreatureType` tinyint(4) NOT NULL DEFAULT '0',
   `BonusActionBar` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `AttackIconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureDisplayID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureDisplayID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureDisplayID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureDisplayID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID5` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID6` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID7` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID8` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5680,13 +5808,18 @@ DROP TABLE IF EXISTS `spell_x_spell_visual`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_x_spell_visual` (
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Unk620` float NOT NULL DEFAULT '0',
-  `SpellVisualID1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SpellVisualID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SpellVisualID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Chance` float NOT NULL DEFAULT '0',
+  `CasterPlayerConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CasterUnitConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `PlayerConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `UnitConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ActiveIconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Priority` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -6372,4 +6505,4 @@ CREATE TABLE `world_safe_locs_locale` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-10-16 17:35:49
+-- Dump completed on 2017-04-19  0:03:47
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index c9eab04e25e..d601f8518c0 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -1,6 +1,6 @@
 -- MySQL dump 10.16  Distrib 10.1.6-MariaDB, for Win64 (AMD64)
 --
--- Host: localhost    Database: world6
+-- Host: localhost    Database: world
 -- ------------------------------------------------------
 -- Server version	5.7.14-log
 
@@ -136,6 +136,64 @@ CREATE TABLE `areatrigger_teleport` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `areatrigger_template`
+--
+
+DROP TABLE IF EXISTS `areatrigger_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `areatrigger_template` (
+  `Id` int(10) unsigned NOT NULL,
+  `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data0` float NOT NULL DEFAULT '0',
+  `Data1` float NOT NULL DEFAULT '0',
+  `Data2` float NOT NULL DEFAULT '0',
+  `Data3` float NOT NULL DEFAULT '0',
+  `Data4` float NOT NULL DEFAULT '0',
+  `Data5` float NOT NULL DEFAULT '0',
+  `ScriptName` char(64) NOT NULL DEFAULT '',
+  `VerifiedBuild` int(10) 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 `areatrigger_template_actions`
+--
+
+DROP TABLE IF EXISTS `areatrigger_template_actions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `areatrigger_template_actions` (
+  `AreaTriggerId` int(10) unsigned NOT NULL,
+  `ActionType` int(10) unsigned NOT NULL,
+  `ActionParam` int(10) unsigned NOT NULL,
+  `TargetType` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`AreaTriggerId`,`ActionType`,`ActionParam`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `areatrigger_template_polygon_vertices`
+--
+
+DROP TABLE IF EXISTS `areatrigger_template_polygon_vertices`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `areatrigger_template_polygon_vertices` (
+  `AreaTriggerId` int(10) unsigned NOT NULL,
+  `Idx` int(10) unsigned NOT NULL,
+  `VerticeX` float NOT NULL DEFAULT '0',
+  `VerticeY` float NOT NULL DEFAULT '0',
+  `VerticeTargetX` float DEFAULT NULL,
+  `VerticeTargetY` float DEFAULT NULL,
+  `VerifiedBuild` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`AreaTriggerId`,`Idx`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `battle_pet_breeds`
 --
 
@@ -221,6 +279,37 @@ CREATE TABLE `blackmarket_template` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `character_template`
+--
+
+DROP TABLE IF EXISTS `character_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_template` (
+  `Id` int(10) unsigned NOT NULL,
+  `Name` varchar(70) NOT NULL,
+  `Description` varchar(100) NOT NULL,
+  `Level` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  PRIMARY KEY (`Id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `character_template_class`
+--
+
+DROP TABLE IF EXISTS `character_template_class`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_template_class` (
+  `TemplateId` int(10) unsigned NOT NULL,
+  `FactionGroup` tinyint(3) unsigned NOT NULL COMMENT '3 - Alliance, 5 - Horde',
+  `Class` tinyint(3) unsigned NOT NULL,
+  PRIMARY KEY (`TemplateId`,`FactionGroup`,`Class`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `class_expansion_requirement`
 --
 
@@ -307,6 +396,7 @@ CREATE TABLE `creature` (
   `npcflag` bigint(20) unsigned NOT NULL DEFAULT '0',
   `unit_flags` int(10) unsigned NOT NULL DEFAULT '0',
   `dynamicflags` int(10) unsigned NOT NULL DEFAULT '0',
+  `ScriptName` char(64) DEFAULT '',
   `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`guid`),
   KEY `idx_map` (`map`),
@@ -372,8 +462,14 @@ CREATE TABLE `creature_equip_template` (
   `CreatureID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `ID` tinyint(3) unsigned NOT NULL DEFAULT '1',
   `ItemID1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `AppearanceModID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemVisual1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemID2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `AppearanceModID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemVisual2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemID3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `AppearanceModID3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemVisual3` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`CreatureID`,`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1049,7 +1145,7 @@ CREATE TABLE `game_tele` (
   `map` smallint(5) unsigned NOT NULL DEFAULT '0',
   `name` varchar(100) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1575 DEFAULT CHARSET=utf8 COMMENT='Tele Command';
+) ENGINE=MyISAM AUTO_INCREMENT=1584 DEFAULT CHARSET=utf8 COMMENT='Tele Command';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1105,6 +1201,7 @@ CREATE TABLE `gameobject` (
   `spawntimesecs` int(11) NOT NULL DEFAULT '0',
   `animprogress` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `state` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ScriptName` char(64) DEFAULT '',
   `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`guid`)
 ) ENGINE=MyISAM AUTO_INCREMENT=255094 DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Gameobject System';
@@ -1119,6 +1216,10 @@ DROP TABLE IF EXISTS `gameobject_addon`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `gameobject_addon` (
   `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `parent_rotation0` float NOT NULL DEFAULT '0',
+  `parent_rotation1` float NOT NULL DEFAULT '0',
+  `parent_rotation2` float NOT NULL DEFAULT '0',
+  `parent_rotation3` float NOT NULL DEFAULT '1',
   `invisibilityType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `invisibilityValue` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`)
@@ -1333,6 +1434,7 @@ DROP TABLE IF EXISTS `gossip_menu`;
 CREATE TABLE `gossip_menu` (
   `entry` smallint(5) unsigned NOT NULL DEFAULT '0',
   `text_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
   PRIMARY KEY (`entry`,`text_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1358,6 +1460,7 @@ CREATE TABLE `gossip_menu_option` (
   `box_money` int(10) unsigned NOT NULL DEFAULT '0',
   `box_text` text,
   `BoxBroadcastTextID` mediumint(6) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
   PRIMARY KEY (`menu_id`,`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1449,10 +1552,11 @@ DROP TABLE IF EXISTS `item_enchantment_template`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_enchantment_template` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `ench` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `entry` int(10) unsigned NOT NULL DEFAULT '0',
+  `type` tinyint(3) unsigned NOT NULL,
+  `ench` int(10) unsigned NOT NULL DEFAULT '0',
   `chance` float unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`entry`,`ench`)
+  PRIMARY KEY (`entry`,`type`,`ench`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Item Random Enchantment System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1777,6 +1881,7 @@ CREATE TABLE `npc_trainer` (
   `ReqSkillLine` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ReqSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ReqLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Index` tinyint(3) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`SpellID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2318,6 +2423,20 @@ CREATE TABLE `quest_greeting` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `quest_mail_sender`
+--
+
+DROP TABLE IF EXISTS `quest_mail_sender`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_mail_sender` (
+  `QuestId` int(5) unsigned NOT NULL DEFAULT '0',
+  `RewardMailSenderEntry` int(5) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`QuestId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `quest_objectives`
 --
 
@@ -2332,6 +2451,7 @@ CREATE TABLE `quest_objectives` (
   `ObjectID` int(10) NOT NULL DEFAULT '0',
   `Amount` int(10) NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags2` int(10) unsigned NOT NULL DEFAULT '0',
   `ProgressBarWeight` float NOT NULL DEFAULT '0',
   `Description` text,
   `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
@@ -2381,6 +2501,22 @@ CREATE TABLE `quest_offer_reward` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `quest_offer_reward_locale`
+--
+
+DROP TABLE IF EXISTS `quest_offer_reward_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_offer_reward_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `RewardText` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `quest_poi`
 --
 
@@ -2447,6 +2583,22 @@ CREATE TABLE `quest_request_items` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `quest_request_items_locale`
+--
+
+DROP TABLE IF EXISTS `quest_request_items_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_request_items_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `CompletionText` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `quest_template`
 --
 
@@ -2560,6 +2712,7 @@ CREATE TABLE `quest_template` (
   `TimeAllowed` int(10) unsigned NOT NULL DEFAULT '0',
   `AllowableRaces` int(11) NOT NULL DEFAULT '-1',
   `QuestRewardID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Expansion` int(11) NOT NULL DEFAULT '0',
   `LogTitle` text,
   `LogDescription` text,
   `QuestDescription` text,
@@ -2728,6 +2881,65 @@ CREATE TABLE `reputation_spillover_template` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `scenario_poi`
+--
+
+DROP TABLE IF EXISTS `scenario_poi`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scenario_poi` (
+  `CriteriaTreeID` int(11) NOT NULL DEFAULT '0',
+  `BlobIndex` int(11) NOT NULL DEFAULT '0',
+  `Idx1` int(11) NOT NULL DEFAULT '0',
+  `MapID` int(11) NOT NULL DEFAULT '0',
+  `WorldMapAreaId` int(11) NOT NULL DEFAULT '0',
+  `Floor` int(11) NOT NULL DEFAULT '0',
+  `Priority` int(11) NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
+  `WorldEffectID` int(11) NOT NULL DEFAULT '0',
+  `PlayerConditionID` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) DEFAULT '0',
+  PRIMARY KEY (`CriteriaTreeID`,`BlobIndex`,`Idx1`),
+  KEY `idx` (`CriteriaTreeID`,`BlobIndex`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `scenario_poi_points`
+--
+
+DROP TABLE IF EXISTS `scenario_poi_points`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scenario_poi_points` (
+  `CriteriaTreeID` int(11) NOT NULL DEFAULT '0',
+  `Idx1` int(11) NOT NULL DEFAULT '0',
+  `Idx2` int(11) 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 (`CriteriaTreeID`,`Idx1`,`Idx2`),
+  KEY `questId_id` (`CriteriaTreeID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `scenarios`
+--
+
+DROP TABLE IF EXISTS `scenarios`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scenarios` (
+  `map` int(10) unsigned NOT NULL DEFAULT '0',
+  `difficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `scenario_A` int(10) unsigned NOT NULL DEFAULT '0',
+  `scenario_H` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`map`,`difficulty`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `scene_template`
 --
 
@@ -2744,6 +2956,42 @@ CREATE TABLE `scene_template` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `script_spline_chain_meta`
+--
+
+DROP TABLE IF EXISTS `script_spline_chain_meta`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `script_spline_chain_meta` (
+  `entry` int(10) unsigned NOT NULL,
+  `chainId` smallint(5) unsigned NOT NULL,
+  `splineId` tinyint(3) unsigned NOT NULL,
+  `expectedDuration` int(10) unsigned NOT NULL,
+  `msUntilNext` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`entry`,`chainId`,`splineId`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `script_spline_chain_waypoints`
+--
+
+DROP TABLE IF EXISTS `script_spline_chain_waypoints`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `script_spline_chain_waypoints` (
+  `entry` int(10) unsigned NOT NULL,
+  `chainId` smallint(5) unsigned NOT NULL,
+  `splineId` tinyint(3) unsigned NOT NULL,
+  `wpId` tinyint(3) unsigned NOT NULL,
+  `x` float NOT NULL,
+  `y` float NOT NULL,
+  `z` float NOT NULL,
+  PRIMARY KEY (`entry`,`chainId`,`splineId`,`wpId`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `script_waypoint`
 --
 
@@ -2890,11 +3138,12 @@ CREATE TABLE `smart_scripts` (
   `event_type` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `event_phase_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `event_chance` tinyint(3) unsigned NOT NULL DEFAULT '100',
-  `event_flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `event_flags` smallint(3) unsigned NOT NULL DEFAULT '0',
   `event_param1` int(10) unsigned NOT NULL DEFAULT '0',
   `event_param2` int(10) unsigned NOT NULL DEFAULT '0',
   `event_param3` int(10) unsigned NOT NULL DEFAULT '0',
   `event_param4` int(10) unsigned NOT NULL DEFAULT '0',
+  `event_param_string` varchar(255) NOT NULL DEFAULT '',
   `action_type` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `action_param1` int(10) unsigned NOT NULL DEFAULT '0',
   `action_param2` int(10) unsigned NOT NULL DEFAULT '0',
@@ -2938,6 +3187,46 @@ CREATE TABLE `spell_area` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `spell_areatrigger`
+--
+
+DROP TABLE IF EXISTS `spell_areatrigger`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_areatrigger` (
+  `SpellMiscId` int(10) unsigned NOT NULL,
+  `AreaTriggerId` int(10) unsigned NOT NULL,
+  `MoveCurveId` int(10) unsigned NOT NULL DEFAULT '0',
+  `ScaleCurveId` int(10) unsigned NOT NULL DEFAULT '0',
+  `MorphCurveId` int(10) unsigned NOT NULL DEFAULT '0',
+  `FacingCurveId` int(10) unsigned NOT NULL DEFAULT '0',
+  `DecalPropertiesId` int(10) unsigned NOT NULL DEFAULT '0',
+  `TimeToTarget` int(10) unsigned NOT NULL DEFAULT '0',
+  `TimeToTargetScale` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`SpellMiscId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `spell_areatrigger_splines`
+--
+
+DROP TABLE IF EXISTS `spell_areatrigger_splines`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_areatrigger_splines` (
+  `SpellMiscId` int(10) unsigned NOT NULL,
+  `Idx` int(10) unsigned NOT NULL,
+  `X` float NOT NULL DEFAULT '0',
+  `Y` float NOT NULL DEFAULT '0',
+  `Z` float NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`SpellMiscId`,`Idx`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `spell_custom_attr`
 --
 
@@ -3109,23 +3398,23 @@ DROP TABLE IF EXISTS `spell_proc`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_proc` (
-  `spellId` mediumint(8) NOT NULL DEFAULT '0',
-  `schoolMask` tinyint(4) NOT NULL DEFAULT '0',
-  `spellFamilyName` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `spellFamilyMask0` int(10) unsigned NOT NULL DEFAULT '0',
-  `spellFamilyMask1` int(10) unsigned NOT NULL DEFAULT '0',
-  `spellFamilyMask2` int(10) unsigned NOT NULL DEFAULT '0',
-  `spellFamilyMask3` int(10) unsigned NOT NULL DEFAULT '0',
-  `typeMask` int(10) unsigned NOT NULL DEFAULT '0',
-  `spellTypeMask` int(10) unsigned NOT NULL DEFAULT '0',
-  `spellPhaseMask` int(11) NOT NULL DEFAULT '0',
-  `hitMask` int(11) NOT NULL DEFAULT '0',
-  `attributesMask` int(10) unsigned NOT NULL DEFAULT '0',
-  `ratePerMinute` float NOT NULL DEFAULT '0',
-  `chance` float NOT NULL DEFAULT '0',
-  `cooldown` float unsigned NOT NULL DEFAULT '0',
-  `charges` int(10) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`spellId`)
+  `SpellId` int(11) NOT NULL DEFAULT '0',
+  `SchoolMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyName` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyMask0` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyMask1` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyMask2` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyMask3` int(10) unsigned NOT NULL DEFAULT '0',
+  `ProcFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellTypeMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellPhaseMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `HitMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `ProcsPerMinute` float NOT NULL DEFAULT '0',
+  `Chance` float NOT NULL DEFAULT '0',
+  `Cooldown` int(10) unsigned NOT NULL DEFAULT '0',
+  `Charges` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`SpellId`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -3539,4 +3828,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-10-16 17:35:48
+-- Dump completed on 2017-04-19  0:03:47