Core/Scripting: Misc Cleanup.

This commit is contained in:
Malcrom committed 2013-01-13 01:38:28 -03:30
1 parent 0fe10ce283
commit d7383717ea
5 files changed
+69 -49

No files matched your search

@@ -45,32 +45,37 @@ EndScriptData */
#define YELL_BERSERK "Whatch you be doing? Pissin' yourselves..."
#define SOUND_BERSERK 12025
#define SPELL_DUAL_WIELD 29651
#define SPELL_SABER_LASH 43267
#define SPELL_FRENZY 43139
#define SPELL_FLAMESHOCK 43303
#define SPELL_EARTHSHOCK 43305
#define SPELL_TRANSFORM_SPLIT 43142
#define SPELL_TRANSFORM_SPLIT2 43573
#define SPELL_TRANSFORM_MERGE 43271
#define SPELL_SUMMON_LYNX 43143
#define SPELL_SUMMON_TOTEM 43302
#define SPELL_BERSERK 45078
enum Spells
{
SPELL_DUAL_WIELD = 29651,
SPELL_SABER_LASH = 43267,
SPELL_FRENZY = 43139,
SPELL_FLAMESHOCK = 43303,
SPELL_EARTHSHOCK = 43305,
SPELL_TRANSFORM_SPLIT = 43142,
SPELL_TRANSFORM_SPLIT2 = 43573,
SPELL_TRANSFORM_MERGE = 43271,
SPELL_SUMMON_LYNX = 43143,
SPELL_SUMMON_TOTEM = 43302,
SPELL_BERSERK = 45078,
SPELL_LYNX_FRENZY = 43290, // Used by Spirit Lynx
SPELL_SHRED_ARMOR = 43243 // Used by Spirit Lynx
};
#define MOB_SPIRIT_LYNX 24143
#define SPELL_LYNX_FRENZY 43290
#define SPELL_SHRED_ARMOR 43243
#define MOB_TOTEM 24224
enum Hal_CreatureIds
{
NPC_SPIRIT_LYNX = 24143,
NPC_TOTEM = 24224
};
enum PhaseHalazzi
{
PHASE_NONE = 0,
PHASE_LYNX = 1,
PHASE_SPLIT = 2,
PHASE_HUMAN = 3,
PHASE_MERGE = 4,
PHASE_ENRAGE = 5
PHASE_NONE = 0,
PHASE_LYNX = 1,
PHASE_SPLIT = 2,
PHASE_HUMAN = 3,
PHASE_MERGE = 4,
PHASE_ENRAGE = 5
};
class boss_halazzi : public CreatureScript
@@ -134,7 +139,7 @@ class boss_halazzi : public CreatureScript
void JustSummoned(Creature* summon)
{
summon->AI()->AttackStart(me->getVictim());
if (summon->GetEntry() == MOB_SPIRIT_LYNX)
if (summon->GetEntry() == NPC_SPIRIT_LYNX)
LynxGUID = summon->GetGUID();
}
@@ -183,7 +188,7 @@ class boss_halazzi : public CreatureScript
break;
case PHASE_HUMAN:
//DoCast(me, SPELL_SUMMON_LYNX, true);
DoSpawnCreature(MOB_SPIRIT_LYNX, 5, 5, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
DoSpawnCreature(NPC_SPIRIT_LYNX, 5, 5, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
me->SetMaxHealth(400000);
me->SetHealth(400000);
ShockTimer = 10000;
@@ -413,3 +418,4 @@ void AddSC_boss_halazzi()
new mob_halazzi_lynx();
}
@@ -26,13 +26,16 @@ EndScriptData */
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#define SPELL_SHADOWVOLLEY 21341
#define SPELL_CLEAVE 20677
#define SPELL_THUNDERCLAP 23931
#define SPELL_TWISTEDREFLECTION 21063
#define SPELL_VOIDBOLT 21066
#define SPELL_RAGE 21340
#define SPELL_CAPTURESOUL 21054
enum Spells
{
SPELL_SHADOWVOLLEY = 21341,
SPELL_CLEAVE = 20677,
SPELL_THUNDERCLAP = 23931,
SPELL_TWISTEDREFLECTION = 21063,
SPELL_VOIDBOLT = 21066,
SPELL_RAGE = 21340,
SPELL_CAPTURESOUL = 21054
};
class boss_kruul : public CreatureScript
{
@@ -20,25 +20,33 @@
#include "naxxramas.h"
#include "SpellInfo.h"
#define SPELL_BOMBARD_SLIME 28280
enum Spells
{
SPELL_BOMBARD_SLIME = 28280,
SPELL_POISON_CLOUD = 28240,
SPELL_MUTATING_INJECTION = 28169,
SPELL_SLIME_SPRAY = 28157,
H_SPELL_SLIME_SPRAY = 54364,
SPELL_BERSERK = 26662,
SPELL_POISON_CLOUD_ADD = 59116
};
#define SPELL_POISON_CLOUD 28240
#define SPELL_MUTATING_INJECTION 28169
#define SPELL_SLIME_SPRAY RAID_MODE(28157, 54364)
#define SPELL_BERSERK 26662
#define SPELL_POISON_CLOUD_ADD 59116
enum Events
{
EVENT_BERSERK = 0,
EVENT_CLOUD = 1,
EVENT_INJECT = 2,
EVENT_SPRAY = 3
};
#define EVENT_BERSERK 1
#define EVENT_CLOUD 2
#define EVENT_INJECT 3
#define EVENT_SPRAY 4
#define MOB_FALLOUT_SLIME 16290
enum CreatureId
{
MOB_FALLOUT_SLIME = 16290
};
class boss_grobbulus : public CreatureScript
{
public:
boss_grobbulus() : CreatureScript("boss_grobbulus") { }
public: boss_grobbulus() : CreatureScript("boss_grobbulus") { }
CreatureAI* GetAI(Creature* creature) const
{
@@ -28,7 +28,7 @@ enum Spells
SPELL_ARCANE_BUFFET_H = 59485,
SPELL_SUMMON_ETHEREAL_SPHERE_1 = 54102,
SPELL_SUMMON_ETHEREAL_SPHERE_2 = 54137,
SPELL_SUMMON_ETHEREAL_SPHERE_3 = 54138,
SPELL_SUMMON_ETHEREAL_SPHERE_3 = 54138
};
enum NPCs
@@ -42,7 +42,7 @@ enum CreatureSpells
SPELL_ARCANE_POWER = 54160,
H_SPELL_ARCANE_POWER = 59474,
SPELL_SUMMON_PLAYERS = 54164,
SPELL_POWER_BALL_VISUAL = 54141,
SPELL_POWER_BALL_VISUAL = 54141
};
enum Yells
@@ -26,8 +26,11 @@ EndScriptData */
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#define SPELL_FOUL_SPORES 31673
#define SPELL_ACID_GEYSER 38739
enum Spells
{
SPELL_FOUL_SPORES = 31673,
SPELL_ACID_GEYSER = 38739
};
class boss_hungarfen : public CreatureScript
{