aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorKudlaty <none@none>2009-08-16 17:54:31 +0200
committerKudlaty <none@none>2009-08-16 17:54:31 +0200
commit9ddfd5bf22269f8622f72ee3797a56b0dcc37422 (patch)
tree78f2f3bb01b95b453f2c9cfe6a9b2806e4178cb1 /sql
parent683848679649994f048a526be55f776644165827 (diff)
Merge [SD2]
r1307 Add gossip for npc_tracy_proudwell. Patch by hoshie r1308 Fixed one not initialized array. r1309 Correct typo in folder name. - skip r1310 Enable faction change and remove unitState at attackStart for script related to quest 1560 --HG-- branch : trunk
Diffstat (limited to 'sql')
-rw-r--r--sql/FULL/world_scripts_full.sql1
-rw-r--r--sql/updates/5092_world_scripts.sql1
2 files changed, 2 insertions, 0 deletions
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index 81350d1cd44..af5e9af4800 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -550,6 +550,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_wounded_blood_elf' WHERE `entry
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;
/* HILLSBRAD FOOTHILLS */
diff --git a/sql/updates/5092_world_scripts.sql b/sql/updates/5092_world_scripts.sql
new file mode 100644
index 00000000000..bd9535181af
--- /dev/null
+++ b/sql/updates/5092_world_scripts.sql
@@ -0,0 +1 @@
+UPDATE creature_template SET ScriptName='npc_tracy_proudwell' WHERE entry=18266;