Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

This commit is contained in:
Vincent_Michael
2013-01-17 23:49:26 +01:00
6 changed files with 60 additions and 40 deletions

View File

@@ -0,0 +1,4 @@
-- Add some missing go gossip
DELETE FROM `gossip_menu` WHERE `entry` IN (6448,6449,6450,6451);
INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
(6448,7669),(6449,7670),(6450,7673),(6451,7674);

View File

@@ -0,0 +1,7 @@
-- Text for Crushridge Warmonger
SET @ENTRY := 2287;
DELETE FROM `creature_text` WHERE `entry`=@ENTRY;
INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
(@ENTRY,0,0,'Raaar!!! Me smash $R',12,0,100,0,0,0,'Crushridge Warmonger'),
(@ENTRY,0,1,'Me smash! You die!',12,0,100,0,0,0,'Crushridge Warmonger'),
(@ENTRY,0,2,'I''ll crush you!',12,0,100,0,0,0,'Crushridge Warmonger');

View File

@@ -0,0 +1,2 @@
-- proper faction for Bran in Halls of Stone
UPDATE `creature_template` SET `faction_A`=1665,`faction_H`=1665 WHERE `entry` IN (28070,31366);