*Merge.

--HG--
branch : trunk

sql/updates/965_world_scripts.sql

@@ -0,0 +1,17 @@
+INSERT INTO `spell_script_target` VALUES
+(33655,0,183350),
+(33655,0,183351),
+(44374,1,24722),
+(31538,1,17895),
+(29967,1,16524),
+(39887,1,23002),
+(31617,1,17899),
+(31624,1,17899),
+(31625,1,17899),
+(34019,1,19422),
+(34946,1,20040),
+(34946,1,20041),
+(21934,1,21934),
+(43144,1,23817),
+(12613,1,5843),
+(9095,1,1200);

sql/updates/966_world_scripts.sql

@@ -0,0 +1,24 @@
+DELETE FROM script_texts WHERE entry BETWEEN -1000395 AND -1000375;
+INSERT INTO script_texts (entry,content_default,sound,type,language,emote,comment) VALUES
+(-1000375 ,'I remember well the sting of defeat at the conclusion of the Third War. I have waited far too long for my revenge. Now the shadow of the Legion falls over this world. It is only a matter of time until all of your failed creation... is undone.',11332,1,0,0,'kazzak SAY_INTRO'),
+(-1000376,'The Legion will conquer all!',11333,1,0,0,'kazzak SAY_AGGRO1'),
+(-1000377,'All mortals will perish!',11334,1,0,0,'kazzak SAY_AGGRO2'),
+(-1000378,'All life must be eradicated!',11335,1,0,0,'kazzak SAY_SURPREME1'),
+(-1000379,'I\'ll rip the flesh from your bones!',11336,1,0,0,'kazzak SAY_SURPREME2'),
+(-1000380,'Kirel Narak!',11337,1,0,0,'kazzak SAY_KILL1'),
+(-1000381,'Contemptible wretch!',11338,1,0,0,'kazzak SAY_KILL2'),
+(-1000382,'The universe will be remade.',11339,1,0,0,'kazzak SAY_KILL3'),
+(-1000383,'The Legion... will never... fall.',11340,1,0,0,'kazzak SAY_DEATH'),
+(-1000384,'%s goes into a frenzy!',0,2,0,0,'kazzak EMOTE_FRENZY'),
+(-1000385,'Invaders, you dangle upon the precipice of oblivion! The Burning Legion comes and with it comes your end.',0,1,0,0,'kazzak SAY_RAND1'),
+(-1000386,'Impudent whelps, you only delay the inevitable. Where one has fallen, ten shall rise. Such is the will of Kazzak...',0,1,0,0,'kazzak SAY_RAND2'),
+
+(-1000387,'Do not proceed. You will be eliminated!',11344,1,0,0,'doomwalker SAY_AGGRO'),
+(-1000388,'Tectonic disruption commencing.',11345,1,0,0,'doomwalker SAY_EARTHQUAKE_1'),
+(-1000389,'Magnitude set. Release.',11346,1,0,0,'doomwalker SAY_EARTHQUAKE_2'),
+(-1000390,'Trajectory locked.',11347,1,0,0,'doomwalker SAY_OVERRUN_1'),
+(-1000391,'Engage maximum speed.',11348,1,0,0,'doomwalker SAY_OVERRUN_2'),
+(-1000392,'Threat level zero.',11349,1,0,0,'doomwalker SAY_SLAY_1'),
+(-1000393,'Directive accomplished.',11350,1,0,0,'doomwalker SAY_SLAY_2'),
+(-1000394,'Target exterminated.',11351,1,0,0,'doomwalker SAY_SLAY_3'),
+(-1000395,'System failure in five, f-o-u-r...',11352,1,0,0,'doomwalker SAY_DEATH');

sql/updates/970_world_scripts.sql

@@ -0,0 +1,9 @@
+DELETE FROM script_texts WHERE entry BETWEEN -1000401 AND -1000396;
+INSERT INTO script_texts (entry, content_default, type, language, comment) VALUES
+(-1000396, 'Muahahahaha! You fool! You\'ve released me from my banishment in the interstices between space and time!', 0, 0, 'mobs_nether_drake - SAY_NIHIL_1'),
+(-1000397, 'All of Draenor shall quick beneath my feet! I will destroy this world and reshape it in my image!', 0, 0, 'mobs_nether_drake - SAY_NIHIL_2'),
+(-1000398, 'Where shall I begin? I cannot bother myself with a worm such as yourself. There is a world to be conquered!', 0, 0, 'mobs_nether_Drake - SAY_NIHIL_3'),
+(-1000399, 'No doubt the fools that banished me are long dead. I shall take wing survey my demense. Pray to whatever gods you hold dear that we do not meet again.', 0, 0, 'mobs_nether_drake - SAY_NIHIL_4'),
+(-1000400, 'NOOOOooooooo!', 1, 0, 'mobs_nether_drake - SAY_NIHIL_INTERRUPT'),
+
+(-1000401, 'Good $N, you are under the spell\'s influence. I must analyze it quickly, then we can talk.', 0, 7, 'npc_daranelle - SAY_DARANELLE');

sql/updates/CMakeLists.txt

@@ -158,4 +158,7 @@ INSTALL(FILES
 956_world_scripts.sql
 957_world_scripts.sql
 963_world_scripts.sql
+965_world_scripts.sql
+966_world_scripts.sql
+970_world_scripts.sql
 DESTINATION share/trinity/sql/updates)

sql/world_scripts_full.sql

@@ -720,7 +720,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_overlord_morghor' WHERE entry=
 UPDATE `creature_template` SET `ScriptName`='' WHERE entry=23141;
 UPDATE `creature_template` SET `ScriptName`='mob_illidari_spawn' WHERE `entry` IN (22075, 22074, 19797);
 UPDATE `creature_template` SET `ScriptName`='mob_torloth_the_magnificent' WHERE `entry`='22076';
-UPDATE `creature_template  SET `ScriptName`='npc_lord_illidan_stormrage' WHERE `entry`=22083;
+UPDATE `creature_template` SET `ScriptName`='npc_lord_illidan_stormrage' WHERE `entry`=22083;
 UPDATE `creature_template` SET `ScriptName`='npc_earthmender_wilda' WHERE `entry`=21027;
 
 /* SHATTRATH */