Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 08:28:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16704 from tkrokli/zul_aman_text_cleanup

Browse Source 
Core/Scripts: Zul'Aman boss script text cleanup
This commit is contained in:
Aokromes
2016-02-29 03:40:24 +01:00
parent f9eff81388 9806f7812a
commit 1359a55aa2
3 changed files with 162 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sql/updates/world/2016_02_29_ZULAMAN_world.sql Normal file
View File

@@ -0,0 +1,27 @@
-- creature text 23576 Nalorakk + sound ID + broadcast_text ID
DELETE FROM `creature_text` WHERE `entry` = 23576 AND `type` = 14;
INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
(23576, 0,0, "Get da move on, guards! It be killin' time!", 14,0,100,0,0, 12066, 22144, 1, 'Nalorakk - YELL_NALORAKK_WAVE1'),
(23576, 1,0, "Guards, go already! Who you more afraid of, dem... or me?", 14,0,100,0,0, 12067, 22146, 1, 'Nalorakk - YELL_NALORAKK_WAVE2'),
(23576, 2,0, "Ride now! Ride out dere and bring me back some heads!", 14,0,100,0,0, 12068, 22151, 1, 'Nalorakk - YELL_NALORAKK_WAVE3'),
(23576, 3,0, "I be losin' me patience! Go on: make dem wish dey was never born!", 14,0,100,0,0, 12069, 22155, 1, 'Nalorakk - YELL_NALORAKK_WAVE4'),
(23576, 4,0, "You be dead soon enough!", 14,0,100,0,0, 12070, 23166, 1, 'Nalorakk - YELL_AGGRO'),
(23576, 5,0, "I bring da pain!", 14,0,100,0,0, 12071, 23167, 1, 'Nalorakk - YELL_SURGE'),
(23576, 6,0, "You call on da beast, you gonna get more dan you bargain for!", 14,0,100,0,0, 12072, 23168, 1, 'Nalorakk - YELL_SHIFTEDTOBEAR '),
(23576, 7,0, "Make way for da Nalorakk!", 14,0,100,0,0, 12073, 23169, 1, 'Nalorakk - YELL_SHIFTEDTOTROLL'),
(23576, 8,0, "You had your chance; now it be too late!", 14,0,100,0,0, 12074, 23170, 1, 'Nalorakk - YELL_BERSERK'),
(23576, 9,0, "Now whatchoo got to say?", 14,0,100,0,0, 12075, 23171, 1, 'Nalorakk - YELL_KILL_ONE'),
(23576, 10,0, "Da Amani gonna rule again!", 14,0,100,0,0, 12076, 23172, 1, 'Nalorakk - YELL_KILL_TWO'),
(23576, 11,0, "I... be waitin' on da udda side....", 14,0,100,0,0, 12077, 23173, 1, 'Nalorakk - YELL_DEATH'),
(23576, 12,0, "What could be better than servin' da bear spirit for eternity? Come closer now. Bring your souls to me!", 14,0,100,0,0, 12078, 23305, 1, 'Nalorakk - YELL_NALORAKK_EVENT1'),
(23576, 13,0, "I smell you, strangers. Don't be delayin' your fate. Come to me now. I make your sacrifice quick.", 14,0,100,0,0, 12079, 23306, 1, 'Nalorakk - YELL_NALORAKK_EVENT1');
-- creature text 24239 Hex Lord Malacrass + sound ID + broadcast_text ID
DELETE FROM `creature_text` WHERE `entry` = 24239 AND `type` = 14;
INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
(24239, 0,0, "Da shadow gonna fall on you....", 14,0,100,0,0, 12041, 23591, 1, 'Hex Lord Malacrass - YELL_AGGRO'),
(24239, 1,0, "Dis a nightmare ya don' wake up from!", 14,0,100,0,0, 12043, 23593, 1, 'Hex Lord Malacrass - YELL_KILL_ONE'),
(24239, 2,0, "Azzaga choogo zinn!", 14,0,100,0,0, 12044, 23594, 1, 'Hex Lord Malacrass - YELL_KILL_TWO'),
(24239, 3,0, "Darkness comin' for you....", 14,0,100,0,0, 12046, 23596, 1, 'Hex Lord Malacrass - YELL_DRAIN_POWER'),
(24239, 4,0, "Your soul gonna bleed!", 14,0,100,0,0, 12047, 23597, 1, 'Hex Lord Malacrass - YELL_SPIRIT_BOLTS'),
(24239, 5,0, "Dis not... da end for me!", 14,0,100,0,0, 12051, 23601, 1, 'Hex Lord Malacrass - YELL_DEATH');

