Core/Scripts: rename files, remove whitespace and some other small changes after recent pull requests

2 files changed, 35 insertions, 43 deletions

diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
index 1776cccb6cc..22914ca9094 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
@@ -72,21 +72,13 @@ public:
 
         void MoveInLineOfSight(Unit* who) override
         {
-            if (!me->GetVictim() && me->CanCreatureAttack(who))
+            if (!Intro && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 100.0f))
             {
-                if (!Intro && me->IsWithinDistInMap(who, 100))
-                {
-                    Intro = true;
-                    Talk(SAY_INTRO);
-                }
-
-                if (!me->CanFly() && me->GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE)
-                    return;
-
-                float attackRadius = me->GetAttackDistance(who);
-                if (me->IsWithinDistInMap(who, attackRadius) && me->IsWithinLOSInMap(who))
-                    AttackStart(who);
+                Intro = true;
+                Talk(SAY_INTRO);
             }
+
+            BossAI::MoveInLineOfSight(who);
         }
 
         void EnterCombat(Unit* /*who*/) override
@@ -175,41 +167,41 @@ class spell_talon_king_ikiss_blink : public SpellScriptLoader
     public:
         spell_talon_king_ikiss_blink() : SpellScriptLoader("spell_talon_king_ikiss_blink") { }
 
-    class spell_talon_king_ikiss_blink_SpellScript : public SpellScript
-    {
-        PrepareSpellScript(spell_talon_king_ikiss_blink_SpellScript);
-
-        bool Validate(SpellInfo const* /*spellInfo*/) override
+        class spell_talon_king_ikiss_blink_SpellScript : public SpellScript
         {
-            if (!sSpellMgr->GetSpellInfo(SPELL_BLINK))
-                return false;
-            return true;
-        }
+            PrepareSpellScript(spell_talon_king_ikiss_blink_SpellScript);
 
-        void FilterTargets(std::list<WorldObject*>& targets)
-        {
-            uint8 maxSize = 1;
-            if (targets.size() > maxSize)
-                Trinity::Containers::RandomResizeList(targets, maxSize);
-        }
+            bool Validate(SpellInfo const* /*spellInfo*/) override
+            {
+                if (!sSpellMgr->GetSpellInfo(SPELL_BLINK_TELEPORT))
+                    return false;
+                return true;
+            }
 
-        void HandleDummyHitTarget(SpellEffIndex effIndex)
-        {
-            PreventHitDefaultEffect(effIndex);
-            GetHitUnit()->CastSpell(GetCaster(), SPELL_BLINK_TELEPORT, true);
-        }
+            void FilterTargets(std::list<WorldObject*>& targets)
+            {
+                WorldObject* target = Trinity::Containers::SelectRandomContainerElement(targets);
+                targets.clear();
+                targets.push_back(target);
+            }
+
+            void HandleDummyHitTarget(SpellEffIndex effIndex)
+            {
+                PreventHitDefaultEffect(effIndex);
+                GetHitUnit()->CastSpell(GetCaster(), SPELL_BLINK_TELEPORT, true);
+            }
 
-        void Register() override
+            void Register() override
+            {
+                OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_talon_king_ikiss_blink_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
+                OnEffectHitTarget += SpellEffectFn(spell_talon_king_ikiss_blink_SpellScript::HandleDummyHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY);
+            }
+        };
+
+        SpellScript* GetSpellScript() const override
         {
-            OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_talon_king_ikiss_blink_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
-            OnEffectHitTarget += SpellEffectFn(spell_talon_king_ikiss_blink_SpellScript::HandleDummyHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY);
+            return new spell_talon_king_ikiss_blink_SpellScript();
         }
-    };
-
-    SpellScript* GetSpellScript() const override
-    {
-        return new spell_talon_king_ikiss_blink_SpellScript();
-    }
 };
 
 void AddSC_boss_talon_king_ikiss()
diff --git a/src/server/scripts/Outland/CMakeLists.txt b/src/server/scripts/Outland/CMakeLists.txt
index 0c69a236ef8..ffc9b514abf 100644
--- a/src/server/scripts/Outland/CMakeLists.txt
+++ b/src/server/scripts/Outland/CMakeLists.txt
@@ -88,7 +88,7 @@ set(scripts_STAT_SRCS
   Outland/Auchindoun/ManaTombs/instance_mana_tombs.cpp
   Outland/Auchindoun/ManaTombs/mana_tombs.h
   Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
-  Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
+  Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
   Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
   Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
   Outland/Auchindoun/SethekkHalls/sethekk_halls.h