Core/Script: Code style and remove unused core.

Signed-off-by: Gyx <2359980687@qq.com>

6 files changed, 198 insertions, 65 deletions

diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index ad9d9f67ae1..6c14a54e42d 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -1187,7 +1187,11 @@ public:
         void EnterCombat(Unit* /*who*/) {}
         void MoveInLineOfSight(Unit* /*who*/) {}
         void EnterEvadeMode() {}
-        void GetIllidanGUID(uint64 guid) { IllidanGUID = guid; }
+
+        void GetIllidanGUID(uint64 guid)
+        {
+            IllidanGUID = guid;
+        }
 
         void DamageTaken(Unit* done_by, uint32 &damage)
         {
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 57a33f6bdd4..630e44429fa 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -121,7 +121,10 @@ public:
 
     struct mob_ashtongue_channelerAI : public ScriptedAI
     {
-        mob_ashtongue_channelerAI(Creature* creature) : ScriptedAI(creature) {ShadeGUID = 0;}
+        mob_ashtongue_channelerAI(Creature* creature) : ScriptedAI(creature)
+        {
+            ShadeGUID = 0;
+        }
 
         uint64 ShadeGUID;
 
@@ -147,7 +150,10 @@ public:
 
     struct mob_ashtongue_sorcererAI : public ScriptedAI
     {
-        mob_ashtongue_sorcererAI(Creature* creature) : ScriptedAI(creature) {ShadeGUID = 0;}
+        mob_ashtongue_sorcererAI(Creature* creature) : ScriptedAI(creature)
+        {
+            ShadeGUID = 0;
+        }
 
         uint64 ShadeGUID;
         uint32 CheckTimer;
diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
index 15b9eebc869..cd804ad0d03 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
@@ -165,8 +165,15 @@ public:
             summons.DespawnAll();
         }
 
-        void JustSummoned(Creature* summon) {summons.Summon(summon);}
-        void SummonedCreatureDespawn(Creature* summon) {summons.Despawn(summon);}
+        void JustSummoned(Creature* summon)
+        {
+            summons.Summon(summon);
+        }
+
+        void SummonedCreatureDespawn(Creature* summon)
+        {
+            summons.Despawn(summon);
+        }
 
         Unit* CalculateHatefulStrikeTarget()
         {
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index f867612e91e..a70aabe3d85 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -445,7 +445,10 @@ class boss_kaelthas : public CreatureScript
                 }
             }
 
-            void SummonedCreatureDespawn(Creature* summon) {summons.Despawn(summon);}
+            void SummonedCreatureDespawn(Creature* summon)
+            {
+                summons.Despawn(summon);
+            }
 
             void JustDied(Unit* /*Killer*/)
             {
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
index 13c2a280dbe..5bd6ff795eb 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -647,7 +647,6 @@ public:
         if (player->isAlive() && player->GetQuestStatus(QUEST_INFO_GATHERING) == QUEST_STATUS_INCOMPLETE)
         {
             Creature* Dawnforge = player->FindNearestCreature(CreatureEntry[1], 30.0f);
-
             if (!Dawnforge)
                 return false;
 
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
index 234b672d08b..96b1247c152 100644
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -241,7 +241,6 @@ public:
                 DoCast(caster, SPELL_FORCE_OF_NELTHARAKU, true);
 
                 Unit* Dragonmaw = me->FindNearestCreature(CREATURE_DRAGONMAW_SUBJUGATOR, 50);
-
                 if (Dragonmaw)
                 {
                     me->AddThreat(Dragonmaw, 100000.0f);
@@ -760,7 +759,6 @@ public:
         uint32 NextStep(uint32 Step)
         {
             Unit* player = Unit::GetUnit((*me), PlayerGUID);
-
             Unit* Illi = Unit::GetUnit((*me), IllidanGUID);
 
             if (!player || !Illi)
@@ -771,27 +769,88 @@ public:
 
             switch (Step)
             {
-            case 0: return 0; break;
-            case 1: me->GetMotionMaster()->MovePoint(0, -5104.41f, 595.297f, 85.6838f); return 9000; break;
-            case 2: DoScriptText(OVERLORD_YELL_1, me, player); return 4500; break;
-            case 3: me->SetInFront(player); return 3200;  break;
-            case 4: DoScriptText(OVERLORD_SAY_2, me, player); return 2000; break;
-            case 5: Illi->SetVisible(true);
-                 Illi->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); return 350; break;
+            case 0:
+                return 0;
+                break;
+
+            case 1:
+                me->GetMotionMaster()->MovePoint(0, -5104.41f, 595.297f, 85.6838f);
+                return 9000;
+                break;
+
+            case 2:
+                DoScriptText(OVERLORD_YELL_1, me, player);
+                return 4500;
+                break;
+
+            case 3:
+                me->SetInFront(player);
+                return 3200;
+                break;
+
+            case 4:
+                DoScriptText(OVERLORD_SAY_2, me, player);
+                return 2000;
+                break;
+
+            case 5:
+                Illi->SetVisible(true);
+                Illi->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                return 350;
+                break;
+
             case 6:
                 Illi->CastSpell(Illi, SPELL_ONE, true);
                 Illi->SetTarget(me->GetGUID());
                 me->SetTarget(IllidanGUID);
-                return 2000; break;
-            case 7: DoScriptText(OVERLORD_YELL_2, me); return 4500; break;
-            case 8: me->SetUInt32Value(UNIT_FIELD_BYTES_1, 8); return 2500; break;
-            case 9: DoScriptText(OVERLORD_SAY_3, me); return 6500; break;
-            case 10: DoScriptText(LORD_ILLIDAN_SAY_1, Illi); return 5000;  break;
-            case 11: DoScriptText(OVERLORD_SAY_4, me, player); return 6000; break;
-            case 12: DoScriptText(LORD_ILLIDAN_SAY_2, Illi); return 5500; break;
-            case 13: DoScriptText(LORD_ILLIDAN_SAY_3, Illi); return 4000; break;
-            case 14: Illi->SetTarget(PlayerGUID); return 1500; break;
-            case 15: DoScriptText(LORD_ILLIDAN_SAY_4, Illi); return 1500; break;
+                return 2000;
+                break;
+
+            case 7:
+                DoScriptText(OVERLORD_YELL_2, me);
+                return 4500;
+                break;
+
+            case 8:
+                me->SetUInt32Value(UNIT_FIELD_BYTES_1, 8);
+                return 2500;
+                break;
+
+            case 9:
+                DoScriptText(OVERLORD_SAY_3, me);
+                return 6500;
+                break;
+
+            case 10:
+                DoScriptText(LORD_ILLIDAN_SAY_1, Illi);
+                return 5000;
+                break;
+
+            case 11:
+                DoScriptText(OVERLORD_SAY_4, me, player);
+                return 6000;
+                break;
+
+            case 12:
+                DoScriptText(LORD_ILLIDAN_SAY_2, Illi);
+                return 5500;
+                break;
+
+            case 13:
+                DoScriptText(LORD_ILLIDAN_SAY_3, Illi);
+                return 4000;
+                break;
+
+            case 14:
+                Illi->SetTarget(PlayerGUID);
+                return 1500;
+                break;
+
+            case 15:
+                DoScriptText(LORD_ILLIDAN_SAY_4, Illi);
+                return 1500;
+                break;
+
             case 16:
                 if (player)
                 {
@@ -799,67 +858,124 @@ public:
                     player->RemoveAurasDueToSpell(SPELL_THREE);
                     player->RemoveAurasDueToSpell(SPELL_FOUR);
                     return 5000;
-                }else{
-                    CAST_PLR(player)->FailQuest(QUEST_LORD_ILLIDAN_STORMRAGE); Step = 30; return 100;
                 }
+                else
+                {
+                    CAST_PLR(player)->FailQuest(QUEST_LORD_ILLIDAN_STORMRAGE);
+                    Step = 30;
+                    return 100;
+                }
+                break;
+
+            case 17:
+                DoScriptText(LORD_ILLIDAN_SAY_5, Illi);
+                return 5000;
                 break;
-            case 17: DoScriptText(LORD_ILLIDAN_SAY_5, Illi); return 5000; break;
-            case 18: DoScriptText(LORD_ILLIDAN_SAY_6, Illi); return 5000; break;
-            case 19: DoScriptText(LORD_ILLIDAN_SAY_7, Illi); return 5000; break;
+
+            case 18:
+                DoScriptText(LORD_ILLIDAN_SAY_6, Illi);
+                return 5000;
+                break;
+
+            case 19:
+                DoScriptText(LORD_ILLIDAN_SAY_7, Illi);
+                return 5000;
+                break;
+
             case 20:
                 Illi->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
                 Illi->SetDisableGravity(true);
-                return 500; break;
-            case 21: DoScriptText(OVERLORD_SAY_5, me); return 500; break;
+                return 500;
+                break;
+
+            case 21:
+                DoScriptText(OVERLORD_SAY_5, me);
+                return 500;
+                break;
+
             case 22:
                 Illi->SetVisible(false);
                 Illi->setDeathState(JUST_DIED);
-                return 1000; break;
-            case 23: me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); return 2000; break;
-            case 24: me->SetTarget(PlayerGUID); return 5000; break;
-            case 25: DoScriptText(OVERLORD_SAY_6, me); return 2000; break;
+                return 1000;
+                break;
+
+            case 23:
+                me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
+                return 2000;
+                break;
+
+            case 24:
+                me->SetTarget(PlayerGUID);
+                return 5000;
+                break;
+
+            case 25:
+                DoScriptText(OVERLORD_SAY_6, me);
+                return 2000;
+                break;
+
             case 26:
                 if (player)
                     CAST_PLR(player)->GroupEventHappens(QUEST_LORD_ILLIDAN_STORMRAGE, me);
-                return 6000; break;
+                return 6000;
+                break;
+
             case 27:
                 {
-                Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
-                if (Yarzill)
-                    Yarzill->SetTarget(PlayerGUID);
-                return 500; }
-     break;
+                    Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
+                    if (Yarzill)
+                        Yarzill->SetTarget(PlayerGUID);
+                    return 500;
+                }
+                break;
+
             case 28:
                 player->RemoveAurasDueToSpell(SPELL_TWO);
                 player->RemoveAurasDueToSpell(41519);
                 player->CastSpell(player, SPELL_THREE, true);
                 player->CastSpell(player, SPELL_FOUR, true);
-                return 1000; break;
+                return 1000;
+                break;
+
             case 29:
                 {
-                Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
-                if (Yarzill)
-                    DoScriptText(YARZILL_THE_MERC_SAY, Yarzill, player);
-                return 5000; }
-     break;
+                    Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
+                    if (Yarzill)
+                        DoScriptText(YARZILL_THE_MERC_SAY, Yarzill, player);
+                    return 5000;
+                }
+                break;
+
             case 30:
                 {
-                Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
-                if (Yarzill)
-                    Yarzill->SetTarget(0);
-                return 5000; }
-     break;
+                    Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
+                    if (Yarzill)
+                        Yarzill->SetTarget(0);
+                    return 5000;
+                }
+                break;
+
             case 31:
                 {
-                Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
-                if (Yarzill)
-                    Yarzill->CastSpell(player, 41540, true);
-                return 1000;}
-    break;
-            case 32: me->GetMotionMaster()->MovePoint(0, -5085.77f, 577.231f, 86.6719f); return 5000; break;
-            case 33: Reset(); return 100; break;
-
-            default : return 0;
+                    Unit* Yarzill = me->FindNearestCreature(C_YARZILL, 50);
+                    if (Yarzill)
+                        Yarzill->CastSpell(player, 41540, true);
+                    return 1000;
+                }
+                break;
+
+            case 32:
+                me->GetMotionMaster()->MovePoint(0, -5085.77f, 577.231f, 86.6719f); return 5000;
+                break;
+
+            case 33:
+                Reset();
+                return 100;
+                break;
+
+            default :
+                return 0;
+                break;
             }
         }
 
@@ -871,9 +987,7 @@ public:
             if (ConversationTimer <= diff)
             {
                 if (Event && IllidanGUID && PlayerGUID)
-                {
                     ConversationTimer = NextStep(++Step);
-                }
             } else ConversationTimer -= diff;
         }
     };