diff options
| author | Spp <none@none> | 2010-04-07 18:09:10 +0200 |
|---|---|---|
| committer | Spp <none@none> | 2010-04-07 18:09:10 +0200 |
| commit | b27ce42704c33e292bda390265bb8fd01a433505 (patch) | |
| tree | 29b2df222a2c1be3325e3d6fab75206100b578fd /src/scripts/northrend/ulduar | |
| parent | f490ad5ac259712e323f0a52e608ff1383b2fc41 (diff) | |
Code Style: Remove trailing spaces
--HG--
branch : trunk
Diffstat (limited to 'src/scripts/northrend/ulduar')
7 files changed, 30 insertions, 30 deletions
diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp index 75395aaa751..a534dbf0340 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp @@ -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); diff --git a/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp b/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp index f62f8f9b499..bd655c1ec1a 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp @@ -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; diff --git a/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp b/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp index 842c4599f69..674500584a7 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp @@ -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; diff --git a/src/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp b/src/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp index d78916564e7..3ffa8f9118b 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_kologarn.cpp @@ -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) diff --git a/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp b/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp index 34893d2dd41..0ac8f444fa3 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp @@ -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; diff --git a/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp b/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp index a112108389a..21dbe4bf6cd 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_xt002.cpp @@ -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) diff --git a/src/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp b/src/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp index ea84ecb6670..7e7d176f0a5 100644 --- a/src/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp +++ b/src/scripts/northrend/ulduar/ulduar/instance_ulduar.cpp @@ -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; } |
