Core: Generic cleanup (tab2spaces/trailing whitespace removal)
This commit is contained in:
1 parent
57f85ab7da
commit
137b079eea
57 files changed
+252
-252
No files matched your search
@@ -78,7 +78,7 @@ class boss_drakkari_colossus : public CreatureScript
|
||||
|
||||
struct boss_drakkari_colossusAI : public BossAI
|
||||
{
|
||||
boss_drakkari_colossusAI(Creature* creature) : BossAI(creature, DATA_DRAKKARI_COLOSSUS_EVENT)
|
||||
boss_drakkari_colossusAI(Creature* creature) : BossAI(creature, DATA_DRAKKARI_COLOSSUS_EVENT)
|
||||
{
|
||||
me->SetReactState(REACT_PASSIVE);
|
||||
introDone = false;
|
||||
@@ -115,7 +115,7 @@ class boss_drakkari_colossus : public CreatureScript
|
||||
void EnterCombat(Unit* /*who*/)
|
||||
{
|
||||
_EnterCombat();
|
||||
|
||||
|
||||
me->RemoveAura(SPELL_FREEZE_ANIM);
|
||||
|
||||
// Note: This should not be called, but before use SetBossState function we should use BossAI
|
||||
@@ -185,7 +185,7 @@ class boss_drakkari_colossus : public CreatureScript
|
||||
phase = (phase == COLOSSUS_PHASE_NORMAL ? COLOSSUS_PHASE_FIRST_ELEMENTAL_SUMMON : COLOSSUS_PHASE_SECOND_ELEMENTAL_SUMMON);
|
||||
DoAction(ACTION_FREEZE_COLOSSUS);
|
||||
DoAction(ACTION_SUMMON_ELEMENTAL);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -287,7 +287,7 @@ class boss_drakkari_elemental : public CreatureScript
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
|
||||
|
||||
events.Update(diff);
|
||||
|
||||
if (me->HasUnitState(UNIT_STAT_CASTING))
|
||||
@@ -339,7 +339,7 @@ class boss_drakkari_elemental : public CreatureScript
|
||||
if (me->HasUnitState(UNIT_STAT_CHARGING))
|
||||
return;
|
||||
|
||||
// not sure about this, the idea of this code is to prevent bug the elemental
|
||||
// not sure about this, the idea of this code is to prevent bug the elemental
|
||||
// if it is not in a acceptable distance to cast the charge spell.
|
||||
/*if (me->GetDistance(colossus) > 80.0f)
|
||||
{
|
||||
@@ -454,7 +454,7 @@ public:
|
||||
colossus->GetHomePosition().GetPosition(&colossusHomePosition);
|
||||
|
||||
float distance = homePosition.GetExactDist(colossusHomePosition.GetPositionX(),colossusHomePosition.GetPositionY(),colossusHomePosition.GetPositionZ());
|
||||
|
||||
|
||||
if (distance < 12.0f)
|
||||
{
|
||||
MoveMojos(colossus);
|
||||
|
||||
@@ -105,7 +105,7 @@ public:
|
||||
if (instance->GetBossState(DATA_VAROS_EVENT) != DONE)
|
||||
DoCast(SPELL_ARCANE_SHIELD);
|
||||
|
||||
_Reset();
|
||||
_Reset();
|
||||
|
||||
if (instance->GetData(DATA_UROM_PLATAFORM) == 0)
|
||||
{
|
||||
|
||||
@@ -36,7 +36,7 @@ enum Spells
|
||||
SPELL_CALL_AZURE_RING_CAPTAIN_3 = 51007, //Effect Send Event (18454)
|
||||
SPELL_CALL_AZURE_RING_CAPTAIN_4 = 51008, //Effect Send Event (18455)*/
|
||||
SPELL_CALL_AMPLIFY_MAGIC = 51054,
|
||||
|
||||
|
||||
SPELL_ICE_BEAM = 49549,
|
||||
SPELL_ARCANE_BEAM_PERIODIC = 51019,
|
||||
SPELL_SUMMON_ARCANE_BEAM = 51017
|
||||
@@ -62,7 +62,7 @@ public:
|
||||
|
||||
struct boss_varosAI : public BossAI
|
||||
{
|
||||
boss_varosAI(Creature* creature) : BossAI(creature, DATA_VAROS_EVENT)
|
||||
boss_varosAI(Creature* creature) : BossAI(creature, DATA_VAROS_EVENT)
|
||||
{
|
||||
if (instance->GetBossState(DATA_DRAKOS_EVENT) != DONE)
|
||||
DoCast(me,SPELL_CENTRIFUGE_SHIELD);
|
||||
@@ -76,7 +76,7 @@ public:
|
||||
events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5000);
|
||||
// not sure if this is handled by a timer or hp percentage
|
||||
events.ScheduleEvent(EVENT_CALL_AZURE, urand(15,30) * IN_MILLISECONDS);
|
||||
|
||||
|
||||
firstCoreEnergize = false;
|
||||
coreEnergizeOrientation = 0.0f;
|
||||
}
|
||||
@@ -134,7 +134,7 @@ public:
|
||||
break;
|
||||
case EVENT_CALL_AZURE:
|
||||
// not sure how blizz handles this, i cant see any pattern between the differnt spells
|
||||
DoCast(me,SPELL_CALL_AZURE_RING_CAPTAIN);
|
||||
DoCast(me,SPELL_CALL_AZURE_RING_CAPTAIN);
|
||||
Talk(SAY_AZURE);
|
||||
Talk(SAY_AZURE_EMOTE);
|
||||
events.ScheduleEvent(EVENT_CALL_AZURE, urand(20,25) * IN_MILLISECONDS);
|
||||
@@ -169,7 +169,7 @@ class npc_azure_ring_captain : public CreatureScript
|
||||
struct npc_azure_ring_captainAI : public ScriptedAI
|
||||
{
|
||||
npc_azure_ring_captainAI(Creature* creature) : ScriptedAI(creature)
|
||||
{
|
||||
{
|
||||
instance = creature->GetInstanceScript();
|
||||
}
|
||||
|
||||
@@ -180,7 +180,7 @@ class npc_azure_ring_captain : public CreatureScript
|
||||
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING | MOVEMENTFLAG_FLYING);
|
||||
me->SetReactState(REACT_AGGRESSIVE);
|
||||
}
|
||||
|
||||
|
||||
void SpellHitTarget(Unit* target, SpellEntry const* spell)
|
||||
{
|
||||
if (spell->Id == SPELL_ICE_BEAM)
|
||||
@@ -194,16 +194,16 @@ class npc_azure_ring_captain : public CreatureScript
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
|
||||
|
||||
DoMeleeAttackIfReady();
|
||||
}
|
||||
|
||||
void MovementInform(uint32 type, uint32 id)
|
||||
{
|
||||
{
|
||||
if (type != POINT_MOTION_TYPE ||
|
||||
id != ACTION_CALL_DRAGON_EVENT)
|
||||
return;
|
||||
|
||||
|
||||
me->GetMotionMaster()->MoveIdle();
|
||||
|
||||
if (Unit* target = ObjectAccessor::GetUnit(*me,targetGUID))
|
||||
@@ -307,7 +307,7 @@ class spell_varos_energize_core_area_enemy : public SpellScriptLoader
|
||||
return;
|
||||
|
||||
float orientation = CAST_AI(boss_varos::boss_varosAI,varos->AI())->GetCoreEnergizeOrientation();
|
||||
|
||||
|
||||
for (std::list<Unit*>::iterator itr = targetList.begin() ; itr != targetList.end();)
|
||||
{
|
||||
Position pos;
|
||||
@@ -354,7 +354,7 @@ class spell_varos_energize_core_area_entry : public SpellScriptLoader
|
||||
return;
|
||||
|
||||
float orientation = CAST_AI(boss_varos::boss_varosAI,varos->AI())->GetCoreEnergizeOrientation();
|
||||
|
||||
|
||||
for (std::list<Unit*>::iterator itr = targetList.begin() ; itr != targetList.end();)
|
||||
{
|
||||
Position pos;
|
||||
|
||||
@@ -45,7 +45,7 @@ enum Bosses
|
||||
NPC_AZURE_RING_GUARDIAN = 28236,
|
||||
NPC_CENTRIFUGE_CONSTRUCT = 27641,
|
||||
};
|
||||
|
||||
|
||||
enum GameObjects
|
||||
{
|
||||
GO_DRAGON_CAGE_DOOR = 193995
|
||||
|
||||
@@ -1333,7 +1333,7 @@ public:
|
||||
pTarget->AddAura(SPELL_GIFT_OF_TWILIGTH_SHA, pTarget);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me);
|
||||
}
|
||||
|
||||
|
||||
@@ -163,7 +163,7 @@ void StartEncounter(InstanceScript* pInstance, Creature* me, Unit* /*target*/)
|
||||
{
|
||||
if (pInstance->GetBossState(TYPE_ASSEMBLY) == IN_PROGRESS)
|
||||
return; // Prevent recursive calls
|
||||
|
||||
|
||||
pInstance->SetBossState(TYPE_ASSEMBLY, IN_PROGRESS);
|
||||
|
||||
for (uint8 i = 0; i < 3; ++i)
|
||||
@@ -173,7 +173,7 @@ void StartEncounter(InstanceScript* pInstance, Creature* me, Unit* /*target*/)
|
||||
continue;
|
||||
|
||||
if (Creature *boss = Unit::GetCreature(*me, guid))
|
||||
boss->SetInCombatWithZone();
|
||||
boss->SetInCombatWithZone();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -554,7 +554,7 @@ public:
|
||||
{
|
||||
me->AddAura(SPELL_RUNE_OF_SUMMONING_VIS, me);
|
||||
summonCount = 0;
|
||||
summonTimer = 2000;
|
||||
summonTimer = 2000;
|
||||
}
|
||||
|
||||
uint32 summonCount;
|
||||
|
||||
@@ -44,7 +44,7 @@ enum eSpells
|
||||
SPELL_SARONITE_BARRIER = 63364,
|
||||
SPELL_SEARING_FLAMES = 62661,
|
||||
SPELL_SHADOW_CRASH = 62660,
|
||||
SPELL_SHADOW_CRASH_HIT = 62659,
|
||||
SPELL_SHADOW_CRASH_HIT = 62659,
|
||||
SPELL_SURGE_OF_DARKNESS = 62662,
|
||||
SPELL_SARONITE_VAPORS = 63323,
|
||||
SPELL_SUMMON_SARONITE_VAPORS = 63081,
|
||||
@@ -75,7 +75,7 @@ enum eEvents
|
||||
EVENT_SARONITE_VAPORS = 5,
|
||||
EVENT_BERSERK = 6,
|
||||
};
|
||||
|
||||
|
||||
#define ACHIEVEMENT_SMELL_SARONITE RAID_MODE(3181, 3188)
|
||||
#define ACHIEVEMENT_SHADOWDODGER RAID_MODE(2996, 2997)
|
||||
|
||||
@@ -118,7 +118,7 @@ public:
|
||||
void EnterCombat(Unit * /*pWho*/)
|
||||
{
|
||||
_EnterCombat();
|
||||
|
||||
|
||||
DoScriptText(SAY_AGGRO, me);
|
||||
DoCast(me, SPELL_AURA_OF_DESPAIR);
|
||||
CheckShamanisticRage();
|
||||
@@ -157,12 +157,12 @@ public:
|
||||
break;
|
||||
case EVENT_MARK_OF_THE_FACELESS:
|
||||
Unit* pTarget;
|
||||
/* He will not cast this on players within 15 yards of him.
|
||||
However, if there are not at least 9 people outside of 15 yards
|
||||
/* He will not cast this on players within 15 yards of him.
|
||||
However, if there are not at least 9 people outside of 15 yards
|
||||
he will start casting it on players inside 15 yards melee and tank included.
|
||||
*/
|
||||
if (!(pTarget = CheckPlayersInRange(RAID_MODE(4,9), 15.0f, 50.f)))
|
||||
pTarget = SelectTarget(SELECT_TARGET_RANDOM);
|
||||
pTarget = SelectTarget(SELECT_TARGET_RANDOM);
|
||||
DoCast(pTarget, SPELL_MARK_OF_THE_FACELESS);
|
||||
events.ScheduleEvent(EVENT_MARK_OF_THE_FACELESS, urand(35000, 45000));
|
||||
break;
|
||||
@@ -175,7 +175,7 @@ public:
|
||||
case EVENT_SARONITE_VAPORS:
|
||||
DoCast(SPELL_SUMMON_SARONITE_VAPORS);
|
||||
events.ScheduleEvent(EVENT_SARONITE_VAPORS, urand(30000, 35000));
|
||||
|
||||
|
||||
if (++uiVaporCount == 6 && bSmellSaronite)
|
||||
{
|
||||
DoScriptText(SAY_HARDMODE, me);
|
||||
@@ -212,7 +212,7 @@ public:
|
||||
void JustDied(Unit * /*pWho*/)
|
||||
{
|
||||
_JustDied();
|
||||
|
||||
|
||||
DoScriptText(SAY_DEATH, me);
|
||||
|
||||
if (instance)
|
||||
@@ -337,7 +337,7 @@ public:
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
|
||||
|
||||
if (uiProfoundOfDarknessTimer <= uiDiff)
|
||||
{
|
||||
DoCastAOE(SPELL_PROFOUND_DARKNESS);
|
||||
@@ -345,7 +345,7 @@ public:
|
||||
}
|
||||
else
|
||||
uiProfoundOfDarknessTimer -= uiDiff;
|
||||
|
||||
|
||||
DoMeleeAttackIfReady();
|
||||
}
|
||||
};
|
||||
@@ -401,7 +401,7 @@ public:
|
||||
me->RemoveAllAuras();
|
||||
DoCast(me, SPELL_SARONITE_VAPORS);
|
||||
me->DespawnOrUnsummon(30000);
|
||||
|
||||
|
||||
if (Creature * pVezax = me->GetCreature(*me, pInstance ? pInstance->GetData64(TYPE_VEZAX) : 0))
|
||||
pVezax->AI()->DoAction(ACTION_VAPORS_DIE);
|
||||
}
|
||||
|
||||
@@ -26,9 +26,9 @@
|
||||
#define SPELL_PETRIFY_BREATH RAID_MODE(62030,63980)
|
||||
|
||||
#define SPELL_STONE_GRIP RAID_MODE(62166,63981)
|
||||
#define SPELL_STONE_GRIP_CANCEL 65594
|
||||
#define SPELL_STONE_GRIP_CANCEL 65594
|
||||
#define SPELL_ARM_SWEEP RAID_MODE(63766,63983)
|
||||
#define SPELL_ARM_VISUAL 64753
|
||||
#define SPELL_ARM_VISUAL 64753
|
||||
|
||||
#define SPELL_BERSERK 47008 // guess
|
||||
|
||||
@@ -70,7 +70,7 @@ void EncounterInCombat(Creature* me, InstanceScript* pInstance)
|
||||
c = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_RIGHT_ARM) : 0);
|
||||
if (c && c != me && c->isAlive())
|
||||
c->SetInCombatWithZone();
|
||||
|
||||
|
||||
c = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_LEFT_ARM) : 0);
|
||||
if (c && c != me && c->isAlive())
|
||||
c->SetInCombatWithZone();
|
||||
|
||||
@@ -540,7 +540,7 @@ public:
|
||||
|
||||
enum brunhildar {
|
||||
NPC_QUEST_GIVER = 29592,
|
||||
|
||||
|
||||
SPELL_ICE_PRISON = 54894,
|
||||
SPELL_KILL_CREDIT_PRISONER = 55144,
|
||||
SPELL_KILL_CREDIT_DRAKE = 55143,
|
||||
@@ -548,7 +548,7 @@ enum brunhildar {
|
||||
SPELL_ICE_LANCE = 55046
|
||||
};
|
||||
|
||||
class npc_brunnhildar_prisoner : public CreatureScript
|
||||
class npc_brunnhildar_prisoner : public CreatureScript
|
||||
{
|
||||
public:
|
||||
npc_brunnhildar_prisoner() : CreatureScript("npc_brunnhildar_prisoner") { }
|
||||
@@ -625,7 +625,7 @@ public:
|
||||
|
||||
// drake is empty now, deliver credit for drake and despawn him
|
||||
if (drake->GetVehicleKit()->HasEmptySeat(1) &&
|
||||
drake->GetVehicleKit()->HasEmptySeat(2) &&
|
||||
drake->GetVehicleKit()->HasEmptySeat(2) &&
|
||||
drake->GetVehicleKit()->HasEmptySeat(3))
|
||||
{
|
||||
// not working rider->CastSpell(rider, SPELL_KILL_CREDIT_DRAKE, true);
|
||||
@@ -645,7 +645,7 @@ public:
|
||||
|
||||
if (spell->Id != SPELL_ICE_LANCE)
|
||||
return;
|
||||
|
||||
|
||||
me->RemoveAura(SPELL_ICE_PRISON);
|
||||
enter_timer = 500;
|
||||
|
||||
|
||||
Reference in new issue
Block a user