Core/Scripts: move #define to enum/boss emote to DB (#17967)

boss_lurker_below.cpp : remove deprecated #define entries
- remove hardcoded text, use creature_text/broadcast_text
- move #define value & text reference to enum section
- replace TextEmote() with Talk() pointing to DB entry
This commit is contained in:
tkrokli
2016-09-24 19:20:12 +02:00
committed by GitHub
parent c4865fe63e
commit cd6fcce84b
2 changed files with 11 additions and 5 deletions

View File

@@ -0,0 +1,4 @@
-- NPC 21217 The Lurker Below, emote (41) text
DELETE FROM `creature_text` WHERE `entry` = 21217;
INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
(21217, 0,0, '%s takes a deep breath.', 41, 0, 100, 0, 0, 0, 20021, 1, 'The Lurker Below - EMOTE_SPOUT');

View File

@@ -50,16 +50,18 @@ enum Spells
SPELL_HAMSTRING = 26211
};
enum Misc
{
EMOTE_SPOUT = 0, // "The Lurker Below takes a deep breath."
SPOUT_DIST = 100
};
enum Creatures
{
NPC_COILFANG_GUARDIAN = 21873,
NPC_COILFANG_AMBUSHER = 21865
};
#define EMOTE_SPOUT "The Lurker Below takes a deep breath."
#define SPOUT_DIST 100
float AddPos[9][3] =
{
// MOVE_AMBUSHER_1 X, Y, Z
@@ -240,7 +242,7 @@ public:
if (SpoutTimer <= diff)
{
me->TextEmote(EMOTE_SPOUT, nullptr, true);
Talk(EMOTE_SPOUT);
me->SetReactState(REACT_PASSIVE);
me->GetMotionMaster()->MoveRotate(20000, urand(0, 1) ? ROTATE_DIRECTION_LEFT : ROTATE_DIRECTION_RIGHT);
SpoutTimer = 45000;