139
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
View File

@@ -29,109 +29,114 @@ EndScriptData */
#include "SpellAuraEffects.h"
#include "zulaman.h"
#define YELL_AGGRO "Da shadow gonna fall on you... "
#define SOUND_YELL_AGGRO 12041
#define YELL_SPIRIT_BOLTS "Your soul gonna bleed!"
#define SOUND_YELL_SPIRIT_BOLTS 12047
#define YELL_DRAIN_POWER "Darkness comin\' for you"
#define SOUND_YELL_DRAIN_POWER 12046
#define YELL_KILL_ONE "Dis a nightmare ya don\' wake up from!"
#define SOUND_YELL_KILL_ONE 12043
#define YELL_KILL_TWO "Azzaga choogo zinn!"
#define SOUND_YELL_KILL_TWO 12044
#define YELL_DEATH "Dis not... da end of me..."
#define SOUND_YELL_DEATH 12051
enum Yells
{
YELL_AGGRO = 0,
YELL_KILL_ONE = 1,
YELL_KILL_TWO = 2,
YELL_DRAIN_POWER = 3,
YELL_SPIRIT_BOLTS = 4,
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
NPC_TEMP_TRIGGER = 23920
};
enum Spells
{
SPELL_SPIRIT_BOLTS = 43383,
SPELL_DRAIN_POWER = 44131,
SPELL_SIPHON_SOUL = 43501,
SPELL_SPIRIT_BOLTS = 43383,
SPELL_DRAIN_POWER = 44131,
SPELL_SIPHON_SOUL = 43501,
// Druid
SPELL_DR_THORNS = 43420,
SPELL_DR_LIFEBLOOM = 43421,
SPELL_DR_MOONFIRE = 43545,
SPELL_DR_THORNS = 43420,
SPELL_DR_LIFEBLOOM = 43421,
SPELL_DR_MOONFIRE = 43545,
// Hunter
SPELL_HU_EXPLOSIVE_TRAP = 43444,
SPELL_HU_FREEZING_TRAP = 43447,
SPELL_HU_SNAKE_TRAP = 43449,
SPELL_HU_EXPLOSIVE_TRAP = 43444,
SPELL_HU_FREEZING_TRAP = 43447,
SPELL_HU_SNAKE_TRAP = 43449,
// Mage
SPELL_MG_FIREBALL = 41383,
SPELL_MG_FROST_NOVA = 43426,
SPELL_MG_ICE_LANCE = 43427,
SPELL_MG_FROSTBOLT = 43428,
SPELL_MG_FIREBALL = 41383,
SPELL_MG_FROST_NOVA = 43426,
SPELL_MG_ICE_LANCE = 43427,
SPELL_MG_FROSTBOLT = 43428,
// Paladin
SPELL_PA_CONSECRATION = 43429,
SPELL_PA_AVENGING_WRATH = 43430,
SPELL_PA_HOLY_LIGHT = 43451,
SPELL_PA_CONSECRATION = 43429,
SPELL_PA_AVENGING_WRATH = 43430,
SPELL_PA_HOLY_LIGHT = 43451,
// Priest
SPELL_PR_HEAL = 41372,
SPELL_PR_MIND_BLAST = 41374,
SPELL_PR_SW_DEATH = 41375,
SPELL_PR_PSYCHIC_SCREAM = 43432,
SPELL_PR_MIND_CONTROL = 43550,
SPELL_PR_PAIN_SUPP = 44416,
SPELL_PR_HEAL = 41372,
SPELL_PR_MIND_BLAST = 41374,
SPELL_PR_SW_DEATH = 41375,
SPELL_PR_PSYCHIC_SCREAM = 43432,
SPELL_PR_MIND_CONTROL = 43550,
SPELL_PR_PAIN_SUPP = 44416,
// Rogue
SPELL_RO_BLIND = 43433,
SPELL_RO_SLICE_DICE = 43457,
SPELL_RO_WOUND_POISON = 43461,
SPELL_RO_BLIND = 43433,
SPELL_RO_SLICE_DICE = 43457,
SPELL_RO_WOUND_POISON = 43461,
// Shaman
SPELL_SH_CHAIN_LIGHT = 43435,
SPELL_SH_FIRE_NOVA = 43436,
SPELL_SH_HEALING_WAVE = 43548,
SPELL_SH_CHAIN_LIGHT = 43435,
SPELL_SH_FIRE_NOVA = 43436,
SPELL_SH_HEALING_WAVE = 43548,
// Warlock
SPELL_WL_CURSE_OF_DOOM = 43439,
SPELL_WL_RAIN_OF_FIRE = 43440,
SPELL_WL_UNSTABLE_AFFL = 43522,
SPELL_WL_UNSTABLE_AFFL_DISPEL = 43523,
SPELL_WL_CURSE_OF_DOOM = 43439,
SPELL_WL_RAIN_OF_FIRE = 43440,
SPELL_WL_UNSTABLE_AFFL = 43522,
SPELL_WL_UNSTABLE_AFFL_DISPEL = 43523,
// Warrior
SPELL_WR_MORTAL_STRIKE = 43441,
SPELL_WR_WHIRLWIND = 43442,
SPELL_WR_SPELL_REFLECT = 43443,
SPELL_WR_MORTAL_STRIKE = 43441,
SPELL_WR_WHIRLWIND = 43442,
SPELL_WR_SPELL_REFLECT = 43443,
// Thurg
SPELL_BLOODLUST = 43578,
SPELL_CLEAVE = 15496,
SPELL_BLOODLUST = 43578,
SPELL_CLEAVE = 15496,
// Gazakroth
SPELL_FIREBOLT = 43584,
SPELL_FIREBOLT = 43584,
// Alyson Antille
SPELL_FLASH_HEAL = 43575,
SPELL_DISPEL_MAGIC = 43577,
SPELL_FLASH_HEAL = 43575,
SPELL_DISPEL_MAGIC = 43577,
// Lord Raadan
SPELL_FLAME_BREATH = 43582,
SPELL_THUNDERCLAP = 43583,
SPELL_FLAME_BREATH = 43582,
SPELL_THUNDERCLAP = 43583,
// Darkheart
SPELL_PSYCHIC_WAIL = 43590,
SPELL_PSYCHIC_WAIL = 43590,
// Slither
SPELL_VENOM_SPIT = 43579,
SPELL_VENOM_SPIT = 43579,
// Fenstalker
SPELL_VOLATILE_INFECTION = 43586,
SPELL_VOLATILE_INFECTION = 43586,
// Koragg
SPELL_COLD_STARE = 43593,
SPELL_MIGHTY_BLOW = 43592
SPELL_COLD_STARE = 43593,
SPELL_MIGHTY_BLOW = 43592
};
#define ORIENT 1.5696f
@@ -306,7 +311,7 @@ class boss_hexlord_malacrass : public CreatureScript
instance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS);
DoZoneInCombat();
me->Yell(YELL_AGGRO, LANG_UNIVERSAL);
Talk(YELL_AGGRO, me);
DoPlaySoundToSet(me, SOUND_YELL_AGGRO);
for (uint8 i = 0; i < 4; ++i)
@@ -327,11 +332,11 @@ class boss_hexlord_malacrass : public CreatureScript
switch (urand(0, 1))
{
case 0:
me->Yell(YELL_KILL_ONE, LANG_UNIVERSAL);
Talk(YELL_KILL_ONE, me);
DoPlaySoundToSet(me, SOUND_YELL_KILL_ONE);
break;
case 1:
me->Yell(YELL_KILL_TWO, LANG_UNIVERSAL);
Talk(YELL_KILL_TWO, me);
DoPlaySoundToSet(me, SOUND_YELL_KILL_TWO);
break;
}
@@ -341,7 +346,7 @@ class boss_hexlord_malacrass : public CreatureScript
{
instance->SetData(DATA_HEXLORDEVENT, DONE);
me->Yell(YELL_DEATH, LANG_UNIVERSAL);
Talk(YELL_DEATH, me);
DoPlaySoundToSet(me, SOUND_YELL_DEATH);
for (uint8 i = 0; i < 4; ++i)
@@ -415,7 +420,7 @@ class boss_hexlord_malacrass : public CreatureScript
if (DrainPower_Timer <= diff)
{
DoCast(me, SPELL_DRAIN_POWER, true);
me->Yell(YELL_DRAIN_POWER, LANG_UNIVERSAL);
Talk(YELL_DRAIN_POWER, me);
DoPlaySoundToSet(me, SOUND_YELL_DRAIN_POWER);
DrainPower_Timer = urand(40000, 55000); // must cast in 60 sec, or buff/debuff will disappear
} else DrainPower_Timer -= diff;
@@ -427,7 +432,7 @@ class boss_hexlord_malacrass : public CreatureScript
else
{
DoCast(me, SPELL_SPIRIT_BOLTS, false);
me->Yell(YELL_SPIRIT_BOLTS, LANG_UNIVERSAL);
Talk(YELL_SPIRIT_BOLTS, me);
DoPlaySoundToSet(me, SOUND_YELL_SPIRIT_BOLTS);
SpiritBolts_Timer = 40000;
SiphonSoul_Timer = 10000; // ready to drain

122
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
View File

@@ -30,21 +30,61 @@ EndScriptData */
#include "GridNotifiersImpl.h"
#include "CellImpl.h"
enum Yells
{
YELL_NALORAKK_WAVE1 = 0,
YELL_NALORAKK_WAVE2 = 1,
YELL_NALORAKK_WAVE3 = 2,
YELL_NALORAKK_WAVE4 = 3,
YELL_AGGRO = 4,
YELL_SURGE = 5,
YELL_SHIFTEDTOBEAR = 6,
YELL_SHIFTEDTOTROLL = 7,
YELL_BERSERK = 8,
YELL_KILL_ONE = 9,
YELL_KILL_TWO = 10,
YELL_DEATH = 11
// Not yet implemented
// YELL_NALORAKK_EVENT1 = 12,
// 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
{
SPELL_BERSERK = 45078,
// Troll form
SPELL_BRUTALSWIPE = 42384,
SPELL_MANGLE = 42389,
SPELL_MANGLEEFFECT = 44955,
SPELL_SURGE = 42402,
SPELL_BEARFORM = 42377,
SPELL_BRUTALSWIPE = 42384,
SPELL_MANGLE = 42389,
SPELL_MANGLEEFFECT = 44955,
SPELL_SURGE = 42402,
SPELL_BEARFORM = 42377,
// Bear form
SPELL_LACERATINGSLASH = 42395,
SPELL_RENDFLESH = 42397,
SPELL_DEAFENINGROAR = 42398
SPELL_LACERATINGSLASH = 42395,
SPELL_RENDFLESH = 42397,
SPELL_DEAFENINGROAR = 42398,
SPELL_BERSERK = 45078
};
// Trash Waves
@@ -57,45 +97,9 @@ float NalorakkWay[8][3] =
{-79.929f, 1395.958f, 27.31f},
{-80.072f, 1374.555f, 40.87f}, // waypoint 3
{-80.072f, 1314.398f, 40.87f},
{-80.072f, 1295.775f, 48.60f} // waypoint 4
{-80.072f, 1295.775f, 48.60f} // waypoint 4
};
#define YELL_NALORAKK_WAVE1 "Get da move on, guards! It be killin' time!"
#define SOUND_NALORAKK_WAVE1 12066
#define YELL_NALORAKK_WAVE2 "Guards, go already! Who you more afraid of, dem... or me?"
#define SOUND_NALORAKK_WAVE2 12067
#define YELL_NALORAKK_WAVE3 "Ride now! Ride out dere and bring me back some heads!"
#define SOUND_NALORAKK_WAVE3 12068
#define YELL_NALORAKK_WAVE4 "I be losin' me patience! Go on: make dem wish dey was never born!"
#define SOUND_NALORAKK_WAVE4 12069
//Unimplemented SoundIDs
/*
#define SOUND_NALORAKK_EVENT1 12078
#define SOUND_NALORAKK_EVENT2 12079
*/
//General defines
#define YELL_AGGRO "You be dead soon enough!"
#define SOUND_YELL_AGGRO 12070
#define YELL_KILL_ONE "Mua-ha-ha! Now whatchoo got to say?"
#define SOUND_YELL_KILL_ONE 12075
#define YELL_KILL_TWO "Da Amani gonna rule again!"
#define SOUND_YELL_KILL_TWO 12076
#define YELL_DEATH "I... be waitin' on da udda side...."
#define SOUND_YELL_DEATH 12077
#define YELL_BERSERK "You had your chance, now it be too late!" //Never seen this being used, so just guessing from what I hear.
#define SOUND_YELL_BERSERK 12074
#define YELL_SURGE "I bring da pain!"
#define SOUND_YELL_SURGE 12071
#define YELL_SHIFTEDTOTROLL "Make way for Nalorakk!"
#define SOUND_YELL_TOTROLL 12073
#define YELL_SHIFTEDTOBEAR "You call on da beast, you gonna get more dan you bargain for!"
#define SOUND_YELL_TOBEAR 12072
class boss_nalorakk : public CreatureScript
{
public:
@@ -227,7 +231,7 @@ class boss_nalorakk : public CreatureScript
case 0:
if (me->IsWithinDistInMap(who, 50))
{
me->Yell(YELL_NALORAKK_WAVE1, LANG_UNIVERSAL);
Talk(YELL_NALORAKK_WAVE1, me);
DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE1);
(*me).GetMotionMaster()->MovePoint(1, NalorakkWay[1][0], NalorakkWay[1][1], NalorakkWay[1][2]);
@@ -240,7 +244,7 @@ class boss_nalorakk : public CreatureScript
case 2:
if (me->IsWithinDistInMap(who, 40))
{
me->Yell(YELL_NALORAKK_WAVE2, LANG_UNIVERSAL);
Talk(YELL_NALORAKK_WAVE2, me);
DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE2);
(*me).GetMotionMaster()->MovePoint(3, NalorakkWay[3][0], NalorakkWay[3][1], NalorakkWay[3][2]);
@@ -253,7 +257,7 @@ class boss_nalorakk : public CreatureScript
case 5:
if (me->IsWithinDistInMap(who, 40))
{
me->Yell(YELL_NALORAKK_WAVE3, LANG_UNIVERSAL);
Talk(YELL_NALORAKK_WAVE3, me);
DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE3);
(*me).GetMotionMaster()->MovePoint(6, NalorakkWay[6][0], NalorakkWay[6][1], NalorakkWay[6][2]);
@@ -268,7 +272,7 @@ class boss_nalorakk : public CreatureScript
{
SendAttacker(who);
me->Yell(YELL_NALORAKK_WAVE4, LANG_UNIVERSAL);
Talk(YELL_NALORAKK_WAVE4, me);
DoPlaySoundToSet(me, SOUND_NALORAKK_WAVE4);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -287,7 +291,7 @@ class boss_nalorakk : public CreatureScript
{
instance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS);
me->Yell(YELL_AGGRO, LANG_UNIVERSAL);
Talk(YELL_AGGRO, me);
DoPlaySoundToSet(me, SOUND_YELL_AGGRO);
DoZoneInCombat();
}
@@ -296,7 +300,7 @@ class boss_nalorakk : public CreatureScript
{
instance->SetData(DATA_NALORAKKEVENT, DONE);
me->Yell(YELL_DEATH, LANG_UNIVERSAL);
Talk(YELL_DEATH, me);
DoPlaySoundToSet(me, SOUND_YELL_DEATH);
}
@@ -305,11 +309,11 @@ class boss_nalorakk : public CreatureScript
switch (urand(0, 1))
{
case 0:
me->Yell(YELL_KILL_ONE, LANG_UNIVERSAL);
TAlk(YELL_KILL_ONE, me);
DoPlaySoundToSet(me, SOUND_YELL_KILL_ONE);
break;
case 1:
me->Yell(YELL_KILL_TWO, LANG_UNIVERSAL);
Talk(YELL_KILL_TWO, me);
DoPlaySoundToSet(me, SOUND_YELL_KILL_TWO);
break;
}
@@ -373,7 +377,7 @@ class boss_nalorakk : public CreatureScript
if (Berserk_Timer <= diff)
{
DoCast(me, SPELL_BERSERK, true);
me->Yell(YELL_BERSERK, LANG_UNIVERSAL);
Talk(YELL_BERSERK, me);
DoPlaySoundToSet(me, SOUND_YELL_BERSERK);
Berserk_Timer = 600000;
} else Berserk_Timer -= diff;
@@ -383,7 +387,7 @@ class boss_nalorakk : public CreatureScript
if (inBearForm)
{
// me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, 5122);
me->Yell(YELL_SHIFTEDTOTROLL, LANG_UNIVERSAL);
Talk(YELL_SHIFTEDTOTROLL, me);
DoPlaySoundToSet(me, SOUND_YELL_TOTROLL);
me->RemoveAurasDueToSpell(SPELL_BEARFORM);
Surge_Timer = urand(15000, 20000);
@@ -395,7 +399,7 @@ class boss_nalorakk : public CreatureScript
else
{
// me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, 0);
me->Yell(YELL_SHIFTEDTOBEAR, LANG_UNIVERSAL);
Talk(YELL_SHIFTEDTOBEAR, me);
DoPlaySoundToSet(me, SOUND_YELL_TOBEAR);
DoCast(me, SPELL_BEARFORM, true);
LaceratingSlash_Timer = 2000; // dur 18s
@@ -426,7 +430,7 @@ class boss_nalorakk : public CreatureScript
if (Surge_Timer <= diff)
{
me->Yell(YELL_SURGE, LANG_UNIVERSAL);
Talk(YELL_SURGE, me);
DoPlaySoundToSet(me, SOUND_YELL_SURGE);
Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true);
if (target)