Merge branch 'master' into 4.x

Conflicts: src/server/game/Spells/Auras/SpellAuraEffects.h
2011-11-26 23:50:15 +02:00
parent 29400b4198 3d21444db6
commit ed55fc3567
11 changed files with 111 additions and 74 deletions
@@ -0,0 +1,7 @@
+-- Blessing of Sanctuary + Grace
+DELETE FROM `spell_group` WHERE `id`>=1091 AND `id`<=1093  LIMIT 4;
+DELETE FROM `spell_group_stack_rules` WHERE `group_id`=1093 LIMIT 1;
+
+-- Ebon Plague + Curse of Elements + Earth and Moon
+DELETE FROM `spell_group` WHERE `id`>=1040 AND `id`<=1043  LIMIT 6;
+DELETE FROM `spell_group_stack_rules` WHERE `group_id`=1043 LIMIT 1;
@@ -0,0 +1,2 @@
+-- Misery
+UPDATE `spell_proc_event` SET `SpellFamilyMask2` = `SpellFamilyMask2` | 64 WHERE `entry` = 33193;
@@ -0,0 +1,3 @@
+DELETE FROM `achievement_criteria_data` WHERE `type` = 11 AND `criteria_id` = 7363;
+INSERT INTO `achievement_criteria_data` VALUES
+(7363, 11, 0, 0, 'achievement_snakes_whyd_it_have_to_be_snakes');
@@ -0,0 +1 @@
+DELETE FROM `disables` WHERE entry = 7363 AND sourceType = 4;
@@ -0,0 +1,2 @@
+-- Set all gameobjects in Ulduar (excluding chests, including veins and herbs) spawned in 10 and 25 man difficult.
+UPDATE `gameobject` SET `spawnMask` = 3 WHERE `id` IN (194555, 194232, 194675, 194560, 194569, 194370, 194371, 194630, 194631, 194375, 194377, 194634, 194635, 194636, 194637, 194904, 194905, 194907, 194398, 194399, 194400, 194401, 194402, 194914, 194403, 194915, 194404, 194405, 194406, 194407, 194663, 194408, 194664, 194665, 194409, 194666, 194410, 194411, 194412, 194413, 194414, 194415, 194416, 194437, 194441, 194442, 194704, 194705, 194706, 194707, 194481, 194484, 194235, 194236, 194750, 194506, 194255, 194773, 194261, 194262, 194264, 194553, 194554, 194556, 194557, 194558, 194559, 194565, 194912, 194913, 194739, 194740, 194741, 194742, 194743, 194744, 194745, 194746, 194747, 194748, 194749, 194774, 194775, 194776) AND `map` = 603;
				`@@ -0,0 +1 @@`
				DELETE FROM `disables` WHERE entry = 7363 AND sourceType = 4;