diff options
| -rw-r--r-- | sql/updates/world/2013_01_07_14_world_creature_text.sql | 4 | ||||
| -rw-r--r-- | src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sql/updates/world/2013_01_07_14_world_creature_text.sql b/sql/updates/world/2013_01_07_14_world_creature_text.sql new file mode 100644 index 00000000000..d68eb93ff4e --- /dev/null +++ b/sql/updates/world/2013_01_07_14_world_creature_text.sql @@ -0,0 +1,4 @@ +-- Texts for Shirrak the Dead Watcher +DELETE FROM `creature_text` WHERE `entry`= 18371; +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(18371,0,0, '%s focuses on $n!',41,0,100,0,0,0, 'Shirrak the Dead Watcher - Emote Focus'); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index 1b0897f1d5e..8bb97fbe387 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -40,7 +40,10 @@ EndScriptData */ #define SPELL_FIERY_BLAST DUNGEON_MODE(N_SPELL_FIERY_BLAST, H_SPELL_FIERY_BLAST) #define SPELL_FOCUS_FIRE_VISUAL 42075 //need to find better visual -#define EMOTE_FOCUSES_ON "focuses on " +enum Emote +{ + EMOTE_FOCUSE = 0 +}; class boss_shirrak_the_dead_watcher : public CreatureScript { @@ -143,13 +146,7 @@ public: { FocusedTargetGUID = target->GetGUID(); me->SummonCreature(ENTRY_FOCUS_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5500); - - // TODO: Find better way to handle emote - // Emote - std::string emote(EMOTE_FOCUSES_ON); - emote.append(target->GetName()); - emote.push_back('!'); - me->MonsterTextEmote(emote.c_str(), 0, true); + Talk(EMOTE_FOCUSE); } FocusFire_Timer = 15000+(rand()%5000); } else FocusFire_Timer -= diff; |