Skip to content

Commit

Permalink
Core/Scripts: Zul'Aman boss script text cleanup
Browse files Browse the repository at this point in the history 
Replacing more hardcoded text with DB entries.
A little bit extra enum alignment and sorting.
  • Loading branch information
tkrokli committed Feb 29, 2016
1 parent f9eff81 commit 9806f78
Show file tree
Hide file tree
Showing 3 changed files with 162 additions and 126 deletions.
27 changes: 27 additions & 0 deletions sql/updates/world/2016_02_29_ZULAMAN_world.sql
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 changes: 72 additions & 67 deletions src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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;
}
Expand All @@ -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)
Expand Down Expand Up @@ -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;
Expand All @@ -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
Expand Down

1 comment on commit 9806f78

@joschiwald
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds should be removed from cpp since they are handled by creaturetext

Please sign in to comment.