Merge [SD2]

r1331 Delete old .patch files no longer needed. - skip
r1332 Clean up script for end boss in TK and apply SD2 code style. Patch by Abim - skip
r1333 Remove workaround ai's and correct spells to be casted for Flame Strike - skip
r1334 Add misc gossip for npc_timothy_daniels and npc_trollbane. Patch by hoshie
r1335 Correct order of dwarf attack for BRD seven event. Also add missing text and remove wrong gossip. Patch by jotapdiez - skip
r1336 Add support for quest 12573. Patch by Azuritus
r1337 Set eol-style where missing, since i have no fantasy to do other changes for a l33t revision. - skip
r1338 Trim trailing whitespace in files. - skip
r1339 Fix my mistake in rev 1336 and add script where it should be.
r1340 Correct inconsistent use of line endings and set eol-style to custom patch. - skip

--HG--
branch : trunk

2 files changed, 4 insertions, 1 deletions

diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index fd2cc390d85..3c0ef426d4e 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -149,7 +149,7 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content
 (-1000205,'%s looks at you unexpectadly.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, 0, 0,'cluck EMOTE_H_HELLO'),
 (-1000206,'%s starts pecking at the feed.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, 0, 0,'cluck EMOTE_CLUCK_TEXT2'),
 (-1000207,'You have my blessing', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,'ashyen_and_keleth SAY_REWARD_BLESS'),
-(-1000208,'UNUSED', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,'REUSE ME'),
+(-1000208,'Frenzyheart kill you if you come back. You no welcome here no more!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,'vekjik SAY_TEXTID_VEKJIK1'),
 (-1000209,'Very well. Let''s see what you have to show me, $N.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 1, 0,'anvilward SAY_ANVIL1'),
 (-1000210,'What manner of trick is this, $R? If you seek to ambush me, I warn you I will not go down quietly!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 1, 0,'anvilward SAY_ANVIL2'),
 (-1000211,'Warning! %s emergency shutdown process initiated by $N. Shutdown will complete in two minutes.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, 0, 0,'manaforge_control EMOTE_START'),
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index ae503cd4e47..c0fa1b9efa8 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -551,6 +551,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_aeranas' WHERE `entry`=17085;
 UPDATE `gameobject_template` SET `ScriptName`='go_haaleshi_altar' WHERE `entry`=181606;
 UPDATE `creature_template` SET `ScriptName`='npc_naladu' WHERE `entry`=19361;
 UPDATE `creature_template` SET `ScriptName`='npc_tracy_proudwell' WHERE `entry`=18266;
+UPDATE `creature_template` SET `ScriptName`='npc_trollbane' WHERE `entry`=16819;
 
 /* HILLSBRAD FOOTHILLS */
 
@@ -560,6 +561,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_rinji' WHERE `entry`=7780;
 
 /* ICECROWN */
 UPDATE creature_template SET ScriptName='npc_arete' WHERE entry=29344;
+UPDATE creature_template SET ScriptName='npc_vekjik' WHERE entry=28315;
 
 /* IRONFORGE */
 UPDATE `creature_template` SET `ScriptName`='npc_royal_historian_archesonus' WHERE `entry`=8879;
@@ -1101,6 +1103,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_cooshcoosh' WHERE `entry`=18586
 UPDATE `creature_template` SET `ScriptName`='npc_elder_kuruti' WHERE `entry`=18197;
 UPDATE `creature_template` SET `ScriptName`='npc_mortog_steamhead' WHERE `entry`=23373;
 UPDATE `creature_template` SET `ScriptName`='npc_kayra_longmane' WHERE `entry`=17969;
+UPDATE `creature_template` SET `ScriptName`='npc_timothy_daniels' WHERE `entry`=18019;
 
 /* ZUL'AMAN */
 UPDATE `instance_template` SET `script`='instance_zulaman' WHERE `map`=568;