Scripts/Kalimdor: Maraudon

* Fixed basic coding standards.
- Fixed Enums in Defines.
This commit is contained in:
Bootz
2012-01-26 03:06:48 -06:00
parent bf4b83436a
commit b83aa17126
4 changed files with 57 additions and 38 deletions

View File

@@ -25,9 +25,12 @@ EndScriptData */
#include "ScriptPCH.h"
#define SPELL_WRATH 21807
#define SPELL_ENTANGLINGROOTS 12747
#define SPELL_CORRUPT_FORCES 21968
enum Spells
{
SPELL_WRATH = 21807,
SPELL_ENTANGLINGROOTS = 12747,
SPELL_CORRUPT_FORCES = 21968
};
class celebras_the_cursed : public CreatureScript
{
@@ -41,7 +44,7 @@ public:
struct celebras_the_cursedAI : public ScriptedAI
{
celebras_the_cursedAI(Creature* c) : ScriptedAI(c) {}
celebras_the_cursedAI(Creature* creature) : ScriptedAI(creature) {}
uint32 Wrath_Timer;
uint32 EntanglingRoots_Timer;
@@ -74,14 +77,16 @@ public:
if (target)
DoCast(target, SPELL_WRATH);
Wrath_Timer = 8000;
} else Wrath_Timer -= diff;
}
else Wrath_Timer -= diff;
//EntanglingRoots
if (EntanglingRoots_Timer <= diff)
{
DoCast(me->getVictim(), SPELL_ENTANGLINGROOTS);
EntanglingRoots_Timer = 20000;
} else EntanglingRoots_Timer -= diff;
}
else EntanglingRoots_Timer -= diff;
//CorruptForces
if (CorruptForces_Timer <= diff)
@@ -89,12 +94,12 @@ public:
me->InterruptNonMeleeSpells(false);
DoCast(me, SPELL_CORRUPT_FORCES);
CorruptForces_Timer = 20000;
} else CorruptForces_Timer -= diff;
}
else CorruptForces_Timer -= diff;
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_celebras_the_cursed()

View File

@@ -25,9 +25,12 @@ EndScriptData */
#include "ScriptPCH.h"
#define SPELL_KNOCKAWAY 18670
#define SPELL_TRAMPLE 5568
#define SPELL_LANDSLIDE 21808
enum Spells
{
SPELL_KNOCKAWAY = 18670,
SPELL_TRAMPLE = 5568,
SPELL_LANDSLIDE = 21808
};
class boss_landslide : public CreatureScript
{
@@ -41,7 +44,7 @@ public:
struct boss_landslideAI : public ScriptedAI
{
boss_landslideAI(Creature* c) : ScriptedAI(c) {}
boss_landslideAI(Creature* creature) : ScriptedAI(creature) {}
uint32 KnockAway_Timer;
uint32 Trample_Timer;
@@ -68,14 +71,16 @@ public:
{
DoCast(me->getVictim(), SPELL_KNOCKAWAY);
KnockAway_Timer = 15000;
} else KnockAway_Timer -= diff;
}
else KnockAway_Timer -= diff;
//Trample_Timer
if (Trample_Timer <= diff)
{
DoCast(me, SPELL_TRAMPLE);
Trample_Timer = 8000;
} else Trample_Timer -= diff;
}
else Trample_Timer -= diff;
//Landslide
if (HealthBelowPct(50))
@@ -85,13 +90,13 @@ public:
me->InterruptNonMeleeSpells(false);
DoCast(me, SPELL_LANDSLIDE);
Landslide_Timer = 60000;
} else Landslide_Timer -= diff;
}
else Landslide_Timer -= diff;
}
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_landslide()

View File

