diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-04-23 13:22:03 +0200 | 
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-04-23 13:22:03 +0200 | 
| commit | 3ac33163db2786cbd18f2158fc81d6ea9fa66316 (patch) | |
| tree | 59aa0806010eebd620e3f5ec93f4aaf616422ef2 /src/server/scripts/Outland | |
| parent | 67fd3ee726cbd509e6a15f81f4780e757a78a8b5 (diff) | |
Core/Misc: Fixed -Wmisleading-indentation warnings
Diffstat (limited to 'src/server/scripts/Outland')
3 files changed, 101 insertions, 101 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 2ceae118fa2..71847077c91 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -1301,15 +1301,17 @@ public:              EventMaiev Event = EVENT_MAIEV_NULL;              for (uint8 i = 1; i <= MaxTimer; ++i) +            {                  if (Timer[i])                  {                      if (Timer[i] <= diff)                          Event = (EventMaiev)i;                      else Timer[i] -= diff;                  } +            } -                switch (Event) -                { +            switch (Event) +            {                  case EVENT_MAIEV_STEALTH:                      {                          me->SetFullHealth(); @@ -1345,21 +1347,21 @@ public:                      break;                  default:                      break; -                } +            } -                if (HealthBelowPct(50)) -                { -                    me->SetVisible(false); -                    me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); -                    if (Creature* illidan = ObjectAccessor::GetCreature(*me, IllidanGUID)) -                        ENSURE_AI(boss_illidan_stormrage::boss_illidan_stormrageAI, illidan->AI())->DeleteFromThreatList(me->GetGUID()); -                    me->AttackStop(); -                    Timer[EVENT_MAIEV_STEALTH] = 60000; // reappear after 1 minute -                    MaxTimer = 1; -                } +            if (HealthBelowPct(50)) +            { +                me->SetVisible(false); +                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); +                if (Creature* illidan = ObjectAccessor::GetCreature(*me, IllidanGUID)) +                    ENSURE_AI(boss_illidan_stormrage::boss_illidan_stormrageAI, illidan->AI())->DeleteFromThreatList(me->GetGUID()); +                me->AttackStop(); +                Timer[EVENT_MAIEV_STEALTH] = 60000; // reappear after 1 minute +                MaxTimer = 1; +            } -                if (Phase == PHASE_NORMAL_MAIEV) -                    DoMeleeAttackIfReady(); +            if (Phase == PHASE_NORMAL_MAIEV) +                DoMeleeAttackIfReady();          }      private: diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 499550945c6..2592ed3b262 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -180,24 +180,23 @@ class boss_grand_warlock_nethekurse : public CreatureScript              }              void MoveInLineOfSight(Unit* who) override -              {                  if (!IntroOnce && me->IsWithinDistInMap(who, 30.0f)) -                    { +                {                      if (who->GetTypeId() != TYPEID_PLAYER)                          return; -                        Talk(SAY_INTRO); -                        IntroOnce = true; -                        IsIntroEvent = true; +                    Talk(SAY_INTRO); +                    IntroOnce = true; +                    IsIntroEvent = true; -                        instance->SetBossState(DATA_NETHEKURSE, IN_PROGRESS); -                    } +                    instance->SetBossState(DATA_NETHEKURSE, IN_PROGRESS); +                } -                    if (IsIntroEvent || !IsMainEvent) -                        return; +                if (IsIntroEvent || !IsMainEvent) +                    return; -                    ScriptedAI::MoveInLineOfSight(who); +                ScriptedAI::MoveInLineOfSight(who);              }              void EnterCombat(Unit* /*who*/) override diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 89386ae815d..0689a0fe216 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -325,86 +325,85 @@ class boss_high_astromancer_solarian : public CreatureScript                      else                          Phase1_Timer-=diff;                  } -                else -                    if (Phase == 2) +                else if (Phase == 2) +                { +                    //10 seconds after Solarian disappears, 12 mobs spawn out of the three portals. +                    me->AttackStop(); +                    me->StopMoving(); +                    if (Phase2_Timer <= diff)                      { -                        //10 seconds after Solarian disappears, 12 mobs spawn out of the three portals. -                        me->AttackStop(); -                        me->StopMoving(); -                        if (Phase2_Timer <= diff) -                        { -                            Phase = 3; -                            for (int i=0; i <= 2; ++i) -                                for (int j=1; j <= 4; j++) -                                    SummonMinion(NPC_SOLARIUM_AGENT, Portals[i][0], Portals[i][1], Portals[i][2]); +                        Phase = 3; +                        for (int i=0; i <= 2; ++i) +                            for (int j=1; j <= 4; j++) +                                SummonMinion(NPC_SOLARIUM_AGENT, Portals[i][0], Portals[i][1], Portals[i][2]); -                            Talk(SAY_SUMMON1); -                            Phase2_Timer = 10000; -                        } -                        else -                            Phase2_Timer -= diff; +                        Talk(SAY_SUMMON1); +                        Phase2_Timer = 10000;                      }                      else -                        if (Phase == 3) -                        { -                            me->AttackStop(); -                            me->StopMoving(); -                            //Check Phase3_Timer -                            if (Phase3_Timer <= diff) -                            { -                                Phase = 1; -                                //15 seconds later Solarian reappears out of one of the 3 portals. Simultaneously, 2 healers appear in the two other portals. -                                int i = rand32() % 3; -                                me->GetMotionMaster()->Clear(); -                                me->SetPosition(Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O); - -                                for (int j=0; j <= 2; j++) -                                    if (j != i) -                                        SummonMinion(NPC_SOLARIUM_PRIEST, Portals[j][0], Portals[j][1], Portals[j][2]); - -                                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); -                                me->SetVisible(true); - -                                Talk(SAY_SUMMON2); -                                AppearDelay = true; -                                Phase3_Timer = 15000; -                            } -                            else -                                Phase3_Timer -= diff; -                        } -                        else -                            if (Phase == 4) -                            { -                                //Fear_Timer -                                if (Fear_Timer <= diff) -                                { -                                    DoCast(me, SPELL_FEAR); -                                    Fear_Timer = 20000; -                                } -                                else -                                    Fear_Timer -= diff; -                                //VoidBolt_Timer -                                if (VoidBolt_Timer <= diff) -                                { -                                    DoCastVictim(SPELL_VOID_BOLT); -                                    VoidBolt_Timer = 10000; -                                } -                                else -                                    VoidBolt_Timer -= diff; -                            } -                            //When Solarian reaches 20% she will transform into a huge void walker. -                            if (Phase != 4 && me->HealthBelowPct(20)) -                            { -                                Phase = 4; -                                //To make sure she wont be invisible or not selecatble -                                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); -                                me->SetVisible(true); -                                Talk(SAY_VOIDA); -                                Talk(SAY_VOIDB); -                                me->SetArmor(WV_ARMOR); -                                me->SetDisplayId(MODEL_VOIDWALKER); -                                me->SetObjectScale(defaultsize*2.5f); -                            } +                        Phase2_Timer -= diff; +                } +                else if (Phase == 3) +                { +                    me->AttackStop(); +                    me->StopMoving(); +                    //Check Phase3_Timer +                    if (Phase3_Timer <= diff) +                    { +                        Phase = 1; +                        //15 seconds later Solarian reappears out of one of the 3 portals. Simultaneously, 2 healers appear in the two other portals. +                        int i = rand32() % 3; +                        me->GetMotionMaster()->Clear(); +                        me->SetPosition(Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O); + +                        for (int j=0; j <= 2; j++) +                            if (j != i) +                                SummonMinion(NPC_SOLARIUM_PRIEST, Portals[j][0], Portals[j][1], Portals[j][2]); + +                        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); +                        me->SetVisible(true); + +                        Talk(SAY_SUMMON2); +                        AppearDelay = true; +                        Phase3_Timer = 15000; +                    } +                    else +                        Phase3_Timer -= diff; +                } +                else if (Phase == 4) +                { +                    //Fear_Timer +                    if (Fear_Timer <= diff) +                    { +                        DoCast(me, SPELL_FEAR); +                        Fear_Timer = 20000; +                    } +                    else +                        Fear_Timer -= diff; +                    //VoidBolt_Timer +                    if (VoidBolt_Timer <= diff) +                    { +                        DoCastVictim(SPELL_VOID_BOLT); +                        VoidBolt_Timer = 10000; +                    } +                    else +                        VoidBolt_Timer -= diff; +                } +                 +                //When Solarian reaches 20% she will transform into a huge void walker. +                if (Phase != 4 && me->HealthBelowPct(20)) +                { +                    Phase = 4; +                    //To make sure she wont be invisible or not selecatble +                    me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); +                    me->SetVisible(true); +                    Talk(SAY_VOIDA); +                    Talk(SAY_VOIDB); +                    me->SetArmor(WV_ARMOR); +                    me->SetDisplayId(MODEL_VOIDWALKER); +                    me->SetObjectScale(defaultsize*2.5f); +                } +                                  DoMeleeAttackIfReady();              }          };  | 
