Scripts: Convert DoCast(me->GetVictim(), SPELL_XXXXX); in DoCastVictim(SPELL_XXX);

11 files changed, 26 insertions, 26 deletions

diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index 61cccc7ae24..62863edc2d7 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -383,7 +383,7 @@ class boss_alar : public CreatureScript
 
                     if (MeltArmor_Timer <= diff)
                     {
-                        DoCast(me->GetVictim(), SPELL_MELT_ARMOR);
+                        DoCastVictim(SPELL_MELT_ARMOR);
                         MeltArmor_Timer = 60000;
                     }
                     else
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index 88fb5ca6c74..a18b34f7867 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -240,7 +240,7 @@ class boss_high_astromancer_solarian : public CreatureScript
                     {
                         if (BlindingLight)
                         {
-                            DoCast(me->GetVictim(), SPELL_BLINDING_LIGHT);
+                            DoCastVictim(SPELL_BLINDING_LIGHT);
                             BlindingLight = false;
                         }
                         else
@@ -381,7 +381,7 @@ class boss_high_astromancer_solarian : public CreatureScript
                                 //VoidBolt_Timer
                                 if (VoidBolt_Timer <= diff)
                                 {
-                                    DoCast(me->GetVictim(), SPELL_VOID_BOLT);
+                                    DoCastVictim(SPELL_VOID_BOLT);
                                     VoidBolt_Timer = 10000;
                                 }
                                 else
@@ -473,7 +473,7 @@ class mob_solarium_priest : public CreatureScript
 
                 if (holysmiteTimer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_SOLARIUM_HOLY_SMITE);
+                    DoCastVictim(SPELL_SOLARIUM_HOLY_SMITE);
                     holysmiteTimer = 4000;
                 }
                 else
@@ -481,7 +481,7 @@ class mob_solarium_priest : public CreatureScript
 
                 if (aoesilenceTimer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_SOLARIUM_ARCANE_TORRENT);
+                    DoCastVictim(SPELL_SOLARIUM_ARCANE_TORRENT);
                     aoesilenceTimer = 13000;
                 }
                 else
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index f995a454671..d52c67bc2d6 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -761,7 +761,7 @@ class boss_kaelthas : public CreatureScript
                             //ArcaneDisruption_Timer
                             if (ArcaneDisruption_Timer <= diff)
                             {
-                                DoCast(me->GetVictim(), SPELL_ARCANE_DISRUPTION, true);
+                                DoCastVictim(SPELL_ARCANE_DISRUPTION, true);
                                 ArcaneDisruption_Timer = 60000;
                             }
                             else
@@ -842,7 +842,7 @@ class boss_kaelthas : public CreatureScript
                             {
                                 if (PyrosCasted < 3)
                                 {
-                                    DoCast(me->GetVictim(), SPELL_PYROBLAST);
+                                    DoCastVictim(SPELL_PYROBLAST);
                                     ++PyrosCasted;
                                 }
                                 else
@@ -1075,7 +1075,7 @@ class boss_thaladred_the_darkener : public CreatureScript
                 //Silence_Timer
                 if (Silence_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_SILENCE);
+                    DoCastVictim(SPELL_SILENCE);
                     Silence_Timer = 20000;
                 }
                 else
@@ -1084,7 +1084,7 @@ class boss_thaladred_the_darkener : public CreatureScript
                 //PsychicBlow_Timer
                 if (PsychicBlow_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_PSYCHIC_BLOW);
+                    DoCastVictim(SPELL_PSYCHIC_BLOW);
                     PsychicBlow_Timer = 20000+rand()%5000;
                 }
                 else
@@ -1153,7 +1153,7 @@ class boss_lord_sanguinar : public CreatureScript
                 //Fear_Timer
                 if (Fear_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_BELLOWING_ROAR);
+                    DoCastVictim(SPELL_BELLOWING_ROAR);
                     Fear_Timer = 25000+rand()%10000;                //approximately every 30 seconds
                 }
                 else
@@ -1254,7 +1254,7 @@ class boss_grand_astromancer_capernian : public CreatureScript
                 //Fireball_Timer
                 if (Fireball_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_CAPERNIAN_FIREBALL);
+                    DoCastVictim(SPELL_CAPERNIAN_FIREBALL);
                     Fireball_Timer = 4000;
                 }
                 else
@@ -1269,7 +1269,7 @@ class boss_grand_astromancer_capernian : public CreatureScript
                     if (target && me->IsWithinDistInMap(target, 30))
                         DoCast(target, SPELL_CONFLAGRATION);
                     else
-                        DoCast(me->GetVictim(), SPELL_CONFLAGRATION);
+                        DoCastVictim(SPELL_CONFLAGRATION);
 
                     Conflagration_Timer = 10000+rand()%5000;
                 }
@@ -1368,7 +1368,7 @@ class boss_master_engineer_telonicus : public CreatureScript
                 //Bomb_Timer
                 if (Bomb_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_BOMB);
+                    DoCastVictim(SPELL_BOMB);
                     Bomb_Timer = 25000;
                 }
                 else
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index 684b37cc245..26668a77742 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -107,7 +107,7 @@ class boss_void_reaver : public CreatureScript
                 // Pounding
                 if (Pounding_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_POUNDING);
