Sourcefile sleanups -> tabs to spaces, remove whitespace - also update the cleanupscripts very slightly
--HG-- branch : trunk
This commit is contained in:
@@ -98,7 +98,7 @@ class boss_broggok : public CreatureScript
|
||||
{
|
||||
DoCast(me->getVictim(), SPELL_SLIME_SPRAY);
|
||||
AcidSpray_Timer = 4000+rand()%8000;
|
||||
}
|
||||
}
|
||||
else
|
||||
AcidSpray_Timer -=diff;
|
||||
|
||||
@@ -106,16 +106,16 @@ class boss_broggok : public CreatureScript
|
||||
{
|
||||
DoCast(me->getVictim(), SPELL_POISON_BOLT);
|
||||
PoisonBolt_Timer = 4000+rand()%8000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
PoisonBolt_Timer -=diff;
|
||||
|
||||
if (PoisonSpawn_Timer <= diff)
|
||||
{
|
||||
DoCast(me, SPELL_POISON_CLOUD);
|
||||
PoisonSpawn_Timer = 20000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
PoisonSpawn_Timer -=diff;
|
||||
|
||||
DoMeleeAttackIfReady();
|
||||
|
||||
+9
-9
@@ -228,8 +228,8 @@ class boss_kelidan_the_breaker : public CreatureScript
|
||||
{
|
||||
DoCast(me, SPELL_SHADOW_BOLT_VOLLEY);
|
||||
ShadowVolley_Timer = 5000+rand()%8000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
ShadowVolley_Timer -=diff;
|
||||
|
||||
if (Corruption_Timer <= diff)
|
||||
@@ -237,7 +237,7 @@ class boss_kelidan_the_breaker : public CreatureScript
|
||||
DoCast(me, SPELL_CORRUPTION);
|
||||
Corruption_Timer = 30000+rand()%20000;
|
||||
}
|
||||
else
|
||||
else
|
||||
Corruption_Timer -=diff;
|
||||
|
||||
if (BurningNova_Timer <= diff)
|
||||
@@ -344,8 +344,8 @@ class mob_shadowmoon_channeler : public CreatureScript
|
||||
DoCast(channeled, SPELL_CHANNELING);
|
||||
}
|
||||
check_Timer = 5000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
check_Timer -= diff;
|
||||
return;
|
||||
}
|
||||
@@ -355,16 +355,16 @@ class mob_shadowmoon_channeler : public CreatureScript
|
||||
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(pTarget, SPELL_MARK_OF_SHADOW);
|
||||
MarkOfShadow_Timer = 15000+rand()%5000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
MarkOfShadow_Timer -=diff;
|
||||
|
||||
if (ShadowBolt_Timer <= diff)
|
||||
{
|
||||
DoCast(me->getVictim(), SPELL_SHADOW_BOLT);
|
||||
ShadowBolt_Timer = 5000+rand()%1000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
ShadowBolt_Timer -=diff;
|
||||
|
||||
DoMeleeAttackIfReady();
|
||||
|
||||
@@ -125,8 +125,8 @@ class boss_the_maker : public CreatureScript
|
||||
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
|
||||
DoCast(pTarget, SPELL_EXPLODING_BREAKER);
|
||||
ExplodingBreaker_Timer = 4000+rand()%8000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
ExplodingBreaker_Timer -=diff;
|
||||
|
||||
/* // Disabled until Core Support for mind control
|
||||
@@ -145,8 +145,8 @@ class boss_the_maker : public CreatureScript
|
||||
{
|
||||
DoCast(me->getVictim(), SPELL_KNOCKDOWN);
|
||||
Knockdown_Timer = 4000+rand()%8000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
Knockdown_Timer -=diff;
|
||||
|
||||
DoMeleeAttackIfReady();
|
||||
|
||||
+13
-13
@@ -26,7 +26,7 @@ EndScriptData */
|
||||
#include "ScriptPCH.h"
|
||||
|
||||
enum eSays
|
||||
{
|
||||
{
|
||||
SAY_AGGRO_1 = -1543009,
|
||||
SAY_AGGRO_2 = -1543010,
|
||||
SAY_AGGRO_3 = -1543011,
|
||||
@@ -38,7 +38,7 @@ enum eSays
|
||||
};
|
||||
|
||||
enum eSpells
|
||||
{
|
||||
{
|
||||
SPELL_ORBITAL_STRIKE = 30637,
|
||||
SPELL_SHADOW_WHIP = 30638,
|
||||
SPELL_TREACHEROUS_AURA = 30695,
|
||||
@@ -131,8 +131,8 @@ class boss_omor_the_unscarred : public CreatureScript
|
||||
me->InterruptNonMeleeSpells(false);
|
||||
DoCast(me, SPELL_SUMMON_FIENDISH_HOUND);
|
||||
Summon_Timer = 15000+rand()%15000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
Summon_Timer -= diff;
|
||||
}
|
||||
|
||||
@@ -152,11 +152,11 @@ class boss_omor_the_unscarred : public CreatureScript
|
||||
PlayerGUID = 0;
|
||||
ShadowWhip_Timer = 2000;
|
||||
CanPullBack = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
ShadowWhip_Timer -= diff;
|
||||
}
|
||||
else
|
||||
else
|
||||
if (OrbitalStrike_Timer <= diff)
|
||||
{
|
||||
Unit* temp = NULL;
|
||||
@@ -173,8 +173,8 @@ class boss_omor_the_unscarred : public CreatureScript
|
||||
if (PlayerGUID)
|
||||
CanPullBack = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
OrbitalStrike_Timer -= diff;
|
||||
|
||||
if ((me->GetHealth()*100) / me->GetMaxHealth() < 20)
|
||||
@@ -183,8 +183,8 @@ class boss_omor_the_unscarred : public CreatureScript
|
||||
{
|
||||
DoCast(me, SPELL_DEMONIC_SHIELD);
|
||||
DemonicShield_Timer = 15000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
DemonicShield_Timer -= diff;
|
||||
}
|
||||
|
||||
@@ -197,7 +197,7 @@ class boss_omor_the_unscarred : public CreatureScript
|
||||
DoCast(pTarget, SPELL_TREACHEROUS_AURA);
|
||||
Aura_Timer = 8000+rand()%8000;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
Aura_Timer -= diff;
|
||||
|
||||
@@ -211,8 +211,8 @@ class boss_omor_the_unscarred : public CreatureScript
|
||||
DoCast(pTarget, SPELL_SHADOW_BOLT);
|
||||
Shadowbolt_Timer = 4000+rand()%2500;
|
||||
}
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
Shadowbolt_Timer -= diff;
|
||||
|
||||
DoMeleeAttackIfReady();
|
||||
|
||||
+24
-24
@@ -85,7 +85,7 @@ class boss_nazan : public CreatureScript
|
||||
boss_nazanAI(Creature* pCreature) : ScriptedAI(pCreature)
|
||||
{
|
||||
VazrudenGUID = 0;
|
||||
flight = true;
|
||||
flight = true;
|
||||
}
|
||||
|
||||
uint32 Fireball_Timer;
|
||||
@@ -102,7 +102,7 @@ class boss_nazan : public CreatureScript
|
||||
Fireball_Timer = 4000;
|
||||
Fly_Timer = 45000;
|
||||
Turn_Timer = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) {}
|
||||
|
||||
@@ -133,8 +133,8 @@ class boss_nazan : public CreatureScript
|
||||
if (Unit* pVictim = SelectUnit(SELECT_TARGET_RANDOM,0))
|
||||
DoCast(pVictim, DUNGEON_MODE(SPELL_FIREBALL, SPELL_FIREBALL_H), true);
|
||||
Fireball_Timer = urand(4000,7000);
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
Fireball_Timer -= diff;
|
||||
|
||||
if (flight) // phase 1 - the flight
|
||||
@@ -144,7 +144,7 @@ class boss_nazan : public CreatureScript
|
||||
{
|
||||
flight = false;
|
||||
BellowingRoar_Timer = 6000;
|
||||
ConeOfFire_Timer = 12000;
|
||||
ConeOfFire_Timer = 12000;
|
||||
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
|
||||
me->GetMotionMaster()->Clear();
|
||||
@@ -174,8 +174,8 @@ class boss_nazan : public CreatureScript
|
||||
DoCast(me, DUNGEON_MODE(SPELL_CONE_OF_FIRE, SPELL_CONE_OF_FIRE_H));
|
||||
ConeOfFire_Timer = 12000;
|
||||
Fireball_Timer = 4000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
ConeOfFire_Timer -= diff;
|
||||
|
||||
if (IsHeroic())
|
||||
@@ -183,8 +183,8 @@ class boss_nazan : public CreatureScript
|
||||
{
|
||||
DoCast(me, SPELL_BELLOWING_ROAR);
|
||||
BellowingRoar_Timer = 45000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
BellowingRoar_Timer -= diff;
|
||||
|
||||
DoMeleeAttackIfReady();
|
||||
@@ -252,8 +252,8 @@ class boss_vazruden : public CreatureScript
|
||||
WipeSaid = true;
|
||||
}
|
||||
me->DisappearAndDie();
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
UnsummonCheck -= diff;
|
||||
return;
|
||||
}
|
||||
@@ -263,8 +263,8 @@ class boss_vazruden : public CreatureScript
|
||||
if (Unit *victim = me->getVictim())
|
||||
DoCast(victim, DUNGEON_MODE(SPELL_REVENGE,SPELL_REVENGE_H));
|
||||
Revenge_Timer = 5000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
Revenge_Timer -= diff;
|
||||
|
||||
DoMeleeAttackIfReady();
|
||||
@@ -308,7 +308,7 @@ class boss_vazruden_the_herald : public CreatureScript
|
||||
phase = 0;
|
||||
waypoint = 0;
|
||||
check = 0;
|
||||
UnsummonAdds();
|
||||
UnsummonAdds();
|
||||
}
|
||||
|
||||
void UnsummonAdds()
|
||||
@@ -344,8 +344,8 @@ class boss_vazruden_the_herald : public CreatureScript
|
||||
{
|
||||
if (Creature* Vazruden = me->SummonCreature(ENTRY_VAZRUDEN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000))
|
||||
VazrudenGUID = Vazruden->GetGUID();
|
||||
if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000))
|
||||
NazanGUID = Nazan->GetGUID();
|
||||
if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000))
|
||||
NazanGUID = Nazan->GetGUID();
|
||||
summoned = true;
|
||||
me->SetVisibility(VISIBILITY_OFF);
|
||||
me->addUnitState(UNIT_STAT_ROOT);
|
||||
@@ -371,11 +371,11 @@ class boss_vazruden_the_herald : public CreatureScript
|
||||
{
|
||||
CAST_AI(boss_nazan::boss_nazanAI, pSummoned->AI())->VazrudenGUID = VazrudenGUID;
|
||||
pSummoned->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
|
||||
pSummoned->SetSpeed(MOVE_FLIGHT, 2.5);
|
||||
pSummoned->SetSpeed(MOVE_FLIGHT, 2.5);
|
||||
if (pVictim)
|
||||
AttackStartNoMove(pVictim);
|
||||
}
|
||||
else
|
||||
else
|
||||
if (pVictim)
|
||||
pSummoned->AI()->AttackStart(pVictim);
|
||||
}
|
||||
@@ -413,8 +413,8 @@ class boss_vazruden_the_herald : public CreatureScript
|
||||
phase = 2;
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
check -= diff;
|
||||
break;
|
||||
default: // adds do the job now
|
||||
@@ -440,8 +440,8 @@ class boss_vazruden_the_herald : public CreatureScript
|
||||
//me->Kill(me);
|
||||
}
|
||||
check = 2000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
check -= diff;
|
||||
break;
|
||||
}
|
||||
@@ -491,8 +491,8 @@ class mob_hellfire_sentry : public CreatureScript
|
||||
if (Unit *victim = me->getVictim())
|
||||
DoCast(victim, SPELL_KIDNEY_SHOT);
|
||||
KidneyShot_Timer = 20000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
KidneyShot_Timer -= diff;
|
||||
|
||||
DoMeleeAttackIfReady();
|
||||
|
||||
+4
-4
@@ -124,7 +124,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
|
||||
DoCast(me->getVictim(), SPELL_MORTAL_WOUND);
|
||||
MortalWound_Timer = 5000+rand()%8000;
|
||||
}
|
||||
else
|
||||
else
|
||||
MortalWound_Timer -= diff;
|
||||
|
||||
if (Surge_Timer <= diff)
|
||||
@@ -135,8 +135,8 @@ class boss_watchkeeper_gargolmar : public CreatureScript
|
||||
DoCast(pTarget, SPELL_SURGE);
|
||||
|
||||
Surge_Timer = 5000+rand()%8000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
Surge_Timer -= diff;
|
||||
|
||||
if ((me->GetHealth()*100) / me->GetMaxHealth() < 20)
|
||||
@@ -146,7 +146,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
|
||||
DoCast(me, SPELL_RETALIATION);
|
||||
Retaliation_Timer = 30000;
|
||||
}
|
||||
else
|
||||
else
|
||||
Retaliation_Timer -= diff;
|
||||
}
|
||||
|
||||
|
||||
+5
-5
@@ -32,7 +32,7 @@ class instance_ramparts : public InstanceMapScript
|
||||
instance_ramparts()
|
||||
: InstanceMapScript("instance_ramparts")
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
struct instance_ramparts_InstanceMapScript : public InstanceScript
|
||||
{
|
||||
@@ -54,11 +54,11 @@ class instance_ramparts : public InstanceMapScript
|
||||
{
|
||||
switch(pGo->GetEntry())
|
||||
{
|
||||
case 185168:
|
||||
m_uiChestNGUID = pGo->GetGUID();
|
||||
case 185168:
|
||||
m_uiChestNGUID = pGo->GetGUID();
|
||||
break;
|
||||
case 185169:
|
||||
m_uiChestHGUID = pGo->GetGUID();
|
||||
case 185169:
|
||||
m_uiChestHGUID = pGo->GetGUID();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -147,11 +147,11 @@ class mob_abyssal : public CreatureScript
|
||||
}
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/)
|
||||
void EnterCombat(Unit* /*who*/)
|
||||
{
|
||||
DoZoneInCombat();
|
||||
}
|
||||
void AttackStart(Unit *who)
|
||||
void AttackStart(Unit *who)
|
||||
{
|
||||
if (!trigger)
|
||||
ScriptedAI::AttackStart(who);
|
||||
@@ -181,7 +181,7 @@ class mob_abyssal : public CreatureScript
|
||||
if (Despawn_Timer <= diff)
|
||||
{
|
||||
me->ForcedDespawn();
|
||||
}
|
||||
}
|
||||
else Despawn_Timer -= diff;
|
||||
|
||||
if (!UpdateVictim())
|
||||
@@ -191,7 +191,7 @@ class mob_abyssal : public CreatureScript
|
||||
{
|
||||
DoCast(me->getVictim(), SPELL_FIRE_BLAST);
|
||||
FireBlast_Timer = 5000+rand()%10000;
|
||||
}
|
||||
}
|
||||
else FireBlast_Timer -= diff;
|
||||
|
||||
DoMeleeAttackIfReady();
|
||||
@@ -312,7 +312,7 @@ class boss_magtheridon : public CreatureScript
|
||||
{
|
||||
DebuffClicker(clicker);
|
||||
(*i).second = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
++ClickerNum;
|
||||
}
|
||||
@@ -323,11 +323,11 @@ class boss_magtheridon : public CreatureScript
|
||||
DoScriptText(SAY_BANISH, me);
|
||||
DoCast(me, SPELL_SHADOW_CAGE, true);
|
||||
}
|
||||
else
|
||||
else
|
||||
if (ClickerNum < CLICKERS_COUNT && me->HasAura(SPELL_SHADOW_CAGE))
|
||||
me->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE);
|
||||
|
||||
if (!ClickerNum)
|
||||
if (!ClickerNum)
|
||||
NeedCheckCube = false;
|
||||
}
|
||||
|
||||
@@ -372,8 +372,8 @@ class boss_magtheridon : public CreatureScript
|
||||
{
|
||||
DoScriptText(RandomTaunt[rand()%6].id, me);
|
||||
RandChat_Timer = 90000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
RandChat_Timer -= diff;
|
||||
}
|
||||
|
||||
@@ -387,15 +387,15 @@ class boss_magtheridon : public CreatureScript
|
||||
DoCast(me, SPELL_BERSERK, true);
|
||||
DoScriptText(EMOTE_BERSERK, me);
|
||||
Berserk_Timer = 60000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
Berserk_Timer -= diff;
|
||||
|
||||
if (Cleave_Timer <= diff)
|
||||
{
|
||||
DoCast(me->getVictim(), SPELL_CLEAVE);
|
||||
Cleave_Timer = 10000;
|
||||
}
|
||||
}
|
||||
else
|
||||
Cleave_Timer -= diff;
|
||||
|
||||
@@ -409,7 +409,7 @@ class boss_magtheridon : public CreatureScript
|
||||
BlastNova_Timer = 60000;
|
||||
}
|
||||
}
|
||||
else
|
||||
else
|
||||
BlastNova_Timer -= diff;
|
||||
|
||||
if (Quake_Timer <= diff)
|
||||
@@ -420,7 +420,7 @@ class boss_magtheridon : public CreatureScript
|
||||
DoCast(me, SPELL_QUAKE_TRIGGER, true);
|
||||
Quake_Timer = 50000;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
Quake_Timer -= diff;
|
||||
|
||||
@@ -440,7 +440,7 @@ class boss_magtheridon : public CreatureScript
|
||||
}
|
||||
Blaze_Timer = 20000 + rand()%20000;
|
||||
}
|
||||
else
|
||||
else
|
||||
Blaze_Timer -= diff;
|
||||
|
||||
if (!Phase3 && me->GetHealth()*10 < me->GetMaxHealth()*3
|
||||
@@ -465,12 +465,12 @@ class boss_magtheridon : public CreatureScript
|
||||
float x, y, z;
|
||||
pTarget->GetPosition(x, y, z);
|
||||
Creature *summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
|
||||
if (summon)
|
||||
if (summon)
|
||||
CAST_AI(mob_abyssal::mob_abyssalAI, summon->AI())->SetTrigger(1);
|
||||
}
|
||||
Debris_Timer = 10000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
Debris_Timer -= diff;
|
||||
}
|
||||
|
||||
@@ -562,7 +562,7 @@ class mob_hellfire_channeler : public CreatureScript
|
||||
{
|
||||
DoCast(me, SPELL_SHADOW_BOLT_VOLLEY);
|
||||
ShadowBoltVolley_Timer = 10000 + rand()%10000;
|
||||
}
|
||||
}
|
||||
else
|
||||
ShadowBoltVolley_Timer -= diff;
|
||||
|
||||
@@ -580,8 +580,8 @@ class mob_hellfire_channeler : public CreatureScript
|
||||
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1))
|
||||
DoCast(pTarget, SPELL_FEAR);
|
||||
Fear_Timer = 25000 + rand()%15000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
Fear_Timer -= diff;
|
||||
|
||||
if (Infernal_Timer <= diff)
|
||||
@@ -589,8 +589,8 @@ class mob_hellfire_channeler : public CreatureScript
|
||||
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(pTarget, SPELL_BURNING_ABYSSAL, true);
|
||||
Infernal_Timer = 30000 + rand()%10000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
Infernal_Timer -= diff;
|
||||
|
||||
DoMeleeAttackIfReady();
|
||||
@@ -607,7 +607,7 @@ class mob_hellfire_channeler : public CreatureScript
|
||||
class go_manticron_cube : public GameObjectScript
|
||||
{
|
||||
public:
|
||||
go_manticron_cube() : GameObjectScript("go_manticron_cube")
|
||||
go_manticron_cube() : GameObjectScript("go_manticron_cube")
|
||||
{
|
||||
}
|
||||
|
||||
@@ -617,13 +617,13 @@ public:
|
||||
|
||||
if (!pInstance)
|
||||
return true;
|
||||
|
||||
if (pInstance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS)
|
||||
|
||||
if (pInstance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS)
|
||||
return true;
|
||||
Creature *Magtheridon =Unit::GetCreature(*pGO, pInstance->GetData64(DATA_MAGTHERIDON));
|
||||
if (!Magtheridon || !Magtheridon->isAlive())
|
||||
if (!Magtheridon || !Magtheridon->isAlive())
|
||||
return true;
|
||||
|
||||
|
||||
// if exhausted or already channeling return
|
||||
if (pPlayer->HasAura(SPELL_MIND_EXHAUSTION) || pPlayer->HasAura(SPELL_SHADOW_GRASP))
|
||||
return true;
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ EndScriptData */
|
||||
enum eSpells
|
||||
{
|
||||
SPELL_SOUL_TRANSFER = 30531, // core bug, does not support target 7
|
||||
SPELL_BLAZE_TARGET = 30541, // core bug, does not support target 7
|
||||
SPELL_BLAZE_TARGET = 30541, // core bug, does not support target 7
|
||||
};
|
||||
|
||||
#define CHAMBER_CENTER_X -15.14
|
||||
|
||||
@@ -53,7 +53,7 @@ static Say PeonDies[]=
|
||||
};
|
||||
|
||||
enum eSays
|
||||
{
|
||||
{
|
||||
SAY_INTRO = -1540000,
|
||||
SAY_TAUNT_1 = -1540009,
|
||||
SAY_TAUNT_2 = -1540010,
|
||||
@@ -67,7 +67,7 @@ enum eSays
|
||||
};
|
||||
|
||||
enum eSpells
|
||||
{
|
||||
{
|
||||
SPELL_DEATH_COIL = 30500,
|
||||
SPELL_DARK_SPIN = 30502, // core bug spell attack caster :D
|
||||
SPELL_SHADOW_FISSURE = 30496, // Summon the ShadowFissure NPC
|
||||
@@ -269,8 +269,8 @@ class boss_grand_warlock_nethekurse : public CreatureScript
|
||||
{
|
||||
DoCast(me->getVictim(), SPELL_SHADOW_CLEAVE);
|
||||
Cleave_Timer = 6000+rand()%2500;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
Cleave_Timer -= diff;
|
||||
}
|
||||
else
|
||||
@@ -280,8 +280,8 @@ class boss_grand_warlock_nethekurse : public CreatureScript
|
||||
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
|
||||
DoCast(pTarget, SPELL_SHADOW_FISSURE);
|
||||
ShadowFissure_Timer = urand(7500,15000);
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
ShadowFissure_Timer -= diff;
|
||||
|
||||
if (DeathCoil_Timer <= diff)
|
||||
@@ -289,8 +289,8 @@ class boss_grand_warlock_nethekurse : public CreatureScript
|
||||
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
|
||||
DoCast(pTarget, SPELL_DEATH_COIL);
|
||||
DeathCoil_Timer = urand(15000,20000);
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
DeathCoil_Timer -= diff;
|
||||
|
||||
if ((me->GetHealth()*100) / me->GetMaxHealth() <= 20)
|
||||
|
||||
+6
-6
@@ -367,7 +367,7 @@ class boss_warbringer_omrogg : public CreatureScript
|
||||
if (BlastCount == 3)
|
||||
BlastCount = 0;
|
||||
}
|
||||
else
|
||||
else
|
||||
BlastWave_Timer -= diff;
|
||||
|
||||
if (BurningMaul_Timer <= diff)
|
||||
@@ -377,8 +377,8 @@ class boss_warbringer_omrogg : public CreatureScript
|
||||
BurningMaul_Timer = 40000;
|
||||
BlastWave_Timer = 16000;
|
||||
BlastCount = 1;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
BurningMaul_Timer -= diff;
|
||||
|
||||
if (ResetThreat_Timer <= diff)
|
||||
@@ -390,7 +390,7 @@ class boss_warbringer_omrogg : public CreatureScript
|
||||
me->AddThreat(pTarget, 0.0f);
|
||||
}
|
||||
ResetThreat_Timer = 25000+rand()%15000;
|
||||
}
|
||||
}
|
||||
else
|
||||
ResetThreat_Timer -= diff;
|
||||
|
||||
@@ -398,7 +398,7 @@ class boss_warbringer_omrogg : public CreatureScript
|
||||
{
|
||||
DoCast(me, SPELL_FEAR);
|
||||
Fear_Timer = 15000+rand()%20000;
|
||||
}
|
||||
}
|
||||
else
|
||||
Fear_Timer -= diff;
|
||||
|
||||
@@ -407,7 +407,7 @@ class boss_warbringer_omrogg : public CreatureScript
|
||||
DoCast(me, SPELL_THUNDERCLAP);
|
||||
ThunderClap_Timer = 15000+rand()%15000;
|
||||
}
|
||||
else
|
||||
else
|
||||
ThunderClap_Timer -= diff;
|
||||
|
||||
DoMeleeAttackIfReady();
|
||||
|
||||
+13
-13
@@ -30,7 +30,7 @@ EndContentData */
|
||||
#include "ScriptPCH.h"
|
||||
|
||||
enum eSays
|
||||
{
|
||||
{
|
||||
SAY_AGGRO1 = -1540042,
|
||||
SAY_AGGRO2 = -1540043,
|
||||
SAY_AGGRO3 = -1540044,
|
||||
@@ -208,7 +208,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
|
||||
SpawnAssassin();
|
||||
Assassins_Timer = 0;
|
||||
}
|
||||
else
|
||||
else
|
||||
Assassins_Timer -= diff;
|
||||
|
||||
if (InBlade)
|
||||
@@ -239,7 +239,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
|
||||
Wait_Timer = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
else
|
||||
Wait_Timer -= diff;
|
||||
}
|
||||
else
|
||||
@@ -253,8 +253,8 @@ class boss_warchief_kargath_bladefist : public CreatureScript
|
||||
Blade_Dance_Timer = 0;
|
||||
me->SetSpeed(MOVE_RUN,4);
|
||||
return;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
Blade_Dance_Timer -= diff;
|
||||
|
||||
if (Charge_timer)
|
||||
@@ -263,7 +263,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
|
||||
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), H_SPELL_CHARGE);
|
||||
Charge_timer = 0;
|
||||
}
|
||||
else
|
||||
else
|
||||
Charge_timer -= diff;
|
||||
|
||||
if (Summon_Assistant_Timer <= diff)
|
||||
@@ -273,20 +273,20 @@ class boss_warchief_kargath_bladefist : public CreatureScript
|
||||
switch (urand(0,2))
|
||||
{
|
||||
case 0:
|
||||
me->SummonCreature(MOB_HEARTHEN_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
|
||||
me->SummonCreature(MOB_HEARTHEN_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
|
||||
break;
|
||||
case 1:
|
||||
me->SummonCreature(MOB_SHARPSHOOTER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
|
||||
case 1:
|
||||
me->SummonCreature(MOB_SHARPSHOOTER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
|
||||
break;
|
||||
case 2:
|
||||
me->SummonCreature(MOB_REAVER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
|
||||
me->SummonCreature(MOB_REAVER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (urand(0,9) < 2)
|
||||
++summoned;
|
||||
Summon_Assistant_Timer = urand(25000,35000);
|
||||
}
|
||||
}
|
||||
else
|
||||
Summon_Assistant_Timer -= diff;
|
||||
|
||||
@@ -304,8 +304,8 @@ class boss_warchief_kargath_bladefist : public CreatureScript
|
||||
return;
|
||||
}
|
||||
resetcheck_timer = 5000;
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
resetcheck_timer -= diff;
|
||||
}
|
||||
};
|
||||
|
||||
+4
-4
@@ -57,8 +57,8 @@ class instance_shattered_halls : public InstanceMapScript
|
||||
{
|
||||
switch(pGo->GetEntry())
|
||||
{
|
||||
case DOOR_NETHEKURSE:
|
||||
nethekurseDoorGUID = pGo->GetGUID();
|
||||
case DOOR_NETHEKURSE:
|
||||
nethekurseDoorGUID = pGo->GetGUID();
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -67,8 +67,8 @@ class instance_shattered_halls : public InstanceMapScript
|
||||
{
|
||||
switch(pCreature->GetEntry())
|
||||
{
|
||||
case 16807:
|
||||
nethekurseGUID = pCreature->GetGUID();
|
||||
case 16807:
|
||||
nethekurseGUID = pCreature->GetGUID();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user