aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp28
-rw-r--r--src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp56
2 files changed, 18 insertions, 66 deletions
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
index a28c8c1b747..5ec57fc44b6 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
@@ -39,16 +39,6 @@ enum Yells
YELL_DEATH = 5
};
-enum Sounds
-{
- SOUND_YELL_AGGRO = 12041,
- SOUND_YELL_KILL_ONE = 12043,
- SOUND_YELL_KILL_TWO = 12044,
- SOUND_YELL_DRAIN_POWER = 12046,
- SOUND_YELL_SPIRIT_BOLTS = 12047,
- SOUND_YELL_DEATH = 12051
-};
-
enum Creatures
{
NPC_TEMP_TRIGGER = 23920
@@ -311,8 +301,7 @@ class boss_hexlord_malacrass : public CreatureScript
instance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS);
DoZoneInCombat();
- Talk(YELL_AGGRO, me);
- DoPlaySoundToSet(me, SOUND_YELL_AGGRO);
+ Talk(YELL_AGGRO);
for (uint8 i = 0; i < 4; ++i)
{
@@ -332,12 +321,10 @@ class boss_hexlord_malacrass : public CreatureScript
switch (urand(0, 1))
{
case 0:
- Talk(YELL_KILL_ONE, me);
- DoPlaySoundToSet(me, SOUND_YELL_KILL_ONE);
+ Talk(YELL_KILL_ONE);
break;
case 1:
- Talk(YELL_KILL_TWO, me);
- DoPlaySoundToSet(me, SOUND_YELL_KILL_TWO);
+ Talk(YELL_KILL_TWO);
break;
}
}
@@ -346,8 +333,7 @@ class boss_hexlord_malacrass : public CreatureScript
{
instance->SetData(DATA_HEXLORDEVENT, DONE);
- Talk(YELL_DEATH, me);
- DoPlaySoundToSet(me, SOUND_YELL_DEATH);
+ Talk(YELL_DEATH);
for (uint8 i = 0; i < 4; ++i)
{
@@ -420,8 +406,7 @@ class boss_hexlord_malacrass : public CreatureScript
if (DrainPower_Timer <= diff)
{
DoCast(me, SPELL_DRAIN_POWER, true);
- Talk(YELL_DRAIN_POWER, me);
- DoPlaySoundToSet(me, SOUND_YELL_DRAIN_POWER);
+ Talk(YELL_DRAIN_POWER);
DrainPower_Timer = urand(40000, 55000); // must cast in 60 sec, or buff/debuff will disappear
} else DrainPower_Timer -= diff;
@@ -432,8 +417,7 @@ class boss_hexlord_malacrass : public CreatureScript
else
{
DoCast(me, SPELL_SPIRIT_BOLTS, false);
- Talk(YELL_SPIRIT_BOLTS, me);
- DoPlaySoundToSet(me, SOUND_YELL_SPIRIT_BOLTS);
+ Talk(YELL_SPIRIT_BOLTS);
SpiritBolts_Timer = 40000;
SiphonSoul_Timer = 10000; // ready to drain
PlayerAbility_Timer = 99999;
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
index bb63e297674..0407cb6cd7c 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
@@ -50,26 +50,6 @@ enum Yells
// YELL_NALORAKK_EVENT2 = 13
};
-enum Sounds
-{
- SOUND_NALORAKK_WAVE1 = 12066,
- SOUND_NALORAKK_WAVE2 = 12067,
- SOUND_NALORAKK_WAVE3 = 12068,
- SOUND_NALORAKK_WAVE4 = 12069,
- SOUND_YELL_AGGRO = 12070,
- SOUND_YELL_SURGE = 12071,
- SOUND_YELL_TOBEAR = 12072,
- SOUND_YELL_TOTROLL = 12073,
- SOUND_YELL_BERSERK = 12074,
- SOUND_YELL_KILL_ONE = 12075,
- SOUND_YELL_KILL_TWO = 12076,
- SOUND_YELL_DEATH = 12077
-
-// Not yet implemented
-// SOUND_NALORAKK_EVENT1 = 12078,
-// SOUND_NALORAKK_EVENT2 = 12079
-};
-
enum Spells
{
// Troll form
@@ -231,8 +211,7 @@ class boss_nalorakk : public CreatureScript
case 0:
if (me->IsWithinDistInMap(who, 50))
{
- Talk(YELL_NALORAKK_WAVE1, me);
- DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE1);
+ Talk(YELL_NALORAKK_WAVE1);
(*me).GetMotionMaster()->MovePoint(1, NalorakkWay[1][0], NalorakkWay[1][1], NalorakkWay[1][2]);
MovePhase ++;
@@ -244,8 +223,7 @@ class boss_nalorakk : public CreatureScript
case 2:
if (me->IsWithinDistInMap(who, 40))
{
- Talk(YELL_NALORAKK_WAVE2, me);
- DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE2);
+ Talk(YELL_NALORAKK_WAVE2);
(*me).GetMotionMaster()->MovePoint(3, NalorakkWay[3][0], NalorakkWay[3][1], NalorakkWay[3][2]);
MovePhase ++;
@@ -257,8 +235,7 @@ class boss_nalorakk : public CreatureScript
case 5:
if (me->IsWithinDistInMap(who, 40))
{
- Talk(YELL_NALORAKK_WAVE3, me);
- DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE3);
+ Talk(YELL_NALORAKK_WAVE3);
(*me).GetMotionMaster()->MovePoint(6, NalorakkWay[6][0], NalorakkWay[6][1], NalorakkWay[6][2]);
MovePhase ++;
@@ -272,8 +249,7 @@ class boss_nalorakk : public CreatureScript
{
SendAttacker(who);
- Talk(YELL_NALORAKK_WAVE4, me);
- DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE4);
+ Talk(YELL_NALORAKK_WAVE4);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -291,8 +267,7 @@ class boss_nalorakk : public CreatureScript
{
instance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS);
- Talk(YELL_AGGRO, me);
- DoPlaySoundToSet(me, SOUND_YELL_AGGRO);
+ Talk(YELL_AGGRO);
DoZoneInCombat();
}
@@ -300,8 +275,7 @@ class boss_nalorakk : public CreatureScript
{
instance->SetData(DATA_NALORAKKEVENT, DONE);
- Talk(YELL_DEATH, me);
- DoPlaySoundToSet(me, SOUND_YELL_DEATH);
+ Talk(YELL_DEATH);
}
void KilledUnit(Unit* /*victim*/) override
@@ -309,12 +283,10 @@ class boss_nalorakk : public CreatureScript
switch (urand(0, 1))
{
case 0:
- Talk(YELL_KILL_ONE, me);
- DoPlaySoundToSet(me, SOUND_YELL_KILL_ONE);
+ Talk(YELL_KILL_ONE);
break;
case 1:
- Talk(YELL_KILL_TWO, me);
- DoPlaySoundToSet(me, SOUND_YELL_KILL_TWO);
+ Talk(YELL_KILL_TWO);
break;
}
}
@@ -377,8 +349,7 @@ class boss_nalorakk : public CreatureScript
if (Berserk_Timer <= diff)
{
DoCast(me, SPELL_BERSERK, true);
- Talk(YELL_BERSERK, me);
- DoPlaySoundToSet(me, SOUND_YELL_BERSERK);
+ Talk(YELL_BERSERK);
Berserk_Timer = 600000;
} else Berserk_Timer -= diff;
@@ -387,8 +358,7 @@ class boss_nalorakk : public CreatureScript
if (inBearForm)
{
// me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, 5122);
- Talk(YELL_SHIFTEDTOTROLL, me);
- DoPlaySoundToSet(me, SOUND_YELL_TOTROLL);
+ Talk(YELL_SHIFTEDTOTROLL);
me->RemoveAurasDueToSpell(SPELL_BEARFORM);
Surge_Timer = urand(15000, 20000);
BrutalSwipe_Timer = urand(7000, 12000);
@@ -399,8 +369,7 @@ class boss_nalorakk : public CreatureScript
else
{
// me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, 0);
- Talk(YELL_SHIFTEDTOBEAR, me);
- DoPlaySoundToSet(me, SOUND_YELL_TOBEAR);
+ Talk(YELL_SHIFTEDTOBEAR);
DoCast(me, SPELL_BEARFORM, true);
LaceratingSlash_Timer = 2000; // dur 18s
RendFlesh_Timer = 3000; // dur 5s
@@ -430,8 +399,7 @@ class boss_nalorakk : public CreatureScript
if (Surge_Timer <= diff)
{
- Talk(YELL_SURGE, me);
- DoPlaySoundToSet(me, SOUND_YELL_SURGE);
+ Talk(YELL_SURGE);
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true);
if (target)
DoCast(target, SPELL_SURGE);