aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortkrokli <tkrokli@users.noreply.github.com>2016-09-24 19:20:12 +0200
committerjoschiwald <joschiwald.trinity@gmail.com>2017-03-03 22:31:29 +0100
commite13fadf8e9a6d17bae06fe41096cd19fea16ba0f (patch)
treeecee8f2e6a7e071168df0ff0aa17f31995ebdd0c
parent9d09307e344fbfe7e0b7ac9b65de45229d11b483 (diff)
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 (cherry picked from commit cd6fcce84b0aefb2f5d0494cbfdbb5bf25061f2f)
-rw-r--r--sql/updates/world/master/2017_03_03_08_world_2016_09_24_08_world.sql4
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp12
2 files changed, 11 insertions, 5 deletions
diff --git a/sql/updates/world/master/2017_03_03_08_world_2016_09_24_08_world.sql b/sql/updates/world/master/2017_03_03_08_world_2016_09_24_08_world.sql
new file mode 100644
index 00000000000..cb1a823ba43
--- /dev/null
+++ b/sql/updates/world/master/2017_03_03_08_world_2016_09_24_08_world.sql
@@ -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');
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
index ee25b95bcb3..0d766785627 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -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;