diff options
| author | Machiavelli <none@none> | 2009-08-17 01:43:26 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-08-17 01:43:26 +0200 |
| commit | ef9a1985e9fa28ffb3ac3c666fa8f97f868754bd (patch) | |
| tree | e56f2433def7acb59a08252e07705e048ac575ed /sql | |
| parent | fa20274a9188162871f48056767b857ddcba6778 (diff) | |
| parent | 55087b5e72d1945ead5d30d12e6746b137312e50 (diff) | |
*Merge
--HG--
branch : trunk
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/FULL/world_script_texts.sql | 2 | ||||
| -rw-r--r-- | sql/FULL/world_scripts_full.sql | 3 |
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; |