diff options
| author | Shocker <shocker@freakz.ro> | 2011-11-26 23:50:15 +0200 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2011-11-26 23:50:15 +0200 |
| commit | ed55fc3567599b0e595e99ee06252f1ed23e3851 (patch) | |
| tree | eed4e19a0cd020adc066a68cdf36e88263bf4726 /sql/updates | |
| parent | 29400b4198bd56544de097c186955f1154ca78ad (diff) | |
| parent | 3d21444db689d5b2eecd933ee6202b5636d7f2e2 (diff) | |
Merge branch 'master' into 4.x
Conflicts:
src/server/game/Spells/Auras/SpellAuraEffects.h
Diffstat (limited to 'sql/updates')
5 files changed, 15 insertions, 0 deletions
diff --git a/sql/updates/world/2011_11_26_02_world_spell_group.sql b/sql/updates/world/2011_11_26_02_world_spell_group.sql new file mode 100644 index 00000000000..71ad2eaf9fb --- /dev/null +++ b/sql/updates/world/2011_11_26_02_world_spell_group.sql @@ -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; diff --git a/sql/updates/world/2011_11_26_03_world_spell_proc_event.sql b/sql/updates/world/2011_11_26_03_world_spell_proc_event.sql new file mode 100644 index 00000000000..36837be8ab6 --- /dev/null +++ b/sql/updates/world/2011_11_26_03_world_spell_proc_event.sql @@ -0,0 +1,2 @@ +-- Misery +UPDATE `spell_proc_event` SET `SpellFamilyMask2` = `SpellFamilyMask2` | 64 WHERE `entry` = 33193; diff --git a/sql/updates/world/2011_11_26_04_world_achievement_criteria_data.sql b/sql/updates/world/2011_11_26_04_world_achievement_criteria_data.sql new file mode 100644 index 00000000000..b037bf58349 --- /dev/null +++ b/sql/updates/world/2011_11_26_04_world_achievement_criteria_data.sql @@ -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'); diff --git a/sql/updates/world/2011_11_26_04_world_disables.sql b/sql/updates/world/2011_11_26_04_world_disables.sql new file mode 100644 index 00000000000..4722f248656 --- /dev/null +++ b/sql/updates/world/2011_11_26_04_world_disables.sql @@ -0,0 +1 @@ +DELETE FROM `disables` WHERE entry = 7363 AND sourceType = 4; diff --git a/sql/updates/world/2011_11_26_05_ulduar_gameobject.sql b/sql/updates/world/2011_11_26_05_ulduar_gameobject.sql new file mode 100644 index 00000000000..60ba0aefbeb --- /dev/null +++ b/sql/updates/world/2011_11_26_05_ulduar_gameobject.sql @@ -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; |