Code Style: Remove trailing spaces
--HG-- branch : trunk
This commit is contained in:
@@ -28,11 +28,11 @@ enum Spells
|
||||
H_SPELL_BALL_LIGHTNING = 59800,
|
||||
SPELL_STATIC_OVERLOAD = 52658,
|
||||
H_SPELL_STATIC_OVERLOAD = 59795,
|
||||
|
||||
|
||||
SPELL_DISPERSE = 52770,
|
||||
SPELL_SUMMON_SPARK = 52746,
|
||||
SPELL_SPARK_DESPAWN = 52776,
|
||||
|
||||
|
||||
//Spark of Ionar
|
||||
SPELL_SPARK_VISUAL_TRIGGER = 52667,
|
||||
H_SPELL_SPARK_VISUAL_TRIGGER = 59833
|
||||
@@ -78,7 +78,7 @@ struct boss_ionarAI : public ScriptedAI
|
||||
|
||||
bool bIsSplitPhase;
|
||||
bool bHasDispersed;
|
||||
|
||||
|
||||
uint32 uiSplitTimer;
|
||||
|
||||
uint32 uiStaticOverloadTimer;
|
||||
@@ -92,7 +92,7 @@ struct boss_ionarAI : public ScriptedAI
|
||||
|
||||
bIsSplitPhase = true;
|
||||
bHasDispersed = false;
|
||||
|
||||
|
||||
uiSplitTimer = 25*IN_MILISECONDS;
|
||||
|
||||
uiStaticOverloadTimer = urand(5*IN_MILISECONDS, 6*IN_MILISECONDS);
|
||||
|
||||
@@ -152,7 +152,7 @@ struct mob_tribuna_controllerAI : public ScriptedAI
|
||||
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),false);
|
||||
pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),false);
|
||||
}
|
||||
|
||||
|
||||
KaddrakGUIDList.clear();
|
||||
}
|
||||
|
||||
@@ -538,7 +538,7 @@ struct npc_brann_hosAI : public npc_escortAI
|
||||
if (!bHasBeenDamaged)
|
||||
pInstance->DoCompleteAchievement(ACHIEV_BRANN_SPANKIN_NEW);
|
||||
}
|
||||
|
||||
|
||||
JumpToNextStep(5500);
|
||||
break;
|
||||
case 30:
|
||||
@@ -663,7 +663,7 @@ struct npc_brann_hosAI : public npc_escortAI
|
||||
{
|
||||
DoScriptText(SAY_LOW_HEALTH, m_creature);
|
||||
bIsLowHP = true;
|
||||
}
|
||||
}
|
||||
else if (bIsLowHP && !HealthBelowPct(30))
|
||||
bIsLowHP = false;
|
||||
|
||||
|
||||
@@ -234,24 +234,24 @@ struct boss_algalonAI : public ScriptedAI
|
||||
{
|
||||
switch(uiStep)
|
||||
{
|
||||
case 1:
|
||||
DoScriptText(SAY_SUMMON_1, m_creature);
|
||||
case 1:
|
||||
DoScriptText(SAY_SUMMON_1, m_creature);
|
||||
JumpToNextStep(3000);
|
||||
break;
|
||||
case 2:
|
||||
DoScriptText(SAY_SUMMON_2, m_creature);
|
||||
break;
|
||||
case 2:
|
||||
DoScriptText(SAY_SUMMON_2, m_creature);
|
||||
JumpToNextStep(3000);
|
||||
break;
|
||||
case 3:
|
||||
DoScriptText(SAY_SUMMON_3, m_creature);
|
||||
break;
|
||||
case 3:
|
||||
DoScriptText(SAY_SUMMON_3, m_creature);
|
||||
JumpToNextStep(3000);
|
||||
break;
|
||||
case 4:
|
||||
DoScriptText(SAY_ENGADED_FOR_FIRTS_TIME, m_creature);
|
||||
break;
|
||||
case 4:
|
||||
DoScriptText(SAY_ENGADED_FOR_FIRTS_TIME, m_creature);
|
||||
JumpToNextStep(3000);
|
||||
break;
|
||||
case 5:
|
||||
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
break;
|
||||
case 5:
|
||||
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
m_creature->SetReactState(REACT_AGGRESSIVE);
|
||||
Summon = true;
|
||||
break;
|
||||
|
||||
@@ -114,7 +114,7 @@ struct boss_kologarnAI : public BossAI
|
||||
// TODO: because we are using hack, he is stunned and cannot cast, so we use triggered for every spell
|
||||
switch(events.GetEvent())
|
||||
{
|
||||
case EVENT_NONE:
|
||||
case EVENT_NONE:
|
||||
break;
|
||||
case EVENT_SMASH:
|
||||
if(left && right)
|
||||
|
||||
@@ -267,7 +267,7 @@ struct boss_razorscaleAI : public BossAI
|
||||
const float y = -174.92;
|
||||
const float GroundLevel = m_creature->GetBaseMap()->GetHeight(x, y, MAX_HEIGHT);
|
||||
const float FlightHeight = GroundLevel + 4.0f; // TODO: Fly out of range of attacks (442 is sufficient height for this), minus ~(10*number of harpoon gun chains attached to Razorscale)
|
||||
|
||||
|
||||
if (Phase == 1) // Always flying during Phase 1
|
||||
IsFlying = true;
|
||||
|
||||
|
||||
@@ -134,7 +134,7 @@ enum Yells
|
||||
|
||||
//#define VOID_ZONE_DMG_10 5000
|
||||
//#define VOID_ZONE_DMG_25 7500
|
||||
//#define VOID_ZONE_RADIUS
|
||||
//#define VOID_ZONE_RADIUS
|
||||
|
||||
|
||||
/************************************************
|
||||
@@ -174,7 +174,7 @@ struct boss_xt002_AI : public BossAI
|
||||
uint32 uiHeartPhaseTimer;
|
||||
uint32 uiSpawnAddTimer;
|
||||
uint32 uiEnrageTimer;
|
||||
|
||||
|
||||
bool searing_light_active;
|
||||
uint64 uiSearingLightTarget;
|
||||
|
||||
@@ -360,7 +360,7 @@ struct boss_xt002_AI : public BossAI
|
||||
case 3: m_creature->SummonCreature(NPC_XS013_SCRAPBOT, irand(UL_X - 3, UL_X + 3), irand(UL_Y - 3, UL_Y + 3), SPAWN_Z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000); break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//Spawn 5 Scrapbots
|
||||
switch (rand() % 4)
|
||||
{
|
||||
@@ -399,7 +399,7 @@ struct boss_xt002_AI : public BossAI
|
||||
|
||||
DoMeleeAttackIfReady();
|
||||
}
|
||||
|
||||
|
||||
if (gravity_bomb_active)
|
||||
{
|
||||
if (uiGravityBombAuraTimer <= diff)
|
||||
@@ -437,7 +437,7 @@ struct boss_xt002_AI : public BossAI
|
||||
|
||||
//Summon the heart npc
|
||||
m_creature->SummonCreature(NPC_XT002_HEART, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() + 7, 0, TEMPSUMMON_TIMED_DESPAWN, TIMER_HEART_PHASE);
|
||||
|
||||
|
||||
// Start "end of phase 2 timer"
|
||||
uiHeartPhaseTimer = TIMER_HEART_PHASE;
|
||||
|
||||
@@ -620,7 +620,7 @@ struct mob_pummellerAI : public ScriptedAI
|
||||
{
|
||||
if (!UpdateVictim())
|
||||
return;
|
||||
|
||||
|
||||
if (m_creature->IsWithinMeleeRange(m_creature->getVictim()))
|
||||
{
|
||||
if (uiArcingSmashTimer <= diff)
|
||||
|
||||
@@ -320,7 +320,7 @@ struct instance_ulduar : public ScriptedInstance
|
||||
for (uint8 i = 0; i < MAX_ENCOUNTER; ++i)
|
||||
{
|
||||
loadStream >> m_auiEncounter[i];
|
||||
|
||||
|
||||
if (m_auiEncounter[i] == IN_PROGRESS)
|
||||
m_auiEncounter[i] = NOT_STARTED;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user