Core/Maps: Updated map difficulties

3 files changed, 29 insertions, 3 deletions

diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 4fcc88a3a7d..88327122f26 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1363,7 +1363,9 @@ CREATE TABLE `characters` (
   `position_z` float NOT NULL DEFAULT '0',
   `map` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Map Identifier',
   `instance_id` int(10) unsigned NOT NULL DEFAULT '0',
-  `instance_mode_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `dungeonDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `raidDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '14',
+  `legacyRaidDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '3',
   `orientation` float NOT NULL DEFAULT '0',
   `taximask` text NOT NULL,
   `online` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -1731,8 +1733,9 @@ CREATE TABLE `groups` (
   `icon7` binary(16) NOT NULL,
   `icon8` binary(16) NOT NULL,
   `groupType` tinyint(3) unsigned NOT NULL,
-  `difficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `raiddifficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `difficulty` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `raidDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '14',
+  `legacyRaidDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '3',
   `masterLooterGuid` bigint(20) unsigned NOT NULL,
   PRIMARY KEY (`guid`),
   KEY `leaderGuid` (`leaderGuid`)
diff --git a/sql/updates/characters/2015_01_10_00_characters.sql b/sql/updates/characters/2015_01_10_00_characters.sql
new file mode 100644
index 00000000000..c0070507b6d
--- /dev/null
+++ b/sql/updates/characters/2015_01_10_00_characters.sql
@@ -0,0 +1,10 @@
+ALTER TABLE `characters`
+  DROP `instance_mode_mask`,
+  ADD `dungeonDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '1' AFTER `instance_id`,
+  ADD `raidDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '14' AFTER `dungeonDifficulty`,
+  ADD `legacyRaidDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '3' AFTER `raidDifficulty`;
+
+ALTER TABLE `groups`
+  CHANGE `difficulty` `difficulty` tinyint(3) unsigned NOT NULL DEFAULT '1' AFTER `groupType`,
+  CHANGE `raiddifficulty` `raidDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '14' AFTER `difficulty`,
+  ADD `legacyRaidDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '3' AFTER `raidDifficulty`;
diff --git a/sql/updates/world/2015_01_10_00_world.sql b/sql/updates/world/2015_01_10_00_world.sql
new file mode 100644
index 00000000000..d5943731a50
--- /dev/null
+++ b/sql/updates/world/2015_01_10_00_world.sql
@@ -0,0 +1,13 @@
+ALTER TABLE `creature` CHANGE `spawnMask` `spawnMask` int(10) unsigned not null default '1';
+
+UPDATE `creature` SET `spawnMask`=`spawnMask`<<1 WHERE `map` IN (33,34,36,43,44,47,48,70,90,109,129,189,209,229,230,269,289,309,329,349,389,429,540,542,543,545,546,547,552,553,554,555,556,557,558,560,568,574,575,576,578,585,595,598,599,600,601,602,604,608,619,627,632,637,643,644,645,650,657,658,668,670,721,725,727,728,734,755,859,930,938,939,940,951,977);
+UPDATE `creature` SET `spawnMask`=`spawnMask`<<3 WHERE `map` IN (249,509,532,533,603,615,616,624,631,649,669,671,720,724,754,757,967);
+UPDATE `creature` SET `spawnMask`=`spawnMask`<<4 WHERE `map` IN (534,544,548,550,564,565,580);
+UPDATE `creature` SET `spawnMask`=`spawnMask`<<9 WHERE `map` IN (169,409,469,531,605);
+
+ALTER TABLE `gameobject` CHANGE `spawnMask` `spawnMask` int(10) unsigned not null default '1';
+
+UPDATE `gameobject` SET `spawnMask`=`spawnMask`<<1 WHERE `map` IN (33,34,36,43,44,47,48,70,90,109,129,189,209,229,230,269,289,309,329,349,389,429,540,542,543,545,546,547,552,553,554,555,556,557,558,560,568,574,575,576,578,585,595,598,599,600,601,602,604,608,619,627,632,637,643,644,645,650,657,658,668,670,721,725,727,728,734,755,859,930,938,939,940,951,977);
+UPDATE `gameobject` SET `spawnMask`=`spawnMask`<<3 WHERE `map` IN (249,509,532,533,603,615,616,624,631,649,669,671,720,724,754,757,967);
+UPDATE `gameobject` SET `spawnMask`=`spawnMask`<<4 WHERE `map` IN (534,544,548,550,564,565,580);
+UPDATE `gameobject` SET `spawnMask`=`spawnMask`<<9 WHERE `map` IN (169,409,469,531,605);