@@ -24,9 +24,11 @@ SDCategory: Maraudon
EndScriptData */
#include "ScriptPCH.h"
#define SPELL_TOXICVOLLEY 21687
#define SPELL_UPPERCUT 22916
enum Spells
{
SPELL_TOXICVOLLEY = 21687,
SPELL_UPPERCUT = 22916
};
class boss_noxxion : public CreatureScript
{
@@ -40,7 +42,7 @@ public:
struct boss_noxxionAI : public ScriptedAI
{
boss_noxxionAI(Creature* c) : ScriptedAI(c) {}
boss_noxxionAI(Creature* creature) : ScriptedAI(creature) {}
uint32 ToxicVolley_Timer;
uint32 Uppercut_Timer;
@@ -78,7 +80,8 @@ public:
me->SetDisplayId(11172);
Invisible = false;
//me->m_canMove = true;
} else if (Invisible)
}
else if (Invisible)
{
Invisible_Timer -= diff;
//Do nothing while invisible
@@ -94,14 +97,16 @@ public:
{
DoCast(me->getVictim(), SPELL_TOXICVOLLEY);
ToxicVolley_Timer = 9000;
} else ToxicVolley_Timer -= diff;
}
else ToxicVolley_Timer -= diff;
//Uppercut_Timer
if (Uppercut_Timer <= diff)
{
DoCast(me->getVictim(), SPELL_UPPERCUT);
Uppercut_Timer = 12000;
} else Uppercut_Timer -= diff;
}
else Uppercut_Timer -= diff;
//Adds_Timer
if (!Invisible && Adds_Timer <= diff)
@@ -122,12 +127,12 @@ public:
Invisible_Timer = 15000;
Adds_Timer = 40000;
} else Adds_Timer -= diff;
}
else Adds_Timer -= diff;
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_noxxion()

View File

@@ -25,10 +25,13 @@ EndScriptData */
#include "ScriptPCH.h"
#define SPELL_DUSTFIELD 21909
#define SPELL_BOULDER 21832
#define SPELL_THRASH 3391
#define SPELL_REPULSIVEGAZE 21869
enum Spells
{
SPELL_DUSTFIELD = 21909,
SPELL_BOULDER = 21832,
SPELL_THRASH = 3391,
SPELL_REPULSIVEGAZE = 21869
};
class boss_princess_theradras : public CreatureScript
{
@@ -42,7 +45,7 @@ public:
struct boss_ptheradrasAI : public ScriptedAI
{
boss_ptheradrasAI(Creature* c) : ScriptedAI(c) {}
boss_ptheradrasAI(Creature* creature) : ScriptedAI(creature) {}
uint32 Dustfield_Timer;
uint32 Boulder_Timer;
@@ -57,9 +60,7 @@ public:
RepulsiveGaze_Timer = 23000;
}
void EnterCombat(Unit* /*who*/)
{
}
void EnterCombat(Unit* /*who*/) {}
void JustDied(Unit* /*killer*/)
{
@@ -76,7 +77,8 @@ public:
{
DoCast(me, SPELL_DUSTFIELD);
Dustfield_Timer = 14000;
} else Dustfield_Timer -= diff;
}
else Dustfield_Timer -= diff;
//Boulder_Timer
if (Boulder_Timer <= diff)
@@ -86,26 +88,28 @@ public:
if (target)
DoCast(target, SPELL_BOULDER);
Boulder_Timer = 10000;
} else Boulder_Timer -= diff;
}
else Boulder_Timer -= diff;
//RepulsiveGaze_Timer
if (RepulsiveGaze_Timer <= diff)
{
DoCast(me->getVictim(), SPELL_REPULSIVEGAZE);
RepulsiveGaze_Timer = 20000;
} else RepulsiveGaze_Timer -= diff;
}
else RepulsiveGaze_Timer -= diff;
//Thrash_Timer
if (Thrash_Timer <= diff)
{
DoCast(me, SPELL_THRASH);
Thrash_Timer = 18000;
} else Thrash_Timer -= diff;
}
else Thrash_Timer -= diff;
DoMeleeAttackIfReady();
}
};
};
void AddSC_boss_ptheradras()