diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-08 20:28:12 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-12-08 20:28:12 +0100 |
| commit | 89f381b1ff8cd8374488b81c7f5111fbc6af884b (patch) | |
| tree | 2159ebea9570dd6401816a8bfaaf32d71984ef4d | |
| parent | e8be55aa8b3facd776303a34acf6048f50dcfa51 (diff) | |
| parent | 0e37faf2022aed2b54f337950e8a209e6538613f (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
| -rw-r--r-- | sql/updates/world/2013_12_08_00_world_creature_text.sql | 8 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp | 12 |
2 files changed, 18 insertions, 2 deletions
diff --git a/sql/updates/world/2013_12_08_00_world_creature_text.sql b/sql/updates/world/2013_12_08_00_world_creature_text.sql new file mode 100644 index 00000000000..4dfc579047b --- /dev/null +++ b/sql/updates/world/2013_12_08_00_world_creature_text.sql @@ -0,0 +1,8 @@ +-- Talk text for Glutton +SET @ENTRY := 8567; +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,'Me smell stench of the living!',14,0,100,0,0,5823, 'Glutton - SAY_AGGRO'), +(@ENTRY,1,0,'Me feast on you all!',14,0,100,0,0,5824, 'Glutton - SAY_SLAY'), +(@ENTRY,2,0,'%s is getting hungry!',16,0,100,0,0,0, 'Glutton - EMOTE_50%'), +(@ENTRY,3,0,'%s is getting VERY hungry!',16,0,100,0,0,0, 'Glutton - EMOTE 15%'); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp index a249013bd6a..b75fcad64a5 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp @@ -21,8 +21,10 @@ enum Say { - SAY_HP50 = 0, - SAY_HP15 = 1 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_HP50 = 2, + SAY_HP15 = 3 }; enum Spells @@ -50,6 +52,12 @@ public: void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); + Talk(SAY_AGGRO); + } + + void KilledUnit(Unit* /*victim*/) OVERRIDE + { + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) OVERRIDE |