diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-17 23:49:26 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-17 23:49:26 +0100 |
| commit | fbcb2e5335b2d8bd5d989c7cb346046258bf3203 (patch) | |
| tree | 8e52dc905db08b65516dbc68accec7fcd64203ab /sql | |
| parent | 7d6634e3636c6090139c1415d164329ff03bb95f (diff) | |
| parent | a74bd06ac7aef65f0c9955922ea60fc597e98dea (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'sql')
3 files changed, 13 insertions, 0 deletions
diff --git a/sql/updates/world/2013_01_16_00_world_gossip_menu.sql b/sql/updates/world/2013_01_16_00_world_gossip_menu.sql new file mode 100644 index 00000000000..1b0554931fa --- /dev/null +++ b/sql/updates/world/2013_01_16_00_world_gossip_menu.sql @@ -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); diff --git a/sql/updates/world/2013_01_16_01_world_creature_text.sql b/sql/updates/world/2013_01_16_01_world_creature_text.sql new file mode 100644 index 00000000000..69bdd91b886 --- /dev/null +++ b/sql/updates/world/2013_01_16_01_world_creature_text.sql @@ -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'); diff --git a/sql/updates/world/2013_01_17_00_world_creature_template.sql b/sql/updates/world/2013_01_17_00_world_creature_template.sql new file mode 100644 index 00000000000..af602096440 --- /dev/null +++ b/sql/updates/world/2013_01_17_00_world_creature_template.sql @@ -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); |