Merge branch 'bfa'

sql/base/characters_database.sql

@@ -1095,9 +1095,12 @@ DROP TABLE IF EXISTS `character_pvp_talent`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `character_pvp_talent` (
   `guid` bigint(20) unsigned NOT NULL,
-  `talentId` mediumint(8) unsigned NOT NULL,
+  `talentId0` int(10) unsigned NOT NULL,
+  `talentId1` int(10) unsigned NOT NULL,
+  `talentId2` int(10) unsigned NOT NULL,
+  `talentId3` int(10) unsigned NOT NULL,
   `talentGroup` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`guid`,`talentId`,`talentGroup`)
+  PRIMARY KEY (`guid`,`talentGroup`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1731,7 +1734,6 @@ CREATE TABLE `characters` (
   `deleteDate` int(10) unsigned DEFAULT NULL,
   `honor` int(10) unsigned NOT NULL DEFAULT '0',
   `honorLevel` int(10) unsigned NOT NULL DEFAULT '1',
-  `prestigeLevel` int(10) unsigned NOT NULL DEFAULT '0',
   `honorRestState` tinyint(3) unsigned NOT NULL DEFAULT '2',
   `honorRestBonus` float NOT NULL DEFAULT '0',
   `lastLoginBuild` int(10) unsigned NOT NULL DEFAULT '0',
@@ -3566,7 +3568,10 @@ INSERT INTO `updates` VALUES
 ('2018_03_04_00_characters.sql','2A4CD2EE2547E718490706FADC78BF36F0DED8D6','RELEASED','2018-03-04 18:15:24',0),
 ('2018_04_28_00_characters.sql','CBD0FDC0F32DE3F456F7CE3D9CAD6933CD6A50F5','RELEASED','2018-04-28 12:44:09',0),
 ('2018_07_28_00_characters.sql','31F66AE7831251A8915625EC7F10FA138AB8B654','RELEASED','2018-07-28 18:30:19',0),
-('2018_07_31_00_characters.sql','7DA8D4A4534520B23E6F5BBD5B8EE205B799C798','RELEASED','2018-07-31 20:54:39',0);
+('2018_07_31_00_characters.sql','7DA8D4A4534520B23E6F5BBD5B8EE205B799C798','RELEASED','2018-07-31 20:54:39',0),
+('2018_12_09_00_characters.sql','7FE9641C93ED762597C08F1E9B6649C9EC2F0E47','RELEASED','2018-09-18 23:34:29',0),
+('2018_12_09_01_characters.sql','C80B936AAD94C58A0F33382CED08CFB4E0B6AC34','RELEASED','2018-10-10 22:05:28',0),
+('2018_12_09_02_characters.sql','DBBA0C06985CE8AC4E6E7E94BD6B2673E9ADFAE2','RELEASED','2018-12-02 17:32:31',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 

sql/updates/characters/master/2018_12_09_00_characters.sql

@@ -0,0 +1,8 @@
+TRUNCATE `character_pvp_talent`;
+ALTER TABLE `character_pvp_talent`
+  DROP PRIMARY KEY,
+  CHANGE `talentId` `talentId0` int(10) unsigned NOT NULL AFTER `guid`,
+  ADD `talentId1` int(10) unsigned NOT NULL AFTER `talentId0`,
+  ADD `talentId2` int(10) unsigned NOT NULL AFTER `talentId1`,
+  ADD `talentId3` int(10) unsigned NOT NULL AFTER `talentId2`,
+  ADD PRIMARY KEY(`guid`,`talentGroup`);

sql/updates/characters/master/2018_12_09_01_characters.sql

@@ -0,0 +1,32 @@
+DROP TABLE IF EXISTS `total_honor_at_honor_level`;
+CREATE TABLE `total_honor_at_honor_level` (
+  `HonorLevel` int(10) UNSIGNED NOT NULL,
+  `Prestige0` int(10) UNSIGNED NOT NULL,
+  `Prestige1` int(10) UNSIGNED NOT NULL,
+  PRIMARY KEY (`HonorLevel`) 
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO `total_honor_at_honor_level` VALUES
+(0,0,0),(1,350,800),(2,700,1600),(3,1050,2400),(4,1400,3200),
+(5,1750,4000),(6,2100,4800),(7,2450,5600),(8,2800,6400),(9,3150,7200),
+(10,3500,8000),(11,3900,8850),(12,4300,9700),(13,4700,10550),(14,5100,11400),
+(15,5500,12250),(16,5900,13100),(17,6300,13950),(18,6700,14800),(19,7100,15650),
+(20,7500,16500),(21,7950,17400),(22,8400,18300),(23,8850,19200),(24,9300,20100),
+(25,9750,21000),(26,10200,21900),(27,10650,22800),(28,11100,23700),(29,11550,24600),
+(30,12000,25500),(31,12500,26450),(32,13000,27400),(33,13500,28350),(34,14000,29300),
+(35,14500,30250),(36,15000,31200),(37,15500,32150),(38,16000,33100),(39,16500,34050),
+(40,17000,35000),(41,17550,36000),(42,18100,37000),(43,18650,38000),(44,19200,39000),
+(45,19750,40000),(46,20300,41000),(47,20850,42000),(48,21400,43000),(49,21950,44000);
+
+-- first compensate for prestige levels above first
+UPDATE `characters` SET `honor`=`honor`+44000*(`prestigeLevel`-1) WHERE `prestigeLevel`>0;
+-- compensate for honor levels in prestige for characters above first prestige
+UPDATE `characters` SET `honor`=`honor`+(SELECT th.`Prestige1` FROM `total_honor_at_honor_level` th WHERE th.`HonorLevel`=(`characters`.`honorLevel`-1)) WHERE `prestigeLevel`>0;
+-- compensate for honor levels in first prestige level
+UPDATE `characters` SET `honor`=`honor`+(SELECT th.`Prestige0` FROM `total_honor_at_honor_level` th WHERE th.`HonorLevel`=(`characters`.`honorLevel`-1)) WHERE `prestigeLevel`=0;
+
+-- reset honor levels, will be recalculated from refunded honor at first login (and grant achievements)
+UPDATE `characters` SET `honorLevel`=1;
+
+ALTER TABLE `characters` DROP `prestigeLevel`;
+DROP TABLE IF EXISTS `total_honor_at_honor_level`;

sql/updates/characters/master/2018_12_09_02_characters.sql

@@ -0,0 +1,135 @@
+--
+-- Table structure for table `profession_skill_migration_data`
+--
+DROP TABLE IF EXISTS `profession_skill_migration_data`;
+CREATE TABLE `profession_skill_migration_data` (
+  `SkillID` int(10) unsigned,
+  `ParentSkillLineID` int(10) unsigned,
+  `MaxValue` int(10) unsigned,
+  `NewMaxValue` int(10) unsigned,
+  `SpellID_A` int(10) unsigned,
+  `SpellID_H` int(10) unsigned,
+  PRIMARY KEY (`SkillID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+--
+-- Dumping data for table `profession_skill_migration_data`
+--
+INSERT INTO `profession_skill_migration_data` VALUES
+(2437,164,900,150,264448,265803),
+(2454,164,800,100,264446,264446),
+(2472,164,700,100,264444,264444),
+(2473,164,600,75,264442,264442),
+(2474,164,525,75,264440,264440),
+(2475,164,450,75,264438,264438),
+(2476,164,375,75,264436,264436),
+(2477,164,300,300,264434,264434),
+(2478,171,900,150,264255,265787),
+(2479,171,800,100,264250,264250),
+(2480,171,700,100,264247,264247),
+(2481,171,600,75,264245,264245),
+(2482,171,525,75,264243,264243),
+(2483,171,450,75,264220,264220),
+(2484,171,375,75,264213,264213),
+(2485,171,300,300,264211,264211),
+(2486,333,900,150,264473,265805),
+(2487,333,800,100,264471,264471),
+(2488,333,700,100,264469,264469),
+(2489,333,600,75,264467,264467),
+(2491,333,525,75,264464,264464),
+(2492,333,450,75,264462,264462),
+(2493,333,375,75,264460,264460),
+(2494,333,300,300,264455,264455),
+(2499,202,900,150,264492,265807),
+(2500,202,800,100,264490,264490),
+(2501,202,700,100,264487,264487),
+(2502,202,600,75,264485,264485),
+(2503,202,525,75,264483,264483),
+(2504,202,450,75,264481,264481),
+(2505,202,375,75,264479,264479),
+(2506,202,300,300,264475,264475),
+(2507,773,900,150,264508,265809),
+(2508,773,800,100,264506,264506),
+(2509,773,700,100,264504,264504),
+(2510,773,600,75,264502,264502),
+(2511,773,525,75,264500,264500),
+(2512,773,450,75,264498,264498),
+(2513,773,375,75,264496,264496),
+(2514,773,300,300,264494,264494),
+(2517,755,900,150,264548,265811),
+(2518,755,800,100,264546,264546),
+(2519,755,700,100,264544,264544),
+(2520,755,600,75,264542,264542),
+(2521,755,525,75,264539,264539),
+(2522,755,450,75,264537,264537),
+(2523,755,375,75,264534,264534),
+(2524,755,300,300,264532,264532),
+(2525,165,900,150,264592,265813),
+(2526,165,800,100,264590,264590),
+(2527,165,700,100,264588,264588),
+(2528,165,600,75,264585,264585),
+(2529,165,525,75,264583,264583),
+(2530,165,450,75,264581,264581),
+(2531,165,375,75,264579,264579),
+(2532,165,300,300,264577,264577),
+(2533,197,900,150,264630,265815),
+(2534,197,800,100,264628,264628),
+(2535,197,700,100,264626,264626),
+(2536,197,600,75,264624,264624),
+(2537,197,525,75,264622,264622),
+(2538,197,450,75,264620,264620),
+(2539,197,375,75,264618,264618),
+(2540,197,300,300,264616,264616),
+(2541,185,825,150,264646,265817),
+(2542,185,750,100,264644,264644),
+(2543,185,700,100,264642,264642),
+(2544,185,600,75,264640,264640),
+(2545,185,525,75,264638,264638),
+(2546,185,450,75,264636,264636),
+(2547,185,375,75,264634,264634),
+(2548,185,300,300,264632,264632),
+(2549,182,900,150,265831,265835),
+(2550,182,800,100,265834,265834),
+(2551,182,700,100,265829,265829),
+(2552,182,600,75,265827,265827),
+(2553,182,525,75,265825,265825),
+(2554,182,450,75,265823,265823),
+(2555,182,375,75,265821,265821),
+(2556,182,300,300,265819,265819),
+(2557,393,900,150,265869,265871),
+(2558,393,800,100,265867,265867),
+(2559,393,700,100,265865,265865),
+(2560,393,600,75,265863,265863),
+(2561,393,525,75,265861,265861),
+(2562,393,450,75,265859,265859),
+(2563,393,375,75,265857,265857),
+(2564,393,300,300,265855,265855),
+(2565,186,900,150,265851,265853),
+(2566,186,800,100,265849,265849),
+(2567,186,700,100,265847,265847),
+(2568,186,600,75,265845,265845),
+(2569,186,525,75,265843,265843),
+(2570,186,450,75,265841,265841),
+(2571,186,375,75,265839,265839),
+(2572,186,300,300,265837,265837),
+(2585,356,825,150,271675,271677),
+(2586,356,750,100,271672,271672),
+(2587,356,700,100,271664,271664),
+(2588,356,600,75,271662,271662),
+(2589,356,525,75,271660,271660),
+(2590,356,450,75,271658,271658),
+(2591,356,375,75,271656,271656),
+(2592,356,300,300,271616,271616);
+
+INSERT IGNORE INTO `character_spell`
+SELECT cs.`guid`, IF(c.`race` IN (1,3,4,7,11,22,25,29,30,34), psmd.`SpellID_A`, psmd.`SpellID_H`), 1, 0
+FROM `profession_skill_migration_data` psmd
+INNER JOIN `character_skills` cs ON psmd.`ParentSkillLineID` = cs.`skill` AND psmd.`MaxValue` <= cs.`max`
+INNER JOIN `characters` c ON cs.`guid` = c.`guid`;
+
+INSERT IGNORE INTO `character_skills`
+SELECT cs.`guid`, psmd.`SkillID`, CASE WHEN psmd.`MaxValue` < cs.`value` THEN psmd.`NewMaxValue` WHEN psmd.`MaxValue` - cs.`value` < psmd.`NewMaxValue` THEN psmd.`NewMaxValue` + cs.`value` - psmd.`MaxValue` ELSE 1 END, psmd.`NewMaxValue`
+FROM `profession_skill_migration_data` psmd
+INNER JOIN `character_skills` cs ON psmd.`ParentSkillLineID` = cs.`skill` AND psmd.`MaxValue` <= cs.`max`;
+
+DROP TABLE IF EXISTS `profession_skill_migration_data`;

sql/updates/hotfixes/master/2018_12_09_01_hotfixes.sql

@@ -0,0 +1,27 @@
+--
+-- Table structure for table `animation_data`
+--
+DROP TABLE IF EXISTS `animation_data`;
+CREATE TABLE `animation_data` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Fallback` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `BehaviorTier` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BehaviorID` int(11) NOT NULL DEFAULT '0',
+  `Flags1` int(11) NOT NULL DEFAULT '0',
+  `Flags2` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `num_talents_at_level`
+--
+DROP TABLE IF EXISTS `num_talents_at_level`;
+CREATE TABLE `num_talents_at_level` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `NumTalents` int(11) NOT NULL DEFAULT '0',
+  `NumTalentsDeathKnight` int(11) NOT NULL DEFAULT '0',
+  `NumTalentsDemonHunter` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;

sql/updates/hotfixes/master/2018_12_09_02_hotfixes.sql

@@ -0,0 +1,10 @@
+--
+-- Table structure for table `hotfix_blob`
+--
+DROP TABLE IF EXISTS `hotfix_blob`;
+CREATE TABLE `hotfix_blob` (
+  `TableHash` INT(10) UNSIGNED NOT NULL,
+  `RecordId` INT(11) NOT NULL,
+  `Blob` BLOB,
+  PRIMARY KEY (`TableHash`,`RecordId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;

sql/updates/world/master/2018_12_09_01_world.sql

@@ -0,0 +1,13 @@
+ALTER TABLE `terrain_worldmap`
+  DROP PRIMARY KEY,
+  ADD `UiMapPhaseId` int(10) unsigned NOT NULL AFTER `TerrainSwapMap`;
+
+DELETE FROM `terrain_worldmap` WHERE `TerrainSwapMap`=638;
+UPDATE `terrain_worldmap` SET `UiMapPhaseId`=52 WHERE `TerrainSwapMap`=655;
+UPDATE `terrain_worldmap` SET `UiMapPhaseId`=54 WHERE `TerrainSwapMap`=656;
+UPDATE `terrain_worldmap` SET `UiMapPhaseId`=165 WHERE `TerrainSwapMap`=719;
+UPDATE `terrain_worldmap` SET `UiMapPhaseId`=2801 WHERE `TerrainSwapMap`=545;
+
+ALTER TABLE `terrain_worldmap`
+  ADD PRIMARY KEY(`TerrainSwapMap`,`UiMapPhaseId`),
+  DROP `WorldMapArea`;

sql/updates/world/master/2018_12_09_02_world.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `mail_level_reward` CHANGE `raceMask` `raceMask` bigint(20) unsigned NOT NULL;
+ALTER TABLE `playercreateinfo_spell_custom` CHANGE `racemask` `racemask` bigint(20) unsigned NOT NULL;
+ALTER TABLE `playercreateinfo_cast_spell` CHANGE `raceMask` `raceMask` bigint(20) unsigned NOT NULL;
+ALTER TABLE `spell_area` CHANGE `racemask` `racemask` bigint(20) unsigned NOT NULL;

sql/updates/world/master/2018_12_09_03_world.sql

@@ -0,0 +1,104 @@
+ALTER TABLE `conversation_template` ADD `TextureKitId` int(10) unsigned NOT NULL DEFAULT '0' AFTER `LastLineEndTime`;
+ALTER TABLE `gameobject_template` ADD `Data33` int(11) NOT NULL DEFAULT '0' AFTER `Data32`;
+ALTER TABLE `playerchoice` ADD `KeepOpenAfterChoice` tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER `HideWarboardHeader`;
+ALTER TABLE `playerchoice_response`
+  ADD `Flags` int(11) NOT NULL DEFAULT '0' AFTER `ChoiceArtFileId`,
+  ADD `WidgetSetID` int(10) unsigned NOT NULL DEFAULT '0' AFTER `Flags`,
+  ADD `GroupID` tinyint(3) unsigned NOT NULL DEFAULT '0' AFTER `WidgetSetID`;
+
+ALTER TABLE `quest_poi`
+  ADD `UiMapID` int(11) DEFAULT NULL AFTER `MapID`,
+  CHANGE `WoDUnk1` `SpawnTrackingID` int(11) NOT NULL DEFAULT '0' AFTER `PlayerConditionID`;
+
+ALTER TABLE `quest_template`
+  ADD `ScalingFactionGroup` int(11) NOT NULL DEFAULT '0' AFTER `QuestLevel`,
+  ADD `FlagsEx2` int(10) unsigned NOT NULL DEFAULT '0' AFTER `FlagsEx`,
+  ADD `PortraitGiverMount` int(11) NOT NULL DEFAULT '0' AFTER `PortraitGiver`,
+  CHANGE `QuestRewardID` `TreasurePickerID` int(11) NOT NULL DEFAULT '0' AFTER `AllowableRaces`;
+
+ALTER TABLE `scenario_poi` ADD `UiMapID` int(11) DEFAULT NULL AFTER `MapID`;
+
+DROP TABLE IF EXISTS `world_map_area_to_ui_map`;
+CREATE TABLE `world_map_area_to_ui_map` (
+  `WorldMapAreaID` int(11) NOT NULL,
+  `Floor` int(11) NOT NULL,
+  `UiMapID` int(11) DEFAULT NULL,
+  PRIMARY KEY (`WorldMapAreaID`,`Floor`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+INSERT INTO `world_map_area_to_ui_map` VALUES
+(4,0,1),(4,8,2),(4,10,3),(4,11,4),(4,12,5),(4,19,6),(9,0,7),(9,6,8),(9,7,9),(11,0,10),(11,20,11),(13,0,12),(14,0,13),(16,0,14),(17,0,15),(17,18,16),(19,0,17),(20,0,18),(20,13,19),(20,25,20),
+(21,0,21),(22,0,22),(23,0,23),(23,20,24),(24,0,25),(26,0,26),(27,0,27),(27,6,28),(27,7,29),(27,10,30),(27,11,31),(28,0,32),(28,14,33),(28,15,34),(28,16,35),(29,0,36),(30,0,37),(30,1,38),(30,2,39),(30,19,40),
+(30,21,41),(32,0,42),(32,22,43),(32,23,44),(32,24,45),(32,27,46),(34,0,47),(35,0,48),(36,0,49),(37,0,50),(38,0,51),(39,0,52),(39,4,53),(39,5,54),(39,17,55),(40,0,56),(41,0,57),(41,2,58),(41,3,59),(41,4,60),
+(41,5,61),(42,0,62),(43,0,63),(61,0,64),(81,0,65),(101,0,66),(101,21,67),(101,22,68),(121,0,69),(141,0,70),(161,0,71),(161,15,72),(161,16,73),(161,17,74),(161,18,75),(181,0,76),(182,0,77),(201,0,78),(201,14,79),(241,0,80),
+(261,0,81),(261,13,82),(281,0,83),(301,0,84),(321,0,85),(321,1,86),(341,0,87),(362,0,88),(381,0,89),(382,0,90),(401,0,91),(443,0,92),(461,0,93),(462,0,94),(463,0,95),(463,1,96),(464,0,97),(464,2,98),(464,3,99),(465,0,100),
+(466,0,101),(467,0,102),(471,0,103),(473,0,104),(475,0,105),(476,0,106),(477,0,107),(478,0,108),(479,0,109),(480,0,110),(481,0,111),(482,0,112),(485,0,113),(486,0,114),(488,0,115),(490,0,116),(491,0,117),(492,0,118),(493,0,119),(495,0,120),
+(496,0,121),(499,0,122),(501,0,123),(502,0,124),(504,1,125),(504,2,126),(510,0,127),(512,0,128),(520,1,129),(521,0,130),(521,1,131),(522,1,132),(523,1,133),(523,2,134),(523,3,135),(524,1,136),(524,2,137),(525,1,138),(525,2,139),(526,1,140),
+(527,1,141),(528,0,142),(528,1,143),(528,2,144),(528,3,145),(528,4,146),(529,0,147),(529,1,148),(529,2,149),(529,3,150),(529,4,151),(529,5,152),(530,0,153),(530,1,154),(531,0,155),(532,1,156),(533,1,157),(533,2,158),(533,3,159),(534,1,160),
+(534,2,161),(535,1,162),(535,2,163),(535,3,164),(535,4,165),(535,5,166),(535,6,167),(536,1,168),(540,0,169),(541,0,170),(542,1,171),(543,1,172),(543,2,173),(544,0,174),(544,1,175),(544,2,176),(544,3,177),(544,4,178),(545,0,179),(545,1,180),
+(545,2,181),(545,3,182),(601,1,183),(602,0,184),(603,1,185),(604,1,186),(604,2,187),(604,3,188),(604,4,189),(604,5,190),(604,6,191),(604,7,192),(604,8,193),(605,0,194),(605,5,195),(605,6,196),(605,7,197),(606,0,198),(607,0,199),(609,0,200),
+(610,0,201),(611,0,202),(613,0,203),(614,0,204),(615,0,205),(626,0,206),(640,0,207),(640,1,208),(640,2,209),(673,0,210),(680,1,213),(684,0,217),(685,0,218),(686,0,219),(687,1,220),(688,1,221),(688,2,222),(688,3,223),(689,0,224),(690,1,225),
+(691,1,226),(691,2,227),(691,3,228),(691,4,229),(692,1,230),(692,2,231),(696,1,232),(697,0,233),(699,0,234),(699,1,235),(699,2,236),(699,3,237),(699,4,238),(699,5,239),(699,6,240),(700,0,241),(704,1,242),(704,2,243),(708,0,244),(709,0,245),
+(710,1,246),(717,0,247),(718,1,248),(720,0,249),(721,1,250),(721,2,251),(721,3,252),(721,4,253),(721,5,254),(721,6,255),(722,1,256),(722,2,257),(723,1,258),(723,2,259),(724,1,260),(725,1,261),(726,1,262),(727,1,263),(727,2,264),(728,1,265),
+(729,1,266),(730,1,267),(730,2,268),(731,1,269),(731,2,270),(731,3,271),(732,1,272),(733,0,273),(734,0,274),(736,0,275),(737,0,276),(747,0,277),(749,1,279),(750,1,280),(750,2,281),(752,1,282),(753,1,283),(753,2,284),(754,1,285),(754,2,286),
+(755,1,287),(755,2,288),(755,3,289),(755,4,290),(756,1,291),(756,2,292),(757,1,293),(758,1,294),(758,2,295),(758,3,296),(759,1,297),(759,2,298),(759,3,299),(760,1,300),(761,1,301),(762,1,302),(762,2,303),(762,3,304),(762,4,305),(763,1,306),
+(763,2,307),(763,3,308),(763,4,309),(764,1,310),(764,2,311),(764,3,312),(764,4,313),(764,5,314),(764,6,315),(764,7,316),(765,1,317),(765,2,318),(766,1,319),(766,2,320),(766,3,321),(767,1,322),(767,2,323),(768,1,324),(769,1,325),(772,0,327),
+(773,1,328),(775,0,329),(776,1,330),(779,1,331),(780,1,332),(781,0,333),(782,1,334),(789,0,335),(789,1,336),(793,0,337),(795,0,338),(796,0,339),(796,1,340),(796,2,341),(796,3,342),(796,4,343),(796,5,344),(796,6,345),(796,7,346),(797,1,347),
+(798,1,348),(798,2,349),(799,1,350),(799,2,351),(799,3,352),(799,4,353),(799,5,354),(799,6,355),(799,7,356),(799,8,357),(799,9,358),(799,10,359),(799,11,360),(799,12,361),(799,13,362),(799,14,363),(799,15,364),(799,16,365),(799,17,366),(800,0,367),
+(800,1,368),(800,2,369),(803,1,370),(806,0,371),(806,6,372),(806,7,373),(806,15,374),(806,16,375),(807,0,376),(807,14,377),(808,0,378),(809,0,379),(809,8,380),(809,9,381),(809,10,382),(809,11,383),(809,12,384),(809,17,385),(809,20,386),(809,21,387),
+(810,0,388),(810,13,389),(811,0,390),(811,1,391),(811,2,392),(811,3,393),(811,4,394),(811,18,395),(811,19,396),(813,0,397),(816,0,398),(819,0,399),(819,1,400),(820,0,401),(820,1,402),(820,2,403),(820,3,404),(820,4,405),(820,5,406),(823,0,407),
+(823,1,408),(824,0,409),(824,1,410),(824,2,411),(824,3,412),(824,4,413),(824,5,414),(824,6,415),(851,0,416),(856,0,417),(857,0,418),(857,1,419),(857,2,420),(857,3,421),(858,0,422),(860,1,423),(862,0,424),(864,0,425),(864,3,426),(866,0,427),
+(866,9,428),(867,1,429),(867,2,430),(871,1,431),(871,2,432),(873,0,433),(873,5,434),(874,1,435),(874,2,436),(875,1,437),(875,2,438),(876,1,439),(876,2,440),(876,3,441),(876,4,442),(877,0,443),(877,1,444),(877,2,445),(877,3,446),(878,0,447),
+(880,0,448),(881,0,449),(882,0,450),(883,0,451),(884,0,452),(885,1,453),(885,2,454),(885,3,455),(886,0,456),(887,0,457),(887,1,458),(887,2,459),(888,0,460),(889,0,461),(890,0,462),(891,0,463),(891,9,464),(892,0,465),(892,12,466),(893,0,467),
+(894,0,468),(895,0,469),(895,8,470),(896,1,471),(896,2,472),(896,3,473),(897,1,474),(897,2,475),(898,1,476),(898,2,477),(898,3,478),(898,4,479),(899,1,480),(900,1,481),(900,2,482),(906,0,483),(911,0,486),(912,0,487),(914,0,488),(914,1,489),
+(919,0,490),(919,1,491),(919,2,492),(919,3,493),(919,4,494),(919,5,495),(919,6,496),(919,7,497),(920,0,498),(922,1,499),(922,2,500),(924,1,501),(924,2,502),(925,1,503),(928,0,504),(928,1,505),(928,2,506),(929,0,507),(930,1,508),(930,2,509),
+(930,3,510),(930,4,511),(930,5,512),(930,6,513),(930,7,514),(930,8,515),(933,0,516),(933,1,517),(934,1,518),(935,0,519),(937,0,520),(937,1,521),(938,1,522),(939,0,523),(940,0,524),(941,0,525),(941,1,526),(941,2,527),(941,3,528),(941,4,529),
+(941,6,530),(941,7,531),(941,8,532),(941,9,533),(945,0,534),(946,0,535),(946,13,536),(946,14,537),(946,30,538),(947,0,539),(947,15,540),(947,22,541),(948,0,542),(949,0,543),(949,16,544),(949,17,545),(949,18,546),(949,19,547),(949,20,548),(949,21,549),
+(950,0,550),(950,10,551),(950,11,552),(950,12,553),(951,0,554),(951,22,555),(953,0,556),(953,1,557),(953,2,558),(953,3,559),(953,4,560),(953,5,561),(953,6,562),(953,7,563),(953,8,564),(953,9,565),(953,10,566),(953,11,567),(953,12,568),(953,13,569),
+(953,14,570),(955,0,571),(962,0,572),(964,1,573),(969,1,574),(969,2,575),(969,3,576),(970,0,577),(970,1,578),(971,23,579),(971,24,580),(971,25,581),(973,0,582),(976,26,585),(976,27,586),(976,28,587),(978,0,588),(978,29,589),(980,0,590),(983,0,592),
+(984,1,593),(986,0,594),(987,1,595),(988,1,596),(988,2,597),(988,3,598),(988,4,599),(988,5,600),(989,1,601),(989,2,602),(993,1,606),(993,2,607),(993,3,608),(993,4,609),(994,0,610),(994,1,611),(994,2,612),(994,3,613),(994,4,614),(994,5,615),
+(995,1,616),(995,2,617),(995,3,618),(1007,0,619),(1008,0,620),(1008,1,621),(1009,0,622),(1010,0,623),(1011,0,624),(1014,0,625),(1014,4,626),(1014,10,627),(1014,11,628),(1014,12,629),(1015,0,630),(1015,17,631),(1015,18,632),(1015,19,633),(1017,0,634),(1017,1,635),
+(1017,9,636),(1017,25,637),(1017,26,638),(1017,27,639),(1017,28,640),(1018,0,641),(1018,13,642),(1018,14,643),(1018,15,644),(1020,0,645),(1021,0,646),(1021,1,647),(1021,2,648),(1022,0,649),(1024,0,650),
+(1024,5,651),(1024,6,652),(1024,8,653),(1024,16,654),(1024,20,655),(1024,21,656),(1024,29,657),(1024,30,658),(1024,31,659),(1024,40,660),(1026,0,661),(1026,1,662),(1026,2,663),(1026,3,664),(1026,4,665),
+(1026,5,666),(1026,6,667),(1026,7,668),(1026,8,669),(1026,9,670),(1027,0,671),(1028,0,672),(1028,1,673),(1028,2,674),(1028,3,675),(1031,0,676),(1032,1,677),(1032,2,678),(1032,3,679),(1033,0,680),
+(1033,22,681),(1033,23,682),(1033,24,683),(1033,32,684),(1033,33,685),(1033,34,686),(1033,35,687),(1033,36,688),(1033,37,689),(1033,38,690),(1033,39,691),(1033,41,692),(1033,42,693),(1034,0,694),
+(1035,1,695),(1037,0,696),(1038,0,697),(1039,1,698),(1039,2,699),(1039,3,700),(1039,4,701),(1040,1,702),(1041,0,703),(1041,1,704),(1041,2,705),(1042,0,706),(1042,1,707),(1042,2,708),(1044,0,709),
+(1045,1,710),(1045,2,711),(1045,3,712),(1046,0,713),(1047,0,714),(1048,0,715),(1049,1,716),(1050,0,717),(1051,0,718),(1052,0,719),(1052,1,720),(1052,2,721),(1054,1,723),(1056,0,725),(1057,0,726),
+(1059,0,728),(1060,1,729),(1065,0,731),(1066,1,732),(1067,0,733),(1068,1,734),(1068,2,735),(1069,1,736),(1070,1,737),(1071,0,738),(1072,0,739),(1073,1,740),(1073,2,741),(1075,1,742),(1075,2,743),
+(1076,1,744),(1076,2,745),(1076,3,746),(1077,0,747),(1078,0,748),(1079,1,749),(1080,0,750),(1081,1,751),(1081,2,752),(1081,3,753),(1081,4,754),(1081,5,755),(1081,6,756),(1082,0,757),(1084,0,758),
+(1085,1,759),(1086,0,760),(1087,0,761),(1087,1,762),(1087,2,763),(1088,1,764),(1088,2,765),(1088,3,766),(1088,4,767),(1088,5,768),(1088,6,769),(1088,7,770),(1088,8,771),(1088,9,772),(1090,0,773),
+(1090,1,774),(1091,0,775),(1092,0,776),(1094,1,777),(1094,2,778),(1094,3,779),(1094,4,780),(1094,5,781),(1094,6,782),(1094,7,783),(1094,8,784),(1094,9,785),(1094,10,786),(1094,11,787),(1094,12,788),
+(1094,13,789),(1096,0,790),(1097,1,791),(1097,2,792),(1099,0,793),(1100,1,794),(1100,2,795),(1100,3,796),(1100,4,797),(1102,1,798),(1104,0,799),(1104,1,800),(1104,2,801),(1104,3,802),(1104,4,803),
+(1105,1,804),(1105,2,805),(1114,0,806),(1114,1,807),(1114,2,808),(1115,1,809),(1115,2,810),(1115,3,811),(1115,4,812),(1115,5,813),(1115,6,814),(1115,7,815),(1115,8,816),(1115,9,817),(1115,10,818),
+(1115,11,819),(1115,12,820),(1115,13,821),(1115,14,822),(1116,0,823),(1126,0,824),(1127,1,825),(1129,1,826),(1130,1,827),(1131,1,828),(1132,1,829),(1135,0,830),(1135,1,831),(1135,2,832),(1135,7,833),
+(1136,0,834),(1137,1,835),(1137,2,836),(1139,0,837),(1140,0,838),(1142,1,839),(1143,1,840),(1143,2,841),(1143,3,842),(1144,0,843),(1145,0,844),(1146,1,845),(1146,2,846),(1146,3,847),(1146,4,848),
+(1146,5,849),(1147,1,850),(1147,2,851),(1147,3,852),(1147,4,853),(1147,5,854),(1147,6,855),(1147,7,856),(1148,1,857),(1149,0,858),(1150,0,859),(1151,0,860),(1152,0,861),(1153,0,862),(1154,0,863),
+(1155,0,864),(1156,1,865),(1156,2,866),(1157,1,867),(1158,1,868),(1159,1,869),(1159,2,870),(1160,0,871),(1161,0,872),(1161,1,873),(1161,2,874),(1162,0,875),(1163,0,876),(1164,0,877),(1165,0,878),
+(1165,1,879),(1165,2,880),(1166,1,881),(1170,0,882),(1170,3,883),(1170,4,884),(1171,0,885),(1171,5,886),(1171,6,887),(1172,1,888),(1173,1,889),(1173,2,890),(1174,0,891),(1174,1,892),(1174,2,893),
+(1174,3,894),(1175,0,895),(1176,0,896),(1177,0,897),(1177,1,898),(1177,2,899),(1177,3,900),(1177,4,901),(1177,5,902),(1178,0,903),(1183,0,904),(1184,0,905),(1185,0,906),(1186,0,907),(1187,0,908),
+(1188,0,909),(1188,1,910),(1188,2,911),(1188,3,912),(1188,4,913),(1188,5,914),(1188,6,915),(1188,7,916),(1188,8,917),(1188,9,918),(1188,10,919),(1188,11,920),(1190,0,921),(1191,0,922),(1192,0,923),
+(1193,0,924),(1194,0,925),(1195,0,926),(1196,0,927),(1197,0,928),(1198,0,929),(1199,0,930),(1200,0,931),(1201,0,932),(1202,0,933),(1204,1,934),(1204,2,935),(1205,0,936),(1210,0,938),(1211,0,939),
+(1212,1,940),(1212,2,941),(1213,0,942),(1214,0,943),(1215,0,971),(1216,0,972),(1217,1,973),(1219,0,974),(1219,1,975),(1219,2,976),(1219,3,977),(1219,4,978),(1219,5,979),(1219,6,980),(1220,0,981),
+(32,21,42),(974,0,582),(1121,0,646),(992,0,17),(981,0,590),(991,0,582),(990,0,590),(975,0,582),(910,0,418),(910,1,419),(910,2,420),(910,3,421),(907,0,70),(905,4,394),(321,2,85),(510,1,127),(522,0,132);
+
+UPDATE `quest_poi` SET `UiMapID`=(SELECT wma.`UiMapID` FROM `world_map_area_to_ui_map` wma WHERE wma.`WorldMapAreaID`=`quest_poi`.`WorldMapAreaID` AND wma.`Floor`=`quest_poi`.`Floor`);
+UPDATE `scenario_poi` SET `UiMapID`=(SELECT wma.`UiMapID` FROM `world_map_area_to_ui_map` wma WHERE wma.`WorldMapAreaID`=`scenario_poi`.`WorldMapAreaID` AND wma.`Floor`=`scenario_poi`.`Floor`);
+
+DROP TABLE IF EXISTS `world_map_area_to_ui_map`;
+
+DELETE FROM `quest_poi` WHERE `UiMapID` IS NULL;
+DELETE FROM `scenario_poi` WHERE `UiMapID` IS NULL;
+
+ALTER TABLE `quest_poi`
+  CHANGE `UiMapID` `UiMapID` int(11) NOT NULL DEFAULT '0' AFTER `MapID`,
+  DROP `WorldMapAreaID`,
+  DROP `Floor`;
+
+ALTER TABLE `scenario_poi`
+  CHANGE `UiMapID` `UiMapID` int(11) NOT NULL DEFAULT '0' AFTER `MapID`,
+  DROP `WorldMapAreaID`,
+  DROP `Floor`;
+
+ALTER TABLE `spell_areatrigger`
+  ADD `AnimId` int(11) NOT NULL DEFAULT '0' AFTER `FacingCurveId`,
+  ADD `AnimKitId` int(11) NOT NULL DEFAULT '0' AFTER `AnimId`;

sql/updates/world/master/2018_12_09_04_world.sql

@@ -0,0 +1,23 @@
+DROP TABLE IF EXISTS `creature_template_model`;
+CREATE TABLE `creature_template_model`(
+  `CreatureID` int(10) unsigned NOT NULL,
+  `Idx` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureDisplayID` int(10) unsigned NOT NULL,
+  `DisplayScale` float NOT NULL DEFAULT '1',
+  `Probability` float NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) unsigned NOT NULL,
+  PRIMARY KEY (`CreatureID`,`CreatureDisplayID`)
+) ENGINE=MYISAM CHARSET=utf8mb4;
+
+INSERT IGNORE INTO `creature_template_model` (`CreatureID`,`Idx`,`CreatureDisplayID`,`DisplayScale`,`Probability`,`VerifiedBuild`) SELECT `entry`,0,`modelid1`,`scale`,1,`VerifiedBuild` FROM `creature_template` WHERE `modelid1`!=0;
+INSERT IGNORE INTO `creature_template_model` (`CreatureID`,`Idx`,`CreatureDisplayID`,`DisplayScale`,`Probability`,`VerifiedBuild`) SELECT `entry`,1,`modelid2`,`scale`,1,`VerifiedBuild` FROM `creature_template` WHERE `modelid2`!=0;
+INSERT IGNORE INTO `creature_template_model` (`CreatureID`,`Idx`,`CreatureDisplayID`,`DisplayScale`,`Probability`,`VerifiedBuild`) SELECT `entry`,2,`modelid3`,`scale`,1,`VerifiedBuild` FROM `creature_template` WHERE `modelid3`!=0;
+INSERT IGNORE INTO `creature_template_model` (`CreatureID`,`Idx`,`CreatureDisplayID`,`DisplayScale`,`Probability`,`VerifiedBuild`) SELECT `entry`,3,`modelid4`,`scale`,1,`VerifiedBuild` FROM `creature_template` WHERE `modelid4`!=0;
+
+UPDATE `creature_template` SET `scale`=1;
+
+ALTER TABLE `creature_template`
+  DROP `modelid1`,
+  DROP `modelid2`,
+  DROP `modelid3`,
+  DROP `modelid4`;

sql/updates/world/master/2018_12_09_05_world.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `creature_classlevelstats`
+  DROP `damage_base`,
+  DROP `damage_exp1`,
+  DROP `damage_exp2`,
+  DROP `damage_exp3`,
+  DROP `damage_exp4`,
+  DROP `damage_exp5`;

sql/updates/world/master/2018_12_09_06_world.sql

@@ -0,0 +1 @@
+UPDATE `trinity_string` SET `content_default`='%u - |cffffffff|Hquest:%u:%d:%d:%d:%d|h[%s]|h|r %s' WHERE `entry`=513;

sql/updates/world/master/2018_12_09_07_world.sql

@@ -0,0 +1,8 @@
+DELETE FROM `skill_tiers` WHERE `ID` IN (333,335,336,338);
+INSERT INTO `skill_tiers` (`ID`,`Value1`,`Value2`,`Value3`,`Value4`,`Value5`,`Value6`,`Value7`,`Value8`,`Value9`,`Value10`,`Value11`,`Value12`,`Value13`,`Value14`,`Value15`,`Value16`) VALUES
+(333,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+(335,75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+(336,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+(338,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+
+UPDATE `skill_tiers` SET `Value10`=800,`Value11`=950 WHERE `ID`=224;