+                    DoCastVictim(SPELL_POUNDING);
                     Talk(SAY_POUNDING);
                     Pounding_Timer = 15000; //cast time(3000) + cooldown time(12000)
                 }
@@ -144,7 +144,7 @@ class boss_void_reaver : public CreatureScript
                 // Single Target knock back, reduces aggro
                 if (KnockAway_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_KNOCK_AWAY);
+                    DoCastVictim(SPELL_KNOCK_AWAY);
                     //Drop 25% aggro
                     if (DoGetThreat(me->GetVictim()))
                         DoModifyThreatPercent(me->GetVictim(), -25);
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
index 3d72dae58df..c843f09beb9 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
@@ -71,7 +71,7 @@ class mob_crystalcore_devastator : public CreatureScript
                 //Knockaway_Timer
                 if (Knockaway_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_KNOCKAWAY, true);
+                    DoCastVictim(SPELL_KNOCKAWAY, true);
 
                     // current aggro target is knocked away pick new target
                     Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0);
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index 5954d885f72..1a4916f491a 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -206,7 +206,7 @@ class mob_ragin_flames : public CreatureScript
 
                     if (inferno_Timer <= diff)
                     {
-                        DoCast(me->GetVictim(), SPELL_INFERNO);
+                        DoCastVictim(SPELL_INFERNO);
                         me->TauntApply(me->GetVictim());
                         inferno_Timer = 10000;
                     } else inferno_Timer -= diff;
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
index cb687aea432..67fadf34caa 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -199,7 +199,7 @@ class mob_nether_wraith : public CreatureScript
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                         DoCast(target, SPELL_ARCANE_MISSILES);
                     else
-                        DoCast(me->GetVictim(), SPELL_ARCANE_MISSILES);
+                        DoCastVictim(SPELL_ARCANE_MISSILES);
                     ArcaneMissiles_Timer = urand(5000, 10000);
                 }
                 else
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 172a5b05a96..56e7dbe2a1f 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -203,7 +203,7 @@ class npc_millhouse_manastorm : public CreatureScript
 
                     Talk(SAY_PYRO);
 
-                    DoCast(me->GetVictim(), SPELL_PYROBLAST);
+                    DoCastVictim(SPELL_PYROBLAST);
                     Pyroblast_Timer = 40000;
                 }
                 else
@@ -211,7 +211,7 @@ class npc_millhouse_manastorm : public CreatureScript
 
                 if (Fireball_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_FIREBALL);
+                    DoCastVictim(SPELL_FIREBALL);
                     Fireball_Timer = 4000;
                 }
                 else
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
index 2e6a4e52d67..3cf9f01a601 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -209,7 +209,7 @@ class boss_harbinger_skyriss : public CreatureScript
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                         DoCast(target, SPELL_MIND_REND);
                     else
-                        DoCast(me->GetVictim(), SPELL_MIND_REND);
+                        DoCastVictim(SPELL_MIND_REND);
 
                     MindRend_Timer = 8000;
                 }
@@ -226,7 +226,7 @@ class boss_harbinger_skyriss : public CreatureScript
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                         DoCast(target, SPELL_FEAR);
                     else
-                        DoCast(me->GetVictim(), SPELL_FEAR);
+                        DoCastVictim(SPELL_FEAR);
 
                     Fear_Timer = 25000;
                 }
@@ -243,7 +243,7 @@ class boss_harbinger_skyriss : public CreatureScript
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                         DoCast(target, SPELL_DOMINATION);
                     else
-                        DoCast(me->GetVictim(), SPELL_DOMINATION);
+                        DoCastVictim(SPELL_DOMINATION);
 
                     Domination_Timer = 16000+rand()%16000;
                 }
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
index ad1f6327207..91bf42351b4 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
@@ -186,7 +186,7 @@ class boss_laj : public CreatureScript
 
                 if (Allergic_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), SPELL_ALLERGIC_REACTION);
+                    DoCastVictim(SPELL_ALLERGIC_REACTION);
                     Allergic_Timer = 25000+rand()%15000;
                 }
                 else
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
index 4fb04aaeb2f..8f959334c5e 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
@@ -198,7 +198,7 @@ class boss_warp_splinter : public CreatureScript
                 //Check for War Stomp
                 if (War_Stomp_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), WAR_STOMP);
+                    DoCastVictim(WAR_STOMP);
                     War_Stomp_Timer = urand(25000, 40000);
                 }
                 else
@@ -207,7 +207,7 @@ class boss_warp_splinter : public CreatureScript
                 //Check for Arcane Volley
                 if (Arcane_Volley_Timer <= diff)
                 {
-                    DoCast(me->GetVictim(), DUNGEON_MODE(ARCANE_VOLLEY, ARCANE_VOLLEY_H));
+                    DoCastVictim(DUNGEON_MODE(ARCANE_VOLLEY, ARCANE_VOLLEY_H));
                     Arcane_Volley_Timer = urand(20000, 35000);
                 }
                 else