mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-24 19:06:49 +01:00
*Merge.
--HG-- branch : trunk
This commit is contained in:
@@ -3,4 +3,4 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm
|
||||
(31224, -1543, 2, 'Cloak of Shadows - Flare'),
|
||||
(41292, 42017, 2, 'Aura of Suffering'),
|
||||
(44007, -43657, 2, 'Storm Eye Safe Zone Immune'),
|
||||
(44867, -46019, 2, 'Spectral Exhaustion - Teleport: Spectral Realm');
|
||||
(44867, -46019, 2, 'Spectral Exhaustion - Teleport: Spectral Realm');
|
||||
|
||||
@@ -2,4 +2,4 @@ DELETE FROM `spell_linked_spell` WHERE `spell_effect` IN ('33686', '31705');
|
||||
INSERT INTO `spell_linked_spell`(`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
|
||||
('-33711','33686','0','Murmur\'s Shockwave (Normal)'),
|
||||
('-38794','33686','0','Murmur\'s Shockwave (Heroic)'),
|
||||
('33686','31705','0','Murmur\'s Shockwave Jump');
|
||||
('33686','31705','0','Murmur\'s Shockwave Jump');
|
||||
|
||||
@@ -1 +1 @@
|
||||
UPDATE `creature_template` SET `ScriptName`='boss_the_black_stalker' WHERE `entry`='17882';
|
||||
UPDATE `creature_template` SET `ScriptName`='boss_the_black_stalker' WHERE `entry`='17882';
|
||||
|
||||
1
sql/updates/973_world_scripts.sql
Normal file
1
sql/updates/973_world_scripts.sql
Normal file
@@ -0,0 +1 @@
|
||||
update creature_template set scriptname = 'npc_enraged_spirit' where entry in (21050, 21061, 21060, 21059);
|
||||
Reference in New Issue
Block a user