diff options
266 files changed, 1092 insertions, 1103 deletions
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp index e50bde51a4c..b07da60e21e 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp @@ -376,7 +376,7 @@ struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI //ThunderClap_Timer if (ThunderClap_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_THUNDERCLAP); + DoCast(m_creature->getVictim(), SPELL_THUNDERCLAP); ThunderClap_Timer = 10000; } else ThunderClap_Timer -= diff; @@ -385,7 +385,7 @@ struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI { if (FireballVolley_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FIREBALLVOLLEY); + DoCast(m_creature->getVictim(), SPELL_FIREBALLVOLLEY); FireballVolley_Timer = 15000; } else FireballVolley_Timer -= diff; } @@ -393,7 +393,7 @@ struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI //MightyBlow_Timer if (MightyBlow_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MIGHTYBLOW); + DoCast(m_creature->getVictim(), SPELL_MIGHTYBLOW); MightyBlow_Timer = 10000; } else MightyBlow_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp index 551ddef325f..2af667f4b27 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI //FireBlast_Timer if (FireBlast_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FIREBLAST); + DoCast(m_creature->getVictim(), SPELL_FIREBLAST); FireBlast_Timer = 7000; } else FireBlast_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp index 2575e9ad000..6a7aecb6e15 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp @@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI //ShadowBolt_Timer if (ShadowBolt_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHADOWBOLT); + DoCast(m_creature->getVictim(), SPELL_SHADOWBOLT); ShadowBolt_Timer = 7000; } else ShadowBolt_Timer -= diff; @@ -72,21 +72,21 @@ struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI if (CurseOfTongues_Timer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_CURSEOFTONGUES); + DoCast(pTarget, SPELL_CURSEOFTONGUES); CurseOfTongues_Timer = 18000; } else CurseOfTongues_Timer -= diff; //CurseOfWeakness_Timer if (CurseOfWeakness_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CURSEOFWEAKNESS); + DoCast(m_creature->getVictim(), SPELL_CURSEOFWEAKNESS); CurseOfWeakness_Timer = 45000; } else CurseOfWeakness_Timer -= diff; //DemonArmor_Timer if (DemonArmor_Timer <= diff) { - DoCast(m_creature,SPELL_DEMONARMOR); + DoCast(m_creature, SPELL_DEMONARMOR); DemonArmor_Timer = 300000; } else DemonArmor_Timer -= diff; @@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI if (EnvelopingWeb_Timer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_ENVELOPINGWEB); + DoCast(pTarget, SPELL_ENVELOPINGWEB); EnvelopingWeb_Timer = 12000; } else EnvelopingWeb_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp index 32ab314495b..acdba286f9d 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp @@ -70,7 +70,7 @@ struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI if (HandOfThaurissan_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_HANDOFTHAURISSAN); + DoCast(pTarget, SPELL_HANDOFTHAURISSAN); //3 Hands of Thaurissan will be casted //if (Counter < 3) @@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI //AvatarOfFlame_Timer if (AvatarOfFlame_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_AVATAROFFLAME); + DoCast(m_creature->getVictim(), SPELL_AVATAROFFLAME); AvatarOfFlame_Timer = 18000; } else AvatarOfFlame_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp index e10463203b5..dcc1c921ef0 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp @@ -74,21 +74,21 @@ struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI //MightyBlow_Timer if (MightyBlow_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MIGHTYBLOW); + DoCast(m_creature->getVictim(), SPELL_MIGHTYBLOW); MightyBlow_Timer = 18000; } else MightyBlow_Timer -= diff; //HamString_Timer if (HamString_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_HAMSTRING); + DoCast(m_creature->getVictim(), SPELL_HAMSTRING); HamString_Timer = 15000; } else HamString_Timer -= diff; //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 9000; } else Cleave_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp index f5e648f060e..168fa9e0d2e 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp @@ -55,14 +55,14 @@ struct TRINITY_DLL_DECL boss_gorosh_the_dervishAI : public ScriptedAI //WhirlWind_Timer if (WhirlWind_Timer <= diff) { - DoCast(m_creature,SPELL_WHIRLWIND); + DoCast(m_creature, SPELL_WHIRLWIND); WhirlWind_Timer = 15000; } else WhirlWind_Timer -= diff; //MortalStrike_Timer if (MortalStrike_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MORTALSTRIKE); + DoCast(m_creature->getVictim(), SPELL_MORTALSTRIKE); MortalStrike_Timer = 15000; } else MortalStrike_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp index 33c9bc10a8b..31a11b667cb 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp @@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_grizzleAI : public ScriptedAI //GroundTremor_Timer if (GroundTremor_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_GROUNDTREMOR); + DoCast(m_creature->getVictim(), SPELL_GROUNDTREMOR); GroundTremor_Timer = 8000; } else GroundTremor_Timer -= diff; @@ -69,7 +69,7 @@ struct TRINITY_DLL_DECL boss_grizzleAI : public ScriptedAI { if (Frenzy_Timer <= diff) { - DoCast(m_creature,SPELL_FRENZY); + DoCast(m_creature, SPELL_FRENZY); DoScriptText(EMOTE_GENERIC_FRENZY_KILL, m_creature); Frenzy_Timer = 15000; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp index e3fba2c39f8..5bf25036df5 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp @@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI if (ShadowWordPain_Timer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_SHADOWWORDPAIN); + DoCast(pTarget, SPELL_SHADOWWORDPAIN); ShadowWordPain_Timer = 7000; } else ShadowWordPain_Timer -= diff; @@ -70,21 +70,21 @@ struct TRINITY_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI if (ManaBurn_Timer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_MANABURN); + DoCast(pTarget, SPELL_MANABURN); ManaBurn_Timer = 10000; } else ManaBurn_Timer -= diff; //PsychicScream_Timer if (PsychicScream_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_PSYCHICSCREAM); + DoCast(m_creature->getVictim(), SPELL_PSYCHICSCREAM); PsychicScream_Timer = 30000; } else PsychicScream_Timer -= diff; //ShadowShield_Timer if (ShadowShield_Timer <= diff) { - DoCast(m_creature,SPELL_SHADOWSHIELD); + DoCast(m_creature, SPELL_SHADOWSHIELD); ShadowShield_Timer = 25000; } else ShadowShield_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp index 2f44e0e1801..f57a4009709 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp @@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI //FieryBurst_Timer if (FieryBurst_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FIERYBURST); + DoCast(m_creature->getVictim(), SPELL_FIERYBURST); FieryBurst_Timer = 6000; } else FieryBurst_Timer -= diff; @@ -64,7 +64,7 @@ struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI { if (WarStomp_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_WARSTOMP); + DoCast(m_creature->getVictim(), SPELL_WARSTOMP); WarStomp_Timer = 8000; } else WarStomp_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp index 9138e5b17dc..471e6fcd34d 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp @@ -67,21 +67,21 @@ struct TRINITY_DLL_DECL boss_moira_bronzebeardAI : public ScriptedAI //MindBlast_Timer if (MindBlast_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MINDBLAST); + DoCast(m_creature->getVictim(), SPELL_MINDBLAST); MindBlast_Timer = 14000; } else MindBlast_Timer -= diff; //ShadowWordPain_Timer if (ShadowWordPain_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHADOWWORDPAIN); + DoCast(m_creature->getVictim(), SPELL_SHADOWWORDPAIN); ShadowWordPain_Timer = 18000; } else ShadowWordPain_Timer -= diff; //Smite_Timer if (Smite_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SMITE); + DoCast(m_creature->getVictim(), SPELL_SMITE); Smite_Timer = 10000; } else Smite_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp index f3fb0b564f9..b9492775823 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp @@ -163,7 +163,7 @@ struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI //ShadowVolley_Timer if (ShadowVolley_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHADOWBOLTVOLLEY); + DoCast(m_creature->getVictim(), SPELL_SHADOWBOLTVOLLEY); ShadowVolley_Timer = 12000; } else ShadowVolley_Timer -= diff; @@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI if (Immolate_Timer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_IMMOLATE); + DoCast(pTarget, SPELL_IMMOLATE); Immolate_Timer = 25000; } else Immolate_Timer -= diff; @@ -179,21 +179,21 @@ struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI //CurseOfWeakness_Timer if (CurseOfWeakness_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CURSEOFWEAKNESS); + DoCast(m_creature->getVictim(), SPELL_CURSEOFWEAKNESS); CurseOfWeakness_Timer = 45000; } else CurseOfWeakness_Timer -= diff; //DemonArmor_Timer if (DemonArmor_Timer <= diff) { - DoCast(m_creature,SPELL_DEMONARMOR); + DoCast(m_creature, SPELL_DEMONARMOR); DemonArmor_Timer = 300000; } else DemonArmor_Timer -= diff; //Summon Voidwalkers if (!Voidwalkers && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51) { - m_creature->CastSpell(m_creature->getVictim(), SPELL_SUMMON_VOIDWALKERS, true); + DoCast(m_creature->getVictim(), SPELL_SUMMON_VOIDWALKERS, true); Voidwalkers = true; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp index b1ed1807d90..8bdd8849b4d 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp @@ -58,28 +58,28 @@ struct TRINITY_DLL_DECL boss_drakkisathAI : public ScriptedAI //FireNova_Timer if (FireNova_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FIRENOVA); + DoCast(m_creature->getVictim(), SPELL_FIRENOVA); FireNova_Timer = 10000; } else FireNova_Timer -= diff; //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 8000; } else Cleave_Timer -= diff; //Confliguration_Timer if (Confliguration_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CONFLIGURATION); + DoCast(m_creature->getVictim(), SPELL_CONFLIGURATION); Confliguration_Timer = 18000; } else Confliguration_Timer -= diff; //Thunderclap_Timer if (Thunderclap_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_THUNDERCLAP); + DoCast(m_creature->getVictim(), SPELL_THUNDERCLAP); Thunderclap_Timer = 20000; } else Thunderclap_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp index 440570d2a50..a8ffac32343 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp @@ -168,7 +168,7 @@ struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI // Flamebreath_Timer if (Flamebreath_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FLAMEBREATH); + DoCast(m_creature->getVictim(), SPELL_FLAMEBREATH); Flamebreath_Timer = 10500; } else Flamebreath_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp index 62050b1834b..2fb5dea68d3 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp @@ -59,14 +59,14 @@ struct TRINITY_DLL_DECL boss_halyconAI : public ScriptedAI //CrowdPummel_Timer if (CrowdPummel_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CROWDPUMMEL); + DoCast(m_creature->getVictim(), SPELL_CROWDPUMMEL); CrowdPummel_Timer = 14000; } else CrowdPummel_Timer -= diff; //MightyBlow_Timer if (MightyBlow_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MIGHTYBLOW); + DoCast(m_creature->getVictim(), SPELL_MIGHTYBLOW); MightyBlow_Timer = 10000; } else MightyBlow_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp index 34af1a6098a..07229186f0e 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp @@ -67,49 +67,49 @@ struct TRINITY_DLL_DECL boss_highlordomokkAI : public ScriptedAI //WarStomp_Timer if (WarStomp_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_WARSTOMP); + DoCast(m_creature->getVictim(), SPELL_WARSTOMP); WarStomp_Timer = 14000; } else WarStomp_Timer -= diff; //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 8000; } else Cleave_Timer -= diff; //Strike_Timer if (Strike_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_STRIKE); + DoCast(m_creature->getVictim(), SPELL_STRIKE); Strike_Timer = 10000; } else Strike_Timer -= diff; //Rend_Timer if (Rend_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_REND); + DoCast(m_creature->getVictim(), SPELL_REND); Rend_Timer = 18000; } else Rend_Timer -= diff; //SunderArmor_Timer if (SunderArmor_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SUNDERARMOR); + DoCast(m_creature->getVictim(), SPELL_SUNDERARMOR); SunderArmor_Timer = 25000; } else SunderArmor_Timer -= diff; //KnockAway_Timer if (KnockAway_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_KNOCKAWAY); + DoCast(m_creature->getVictim(), SPELL_KNOCKAWAY); KnockAway_Timer = 12000; } else KnockAway_Timer -= diff; //Slow_Timer if (Slow_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SLOW); + DoCast(m_creature->getVictim(), SPELL_SLOW); Slow_Timer = 18000; } else Slow_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp index 707d4dee79e..45e1c86a12d 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp @@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_mothersmolderwebAI : public ScriptedAI void DamageTaken(Unit *done_by, uint32 &damage) { if (m_creature->GetHealth() <= damage) - m_creature->CastSpell(m_creature,SPELL_SUMMON_SPIRE_SPIDERLING,true); + DoCast(m_creature, SPELL_SUMMON_SPIRE_SPIDERLING, true); } void UpdateAI(const uint32 diff) @@ -57,14 +57,14 @@ struct TRINITY_DLL_DECL boss_mothersmolderwebAI : public ScriptedAI //Crystalize_Timer if (Crystalize_Timer <= diff) { - DoCast(m_creature,SPELL_CRYSTALIZE); + DoCast(m_creature, SPELL_CRYSTALIZE); Crystalize_Timer = 15000; } else Crystalize_Timer -= diff; //MothersMilk_Timer if (MothersMilk_Timer <= diff) { - DoCast(m_creature,SPELL_MOTHERSMILK); + DoCast(m_creature, SPELL_MOTHERSMILK); MothersMilk_Timer = urand(5000,12500); } else MothersMilk_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp index 7e21ee66794..d2f493782f3 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp @@ -71,28 +71,28 @@ struct TRINITY_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI //BlastWave_Timer if (BlastWave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_BLASTWAVE); + DoCast(m_creature->getVictim(), SPELL_BLASTWAVE); BlastWave_Timer = 20000; } else BlastWave_Timer -= diff; //Shout_Timer if (Shout_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHOUT); + DoCast(m_creature->getVictim(), SPELL_SHOUT); Shout_Timer = 10000; } else Shout_Timer -= diff; //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 7000; } else Cleave_Timer -= diff; //Knockaway_Timer if (Knockaway_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_KNOCKAWAY); + DoCast(m_creature->getVictim(), SPELL_KNOCKAWAY); Knockaway_Timer = 14000; } else Knockaway_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp index 83ef1bb527c..520156dc656 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp @@ -55,14 +55,14 @@ struct TRINITY_DLL_DECL boss_pyroguard_emberseerAI : public ScriptedAI //FireNova_Timer if (FireNova_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FIRENOVA); + DoCast(m_creature->getVictim(), SPELL_FIRENOVA); FireNova_Timer = 6000; } else FireNova_Timer -= diff; //FlameBuffet_Timer if (FlameBuffet_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FLAMEBUFFET); + DoCast(m_creature->getVictim(), SPELL_FLAMEBUFFET); FlameBuffet_Timer = 14000; } else FlameBuffet_Timer -= diff; @@ -70,7 +70,7 @@ struct TRINITY_DLL_DECL boss_pyroguard_emberseerAI : public ScriptedAI if (PyroBlast_Timer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_PYROBLAST); + DoCast(pTarget, SPELL_PYROBLAST); PyroBlast_Timer = 15000; } else PyroBlast_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp index 0546b771275..16e8178e1b7 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp @@ -56,14 +56,14 @@ struct TRINITY_DLL_DECL boss_quatermasterzigrisAI : public ScriptedAI //Shoot_Timer if (Shoot_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHOOT); + DoCast(m_creature->getVictim(), SPELL_SHOOT); Shoot_Timer = 500; } else Shoot_Timer -= diff; //StunBomb_Timer if (StunBomb_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_STUNBOMB); + DoCast(m_creature->getVictim(), SPELL_STUNBOMB); StunBomb_Timer = 14000; } else StunBomb_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp index d21baebbf04..ad3f3b09548 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp @@ -55,21 +55,21 @@ struct TRINITY_DLL_DECL boss_rend_blackhandAI : public ScriptedAI //WhirlWind_Timer if (WhirlWind_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_WHIRLWIND); + DoCast(m_creature->getVictim(), SPELL_WHIRLWIND); WhirlWind_Timer = 18000; } else WhirlWind_Timer -= diff; //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 10000; } else Cleave_Timer -= diff; //Thunderclap_Timer if (Thunderclap_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_THUNDERCLAP); + DoCast(m_creature->getVictim(), SPELL_THUNDERCLAP); Thunderclap_Timer = 16000; } else Thunderclap_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp index c5fa53f5588..36941fab883 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp @@ -41,12 +41,10 @@ struct TRINITY_DLL_DECL boss_shadowvoshAI : public ScriptedAI Hex_Timer = 8000; Cleave_Timer = 14000; - //m_creature->CastSpell(m_creature,SPELL_ICEARMOR,true); + //DoCast(m_creature, SPELL_ICEARMOR, true); } - void EnterCombat(Unit *who) - { - } + void EnterCombat(Unit *who){} void UpdateAI(const uint32 diff) { @@ -57,7 +55,7 @@ struct TRINITY_DLL_DECL boss_shadowvoshAI : public ScriptedAI //CurseOfBlood_Timer if (CurseOfBlood_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CURSEOFBLOOD); + DoCast(m_creature->getVictim(), SPELL_CURSEOFBLOOD); CurseOfBlood_Timer = 45000; } else CurseOfBlood_Timer -= diff; @@ -65,14 +63,14 @@ struct TRINITY_DLL_DECL boss_shadowvoshAI : public ScriptedAI if (Hex_Timer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_HEX); + DoCast(pTarget, SPELL_HEX); Hex_Timer = 15000; } else Hex_Timer -= diff; //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 7000; } else Cleave_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp index 4a7816e8f55..2282334bff4 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp @@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_thebeastAI : public ScriptedAI //Flamebreak_Timer if (Flamebreak_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FLAMEBREAK); + DoCast(m_creature->getVictim(), SPELL_FLAMEBREAK); Flamebreak_Timer = 10000; } else Flamebreak_Timer -= diff; @@ -63,14 +63,14 @@ struct TRINITY_DLL_DECL boss_thebeastAI : public ScriptedAI if (Immolate_Timer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_IMMOLATE); + DoCast(pTarget, SPELL_IMMOLATE); Immolate_Timer = 8000; } else Immolate_Timer -= diff; //TerrifyingRoar_Timer if (TerrifyingRoar_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_TERRIFYINGROAR); + DoCast(m_creature->getVictim(), SPELL_TERRIFYINGROAR); TerrifyingRoar_Timer = 20000; } else TerrifyingRoar_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp index 29d0a86728a..30896461e97 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp @@ -64,42 +64,42 @@ struct TRINITY_DLL_DECL boss_warmastervooneAI : public ScriptedAI //Snapkick_Timer if (Snapkick_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SNAPKICK); + DoCast(m_creature->getVictim(), SPELL_SNAPKICK); Snapkick_Timer = 6000; } else Snapkick_Timer -= diff; //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 12000; } else Cleave_Timer -= diff; //Uppercut_Timer if (Uppercut_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_UPPERCUT); + DoCast(m_creature->getVictim(), SPELL_UPPERCUT); Uppercut_Timer = 14000; } else Uppercut_Timer -= diff; //MortalStrike_Timer if (MortalStrike_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MORTALSTRIKE); + DoCast(m_creature->getVictim(), SPELL_MORTALSTRIKE); MortalStrike_Timer = 10000; } else MortalStrike_Timer -= diff; //Pummel_Timer if (Pummel_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_PUMMEL); + DoCast(m_creature->getVictim(), SPELL_PUMMEL); Pummel_Timer = 16000; } else Pummel_Timer -= diff; //ThrowAxe_Timer if (ThrowAxe_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_THROWAXE); + DoCast(m_creature->getVictim(), SPELL_THROWAXE); ThrowAxe_Timer = 8000; } else ThrowAxe_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp index ab5029d4352..d688987af96 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp @@ -62,27 +62,27 @@ struct TRINITY_DLL_DECL boss_broodlordAI : public ScriptedAI //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 7000; } else Cleave_Timer -= diff; // BlastWave if (BlastWave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_BLASTWAVE); + DoCast(m_creature->getVictim(), SPELL_BLASTWAVE); BlastWave_Timer = urand(8000,16000); } else BlastWave_Timer -= diff; //MortalStrike_Timer if (MortalStrike_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MORTALSTRIKE); + DoCast(m_creature->getVictim(), SPELL_MORTALSTRIKE); MortalStrike_Timer = urand(25000,35000); } else MortalStrike_Timer -= diff; if (KnockBack_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_KNOCKBACK); + DoCast(m_creature->getVictim(), SPELL_KNOCKBACK); //Drop 50% aggro if (DoGetThreat(m_creature->getVictim())) DoModifyThreatPercent(m_creature->getVictim(),-50); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp index c251ada940e..99c82deea39 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp @@ -205,7 +205,7 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI uint32 spell = RAND(SPELL_FIRE_VULNERABILITY, SPELL_FROST_VULNERABILITY, SPELL_SHADOW_VULNERABILITY, SPELL_NATURE_VULNERABILITY, SPELL_ARCANE_VULNERABILITY); - DoCast(m_creature,spell); + DoCast(m_creature, spell); CurrentVurln_Spell = spell; DoScriptText(EMOTE_SHIMMER, m_creature); @@ -215,14 +215,14 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI //Breath1_Timer if (Breath1_Timer <= diff) { - DoCast(m_creature->getVictim(),Breath1_Spell); + DoCast(m_creature->getVictim(), Breath1_Spell); Breath1_Timer = 60000; } else Breath1_Timer -= diff; //Breath2_Timer if (Breath2_Timer <= diff) { - DoCast(m_creature->getVictim(),Breath2_Spell); + DoCast(m_creature->getVictim(), Breath2_Spell); Breath2_Timer = 60000; } else Breath2_Timer -= diff; @@ -249,7 +249,7 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI && pUnit->HasAura(SPELL_BROODAF_GREEN)) { //pTarget->RemoveAllAuras(); - //DoCast(pTarget,SPELL_CHROMATIC_MUT_1); + //DoCast(pTarget, SPELL_CHROMATIC_MUT_1); //Chromatic mutation is causing issues //Assuming it is caused by a lack of core support for Charm @@ -269,7 +269,7 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI //Frenzy_Timer if (Frenzy_Timer <= diff) { - DoCast(m_creature,SPELL_FRENZY); + DoCast(m_creature, SPELL_FRENZY); DoScriptText(EMOTE_FRENZY, m_creature); Frenzy_Timer = urand(10000,15000); } else Frenzy_Timer -= diff; @@ -277,7 +277,7 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI //Enrage if not already enraged and below 20% if (!Enraged && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 20) { - DoCast(m_creature,SPELL_ENRAGE); + DoCast(m_creature, SPELL_ENRAGE); Enraged = true; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp index 391858aaa73..54ecb4263c5 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp @@ -58,21 +58,21 @@ struct TRINITY_DLL_DECL boss_ebonrocAI : public ScriptedAI //Shadowflame Timer if (ShadowFlame_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHADOWFLAME); + DoCast(m_creature->getVictim(), SPELL_SHADOWFLAME); ShadowFlame_Timer = urand(12000,15000); } else ShadowFlame_Timer -= diff; //Wing Buffet Timer if (WingBuffet_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_WINGBUFFET); + DoCast(m_creature->getVictim(), SPELL_WINGBUFFET); WingBuffet_Timer = 25000; } else WingBuffet_Timer -= diff; //Shadow of Ebonroc Timer if (ShadowOfEbonroc_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHADOWOFEBONROC); + DoCast(m_creature->getVictim(), SPELL_SHADOWOFEBONROC); ShadowOfEbonroc_Timer = urand(25000,350000); } else ShadowOfEbonroc_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp index 736287ef2b5..8e99a90c8a8 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp @@ -55,14 +55,14 @@ struct TRINITY_DLL_DECL boss_firemawAI : public ScriptedAI //ShadowFlame_Timer if (ShadowFlame_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHADOWFLAME); + DoCast(m_creature->getVictim(), SPELL_SHADOWFLAME); ShadowFlame_Timer = urand(15000,18000); } else ShadowFlame_Timer -= diff; //WingBuffet_Timer if (WingBuffet_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_WINGBUFFET); + DoCast(m_creature->getVictim(), SPELL_WINGBUFFET); if (DoGetThreat(m_creature->getVictim())) DoModifyThreatPercent(m_creature->getVictim(),-75); @@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL boss_firemawAI : public ScriptedAI //FlameBuffet_Timer if (FlameBuffet_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FLAMEBUFFET); + DoCast(m_creature->getVictim(), SPELL_FLAMEBUFFET); FlameBuffet_Timer = 5000; } else FlameBuffet_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp index 6a02b3ffe43..24c7e2a5cde 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp @@ -57,14 +57,14 @@ struct TRINITY_DLL_DECL boss_flamegorAI : public ScriptedAI //ShadowFlame_Timer if (ShadowFlame_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHADOWFLAME); + DoCast(m_creature->getVictim(), SPELL_SHADOWFLAME); ShadowFlame_Timer = 15000 + rand()%7000; } else ShadowFlame_Timer -= diff; //WingBuffet_Timer if (WingBuffet_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_WINGBUFFET); + DoCast(m_creature->getVictim(), SPELL_WINGBUFFET); if (DoGetThreat(m_creature->getVictim())) DoModifyThreatPercent(m_creature->getVictim(),-75); @@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL boss_flamegorAI : public ScriptedAI if (Frenzy_Timer <= diff) { DoScriptText(EMOTE_FRENZY, m_creature); - DoCast(m_creature,SPELL_FRENZY); + DoCast(m_creature, SPELL_FRENZY); Frenzy_Timer = urand(8000, 10000); } else Frenzy_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp index 41dd7b03aa1..3bc0cb69cb1 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp @@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI { DoScriptText(RAND(SAY_XHEALTH,SAY_AGGRO,SAY_SHADOWFLAME), m_creature); - DoCast(who,SPELL_SHADOWFLAME_INITIAL); + DoCast(who, SPELL_SHADOWFLAME_INITIAL); DoZoneInCombat(); } @@ -121,28 +121,28 @@ struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI //ShadowFlame_Timer if (ShadowFlame_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHADOWFLAME); + DoCast(m_creature->getVictim(), SPELL_SHADOWFLAME); ShadowFlame_Timer = 12000; } else ShadowFlame_Timer -= diff; //BellowingRoar_Timer if (BellowingRoar_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_BELLOWINGROAR); + DoCast(m_creature->getVictim(), SPELL_BELLOWINGROAR); BellowingRoar_Timer = 30000; } else BellowingRoar_Timer -= diff; //VeilOfShadow_Timer if (VeilOfShadow_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_VEILOFSHADOW); + DoCast(m_creature->getVictim(), SPELL_VEILOFSHADOW); VeilOfShadow_Timer = 15000; } else VeilOfShadow_Timer -= diff; //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 7000; } else Cleave_Timer -= diff; @@ -150,7 +150,7 @@ struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI if (TailLash_Timer <= diff) { //Cast NYI since we need a better check for behind target - //DoCast(m_creature->getVictim(),SPELL_TAILLASH); + //DoCast(m_creature->getVictim(), SPELL_TAILLASH); TailLash_Timer = 10000; } else TailLash_Timer -= diff; @@ -166,39 +166,39 @@ struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI { case 0: DoScriptText(SAY_MAGE, m_creature); - DoCast(m_creature,SPELL_MAGE); + DoCast(m_creature, SPELL_MAGE); break; case 1: DoScriptText(SAY_WARRIOR, m_creature); - DoCast(m_creature,SPELL_WARRIOR); + DoCast(m_creature, SPELL_WARRIOR); break; case 2: DoScriptText(SAY_DRUID, m_creature); - DoCast(m_creature,SPELL_DRUID); + DoCast(m_creature, SPELL_DRUID); break; case 3: DoScriptText(SAY_PRIEST, m_creature); - DoCast(m_creature,SPELL_PRIEST); + DoCast(m_creature, SPELL_PRIEST); break; case 4: DoScriptText(SAY_PALADIN, m_creature); - DoCast(m_creature,SPELL_PALADIN); + DoCast(m_creature, SPELL_PALADIN); break; case 5: DoScriptText(SAY_SHAMAN, m_creature); - DoCast(m_creature,SPELL_SHAMAN); + DoCast(m_creature, SPELL_SHAMAN); break; case 6: DoScriptText(SAY_WARLOCK, m_creature); - DoCast(m_creature,SPELL_WARLOCK); + DoCast(m_creature, SPELL_WARLOCK); break; case 7: DoScriptText(SAY_HUNTER, m_creature); - DoCast(m_creature,SPELL_HUNTER); + DoCast(m_creature, SPELL_HUNTER); break; case 8: DoScriptText(SAY_ROGUE, m_creature); - DoCast(m_creature,SPELL_ROGUE); + DoCast(m_creature, SPELL_ROGUE); break; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp index 900317a9c83..37c446acaf3 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp @@ -70,28 +70,28 @@ struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = urand(7000,10000); } else Cleave_Timer -= diff; //WarStomp_Timer if (WarStomp_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_WARSTOMP); + DoCast(m_creature->getVictim(), SPELL_WARSTOMP); WarStomp_Timer = urand(15000,25000); } else WarStomp_Timer -= diff; //FireballVolley_Timer if (FireballVolley_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FIREBALLVOLLEY); + DoCast(m_creature->getVictim(), SPELL_FIREBALLVOLLEY); FireballVolley_Timer = urand(12000,15000); } else FireballVolley_Timer -= diff; //Conflagration_Timer if (Conflagration_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CONFLAGRATION); + DoCast(m_creature->getVictim(), SPELL_CONFLAGRATION); //We will remove this threat reduction and add an aura check. //if (DoGetThreat(m_creature->getVictim())) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp index 4bf513997ab..81c673fa19d 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp @@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI void EnterCombat(Unit *who) { - DoCast(m_creature,SPELL_ESSENCEOFTHERED); + DoCast(m_creature, SPELL_ESSENCEOFTHERED); DoZoneInCombat(); m_creature->SetHealth(int(m_creature->GetMaxHealth()*.3)); } @@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI if (PlayerGUID && Unit::GetUnit((*m_creature),PlayerGUID)) { AttackStart(Unit::GetUnit((*m_creature),PlayerGUID)); - DoCast(m_creature,SPELL_ESSENCEOFTHERED); + DoCast(m_creature, SPELL_ESSENCEOFTHERED); } SpeechTimer = 0; DoingSpeech = false; @@ -153,14 +153,14 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 15000; } else Cleave_Timer -= diff; //FlameBreath_Timer if (FlameBreath_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FLAMEBREATH); + DoCast(m_creature->getVictim(), SPELL_FLAMEBREATH); FlameBreath_Timer = urand(4000,8000); } else FlameBreath_Timer -= diff; @@ -196,7 +196,7 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI //FireNova_Timer if (FireNova_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FIRENOVA); + DoCast(m_creature->getVictim(), SPELL_FIRENOVA); FireNova_Timer = 5000; } else FireNova_Timer -= diff; @@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI //Only cast if we are behind /*if (!m_creature->HasInArc(M_PI, m_creature->getVictim())) { - DoCast(m_creature->getVictim(),SPELL_TAILSWIPE); + DoCast(m_creature->getVictim(), SPELL_TAILSWIPE); }*/ TailSwipe_Timer = 20000; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp index 5a922c413b7..47a2ea942ae 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp @@ -294,10 +294,10 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI m_creature->InterruptNonMeleeSpells(false); //Root self - DoCast(m_creature,33356); + DoCast(m_creature, 33356); //Make super invis - DoCast(m_creature,8149); + DoCast(m_creature, 8149); //Teleport self to a hiding spot (this causes errors in the Trinity log but no real issues) DoTeleportTo(HIDE_X,HIDE_Y,HIDE_Z); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/boss_kruul.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/boss_kruul.cpp index 6d3ba9fda5e..5b9de136aa0 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/boss_kruul.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/boss_kruul.cpp @@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI void KilledUnit() { // When a player, pet or totem gets killed, Lord Kazzak casts this spell to instantly regenerate 70,000 health. - DoCast(m_creature,SPELL_CAPTURESOUL); + DoCast(m_creature, SPELL_CAPTURESOUL); } void SummonHounds(Unit* pVictim) @@ -80,7 +80,7 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI if (ShadowVolley_Timer <= diff) { if (urand(0,99) < 45) - DoCast(m_creature->getVictim(),SPELL_SHADOWVOLLEY); + DoCast(m_creature->getVictim(), SPELL_SHADOWVOLLEY); ShadowVolley_Timer = 5000; } else ShadowVolley_Timer -= diff; @@ -89,7 +89,7 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI if (Cleave_Timer <= diff) { if (urand(0,1)) - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 10000; } else Cleave_Timer -= diff; @@ -98,7 +98,7 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI if (ThunderClap_Timer <= diff) { if (urand(0,9) < 2) - DoCast(m_creature->getVictim(),SPELL_THUNDERCLAP); + DoCast(m_creature->getVictim(), SPELL_THUNDERCLAP); ThunderClap_Timer = 12000; } else ThunderClap_Timer -= diff; @@ -106,7 +106,7 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI //TwistedReflection_Timer if (TwistedReflection_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_TWISTEDREFLECTION); + DoCast(m_creature->getVictim(), SPELL_TWISTEDREFLECTION); TwistedReflection_Timer = 30000; } else TwistedReflection_Timer -= diff; @@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI if (VoidBolt_Timer <= diff) { if (urand(0,9) < 4) - DoCast(m_creature->getVictim(),SPELL_VOIDBOLT); + DoCast(m_creature->getVictim(), SPELL_VOIDBOLT); VoidBolt_Timer = 18000; } else VoidBolt_Timer -= diff; @@ -122,7 +122,7 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI //Rage_Timer if (Rage_Timer <= diff) { - DoCast(m_creature,SPELL_RAGE); + DoCast(m_creature, SPELL_RAGE); Rage_Timer = 70000; } else Rage_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/burning_steppes.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/burning_steppes.cpp index d1b4c778a1f..5ef8fc6296a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/burning_steppes.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/burning_steppes.cpp @@ -56,7 +56,7 @@ struct TRINITY_DLL_DECL npc_ragged_johnAI : public ScriptedAI { if (who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 15) && who->isInAccessiblePlaceFor(m_creature)) { - DoCast(who,16472); + DoCast(who, 16472); CAST_PLR(who)->AreaExploredOrEventHappens(4866); } } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/dun_morogh.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/dun_morogh.cpp index 8e134ed19f6..04eb6d4aeed 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/dun_morogh.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/dun_morogh.cpp @@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL npc_narm_faulkAI : public ScriptedAI { if (Spellkind->Id == 8593 && !spellHit) { - DoCast(m_creature,32343); + DoCast(m_creature, 32343); m_creature->SetStandState(UNIT_STAND_STATE_STAND); m_creature->SetUInt32Value(UNIT_DYNAMIC_FLAGS, 0); //m_creature->RemoveAllAuras(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/duskwood.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/duskwood.cpp index 83003f8c73c..7f620c755fb 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/duskwood.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/duskwood.cpp @@ -94,12 +94,12 @@ struct TRINITY_DLL_DECL boss_twilight_corrupterAI : public ScriptedAI return; if (SoulCorruption_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SOUL_CORRUPTION); + DoCast(m_creature->getVictim(), SPELL_SOUL_CORRUPTION); SoulCorruption_Timer = rand()%4000+15000; //gotta confirm Timers } else SoulCorruption_Timer-=diff; if (CreatureOfNightmare_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SOUL_CORRUPTION); + DoCast(m_creature->getVictim(), SPELL_SOUL_CORRUPTION); CreatureOfNightmare_Timer = 45000; //gotta confirm Timers } else CreatureOfNightmare_Timer-=diff; DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/eastern_plaguelands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/eastern_plaguelands.cpp index a53a23d9dbd..17f7296dcb3 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/eastern_plaguelands.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/eastern_plaguelands.cpp @@ -89,7 +89,7 @@ struct TRINITY_DLL_DECL npc_darrowshire_spiritAI : public ScriptedAI void Reset() { - DoCast(m_creature,SPELL_SPIRIT_SPAWNIN); + DoCast(m_creature, SPELL_SPIRIT_SPAWNIN); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/elwynn_forest.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/elwynn_forest.cpp index 113dcbc02e5..e68817e0a6b 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/elwynn_forest.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/elwynn_forest.cpp @@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL npc_henze_faulkAI : public ScriptedAI { if (Spellkind->Id == 8593 && !spellHit) { - DoCast(m_creature,32343); + DoCast(m_creature, 32343); m_creature->SetStandState(UNIT_STAND_STATE_STAND); m_creature->SetUInt32Value(UNIT_DYNAMIC_FLAGS, 0); //m_creature->RemoveAllAuras(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp index cee99b1e7ad..ad6fb0013f3 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/eversong_woods.cpp @@ -268,7 +268,7 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI if (spellJudLight) if (timerJudLight <= diff) { - DoCast(m_creature, SPELL_JUDGEMENT_OF_LIGHT); + DoCast(m_creature, SPELL_JUDGEMENT_OF_LIGHT); timerJudLight = TIMER_JUDGEMENT_OF_LIGHT + rand()%TIMER_JUDGEMENT_OF_LIGHT; } else @@ -277,7 +277,7 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI if (spellCommand) if (timerCommand <= diff) { - DoCast(m_creature, TIMER_SEAL_OF_COMMAND); + DoCast(m_creature, TIMER_SEAL_OF_COMMAND); timerCommand = TIMER_SEAL_OF_COMMAND + rand()%TIMER_SEAL_OF_COMMAND; } else diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp index 93430f5b079..1441b06ca81 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp @@ -83,7 +83,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI if (Enrage_Timer < diff && !Enraged) { - DoCast(m_creature, SPELL_BERSERK,true); + DoCast(m_creature, SPELL_BERSERK, true); Enraged = true; } else Enrage_Timer -= diff; @@ -95,7 +95,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI if (Repentance_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_REPENTANCE); + DoCast(m_creature->getVictim(), SPELL_REPENTANCE); DoScriptText(RAND(SAY_REPENTANCE1,SAY_REPENTANCE2), m_creature); Repentance_Timer = urand(25000,35000); //A little randomness on that spell @@ -104,7 +104,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI if (Holyfire_Timer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_HOLYFIRE); + DoCast(pTarget, SPELL_HOLYFIRE); Holyfire_Timer = urand(8000,23000); //Anywhere from 8 to 23 seconds, good luck having several of those in a row! } else Holyfire_Timer -= diff; @@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI if (Holywrath_Timer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_HOLYWRATH); + DoCast(pTarget, SPELL_HOLYWRATH); Holywrath_Timer = urand(20000,25000); //20-30 secs sounds nice } else Holywrath_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp index 944c69e7ba7..be51947aa5b 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp @@ -381,7 +381,7 @@ struct TRINITY_DLL_DECL boss_baroness_dorothea_millstipeAI : public boss_moroes_ MindFlay_Timer = 1000; ShadowWordPain_Timer = 6000; - DoCast(m_creature,SPELL_SHADOWFORM, true); + DoCast(m_creature, SPELL_SHADOWFORM, true); boss_moroes_guestAI::Reset(); } @@ -395,7 +395,7 @@ struct TRINITY_DLL_DECL boss_baroness_dorothea_millstipeAI : public boss_moroes_ if (MindFlay_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MINDFLY); + DoCast(m_creature->getVictim(), SPELL_MINDFLY); MindFlay_Timer = 12000; // 3 sec channeled } else MindFlay_Timer -= diff; @@ -403,7 +403,7 @@ struct TRINITY_DLL_DECL boss_baroness_dorothea_millstipeAI : public boss_moroes_ { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) if (pTarget->getPowerType() == POWER_MANA) - DoCast(pTarget,SPELL_MANABURN); + DoCast(pTarget, SPELL_MANABURN); ManaBurn_Timer = 5000; // 3 sec cast } else ManaBurn_Timer -= diff; @@ -411,7 +411,7 @@ struct TRINITY_DLL_DECL boss_baroness_dorothea_millstipeAI : public boss_moroes_ { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - DoCast(pTarget,SPELL_SWPAIN); + DoCast(pTarget, SPELL_SWPAIN); ShadowWordPain_Timer = 7000; } } else ShadowWordPain_Timer -= diff; @@ -449,20 +449,20 @@ struct TRINITY_DLL_DECL boss_baron_rafe_dreugerAI : public boss_moroes_guestAI if (SealOfCommand_Timer <= diff) { - DoCast(m_creature,SPELL_SEALOFCOMMAND); + DoCast(m_creature, SPELL_SEALOFCOMMAND); SealOfCommand_Timer = 32000; JudgementOfCommand_Timer = 29000; } else SealOfCommand_Timer -= diff; if (JudgementOfCommand_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_JUDGEMENTOFCOMMAND); + DoCast(m_creature->getVictim(), SPELL_JUDGEMENTOFCOMMAND); JudgementOfCommand_Timer = SealOfCommand_Timer + 29000; } else JudgementOfCommand_Timer -= diff; if (HammerOfJustice_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_HAMMEROFJUSTICE); + DoCast(m_creature->getVictim(), SPELL_HAMMEROFJUSTICE); HammerOfJustice_Timer = 12000; } else HammerOfJustice_Timer -= diff; } @@ -504,7 +504,7 @@ struct TRINITY_DLL_DECL boss_lady_catriona_von_indiAI : public boss_moroes_guest if (PowerWordShield_Timer <= diff) { - DoCast(m_creature,SPELL_PWSHIELD); + DoCast(m_creature, SPELL_PWSHIELD); PowerWordShield_Timer = 15000; } else PowerWordShield_Timer -= diff; @@ -518,7 +518,7 @@ struct TRINITY_DLL_DECL boss_lady_catriona_von_indiAI : public boss_moroes_guest if (HolyFire_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_HOLYFIRE); + DoCast(m_creature->getVictim(), SPELL_HOLYFIRE); HolyFire_Timer = 22000; } else HolyFire_Timer -= diff; @@ -568,7 +568,7 @@ struct TRINITY_DLL_DECL boss_lady_keira_berrybuckAI : public boss_moroes_guestAI if (DivineShield_Timer <= diff) { - DoCast(m_creature,SPELL_DIVINESHIELD); + DoCast(m_creature, SPELL_DIVINESHIELD); DivineShield_Timer = 31000; } else DivineShield_Timer -= diff; @@ -631,7 +631,7 @@ struct TRINITY_DLL_DECL boss_lord_robin_darisAI : public boss_moroes_guestAI if (Hamstring_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_HAMSTRING); + DoCast(m_creature->getVictim(), SPELL_HAMSTRING); Hamstring_Timer = 12000; } else Hamstring_Timer -= diff; @@ -643,7 +643,7 @@ struct TRINITY_DLL_DECL boss_lord_robin_darisAI : public boss_moroes_guestAI if (WhirlWind_Timer <= diff) { - DoCast(m_creature,SPELL_WHIRLWIND); + DoCast(m_creature, SPELL_WHIRLWIND); WhirlWind_Timer = 21000; } else WhirlWind_Timer -= diff; } @@ -683,25 +683,25 @@ struct TRINITY_DLL_DECL boss_lord_crispin_ferenceAI : public boss_moroes_guestAI if (Disarm_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_DISARM); + DoCast(m_creature->getVictim(), SPELL_DISARM); Disarm_Timer = 12000; } else Disarm_Timer -= diff; if (HeroicStrike_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_HEROICSTRIKE); + DoCast(m_creature->getVictim(), SPELL_HEROICSTRIKE); HeroicStrike_Timer = 10000; } else HeroicStrike_Timer -= diff; if (ShieldBash_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHIELDBASH); + DoCast(m_creature->getVictim(), SPELL_SHIELDBASH); ShieldBash_Timer = 13000; } else ShieldBash_Timer -= diff; if (ShieldWall_Timer <= diff) { - DoCast(m_creature,SPELL_SHIELDWALL); + DoCast(m_creature, SPELL_SHIELDWALL); ShieldWall_Timer = 21000; } else ShieldWall_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp index 31db51eac3d..1e8bd3e3071 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp @@ -228,8 +228,8 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI { m_creature->RemoveAurasDueToSpell(SPELL_EMPOWERMENT); m_creature->RemoveAurasDueToSpell(SPELL_NETHERBURN_AURA); - DoCast(m_creature,SPELL_BANISH_VISUAL,true); - DoCast(m_creature,SPELL_BANISH_ROOT,true); + DoCast(m_creature, SPELL_BANISH_VISUAL, true); + DoCast(m_creature, SPELL_BANISH_ROOT, true); DestroyPortals(); PhaseTimer = 30000; PortalPhase = false; @@ -309,7 +309,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI if (NetherbreathTimer <= diff) { if(Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,40,true)) - DoCast(pTarget,SPELL_NETHERBREATH); + DoCast(pTarget, SPELL_NETHERBREATH); NetherbreathTimer = urand(5000,7000); } else NetherbreathTimer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp index 84a0ef601fc..a153a24c106 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp @@ -297,20 +297,20 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI if (BellowingRoarTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_BELLOWING_ROAR); + DoCast(m_creature->getVictim(), SPELL_BELLOWING_ROAR); BellowingRoarTimer = urand(30000,40000); } else BellowingRoarTimer -= diff; if (SmolderingBreathTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SMOLDERING_BREATH); + DoCast(m_creature->getVictim(), SPELL_SMOLDERING_BREATH); SmolderingBreathTimer = 20000; } else SmolderingBreathTimer -= diff; if (CharredEarthTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_CHARRED_EARTH); + DoCast(pTarget, SPELL_CHARRED_EARTH); CharredEarthTimer = 20000; } else CharredEarthTimer -= diff; @@ -318,14 +318,14 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) if (!m_creature->HasInArc(M_PI, pTarget)) - DoCast(pTarget,SPELL_TAIL_SWEEP); + DoCast(pTarget, SPELL_TAIL_SWEEP); TailSweepTimer = 15000; } else TailSweepTimer -= diff; if (SearingCindersTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_SEARING_CINDERS); + DoCast(pTarget, SPELL_SEARING_CINDERS); SearingCindersTimer = 10000; } else SearingCindersTimer -= diff; @@ -360,7 +360,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI if (RainofBonesTimer < diff && !RainBones) // only once at the beginning of phase 2 { - DoCast(m_creature->getVictim(),SPELL_RAIN_OF_BONES); + DoCast(m_creature->getVictim(), SPELL_RAIN_OF_BONES); RainBones = true; SmokingBlastTimer = 20000; } else RainofBonesTimer -= diff; @@ -368,7 +368,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI if (DistractingAshTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_DISTRACTING_ASH); + DoCast(pTarget, SPELL_DISTRACTING_ASH); DistractingAshTimer = 2000; //timer wrong } else DistractingAshTimer -= diff; } @@ -377,7 +377,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI { if (SmokingBlastTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SMOKING_BLAST); + DoCast(m_creature->getVictim(), SPELL_SMOKING_BLAST); SmokingBlastTimer = 1500; //timer wrong } else SmokingBlastTimer -= diff; } @@ -385,7 +385,7 @@ struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI if (FireballBarrageTimer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_FARTHEST, 0)) - DoCast(pTarget,SPELL_FIREBALL_BARRAGE); + DoCast(pTarget, SPELL_FIREBALL_BARRAGE); FireballBarrageTimer = 20000; } else FireballBarrageTimer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp index 892a7765cd1..03d5166ffd3 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp @@ -386,7 +386,7 @@ struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI DoScriptText(SAY_AXE_TOSS1, m_creature); //passive thrash aura - m_creature->CastSpell(m_creature, SPELL_THRASH_AURA, true); + DoCast(m_creature, SPELL_THRASH_AURA, true); //models SetEquipmentSlots(false, EQUIP_ID_AXE, EQUIP_ID_AXE, EQUIP_NO_CHANGE); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp index c03afc3f0eb..a3d63534697 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp @@ -201,7 +201,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI FlameWreathTarget[i] = (*itr)->GetGUID(); FWTargPosX[i] = (*itr)->GetPositionX(); FWTargPosY[i] = (*itr)->GetPositionY(); - m_creature->CastSpell((*itr), SPELL_FLAME_WREATH, true); + DoCast((*itr), SPELL_FLAME_WREATH, true); ++i; } } @@ -255,9 +255,9 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI if (!DrinkInturrupted) { - m_creature->CastSpell(m_creature, SPELL_MASS_POLY, true); - m_creature->CastSpell(m_creature, SPELL_CONJURE, false); - m_creature->CastSpell(m_creature, SPELL_DRINK, false); + DoCast(m_creature, SPELL_MASS_POLY, true); + DoCast(m_creature, SPELL_CONJURE, false); + DoCast(m_creature, SPELL_DRINK, false); m_creature->SetStandState(UNIT_STAND_STATE_SIT); DrinkInturruptTimer = 10000; } @@ -270,7 +270,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI m_creature->RemoveAurasDueToSpell(SPELL_DRINK); m_creature->SetStandState(UNIT_STAND_STATE_STAND); m_creature->SetPower(POWER_MANA, m_creature->GetMaxPower(POWER_MANA)-32000); - m_creature->CastSpell(m_creature, SPELL_POTION, false); + DoCast(m_creature, SPELL_POTION, false); } //Drink Inturrupt Timer @@ -280,8 +280,8 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI else { m_creature->SetStandState(UNIT_STAND_STATE_STAND); - m_creature->CastSpell(m_creature, SPELL_POTION, true); - m_creature->CastSpell(m_creature, SPELL_AOE_PYROBLAST, false); + DoCast(m_creature, SPELL_POTION, true); + DoCast(m_creature, SPELL_AOE_PYROBLAST, false); DrinkInturrupted = true; Drinking = false; } @@ -371,10 +371,10 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI case SUPER_AE: DoScriptText(RAND(SAY_EXPLOSION1,SAY_EXPLOSION2), m_creature); - m_creature->CastSpell(m_creature, SPELL_BLINK_CENTER, true); - m_creature->CastSpell(m_creature, SPELL_PLAYERPULL, true); - m_creature->CastSpell(m_creature, SPELL_MASSSLOW, true); - m_creature->CastSpell(m_creature, SPELL_AEXPLOSION, false); + DoCast(m_creature, SPELL_BLINK_CENTER, true); + DoCast(m_creature, SPELL_PLAYERPULL, true); + DoCast(m_creature, SPELL_MASSSLOW, true); + DoCast(m_creature, SPELL_AEXPLOSION, false); break; case SUPER_FLAME: diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp index 6e0cfc714e0..b18c3372b75 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp @@ -105,7 +105,7 @@ struct TRINITY_DLL_DECL mob_kilrekAI : public ScriptedAI if (AmplifyTimer <= diff) { m_creature->InterruptNonMeleeSpells(false); - DoCast(m_creature->getVictim(),SPELL_AMPLIFY_FLAMES); + DoCast(m_creature->getVictim(), SPELL_AMPLIFY_FLAMES); AmplifyTimer = urand(10000,20000); } else AmplifyTimer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp index 888bf9a88e5..4b8dc4a40e0 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/karazhan/karazhan.cpp @@ -159,7 +159,7 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI switch(i) { case 0: - m_creature->CastSpell(m_creature, SPELL_TUXEDO, false); + DoCast(m_creature, SPELL_TUXEDO, false); pInstance->DoUseDoorOrButton(pInstance->GetData64(DATA_GO_STAGEDOORLEFT)); break; case 4: @@ -546,7 +546,7 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI return 10000; case 10: if (arca) - m_creature->CastSpell(arca, SPELL_CONFLAGRATION_BLAST, false); + DoCast(arca, SPELL_CONFLAGRATION_BLAST, false); return 1000; case 11: if (arca) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp index 6e1a83781fc..6a35f458bf5 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp @@ -466,7 +466,7 @@ struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI { m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE + UNIT_FLAG_NON_ATTACKABLE); m_creature->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - m_creature->CastSpell(m_creature,SPELL_PHOENIX_BURN,true); + DoCast(m_creature, SPELL_PHOENIX_BURN, true); BurnTimer = 2000; Death_Timer = 3000; Rebirth = false; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp index aa3c62b9ad2..2a92b19166c 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp @@ -269,7 +269,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI if (pAdd->isAlive()) pTarget = pAdd; - DoCast(pTarget,Heroic ? SPELL_RENEW_HEROIC : SPELL_RENEW_NORMAL); + DoCast(pTarget, Heroic ? SPELL_RENEW_HEROIC : SPELL_RENEW_NORMAL); RenewTimer = 5000; } else RenewTimer -= diff; @@ -599,7 +599,7 @@ struct TRINITY_DLL_DECL boss_ellris_duskhallowAI : public boss_priestess_lackey_ void Aggro(Unit* pWho) { - DoCast(m_creature,SPELL_SUMMON_IMP); + DoCast(m_creature, SPELL_SUMMON_IMP); } void UpdateAI(const uint32 diff) @@ -611,13 +611,13 @@ struct TRINITY_DLL_DECL boss_ellris_duskhallowAI : public boss_priestess_lackey_ if (Immolate_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_IMMOLATE); + DoCast(m_creature->getVictim(), SPELL_IMMOLATE); Immolate_Timer = 6000; } else Immolate_Timer -= diff; if (Shadow_Bolt_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHADOW_BOLT); + DoCast(m_creature->getVictim(), SPELL_SHADOW_BOLT); Shadow_Bolt_Timer = 5000; } else Shadow_Bolt_Timer -= diff; @@ -685,13 +685,13 @@ struct TRINITY_DLL_DECL boss_eramas_brightblazeAI : public boss_priestess_lackey if (Knockdown_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_KNOCKDOWN); + DoCast(m_creature->getVictim(), SPELL_KNOCKDOWN); Knockdown_Timer = 6000; } else Knockdown_Timer -= diff; if (Snap_Kick_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SNAP_KICK); + DoCast(m_creature->getVictim(), SPELL_SNAP_KICK); Snap_Kick_Timer = 4500; } else Snap_Kick_Timer -= diff; @@ -904,7 +904,7 @@ struct TRINITY_DLL_DECL boss_warlord_salarisAI : public boss_priestess_lackey_co if (Disarm_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_DISARM); + DoCast(m_creature->getVictim(), SPELL_DISARM); Disarm_Timer = 6000; } else Disarm_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp index 4b337a42627..c4159937aca 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp @@ -138,11 +138,11 @@ struct TRINITY_DLL_DECL boss_vexallusAI : public ScriptedAI if (Heroic) { - m_creature->CastSpell(m_creature,H_SPELL_SUMMON_PURE_ENERGY1,false); - m_creature->CastSpell(m_creature,H_SPELL_SUMMON_PURE_ENERGY2,false); + DoCast(m_creature, H_SPELL_SUMMON_PURE_ENERGY1, false); + DoCast(m_creature, H_SPELL_SUMMON_PURE_ENERGY2, false); } else - m_creature->CastSpell(m_creature,SPELL_SUMMON_PURE_ENERGY,false); + DoCast(m_creature, SPELL_SUMMON_PURE_ENERGY, false); //below are workaround summons, remove when summoning spells w/implicitTarget 73 implemented in Mangos m_creature->SummonCreature(NPC_PURE_ENERGY, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp index bdc524c4bf2..1aa6cd10914 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp @@ -104,11 +104,11 @@ struct TRINITY_DLL_DECL npc_kalecgosAI : public ScriptedAI { if (m_uiTransformTimer <= uiDiff) { - m_creature->CastSpell(m_creature,SPELL_ORB_KILL_CREDIT,false); + DoCast(m_creature, SPELL_ORB_KILL_CREDIT, false); DoWorkaroundForQuestCredit(); // Transform and update entry, now ready for quest/read gossip - m_creature->CastSpell(m_creature,SPELL_TRANSFORM_TO_KAEL,false); + DoCast(m_creature, SPELL_TRANSFORM_TO_KAEL, false); m_creature->UpdateEntry(NPC_KAEL); m_uiTransformTimer = 0; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp index 6192647af05..462f42a531a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_baron_geddonAI : public ScriptedAI if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 2) { m_creature->InterruptNonMeleeSpells(true); - DoCast(m_creature,SPELL_ARMAGEDDOM); + DoCast(m_creature, SPELL_ARMAGEDDOM); DoScriptText(EMOTE_SERVICE, m_creature); return; } @@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_baron_geddonAI : public ScriptedAI //Inferno_Timer if (Inferno_Timer <= diff) { - DoCast(m_creature,SPELL_INFERNO); + DoCast(m_creature, SPELL_INFERNO); Inferno_Timer = 45000; } else Inferno_Timer -= diff; @@ -74,7 +74,7 @@ struct TRINITY_DLL_DECL boss_baron_geddonAI : public ScriptedAI if (IgniteMana_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_IGNITEMANA); + DoCast(pTarget, SPELL_IGNITEMANA); IgniteMana_Timer = 30000; } else IgniteMana_Timer -= diff; @@ -83,7 +83,7 @@ struct TRINITY_DLL_DECL boss_baron_geddonAI : public ScriptedAI if (LivingBomb_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_LIVINGBOMB); + DoCast(pTarget, SPELL_LIVINGBOMB); LivingBomb_Timer = 35000; } else LivingBomb_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_garr.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_garr.cpp index ef1a6948692..502b78e940a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_garr.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_garr.cpp @@ -61,14 +61,14 @@ struct TRINITY_DLL_DECL boss_garrAI : public ScriptedAI //AntiMagicPulse_Timer if (AntiMagicPulse_Timer <= diff) { - DoCast(m_creature,SPELL_ANTIMAGICPULSE); + DoCast(m_creature, SPELL_ANTIMAGICPULSE); AntiMagicPulse_Timer = 10000 + rand()%5000; } else AntiMagicPulse_Timer -= diff; //MagmaShackles_Timer if (MagmaShackles_Timer <= diff) { - DoCast(m_creature,SPELL_MAGMASHACKLES); + DoCast(m_creature, SPELL_MAGMASHACKLES); MagmaShackles_Timer = 8000 + rand()%4000; } else MagmaShackles_Timer -= diff; @@ -100,7 +100,7 @@ struct TRINITY_DLL_DECL mob_fireswornAI : public ScriptedAI if (Immolate_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_IMMOLATE); + DoCast(pTarget, SPELL_IMMOLATE); Immolate_Timer = urand(5000,10000); } else Immolate_Timer -= diff; @@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL mob_fireswornAI : public ScriptedAI //Cast Erruption and let them die if (m_creature->GetHealth() <= m_creature->GetMaxHealth() * 0.10) { - DoCast(m_creature->getVictim(),SPELL_ERUPTION); + DoCast(m_creature->getVictim(), SPELL_ERUPTION); m_creature->setDeathState(JUST_DIED); m_creature->RemoveCorpse(); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp index 27ecb3f6546..a557e7baabb 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp @@ -70,7 +70,7 @@ struct TRINITY_DLL_DECL boss_gehennasAI : public ScriptedAI //GehennasCurse_Timer if (GehennasCurse_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_GEHENNASCURSE); + DoCast(m_creature->getVictim(), SPELL_GEHENNASCURSE); GehennasCurse_Timer = urand(22000,30000); } else GehennasCurse_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp index 64bcedf3cbf..594a8f24ebe 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI m_uiBuffTimer = 2.5*IN_MILISECONDS; m_bEnraged = false; - m_creature->CastSpell(m_creature, SPELL_MAGMASPLASH, true); + DoCast(m_creature, SPELL_MAGMASPLASH, true); } void JustDied(Unit* pKiller) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp index 3dff3c7ccac..333fe782717 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp @@ -54,21 +54,21 @@ struct TRINITY_DLL_DECL boss_lucifronAI : public ScriptedAI //Impending doom timer if (ImpendingDoom_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_IMPENDINGDOOM); + DoCast(m_creature->getVictim(), SPELL_IMPENDINGDOOM); ImpendingDoom_Timer = 20000; } else ImpendingDoom_Timer -= diff; //Lucifron's curse timer if (LucifronCurse_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_LUCIFRONCURSE); + DoCast(m_creature->getVictim(), SPELL_LUCIFRONCURSE); LucifronCurse_Timer = 15000; } else LucifronCurse_Timer -= diff; //Shadowshock if (ShadowShock_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHADOWSHOCK); + DoCast(m_creature->getVictim(), SPELL_SHADOWSHOCK); ShadowShock_Timer = 6000; } else ShadowShock_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp index 8728a593e1c..498987b2bd0 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp @@ -45,7 +45,7 @@ struct TRINITY_DLL_DECL boss_magmadarAI : public ScriptedAI Panic_Timer = 20000; Lavabomb_Timer = 12000; - m_creature->CastSpell(m_creature,SPELL_MAGMASPIT,true); + DoCast(m_creature, SPELL_MAGMASPIT, true); } void EnterCombat(Unit *who) @@ -61,14 +61,14 @@ struct TRINITY_DLL_DECL boss_magmadarAI : public ScriptedAI if (Frenzy_Timer <= diff) { DoScriptText(EMOTE_FRENZY, m_creature); - DoCast(m_creature,SPELL_FRENZY); + DoCast(m_creature, SPELL_FRENZY); Frenzy_Timer = 15000; } else Frenzy_Timer -= diff; //Panic_Timer if (Panic_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_PANIC); + DoCast(m_creature->getVictim(), SPELL_PANIC); Panic_Timer = 35000; } else Panic_Timer -= diff; @@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_magmadarAI : public ScriptedAI if (Lavabomb_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_LAVABOMB_ALT); + DoCast(pTarget, SPELL_LAVABOMB_ALT); Lavabomb_Timer = 12000; } else Lavabomb_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp index 859332be008..8ae81f9cd90 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp @@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL boss_majordomoAI : public ScriptedAI //Cast Ageis if less than 50% hp if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 50) { - DoCast(m_creature,SPELL_AEGIS); + DoCast(m_creature, SPELL_AEGIS); } //MagicReflection_Timer @@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL boss_majordomoAI : public ScriptedAI //Blastwave_Timer if (Blastwave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_BLASTWAVE); + DoCast(m_creature->getVictim(), SPELL_BLASTWAVE); Blastwave_Timer = 10000; } else Blastwave_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp index 197c4e5703f..0d14e8a6be4 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp @@ -118,7 +118,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI HasSubmergedOnce = false; WasBanished = false; - m_creature->CastSpell(m_creature,SPELL_MELTWEAPON,true); + DoCast(m_creature, SPELL_MELTWEAPON, true); HasAura = true; } @@ -141,7 +141,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI //Become unbanished again m_creature->setFaction(14); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - DoCast(m_creature,SPELL_RAGEMERGE); + DoCast(m_creature, SPELL_RAGEMERGE); WasBanished = false; } else if (WasBanished) { @@ -157,7 +157,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI //WrathOfRagnaros_Timer if (WrathOfRagnaros_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_WRATHOFRAGNAROS); + DoCast(m_creature->getVictim(), SPELL_WRATHOFRAGNAROS); if (urand(0,1)) DoScriptText(SAY_WRATH, m_creature); @@ -168,7 +168,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI //HandOfRagnaros_Timer if (HandOfRagnaros_Timer <= diff) { - DoCast(m_creature,SPELL_HANDOFRAGNAROS); + DoCast(m_creature, SPELL_HANDOFRAGNAROS); if (urand(0,1)) DoScriptText(SAY_HAND, m_creature); @@ -179,21 +179,21 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI //LavaBurst_Timer if (LavaBurst_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_LAVABURST); + DoCast(m_creature->getVictim(), SPELL_LAVABURST); LavaBurst_Timer = 10000; } else LavaBurst_Timer -= diff; //Erruption_Timer if (LavaBurst_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ERRUPTION); + DoCast(m_creature->getVictim(), SPELL_ERRUPTION); Erruption_Timer = urand(20000,45000); } else Erruption_Timer -= diff; //ElementalFire_Timer if (ElementalFire_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ELEMENTALFIRE); + DoCast(m_creature->getVictim(), SPELL_ELEMENTALFIRE); ElementalFire_Timer = urand(10000,14000); } else ElementalFire_Timer -= diff; @@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI m_creature->InterruptNonMeleeSpells(false); //Root self - DoCast(m_creature,23973); + DoCast(m_creature, 23973); m_creature->setFaction(35); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->HandleEmoteCommand(EMOTE_ONESHOT_SUBMERGE); @@ -227,7 +227,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI HasSubmergedOnce = true; WasBanished = true; - DoCast(m_creature,SPELL_RAGSUBMERGE); + DoCast(m_creature, SPELL_RAGSUBMERGE); Attack_Timer = 90000; } @@ -245,7 +245,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI } WasBanished = true; - DoCast(m_creature,SPELL_RAGSUBMERGE); + DoCast(m_creature, SPELL_RAGSUBMERGE); Attack_Timer = 90000; } @@ -267,7 +267,7 @@ struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI //MagmaBurst_Timer if (MagmaBurst_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MAGMABURST); + DoCast(m_creature->getVictim(), SPELL_MAGMABURST); if (!HasYelledMagmaBurst) { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp index 051ddce83a5..9e6527ffec6 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp @@ -59,7 +59,7 @@ struct TRINITY_DLL_DECL boss_shazzrahAI : public ScriptedAI //ArcaneExplosion_Timer if (ArcaneExplosion_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ARCANEEXPLOSION); + DoCast(m_creature->getVictim(), SPELL_ARCANEEXPLOSION); ArcaneExplosion_Timer = 5000 + rand()%4000; } else ArcaneExplosion_Timer -= diff; @@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL boss_shazzrahAI : public ScriptedAI { Unit *pTarget = NULL; pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (pTarget) DoCast(pTarget,SPELL_SHAZZRAHCURSE); + if (pTarget) DoCast(pTarget, SPELL_SHAZZRAHCURSE); ShazzrahCurse_Timer = 25000 + rand()%5000; } else ShazzrahCurse_Timer -= diff; @@ -76,14 +76,14 @@ struct TRINITY_DLL_DECL boss_shazzrahAI : public ScriptedAI //DeadenMagic_Timer if (DeadenMagic_Timer <= diff) { - DoCast(m_creature,SPELL_DEADENMAGIC); + DoCast(m_creature, SPELL_DEADENMAGIC); DeadenMagic_Timer = 35000; } else DeadenMagic_Timer -= diff; //Countspell_Timer if (Countspell_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_COUNTERSPELL); + DoCast(m_creature->getVictim(), SPELL_COUNTERSPELL); Countspell_Timer = 16000 + rand()%4000; } else Countspell_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp index f64017fe6b0..a1ac6b94f96 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp @@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_sulfuronAI : public ScriptedAI //DemoralizingShout_Timer if (DemoralizingShout_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_DEMORALIZINGSHOUT); + DoCast(m_creature->getVictim(), SPELL_DEMORALIZINGSHOUT); DemoralizingShout_Timer = 15000 + rand()%5000; } else DemoralizingShout_Timer -= diff; @@ -83,9 +83,9 @@ struct TRINITY_DLL_DECL boss_sulfuronAI : public ScriptedAI } if (pTarget) - DoCast(pTarget,SPELL_INSPIRE); + DoCast(pTarget, SPELL_INSPIRE); - DoCast(m_creature,SPELL_INSPIRE); + DoCast(m_creature, SPELL_INSPIRE); Inspire_Timer = 20000 + rand()%6000; } else Inspire_Timer -= diff; @@ -93,7 +93,7 @@ struct TRINITY_DLL_DECL boss_sulfuronAI : public ScriptedAI //Knockdown_Timer if (Knockdown_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_KNOCKDOWN); + DoCast(m_creature->getVictim(), SPELL_KNOCKDOWN); Knockdown_Timer = 12000 + rand()%3000; } else Knockdown_Timer -= diff; @@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL boss_sulfuronAI : public ScriptedAI { Unit *pTarget = NULL; pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (pTarget) DoCast(pTarget,SPELL_FLAMESPEAR); + if (pTarget) DoCast(pTarget, SPELL_FLAMESPEAR); Flamespear_Timer = 12000 + rand()%4000; } else Flamespear_Timer -= diff; @@ -159,7 +159,7 @@ struct TRINITY_DLL_DECL mob_flamewaker_priestAI : public ScriptedAI { Unit *pTarget = NULL; pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (pTarget) DoCast(pTarget,SPELL_SHADOWWORDPAIN); + if (pTarget) DoCast(pTarget, SPELL_SHADOWWORDPAIN); ShadowWordPain_Timer = 18000+rand()%8000; } else ShadowWordPain_Timer -= diff; @@ -169,7 +169,7 @@ struct TRINITY_DLL_DECL mob_flamewaker_priestAI : public ScriptedAI { Unit *pTarget = NULL; pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (pTarget) DoCast(pTarget,SPELL_IMMOLATE); + if (pTarget) DoCast(pTarget, SPELL_IMMOLATE); Immolate_Timer = 15000+rand()%10000; } else Immolate_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp index b46445b285b..21f1b2f8286 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp @@ -43,7 +43,7 @@ struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance instance_molten_core(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; uint64 Lucifron, Magmadar, Gehennas, Garr, Geddon, Shazzrah, Sulfuron, Golemagg, Domo, Ragnaros, FlamewakerPriest; - uint64 RuneKoro, RuneZeth, RuneMazj, RuneTheri, RuneBlaz, RuneKress, RuneMohn, m_uiFirelordCacheGUID;; + uint64 RuneKoro, RuneZeth, RuneMazj, RuneTheri, RuneBlaz, RuneKress, RuneMohn, m_uiFirelordCacheGUID; //If all Bosses are dead. bool IsBossDied[9]; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp index 1c35eb87cdc..185c61d3989 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp @@ -721,7 +721,7 @@ struct TRINITY_DLL_DECL npc_scarlet_ghoulAI : public ScriptedAI { // Ghouls should display their Birth Animation // Crawling out of the ground - //m_creature->CastSpell(m_creature,35177,true); + //DoCast(m_creature, 35177, true); //m_creature->MonsterSay("Mommy?",LANG_UNIVERSAL,0); m_creature->SetReactState(REACT_DEFENSIVE); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp index c1d88bf4e2a..a2e511eeb26 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp @@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_arcanist_doanAI : public ScriptedAI if (bShielded && bCanDetonate) { - DoCast(m_creature,SPELL_FIREAOE); + DoCast(m_creature, SPELL_FIREAOE); bCanDetonate = false; } @@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL boss_arcanist_doanAI : public ScriptedAI return; DoScriptText(SAY_SPECIALAE, m_creature); - DoCast(m_creature,SPELL_ARCANEBUBBLE); + DoCast(m_creature, SPELL_ARCANEBUBBLE); bCanDetonate = true; bShielded = true; @@ -90,7 +90,7 @@ struct TRINITY_DLL_DECL boss_arcanist_doanAI : public ScriptedAI if (Polymorph_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(pTarget,SPELL_POLYMORPH); + DoCast(pTarget, SPELL_POLYMORPH); Polymorph_Timer = 20000; } else Polymorph_Timer -= diff; @@ -98,14 +98,14 @@ struct TRINITY_DLL_DECL boss_arcanist_doanAI : public ScriptedAI //AoESilence_Timer if (AoESilence_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_AOESILENCE); + DoCast(m_creature->getVictim(), SPELL_AOESILENCE); AoESilence_Timer = 15000 + rand()%5000; } else AoESilence_Timer -= diff; //ArcaneExplosion_Timer if (ArcaneExplosion_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ARCANEEXPLOSION); + DoCast(m_creature->getVictim(), SPELL_ARCANEEXPLOSION); ArcaneExplosion_Timer = 8000; } else ArcaneExplosion_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp index 92b31d28c38..20dd0fab1ad 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp @@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL boss_azshir_the_sleeplessAI : public ScriptedAI //SoulSiphon_Timer if (SoulSiphon_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SOULSIPHON); + DoCast(m_creature->getVictim(), SPELL_SOULSIPHON); return; SoulSiphon_Timer = 20000; @@ -67,14 +67,14 @@ struct TRINITY_DLL_DECL boss_azshir_the_sleeplessAI : public ScriptedAI //CallOfTheGrave_Timer if (CallOftheGrave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CALLOFTHEGRAVE); + DoCast(m_creature->getVictim(), SPELL_CALLOFTHEGRAVE); CallOftheGrave_Timer = 30000; } else CallOftheGrave_Timer -= diff; //Terrify_Timer if (Terrify_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_TERRIFY); + DoCast(m_creature->getVictim(), SPELL_TERRIFY); Terrify_Timer = 20000; } else Terrify_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp index 842d3a2ba05..2d8b2898437 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp @@ -79,28 +79,28 @@ struct TRINITY_DLL_DECL boss_bloodmage_thalnosAI : public ScriptedAI //FlameShock_Timer if (FlameShock_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FLAMESHOCK); + DoCast(m_creature->getVictim(), SPELL_FLAMESHOCK); FlameShock_Timer = 10000 + rand()%5000; } else FlameShock_Timer -= diff; //FlameSpike_Timer if (FlameSpike_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FLAMESPIKE); + DoCast(m_creature->getVictim(), SPELL_FLAMESPIKE); FlameSpike_Timer = 30000; } else FlameSpike_Timer -= diff; //FireNova_Timer if (FireNova_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FIRENOVA); + DoCast(m_creature->getVictim(), SPELL_FIRENOVA); FireNova_Timer = 40000; } else FireNova_Timer -= diff; //ShadowBolt_Timer if (ShadowBolt_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHADOWBOLT); + DoCast(m_creature->getVictim(), SPELL_SHADOWBOLT); ShadowBolt_Timer = 2000; } else ShadowBolt_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp index 3fce77333a4..1469d9a5620 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp @@ -173,7 +173,7 @@ struct TRINITY_DLL_DECL mob_wisp_invisAI : public ScriptedAI break; } if (spell) - DoCast(m_creature,spell); + DoCast(m_creature, spell); } void SpellHit(Unit* caster, const SpellEntry *spell) @@ -188,7 +188,7 @@ struct TRINITY_DLL_DECL mob_wisp_invisAI : public ScriptedAI return; if (m_creature->IsWithinDist(who, 0.1, false) && !who->HasAura(SPELL_SQUASH_SOUL)) - DoCast(who,SPELL_SQUASH_SOUL); + DoCast(who, SPELL_SQUASH_SOUL); } void UpdateAI(const uint32 diff) @@ -199,7 +199,7 @@ struct TRINITY_DLL_DECL mob_wisp_invisAI : public ScriptedAI { m_creature->RemoveAurasDueToSpell(SPELL_SMOKE); if (spell2) - DoCast(m_creature,spell2); + DoCast(m_creature, spell2); delay = 0; } else delay -= diff; } @@ -233,7 +233,7 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI void SaySound(int32 textEntry, Unit *pTarget = 0) { DoScriptText(textEntry, m_creature, pTarget); - //DoCast(m_creature,SPELL_HEAD_SPEAKS,true); + //DoCast(m_creature, SPELL_HEAD_SPEAKS, true); Creature *speaker = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,1000); if (speaker) speaker->CastSpell(speaker,SPELL_HEAD_SPEAKS,false); @@ -265,7 +265,7 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->StopMoving(); //m_creature->GetMotionMaster()->MoveIdle(); - DoCast(m_creature,SPELL_HEAD_IS_DEAD); + DoCast(m_creature, SPELL_HEAD_IS_DEAD); } break; } @@ -285,8 +285,8 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI bodyGUID = caster->GetGUID(); m_creature->RemoveAllAuras(); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - DoCast(m_creature,SPELL_HEAD_LANDS,true); - DoCast(m_creature,SPELL_HEAD,false); + DoCast(m_creature, SPELL_HEAD_LANDS, true); + DoCast(m_creature, SPELL_HEAD, false); SaySound(SAY_LOST_HEAD); m_creature->GetMotionMaster()->Clear(false); m_creature->GetMotionMaster()->MoveFleeing(caster->getVictim()); @@ -309,7 +309,7 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI { laugh = urand(15000,30000); DoPlaySoundToSet(m_creature, RandomLaugh[urand(0,2)]); - //DoCast(m_creature,SPELL_HEAD_SPEAKS,true); //this spell remove buff "head" + //DoCast(m_creature, SPELL_HEAD_SPEAKS, true); //this spell remove buff "head" Creature *speaker = DoSpawnCreature(HELPER,0,0,0,0,TEMPSUMMON_TIMED_DESPAWN,1000); if (speaker) speaker->CastSpell(speaker,SPELL_HEAD_SPEAKS,false); @@ -397,7 +397,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI returned = true; burned = false; IsFlying = false; - DoCast(m_creature,SPELL_HEAD); + DoCast(m_creature, SPELL_HEAD); if (headGUID) { if (Creature* Head = Unit::GetCreature((*m_creature), headGUID)) @@ -439,7 +439,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI { if (Creature *smoke = m_creature->SummonCreature(HELPER,Spawn[1].x,Spawn[1].y,Spawn[1].z,0,TEMPSUMMON_TIMED_DESPAWN,20000)) CAST_AI(mob_wisp_invisAI, smoke->AI())->SetType(3); - DoCast(m_creature,SPELL_RHYME_BIG); + DoCast(m_creature, SPELL_RHYME_BIG); break; } case 6: @@ -555,7 +555,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI m_creature->SetName("Headless Horseman"); m_creature->SetHealth(m_creature->GetMaxHealth()); SaySound(SAY_REJOINED); - DoCast(m_creature,SPELL_HEAD); + DoCast(m_creature, SPELL_HEAD); caster->GetMotionMaster()->Clear(false); caster->GetMotionMaster()->MoveFollow(m_creature,6,urand(0,5)); //DoResetThreat();//not sure if need @@ -587,10 +587,10 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI Head->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); //Head->CastSpell(Head,SPELL_HEAD_INVIS,false); m_creature->InterruptNonMeleeSpells(false); - DoCast(m_creature,SPELL_IMMUNE,true); - DoCast(m_creature,SPELL_BODY_REGEN,true); - m_creature->CastSpell(Head, SPELL_FLYING_HEAD,true); - DoCast(m_creature,SPELL_CONFUSE,false); //test + DoCast(m_creature, SPELL_IMMUNE, true); + DoCast(m_creature, SPELL_BODY_REGEN, true); + DoCast(Head, SPELL_FLYING_HEAD, true); + DoCast(m_creature, SPELL_CONFUSE, false); //test done_by->ProcDamageAndSpell(m_creature,PROC_FLAG_KILL,PROC_FLAG_KILLED,PROC_EX_NONE,0); whirlwind = urand(4000,8000); regen = 0; @@ -619,7 +619,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI } else { - DoCast(m_creature,SPELL_RHYME_BIG); + DoCast(m_creature, SPELL_RHYME_BIG); if (plr) { plr->Say(Text[count].text,0); @@ -658,7 +658,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI if (conflagrate <= diff) { if (Unit *plr = SelectRandomPlayer(30.0f)) - m_creature->CastSpell(plr,SPELL_CONFLAGRATION,false); + DoCast(plr, SPELL_CONFLAGRATION, false); conflagrate = urand(10000,16000); } else conflagrate -= diff; break; @@ -666,7 +666,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI if (summonadds <= diff) { m_creature->InterruptNonMeleeSpells(false); - DoCast(m_creature,SPELL_SUMMON_PUMPKIN); + DoCast(m_creature, SPELL_SUMMON_PUMPKIN); SaySound(SAY_SPROUTING_PUMPKINS); summonadds = urand(25000,35000); } else summonadds -= diff; @@ -685,7 +685,7 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI DoMeleeAttackIfReady(); if (cleave <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); cleave = urand(2000,6000); //1 cleave per 2.0-6.0sec } else cleave -= diff; } @@ -718,8 +718,8 @@ struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI if (urand(0,1)) { m_creature->RemoveAurasDueToSpell(SPELL_CONFUSE); - DoCast(m_creature,SPELL_WHIRLWIND,true); - DoCast(m_creature,SPELL_CONFUSE); + DoCast(m_creature, SPELL_WHIRLWIND, true); + DoCast(m_creature, SPELL_CONFUSE); } else m_creature->RemoveAurasDueToSpell(SPELL_WHIRLWIND); } else whirlwind -= diff; @@ -739,7 +739,7 @@ void mob_headAI::Disappear() withbody = true; m_creature->RemoveAllAuras(); body->RemoveAurasDueToSpell(SPELL_IMMUNE);//hack, SpellHit doesn't calls if body has immune aura - DoCast(body,SPELL_FLYING_HEAD); + DoCast(body, SPELL_FLYING_HEAD); m_creature->SetHealth(m_creature->GetMaxHealth()); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -771,8 +771,8 @@ struct TRINITY_DLL_DECL mob_pulsing_pumpkinAI : public ScriptedAI debuffGUID = debuff->GetGUID(); } sprouted = false; - DoCast(m_creature,SPELL_PUMPKIN_AURA,true); - DoCast(m_creature,SPELL_SPROUTING); + DoCast(m_creature, SPELL_PUMPKIN_AURA, true); + DoCast(m_creature, SPELL_SPROUTING); m_creature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_STUNNED); } @@ -785,7 +785,7 @@ struct TRINITY_DLL_DECL mob_pulsing_pumpkinAI : public ScriptedAI sprouted = true; m_creature->RemoveAllAuras(); m_creature->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_STUNNED); - DoCast(m_creature,SPELL_SPROUT_BODY,true); + DoCast(m_creature, SPELL_SPROUT_BODY, true); m_creature->UpdateEntry(PUMPKIN_FIEND); DoStartMovement(m_creature->getVictim()); } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp index c108575fc57..d11fa738d5f 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp @@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL boss_herodAI : public ScriptedAI void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); - DoCast(m_creature,SPELL_RUSHINGCHARGE); + DoCast(m_creature, SPELL_RUSHINGCHARGE); } void KilledUnit(Unit *victim) @@ -81,14 +81,14 @@ struct TRINITY_DLL_DECL boss_herodAI : public ScriptedAI { DoScriptText(EMOTE_ENRAGE, m_creature); DoScriptText(SAY_ENRAGE, m_creature); - DoCast(m_creature,SPELL_FRENZY); + DoCast(m_creature, SPELL_FRENZY); Enrage = true; } //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 12000; } else Cleave_Timer -= diff; @@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL boss_herodAI : public ScriptedAI if (Whirlwind_Timer <= diff) { DoScriptText(SAY_WHIRLWIND, m_creature); - DoCast(m_creature->getVictim(),SPELL_WHIRLWIND); + DoCast(m_creature->getVictim(), SPELL_WHIRLWIND); Whirlwind_Timer = 30000; } else Whirlwind_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp index dc1081f97b9..3e82771b928 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp @@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_fairbanksAI : public ScriptedAI //If we are <25% hp cast Heal if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 25 && !m_creature->IsNonMeleeSpellCasted(false) && Heal_Timer <= diff) { - DoCast(m_creature,SPELL_HEAL); + DoCast(m_creature, SPELL_HEAL); Heal_Timer = 30000; } else Heal_Timer -= diff; @@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_fairbanksAI : public ScriptedAI if (Fear_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(pTarget,SPELL_FEAR); + DoCast(pTarget, SPELL_FEAR); Fear_Timer = 40000; } else Fear_Timer -= diff; @@ -85,7 +85,7 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_fairbanksAI : public ScriptedAI if (Sleep_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,0)) - DoCast(pTarget,SPELL_SLEEP); + DoCast(pTarget, SPELL_SLEEP); Sleep_Timer = 30000; } else Sleep_Timer -= diff; @@ -93,7 +93,7 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_fairbanksAI : public ScriptedAI //PowerWordShield_Timer if (!PowerWordShield && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 25) { - DoCast(m_creature,SPELL_POWERWORDSHIELD); + DoCast(m_creature, SPELL_POWERWORDSHIELD); PowerWordShield = true; } @@ -109,7 +109,7 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_fairbanksAI : public ScriptedAI //CurseOfBlood_Timer if (CurseOfBlood_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CURSEOFBLOOD); + DoCast(m_creature->getVictim(), SPELL_CURSEOFBLOOD); CurseOfBlood_Timer = 25000; } else CurseOfBlood_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp index 819801d639f..34564d81349 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp @@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_houndmaster_lokseyAI : public ScriptedAI if (BloodLust_Timer <= diff) { - DoCast(m_creature,SPELL_BLOODLUST); + DoCast(m_creature, SPELL_BLOODLUST); BloodLust_Timer = 20000; } else BloodLust_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp index 509a3d05420..b8b66ceac54 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp @@ -94,8 +94,8 @@ struct TRINITY_DLL_DECL boss_interrogator_vishasAI : public ScriptedAI //ShadowWordPain_Timer if (ShadowWordPain_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHADOWWORDPAIN); - ShadowWordPain_Timer = 5000 + rand()%10000;; + DoCast(m_creature->getVictim(), SPELL_SHADOWWORDPAIN); + ShadowWordPain_Timer = 5000 + rand()%10000; } else ShadowWordPain_Timer -= diff; DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp index 74c5db7682a..fb63b1eab54 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp @@ -98,7 +98,7 @@ struct TRINITY_DLL_DECL boss_scarlet_commander_mograineAI : public ScriptedAI void EnterCombat(Unit* pWho) { DoScriptText(SAY_MO_AGGRO, m_creature); - DoCast(m_creature,SPELL_RETRIBUTIONAURA); + DoCast(m_creature, SPELL_RETRIBUTIONAURA); m_creature->CallForHelp(VISIBLE_RANGE); } @@ -189,14 +189,14 @@ struct TRINITY_DLL_DECL boss_scarlet_commander_mograineAI : public ScriptedAI //m_uiCrusaderStrike_Timer if (m_uiCrusaderStrike_Timer <= uiDiff) { - DoCast(m_creature->getVictim(),SPELL_CRUSADERSTRIKE); + DoCast(m_creature->getVictim(), SPELL_CRUSADERSTRIKE); m_uiCrusaderStrike_Timer = 10000; } else m_uiCrusaderStrike_Timer -= uiDiff; //m_uiHammerOfJustice_Timer if (m_uiHammerOfJustice_Timer <= uiDiff) { - DoCast(m_creature->getVictim(),SPELL_HAMMEROFJUSTICE); + DoCast(m_creature->getVictim(), SPELL_HAMMEROFJUSTICE); m_uiHammerOfJustice_Timer = 60000; } else m_uiHammerOfJustice_Timer -= uiDiff; @@ -317,14 +317,14 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_whitemaneAI : public ScriptedAI //m_uiPowerWordShield_Timer if (m_uiPowerWordShield_Timer <= uiDiff) { - DoCast(m_creature,SPELL_POWERWORDSHIELD); + DoCast(m_creature, SPELL_POWERWORDSHIELD); m_uiPowerWordShield_Timer = 15000; } else m_uiPowerWordShield_Timer -= uiDiff; //m_uiHolySmite_Timer if (m_uiHolySmite_Timer <= uiDiff) { - DoCast(m_creature->getVictim(),SPELL_HOLYSMITE); + DoCast(m_creature->getVictim(), SPELL_HOLYSMITE); m_uiHolySmite_Timer = 6000; } else m_uiHolySmite_Timer -= uiDiff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp index 499499ffed4..7379a53c33a 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp @@ -57,28 +57,28 @@ struct TRINITY_DLL_DECL boss_scornAI : public ScriptedAI //LichSlap_Timer if (LichSlap_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_LICHSLAP); + DoCast(m_creature->getVictim(), SPELL_LICHSLAP); LichSlap_Timer = 45000; } else LichSlap_Timer -= diff; //FrostboltVolley_Timer if (FrostboltVolley_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FROSTBOLTVOLLEY); + DoCast(m_creature->getVictim(), SPELL_FROSTBOLTVOLLEY); FrostboltVolley_Timer = 20000; } else FrostboltVolley_Timer -= diff; //MindFlay_Timer if (MindFlay_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MINDFLAY); + DoCast(m_creature->getVictim(), SPELL_MINDFLAY); MindFlay_Timer = 20000; } else MindFlay_Timer -= diff; //FrostNova_Timer if (FrostNova_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FROSTNOVA); + DoCast(m_creature->getVictim(), SPELL_FROSTNOVA); FrostNova_Timer = 15000; } else FrostNova_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp index 8468432351c..818ab08e534 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp @@ -90,21 +90,21 @@ struct TRINITY_DLL_DECL boss_darkmaster_gandlingAI : public ScriptedAI //ArcaneMissiles_Timer if (ArcaneMissiles_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ARCANEMISSILES); + DoCast(m_creature->getVictim(), SPELL_ARCANEMISSILES); ArcaneMissiles_Timer = 8000; } else ArcaneMissiles_Timer -= diff; //ShadowShield_Timer if (ShadowShield_Timer <= diff) { - DoCast(m_creature,SPELL_SHADOWSHIELD); + DoCast(m_creature, SPELL_SHADOWSHIELD); ShadowShield_Timer = 14000 + rand()%14000; } else ShadowShield_Timer -= diff; //Curse_Timer if (Curse_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CURSE); + DoCast(m_creature->getVictim(), SPELL_CURSE); Curse_Timer = 15000 + rand()%12000; } else Curse_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp index 9144542ae7e..640fdee3758 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp @@ -34,9 +34,7 @@ struct TRINITY_DLL_DECL boss_death_knight_darkreaverAI : public ScriptedAI void DamageTaken(Unit *done_by, uint32 &damage) { if (m_creature->GetHealth() <= damage) - { - m_creature->CastSpell(m_creature,23261,true); //Summon Darkreaver's Fallen Charger - } + DoCast(m_creature, 23261, true); //Summon Darkreaver's Fallen Charger } void EnterCombat(Unit *who) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp index b518d73396d..47e8648fe54 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp @@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL boss_theolenkrastinovAI : public ScriptedAI { if (m_uiFrenzy_Timer <= uiDiff) { - DoCast(m_creature,SPELL_FRENZY); + DoCast(m_creature, SPELL_FRENZY); DoScriptText(EMOTE_GENERIC_FRENZY_KILL, m_creature); m_uiFrenzy_Timer = 120000; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp index bc499300839..ea313c5770b 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp @@ -70,7 +70,7 @@ struct TRINITY_DLL_DECL boss_illuciabarovAI : public ScriptedAI //CurseOfAgony_Timer if (CurseOfAgony_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CURSEOFAGONY); + DoCast(m_creature->getVictim(), SPELL_CURSEOFAGONY); CurseOfAgony_Timer = 30000; } else CurseOfAgony_Timer -= diff; @@ -79,7 +79,7 @@ struct TRINITY_DLL_DECL boss_illuciabarovAI : public ScriptedAI { Unit *pTarget = NULL; pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (pTarget) DoCast(pTarget,SPELL_SHADOWSHOCK); + if (pTarget) DoCast(pTarget, SPELL_SHADOWSHOCK); ShadowShock_Timer = 12000; } else ShadowShock_Timer -= diff; @@ -87,14 +87,14 @@ struct TRINITY_DLL_DECL boss_illuciabarovAI : public ScriptedAI //Silence_Timer if (Silence_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SILENCE); + DoCast(m_creature->getVictim(), SPELL_SILENCE); Silence_Timer = 14000; } else Silence_Timer -= diff; //Fear_Timer if (Fear_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FEAR); + DoCast(m_creature->getVictim(), SPELL_FEAR); Fear_Timer = 30000; } else Fear_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp index 5bae4279882..57a8aef0cde 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp @@ -77,7 +77,7 @@ struct TRINITY_DLL_DECL boss_instructormaliciaAI : public ScriptedAI //CallOfGraves_Timer if (CallOfGraves_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CALLOFGRAVES); + DoCast(m_creature->getVictim(), SPELL_CALLOFGRAVES); CallOfGraves_Timer = 65000; } else CallOfGraves_Timer -= diff; @@ -86,7 +86,7 @@ struct TRINITY_DLL_DECL boss_instructormaliciaAI : public ScriptedAI { Unit *pTarget = NULL; pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (pTarget) DoCast(pTarget,SPELL_CORRUPTION); + if (pTarget) DoCast(pTarget, SPELL_CORRUPTION); Corruption_Timer = 24000; } else Corruption_Timer -= diff; @@ -101,7 +101,7 @@ struct TRINITY_DLL_DECL boss_instructormaliciaAI : public ScriptedAI //FlashHeal_Timer if (FlashHeal_Timer <= diff) { - DoCast(m_creature,SPELL_FLASHHEAL); + DoCast(m_creature, SPELL_FLASHHEAL); //5 Flashheals will be casted if (FlashCounter < 2) @@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL boss_instructormaliciaAI : public ScriptedAI //HealingTouch_Timer if (HealingTouch_Timer <= diff) { - DoCast(m_creature,SPELL_HEALINGTOUCH); + DoCast(m_creature, SPELL_HEALINGTOUCH); //3 Healingtouchs will be casted if (HealingTouch_Timer < 2) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp index 14569cddbf7..650d6fb34ef 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp @@ -81,7 +81,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI if (CurseOfBlood_Timer <= diff) { //Cast - DoCast(m_creature->getVictim(),SPELL_CURSEOFBLOOD); + DoCast(m_creature->getVictim(), SPELL_CURSEOFBLOOD); //45 seconds CurseOfBlood_Timer = 30000; @@ -117,7 +117,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI // if (Illusion_Timer <= diff) // { // //Cast - // DoCast(m_creature->getVictim(),SPELL_ILLUSION); + // DoCast(m_creature->getVictim(), SPELL_ILLUSION); // // //3 Illusion will be summoned // if (Illusioncounter < 3) @@ -165,7 +165,7 @@ struct TRINITY_DLL_DECL mob_illusionofjandicebarovAI : public ScriptedAI if (Cleave_Timer <= diff) { //Cast - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); //5-8 seconds Cleave_Timer = 5000 + rand()%3000; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp index fb5e8cb97b9..a9e764ac38f 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp @@ -69,14 +69,14 @@ struct TRINITY_DLL_DECL boss_kormokAI : public ScriptedAI //ShadowVolley_Timer if (ShadowVolley_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHADOWBOLTVOLLEY); + DoCast(m_creature->getVictim(), SPELL_SHADOWBOLTVOLLEY); ShadowVolley_Timer = 15000; } else ShadowVolley_Timer -= diff; //BoneShield_Timer if (BoneShield_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_BONESHIELD); + DoCast(m_creature->getVictim(), SPELL_BONESHIELD); BoneShield_Timer = 45000; } else BoneShield_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp index 660b0817bee..3c8763b9f4b 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp @@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL boss_lordalexeibarovAI : public ScriptedAI { Unit *pTarget = NULL; pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (pTarget) DoCast(pTarget,SPELL_IMMOLATE); + if (pTarget) DoCast(pTarget, SPELL_IMMOLATE); Immolate_Timer = 12000; } else Immolate_Timer -= diff; @@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_lordalexeibarovAI : public ScriptedAI //VeilofShadow_Timer if (VeilofShadow_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_VEILOFSHADOW); + DoCast(m_creature->getVictim(), SPELL_VEILOFSHADOW); VeilofShadow_Timer = 20000; } else VeilofShadow_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp index 8c9336edc0c..2f4c3d4e5ce 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp @@ -70,28 +70,28 @@ struct TRINITY_DLL_DECL boss_lorekeeperpolkeltAI : public ScriptedAI //VolatileInfection_Timer if (VolatileInfection_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_VOLATILEINFECTION); + DoCast(m_creature->getVictim(), SPELL_VOLATILEINFECTION); VolatileInfection_Timer = 32000; } else VolatileInfection_Timer -= diff; //Darkplague_Timer if (Darkplague_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_DARKPLAGUE); + DoCast(m_creature->getVictim(), SPELL_DARKPLAGUE); Darkplague_Timer = 8000; } else Darkplague_Timer -= diff; //CorrosiveAcid_Timer if (CorrosiveAcid_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CORROSIVEACID); + DoCast(m_creature->getVictim(), SPELL_CORROSIVEACID); CorrosiveAcid_Timer = 25000; } else CorrosiveAcid_Timer -= diff; //NoxiousCatalyst_Timer if (NoxiousCatalyst_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_NOXIOUSCATALYST); + DoCast(m_creature->getVictim(), SPELL_NOXIOUSCATALYST); NoxiousCatalyst_Timer = 38000; } else NoxiousCatalyst_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp index 9199ce998db..7a8aeefe7d0 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp @@ -50,12 +50,10 @@ struct TRINITY_DLL_DECL boss_rasfrostAI : public ScriptedAI FrostVolley_Timer = 24000; Fear_Timer = 45000; - m_creature->CastSpell(m_creature,SPELL_ICEARMOR,true); + DoCast(m_creature, SPELL_ICEARMOR, true); } - void EnterCombat(Unit *who) - { - } + void EnterCombat(Unit *who){} void UpdateAI(const uint32 diff) { @@ -72,9 +70,8 @@ struct TRINITY_DLL_DECL boss_rasfrostAI : public ScriptedAI //Frostbolt_Timer if (Frostbolt_Timer <= diff) { - Unit *pTarget = NULL; - pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (pTarget) DoCast(pTarget,SPELL_FROSTBOLT); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_FROSTBOLT); Frostbolt_Timer = 8000; } else Frostbolt_Timer -= diff; @@ -82,28 +79,28 @@ struct TRINITY_DLL_DECL boss_rasfrostAI : public ScriptedAI //Freeze_Timer if (Freeze_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FREEZE); + DoCast(m_creature->getVictim(), SPELL_FREEZE); Freeze_Timer = 24000; } else Freeze_Timer -= diff; //Fear_Timer if (Fear_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FEAR); + DoCast(m_creature->getVictim(), SPELL_FEAR); Fear_Timer = 30000; } else Fear_Timer -= diff; //ChillNova_Timer if (ChillNova_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CHILLNOVA); + DoCast(m_creature->getVictim(), SPELL_CHILLNOVA); ChillNova_Timer = 14000; } else ChillNova_Timer -= diff; //FrostVolley_Timer if (FrostVolley_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FROSTVOLLEY); + DoCast(m_creature->getVictim(), SPELL_FROSTVOLLEY); FrostVolley_Timer = 15000; } else FrostVolley_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp index f9dc3e8469f..54c60ebdf61 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp @@ -72,28 +72,28 @@ struct TRINITY_DLL_DECL boss_theravenianAI : public ScriptedAI //Trample_Timer if (Trample_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_TRAMPLE); + DoCast(m_creature->getVictim(), SPELL_TRAMPLE); Trample_Timer = 10000; } else Trample_Timer -= diff; //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 7000; } else Cleave_Timer -= diff; //SunderingCleave_Timer if (SunderingCleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SUNDERINCLEAVE); + DoCast(m_creature->getVictim(), SPELL_SUNDERINCLEAVE); SunderingCleave_Timer = 20000; } else SunderingCleave_Timer -= diff; //KnockAway_Timer if (KnockAway_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_KNOCKAWAY); + DoCast(m_creature->getVictim(), SPELL_KNOCKAWAY); KnockAway_Timer = 12000; } else KnockAway_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/silvermoon_city.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/silvermoon_city.cpp index 1d12e7e05bf..a1310e83ce2 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/silvermoon_city.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/silvermoon_city.cpp @@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL npc_blood_knight_stillbladeAI : public ScriptedAI (Hitter->GetTypeId() == TYPEID_PLAYER) && (CAST_PLR(Hitter)->IsActiveQuest(QUEST_REDEEMING_THE_DEAD))) { CAST_PLR(Hitter)->AreaExploredOrEventHappens(QUEST_REDEEMING_THE_DEAD); - DoCast(m_creature,SPELL_REVIVE_SELF); + DoCast(m_creature, SPELL_REVIVE_SELF); m_creature->SetStandState(UNIT_STAND_STATE_STAND); m_creature->SetUInt32Value(UNIT_DYNAMIC_FLAGS, 0); //m_creature->RemoveAllAuras(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp index 4112249fbd0..b2782850540 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp @@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL boss_baron_rivendareAI : public ScriptedAI if (ShadowBolt_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(m_creature->getVictim(),SPELL_SHADOWBOLT); + DoCast(m_creature->getVictim(), SPELL_SHADOWBOLT); ShadowBolt_Timer = 10000; } else ShadowBolt_Timer -= diff; @@ -138,7 +138,7 @@ struct TRINITY_DLL_DECL boss_baron_rivendareAI : public ScriptedAI //Cleave if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); //13 seconds until we should cast this again Cleave_Timer = 7000 + (rand()%10000); } else Cleave_Timer -= diff; @@ -146,14 +146,14 @@ struct TRINITY_DLL_DECL boss_baron_rivendareAI : public ScriptedAI //MortalStrike if (MortalStrike_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MORTALSTRIKE); + DoCast(m_creature->getVictim(), SPELL_MORTALSTRIKE); MortalStrike_Timer = 10000 + (rand()%15000); } else MortalStrike_Timer -= diff; //RaiseDead // if (RaiseDead_Timer <= diff) // { - // DoCast(m_creature,SPELL_RAISEDEAD); + // DoCast(m_creature, SPELL_RAISEDEAD); // RaiseDead_Timer = 45000; // } else RaiseDead_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp index a55bb4ea41f..15e031d29a8 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp @@ -70,7 +70,7 @@ struct TRINITY_DLL_DECL boss_baroness_anastariAI : public ScriptedAI if (BansheeWail_Timer <= diff) { if (rand()%100 < 95) - DoCast(m_creature->getVictim(),SPELL_BANSHEEWAIL); + DoCast(m_creature->getVictim(), SPELL_BANSHEEWAIL); //4 seconds until we should cast this again BansheeWail_Timer = 4000; } else BansheeWail_Timer -= diff; @@ -79,7 +79,7 @@ struct TRINITY_DLL_DECL boss_baroness_anastariAI : public ScriptedAI if (BansheeCurse_Timer <= diff) { if (rand()%100 < 75) - DoCast(m_creature->getVictim(),SPELL_BANSHEECURSE); + DoCast(m_creature->getVictim(), SPELL_BANSHEECURSE); //18 seconds until we should cast this again BansheeCurse_Timer = 18000; } else BansheeCurse_Timer -= diff; @@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL boss_baroness_anastariAI : public ScriptedAI if (Silence_Timer <= diff) { if (rand()%100 < 80) - DoCast(m_creature->getVictim(),SPELL_SILENCE); + DoCast(m_creature->getVictim(), SPELL_SILENCE); //13 seconds until we should cast this again Silence_Timer = 13000; } else Silence_Timer -= diff; @@ -101,7 +101,7 @@ struct TRINITY_DLL_DECL boss_baroness_anastariAI : public ScriptedAI { Unit *pTarget = NULL; pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (pTarget)DoCast(pTarget,SPELL_POSSESS); + if (pTarget)DoCast(pTarget, SPELL_POSSESS); } //50 seconds until we should cast this again Possess_Timer = 50000; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp index d04ea4901b6..e68dfa4ef54 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp @@ -118,7 +118,7 @@ struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI //Cast if (rand()%100 < 90) //90% chance to cast { - DoCast(m_creature->getVictim(),SPELL_PUMMEL); + DoCast(m_creature->getVictim(), SPELL_PUMMEL); } //12 seconds until we should cast this again Pummel_Timer = 12000; @@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI //Cast if (rand()%100 < 80) //80% chance to cast { - DoCast(m_creature->getVictim(),SPELL_KNOCKAWAY); + DoCast(m_creature->getVictim(), SPELL_KNOCKAWAY); } //14 seconds until we should cast this again KnockAway_Timer = 14000; @@ -140,7 +140,7 @@ struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI if (Shoot_Timer <= diff) { //Cast - DoCast(m_creature->getVictim(),SPELL_SHOOT); + DoCast(m_creature->getVictim(), SPELL_SHOOT); //1 seconds until we should cast this again Shoot_Timer = 1000; } else Shoot_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp index e6fb331579a..0e92f989b01 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp @@ -118,28 +118,28 @@ struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI //MindBlast if (m_uiMindBlast_Timer <= uiDiff) { - DoCast(m_creature->getVictim(),SPELL_MINDBLAST); + DoCast(m_creature->getVictim(), SPELL_MINDBLAST); m_uiMindBlast_Timer = 15000 + rand()%5000; } else m_uiMindBlast_Timer -= uiDiff; //CrusadersHammer if (m_uiCrusadersHammer_Timer <= uiDiff) { - DoCast(m_creature->getVictim(),SPELL_CRUSADERSHAMMER); + DoCast(m_creature->getVictim(), SPELL_CRUSADERSHAMMER); m_uiCrusadersHammer_Timer = 12000; } else m_uiCrusadersHammer_Timer -= uiDiff; //CrusaderStrike if (m_uiCrusaderStrike_Timer <= uiDiff) { - DoCast(m_creature->getVictim(),SPELL_CRUSADERSTRIKE); + DoCast(m_creature->getVictim(), SPELL_CRUSADERSTRIKE); m_uiCrusaderStrike_Timer = 15000; } else m_uiCrusaderStrike_Timer -= uiDiff; //HolyStrike if (m_uiHolyStrike_Timer <= uiDiff) { - DoCast(m_creature->getVictim(),SPELL_HOLYSTRIKE); + DoCast(m_creature->getVictim(), SPELL_HOLYSTRIKE); m_uiHolyStrike_Timer = 15000; } else m_uiHolyStrike_Timer -= uiDiff; @@ -150,7 +150,7 @@ struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI m_creature->InterruptNonMeleeSpells(false); //restore hp, mana and stun - DoCast(m_creature,SPELL_BALNAZZARTRANSFORM); + DoCast(m_creature, SPELL_BALNAZZARTRANSFORM); m_creature->UpdateEntry(NPC_BALNAZZAR); m_bTransformed = true; } @@ -160,14 +160,14 @@ struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI //MindBlast if (m_uiMindBlast_Timer <= uiDiff) { - DoCast(m_creature->getVictim(),SPELL_MINDBLAST); + DoCast(m_creature->getVictim(), SPELL_MINDBLAST); m_uiMindBlast_Timer = 15000 + rand()%5000; } else m_uiMindBlast_Timer -= uiDiff; //ShadowShock if (m_uiShadowShock_Timer <= uiDiff) { - DoCast(m_creature->getVictim(),SPELL_SHADOWSHOCK); + DoCast(m_creature->getVictim(), SPELL_SHADOWSHOCK); m_uiShadowShock_Timer = 11000; } else m_uiShadowShock_Timer -= uiDiff; @@ -175,7 +175,7 @@ struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI if (m_uiPsychicScream_Timer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_PSYCHICSCREAM); + DoCast(pTarget, SPELL_PSYCHICSCREAM); m_uiPsychicScream_Timer = 20000; } else m_uiPsychicScream_Timer -= uiDiff; @@ -184,7 +184,7 @@ struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI if (m_uiDeepSleep_Timer <= uiDiff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_SLEEP); + DoCast(pTarget, SPELL_SLEEP); m_uiDeepSleep_Timer = 15000; } else m_uiDeepSleep_Timer -= uiDiff; @@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI //MindControl if (m_uiMindControl_Timer <= uiDiff) { - DoCast(m_creature->getVictim(),SPELL_MINDCONTROL); + DoCast(m_creature->getVictim(), SPELL_MINDCONTROL); m_uiMindControl_Timer = 15000; } else m_uiMindControl_Timer -= uiDiff; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp index b360f034b87..85784d8deab 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp @@ -85,27 +85,27 @@ struct TRINITY_DLL_DECL boss_magistrate_barthilasAI : public ScriptedAI return; ++AngerCount; - m_creature->CastSpell(m_creature,SPELL_FURIOUS_ANGER,false); + DoCast(m_creature, SPELL_FURIOUS_ANGER, false); } else FuriousAnger_Timer -= diff; //DrainingBlow if (DrainingBlow_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_DRAININGBLOW); + DoCast(m_creature->getVictim(), SPELL_DRAININGBLOW); DrainingBlow_Timer = 15000; } else DrainingBlow_Timer -= diff; //CrowdPummel if (CrowdPummel_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CROWDPUMMEL); + DoCast(m_creature->getVictim(), SPELL_CROWDPUMMEL); CrowdPummel_Timer = 15000; } else CrowdPummel_Timer -= diff; //MightyBlow if (MightyBlow_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MIGHTYBLOW); + DoCast(m_creature->getVictim(), SPELL_MIGHTYBLOW); MightyBlow_Timer = 20000; } else MightyBlow_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp index 2a8b1ae7ed4..a661d086e1e 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp @@ -69,7 +69,7 @@ struct TRINITY_DLL_DECL boss_maleki_the_pallidAI : public ScriptedAI if (Frostbolt_Timer <= diff) { if (rand()%100 < 90) - DoCast(m_creature->getVictim(),SPELL_FROSTBOLT); + DoCast(m_creature->getVictim(), SPELL_FROSTBOLT); Frostbolt_Timer = 3500; } else Frostbolt_Timer -= diff; @@ -77,7 +77,7 @@ struct TRINITY_DLL_DECL boss_maleki_the_pallidAI : public ScriptedAI if (IceTomb_Timer <= diff) { if (rand()%100 < 65) - DoCast(m_creature->getVictim(),SPELL_ICETOMB); + DoCast(m_creature->getVictim(), SPELL_ICETOMB); IceTomb_Timer = 28000; } else IceTomb_Timer -= diff; @@ -85,7 +85,7 @@ struct TRINITY_DLL_DECL boss_maleki_the_pallidAI : public ScriptedAI if (DrainLife_Timer <= diff) { if (rand()%100 < 55) - DoCast(m_creature->getVictim(),SPELL_DRAINLIFE); + DoCast(m_creature->getVictim(), SPELL_DRAINLIFE); DrainLife_Timer = 31000; } else DrainLife_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp index 312b09fc182..fba52e487e5 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp @@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL boss_nerubenkanAI : public ScriptedAI //EncasingWebs if (EncasingWebs_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ENCASINGWEBS); + DoCast(m_creature->getVictim(), SPELL_ENCASINGWEBS); EncasingWebs_Timer = 30000; } else EncasingWebs_Timer -= diff; @@ -83,14 +83,14 @@ struct TRINITY_DLL_DECL boss_nerubenkanAI : public ScriptedAI if (PierceArmor_Timer <= diff) { if (urand(0,3) < 2) - DoCast(m_creature->getVictim(),SPELL_PIERCEARMOR); + DoCast(m_creature->getVictim(), SPELL_PIERCEARMOR); PierceArmor_Timer = 35000; } else PierceArmor_Timer -= diff; //CryptScarabs_Timer if (CryptScarabs_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CRYPT_SCARABS); + DoCast(m_creature->getVictim(), SPELL_CRYPT_SCARABS); CryptScarabs_Timer = 20000; } else CryptScarabs_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp index f639fcea2cb..82745ee7a6c 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp @@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI //Cast if (rand()%100 < 65) //65% chance to cast { - DoCast(m_creature->getVictim(),SPELL_WAILINGDEAD); + DoCast(m_creature->getVictim(), SPELL_WAILINGDEAD); } //19 seconds until we should cast this again WailingDead_Timer = 19000; @@ -83,7 +83,7 @@ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI //Cast if (rand()%100 < 45) //45% chance to cast { - DoCast(m_creature->getVictim(),SPELL_BACKHAND); + DoCast(m_creature->getVictim(), SPELL_BACKHAND); } //8 seconds until we should cast this again Backhand_Timer = 8000; @@ -95,7 +95,7 @@ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI //Cast if (rand()%100 < 3) //3% chance to cast { - DoCast(m_creature->getVictim(),SPELL_CURSEOFWEAKNESS); + DoCast(m_creature->getVictim(), SPELL_CURSEOFWEAKNESS); } //20 seconds until we should cast this again CurseOfWeakness_Timer = 20000; @@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI //Cast if (rand()%100 < 3) //3% chance to cast { - DoCast(m_creature->getVictim(),SPELL_CURSEOFTONGUES); + DoCast(m_creature->getVictim(), SPELL_CURSEOFTONGUES); } //22 seconds until we should cast this again CurseOfTongues_Timer = 22000; @@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI //Cast if (rand()%100 < 5) //5% chance to cast { - DoCast(m_creature->getVictim(),SPELL_CALLOFTHEGRAVE); + DoCast(m_creature->getVictim(), SPELL_CALLOFTHEGRAVE); } //25 seconds until we should cast this again CallOfTheGrave_Timer = 25000; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp index 73fb8a96a9e..7a5c08108bd 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp @@ -72,14 +72,14 @@ struct TRINITY_DLL_DECL boss_ramstein_the_gorgerAI : public ScriptedAI //Trample if (Trample_Timer <= diff) { - DoCast(m_creature,SPELL_TRAMPLE); + DoCast(m_creature, SPELL_TRAMPLE); Trample_Timer = 7000; } else Trample_Timer -= diff; //Knockout if (Knockout_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_KNOCKOUT); + DoCast(m_creature->getVictim(), SPELL_KNOCKOUT); Knockout_Timer = 10000; } else Knockout_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp index 813586bcb42..314c631ee88 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp @@ -59,7 +59,7 @@ struct TRINITY_DLL_DECL boss_timmy_the_cruelAI : public ScriptedAI if (RavenousClaw_Timer <= diff) { //Cast - DoCast(m_creature->getVictim(),SPELL_RAVENOUSCLAW); + DoCast(m_creature->getVictim(), SPELL_RAVENOUSCLAW); //15 seconds until we should cast this again RavenousClaw_Timer = 15000; } else RavenousClaw_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp index 58f1559286e..5f31cb57981 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/stratholme/stratholme.cpp @@ -230,7 +230,7 @@ struct TRINITY_DLL_DECL mobs_spectral_ghostly_citizenAI : public ScriptedAI break; case TEXTEMOTE_RUDE: if (m_creature->IsWithinDistInMap(pPlayer, 5)) - m_creature->CastSpell(pPlayer,SPELL_SLAP,false); + DoCast(pPlayer, SPELL_SLAP, false); else m_creature->HandleEmoteCommand(EMOTE_ONESHOT_RUDE); break; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp index 07414e79ca7..12e19c1b215 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp @@ -104,7 +104,7 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI - m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true); + DoCast(m_creature, SPELL_DUAL_WIELD, true); if (pInstance) pInstance->SetData(DATA_BRUTALLUS_EVENT, NOT_STARTED); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp index 82d18c5068a..61c15f73273 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp @@ -235,7 +235,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI if (Temp && Temp->isDead()) { DoScriptText(YELL_SISTER_ALYTHESS_DEAD, m_creature); - DoCast(m_creature,SPELL_EMPOWER); + DoCast(m_creature, SPELL_EMPOWER); m_creature->InterruptSpell(CURRENT_GENERIC_SPELL); SisterDeath = true; } @@ -324,7 +324,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI { m_creature->InterruptSpell(CURRENT_GENERIC_SPELL); DoScriptText(YELL_ENRAGE, m_creature); - DoCast(m_creature,SPELL_ENRAGE); + DoCast(m_creature, SPELL_ENRAGE); Enraged = true; } else EnrageTimer -= diff; @@ -641,7 +641,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI { if (!m_creature->IsNonMeleeSpellCasted(false)) { - DoCast(m_creature, SPELL_PYROGENICS,true); + DoCast(m_creature, SPELL_PYROGENICS, true); PyrogenicsTimer = 15000; } } else PyrogenicsTimer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp index 3fceca261b7..7d0a6b1a9d1 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp @@ -174,8 +174,8 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI { m_creature->setActive(true); DoZoneInCombat(); - m_creature->CastSpell(m_creature, AURA_SUNWELL_RADIANCE, true); - m_creature->CastSpell(m_creature, AURA_NOXIOUS_FUMES, true); + DoCast(m_creature, AURA_SUNWELL_RADIANCE, true); + DoCast(m_creature, AURA_NOXIOUS_FUMES, true); EnterPhase(PHASE_GROUND); if (pInstance) @@ -311,7 +311,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI { Vapor->AI()->AttackStart(pTarget); m_creature->InterruptNonMeleeSpells(false); - m_creature->CastSpell(Vapor, SPELL_VAPOR_CHANNEL, false); // core bug + DoCast(Vapor, SPELL_VAPOR_CHANNEL, false); // core bug Vapor->CastSpell(Vapor, SPELL_VAPOR_TRIGGER, true); } } @@ -325,7 +325,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI case 3: { DespawnSummons(MOB_VAPOR_TRAIL); error_log("Summon Vapor case3"); - //m_creature->CastSpell(m_creature, SPELL_VAPOR_SELECT); need core support + //DoCast(m_creature, SPELL_VAPOR_SELECT); need core support Unit *pTarget; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); if (!pTarget) pTarget = Unit::GetUnit(*m_creature, pInstance ? pInstance->GetData64(DATA_PLAYER_GUID) : 0); @@ -337,7 +337,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI { Vapor->AI()->AttackStart(pTarget); m_creature->InterruptNonMeleeSpells(false); - m_creature->CastSpell(Vapor, SPELL_VAPOR_CHANNEL, false); // core bug + DoCast(Vapor, SPELL_VAPOR_CHANNEL, false); // core bug Vapor->CastSpell(Vapor, SPELL_VAPOR_TRIGGER, true); } } @@ -377,7 +377,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI Timer[EVENT_FLIGHT_SEQUENCE] = 10000; break; case 7: - m_creature->CastSpell(m_creature, SPELL_FOG_BREATH, true); + DoCast(m_creature, SPELL_FOG_BREATH, true); { float x, y, z; m_creature->GetPosition(x, y, z); @@ -451,26 +451,26 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI { case EVENT_BERSERK: DoScriptText(YELL_BERSERK, m_creature); - m_creature->CastSpell(m_creature, SPELL_BERSERK, true); + DoCast(m_creature, SPELL_BERSERK, true); Timer[EVENT_BERSERK] = 10000; break; case EVENT_CLEAVE: - m_creature->CastSpell(m_creature->getVictim(), SPELL_CLEAVE, false); - Timer[EVENT_CLEAVE] = 5000 + rand()%5 * 1000; + DoCast(m_creature->getVictim(), SPELL_CLEAVE, false); + Timer[EVENT_CLEAVE] = urand(5000,10000); break; case EVENT_CORROSION: - m_creature->CastSpell(m_creature->getVictim(), SPELL_CORROSION, false); - Timer[EVENT_CORROSION] = 20000 + rand()%10 * 1000; + DoCast(m_creature->getVictim(), SPELL_CORROSION, false); + Timer[EVENT_CORROSION] = urand(20000,30000); break; case EVENT_GAS_NOVA: - m_creature->CastSpell(m_creature, SPELL_GAS_NOVA, false); - Timer[EVENT_GAS_NOVA] = 20000 + rand()%5 * 1000; + DoCast(m_creature, SPELL_GAS_NOVA, false); + Timer[EVENT_GAS_NOVA] = urand(20000,25000); break; case EVENT_ENCAPSULATE: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true)) { - m_creature->CastSpell(pTarget, SPELL_ENCAPSULATE_CHANNEL, false); - Timer[EVENT_ENCAPSULATE] = 25000 + rand()%5 * 1000; + DoCast(pTarget, SPELL_ENCAPSULATE_CHANNEL, false); + Timer[EVENT_ENCAPSULATE] = urand(25000,30000); } break; case EVENT_FLIGHT: @@ -488,7 +488,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI { case EVENT_BERSERK: DoScriptText(YELL_BERSERK, m_creature); - m_creature->CastSpell(m_creature, SPELL_BERSERK, true); + DoCast(m_creature, SPELL_BERSERK, true); Timer[EVENT_BERSERK] = 0; break; case EVENT_FLIGHT_SEQUENCE: @@ -560,12 +560,13 @@ struct TRINITY_DLL_DECL mob_felmyst_vaporAI : public ScriptedAI void EnterCombat(Unit* who) { DoZoneInCombat(); - //m_creature->CastSpell(m_creature, SPELL_VAPOR_FORCE, true); core bug + //DoCast(m_creature, SPELL_VAPOR_FORCE, true); core bug } void UpdateAI(const uint32 diff) { if (!m_creature->getVictim()) - AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0)); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + AttackStart(pTarget); } }; @@ -574,7 +575,7 @@ struct TRINITY_DLL_DECL mob_felmyst_trailAI : public ScriptedAI mob_felmyst_trailAI(Creature *c) : ScriptedAI(c) { m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - m_creature->CastSpell(m_creature, SPELL_TRAIL_TRIGGER, true); + DoCast(m_creature, SPELL_TRAIL_TRIGGER, true); m_creature->SetUInt64Value(UNIT_FIELD_TARGET, m_creature->GetGUID()); m_creature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 0.01); // core bug } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp index fb0f7f3ea67..dde627904a8 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp @@ -604,7 +604,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI case TIMER_SOUL_FLAY: if (!m_creature->IsNonMeleeSpellCasted(false)) { - m_creature->CastSpell(m_creature->getVictim(), SPELL_SOUL_FLAY, false); + DoCast(m_creature->getVictim(), SPELL_SOUL_FLAY, false); m_creature->getVictim()->CastSpell(m_creature->getVictim(), SPELL_SOUL_FLAY_SLOW, true); Timer[TIMER_SOUL_FLAY] = 3500; } @@ -1319,7 +1319,7 @@ struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI } if (Timer[2] <= diff) { - DoCast(m_creature, SPELL_SR_RENEW, false); + DoCast(m_creature, SPELL_SR_RENEW, false); Timer[2] = 7000; } DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp index e82c76fc726..29497c32e79 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp @@ -178,7 +178,7 @@ struct TRINITY_DLL_DECL boss_entropiusAI : public ScriptedAI if (EnrageTimer < diff && !m_creature->HasAura(SPELL_ENRAGE, 0)) { - DoCast(m_creature,SPELL_ENRAGE, false); + DoCast(m_creature, SPELL_ENRAGE, false); } else EnrageTimer -= diff; if (BlackHoleSummonTimer <= diff) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/tirisfal_glades.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/tirisfal_glades.cpp index 2eae7e45b53..313f9745e4d 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/tirisfal_glades.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/tirisfal_glades.cpp @@ -107,10 +107,10 @@ struct TRINITY_DLL_DECL npc_calvin_montagueAI : public ScriptedAI ++m_uiPhase; break; case 2: - if (Unit* pUnit = Unit::GetUnit(*m_creature, m_uiPlayerGUID)) - CAST_PLR(pUnit)->AreaExploredOrEventHappens(QUEST_590); + if (Player *pPlayer = Unit::GetPlayer(m_uiPlayerGUID)) + pPlayer->AreaExploredOrEventHappens(QUEST_590); - m_creature->CastSpell(m_creature,SPELL_DRINK,true); + DoCast(m_creature, SPELL_DRINK, true); ++m_uiPhase; break; case 3: @@ -132,9 +132,9 @@ CreatureAI* GetAI_npc_calvin_montague(Creature* pCreature) return new npc_calvin_montagueAI (pCreature); } -bool QuestAccept_npc_calvin_montague(Player* pPlayer, Creature* pCreature, Quest const* quest) +bool QuestAccept_npc_calvin_montague(Player* pPlayer, Creature* pCreature, Quest const* pQuest) { - if (quest->GetQuestId() == QUEST_590) + if (pQuest->GetQuestId() == QUEST_590) { pCreature->setFaction(FACTION_HOSTILE); pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp index 40014471bc3..84354c73fdd 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp @@ -167,7 +167,7 @@ struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI if (Tremor_Timer <= diff) { //Cast - DoCast(m_creature->getVictim(),SPELL_GROUND_TREMOR); + DoCast(m_creature->getVictim(), SPELL_GROUND_TREMOR); //45 seconds until we should cast this agian Tremor_Timer = 45000; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp index 9acaefb5352..ec907f1f2f9 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_ironayaAI : public ScriptedAI //If we are <50% hp do knockaway ONCE if (!hasCastedKnockaway && m_creature->GetHealth()*2 < m_creature->GetMaxHealth()) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_KNOCKAWAY, true); + DoCast(m_creature->getVictim(), SPELL_KNOCKAWAY, true); // current aggro target is knocked away pick new target Unit* Target = SelectUnit(SELECT_TARGET_TOPAGGRO, 0); @@ -76,13 +76,13 @@ struct TRINITY_DLL_DECL boss_ironayaAI : public ScriptedAI //Arcing_Timer if (Arcing_Timer <= diff) { - DoCast(m_creature,SPELL_ARCINGSMASH); + DoCast(m_creature, SPELL_ARCINGSMASH); Arcing_Timer = 13000; } else Arcing_Timer -= diff; if (!hasCastedWstomp && m_creature->GetHealth()*4 < m_creature->GetMaxHealth()) { - DoCast(m_creature,SPELL_WSTOMP); + DoCast(m_creature, SPELL_WSTOMP); hasCastedWstomp = true; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/uldaman.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/uldaman.cpp index cb188ba0c9a..f63f5c50805 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/uldaman.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/uldaman/uldaman.cpp @@ -59,8 +59,8 @@ struct TRINITY_DLL_DECL mob_jadespine_basiliskAI : public ScriptedAI if (Cslumber_Timer <= diff) { //Cast - // DoCast(m_creature->getVictim(),SPELL_CSLUMBER); - m_creature->CastSpell(m_creature->getVictim(),SPELL_CSLUMBER, true); + // DoCast(m_creature->getVictim(), SPELL_CSLUMBER); + DoCast(m_creature->getVictim(), SPELL_CSLUMBER, true); //Stop attacking target thast asleep and pick new target Cslumber_Timer = 28000; @@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL mob_jadespine_basiliskAI : public ScriptedAI Unit* Target = SelectUnit(SELECT_TARGET_TOPAGGRO, 0); if (!Target || Target == m_creature->getVictim()) - Target = SelectUnit(SELECT_TARGET_RANDOM, 0); + Target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (Target) m_creature->TauntApply(Target); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/undercity.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/undercity.cpp index dda49cc7a96..d74b6a29b20 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/undercity.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/undercity.cpp @@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL npc_highborne_lamenterAI : public ScriptedAI { if (EventCast_Timer <= diff) { - DoCast(m_creature,SPELL_HIGHBORNE_AURA); + DoCast(m_creature, SPELL_HIGHBORNE_AURA); EventCast = false; } else EventCast_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/wetlands.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/wetlands.cpp index 3ba504c6d7a..77a6d453197 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/wetlands.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/wetlands.cpp @@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL npc_tapoke_slim_jahnAI : public npc_escortAI if (HasEscortState(STATE_ESCORT_ESCORTING) && !m_bFriendSummoned && pPlayer) { for (uint8 i = 0; i < 3; ++i) - m_creature->CastSpell(m_creature, SPELL_CALL_FRIENDS, true); + DoCast(m_creature, SPELL_CALL_FRIENDS, true); m_bFriendSummoned = true; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp index 48a0877a40f..462327b1c34 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp @@ -266,7 +266,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI { m_creature->MonsterYell(SAY_ONENRAGE, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_ONENRAGE); - m_creature->CastSpell(m_creature, SPELL_BERSERK, true); + DoCast(m_creature, SPELL_BERSERK, true); Enrage_Timer = 600000; } else Enrage_Timer -= diff; @@ -275,7 +275,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); if (!pTarget) pTarget = m_creature->getVictim(); TargetGUID = pTarget->GetGUID(); - m_creature->CastSpell(pTarget, SPELL_STATIC_DISRUPTION, false); + DoCast(pTarget, SPELL_STATIC_DISRUPTION, false); m_creature->SetInFront(m_creature->getVictim()); StaticDisruption_Timer = (10+rand()%8)*1000; // < 20s @@ -311,7 +311,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI return; } pTarget->CastSpell(pTarget, 44007, true);//cloud visual - m_creature->CastSpell(pTarget, SPELL_ELECTRICAL_STORM, false);//storm cyclon + visual + DoCast(pTarget, SPELL_ELECTRICAL_STORM, false);//storm cyclon + visual float x,y,z; pTarget->GetPosition(x,y,z); if (pTarget) @@ -399,7 +399,7 @@ struct TRINITY_DLL_DECL mob_soaring_eagleAI : public ScriptedAI if (TargetGUID) { if (Unit *pTarget = Unit::GetUnit(*m_creature, TargetGUID)) - m_creature->CastSpell(pTarget, SPELL_EAGLE_SWOOP, true); + DoCast(pTarget, SPELL_EAGLE_SWOOP, true); TargetGUID = 0; m_creature->SetSpeed(MOVE_RUN, 1.2f); EagleSwoop_Timer = 5000 + rand()%5000; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp index 9baa22e7cc1..6616b5c5c54 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp @@ -155,15 +155,12 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI case PHASE_ENRAGE: if (Phase == PHASE_MERGE) { - m_creature->CastSpell(m_creature, SPELL_TRANSFORM_MERGE, true); + DoCast(m_creature, SPELL_TRANSFORM_MERGE, true); m_creature->Attack(m_creature->getVictim(), true); m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim()); } - if (Unit *Lynx = Unit::GetUnit(*m_creature, LynxGUID)) - { - Lynx->SetVisibility(VISIBILITY_OFF); - Lynx->setDeathState(JUST_DIED); - } + if (Creature *Lynx = Unit::GetCreature(*m_creature, LynxGUID)) + Lynx->DisappearAndDie(); m_creature->SetMaxHealth(600000); m_creature->SetHealth(600000 - 150000 * TransformCount); FrenzyTimer = 16000; @@ -174,7 +171,7 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI case PHASE_SPLIT: m_creature->MonsterYell(YELL_SPLIT, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_SPLIT); - m_creature->CastSpell(m_creature, SPELL_TRANSFORM_SPLIT, true); + DoCast(m_creature, SPELL_TRANSFORM_SPLIT, true); break; case PHASE_HUMAN: //DoCast(m_creature, SPELL_SUMMON_LYNX, true); @@ -221,8 +218,8 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI if (SaberlashTimer <= diff) { // A tank with more than 490 defense skills should receive no critical hit - //m_creature->CastSpell(m_creature, 41296, true); - m_creature->CastSpell(m_creature->getVictim(), SPELL_SABER_LASH, true); + //DoCast(m_creature, 41296, true); + DoCast(m_creature->getVictim(), SPELL_SABER_LASH, true); //m_creature->RemoveAurasDueToSpell(41296); SaberlashTimer = 30000; } else SaberlashTimer -= diff; @@ -230,7 +227,7 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI if (FrenzyTimer <= diff) { DoCast(m_creature, SPELL_FRENZY); - FrenzyTimer = (10+rand()%5)*1000; + FrenzyTimer = urand(10000,15000); } else FrenzyTimer -= diff; if (Phase == PHASE_LYNX) @@ -255,9 +252,9 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { if (pTarget->IsNonMeleeSpellCasted(false)) - DoCast(pTarget,SPELL_EARTHSHOCK); + DoCast(pTarget, SPELL_EARTHSHOCK); else - DoCast(pTarget,SPELL_FLAMESHOCK); + DoCast(pTarget, SPELL_FLAMESHOCK); ShockTimer = 10000 + rand()%5000; } } else ShockTimer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp index 27a6fccd83c..2b3d3738634 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp @@ -339,7 +339,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI if (ResetTimer <= diff) { - if (m_creature->IsWithinDist3d(119.223,1035.45,29.4481, 10)) + if (m_creature->IsWithinDist3d(119.223, 1035.45, 29.4481, 10)) { EnterEvadeMode(); return; @@ -350,17 +350,16 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI if (CheckAddState_Timer <= diff) { for (uint8 i = 0; i < 4; ++i) - { - Unit* Temp = Unit::GetUnit((*m_creature),AddGUID[i]); - if (Temp && Temp->isAlive() && !Temp->getVictim()) - CAST_CRE(Temp)->AI()->AttackStart(m_creature->getVictim()); - } + if (Creature *pTemp = Unit::GetCreature(*m_creature, AddGUID[i])) + if (pTemp->isAlive() && !pTemp->getVictim()) + pTemp->AI()->AttackStart(m_creature->getVictim()); + CheckAddState_Timer = 5000; } else CheckAddState_Timer -= diff; if (DrainPower_Timer <= diff) { - m_creature->CastSpell(m_creature, SPELL_DRAIN_POWER, true); + DoCast(m_creature, SPELL_DRAIN_POWER, true); m_creature->MonsterYell(YELL_DRAIN_POWER, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_YELL_DRAIN_POWER); DrainPower_Timer = urand(40000,55000); // must cast in 60 sec, or buff/debuff will disappear @@ -372,7 +371,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI SpiritBolts_Timer = 13000; // cast drain power first else { - m_creature->CastSpell(m_creature, SPELL_SPIRIT_BOLTS, false); + DoCast(m_creature, SPELL_SPIRIT_BOLTS, false); m_creature->MonsterYell(YELL_SPIRIT_BOLTS, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_YELL_SPIRIT_BOLTS); SpiritBolts_Timer = 40000; @@ -397,7 +396,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI trigger->CastSpell(pTarget, SPELL_SIPHON_SOUL, true); trigger->GetMotionMaster()->MoveChase(m_creature); - //m_creature->CastSpell(pTarget, SPELL_SIPHON_SOUL, true); + //DoCast(pTarget, SPELL_SIPHON_SOUL, true); //m_creature->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, pTarget->GetGUID()); //m_creature->SetUInt32Value(UNIT_CHANNEL_SPELL, SPELL_SIPHON_SOUL); @@ -455,7 +454,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI break; } if (pTarget) - m_creature->CastSpell(pTarget, PlayerAbility[PlayerClass][random].spell, false); + DoCast(pTarget, PlayerAbility[PlayerClass][random].spell, false); } }; @@ -489,14 +488,14 @@ struct TRINITY_DLL_DECL boss_thurgAI : public boss_hexlord_addAI if (!templist.empty()) { if (Unit *pTarget = *(templist.begin())) - m_creature->CastSpell(pTarget, SPELL_BLOODLUST, false); + DoCast(pTarget, SPELL_BLOODLUST, false); } bloodlust_timer = 12000; } else bloodlust_timer -= diff; if (cleave_timer <= diff) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_CLEAVE, false); + DoCast(m_creature->getVictim(), SPELL_CLEAVE, false); cleave_timer = 12000; //3 sec cast } else cleave_timer -= diff; @@ -551,7 +550,7 @@ struct TRINITY_DLL_DECL boss_alyson_antilleAI : public boss_hexlord_addAI if (pTarget) { if (pTarget->IsWithinDistInMap(m_creature, 50)) - m_creature->CastSpell(pTarget,SPELL_FLASH_HEAL, false); + DoCast(pTarget, SPELL_FLASH_HEAL, false); else { // bugged @@ -564,10 +563,10 @@ struct TRINITY_DLL_DECL boss_alyson_antilleAI : public boss_hexlord_addAI if (urand(0,1)) { if (pTarget = DoSelectLowestHpFriendly(50, 0)) - m_creature->CastSpell(pTarget, SPELL_DISPEL_MAGIC, false); + DoCast(pTarget, SPELL_DISPEL_MAGIC, false); } else if (pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - m_creature->CastSpell(pTarget, SPELL_DISPEL_MAGIC, false); + DoCast(pTarget, SPELL_DISPEL_MAGIC, false); } flashheal_timer = 2500; } else flashheal_timer -= diff; @@ -578,7 +577,7 @@ struct TRINITY_DLL_DECL boss_alyson_antilleAI : public boss_hexlord_addAI { Unit *pTarget = SelectTarget(); - m_creature->CastSpell(pTarget, SPELL_DISPEL_MAGIC, false); + DoCast(pTarget, SPELL_DISPEL_MAGIC, false); } else m_creature->CastSpell(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_DISPEL_MAGIC, false); @@ -626,7 +625,7 @@ struct TRINITY_DLL_DECL boss_gazakrothAI : public boss_hexlord_addAI if (firebolt_timer <= diff) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_FIREBOLT, false); + DoCast(m_creature->getVictim(), SPELL_FIREBOLT, false); firebolt_timer = 700; } else firebolt_timer -= diff; @@ -659,13 +658,13 @@ struct TRINITY_DLL_DECL boss_lord_raadanAI : public boss_hexlord_addAI if (thunderclap_timer <= diff) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_THUNDERCLAP, false); + DoCast(m_creature->getVictim(), SPELL_THUNDERCLAP, false); thunderclap_timer = 12000; } else thunderclap_timer -= diff; if (flamebreath_timer <= diff) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_FLAME_BREATH, false); + DoCast(m_creature->getVictim(), SPELL_FLAME_BREATH, false); flamebreath_timer = 12000; } else flamebreath_timer -= diff; @@ -693,7 +692,7 @@ struct TRINITY_DLL_DECL boss_darkheartAI : public boss_hexlord_addAI if (psychicwail_timer <= diff) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_PSYCHIC_WAIL, false); + DoCast(m_creature->getVictim(), SPELL_PSYCHIC_WAIL, false); psychicwail_timer = 12000; } else psychicwail_timer -= diff; @@ -738,7 +737,7 @@ struct TRINITY_DLL_DECL boss_slitherAI : public boss_hexlord_addAI if (venomspit_timer <= diff) { if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - m_creature->CastSpell(victim,SPELL_VENOM_SPIT, false); + DoCast(victim, SPELL_VENOM_SPIT, false); venomspit_timer = 2500; } else venomspit_timer -= diff; @@ -802,13 +801,13 @@ struct TRINITY_DLL_DECL boss_koraggAI : public boss_hexlord_addAI if (mightyblow_timer <= diff) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_MIGHTY_BLOW, false); + DoCast(m_creature->getVictim(), SPELL_MIGHTY_BLOW, false); mightyblow_timer = 12000; } if (coldstare_timer <= diff) { - if (Unit* victim = SelectUnit(SELECT_TARGET_RANDOM, 0)) - m_creature->CastSpell(victim,SPELL_COLD_STARE, false); + if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(victim, SPELL_COLD_STARE, false); coldstare_timer = 12000; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp index b0c63e7afad..2757a62abf5 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp @@ -343,14 +343,14 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI { if (!enraged) { - m_creature->CastSpell(m_creature, SPELL_ENRAGE, true); + DoCast(m_creature, SPELL_ENRAGE, true); enraged = true; EnrageTimer = 300000; } else { DoScriptText(SAY_BERSERK, m_creature); - m_creature->CastSpell(m_creature, SPELL_BERSERK, true); + DoCast(m_creature, SPELL_BERSERK, true); EnrageTimer = 300000; } } else EnrageTimer -= diff; @@ -363,9 +363,9 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI m_creature->GetMotionMaster()->Clear(); DoTeleportTo(JanalainPos[0][0],JanalainPos[0][1],JanalainPos[0][2]); m_creature->StopMoving(); - m_creature->CastSpell(m_creature, SPELL_FIRE_BOMB_CHANNEL, false); + DoCast(m_creature, SPELL_FIRE_BOMB_CHANNEL, false); //DoTeleportPlayer(m_creature, JanalainPos[0][0], JanalainPos[0][1],JanalainPos[0][2], 0); - //m_creature->CastSpell(m_creature, SPELL_TELE_TO_CENTER, true); + //DoCast(m_creature, SPELL_TELE_TO_CENTER, true); FireWall(); SpawnBombs(); @@ -380,7 +380,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI if (Player* i_pl = i->getSource()) if (i_pl->isAlive()) DoTeleportPlayer(i_pl, JanalainPos[0][0]-5+rand()%10, JanalainPos[0][1]-5+rand()%10, JanalainPos[0][2], 0); - //m_creature->CastSpell(Temp, SPELL_SUMMON_PLAYERS, true); // core bug, spell does not work if too far + //DoCast(Temp, SPELL_SUMMON_PLAYERS, true) // core bug, spell does not work if too far return; } else BombTimer -= diff; @@ -394,7 +394,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI m_creature->GetMotionMaster()->Clear(); DoTeleportTo(JanalainPos[0][0],JanalainPos[0][1],JanalainPos[0][2]); m_creature->StopMoving(); - m_creature->CastSpell(m_creature, SPELL_HATCH_ALL, false); + DoCast(m_creature, SPELL_HATCH_ALL, false); HatchAllEggs(2); noeggs = true; } @@ -422,7 +422,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI { m_creature->AttackStop(); m_creature->GetMotionMaster()->Clear(); - m_creature->CastSpell(pTarget, SPELL_FLAME_BREATH, false); + DoCast(pTarget, SPELL_FLAME_BREATH, false); m_creature->StopMoving(); isFlameBreathing = true; } @@ -445,7 +445,7 @@ struct TRINITY_DLL_DECL mob_janalai_firebombAI : public ScriptedAI void SpellHit(Unit *caster, const SpellEntry *spell) { if (spell->Id == SPELL_FIRE_BOMB_THROW) - m_creature->CastSpell(m_creature, SPELL_FIRE_BOMB_DUMMY, true); + DoCast(m_creature, SPELL_FIRE_BOMB_DUMMY, true); } void EnterCombat(Unit* who) {} @@ -621,7 +621,7 @@ struct TRINITY_DLL_DECL mob_hatchlingAI : public ScriptedAI if (BuffetTimer <= diff) { - m_creature->CastSpell(m_creature->getVictim(), SPELL_FLAMEBUFFET, false); + DoCast(m_creature->getVictim(), SPELL_FLAMEBUFFET, false); BuffetTimer = 10000; } else BuffetTimer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp index 290eab2e69d..d096f530a03 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp @@ -274,7 +274,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI m_creature->AttackerStateUpdate(m_creature->getVictim()); if (m_creature->getVictim() && health == m_creature->getVictim()->GetHealth()) { - m_creature->CastSpell(m_creature->getVictim(), SPELL_OVERPOWER, false); + DoCast(m_creature->getVictim(), SPELL_OVERPOWER, false); Overpower_Timer = 5000; } } else m_creature->AttackerStateUpdate(m_creature->getVictim()); @@ -353,7 +353,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI if (NextPhase == 2) { m_creature->GetMotionMaster()->Clear(); - m_creature->CastSpell(m_creature, SPELL_ENERGY_STORM, true); // enemy aura + DoCast(m_creature, SPELL_ENERGY_STORM, true); // enemy aura for (uint8 i = 0; i < 4; ++i) { Creature* Vortex = DoSpawnCreature(CREATURE_FEATHER_VORTEX, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0); @@ -396,7 +396,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI if (Berserk_Timer <= diff) { - m_creature->CastSpell(m_creature, SPELL_BERSERK, true); + DoCast(m_creature, SPELL_BERSERK, true); m_creature->MonsterYell(YELL_BERSERK, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(m_creature, SOUND_BERSERK); Berserk_Timer = 60000; @@ -423,8 +423,8 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI if (Grievous_Throw_Timer <= diff) { - if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - m_creature->CastSpell(pTarget, SPELL_GRIEVOUS_THROW, false); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_GRIEVOUS_THROW, false); Grievous_Throw_Timer = 10000; } else Grievous_Throw_Timer -= diff; break; @@ -473,7 +473,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI AttackStart(pTarget); if (m_creature->IsWithinMeleeRange(pTarget)) { - m_creature->CastSpell(pTarget, SPELL_CLAW_RAGE_DAMAGE, true); + DoCast(pTarget, SPELL_CLAW_RAGE_DAMAGE, true); ++Claw_Counter; if (Claw_Counter == 12) { @@ -521,7 +521,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI { if (m_creature->IsWithinMeleeRange(pTarget)) { - m_creature->CastSpell(pTarget, SPELL_LYNX_RUSH_DAMAGE, true); + DoCast(pTarget, SPELL_LYNX_RUSH_DAMAGE, true); ++Claw_Counter; if (Claw_Counter == 9) { @@ -591,7 +591,7 @@ struct TRINITY_DLL_DECL feather_vortexAI : public ScriptedAI void SpellHit(Unit *caster, const SpellEntry *spell) { if (spell->Id == SPELL_ZAP_INFORM) - m_creature->CastSpell(caster, SPELL_ZAP_DAMAGE, true); + DoCast(caster, SPELL_ZAP_DAMAGE, true); } void UpdateAI(const uint32 diff) diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.cpp index 3f198d1ab59..9828fb14d21 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulaman/zulaman.cpp @@ -86,7 +86,7 @@ struct TRINITY_DLL_DECL npc_forest_frogAI : public ScriptedAI if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->GetTypeId() == TYPEID_PLAYER && m_creature->GetEntry() == ENTRY_FOREST_FROG) { //increase or decrease chance of mojo? - if (rand()%99 == 50) DoCast(caster,SPELL_PUSH_MOJO,true); + if (rand()%99 == 50) DoCast(caster, SPELL_PUSH_MOJO, true); else DoSpawnRandom(); } } @@ -119,7 +119,8 @@ struct TRINITY_DLL_DECL npc_zulaman_hostageAI : public ScriptedAI } void UpdateAI(const uint32 diff) { - if (IsLoot) m_creature->CastSpell(m_creature, 7, false); + if (IsLoot) + DoCast(m_creature, 7, false); } }; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp index 563481118db..90c81a111af 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp @@ -152,7 +152,7 @@ struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI { if (m_uiShadowWordPain_Timer <= uiDiff) { - DoCast(m_creature->getVictim(),SPELL_SHADOWWORDPAIN); + DoCast(m_creature->getVictim(), SPELL_SHADOWWORDPAIN); m_uiShadowWordPain_Timer = 15000; } else diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp index 3de54f0d68a..bf9a0aba9c4 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp @@ -54,14 +54,14 @@ struct TRINITY_DLL_DECL boss_gahzrankaAI : public ScriptedAI //Frostbreath_Timer if (Frostbreath_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FROSTBREATH); + DoCast(m_creature->getVictim(), SPELL_FROSTBREATH); Frostbreath_Timer = 7000 + rand()%4000; } else Frostbreath_Timer -= diff; //MassiveGeyser_Timer if (MassiveGeyser_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MASSIVEGEYSER); + DoCast(m_creature->getVictim(), SPELL_MASSIVEGEYSER); DoResetThreat(); MassiveGeyser_Timer = 22000 + rand()%10000; @@ -70,7 +70,7 @@ struct TRINITY_DLL_DECL boss_gahzrankaAI : public ScriptedAI //Slam_Timer if (Slam_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SLAM); + DoCast(m_creature->getVictim(), SPELL_SLAM); Slam_Timer = 12000 + rand()%8000; } else Slam_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp index 058312f8923..b1a9604f85b 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp @@ -107,14 +107,14 @@ struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI //BloodSiphon_Timer if (BloodSiphon_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_BLOODSIPHON); + DoCast(m_creature->getVictim(), SPELL_BLOODSIPHON); BloodSiphon_Timer = 90000; } else BloodSiphon_Timer -= diff; //CorruptedBlood_Timer if (CorruptedBlood_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CORRUPTEDBLOOD); + DoCast(m_creature->getVictim(), SPELL_CORRUPTEDBLOOD); CorruptedBlood_Timer = 30000 + rand()%15000; } else CorruptedBlood_Timer -= diff; @@ -122,7 +122,7 @@ struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI /*if (CauseInsanity_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_CAUSEINSANITY); + DoCast(pTarget, SPELL_CAUSEINSANITY); CauseInsanity_Timer = 35000 + rand()%8000; } else CauseInsanity_Timer -= diff;*/ @@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI if (WillOfHakkar_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_WILLOFHAKKAR); + DoCast(pTarget, SPELL_WILLOFHAKKAR); WillOfHakkar_Timer = 25000 + rand()%10000; } else WillOfHakkar_Timer -= diff; @@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI { if (AspectOfJeklik_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ASPECT_OF_JEKLIK); + DoCast(m_creature->getVictim(), SPELL_ASPECT_OF_JEKLIK); AspectOfJeklik_Timer = 10000 + rand()%4000; } else AspectOfJeklik_Timer -= diff; } @@ -168,7 +168,7 @@ struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI { if (AspectOfVenoxis_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ASPECT_OF_VENOXIS); + DoCast(m_creature->getVictim(), SPELL_ASPECT_OF_VENOXIS); AspectOfVenoxis_Timer = 8000; } else AspectOfVenoxis_Timer -= diff; } @@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI { if (AspectOfMarli_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ASPECT_OF_MARLI); + DoCast(m_creature->getVictim(), SPELL_ASPECT_OF_MARLI); AspectOfMarli_Timer = 10000; } else AspectOfMarli_Timer -= diff; @@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI { if (AspectOfThekal_Timer <= diff) { - DoCast(m_creature,SPELL_ASPECT_OF_THEKAL); + DoCast(m_creature, SPELL_ASPECT_OF_THEKAL); AspectOfThekal_Timer = 15000; } else AspectOfThekal_Timer -= diff; } @@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI { if (AspectOfArlokk_Timer <= diff) { - DoCast(m_creature,SPELL_ASPECT_OF_ARLOKK); + DoCast(m_creature, SPELL_ASPECT_OF_ARLOKK); DoResetThreat(); AspectOfArlokk_Timer = 10000 + rand()%5000; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp index 4aa5da488e4..ed696fd650e 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp @@ -55,14 +55,14 @@ struct TRINITY_DLL_DECL boss_hazzarahAI : public ScriptedAI //ManaBurn_Timer if (ManaBurn_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MANABURN); + DoCast(m_creature->getVictim(), SPELL_MANABURN); ManaBurn_Timer = 8000 + rand()%8000; } else ManaBurn_Timer -= diff; //Sleep_Timer if (Sleep_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SLEEP); + DoCast(m_creature->getVictim(), SPELL_SLEEP); Sleep_Timer = 12000 + rand()%8000; } else Sleep_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp index 2e1060f6227..7d39d796f65 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp @@ -80,7 +80,7 @@ struct TRINITY_DLL_DECL boss_jeklikAI : public ScriptedAI void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); - DoCast(m_creature,SPELL_BAT_FORM); + DoCast(m_creature, SPELL_BAT_FORM); } void JustDied(Unit* Killer) @@ -104,7 +104,7 @@ struct TRINITY_DLL_DECL boss_jeklikAI : public ScriptedAI { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { - DoCast(pTarget,SPELL_CHARGE); + DoCast(pTarget, SPELL_CHARGE); AttackStart(pTarget); } @@ -113,13 +113,13 @@ struct TRINITY_DLL_DECL boss_jeklikAI : public ScriptedAI if (SonicBurst_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SONICBURST); + DoCast(m_creature->getVictim(), SPELL_SONICBURST); SonicBurst_Timer = 8000 + rand()%5000; } else SonicBurst_Timer -= diff; if (Screech_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SCREECH); + DoCast(m_creature->getVictim(), SPELL_SCREECH); Screech_Timer = 18000 + rand()%8000; } else Screech_Timer -= diff; @@ -177,7 +177,7 @@ struct TRINITY_DLL_DECL boss_jeklikAI : public ScriptedAI if (GreaterHeal_Timer <= diff) { m_creature->InterruptNonMeleeSpells(false); - DoCast(m_creature,SPELL_GREATERHEAL); + DoCast(m_creature, SPELL_GREATERHEAL); GreaterHeal_Timer = 25000 + rand()%10000; }GreaterHeal_Timer -=diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp index 20144e79471..27fa81aed9e 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp @@ -207,12 +207,10 @@ struct TRINITY_DLL_DECL mob_shade_of_jindoAI : public ScriptedAI void Reset() { ShadowShock_Timer = 1000; - m_creature->CastSpell(m_creature, SPELL_INVISIBLE,true); + DoCast(m_creature, SPELL_INVISIBLE, true); } - void EnterCombat(Unit *who) - { - } + void EnterCombat(Unit *who){} void UpdateAI (const uint32 diff) { diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp index 466c670eaf6..73eb3804cd7 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp @@ -159,11 +159,11 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI { if (m_creature->IsWithinMeleeRange(pUnit)) { - DoCast(pUnit,24316); + DoCast(pUnit, 24316); } else { - DoCast(pUnit,SPELL_CHARGE); + DoCast(pUnit, SPELL_CHARGE); //m_creature->SendMonsterMove(pUnit->GetPositionX(), pUnit->GetPositionY(), pUnit->GetPositionZ(), 0, true,1); AttackStart(pUnit); } @@ -202,14 +202,14 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI //Cleave if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 7000; } else Cleave_Timer -= diff; //Whirlwind if (Whirlwind_Timer <= diff) { - DoCast(m_creature,SPELL_WHIRLWIND); + DoCast(m_creature, SPELL_WHIRLWIND); Whirlwind_Timer = 18000; } else Whirlwind_Timer -= diff; @@ -227,7 +227,7 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI } if (TargetInRange > 3) - DoCast(m_creature->getVictim(),SPELL_FEAR); + DoCast(m_creature->getVictim(), SPELL_FEAR); Fear_Timer = 4000; } else Fear_Timer -=diff; @@ -237,7 +237,7 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI { if (MortalStrike_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MORTAL_STRIKE); + DoCast(m_creature->getVictim(), SPELL_MORTAL_STRIKE); MortalStrike_Timer = 15000; } else MortalStrike_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp index f8e016d1bb5..df9b84dc204 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp @@ -94,13 +94,13 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI { if (PoisonVolley_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_POISONVOLLEY); + DoCast(m_creature->getVictim(), SPELL_POISONVOLLEY); PoisonVolley_Timer = 10000 + rand()%10000; } else PoisonVolley_Timer -= diff; if (!PhaseTwo && Aspect_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ASPECT_OF_MARLI); + DoCast(m_creature->getVictim(), SPELL_ASPECT_OF_MARLI); Aspect_Timer = 13000 + rand()%5000; } else Aspect_Timer -= diff; @@ -143,12 +143,12 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI if (!PhaseTwo && Transform_Timer <= diff) { DoScriptText(SAY_TRANSFORM, m_creature); - DoCast(m_creature,SPELL_SPIDER_FORM); + DoCast(m_creature, SPELL_SPIDER_FORM); const CreatureInfo *cinfo = m_creature->GetCreatureInfo(); m_creature->SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, (cinfo->mindmg +((cinfo->mindmg/100) * 35))); m_creature->SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, (cinfo->maxdmg +((cinfo->maxdmg/100) * 35))); m_creature->UpdateDamagePhysical(BASE_ATTACK); - DoCast(m_creature->getVictim(),SPELL_ENVOLWINGWEB); + DoCast(m_creature->getVictim(), SPELL_ENVOLWINGWEB); if (DoGetThreat(m_creature->getVictim())) DoModifyThreatPercent(m_creature->getVictim(),-100); @@ -225,7 +225,7 @@ struct TRINITY_DLL_DECL mob_spawn_of_marliAI : public ScriptedAI //LevelUp_Timer if (LevelUp_Timer <= diff) { - DoCast(m_creature,SPELL_LEVELUP); + DoCast(m_creature, SPELL_LEVELUP); LevelUp_Timer = 3000; } else LevelUp_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp index 5eed4045b4f..9ee67a1e7ba 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp @@ -86,7 +86,7 @@ struct TRINITY_DLL_DECL boss_renatakiAI : public ScriptedAI if (pTarget) { DoTeleportTo(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ()); - DoCast(pTarget,SPELL_AMBUSH); + DoCast(pTarget, SPELL_AMBUSH); } Ambushed = true; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp index 8e29b6c4483..869a429608c 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp @@ -152,13 +152,13 @@ struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI if (!PhaseTwo && MortalCleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MORTALCLEAVE); + DoCast(m_creature->getVictim(), SPELL_MORTALCLEAVE); MortalCleave_Timer = 15000 + rand()%5000; } else MortalCleave_Timer -= diff; if (!PhaseTwo && Silence_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SILENCE); + DoCast(m_creature->getVictim(), SPELL_SILENCE); Silence_Timer = 20000 + rand()%5000; } else Silence_Timer -= diff; @@ -179,7 +179,7 @@ struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI { if (Resurrect_Timer <= diff) { - DoCast(m_creature,SPELL_TIGER_FORM); + DoCast(m_creature, SPELL_TIGER_FORM); m_creature->SetFloatValue(OBJECT_FIELD_SCALE_X, 2.00f); m_creature->SetStandState(UNIT_STAND_STATE_STAND); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -204,7 +204,7 @@ struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { - DoCast(pTarget,SPELL_CHARGE); + DoCast(pTarget, SPELL_CHARGE); DoResetThreat(); AttackStart(pTarget); } @@ -214,19 +214,19 @@ struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI if (Frenzy_Timer <= diff) { - DoCast(m_creature,SPELL_FRENZY); + DoCast(m_creature, SPELL_FRENZY); Frenzy_Timer = 30000; } else Frenzy_Timer -= diff; if (ForcePunch_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SILENCE); + DoCast(m_creature->getVictim(), SPELL_SILENCE); ForcePunch_Timer = 16000 + rand()%5000; } else ForcePunch_Timer -= diff; if (SummonTigers_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SUMMONTIGERS); + DoCast(m_creature->getVictim(), SPELL_SUMMONTIGERS); SummonTigers_Timer = 10000 + rand()%4000; } else SummonTigers_Timer -= diff; @@ -289,14 +289,14 @@ struct TRINITY_DLL_DECL mob_zealot_lorkhanAI : public ScriptedAI //Shield_Timer if (Shield_Timer <= diff) { - DoCast(m_creature,SPELL_SHIELD); + DoCast(m_creature, SPELL_SHIELD); Shield_Timer = 61000; } else Shield_Timer -= diff; //BloodLust_Timer if (BloodLust_Timer <= diff) { - DoCast(m_creature,SPELL_BLOODLUST); + DoCast(m_creature, SPELL_BLOODLUST); BloodLust_Timer = 20000+rand()%8000; } else BloodLust_Timer -= diff; @@ -330,7 +330,7 @@ struct TRINITY_DLL_DECL mob_zealot_lorkhanAI : public ScriptedAI //Disarm_Timer if (Disarm_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_DISARM); + DoCast(m_creature->getVictim(), SPELL_DISARM); Disarm_Timer = 15000+rand()%10000; } else Disarm_Timer -= diff; @@ -433,21 +433,21 @@ struct TRINITY_DLL_DECL mob_zealot_zathAI : public ScriptedAI //SweepingStrikes_Timer if (SweepingStrikes_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SWEEPINGSTRIKES); + DoCast(m_creature->getVictim(), SPELL_SWEEPINGSTRIKES); SweepingStrikes_Timer = 22000+rand()%4000; } else SweepingStrikes_Timer -= diff; //SinisterStrike_Timer if (SinisterStrike_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SINISTERSTRIKE); + DoCast(m_creature->getVictim(), SPELL_SINISTERSTRIKE); SinisterStrike_Timer = 8000+rand()%8000; } else SinisterStrike_Timer -= diff; //Gouge_Timer if (Gouge_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_GOUGE); + DoCast(m_creature->getVictim(), SPELL_GOUGE); if (DoGetThreat(m_creature->getVictim())) DoModifyThreatPercent(m_creature->getVictim(),-100); @@ -458,14 +458,14 @@ struct TRINITY_DLL_DECL mob_zealot_zathAI : public ScriptedAI //Kick_Timer if (Kick_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_KICK); + DoCast(m_creature->getVictim(), SPELL_KICK); Kick_Timer = 15000+rand()%10000; } else Kick_Timer -= diff; //Blind_Timer if (Blind_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_BLIND); + DoCast(m_creature->getVictim(), SPELL_BLIND); Blind_Timer = 10000+rand()%10000; } else Blind_Timer -= diff; diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp index 0f3a170b7a6..4ca642fa10e 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp @@ -121,7 +121,7 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI if (TargetInRange > 1) { - DoCast(m_creature->getVictim(),SPELL_HOLY_NOVA); + DoCast(m_creature->getVictim(), SPELL_HOLY_NOVA); HolyNova_Timer = 1000; } else @@ -145,7 +145,7 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI { DoScriptText(SAY_TRANSFORM, m_creature); m_creature->InterruptNonMeleeSpells(false); - DoCast(m_creature,SPELL_SNAKE_FORM); + DoCast(m_creature, SPELL_SNAKE_FORM); m_creature->SetFloatValue(OBJECT_FIELD_SCALE_X, 2.00f); const CreatureInfo *cinfo = m_creature->GetCreatureInfo(); m_creature->SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, (cinfo->mindmg +((cinfo->mindmg/100) * 25))); diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp index 3fd93edbec6..9f33bb0883b 100644 --- a/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp +++ b/src/bindings/scripts/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp @@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_wushoolayAI : public ScriptedAI //LightningCloud_Timer if (LightningCloud_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_LIGHTNINGCLOUD); + DoCast(m_creature->getVictim(), SPELL_LIGHTNINGCLOUD); LightningCloud_Timer = 15000 + rand()%5000; } else LightningCloud_Timer -= diff; @@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL boss_wushoolayAI : public ScriptedAI { Unit *pTarget = NULL; pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - if (pTarget) DoCast(pTarget,SPELL_LIGHTNINGWAVE); + if (pTarget) DoCast(pTarget, SPELL_LIGHTNINGWAVE); LightningWave_Timer = 12000 + rand()%4000; } else LightningWave_Timer -= diff; diff --git a/src/bindings/scripts/scripts/examples/example_escort.cpp b/src/bindings/scripts/scripts/examples/example_escort.cpp index d22361a585b..02cafe64f50 100644 --- a/src/bindings/scripts/scripts/examples/example_escort.cpp +++ b/src/bindings/scripts/scripts/examples/example_escort.cpp @@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL example_escortAI : public npc_escortAI if (m_uiDeathCoilTimer <= uiDiff) { DoScriptText(SAY_SPELL, m_creature); - m_creature->CastSpell(m_creature->getVictim(), SPELL_DEATH_COIL, false); + DoCast(m_creature->getVictim(), SPELL_DEATH_COIL, false); m_uiDeathCoilTimer = 4000; } else @@ -150,12 +150,12 @@ struct TRINITY_DLL_DECL example_escortAI : public npc_escortAI if (m_creature->HasAura(SPELL_ELIXIR_OF_FORTITUDE, 0)) { DoScriptText(SAY_RAND_1, m_creature); - m_creature->CastSpell(m_creature, SPELL_BLUE_FIREWORK, false); + DoCast(m_creature, SPELL_BLUE_FIREWORK, false); } else { DoScriptText(SAY_RAND_2, m_creature); - m_creature->CastSpell(m_creature, SPELL_ELIXIR_OF_FORTITUDE, false); + DoCast(m_creature, SPELL_ELIXIR_OF_FORTITUDE, false); } m_uiChatTimer = 12000; diff --git a/src/bindings/scripts/scripts/kalimdor/ashenvale.cpp b/src/bindings/scripts/scripts/kalimdor/ashenvale.cpp index 917039bfb85..f606e412668 100644 --- a/src/bindings/scripts/scripts/kalimdor/ashenvale.cpp +++ b/src/bindings/scripts/scripts/kalimdor/ashenvale.cpp @@ -115,13 +115,13 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI if (Rend_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_REND); + DoCast(m_creature->getVictim(), SPELL_REND); Rend_Timer = 20000; } else Rend_Timer -= diff; if (Thunderclap_Timer <= diff) { - DoCast(m_creature,SPELL_THUNDERCLAP); + DoCast(m_creature, SPELL_THUNDERCLAP); Thunderclap_Timer = 30000; } else Thunderclap_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/kalimdor/azshara.cpp b/src/bindings/scripts/scripts/kalimdor/azshara.cpp index a27b7b00f74..e2b6a683f57 100644 --- a/src/bindings/scripts/scripts/kalimdor/azshara.cpp +++ b/src/bindings/scripts/scripts/kalimdor/azshara.cpp @@ -59,7 +59,7 @@ struct TRINITY_DLL_DECL mobs_spitelashesAI : public ScriptedAI (Spellkind->Id==118 || Spellkind->Id== 12824 || Spellkind->Id== 12825 || Spellkind->Id== 12826)) { spellhit=true; - DoCast(m_creature,29124); //become a sheep + DoCast(m_creature, 29124); //become a sheep } } @@ -77,8 +77,8 @@ struct TRINITY_DLL_DECL mobs_spitelashesAI : public ScriptedAI morphtimer+=diff; if (morphtimer>=5000) { - DoCast(m_creature,28406); //summon copies - DoCast(m_creature,6924); //visual explosion + DoCast(m_creature, 28406); //summon copies + DoCast(m_creature, 6924); //visual explosion } } if (!UpdateVictim()) diff --git a/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp b/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp index a91f0f71077..ad5bb358b82 100644 --- a/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp +++ b/src/bindings/scripts/scripts/kalimdor/azuremyst_isle.cpp @@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI CanSayHelp = true; - m_creature->CastSpell(m_creature, SPELL_IRRIDATION, true); + DoCast(m_creature, SPELL_IRRIDATION, true); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); @@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL npc_draenei_survivorAI : public ScriptedAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE); m_creature->SetStandState(UNIT_STAND_STATE_STAND); - m_creature->CastSpell(m_creature, SPELL_STUNNED, true); + DoCast(m_creature, SPELL_STUNNED, true); pCaster = Caster->GetGUID(); diff --git a/src/bindings/scripts/scripts/kalimdor/boss_azuregos.cpp b/src/bindings/scripts/scripts/kalimdor/boss_azuregos.cpp index 51912675d5a..d966323b8cc 100644 --- a/src/bindings/scripts/scripts/kalimdor/boss_azuregos.cpp +++ b/src/bindings/scripts/scripts/kalimdor/boss_azuregos.cpp @@ -89,21 +89,21 @@ struct TRINITY_DLL_DECL boss_azuregosAI : public ScriptedAI // //MarkOfFrost_Timer // if (MarkOfFrost_Timer <= diff) // { - // DoCast(m_creature->getVictim(),SPELL_MARKOFFROST); + // DoCast(m_creature->getVictim(), SPELL_MARKOFFROST); // MarkOfFrost_Timer = 25000; // } else MarkOfFrost_Timer -= diff; //Chill_Timer if (Chill_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CHILL); + DoCast(m_creature->getVictim(), SPELL_CHILL); Chill_Timer = 13000 + rand()%12000; } else Chill_Timer -= diff; //Breath_Timer if (Breath_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FROSTBREATH); + DoCast(m_creature->getVictim(), SPELL_FROSTBREATH); Breath_Timer = 10000 + rand()%5000; } else Breath_Timer -= diff; @@ -111,21 +111,21 @@ struct TRINITY_DLL_DECL boss_azuregosAI : public ScriptedAI if (ManaStorm_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_MANASTORM); + DoCast(pTarget, SPELL_MANASTORM); ManaStorm_Timer = 7500 + rand()%5000; } else ManaStorm_Timer -= diff; //Reflect_Timer if (Reflect_Timer <= diff) { - DoCast(m_creature,SPELL_REFLECT); + DoCast(m_creature, SPELL_REFLECT); Reflect_Timer = 20000 + rand()%15000; } else Reflect_Timer -= diff; //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 7000; } else Cleave_Timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp index 64d662e7a1e..f8bc418f1fc 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp @@ -163,7 +163,7 @@ struct TRINITY_DLL_DECL boss_mal_ganisAI : public ScriptedAI if (uiMindBlastTimer < diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, HEROIC(SPELL_MIND_BLAST,H_SPELL_MIND_BLAST)); + DoCast(pTarget, HEROIC(SPELL_MIND_BLAST, H_SPELL_MIND_BLAST)); } else uiMindBlastTimer -= diff; if (uiVampiricTouchTimer < diff) @@ -175,7 +175,7 @@ struct TRINITY_DLL_DECL boss_mal_ganisAI : public ScriptedAI if (uiSleepTimer < diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, HEROIC(SPELL_SLEEP,H_SPELL_SLEEP)); + DoCast(pTarget, HEROIC(SPELL_SLEEP, H_SPELL_SLEEP)); uiSleepTimer = urand(15000,20000); } else uiSleepTimer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp index 375f883c36f..c69d29f9235 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp @@ -100,7 +100,7 @@ struct TRINITY_DLL_DECL boss_meathookAI : public ScriptedAI if (uiChainTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, HEROIC(SPELL_CONSTRICTING_CHAINS,H_SPELL_CONSTRICTING_CHAINS)); //anyone but the tank + DoCast(pTarget, HEROIC(SPELL_CONSTRICTING_CHAINS, H_SPELL_CONSTRICTING_CHAINS)); //anyone but the tank uiChainTimer = urand(2000,4000); } else uiChainTimer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp index d7d5cf44ab0..dfb85910fbf 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp @@ -105,7 +105,7 @@ struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI //Curse of twisted flesh timer if (Curse_flesh_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CURSE_OF_TWISTED_FLESH); + DoCast(m_creature->getVictim(), SPELL_CURSE_OF_TWISTED_FLESH); Curse_flesh_Timer = 37000; } else Curse_flesh_Timer -= diff; @@ -122,7 +122,7 @@ struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI { DoScriptText(RAND(SAY_STEAL_FLESH_1,SAY_STEAL_FLESH_2,SAY_STEAL_FLESH_3), m_creature); if (Unit* random_pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(random_pTarget,SPELL_STEAL_FLESH); + DoCast(random_pTarget, SPELL_STEAL_FLESH); Steal_flesh_Timer = 10000; } else Steal_flesh_Timer -= diff; @@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI { DoScriptText(RAND(SAY_SUMMON_GHOULS_1,SAY_SUMMON_GHOULS_2), m_creature); if (Unit* random_pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(random_pTarget,SPELL_SUMMON_GHOULS); + DoCast(random_pTarget, SPELL_SUMMON_GHOULS); Summon_ghouls_Timer = 10000; } else Summon_ghouls_Timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp index 617c07bec6f..43e04ef83c9 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp @@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL boss_chrono_lord_dejaAI : public ScriptedAI if (ArcaneDischarge_Timer <= diff) { Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - DoCast(pTarget,HEROIC(SPELL_ARCANE_DISCHARGE, H_SPELL_ARCANE_DISCHARGE)); + DoCast(pTarget, HEROIC(SPELL_ARCANE_DISCHARGE, H_SPELL_ARCANE_DISCHARGE)); ArcaneDischarge_Timer = 20000+rand()%10000; } else ArcaneDischarge_Timer -= diff; @@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL boss_chrono_lord_dejaAI : public ScriptedAI { if (Attraction_Timer <= diff) { - DoCast(m_creature,SPELL_ATTRACTION); + DoCast(m_creature, SPELL_ATTRACTION); Attraction_Timer = 25000+rand()%10000; } else Attraction_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp index ce1b6cbdaea..4ce7554cde9 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp @@ -121,7 +121,7 @@ struct TRINITY_DLL_DECL boss_temporusAI : public ScriptedAI //Wing ruffet if (WingBuffet_Timer <= diff) { - DoCast(m_creature,HEROIC(SPELL_WING_BUFFET, H_SPELL_WING_BUFFET)); + DoCast(m_creature, HEROIC(SPELL_WING_BUFFET, H_SPELL_WING_BUFFET)); WingBuffet_Timer = 20000+rand()%10000; } else WingBuffet_Timer -= diff; @@ -129,7 +129,7 @@ struct TRINITY_DLL_DECL boss_temporusAI : public ScriptedAI { if (SpellReflection_Timer <= diff) { - DoCast(m_creature,SPELL_REFLECT); + DoCast(m_creature, SPELL_REFLECT); SpellReflection_Timer = 25000+rand()%10000; } else SpellReflection_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp index dbdca5eb635..ec2e641aa4b 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp @@ -78,11 +78,11 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI return; if (pInstance->GetData(TYPE_MEDIVH) == IN_PROGRESS) - m_creature->CastSpell(m_creature,SPELL_CHANNEL,true); + DoCast(m_creature, SPELL_CHANNEL, true); else if (m_creature->HasAura(SPELL_CHANNEL)) m_creature->RemoveAura(SPELL_CHANNEL); - m_creature->CastSpell(m_creature,SPELL_PORTAL_RUNE,true); + DoCast(m_creature, SPELL_PORTAL_RUNE, true); } void MoveInLineOfSight(Unit *who) @@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI DoScriptText(SAY_INTRO, m_creature); pInstance->SetData(TYPE_MEDIVH,IN_PROGRESS); - m_creature->CastSpell(m_creature,SPELL_CHANNEL,false); + DoCast(m_creature, SPELL_CHANNEL, false); Check_Timer = 5000; } else if (who->GetTypeId() == TYPEID_UNIT && m_creature->IsWithinDistInMap(who, 15.0f)) diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp index 551682f5e5c..6fcbc7aa840 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp @@ -148,8 +148,8 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI if (SwarmTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) - DoCast(pTarget,SPELL_CARRION_SWARM); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_CARRION_SWARM); SwarmTimer = urand(45000,60000); switch (urand(0,1)) @@ -169,7 +169,7 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI { for (uint8 i = 0; i < 3; ++i) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) pTarget->CastSpell(pTarget,SPELL_SLEEP,true); } SleepTimer = 60000; @@ -187,12 +187,12 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI } else SleepTimer -= diff; if (AuraTimer <= diff) { - DoCast(m_creature, SPELL_VAMPIRIC_AURA,true); + DoCast(m_creature, SPELL_VAMPIRIC_AURA, true); AuraTimer = urand(10000,20000); } else AuraTimer -= diff; if (InfernoTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,100,true), SPELL_INFERNO); + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_INFERNO); InfernoTimer = 45000; switch (urand(0,1)) { diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp index 7488be3a5d5..de6b6944e07 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp @@ -260,7 +260,7 @@ struct TRINITY_DLL_DECL mob_lesser_doomguardAI : public hyjal_trashAI if (CrippleTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,100,true), SPELL_CRIPPLE); + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_CRIPPLE); CrippleTimer = 25000+rand()%5000; } else CrippleTimer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp index 0a0d134e08c..668c5c42379 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp @@ -741,7 +741,7 @@ void hyjalAI::UpdateAI(const uint32 diff) { if (MassTeleportTimer < diff && DoMassTeleport) { - m_creature->CastSpell(m_creature,SPELL_MASS_TELEPORT,false); + DoCast(m_creature, SPELL_MASS_TELEPORT, false); DoMassTeleport = false; } else MassTeleportTimer -= diff; return; @@ -979,7 +979,7 @@ void hyjalAI::WaypointReached(uint32 i) WaitForTeleport = true; TeleportTimer = 20000; if (m_creature->GetEntry() == JAINA) - m_creature->CastSpell(m_creature,SPELL_MASS_TELEPORT,false); + DoCast(m_creature, SPELL_MASS_TELEPORT, false); if (m_creature->GetEntry() == THRALL && DummyGuid) { Unit* Dummy = Unit::GetUnit((*m_creature),DummyGuid); @@ -987,7 +987,7 @@ void hyjalAI::WaypointReached(uint32 i) { CAST_AI(hyjalAI, CAST_CRE(Dummy)->AI())->DoMassTeleport = true; CAST_AI(hyjalAI, CAST_CRE(Dummy)->AI())->MassTeleportTimer = 20000; - Dummy->CastSpell(m_creature,SPELL_MASS_TELEPORT,false); + Dummy->CastSpell(m_creature, SPELL_MASS_TELEPORT, false); } } //do some talking diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp index 3db6c5a51d6..ca7db6f2581 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp @@ -485,12 +485,12 @@ struct mob_giant_infernalAI : public hyjal_trashAI return; if (!imol) { - DoCast(m_creature,SPELL_IMMOLATION); + DoCast(m_creature, SPELL_IMMOLATION); imol=true; } if (FlameBuffetTimer<= diff) { - DoCast(m_creature->getVictim(),SPELL_FLAME_BUFFET,true); + DoCast(m_creature->getVictim(), SPELL_FLAME_BUFFET, true); FlameBuffetTimer = 7000; } else FlameBuffetTimer -= diff; DoMeleeAttackIfReady(); @@ -580,12 +580,12 @@ struct mob_abominationAI : public hyjal_trashAI } } if (!m_creature->HasAura(SPELL_DISEASE_CLOUD)) - DoCast(m_creature,SPELL_DISEASE_CLOUD); + DoCast(m_creature, SPELL_DISEASE_CLOUD); if (!UpdateVictim()) return; if (KnockDownTimer<= diff) { - DoCast(m_creature->getVictim(),SPELL_KNOCKDOWN); + DoCast(m_creature->getVictim(), SPELL_KNOCKDOWN); KnockDownTimer = 15000+rand()%10000; } else KnockDownTimer -= diff; DoMeleeAttackIfReady(); @@ -681,7 +681,7 @@ struct mob_ghoulAI : public hyjal_trashAI } if (FrenzyTimer<= diff) { - DoCast(m_creature,SPELL_FRENZY); + DoCast(m_creature, SPELL_FRENZY); FrenzyTimer = 15000+rand()%15000; } else FrenzyTimer -= diff; if (!UpdateVictim()) @@ -798,7 +798,7 @@ struct mob_necromancerAI : public hyjal_trashAI return; if (ShadowBoltTimer<= diff) { - DoCast(m_creature->getVictim(),SPELL_SHADOW_BOLT); + DoCast(m_creature->getVictim(), SPELL_SHADOW_BOLT); ShadowBoltTimer = 20000+rand()%10000; } else ShadowBoltTimer -= diff; @@ -889,17 +889,17 @@ struct mob_bansheeAI : public hyjal_trashAI return; if (CourseTimer<= diff) { - DoCast(m_creature->getVictim(),SPELL_BANSHEE_CURSE); + DoCast(m_creature->getVictim(), SPELL_BANSHEE_CURSE); CourseTimer = 20000+rand()%5000; } else CourseTimer -= diff; if (WailTimer<= diff) { - DoCast(m_creature->getVictim(),SPELL_BANSHEE_WAIL); + DoCast(m_creature->getVictim(), SPELL_BANSHEE_WAIL); WailTimer = 15000+rand()%5000; } else WailTimer -= diff; if (ShellTimer<= diff) { - DoCast(m_creature,SPELL_ANTI_MAGIC_SHELL); + DoCast(m_creature, SPELL_ANTI_MAGIC_SHELL); ShellTimer = 50000+rand()%10000; } else ShellTimer -= diff; DoMeleeAttackIfReady(); @@ -984,7 +984,7 @@ struct mob_crypt_fiendAI : public hyjal_trashAI return; if (WebTimer<= diff) { - DoCast(m_creature->getVictim(),SPELL_WEB); + DoCast(m_creature->getVictim(), SPELL_WEB); WebTimer = 20000+rand()%5000; } else WebTimer -= diff; DoMeleeAttackIfReady(); @@ -1069,7 +1069,7 @@ struct mob_fel_stalkerAI : public hyjal_trashAI return; if (ManaBurnTimer<= diff) { - DoCast(m_creature->getVictim(),SPELL_MANA_BURN); + DoCast(m_creature->getVictim(), SPELL_MANA_BURN); ManaBurnTimer = 9000+rand()%5000; } else ManaBurnTimer -= diff; DoMeleeAttackIfReady(); @@ -1114,7 +1114,7 @@ struct mob_frost_wyrmAI : public hyjal_trashAI if (pTarget && pTarget->isAlive()) { m_creature->AddThreat(pTarget,0.0); - DoCast(pTarget,SPELL_FROST_BREATH,true); + DoCast(pTarget, SPELL_FROST_BREATH, true); } } } @@ -1177,7 +1177,7 @@ struct mob_frost_wyrmAI : public hyjal_trashAI { if (!m_creature->IsWithinDist(m_creature->getVictim(), 25)) { - DoCast(m_creature->getVictim(),SPELL_FROST_BREATH); + DoCast(m_creature->getVictim(), SPELL_FROST_BREATH); m_creature->StopMoving(); m_creature->GetMotionMaster()->Clear(); FrostBreathTimer = 4000; @@ -1229,7 +1229,7 @@ struct mob_gargoyleAI : public hyjal_trashAI if (pTarget && pTarget->isAlive()) { m_creature->AddThreat(pTarget,0.0); - DoCast(pTarget,SPELL_GARGOYLE_STRIKE,true); + DoCast(pTarget, SPELL_GARGOYLE_STRIKE, true); } } } @@ -1310,7 +1310,7 @@ struct mob_gargoyleAI : public hyjal_trashAI { if (m_creature->IsWithinDist(m_creature->getVictim(), 20)) { - DoCast(m_creature->getVictim(),SPELL_GARGOYLE_STRIKE); + DoCast(m_creature->getVictim(), SPELL_GARGOYLE_STRIKE); m_creature->StopMoving(); m_creature->GetMotionMaster()->Clear(); StrikeTimer = 2000+rand()%1000; diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp index 0be16f06706..9ab23ad453c 100644 --- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp +++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp @@ -92,7 +92,7 @@ struct TRINITY_DLL_DECL boss_epoch_hunterAI : public ScriptedAI if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(false); - DoCast(m_creature->getVictim(),SPELL_SAND_BREATH); + DoCast(m_creature->getVictim(), SPELL_SAND_BREATH); DoScriptText(RAND(SAY_BREATH1,SAY_BREATH2), m_creature); @@ -101,20 +101,20 @@ struct TRINITY_DLL_DECL boss_epoch_hunterAI : public ScriptedAI if (ImpendingDeath_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_IMPENDING_DEATH); + DoCast(m_creature->getVictim(), SPELL_IMPENDING_DEATH); ImpendingDeath_Timer = 25000+rand()%5000; } else ImpendingDeath_Timer -= diff; if (WingBuffet_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_WING_BUFFET); + DoCast(pTarget, SPELL_WING_BUFFET); WingBuffet_Timer = 25000+rand()%10000; } else WingBuffet_Timer -= diff; if (Mda_Timer <= diff) { - DoCast(m_creature,SPELL_MAGIC_DISRUPTION_AURA); + DoCast(m_creature, SPELL_MAGIC_DISRUPTION_AURA); Mda_Timer = 15000; } else Mda_Timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/darkshore.cpp b/src/bindings/scripts/scripts/kalimdor/darkshore.cpp index 992cd2d4dc3..73caa2098ad 100644 --- a/src/bindings/scripts/scripts/kalimdor/darkshore.cpp +++ b/src/bindings/scripts/scripts/kalimdor/darkshore.cpp @@ -110,7 +110,7 @@ struct TRINITY_DLL_DECL npc_kerlonianAI : public FollowerAI DoScriptText(RAND(SAY_KER_SLEEP_1,SAY_KER_SLEEP_2,SAY_KER_SLEEP_3,SAY_KER_SLEEP_4), m_creature); m_creature->SetStandState(UNIT_STAND_STATE_SLEEP); - m_creature->CastSpell(m_creature, SPELL_SLEEP_VISUAL, false); + DoCast(m_creature, SPELL_SLEEP_VISUAL, false); } void ClearSleeping() diff --git a/src/bindings/scripts/scripts/kalimdor/desolace.cpp b/src/bindings/scripts/scripts/kalimdor/desolace.cpp index 3d7676994c4..5dfe86acee4 100644 --- a/src/bindings/scripts/scripts/kalimdor/desolace.cpp +++ b/src/bindings/scripts/scripts/kalimdor/desolace.cpp @@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL npc_aged_dying_ancient_kodoAI : public ScriptedAI DoScriptText(RAND(SAY_SMEED_HOME_1,SAY_SMEED_HOME_2,SAY_SMEED_HOME_3), pWho); //spell have no implemented effect (dummy), so useful to notify spellHit - m_creature->CastSpell(m_creature,SPELL_KODO_KOMBO_GOSSIP,true); + DoCast(m_creature, SPELL_KODO_KOMBO_GOSSIP, true); } } } diff --git a/src/bindings/scripts/scripts/kalimdor/dustwallow_marsh.cpp b/src/bindings/scripts/scripts/kalimdor/dustwallow_marsh.cpp index 0490b4a4386..60c7eb313bc 100644 --- a/src/bindings/scripts/scripts/kalimdor/dustwallow_marsh.cpp +++ b/src/bindings/scripts/scripts/kalimdor/dustwallow_marsh.cpp @@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL mobs_risen_husk_spiritAI : public ScriptedAI if (pDoneBy->GetTypeId() == TYPEID_PLAYER) { if (damage >= m_creature->GetHealth() && CAST_PLR(pDoneBy)->GetQuestStatus(QUEST_WHATS_HAUNTING_WITCH_HILL) == QUEST_STATUS_INCOMPLETE) - m_creature->CastSpell(pDoneBy, SPELL_SUMMON_RESTLESS_APPARITION, false); + DoCast(pDoneBy, SPELL_SUMMON_RESTLESS_APPARITION, false); } } diff --git a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp index 3aeff41e335..2aa4e8ed811 100644 --- a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp +++ b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp @@ -60,14 +60,14 @@ struct TRINITY_DLL_DECL celebras_the_cursedAI : public ScriptedAI Unit *pTarget = NULL; pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); if (pTarget) - DoCast(pTarget,SPELL_WRATH); + DoCast(pTarget, SPELL_WRATH); Wrath_Timer = 8000; } else Wrath_Timer -= diff; //EntanglingRoots if (EntanglingRoots_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ENTANGLINGROOTS); + DoCast(m_creature->getVictim(), SPELL_ENTANGLINGROOTS); EntanglingRoots_Timer = 20000; } else EntanglingRoots_Timer -= diff; @@ -75,7 +75,7 @@ struct TRINITY_DLL_DECL celebras_the_cursedAI : public ScriptedAI if (CorruptForces_Timer <= diff) { m_creature->InterruptNonMeleeSpells(false); - DoCast(m_creature,SPELL_CORRUPT_FORCES); + DoCast(m_creature, SPELL_CORRUPT_FORCES); CorruptForces_Timer = 20000; } else CorruptForces_Timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_landslide.cpp b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_landslide.cpp index 6c27f7a253d..18e118c948f 100644 --- a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_landslide.cpp +++ b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_landslide.cpp @@ -54,14 +54,14 @@ struct TRINITY_DLL_DECL boss_landslideAI : public ScriptedAI //KnockAway_Timer if (KnockAway_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_KNOCKAWAY); + DoCast(m_creature->getVictim(), SPELL_KNOCKAWAY); KnockAway_Timer = 15000; } else KnockAway_Timer -= diff; //Trample_Timer if (Trample_Timer <= diff) { - DoCast(m_creature,SPELL_TRAMPLE); + DoCast(m_creature, SPELL_TRAMPLE); Trample_Timer = 8000; } else Trample_Timer -= diff; @@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_landslideAI : public ScriptedAI if (Landslide_Timer <= diff) { m_creature->InterruptNonMeleeSpells(false); - DoCast(m_creature,SPELL_LANDSLIDE); + DoCast(m_creature, SPELL_LANDSLIDE); Landslide_Timer = 60000; } else Landslide_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_noxxion.cpp b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_noxxion.cpp index d573b118d3e..5ba61379e3e 100644 --- a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_noxxion.cpp +++ b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_noxxion.cpp @@ -80,14 +80,14 @@ struct TRINITY_DLL_DECL boss_noxxionAI : public ScriptedAI //ToxicVolley_Timer if (ToxicVolley_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_TOXICVOLLEY); + DoCast(m_creature->getVictim(), SPELL_TOXICVOLLEY); ToxicVolley_Timer = 9000; } else ToxicVolley_Timer -= diff; //Uppercut_Timer if (Uppercut_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_UPPERCUT); + DoCast(m_creature->getVictim(), SPELL_UPPERCUT); Uppercut_Timer = 12000; } else Uppercut_Timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_princess_theradras.cpp b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_princess_theradras.cpp index d7b575744a5..3f17ed139a4 100644 --- a/src/bindings/scripts/scripts/kalimdor/maraudon/boss_princess_theradras.cpp +++ b/src/bindings/scripts/scripts/kalimdor/maraudon/boss_princess_theradras.cpp @@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL boss_ptheradrasAI : public ScriptedAI //Dustfield_Timer if (Dustfield_Timer <= diff) { - DoCast(m_creature,SPELL_DUSTFIELD); + DoCast(m_creature, SPELL_DUSTFIELD); Dustfield_Timer = 14000; } else Dustfield_Timer -= diff; @@ -72,21 +72,21 @@ struct TRINITY_DLL_DECL boss_ptheradrasAI : public ScriptedAI Unit *pTarget = NULL; pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); if (pTarget) - DoCast(pTarget,SPELL_BOULDER); + DoCast(pTarget, SPELL_BOULDER); Boulder_Timer = 10000; } else Boulder_Timer -= diff; //RepulsiveGaze_Timer if (RepulsiveGaze_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_REPULSIVEGAZE); + DoCast(m_creature->getVictim(), SPELL_REPULSIVEGAZE); RepulsiveGaze_Timer = 20000; } else RepulsiveGaze_Timer -= diff; //Thrash_Timer if (Thrash_Timer <= diff) { - DoCast(m_creature,SPELL_THRASH); + DoCast(m_creature, SPELL_THRASH); Thrash_Timer = 18000; } else Thrash_Timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/orgrimmar.cpp b/src/bindings/scripts/scripts/kalimdor/orgrimmar.cpp index f68e5ad6e5f..1a7e8b1e49e 100644 --- a/src/bindings/scripts/scripts/kalimdor/orgrimmar.cpp +++ b/src/bindings/scripts/scripts/kalimdor/orgrimmar.cpp @@ -194,13 +194,13 @@ struct TRINITY_DLL_DECL npc_thrall_warchiefAI : public ScriptedAI if (ChainLightning_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CHAIN_LIGHTNING); + DoCast(m_creature->getVictim(), SPELL_CHAIN_LIGHTNING); ChainLightning_Timer = 9000; } else ChainLightning_Timer -= diff; if (Shock_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHOCK); + DoCast(m_creature->getVictim(), SPELL_SHOCK); Shock_Timer = 15000; } else Shock_Timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp b/src/bindings/scripts/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp index 1e438bd38eb..ffcdf84b672 100644 --- a/src/bindings/scripts/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp +++ b/src/bindings/scripts/scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp @@ -73,27 +73,27 @@ struct TRINITY_DLL_DECL boss_amnennar_the_coldbringerAI : public ScriptedAI //AmnenarsWrath_Timer if (AmnenarsWrath_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_AMNENNARSWRATH); + DoCast(m_creature->getVictim(), SPELL_AMNENNARSWRATH); AmnenarsWrath_Timer = 12000; } else AmnenarsWrath_Timer -= diff; //FrostBolt_Timer if (FrostBolt_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FROSTBOLT); + DoCast(m_creature->getVictim(), SPELL_FROSTBOLT); FrostBolt_Timer = 8000; } else FrostBolt_Timer -= diff; if (FrostNova_Timer <= diff) { - DoCast(m_creature,SPELL_FROST_NOVA); + DoCast(m_creature, SPELL_FROST_NOVA); FrostNova_Timer = 15000; } else FrostNova_Timer -= diff; if (!Spectrals60 && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 60) { DoScriptText(SAY_SUMMON60, m_creature); - DoCast(m_creature->getVictim(),SPELL_FROST_SPECTRES); + DoCast(m_creature->getVictim(), SPELL_FROST_SPECTRES); Spectrals60 = true; } @@ -106,7 +106,7 @@ struct TRINITY_DLL_DECL boss_amnennar_the_coldbringerAI : public ScriptedAI if (!Spectrals30 && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 30) { DoScriptText(SAY_SUMMON30, m_creature); - DoCast(m_creature->getVictim(),SPELL_FROST_SPECTRES); + DoCast(m_creature->getVictim(), SPELL_FROST_SPECTRES); Spectrals30 = true; } diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp index eb87f7fa76d..4c20a79ad5f 100644 --- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp +++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp @@ -92,21 +92,21 @@ struct TRINITY_DLL_DECL boss_ayamissAI : public ScriptedAI //STINGERSPRAY_Timer (only in phase2) if (phase==2 && STINGERSPRAY_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_STINGERSPRAY); + DoCast(m_creature->getVictim(), SPELL_STINGERSPRAY); STINGERSPRAY_Timer = 30000; } else STINGERSPRAY_Timer -= diff; //POISONSTINGER_Timer (only in phase1) if (phase==1 && POISONSTINGER_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_POISONSTINGER); + DoCast(m_creature->getVictim(), SPELL_POISONSTINGER); POISONSTINGER_Timer = 30000; } else POISONSTINGER_Timer -= diff; //SUMMONSWARMER_Timer (only in phase1) if (SUMMONSWARMER_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SUMMONSWARMER); + DoCast(m_creature->getVictim(), SPELL_SUMMONSWARMER); SUMMONSWARMER_Timer = 60000; } else SUMMONSWARMER_Timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp index bed7a5ed20c..9e3ec3be6b6 100644 --- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp +++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp @@ -84,28 +84,28 @@ struct TRINITY_DLL_DECL boss_kurinnaxxAI : public ScriptedAI if (!bIsEnraged && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 30 && !m_creature->IsNonMeleeSpellCasted(false)) { bIsEnraged = true; - DoCast(m_creature,SPELL_ENRAGE); + DoCast(m_creature, SPELL_ENRAGE); } //Mortal Wound spell if (uiMortalWoundTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MORTALWOUND); - uiMortalWoundTimer = urand(2000,7000);; + DoCast(m_creature->getVictim(), SPELL_MORTALWOUND); + uiMortalWoundTimer = urand(2000,7000); } else uiMortalWoundTimer -= diff; //Santrap spell if (uiSandtrapTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_SANDTRAP); + DoCast(pTarget, SPELL_SANDTRAP); uiSandtrapTimer = 30000; } else uiSandtrapTimer -= diff; //Wide Slash spell if (uiWideSlashTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_WIDE_SLASH); + DoCast(m_creature->getVictim(), SPELL_WIDE_SLASH); uiWideSlashTimer = urand(10000,15000); } else uiWideSlashTimer -= diff; @@ -120,7 +120,7 @@ struct TRINITY_DLL_DECL boss_kurinnaxxAI : public ScriptedAI if (uiSummonPlayerTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_SUMMON_PLAYER); + DoCast(pTarget, SPELL_SUMMON_PLAYER); uiSummonPlayerTimer = urand(30000,40000); } else uiSummonPlayerTimer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp index b2ae29100f4..b26392eaa71 100644 --- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp +++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp @@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL boss_moamAI : public ScriptedAI { for (uint8 i=0;i<6;++i) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { pTarget->ModifyPower(POWER_MANA, -500); m_creature->ModifyPower(POWER_MANA, 1000); @@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL boss_moamAI : public ScriptedAI //If we are 100%MANA cast Arcane Erruption if (m_creature->GetPower(POWER_MANA) == m_creature->GetMaxPower(POWER_MANA)) { - DoCast(m_creature->getVictim(),SPELL_ARCANEERUPTION); + DoCast(m_creature->getVictim(), SPELL_ARCANEERUPTION); DoScriptText(EMOTE_MANA_FULL, m_creature); m_creature->SetPower(POWER_MANA,0); } @@ -120,7 +120,7 @@ struct TRINITY_DLL_DECL boss_moamAI : public ScriptedAI //Trample Spell if (uiTrampleTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_TRAMPLE); + DoCast(m_creature->getVictim(), SPELL_TRAMPLE); uiTrampleTimer = urand(3000,7000); } else uiTrampleTimer -= diff; @@ -137,10 +137,10 @@ struct TRINITY_DLL_DECL boss_moamAI : public ScriptedAI if (uiPhaseTimer <= diff) { Phase = STONE; - DoCast(m_creature,SPELL_SUMMONMANA); - DoCast(m_creature,SPELL_SUMMONMANA); - DoCast(m_creature,SPELL_SUMMONMANA); - DoCast(m_creature,SPELL_GRDRSLEEP); + DoCast(m_creature, SPELL_SUMMONMANA); + DoCast(m_creature, SPELL_SUMMONMANA); + DoCast(m_creature, SPELL_SUMMONMANA); + DoCast(m_creature, SPELL_GRDRSLEEP); } else uiPhaseTimer -= diff; } } diff --git a/src/bindings/scripts/scripts/kalimdor/silithus.cpp b/src/bindings/scripts/scripts/kalimdor/silithus.cpp index b1884d6c242..f77e4aacb38 100644 --- a/src/bindings/scripts/scripts/kalimdor/silithus.cpp +++ b/src/bindings/scripts/scripts/kalimdor/silithus.cpp @@ -632,19 +632,19 @@ struct TRINITY_DLL_DECL npc_anachronos_the_ancientAI : public ScriptedAI Caelestrasz->GetMotionMaster()->MoveCharge(-8165,1530,65,7); break; //Text: sands will stop case 34: - m_creature->CastSpell(plr, 23017, true);//Arcane Channeling + DoCast(plr, 23017, true);//Arcane Channeling break; case 35: m_creature->CastSpell(-8088,1520.43,2.67,25158,true); break; case 36: - m_creature->CastSpell(plr, 25159, true); + DoCast(plr, 25159, true); break; case 37: m_creature->SummonGameObject(GO_GATE_OF_AHN_QIRAJ,-8130,1525,17.5,0,0,0,0,0,0); break; case 38: - m_creature->CastSpell(plr, 25166, true); + DoCast(plr, 25166, true); m_creature->SummonGameObject(GO_GLYPH_OF_AHN_QIRAJ,-8130,1525,17.5,0,0,0,0,0,0); break; case 39: diff --git a/src/bindings/scripts/scripts/kalimdor/tanaris.cpp b/src/bindings/scripts/scripts/kalimdor/tanaris.cpp index 19f8b3c003d..31286f91573 100644 --- a/src/bindings/scripts/scripts/kalimdor/tanaris.cpp +++ b/src/bindings/scripts/scripts/kalimdor/tanaris.cpp @@ -111,13 +111,13 @@ struct TRINITY_DLL_DECL mob_aquementasAI : public ScriptedAI if (FrostShock_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FROST_SHOCK); + DoCast(m_creature->getVictim(), SPELL_FROST_SHOCK); FrostShock_Timer = 15000; } else FrostShock_Timer -= diff; if (AquaJet_Timer <= diff) { - DoCast(m_creature,SPELL_AQUA_JET); + DoCast(m_creature, SPELL_AQUA_JET); AquaJet_Timer = 15000; } else AquaJet_Timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp index a34a83d7ba8..71bac43ab86 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp @@ -85,20 +85,20 @@ struct TRINITY_DLL_DECL boss_kriAI : public ScriptedAI //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 5000 + rand()%7000; } else Cleave_Timer -= diff; //ToxicVolley_Timer if (ToxicVolley_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_TOXIC_VOLLEY); + DoCast(m_creature->getVictim(), SPELL_TOXIC_VOLLEY); ToxicVolley_Timer = 10000 + rand()%5000; } else ToxicVolley_Timer -= diff; if (m_creature->GetHealth() <= m_creature->GetMaxHealth() * 0.05 && !Death) { - DoCast(m_creature->getVictim(),SPELL_POISON_CLOUD); + DoCast(m_creature->getVictim(), SPELL_POISON_CLOUD); Death = true; } @@ -184,7 +184,7 @@ struct TRINITY_DLL_DECL boss_vemAI : public ScriptedAI //KnockBack_Timer if (KnockBack_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_KNOCKBACK); + DoCast(m_creature->getVictim(), SPELL_KNOCKBACK); if (DoGetThreat(m_creature->getVictim())) DoModifyThreatPercent(m_creature->getVictim(),-80); KnockBack_Timer = 15000 + rand()%10000; @@ -193,7 +193,7 @@ struct TRINITY_DLL_DECL boss_vemAI : public ScriptedAI //Enrage_Timer if (!Enraged && Enrage_Timer <= diff) { - DoCast(m_creature,SPELL_ENRAGE); + DoCast(m_creature, SPELL_ENRAGE); Enraged = true; } else Charge_Timer -= diff; @@ -257,7 +257,7 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI //Fear_Timer if (Fear_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FEAR); + DoCast(m_creature->getVictim(), SPELL_FEAR); DoResetThreat(); Fear_Timer = 20000; } else Fear_Timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp index 76d0a1f5aaf..b8b80565eb6 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp @@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI if (pTarget) { m_creature->InterruptNonMeleeSpells(false); - DoCast(pTarget,SPELL_GREEN_BEAM); + DoCast(pTarget, SPELL_GREEN_BEAM); //Correctly update our target m_creature->SetUInt64Value(UNIT_FIELD_TARGET, pTarget->GetGUID()); @@ -294,7 +294,7 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI } //Add red coloration to C'thun - DoCast(m_creature,SPELL_RED_COLORATION); + DoCast(m_creature, SPELL_RED_COLORATION); //Freeze animation @@ -322,7 +322,7 @@ struct TRINITY_DLL_DECL eye_of_cthunAI : public Scripted_NoMovementAI m_creature->StopMoving(); //Actual dark glare cast, maybe something missing here? - m_creature->CastSpell(m_creature, SPELL_DARK_GLARE, false); + DoCast(m_creature, SPELL_DARK_GLARE, false); //Increase tick ++DarkGlareTick; @@ -962,7 +962,7 @@ struct TRINITY_DLL_DECL eye_tentacleAI : public ScriptedAI { Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID)) - DoCast(pTarget,SPELL_MIND_FLAY); + DoCast(pTarget, SPELL_MIND_FLAY); //Mindflay every 10 seconds MindflayTimer = 10000; @@ -1045,14 +1045,14 @@ struct TRINITY_DLL_DECL claw_tentacleAI : public ScriptedAI //GroundRuptureTimer if (GroundRuptureTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_GROUND_RUPTURE); + DoCast(m_creature->getVictim(), SPELL_GROUND_RUPTURE); GroundRuptureTimer = 30000; } else GroundRuptureTimer -= diff; //HamstringTimer if (HamstringTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_HAMSTRING); + DoCast(m_creature->getVictim(), SPELL_HAMSTRING); HamstringTimer = 5000; } else HamstringTimer -= diff; @@ -1139,21 +1139,21 @@ struct TRINITY_DLL_DECL giant_claw_tentacleAI : public ScriptedAI //GroundRuptureTimer if (GroundRuptureTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_GROUND_RUPTURE); + DoCast(m_creature->getVictim(), SPELL_GROUND_RUPTURE); GroundRuptureTimer = 30000; } else GroundRuptureTimer -= diff; //ThrashTimer if (ThrashTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_THRASH); + DoCast(m_creature->getVictim(), SPELL_THRASH); ThrashTimer = 10000; } else ThrashTimer -= diff; //HamstringTimer if (HamstringTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_HAMSTRING); + DoCast(m_creature->getVictim(), SPELL_HAMSTRING); HamstringTimer = 10000; } else HamstringTimer -= diff; @@ -1202,7 +1202,7 @@ struct TRINITY_DLL_DECL giant_eye_tentacleAI : public ScriptedAI { Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID)) - DoCast(pTarget,SPELL_GREEN_BEAM); + DoCast(pTarget, SPELL_GREEN_BEAM); //Beam every 2 seconds BeamTimer = 2100; diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp index 619961c32d9..b504425c033 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_fankriss.cpp @@ -93,7 +93,7 @@ struct TRINITY_DLL_DECL boss_fankrissAI : public ScriptedAI //MortalWound_Timer if (MortalWound_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MORTAL_WOUND); + DoCast(m_creature->getVictim(), SPELL_MORTAL_WOUND); MortalWound_Timer = 10000 + rand()%10000; } else MortalWound_Timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp index cc312c87584..a862f075742 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_huhuran.cpp @@ -84,21 +84,21 @@ struct TRINITY_DLL_DECL boss_huhuranAI : public ScriptedAI if (Wyvern_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_WYVERNSTING); + DoCast(pTarget, SPELL_WYVERNSTING); Wyvern_Timer = 15000 + rand()%17000; } else Wyvern_Timer -= diff; //Spit Timer if (Spit_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ACIDSPIT); + DoCast(m_creature->getVictim(), SPELL_ACIDSPIT); Spit_Timer = 5000 + rand()%5000; } else Spit_Timer -= diff; //NoxiousPoison_Timer if (NoxiousPoison_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_NOXIOUSPOISON); + DoCast(m_creature->getVictim(), SPELL_NOXIOUSPOISON); NoxiousPoison_Timer = 12000 + rand()%12000; } else NoxiousPoison_Timer -= diff; @@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL boss_huhuranAI : public ScriptedAI { if (PoisonBolt_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_POISONBOLT); + DoCast(m_creature->getVictim(), SPELL_POISONBOLT); PoisonBolt_Timer = 3000; } else PoisonBolt_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp index 3affe840b41..d37f299cb06 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp @@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI //EarthShock_Timer if (EarthShock_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_EARTH_SHOCK); + DoCast(m_creature->getVictim(), SPELL_EARTH_SHOCK); EarthShock_Timer = 1000; } else EarthShock_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp index 6da332cc6f0..1ff205162a4 100644 --- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp +++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp @@ -437,7 +437,7 @@ struct TRINITY_DLL_DECL boss_veknilashAI : public boss_twinemperorsAI //UnbalancingStrike_Timer if (UnbalancingStrike_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_UNBALANCING_STRIKE); + DoCast(m_creature->getVictim(), SPELL_UNBALANCING_STRIKE); UnbalancingStrike_Timer = 8000+rand()%12000; } else UnbalancingStrike_Timer -= diff; @@ -445,7 +445,7 @@ struct TRINITY_DLL_DECL boss_veknilashAI : public boss_twinemperorsAI { Unit* randomMelee = SelectTarget(SELECT_TARGET_RANDOM, 0, NOMINAL_MELEE_RANGE, true); if (randomMelee) - DoCast(randomMelee,SPELL_UPPERCUT); + DoCast(randomMelee, SPELL_UPPERCUT); UpperCut_Timer = 15000+rand()%15000; } else UpperCut_Timer -= diff; @@ -485,7 +485,7 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI { TwinReset(); ShadowBolt_Timer = 0; - Blizzard_Timer = 15000 + rand()%5000;; + Blizzard_Timer = 15000 + rand()%5000; ArcaneBurst_Timer = 1000; Scorpions_Timer = 7000 + rand()%7000; @@ -530,7 +530,7 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI if (!m_creature->IsWithinDist(m_creature->getVictim(), 45.0f)) m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), VEKLOR_DIST, 0); else - DoCast(m_creature->getVictim(),SPELL_SHADOWBOLT); + DoCast(m_creature->getVictim(), SPELL_SHADOWBOLT); ShadowBolt_Timer = 2000; } else ShadowBolt_Timer -= diff; @@ -540,7 +540,7 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI Unit *pTarget = NULL; pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45, true); if (pTarget) - DoCast(pTarget,SPELL_BLIZZARD); + DoCast(pTarget, SPELL_BLIZZARD); Blizzard_Timer = 15000+rand()%15000; } else Blizzard_Timer -= diff; @@ -549,7 +549,7 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI Unit *mvic; if ((mvic=SelectTarget(SELECT_TARGET_NEAREST, 0, NOMINAL_MELEE_RANGE, true))!=NULL) { - DoCast(mvic,SPELL_ARCANEBURST); + DoCast(mvic, SPELL_ARCANEBURST); ArcaneBurst_Timer = 5000; } } else ArcaneBurst_Timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp b/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp index e97e129a65b..bc8590b9308 100644 --- a/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp +++ b/src/bindings/scripts/scripts/kalimdor/thousand_needles.cpp @@ -288,7 +288,7 @@ struct TRINITY_DLL_DECL npc_pluckyAI : public ScriptedAI if (m_creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - m_creature->CastSpell(m_creature, SPELL_PLUCKY_CHICKEN, false); + DoCast(m_creature, SPELL_PLUCKY_CHICKEN, false); } void ReceiveEmote(Player* pPlayer, uint32 uiTextEmote) @@ -299,7 +299,7 @@ struct TRINITY_DLL_DECL npc_pluckyAI : public ScriptedAI { m_creature->setFaction(FACTION_FRIENDLY); m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - m_creature->CastSpell(m_creature, SPELL_PLUCKY_HUMAN, false); + DoCast(m_creature, SPELL_PLUCKY_HUMAN, false); } } @@ -311,7 +311,7 @@ struct TRINITY_DLL_DECL npc_pluckyAI : public ScriptedAI { m_creature->setFaction(FACTION_FRIENDLY); m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - m_creature->CastSpell(m_creature, SPELL_PLUCKY_HUMAN, false); + DoCast(m_creature, SPELL_PLUCKY_HUMAN, false); m_creature->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); } } diff --git a/src/bindings/scripts/scripts/kalimdor/thunder_bluff.cpp b/src/bindings/scripts/scripts/kalimdor/thunder_bluff.cpp index ae2a7e8e123..94b809f1280 100644 --- a/src/bindings/scripts/scripts/kalimdor/thunder_bluff.cpp +++ b/src/bindings/scripts/scripts/kalimdor/thunder_bluff.cpp @@ -65,31 +65,31 @@ struct TRINITY_DLL_DECL npc_cairne_bloodhoofAI : public ScriptedAI { Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); if (pTarget) - DoCast(pTarget,SPELL_BERSERKER_CHARGE); + DoCast(pTarget, SPELL_BERSERKER_CHARGE); BerserkerCharge_Timer = 25000; } else BerserkerCharge_Timer -= diff; if (Uppercut_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_UPPERCUT); + DoCast(m_creature->getVictim(), SPELL_UPPERCUT); Uppercut_Timer = 20000; } else Uppercut_Timer -= diff; if (Thunderclap_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_THUNDERCLAP); + DoCast(m_creature->getVictim(), SPELL_THUNDERCLAP); Thunderclap_Timer = 15000; } else Thunderclap_Timer -= diff; if (MortalStrike_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MORTAL_STRIKE); + DoCast(m_creature->getVictim(), SPELL_MORTAL_STRIKE); MortalStrike_Timer = 15000; } else MortalStrike_Timer -= diff; if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 7000; } else Cleave_Timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp b/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp index 7f1adaa0443..4d591b46b63 100644 --- a/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp +++ b/src/bindings/scripts/scripts/kalimdor/ungoro_crater.cpp @@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI if (DEMORALIZINGSHOUT_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_DEMORALIZINGSHOUT); + DoCast(m_creature->getVictim(), SPELL_DEMORALIZINGSHOUT); DEMORALIZINGSHOUT_Timer = 70000; } else DEMORALIZINGSHOUT_Timer -= diff; diff --git a/src/bindings/scripts/scripts/kalimdor/zulfarrak/zulfarrak.cpp b/src/bindings/scripts/scripts/kalimdor/zulfarrak/zulfarrak.cpp index 1de76c43816..da9347bfb42 100644 --- a/src/bindings/scripts/scripts/kalimdor/zulfarrak/zulfarrak.cpp +++ b/src/bindings/scripts/scripts/kalimdor/zulfarrak/zulfarrak.cpp @@ -82,13 +82,13 @@ struct TRINITY_DLL_DECL npc_sergeant_blyAI : public ScriptedAI if (ShieldBash_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHIELD_BASH); + DoCast(m_creature->getVictim(), SPELL_SHIELD_BASH); ShieldBash_Timer = 15000; } else ShieldBash_Timer -= diff; if (Revenge_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_REVENGE); + DoCast(m_creature->getVictim(), SPELL_REVENGE); Revenge_Timer = 10000; } else Revenge_Timer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp index 58115b7e0fc..f33ebdf15ff 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_amanitar.cpp @@ -101,7 +101,7 @@ struct MANGOS_DLL_DECL boss_amanitarAI : public ScriptedAI if (pInstance) pInstance->SetData(DATA_AMANITAR_EVENT, IN_PROGRESS); - m_creature->CastSpell(m_creature, SPELL_MINI, false); + DoCast(m_creature, SPELL_MINI, false); } void SpawnAdds() @@ -187,7 +187,7 @@ struct MANGOS_DLL_DECL mob_amanitar_mushroomsAI : public Scripted_NoMovementAI if (m_creature->GetEntry() == NPC_HEALTHY_MUSHROOM && killer->GetTypeId() == TYPEID_PLAYER) { m_creature->InterruptNonMeleeSpells(false); - m_creature->CastSpell(killer, HEALTHY_MUSHROOM_SPELL_POTENT_FUNGUS, false); + DoCast(killer, HEALTHY_MUSHROOM_SPELL_POTENT_FUNGUS, false); } } diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp index cbc44e2e3ad..e3331db689d 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_elder_nadox.cpp @@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI if (plague_Timer <= diff) { - DoCast(m_creature->getVictim(),HEROIC(SPELL_BROOD_PLAGUE, H_SPELL_BROOD_PLAGUE)); + DoCast(m_creature->getVictim(), HEROIC(SPELL_BROOD_PLAGUE, H_SPELL_BROOD_PLAGUE)); plague_Timer = 15000; } else plague_Timer -= diff; @@ -143,15 +143,15 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI if (Swarmer) { - DoCast(Swarmer,H_SPELL_BROOD_RAGE,true); + DoCast(Swarmer, H_SPELL_BROOD_RAGE, true); rage_Timer = 15000; } } else rage_Timer -= diff; if (swarmer_spawn_Timer <= diff) { - DoCast(m_creature,SPELL_SUMMON_SWARMERS,true); - DoCast(m_creature,SPELL_SUMMON_SWARMERS); + DoCast(m_creature, SPELL_SUMMON_SWARMERS, true); + DoCast(m_creature, SPELL_SUMMON_SWARMERS); if (urand(1,3) == 3) // 33% chance of dialog DoScriptText(RAND(SAY_EGG_SAC_1,SAY_EGG_SAC_2), m_creature); @@ -161,7 +161,7 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI if (guard_spawn_Timer <= diff) { m_creature->MonsterTextEmote(EMOTE_HATCHES,m_creature->GetGUID(),true); - DoCast(m_creature,SPELL_SUMMON_SWARM_GUARD); + DoCast(m_creature, SPELL_SUMMON_SWARM_GUARD); guard_spawn_Timer = 25000; } else guard_spawn_Timer -= diff; @@ -174,7 +174,7 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI m_creature->GetHomePosition(x, y, z, o); if (z < 24) if (!m_creature->IsNonMeleeSpellCasted(false)) - DoCast(m_creature,SPELL_ENRAGE,true); + DoCast(m_creature, SPELL_ENRAGE, true); enrage_Timer = 5000; } else enrage_Timer -= diff; @@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL mob_ahnkahar_nerubianAI : public ScriptedAI void Reset() { if (m_creature->GetEntry() == 30176) //magic numbers are bad! - DoCast(m_creature,SPELL_GUARDIAN_AURA,true); + DoCast(m_creature, SPELL_GUARDIAN_AURA, true); sprint_Timer = 10000; } @@ -234,7 +234,7 @@ struct TRINITY_DLL_DECL mob_ahnkahar_nerubianAI : public ScriptedAI if (sprint_Timer <= diff) { - DoCast(m_creature,SPELL_SPRINT); + DoCast(m_creature, SPELL_SPRINT); sprint_Timer = 25000; } else sprint_Timer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp index cd769f074e5..f8fc8285819 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -271,7 +271,7 @@ struct MANGOS_DLL_DECL boss_jedoga_shadowseekerAI : public ScriptedAI DoScriptText(RAND(TEXT_SACRIFICE_2_1, TEXT_SACRIFICE_2_2), m_creature); m_creature->InterruptNonMeleeSpells(false); - m_creature->CastSpell(m_creature, SPELL_GIFT_OF_THE_HERALD, false); + DoCast(m_creature, SPELL_GIFT_OF_THE_HERALD, false); bOpFerok = false; bCanDown = true; @@ -303,7 +303,7 @@ struct MANGOS_DLL_DECL boss_jedoga_shadowseekerAI : public ScriptedAI if (uiCycloneTimer <= diff) { - m_creature->CastSpell(m_creature, HEROIC(SPELL_CYCLONE_STRIKE, SPELL_CYCLONE_STRIKE_H), false); + DoCast(m_creature, HEROIC(SPELL_CYCLONE_STRIKE, SPELL_CYCLONE_STRIKE_H), false); uiCycloneTimer = urand(15000,30000); } else uiCycloneTimer -= diff; @@ -363,7 +363,7 @@ struct MANGOS_DLL_DECL mob_jedoga_initiandAI : public ScriptedAI } else { - m_creature->CastSpell(m_creature, SPELL_SPHERE_VISUAL, false); + DoCast(m_creature, SPELL_SPHERE_VISUAL, false); m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, true); m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE + UNIT_FLAG_NON_ATTACKABLE); @@ -461,7 +461,7 @@ struct MANGOS_DLL_DECL mob_jedoga_initiandAI : public ScriptedAI } if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS && !m_creature->HasAura(SPELL_SPHERE_VISUAL)) { - m_creature->CastSpell(m_creature, SPELL_SPHERE_VISUAL, false); + DoCast(m_creature, SPELL_SPHERE_VISUAL, false); m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, true); m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE + UNIT_FLAG_NON_ATTACKABLE); @@ -533,7 +533,7 @@ struct MANGOS_DLL_DECL npc_jedogas_aufseher_triggerAI : public Scripted_NoMoveme } if (!casted) { - m_creature->CastSpell(m_creature, SPELL_BEAM_VISUAL_JEDOGAS_AUFSEHER_1, false); + DoCast(m_creature, SPELL_BEAM_VISUAL_JEDOGAS_AUFSEHER_1, false); casted = true; } } @@ -541,7 +541,7 @@ struct MANGOS_DLL_DECL npc_jedogas_aufseher_triggerAI : public Scripted_NoMoveme { if (!casted2 && pInstance->GetData(DATA_JEDOGA_TRIGGER_SWITCH)) { - m_creature->CastSpell(m_creature, SPELL_BEAM_VISUAL_JEDOGAS_AUFSEHER_2, false); + DoCast(m_creature, SPELL_BEAM_VISUAL_JEDOGAS_AUFSEHER_2, false); casted2 = true; } if (casted2 && !pInstance->GetData(DATA_JEDOGA_TRIGGER_SWITCH)) diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp index a9dfeaf9675..d277957b84d 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp @@ -183,7 +183,7 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI break; case VANISHED: if(pEmbraceTarget) - DoCast(pEmbraceTarget,HEROIC(SPELL_EMBRACE_OF_THE_VAMPYR, H_SPELL_EMBRACE_OF_THE_VAMPYR)); + DoCast(pEmbraceTarget, HEROIC(SPELL_EMBRACE_OF_THE_VAMPYR, H_SPELL_EMBRACE_OF_THE_VAMPYR)); m_creature->GetMotionMaster()->Clear(); m_creature->SetSpeed(MOVE_WALK, 1.0f, true); m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim()); @@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI case NORMAL: if (uiBloodthirstTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_BLOODTHIRST); + DoCast(m_creature->getVictim(), SPELL_BLOODTHIRST); uiBloodthirstTimer = 10000; } else uiBloodthirstTimer -= diff; @@ -228,7 +228,7 @@ struct TRINITY_DLL_DECL boss_taldaramAI : public ScriptedAI if (target_list.size() > 2) { DoScriptText(RAND(SAY_VANISH_1,SAY_VANISH_2), m_creature); - DoCast(m_creature,SPELL_VANISH); + DoCast(m_creature, SPELL_VANISH); Phase = JUST_VANISHED; uiPhaseTimer = 500; pEmbraceTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp index da31a76afe6..4cc9169610f 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_anubarak.cpp @@ -134,7 +134,7 @@ struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI if (Channeling == true) { - for(int ind = 0 ; ind < 4; ind++) m_creature->CastSpell(m_creature->getVictim(),SPELL_SUMMON_CARRION_BEETLES,true); + for(int ind = 0 ; ind < 4; ind++) DoCast(m_creature->getVictim(), SPELL_SUMMON_CARRION_BEETLES, true); Channeling = false; } @@ -226,7 +226,7 @@ struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI { if (SPELL_LEECHING_SWARM_Timer <= diff) { - m_creature->CastSpell(m_creature,SPELL_LEECHING_SWARM,true); + DoCast(m_creature, SPELL_LEECHING_SWARM, true); SPELL_LEECHING_SWARM_Timer = 19000; } else SPELL_LEECHING_SWARM_Timer -= diff; @@ -234,14 +234,14 @@ struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI if (SPELL_CARRION_BEETLES_Timer <= diff) { Channeling = true; - m_creature->CastSpell(m_creature->getVictim(),SPELL_CARRION_BEETLES,false); + DoCast(m_creature->getVictim(), SPELL_CARRION_BEETLES, false); SPELL_CARRION_BEETLES_Timer = 25000; } else SPELL_CARRION_BEETLES_Timer -= diff; if (SPELL_POUND_Timer <= diff) { - DoCast(m_creature->getVictim(), HEROIC(SPELL_POUND,H_SPELL_POUND)); + DoCast(m_creature->getVictim(), HEROIC(SPELL_POUND, H_SPELL_POUND)); SPELL_POUND_Timer = 16500; } else SPELL_POUND_Timer -= diff; @@ -261,7 +261,7 @@ struct TRINITY_DLL_DECL boss_anub_arakAI : public ScriptedAI VENOMANCER_Timer = 25000; DATTER_Timer = 32000; - m_creature->CastSpell(m_creature,SPELL_SUBMERGE,false); + DoCast(m_creature, SPELL_SUBMERGE, false); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); diff --git a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp index 8880daf41e6..ded84a23aae 100644 --- a/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/bindings/scripts/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp @@ -168,9 +168,9 @@ struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI if (CurseFatigueTimer <= diff) { - //WowWiki say "Curse of Fatigue-Kirk'thir will cast Curse of Fatigue on 2-3 targets periodically. " - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - Unit *pTarget_1 = SelectUnit(SELECT_TARGET_RANDOM, 1); + //WowWiki say "Curse of Fatigue-Kirk'thir will cast Curse of Fatigue on 2-3 targets periodically." + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + Unit *pTarget_1 = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); DoCast(pTarget, HEROIC(SPELL_CURSE_OF_FATIGUE, H_SPELL_CURSE_OF_FATIGUE)); DoCast(pTarget_1, HEROIC(SPELL_CURSE_OF_FATIGUE, H_SPELL_CURSE_OF_FATIGUE)); @@ -179,7 +179,7 @@ struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI } else CurseFatigueTimer -= diff; if (!m_creature->HasAura(SPELL_FRENZY) && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 10) - m_creature->CastSpell(m_creature,SPELL_FRENZY,true); + DoCast(m_creature, SPELL_FRENZY, true); DoMeleeAttackIfReady(); } @@ -201,7 +201,8 @@ struct TRINITY_DLL_DECL boss_krik_thirAI : public ScriptedAI { Map::PlayerList const &players = pMap->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - itr->getSource()->CompletedAchievement(AchievWatchHimDie); + if (itr->getSource()) + itr->getSource()->CompletedAchievement(AchievWatchHimDie); } } } @@ -255,7 +256,7 @@ struct TRINITY_DLL_DECL npc_anub_ar_skirmisherAI : public ScriptedAI { DoResetThreat(); m_creature->AddThreat(pTarget,1.0f); - DoCast(pTarget,SPELL_CHARGE,true); + DoCast(pTarget, SPELL_CHARGE, true); } ChargeTimer = 15000; @@ -263,7 +264,7 @@ struct TRINITY_DLL_DECL npc_anub_ar_skirmisherAI : public ScriptedAI if (BackstabTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_BACKSTAB); + DoCast(m_creature->getVictim(), SPELL_BACKSTAB); BackstabTimer = 12000; } else BackstabTimer -= diff; @@ -292,7 +293,7 @@ struct TRINITY_DLL_DECL npc_anub_ar_shadowcasterAI : public ScriptedAI if (ShadowBoltTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, HEROIC(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT), true); ShadowBoltTimer = 15000; } else ShadowBoltTimer -= diff; @@ -327,13 +328,13 @@ struct TRINITY_DLL_DECL npc_anub_ar_warriorAI : public ScriptedAI if (StrikeTimer <= diff) { - m_creature->CastSpell(m_creature->getVictim(), SPELL_STRIKE, true); + DoCast(m_creature->getVictim(), SPELL_STRIKE, true); StrikeTimer = 15000; } else StrikeTimer -= diff; if (CleaveTimer <= diff) { - m_creature->CastSpell(m_creature->getVictim(), SPELL_CLEAVE, true); + DoCast(m_creature->getVictim(), SPELL_CLEAVE, true); CleaveTimer = 17000; } else CleaveTimer -= diff; @@ -358,7 +359,7 @@ struct TRINITY_DLL_DECL npc_watcher_gashraAI : public ScriptedAI void EnterCombat(Unit* who) { - m_creature->CastSpell(m_creature,SPELL_ENRAGE,true); + DoCast(m_creature, SPELL_ENRAGE, true); } void UpdateAI(const uint32 diff) @@ -368,8 +369,8 @@ struct TRINITY_DLL_DECL npc_watcher_gashraAI : public ScriptedAI if (WebWrapTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) - m_creature->CastSpell(pTarget, SPELL_WEB_WRAP,true); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_WEB_WRAP, true); WebWrapTimer = 17000; } else WebWrapTimer -= diff; @@ -405,8 +406,8 @@ struct TRINITY_DLL_DECL npc_watcher_narjilAI : public ScriptedAI if (WebWrapTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) - DoCast(pTarget, SPELL_WEB_WRAP,true); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_WEB_WRAP, true); WebWrapTimer = 15000; } else WebWrapTimer -= diff; @@ -448,8 +449,8 @@ struct TRINITY_DLL_DECL npc_watcher_silthikAI : public ScriptedAI if (WebWrapTimer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) - DoCast(pTarget, SPELL_WEB_WRAP,true); + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, SPELL_WEB_WRAP, true); WebWrapTimer = 15000; } else WebWrapTimer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/borean_tundra.cpp b/src/bindings/scripts/scripts/northrend/borean_tundra.cpp index b8bca1882b8..c87c0fbd4df 100644 --- a/src/bindings/scripts/scripts/northrend/borean_tundra.cpp +++ b/src/bindings/scripts/scripts/northrend/borean_tundra.cpp @@ -558,7 +558,7 @@ struct TRINITY_DLL_DECL npc_jennyAI : public ScriptedAI void DamageTaken(Unit* pDone_by, uint32& uiDamage) { - m_creature->CastSpell(m_creature,SPELL_DROP_CRATE,true); + DoCast(m_creature, SPELL_DROP_CRATE, true); } void MoveInLineOfSight(Unit* pWho) @@ -567,7 +567,7 @@ struct TRINITY_DLL_DECL npc_jennyAI : public ScriptedAI { if(CAST_PLR(m_creature->GetOwner())->GetQuestStatus(QUEST_LOADER_UP) == QUEST_STATUS_INCOMPLETE && m_creature->GetAura(SPELL_CRATES_CARRIED)) { - m_creature->CastSpell(CAST_PLR(m_creature->GetOwner()),SPELL_GIVE_JENNY_CREDIT,true); // Maybe is not working. + DoCast(CAST_PLR(m_creature->GetOwner()), SPELL_GIVE_JENNY_CREDIT, true); // Maybe is not working. CAST_PLR(m_creature->GetOwner())->CompleteQuest(QUEST_LOADER_UP); m_creature->DisappearAndDie(); } @@ -714,7 +714,7 @@ struct TRINITY_DLL_DECL npc_nesingwary_trapperAI : public ScriptedAI Phase_Timer = 1000; break; case 8: - m_creature->CastSpell(m_creature,SPELL_TRAPPED,true); + DoCast(m_creature, SPELL_TRAPPED, true); Phase = 0; break; } @@ -901,7 +901,7 @@ struct TRINITY_DLL_DECL npc_nexus_drake_hatchlingAI : public FollowerAI //The sp if (spell->Id == SPELL_DRAKE_HARPOON && caster->GetTypeId() == TYPEID_PLAYER) { pHarpooner = CAST_PLR(caster); - m_creature->CastSpell(m_creature,SPELL_RED_DRAGONBLOOD,true); + DoCast(m_creature, SPELL_RED_DRAGONBLOOD, true); } } @@ -934,7 +934,7 @@ struct TRINITY_DLL_DECL npc_nexus_drake_hatchlingAI : public FollowerAI //The sp pDrakeAI->StartFollow(pHarpooner, 35, NULL); } - m_creature->CastSpell(m_creature, SPELL_SUBDUED, true); + DoCast(m_creature, SPELL_SUBDUED, true); pHarpooner->CastSpell(pHarpooner, SPELL_DRAKE_HATCHLING_SUBDUED, true); m_creature->AttackStop(); diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp index bafc5de6ee0..480694ae3b2 100644 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_novos.cpp @@ -129,7 +129,7 @@ struct TRINITY_DLL_DECL boss_novosAI : public Scripted_NoMovementAI Phase = PHASE_1; uiCrystalHandlerTimer = 30000; uiTimer = 1000; - DoCast(m_creature,SPELL_ARCANE_FIELD); + DoCast(m_creature, SPELL_ARCANE_FIELD); if (pInstance) { for (std::list<uint64>::iterator itr = luiCrystals.begin(); itr != luiCrystals.end(); ++itr) @@ -154,7 +154,7 @@ struct TRINITY_DLL_DECL boss_novosAI : public Scripted_NoMovementAI Creature *pSummon = m_creature->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE,CREATURE_HULKING_CORPSE,CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint.x, AddSpawnPoint.y , AddSpawnPoint.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); pSummon->GetMotionMaster()->MovePoint(0, AddDestinyPoint.x, AddDestinyPoint.y, AddDestinyPoint.z); //If spell is casted stops casting arcane field so no spell casting - //DoCast(m_creature,SPELL_SUMMON_MINIONS); + //DoCast(m_creature, SPELL_SUMMON_MINIONS); uiTimer = 3000; } else uiTimer -= diff; if (uiCrystalHandlerTimer <= diff) diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp index 3c8fc03b323..b7a370639a8 100644 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp @@ -136,7 +136,7 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI if (uiCurseOfLifeTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, HEROIC(SPELL_CURSE_OF_LIFE,H_SPELL_CURSE_OF_LIFE)); + DoCast(pTarget, HEROIC(SPELL_CURSE_OF_LIFE, H_SPELL_CURSE_OF_LIFE)); uiCurseOfLifeTimer = urand(10000,15000); } else uiCurseOfLifeTimer -= diff; @@ -187,14 +187,14 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI if (uiLightningBreathTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,HEROIC(SPELL_LIGHTNING_BREATH,H_SPELL_LIGHTNING_BREATH)); + DoCast(pTarget, HEROIC(SPELL_LIGHTNING_BREATH, H_SPELL_LIGHTNING_BREATH)); uiLightningBreathTimer = urand(6000,7000); } else uiLightningBreathTimer -= diff; if (uiEyeBeamTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,HEROIC(SPELL_EYE_BEAM,H_SPELL_EYE_BEAM)); + DoCast(pTarget, HEROIC(SPELL_EYE_BEAM, H_SPELL_EYE_BEAM)); uiEyeBeamTimer = urand(4000,6000); } else uiEyeBeamTimer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp index db33d3887d2..f2fbbf86f7f 100644 --- a/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp +++ b/src/bindings/scripts/scripts/northrend/draktharon_keep/boss_trollgore.cpp @@ -125,7 +125,7 @@ struct TRINITY_DLL_DECL boss_trollgoreAI : public ScriptedAI if (uiConsumeTimer < diff) { DoScriptText(SAY_CONSUME, m_creature); - DoCast(HEROIC(SPELL_CONSUME,H_SPELL_CONSUME)); + DoCast(HEROIC(SPELL_CONSUME, H_SPELL_CONSUME)); uiConsumeTimer = 15000; } else uiConsumeTimer -= diff; @@ -157,7 +157,7 @@ struct TRINITY_DLL_DECL boss_trollgoreAI : public ScriptedAI if (uiExplodeCorpseTimer < diff) { - DoCast(HEROIC(SPELL_CORPSE_EXPLODE,H_SPELL_CORPSE_EXPLODE)); + DoCast(HEROIC(SPELL_CORPSE_EXPLODE, H_SPELL_CORPSE_EXPLODE)); DoScriptText(SAY_EXPLODE, m_creature); uiExplodeCorpseTimer = urand(15000,19000); } uiExplodeCorpseTimer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_drakkari_colossus.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_drakkari_colossus.cpp index 0bb764570fa..937aeee92b0 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_drakkari_colossus.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_drakkari_colossus.cpp @@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL boss_drakkari_colossusAI : public ScriptedAI { m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->addUnitState(UNIT_STAT_STUNNED); - m_creature->CastSpell(m_creature,SPELL_EMERGE,false); + DoCast(m_creature, SPELL_EMERGE, false); } void UpdateAI(const uint32 diff) @@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL boss_drakkari_colossusAI : public ScriptedAI if (Summoned == false && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 50 && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() > 6) { PrepareToSummonElemental(); - m_creature->CastSpell(m_creature->getVictim(), SPELL_EMERGE_2, true); + DoCast(m_creature->getVictim(), SPELL_EMERGE_2, true); Summoned = true; } @@ -121,7 +121,7 @@ struct TRINITY_DLL_DECL boss_drakkari_colossusAI : public ScriptedAI { if (!m_creature->hasUnitState(UNIT_STAT_STUNNED)) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_MIGHTY_BLOW,true); + DoCast(m_creature->getVictim(), SPELL_MIGHTY_BLOW, true); } MightyBlowTimer = 10000; @@ -179,7 +179,7 @@ struct TRINITY_DLL_DECL boss_drakkari_elementalAI : public ScriptedAI if(GoToColossus == false && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() <= 50) { m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - m_creature->CastSpell(Colossus ,SPELL_MERGE,true); + DoCast(Colossus, SPELL_MERGE, true); GoToColossus = true; PreparationDone = true; @@ -189,7 +189,7 @@ struct TRINITY_DLL_DECL boss_drakkari_elementalAI : public ScriptedAI { m_creature->addUnitState(UNIT_STAT_STUNNED); m_creature->SetVisibility(VISIBILITY_OFF); - m_creature->CastSpell(Colossus ,SPELL_MERGE,true); + DoCast(Colossus, SPELL_MERGE, true); PreparationDone = false; @@ -202,7 +202,7 @@ struct TRINITY_DLL_DECL boss_drakkari_elementalAI : public ScriptedAI if(m_creature->GetVisibility() == VISIBILITY_ON) { Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); - m_creature->CastSpell(pTarget,SPELL_SURGE,false); + DoCast(pTarget, SPELL_SURGE, false); } SurgeTimer = 7000; diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp index f080b4bc10c..b73184ccf55 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_eck.cpp @@ -63,13 +63,13 @@ struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI if (uiBiteTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ECK_BITE); + DoCast(m_creature->getVictim(), SPELL_ECK_BITE); uiBiteTimer = 8000 + rand()%4000; } else uiBiteTimer -= diff; if (uiSpitTimer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ECK_SPIT); + DoCast(m_creature->getVictim(), SPELL_ECK_SPIT); uiSpitTimer = 6000 + rand()%8000; } else uiSpitTimer -= diff; @@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,1); if(pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { - DoCast(pTarget,RAND(SPELL_ECK_SPRING_1,SPELL_ECK_SPRING_2)); + DoCast(pTarget, RAND(SPELL_ECK_SPRING_1, SPELL_ECK_SPRING_2)); uiSpringTimer = 5000 + rand()%10000; } } else uiSpringTimer -= diff; @@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI { if (uiBerserkTimer <= diff) { - DoCast(m_creature,SPELL_ECK_BERSERK); + DoCast(m_creature, SPELL_ECK_BERSERK); bBerserk = true; } else @@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL boss_eckAI : public ScriptedAI uiBerserkTimer -= diff; if (m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 20) { - DoCast(m_creature,SPELL_ECK_BERSERK); + DoCast(m_creature, SPELL_ECK_BERSERK); bBerserk = true; } } diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp index 3e5278744c5..4831004fd38 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_gal_darah.cpp @@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL boss_gal_darahAI : public ScriptedAI { if (uiStampedeTimer <= diff) { - DoCast(m_creature,SPELL_STAMPEDE); + DoCast(m_creature, SPELL_STAMPEDE); DoScriptText(RAND(SAY_SUMMON_RHINO_1,SAY_SUMMON_RHINO_2,SAY_SUMMON_RHINO_3),m_creature); uiStampedeTimer = 15000; } else uiStampedeTimer -= diff; @@ -156,7 +156,7 @@ struct TRINITY_DLL_DECL boss_gal_darahAI : public ScriptedAI if (uiImpalingChargeTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,HEROIC(SPELL_IMPALING_CHARGE, H_SPELL_IMPALING_CHARGE)); + DoCast(pTarget, HEROIC(SPELL_IMPALING_CHARGE, H_SPELL_IMPALING_CHARGE)); uiImpalingChargeTimer = 30000; ++uiPhaseCounter; } else uiImpalingChargeTimer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp index cc79dfd7f57..abba233496f 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_moorabi.cpp @@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI void EnterCombat(Unit *who) { DoScriptText(SAY_AGGRO, m_creature); - m_creature->CastSpell(m_creature,SPELL_MOJO_FRENZY,true); + DoCast(m_creature, SPELL_MOJO_FRENZY, true); if (pInstance) pInstance->SetData(DATA_MOORABI_EVENT, IN_PROGRESS); @@ -87,13 +87,13 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI if (SPELL_GROUND_TREMOR_TIMER <= diff) { DoScriptText(SAY_QUAKE, m_creature); - m_creature->CastSpell(m_creature->getVictim(),SPELL_QUAKE,true); + DoCast(m_creature->getVictim(), SPELL_QUAKE, true); SPELL_GROUND_TREMOR_TIMER = 10000; } else SPELL_GROUND_TREMOR_TIMER -= diff; if (SPELL_NUMBING_SHOUT_TIMER <= diff) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_NUMBING_ROAR,true); + DoCast(m_creature->getVictim(), SPELL_NUMBING_ROAR, true); SPELL_NUMBING_SHOUT_TIMER = 10000; } else SPELL_NUMBING_SHOUT_TIMER -=diff; @@ -110,7 +110,7 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI { DoScriptText(EMOTE_TRANSFORM, m_creature); DoScriptText(SAY_TRANSFORM, m_creature); - m_creature->CastSpell(m_creature,SPELL_TRANSFORMATION,false); + DoCast(m_creature, SPELL_TRANSFORMATION, false); SPELL_TRANSFORMATION_TIMER = 10000; } else SPELL_TRANSFORMATION_TIMER -= diff; @@ -118,20 +118,20 @@ struct TRINITY_DLL_DECL boss_moorabiAI : public ScriptedAI if (SPELL_GROUND_TREMOR_TIMER <= diff) { DoScriptText(SAY_QUAKE, m_creature); - m_creature->CastSpell(m_creature->getVictim(),SPELL_GROUND_TREMOR,true); + DoCast(m_creature->getVictim(), SPELL_GROUND_TREMOR, true); SPELL_GROUND_TREMOR_TIMER = 10000; } else SPELL_GROUND_TREMOR_TIMER -= diff; //CAST NUMBING SHOUT || DETERMINED_STAB if (SPELL_NUMBING_SHOUT_TIMER <= diff) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_NUMBING_SHOUT,true); + DoCast(m_creature->getVictim(), SPELL_NUMBING_SHOUT, true); SPELL_NUMBING_SHOUT_TIMER = 10000; } else SPELL_NUMBING_SHOUT_TIMER -= diff; if (SPELL_DETERMINED_STAB_TIMER <= diff) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_DETERMINED_STAB,true); + DoCast(m_creature->getVictim(), SPELL_DETERMINED_STAB, true); SPELL_DETERMINED_STAB_TIMER = 8000; } else SPELL_DETERMINED_STAB_TIMER -= diff; } diff --git a/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp b/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp index 7c71fb4f9ae..9d12b20feda 100644 --- a/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp +++ b/src/bindings/scripts/scripts/northrend/gundrak/boss_slad_ran.cpp @@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL mob_slad_ran_constrictorAI : public ScriptedAI { DoCast(m_creature->getVictim(), SPELL_GRIP_OF_SLAD_RAN); uiGripOfSladRanTimer = 5000; - } else uiGripOfSladRanTimer -= diff;; + } else uiGripOfSladRanTimer -= diff; } ScriptedInstance* pInstance; diff --git a/src/bindings/scripts/scripts/northrend/howling_fjord.cpp b/src/bindings/scripts/scripts/northrend/howling_fjord.cpp index 48b0fe97228..266caf0a1b3 100644 --- a/src/bindings/scripts/scripts/northrend/howling_fjord.cpp +++ b/src/bindings/scripts/scripts/northrend/howling_fjord.cpp @@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL npc_Apothecary_HanesAI : public npc_escortAI { if (PotTimer <= diff) { - DoCast(me,17534,true); + DoCast(me, 17534, true); PotTimer = 10000; } else PotTimer -= diff; } diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp index e565b69e130..25e9753d8b5 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp @@ -119,11 +119,11 @@ struct TRINITY_DLL_DECL boss_faerlinaAI : public BossAI return; case EVENT_FIRE: if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, HEROIC(SPELL_RAIN_OF_FIRE,H_SPELL_RAIN_OF_FIRE)); + DoCast(pTarget, HEROIC(SPELL_RAIN_OF_FIRE, H_SPELL_RAIN_OF_FIRE)); events.ScheduleEvent(EVENT_FIRE, urand(6000,18000)); return; case EVENT_FRENZY: - DoCast(me,HEROIC(SPELL_FRENZY,H_SPELL_FRENZY)); + DoCast(me, HEROIC(SPELL_FRENZY, H_SPELL_FRENZY)); delayFrenzy = false; return; case EVENT_AFTERENRAGE: @@ -177,7 +177,7 @@ struct TRINITY_DLL_DECL mob_faerlina_addAI : public ScriptedAI if (pInstance) { if (Creature *pFaerlina = pInstance->instance->GetCreature(pInstance->GetData64(DATA_FAERLINA))) - DoCast(pFaerlina,HEROIC(SPELL_WIDOWS_EMBRACE,H_SPELL_WIDOWS_EMBRACE)); + DoCast(pFaerlina, HEROIC(SPELL_WIDOWS_EMBRACE, H_SPELL_WIDOWS_EMBRACE)); } } diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp index 46f1c0ebb97..b1e54501635 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp @@ -289,7 +289,7 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI } break; case EVENT_BOLT: - DoCast(me->getVictim(), HEROIC(SPELL_SHADOW_BOLT,H_SPELL_SHADOW_BOLT)); + DoCast(me->getVictim(), HEROIC(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); events.ScheduleEvent(EVENT_BOLT, 1000); return; case EVENT_HARVEST: diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp index 3e1e336e359..325841b30f4 100644 --- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp +++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp @@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL boss_thaddiusAI : public BossAI events.ScheduleEvent(EVENT_SHIFT, 30000); return; case EVENT_CHAIN: - DoCast(me->getVictim(), HEROIC(SPELL_CHAIN_LIGHTNING,H_SPELL_CHAIN_LIGHTNING)); + DoCast(me->getVictim(), HEROIC(SPELL_CHAIN_LIGHTNING, H_SPELL_CHAIN_LIGHTNING)); events.ScheduleEvent(EVENT_CHAIN, urand(10000,20000)); return; case EVENT_BERSERK: @@ -176,7 +176,7 @@ struct TRINITY_DLL_DECL mob_stalaggAI : public ScriptedAI { if (PowerSurgeTimer <= uiDiff) { - DoCast(m_creature, HEROIC(SPELL_POWERSURGE,H_SPELL_POWERSURGE)); + DoCast(m_creature, HEROIC(SPELL_POWERSURGE, H_SPELL_POWERSURGE)); PowerSurgeTimer = urand(15000,20000); } else PowerSurgeTimer -= uiDiff; DoMeleeAttackIfReady(); @@ -209,7 +209,7 @@ struct TRINITY_DLL_DECL mob_feugenAI : public ScriptedAI { if (StaticFieldTimer <= uiDiff) { - DoCast(m_creature, HEROIC(SPELL_STATICFIELD,H_SPELL_STATICFIELD)); + DoCast(m_creature, HEROIC(SPELL_STATICFIELD, H_SPELL_STATICFIELD)); StaticFieldTimer = 5000; } else StaticFieldTimer -= uiDiff; DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp index a734ce50a41..141e5d1dc65 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_anomalus.cpp @@ -163,7 +163,7 @@ struct TRINITY_DLL_DECL boss_anomalusAI : public ScriptedAI { Phase = 2; DoScriptText(SAY_SHIELD , m_creature); - DoCast(m_creature,SPELL_RIFT_SHIELD); + DoCast(m_creature, SPELL_RIFT_SHIELD); int tmp = rand()%(2); Creature* Rift = m_creature->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[tmp][0], RiftLocation[tmp][1], RiftLocation[tmp][2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); @@ -181,7 +181,7 @@ struct TRINITY_DLL_DECL boss_anomalusAI : public ScriptedAI { Phase = 3; DoScriptText(SAY_SHIELD , m_creature); - DoCast(m_creature,SPELL_RIFT_SHIELD); + DoCast(m_creature, SPELL_RIFT_SHIELD); int tmp = rand()%(2); Creature* Rift = m_creature->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[tmp][0], RiftLocation[tmp][1], RiftLocation[tmp][2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); diff --git a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp index f97ca4d116a..3ca75a3f15f 100644 --- a/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp +++ b/src/bindings/scripts/scripts/northrend/nexus/nexus/boss_keristrasza.cpp @@ -162,7 +162,7 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI { m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - m_creature->CastSpell(m_creature, SPELL_FROZEN_PRISON, false); + DoCast(m_creature, SPELL_FROZEN_PRISON, false); } } diff --git a/src/bindings/scripts/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp index 0445c1afe19..768e6520b92 100644 --- a/src/bindings/scripts/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp +++ b/src/bindings/scripts/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp @@ -677,7 +677,7 @@ struct TRINITY_DLL_DECL dummy_dragonAI : public ScriptedAI // Twilight Revenge to main boss if (Unit* pSartharion = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_SARTHARION))) if (pSartharion->isAlive()) - m_creature->CastSpell(pSartharion,SPELL_TWILIGHT_REVENGE,true); + DoCast(pSartharion, SPELL_TWILIGHT_REVENGE, true); } } diff --git a/src/bindings/scripts/scripts/northrend/storm_peaks.cpp b/src/bindings/scripts/scripts/northrend/storm_peaks.cpp index 8c8df53124a..86b49b5a510 100644 --- a/src/bindings/scripts/scripts/northrend/storm_peaks.cpp +++ b/src/bindings/scripts/scripts/northrend/storm_peaks.cpp @@ -238,13 +238,13 @@ struct TRINITY_DLL_DECL npc_victorious_challengerAI : public ScriptedAI if(RendTimer < diff) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_REND_VC,true); + DoCast(m_creature->getVictim(), SPELL_REND_VC, true); RendTimer = 15000; }else RendTimer -= diff; if(SunderArmorTimer < diff) { - m_creature->CastSpell(m_creature->getVictim(), SPELL_SUNDER_ARMOR, true); + DoCast(m_creature->getVictim(), SPELL_SUNDER_ARMOR, true); SunderArmorTimer = 10000; }else SunderArmorTimer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp index 3b37fb87f6b..87b4ab64cbe 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp @@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI else if (m_uiSparkAtHomeCount == MAX_SPARKS) { m_creature->SetVisibility(VISIBILITY_ON); - m_creature->CastSpell(m_creature, SPELL_SPARK_DESPAWN, false); + DoCast(m_creature, SPELL_SPARK_DESPAWN, false); DespawnSpark(); @@ -259,7 +259,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI if (m_uiStaticOverload_Timer <= uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, HEROIC(SPELL_STATIC_OVERLOAD_N,SPELL_STATIC_OVERLOAD_H)); + DoCast(pTarget, HEROIC(SPELL_STATIC_OVERLOAD_N, SPELL_STATIC_OVERLOAD_H)); m_uiStaticOverload_Timer = 5000 + rand()%1000; } @@ -268,7 +268,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI if (m_uiBallLightning_Timer <= uiDiff) { - DoCast(m_creature->getVictim(), HEROIC(SPELL_BALL_LIGHTNING_N,SPELL_BALL_LIGHTNING_H)); + DoCast(m_creature->getVictim(), HEROIC(SPELL_BALL_LIGHTNING_N, SPELL_BALL_LIGHTNING_H)); m_uiBallLightning_Timer = 10000 + rand()%1000; } else diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp index ebf6dcd9b43..39a889df46a 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_loken.cpp @@ -176,7 +176,7 @@ struct TRINITY_DLL_DECL boss_lokenAI : public ScriptedAI if (m_uiResumePulsingShockwave_Timer <= uiDiff) { //breaks at movement, can we assume when it's time, this spell is casted and also must stop movement? - m_creature->CastSpell(m_creature, SPELL_PULSING_SHOCKWAVE_AURA, true); + DoCast(m_creature, SPELL_PULSING_SHOCKWAVE_AURA, true); DoCast(m_creature, m_bIsHeroic ? SPELL_PULSING_SHOCKWAVE_H : SPELL_PULSING_SHOCKWAVE_N); // need core support m_bIsAura = true; diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp index aa0d622047d..e8b524e772a 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp @@ -293,7 +293,7 @@ struct TRINITY_DLL_DECL boss_volkhanAI : public ScriptedAI m_bHasTemper = true; - m_creature->CastSpell(m_creature, SPELL_TEMPER, false); + DoCast(m_creature, SPELL_TEMPER, false); } DoMeleeAttackIfReady(); diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp index 0104e61b9db..876580ba668 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp @@ -94,7 +94,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); if(pTarget) - DoCast(pTarget,SPELL_PARTING_SORROW); + DoCast(pTarget, SPELL_PARTING_SORROW); PartingSorrowTimer = 30000 + rand()%10000; } else PartingSorrowTimer -= diff; @@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI if (StormOfGriefTimer <= diff) { - DoCast(m_creature->getVictim(),IsHeroic ? SPELL_STORM_OF_GRIEF_H : SPELL_STORM_OF_GRIEF_N, true); + DoCast(m_creature->getVictim(), IsHeroic ? SPELL_STORM_OF_GRIEF_H : SPELL_STORM_OF_GRIEF_N, true); StormOfGriefTimer = 15000 + rand()%5000; } else StormOfGriefTimer -= diff; @@ -110,7 +110,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI { DoResetThreat(); DoScriptText(SAY_STUN, m_creature); - DoCast(m_creature,IsHeroic ? SPELL_SHOCK_OF_SORROW_H : SPELL_SHOCK_OF_SORROW_N); + DoCast(m_creature, IsHeroic ? SPELL_SHOCK_OF_SORROW_H : SPELL_SHOCK_OF_SORROW_N); ShockOfSorrowTimer = 20000 + rand()%10000; } else ShockOfSorrowTimer -= diff; @@ -119,9 +119,9 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); if(pTarget) - DoCast(pTarget,IsHeroic ? SPELL_PILLAR_OF_WOE_H : SPELL_PILLAR_OF_WOE_N); + DoCast(pTarget, IsHeroic ? SPELL_PILLAR_OF_WOE_H : SPELL_PILLAR_OF_WOE_N); else - DoCast(m_creature->getVictim(),IsHeroic ? SPELL_PILLAR_OF_WOE_H : SPELL_PILLAR_OF_WOE_N); + DoCast(m_creature->getVictim(), IsHeroic ? SPELL_PILLAR_OF_WOE_H : SPELL_PILLAR_OF_WOE_N); PillarOfWoeTimer = 5000 + rand()%20000; } else PillarOfWoeTimer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp index 16781a70ca9..54f309afaa3 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_assembly_of_iron.cpp @@ -315,7 +315,7 @@ struct TRINITY_DLL_DECL boss_runemaster_molgeimAI : public ScriptedAI } break; case EVENT_SHIELD_OF_RUNES: - DoCast( m_creature, HEROIC(SPELL_SHIELD_OF_RUNES, SPELL_SHIELD_OF_RUNES_H)); + DoCast(m_creature, HEROIC(SPELL_SHIELD_OF_RUNES, SPELL_SHIELD_OF_RUNES_H)); events.ScheduleEvent(EVENT_SHIELD_OF_RUNES, 27000+ (rand()%7)*1000); break; case EVENT_RUNE_OF_DEATH: diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp index 7a7203a4c76..a453210c779 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_ignis.cpp @@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL boss_ignis_AI : public BossAI if (SLAG_POT_Timer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_SLAG_POT); + DoCast(pTarget, SPELL_SLAG_POT); DoScriptText(SAY_SLAY, m_creature); SLAG_POT_Timer = 30000; } else SLAG_POT_Timer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_xt002.cpp b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_xt002.cpp index 33a8d5edebb..ae9ecde764a 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_xt002.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/ulduar/boss_xt002.cpp @@ -77,14 +77,14 @@ struct TRINITY_DLL_DECL boss_xt002_AI : public BossAI if (SEARING_LIGHT_Timer <= diff) { - DoCast(m_creature,SPELL_SEARING_LIGHT); + DoCast(m_creature, SPELL_SEARING_LIGHT); DoScriptText(SAY_SLAY, m_creature); SEARING_LIGHT_Timer = 50000; } else SEARING_LIGHT_Timer -= diff; if (SONIC_BOOM_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SONIC_BOOM); + DoCast(m_creature->getVictim(), SPELL_SONIC_BOOM); SONIC_BOOM_Timer = 20000; } else SONIC_BOOM_Timer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp index 1627e664d09..268da997c1a 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_ingvar_the_plunderer.cpp @@ -117,7 +117,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI { if (damage >= m_creature->GetHealth() && !undead) { - //DoCast(m_creature,SPELL_INGVAR_FEIGN_DEATH,true); // Dont work ??? + //DoCast(m_creature, SPELL_INGVAR_FEIGN_DEATH, true); // Dont work ??? // visuel hack m_creature->SetHealth(0); m_creature->InterruptNonMeleeSpells(true); @@ -184,8 +184,8 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI if (SpawnResTimer) if (SpawnResTimer <= diff) { - DoCast(m_creature,SPELL_SUMMON_BANSHEE); // Summons direktly on caster position - //DoCast(m_creature,SPELL_SCOURG_RESURRECTION_EFFEKTSPAWN); // Dont needet ? + DoCast(m_creature, SPELL_SUMMON_BANSHEE); // Summons direktly on caster position + //DoCast(m_creature, SPELL_SCOURG_RESURRECTION_EFFEKTSPAWN); // Dont needet ? SpawnResTimer = 0; } else SpawnResTimer -= diff; @@ -204,9 +204,9 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI if (!wait_Timer) { if (undead) - DoCast(m_creature->getVictim(),HEROIC(SPELL_WOE_STRIKE, H_SPELL_WOE_STRIKE)); + DoCast(m_creature->getVictim(), HEROIC(SPELL_WOE_STRIKE, H_SPELL_WOE_STRIKE)); else - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = rand()%5000 + 2000; wait_Timer = 1000; @@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI if (undead) DoCast(m_creature->getVictim(), SPELL_DARK_SMASH); else - DoCast(m_creature->getVictim(),HEROIC(SPELL_SMASH, H_SPELL_SMASH)); + DoCast(m_creature->getVictim(), HEROIC(SPELL_SMASH, H_SPELL_SMASH)); Smash_Timer = 10000; wait_Timer = 5000; @@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI { if (Enrage_Timer <= diff) { - DoCast(m_creature,HEROIC(SPELL_ENRAGE, H_SPELL_ENRAGE)); + DoCast(m_creature, HEROIC(SPELL_ENRAGE, H_SPELL_ENRAGE)); Enrage_Timer = 10000; } else Enrage_Timer -= diff; } else // In Undead form used to summon weapon @@ -246,7 +246,7 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI { Creature* temp = m_creature->SummonCreature(ENTRY_THROW_TARGET,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,2000); - DoCast(m_creature,SPELL_SHADOW_AXE_SUMMON); + DoCast(m_creature, SPELL_SHADOW_AXE_SUMMON); } Enrage_Timer = 30000; } @@ -258,9 +258,9 @@ struct TRINITY_DLL_DECL boss_ingvar_the_plundererAI : public ScriptedAI if (!wait_Timer) { if (undead) - DoCast(m_creature,HEROIC(SPELL_DREADFUL_ROAR, H_SPELL_DREADFUL_ROAR)); + DoCast(m_creature, HEROIC(SPELL_DREADFUL_ROAR, H_SPELL_DREADFUL_ROAR)); else - DoCast(m_creature,HEROIC(SPELL_STAGGERING_ROAR, H_SPELL_STAGGERING_ROAR)); + DoCast(m_creature, HEROIC(SPELL_STAGGERING_ROAR, H_SPELL_STAGGERING_ROAR)); Roar_Timer = 10000; wait_Timer = 5000; @@ -332,7 +332,7 @@ struct TRINITY_DLL_DECL mob_annhylde_the_callerAI : public ScriptedAI case 1: ingvar->RemoveAura(SPELL_SUMMON_BANSHEE); ingvar->CastSpell(ingvar,SPELL_SCOURG_RESURRECTION_DUMMY,true); - DoCast(ingvar,SPELL_SCOURG_RESURRECTION_BEAM); + DoCast(ingvar, SPELL_SCOURG_RESURRECTION_BEAM); Resurect_Timer = 8000; Resurect_Phase = 1; break; diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp index 5ee702e30d7..0c90f71259d 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp @@ -188,7 +188,7 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI { Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 0); if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) - m_creature->CastSpell(pTarget, Heroic ? SPELL_SHADOWBOLT_HEROIC : SPELL_SHADOWBOLT, true); + m_creature->CastSpell(pTarget, HEROIC(SPELL_SHADOWBOLT, SPELL_SHADOWBOLT_HEROIC), true); ShadowboltTimer = 10000; } else ShadowboltTimer -= diff; @@ -199,8 +199,7 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI DoScriptText(SAY_SKELETONS, m_creature); for (uint8 i = 0; i < 5; ++i) { - Skeleton = m_creature->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1] , SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); - if (Skeleton) + if (Skeleton = m_creature->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1] , SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) { Skeleton->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); Skeleton->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX(), m_creature->GetPositionY() , m_creature->GetPositionZ()); @@ -213,18 +212,18 @@ struct TRINITY_DLL_DECL boss_kelesethAI : public ScriptedAI if (FrostTombTimer <= diff) { - Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1); - if (pTarget && pTarget->isAlive() && pTarget->GetTypeId() == TYPEID_PLAYER) - { - //DoCast(pTarget, SPELL_FROST_TOMB_SUMMON, true); - if (Creature *pChains = m_creature->SummonCreature(CREATURE_FROSTTOMB, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (pTarget->isAlive()) { - CAST_AI(mob_frost_tombAI, pChains->AI())->SetPrisoner(pTarget); - pChains->CastSpell(pTarget, SPELL_FROST_TOMB, true); + //DoCast(pTarget, SPELL_FROST_TOMB_SUMMON, true); + if (Creature *pChains = m_creature->SummonCreature(CREATURE_FROSTTOMB, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000)) + { + CAST_AI(mob_frost_tombAI, pChains->AI())->SetPrisoner(pTarget); + pChains->CastSpell(pTarget, SPELL_FROST_TOMB, true); - DoScriptText(SAY_FROST_TOMB, m_creature); + DoScriptText(SAY_FROST_TOMB, m_creature); + } } - } FrostTombTimer = 15000; } else FrostTombTimer -= diff; @@ -249,7 +248,7 @@ struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI void Reset() { Respawn_Time = 12000; - Decrepify_Timer = 10000 + rand()%20000; + Decrepify_Timer = urand(10000,20000); isDead = false; } @@ -282,7 +281,7 @@ struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI isDead = false; m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->SetStandState(UNIT_STAND_STATE_STAND); - m_creature->CastSpell(m_creature,SPELL_SCOURGE_RESSURRECTION,true); + DoCast(m_creature, SPELL_SCOURGE_RESSURRECTION, true); if (m_creature->getVictim()) { @@ -312,7 +311,7 @@ struct TRINITY_DLL_DECL mob_vrykul_skeletonAI : public ScriptedAI if (Decrepify_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_DECREPIFY); + DoCast(m_creature->getVictim(), SPELL_DECREPIFY); Decrepify_Timer = 30000; } else Decrepify_Timer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp index e92194f1d81..0c4d1163532 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_keep/boss_skarvald_dalronn.cpp @@ -126,7 +126,7 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI DoScriptText(YELL_SKARVALD_SKA_DIEDFIRST,m_creature); m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); - //DoCast(m_creature,SPELL_SUMMON_SKARVALD_GHOST,true); + //DoCast(m_creature, SPELL_SUMMON_SKARVALD_GHOST, true); Creature* temp = m_creature->SummonCreature(MOB_SKARVALD_GHOST,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000); if (temp) { @@ -277,7 +277,7 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI DoScriptText(YELL_DALRONN_DAL_DIEDFIRST,m_creature); m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); - //DoCast(m_creature,SPELL_SUMMON_DALRONN_GHOST,true); + //DoCast(m_creature, SPELL_SUMMON_DALRONN_GHOST, true); Creature* temp = m_creature->SummonCreature(MOB_DALRONN_GHOST,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000); if (temp) { @@ -353,7 +353,7 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI { if (!m_creature->IsNonMeleeSpellCasted(false)) { - DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0),SPELL_DEBILITATE); + DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_DEBILITATE); Debilitate_Timer = 5000+rand()%5000; } } else Debilitate_Timer -= diff; @@ -361,7 +361,7 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI if (HeroicMode) if (Summon_Timer <= diff) { - DoCast(m_creature,H_SPELL_SUMMON_SKELETONS); + DoCast(m_creature, H_SPELL_SUMMON_SKELETONS); Summon_Timer = (rand()%10000) + 20000; } else Summon_Timer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp index d87d4f1e16e..62f941a8eef 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp @@ -157,20 +157,20 @@ struct TRINITY_DLL_DECL boss_palehoofAI : public ScriptedAI if (uiArcingSmashTimer <= diff) { - DoCast(m_creature,SPELL_ARCING_SMASH); + DoCast(m_creature, SPELL_ARCING_SMASH); uiArcingSmashTimer = urand(13000,17000); } else uiArcingSmashTimer -= diff; if (uiImpaleTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) - DoCast(pTarget, HEROIC(SPELL_IMPALE,H_SPELL_IMPALE)); + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + DoCast(pTarget, HEROIC(SPELL_IMPALE, H_SPELL_IMPALE)); uiImpaleTimer = urand(8000,12000); } else uiImpaleTimer -= diff; if (uiWhiteringRoarTimer <= diff) { - DoCast(m_creature, HEROIC(SPELL_WITHERING_ROAR,H_SPELL_WITHERING_ROAR)); + DoCast(m_creature, HEROIC(SPELL_WITHERING_ROAR, H_SPELL_WITHERING_ROAR)); uiWhiteringRoarTimer = urand(8000,12000); } else uiWhiteringRoarTimer -= diff; @@ -747,7 +747,7 @@ struct TRINITY_DLL_DECL mob_palehoof_orbAI : public ScriptedAI case PHASE_FEROCIOUS_RHINO: pNext = Unit::GetCreature((*m_creature), pInstance ? pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO) : 0); break; case PHASE_GORTOK_PALEHOOF: pNext = Unit::GetCreature((*m_creature), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); break; } - DoCast(pNext,SPELL_ORB_CHANNEL,false); + DoCast(pNext, SPELL_ORB_CHANNEL, false); currentPhase=(Phase)id; SummonTimer=5000; } diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp index 22c7cc3f83c..e393e518f08 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp @@ -136,7 +136,7 @@ struct TRINITY_DLL_DECL boss_skadiAI : public ScriptedAI Phase = SKADI; m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) AttackStart(pTarget); break; } @@ -155,14 +155,14 @@ struct TRINITY_DLL_DECL boss_skadiAI : public ScriptedAI if (uiPoisonedSpearTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, HEROIC(SPELL_POISONED_SPEAR, H_SPELL_POISONED_SPEAR)); uiPoisonedSpearTimer = 10000; } else uiPoisonedSpearTimer -= diff; if (uiWhirlwindTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) m_creature->CastSpell(pTarget, HEROIC(SPELL_WHIRLWIND, H_SPELL_WHIRLWIND), false); } else uiWhirlwindTimer = 20000; diff --git a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp index 420bfa64fab..5cd32b112f0 100644 --- a/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp +++ b/src/bindings/scripts/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp @@ -160,12 +160,12 @@ struct TRINITY_DLL_DECL boss_svalaAI : public ScriptedAI break; case 4: DoScriptText(SAY_DIALOG_WITH_ARTHAS_3, m_creature); - DoCast(m_creature,SPELL_SVALA_TRANSFORMING1); + DoCast(m_creature, SPELL_SVALA_TRANSFORMING1); ++uiIntroPhase; uiIntroTimer = 2800; break; case 5: - DoCast(m_creature,SPELL_SVALA_TRANSFORMING2); + DoCast(m_creature, SPELL_SVALA_TRANSFORMING2); ++uiIntroPhase; uiIntroTimer = 200; break; @@ -201,7 +201,7 @@ struct TRINITY_DLL_DECL mob_ritual_channelerAI : public Scripted_NoMovementAI void EnterCombat(Unit* who) { if (who && !who->HasAura(SPELL_PARALYZE,0)) - DoCast(who,SPELL_PARALYZE); + DoCast(who, SPELL_PARALYZE); return; } }; @@ -282,7 +282,7 @@ struct TRINITY_DLL_DECL boss_svala_sorrowgraveAI : public ScriptedAI if (pSacrificeTarget) { DoScriptText(RAND(SAY_SACRIFICE_PLAYER_1,SAY_SACRIFICE_PLAYER_2,SAY_SACRIFICE_PLAYER_3,SAY_SACRIFICE_PLAYER_4,SAY_SACRIFICE_PLAYER_5),m_creature); - DoCast(pSacrificeTarget,SPELL_RITUAL_OF_THE_SWORD); + DoCast(pSacrificeTarget, SPELL_RITUAL_OF_THE_SWORD); //Spell doesn't teleport DoTeleportPlayer(pSacrificeTarget, 296.632, -346.075, 90.63, 4.6); m_creature->SetUnitMovementFlags(MOVEMENTFLAG_FLY_MODE); diff --git a/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp index 665d8d7751d..1260cd98557 100644 --- a/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp +++ b/src/bindings/scripts/scripts/northrend/vault_of_archavon/boss_emalon.cpp @@ -239,7 +239,7 @@ struct TRINITY_DLL_DECL mob_tempest_minionAI : public ScriptedAI { if(OverchargedAura->GetStackAmount() == 10) { - DoCast(me,SPELL_OVERCHARGED_BLAST); + DoCast(me, SPELL_OVERCHARGED_BLAST); m_creature->ForcedDespawn(); DoScriptText(EMOTE_MINION_RESPAWN, m_creature); } diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp index 9808fdffca2..41db8a9a8e8 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_cyanigosa.cpp @@ -89,13 +89,13 @@ struct TRINITY_DLL_DECL boss_cyanigosaAI : public ScriptedAI if (uiBlizzardTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, HEROIC(SPELL_BLIZZARD,H_SPELL_BLIZZARD)); + DoCast(pTarget, HEROIC(SPELL_BLIZZARD, H_SPELL_BLIZZARD)); uiBlizzardTimer = 15000; } else uiBlizzardTimer -= diff; if (uiTailSweepTimer <= diff) { - DoCast(HEROIC(SPELL_TAIL_SWEEP,H_SPELL_TAIL_SWEEP)); + DoCast(HEROIC(SPELL_TAIL_SWEEP, H_SPELL_TAIL_SWEEP)); uiTailSweepTimer = 20000; } else uiTailSweepTimer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp index e6f7451163d..37747d7531b 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_erekem.cpp @@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI { if (Creature *pTarget = GetChainHealTarget()) { - DoCast(pTarget, HEROIC(SPELL_CHAIN_HEAL,H_SPELL_CHAIN_HEAL)); + DoCast(pTarget, HEROIC(SPELL_CHAIN_HEAL, H_SPELL_CHAIN_HEAL)); //If one of the adds is dead spawn heals faster uiChainHealTimer = ((pGuard1 && !pGuard1->isAlive()) || (pGuard2 && !pGuard2->isAlive()) ? 3000 : 8000) + rand()%3000; } @@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI if (uiBloodlustTimer <= diff) { - DoCast(m_creature,SPELL_BLOODLUST); + DoCast(m_creature, SPELL_BLOODLUST); uiBloodlustTimer = urand(35000,45000); } else uiBloodlustTimer -= diff; @@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL boss_erekemAI : public ScriptedAI if (uiLightningBoltTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_LIGHTNING_BOLT); uiLightningBoltTimer = urand(18000,24000); } else uiLightningBoltTimer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp index 1f3d326332c..459c4a3e3de 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_moragg.cpp @@ -67,7 +67,7 @@ struct TRINITY_DLL_DECL boss_moraggAI : public ScriptedAI if (uiOpticLinkTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget,SPELL_OPTIC_LINK); + DoCast(pTarget, SPELL_OPTIC_LINK); uiOpticLinkTimer = 15000; } else uiOpticLinkTimer -= diff; diff --git a/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp b/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp index 6e6e1da345f..4dee02ea111 100644 --- a/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp +++ b/src/bindings/scripts/scripts/northrend/violet_hold/boss_zuramat.cpp @@ -95,14 +95,14 @@ struct TRINITY_DLL_DECL boss_zuramatAI : public ScriptedAI if (SpellSummonVoidTimer <= diff) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_SUMMON_VOID_SENTRY,false); + DoCast(m_creature->getVictim(), SPELL_SUMMON_VOID_SENTRY, false); SpellSummonVoidTimer = 20000; } else SpellSummonVoidTimer -=diff; if(SpellVoidShiftedTimer < diff && shiftcast) { if (Shifted) - m_creature->CastSpell(Shifted,SPELL_VOID_SHIFTED,false); + DoCast(Shifted, SPELL_VOID_SHIFTED, false); shiftcast = false; } else SpellVoidShiftedTimer -=diff; diff --git a/src/bindings/scripts/scripts/northrend/zuldrak.cpp b/src/bindings/scripts/scripts/northrend/zuldrak.cpp index 54da04ed8fa..5b0cd64a017 100644 --- a/src/bindings/scripts/scripts/northrend/zuldrak.cpp +++ b/src/bindings/scripts/scripts/northrend/zuldrak.cpp @@ -62,8 +62,8 @@ struct TRINITY_DLL_DECL npc_drakuru_shacklesAI : public ScriptedAI m_creature->SetInFront(Rageclaw); Rageclaw->SetInFront(m_creature); - m_creature->CastSpell(Rageclaw, SPELL_LEFT_CHAIN, true); - m_creature->CastSpell(Rageclaw, SPELL_RIGHT_CHAIN, true); + DoCast(Rageclaw, SPELL_LEFT_CHAIN, true); + DoCast(Rageclaw, SPELL_RIGHT_CHAIN, true); } } else @@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL npc_captured_rageclawAI : public ScriptedAI Despawn = false; DespawnTimer = 0; m_creature->setFaction(35); - m_creature->CastSpell(m_creature, SPELL_KNEEL, true); // Little Hack for kneel - Thanks Illy :P + DoCast(m_creature, SPELL_KNEEL, true); // Little Hack for kneel - Thanks Illy :P } void MoveInLineOfSight(Unit *who){} diff --git a/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp b/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp index cba3569833c..28bb9d4d6f1 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_exarch_maladaar.cpp @@ -257,7 +257,7 @@ struct TRINITY_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI soulholder = pTarget->GetGUID(); soulclass = pTarget->getClass(); - DoCast(pTarget,SPELL_STOLEN_SOUL); + DoCast(pTarget, SPELL_STOLEN_SOUL); m_creature->SummonCreature(ENTRY_STOLEN_SOUL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); StolenSoul_Timer = 20000 + rand()% 10000; @@ -268,14 +268,14 @@ struct TRINITY_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI if (Ribbon_of_Souls_timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_RIBBON_OF_SOULS); + DoCast(pTarget, SPELL_RIBBON_OF_SOULS); Ribbon_of_Souls_timer = 5000 + (rand()%20 * 1000); } else Ribbon_of_Souls_timer -= diff; if (Fear_timer <= diff) { - DoCast(m_creature,SPELL_SOUL_SCREAM); + DoCast(m_creature, SPELL_SOUL_SCREAM); Fear_timer = 15000 + rand()% 15000; } else Fear_timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp b/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp index 24c6123ae88..b702667399b 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp @@ -109,7 +109,7 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI //Attractmagic_Timer if (Attractmagic_Timer <= diff) { - DoCast(m_creature,SPELL_ATTRACTMAGIC); + DoCast(m_creature, SPELL_ATTRACTMAGIC); Attractmagic_Timer = 30000; Carnivorousbite_Timer = 1500; } else Attractmagic_Timer -= diff; @@ -117,7 +117,7 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI //Carnivorousbite_Timer if (Carnivorousbite_Timer <= diff) { - DoCast(m_creature,SPELL_CARNIVOROUSBITE); + DoCast(m_creature, SPELL_CARNIVOROUSBITE); Carnivorousbite_Timer = 10000; } else Carnivorousbite_Timer -= diff; @@ -181,7 +181,7 @@ struct TRINITY_DLL_DECL mob_focus_fireAI : public ScriptedAI //FieryBlast_Timer if (fiery2 && FieryBlast_Timer <= diff) { - DoCast(m_creature,SPELL_FIERY_BLAST); + DoCast(m_creature, SPELL_FIERY_BLAST); if (fiery1) fiery1 = false; else if (fiery2) fiery2 = false; diff --git a/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp b/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp index 67aa3879700..03576794008 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp @@ -149,20 +149,20 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(true); - DoCast(m_creature,SPELL_FROSTNOVA); + DoCast(m_creature, SPELL_FROSTNOVA); FrostNova_Timer = 17500 + rand()%7500; CanBlink = true; } else FrostNova_Timer -= diff; if (Frostbolt_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FROSTBOLT); + DoCast(m_creature->getVictim(), SPELL_FROSTBOLT); Frostbolt_Timer = 4500 + rand()%1500; } else Frostbolt_Timer -= diff; if (FireBall_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FIREBALL); + DoCast(m_creature->getVictim(), SPELL_FIREBALL); FireBall_Timer = 4500 + rand()%1500; } else FireBall_Timer -= diff; @@ -178,7 +178,7 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI if (m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE) m_creature->GetMotionMaster()->MovementExpired(); - DoCast(m_creature,SPELL_BLINK); + DoCast(m_creature, SPELL_BLINK); Blink_Timer = 1000 + rand()%1500; CanBlink = false; } else Blink_Timer -= diff; @@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI if (!urand(0,3)) DoScriptText(SAY_SUMMON, m_creature); - DoCast(m_creature,SPELL_ETHEREAL_BEACON, true); + DoCast(m_creature, SPELL_ETHEREAL_BEACON, true); Beacon_Timer = 10000; } else Beacon_Timer -= diff; @@ -272,7 +272,7 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI if (ArcaneBolt_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ARCANE_BOLT); + DoCast(m_creature->getVictim(), SPELL_ARCANE_BOLT); ArcaneBolt_Timer = 2000 + rand()%2500; } else ArcaneBolt_Timer -= diff; @@ -281,7 +281,7 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(true); - m_creature->CastSpell(m_creature,SPELL_ETHEREAL_APPRENTICE,true); + DoCast(m_creature, SPELL_ETHEREAL_APPRENTICE, true); m_creature->ForcedDespawn(); return; } else Apprentice_Timer -= diff; @@ -322,10 +322,10 @@ struct TRINITY_DLL_DECL mob_ethereal_apprenticeAI : public ScriptedAI { if (isFireboltTurn) { - m_creature->CastSpell(m_creature->getVictim(), SPELL_ETHEREAL_APPRENTICE_FIREBOLT, true); + DoCast(m_creature->getVictim(), SPELL_ETHEREAL_APPRENTICE_FIREBOLT, true); isFireboltTurn = false; }else{ - m_creature->CastSpell(m_creature->getVictim(), SPELL_ETHEREAL_APPRENTICE_FROSTBOLT, true); + DoCast(m_creature->getVictim(), SPELL_ETHEREAL_APPRENTICE_FROSTBOLT, true); isFireboltTurn = true; } Cast_Timer = 3000; diff --git a/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp b/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp index b1decf401a8..a4dd539e5c9 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp @@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL boss_pandemoniusAI : public ScriptedAI { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget,HEROIC(SPELL_VOID_BLAST, H_SPELL_VOID_BLAST)); + DoCast(pTarget, HEROIC(SPELL_VOID_BLAST, H_SPELL_VOID_BLAST)); VoidBlast_Timer = 500; ++VoidBlast_Counter; } @@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL boss_pandemoniusAI : public ScriptedAI DoScriptText(EMOTE_DARK_SHELL, m_creature); - DoCast(m_creature,HEROIC(SPELL_DARK_SHELL, H_SPELL_DARK_SHELL)); + DoCast(m_creature, HEROIC(SPELL_DARK_SHELL, H_SPELL_DARK_SHELL)); DarkShell_Timer = 20000; } else DarkShell_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp index d1ec8b53022..8c8bfacd7bc 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp @@ -114,10 +114,10 @@ struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI if (m_creature->IsNonMeleeSpellCasted(false)) m_creature->InterruptNonMeleeSpells(false); - DoCast(m_creature,SPELL_SUMMON_SYTH_ARCANE,true); //front - DoCast(m_creature,SPELL_SUMMON_SYTH_FIRE,true); //back - DoCast(m_creature,SPELL_SUMMON_SYTH_FROST,true); //left - DoCast(m_creature,SPELL_SUMMON_SYTH_SHADOW,true); //right + DoCast(m_creature, SPELL_SUMMON_SYTH_ARCANE, true); //front + DoCast(m_creature, SPELL_SUMMON_SYTH_FIRE, true); //back + DoCast(m_creature, SPELL_SUMMON_SYTH_FROST, true); //left + DoCast(m_creature, SPELL_SUMMON_SYTH_SHADOW, true); //right } void UpdateAI(const uint32 diff) @@ -146,7 +146,7 @@ struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI if (flameshock_timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_FLAME_SHOCK); + DoCast(pTarget, SPELL_FLAME_SHOCK); flameshock_timer = 10000 + rand()%5000; } else flameshock_timer -= diff; @@ -154,7 +154,7 @@ struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI if (arcaneshock_timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_ARCANE_SHOCK); + DoCast(pTarget, SPELL_ARCANE_SHOCK); arcaneshock_timer = 10000 + rand()%5000; } else arcaneshock_timer -= diff; @@ -162,7 +162,7 @@ struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI if (frostshock_timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_FROST_SHOCK); + DoCast(pTarget, SPELL_FROST_SHOCK); frostshock_timer = 10000 + rand()%5000; } else frostshock_timer -= diff; @@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI if (shadowshock_timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_SHADOW_SHOCK); + DoCast(pTarget, SPELL_SHADOW_SHOCK); shadowshock_timer = 10000 + rand()%5000; } else shadowshock_timer -= diff; @@ -178,7 +178,7 @@ struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI if (chainlightning_timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_CHAIN_LIGHTNING); + DoCast(pTarget, SPELL_CHAIN_LIGHTNING); chainlightning_timer = 25000; } else chainlightning_timer -= diff; @@ -223,7 +223,7 @@ struct TRINITY_DLL_DECL mob_syth_fireAI : public ScriptedAI if (flameshock_timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_FLAME_SHOCK); + DoCast(pTarget, SPELL_FLAME_SHOCK); flameshock_timer = 5000; } else flameshock_timer -= diff; @@ -231,7 +231,7 @@ struct TRINITY_DLL_DECL mob_syth_fireAI : public ScriptedAI if (flamebuffet_timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_FLAME_BUFFET); + DoCast(pTarget, SPELL_FLAME_BUFFET); flamebuffet_timer = 5000; } else flamebuffet_timer -= diff; @@ -274,7 +274,7 @@ struct TRINITY_DLL_DECL mob_syth_arcaneAI : public ScriptedAI if (arcaneshock_timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_ARCANE_SHOCK); + DoCast(pTarget, SPELL_ARCANE_SHOCK); arcaneshock_timer = 5000; } else arcaneshock_timer -= diff; @@ -282,7 +282,7 @@ struct TRINITY_DLL_DECL mob_syth_arcaneAI : public ScriptedAI if (arcanebuffet_timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_ARCANE_BUFFET); + DoCast(pTarget, SPELL_ARCANE_BUFFET); arcanebuffet_timer = 5000; } else arcanebuffet_timer -= diff; @@ -325,7 +325,7 @@ struct TRINITY_DLL_DECL mob_syth_frostAI : public ScriptedAI if (frostshock_timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_FROST_SHOCK); + DoCast(pTarget, SPELL_FROST_SHOCK); frostshock_timer = 5000; } else frostshock_timer -= diff; @@ -333,7 +333,7 @@ struct TRINITY_DLL_DECL mob_syth_frostAI : public ScriptedAI if (frostbuffet_timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_FROST_BUFFET); + DoCast(pTarget, SPELL_FROST_BUFFET); frostbuffet_timer = 5000; } else frostbuffet_timer -= diff; @@ -376,7 +376,7 @@ struct TRINITY_DLL_DECL mob_syth_shadowAI : public ScriptedAI if (shadowshock_timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_SHADOW_SHOCK); + DoCast(pTarget, SPELL_SHADOW_SHOCK); shadowshock_timer = 5000; } else shadowshock_timer -= diff; @@ -384,7 +384,7 @@ struct TRINITY_DLL_DECL mob_syth_shadowAI : public ScriptedAI if (shadowbuffet_timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_SHADOW_BUFFET); + DoCast(pTarget, SPELL_SHADOW_BUFFET); shadowbuffet_timer = 5000; } else shadowbuffet_timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp index 53dedab9cbe..4af8b26b88d 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp @@ -130,14 +130,14 @@ struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI if (Blink) { - DoCast(m_creature,HEROIC(SPELL_ARCANE_EXPLOSION, H_SPELL_ARCANE_EXPLOSION)); - m_creature->CastSpell(m_creature,SPELL_ARCANE_BUBBLE,true); + DoCast(m_creature, HEROIC(SPELL_ARCANE_EXPLOSION, H_SPELL_ARCANE_EXPLOSION)); + DoCast(m_creature, SPELL_ARCANE_BUBBLE, true); Blink = false; } if (ArcaneVolley_Timer <= diff) { - DoCast(m_creature,HEROIC(SPELL_ARCANE_VOLLEY, H_SPELL_ARCANE_VOLLEY)); + DoCast(m_creature, HEROIC(SPELL_ARCANE_VOLLEY, H_SPELL_ARCANE_VOLLEY)); ArcaneVolley_Timer = 7000+rand()%5000; } else ArcaneVolley_Timer -= diff; @@ -147,14 +147,14 @@ struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI Unit *pTarget = NULL; pTarget = HeroicMode ? SelectUnit(SELECT_TARGET_RANDOM,0) : SelectUnit(SELECT_TARGET_TOPAGGRO,1); if (pTarget) - DoCast(pTarget,HEROIC(SPELL_POLYMORPH, H_SPELL_POLYMORPH)); + DoCast(pTarget, HEROIC(SPELL_POLYMORPH, H_SPELL_POLYMORPH)); Sheep_Timer = 15000+rand()%2500; } else Sheep_Timer -= diff; //may not be correct time to cast if (!ManaShield && ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 20)) { - DoCast(m_creature,SPELL_MANA_SHIELD); + DoCast(m_creature, SPELL_MANA_SHIELD); ManaShield = true; } @@ -162,7 +162,7 @@ struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI { if (Slow_Timer <= diff) { - DoCast(m_creature,H_SPELL_SLOW); + DoCast(m_creature, H_SPELL_SLOW); Slow_Timer = 15000+rand()%25000; } else Slow_Timer -= diff; } @@ -177,7 +177,7 @@ struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI m_creature->InterruptNonMeleeSpells(false); //Spell doesn't work, but we use for visual effect at least - DoCast(pTarget,SPELL_BLINK); + DoCast(pTarget, SPELL_BLINK); float X = pTarget->GetPositionX(); float Y = pTarget->GetPositionY(); @@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI DoTeleportTo(X,Y,Z); - DoCast(pTarget,SPELL_BLINK_TELEPORT); + DoCast(pTarget, SPELL_BLINK_TELEPORT); Blink = true; } Blink_Timer = 35000+rand()%5000; diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp index 8b4e378ece2..7a0c82f0926 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp @@ -74,7 +74,7 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public npc_escortAI if (m_pInstance && m_creature->isAlive()) { if (m_pInstance->GetData(TYPE_OVERSEER) != DONE) - m_creature->CastSpell(m_creature, SPELL_BANISH, true); + DoCast(m_creature, SPELL_BANISH, true); } } @@ -171,13 +171,13 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public npc_escortAI if (CorrosiveAcid_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CORROSIVE_ACID); + DoCast(m_creature->getVictim(), SPELL_CORROSIVE_ACID); CorrosiveAcid_Timer = 15000 + rand()%10000; } else CorrosiveAcid_Timer -= diff; if (Fear_Timer <= diff) { - DoCast(m_creature,SPELL_FEAR); + DoCast(m_creature, SPELL_FEAR); Fear_Timer = 20000 + rand()%15000; } else Fear_Timer -= diff; @@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public npc_escortAI { if (!Enraged && Enrage_Timer <= diff) { - DoCast(m_creature,SPELL_ENRAGE); + DoCast(m_creature, SPELL_ENRAGE); Enraged = true; } else Enrage_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp index c1673112794..e94c8953117 100644 --- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp +++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp @@ -247,8 +247,8 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI if (ShadowBoltVolley_Timer <= diff) { - DoCast(m_creature,SPELL_SHADOWBOLT_VOLLEY); - ShadowBoltVolley_Timer = 15000 + rand()%15000;; + DoCast(m_creature, SPELL_SHADOWBOLT_VOLLEY); + ShadowBoltVolley_Timer = 15000 + rand()%15000; } else ShadowBoltVolley_Timer -= diff; if (HeroicMode && banish_Timer <= diff) @@ -256,7 +256,7 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,false); if (pTarget) { - DoCast(pTarget,SPELL_BANISH); + DoCast(pTarget, SPELL_BANISH); banish_Timer = 16000; } } else banish_Timer -= diff; @@ -271,9 +271,9 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI i_pl->TeleportTo(m_creature->GetMapId(), VorpilPosition[0],VorpilPosition[1],VorpilPosition[2], 0, TELE_TO_NOT_LEAVE_COMBAT); m_creature->GetMap()->CreatureRelocation(m_creature, VorpilPosition[0],VorpilPosition[1],VorpilPosition[2],0.0f); - DoCast(m_creature,SPELL_DRAW_SHADOWS,true); + DoCast(m_creature, SPELL_DRAW_SHADOWS, true); - DoCast(m_creature,HeroicMode?H_SPELL_RAIN_OF_FIRE:SPELL_RAIN_OF_FIRE); + DoCast(m_creature, HeroicMode?H_SPELL_RAIN_OF_FIRE:SPELL_RAIN_OF_FIRE); ShadowBoltVolley_Timer = 6000; DrawShadows_Timer = 30000; diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp index 8702cd03876..98ee375a3f9 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp @@ -281,7 +281,7 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI // If VMaps are disabled, this spell can call the whole instance DoCast(m_creature, SPELL_INSIGNIFIGANCE, true); DoCast(pTarget, SPELL_FEL_RAGE_TARGET, true); - DoCast(pTarget,SPELL_FEL_RAGE_2, true); + DoCast(pTarget, SPELL_FEL_RAGE_2, true); /* These spells do not work, comment them out for now. DoCast(pTarget, SPELL_FEL_RAGE_2, true); DoCast(pTarget, SPELL_FEL_RAGE_3, true);*/ diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp index 390c6d28aa7..ddbfafecfdb 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp @@ -368,7 +368,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI boss_illidan_stormrageAI(Creature* c) : ScriptedAI(c), Summons(m_creature) { pInstance = c->GetInstanceData(); - m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true); + DoCast(m_creature, SPELL_DUAL_WIELD, true); SpellEntry *TempSpell = GET_SPELL(SPELL_SHADOWFIEND_PASSIVE); if (TempSpell) @@ -783,7 +783,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI case EVENT_PARASITIC_SHADOWFIEND: { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true)) - m_creature->CastSpell(pTarget, SPELL_PARASITIC_SHADOWFIEND, true); + DoCast(pTarget, SPELL_PARASITIC_SHADOWFIEND, true); Timer[EVENT_PARASITIC_SHADOWFIEND] = 35000 + rand()%10000; } break; @@ -799,7 +799,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI //PHASE_NORMAL_2 case EVENT_AGONIZING_FLAMES: - DoCast(SelectUnit(SELECT_TARGET_RANDOM,0), SPELL_AGONIZING_FLAMES); + DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_AGONIZING_FLAMES); Timer[EVENT_AGONIZING_FLAMES] = 0; break; @@ -1709,7 +1709,7 @@ struct TRINITY_DLL_DECL shadow_demonAI : public ScriptedAI void Reset() { TargetGUID = 0; - m_creature->CastSpell(m_creature, SPELL_SHADOW_DEMON_PASSIVE, true); + DoCast(m_creature, SPELL_SHADOW_DEMON_PASSIVE, true); } void JustDied(Unit *killer) @@ -2059,8 +2059,8 @@ void boss_illidan_stormrageAI::SummonFlamesOfAzzinoth() void boss_illidan_stormrageAI::SummonMaiev() { - m_creature->CastSpell(m_creature, SPELL_SHADOW_PRISON, true); - m_creature->CastSpell(m_creature, 40403, true); + DoCast(m_creature, SPELL_SHADOW_PRISON, true); + DoCast(m_creature, 40403, true); if (!MaievGUID) // If Maiev cannot be summoned, reset the encounter and post some errors to the console. { EnterEvadeMode(); diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp index b575e77c64e..1408a01b8b5 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp @@ -109,7 +109,7 @@ struct TRINITY_DLL_DECL npc_enslaved_soulAI : public ScriptedAI void EnterCombat(Unit* who) { - m_creature->CastSpell(m_creature, ENSLAVED_SOUL_PASSIVE, true); + DoCast(m_creature, ENSLAVED_SOUL_PASSIVE, true); DoZoneInCombat(); } @@ -242,7 +242,7 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI case 1: Timer = 2800; m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_SUBMERGE); // Release the cube - DoCast(m_creature,SPELL_SUBMERGE); + DoCast(m_creature, SPELL_SUBMERGE); DoStartNoMovement(m_creature); break; case 2: @@ -260,7 +260,7 @@ struct TRINITY_DLL_DECL boss_reliquary_of_soulsAI : public ScriptedAI if (Phase == 3) { if (!Essence->isAlive()) - m_creature->CastSpell(m_creature, 7, true); + DoCast(m_creature, 7, true); else return; } else @@ -372,9 +372,9 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI { DoScriptText(SUFF_SAY_FREED, m_creature); DoZoneInCombat(); - m_creature->CastSpell(m_creature, AURA_OF_SUFFERING, true); // linked aura need core support - m_creature->CastSpell(m_creature, ESSENCE_OF_SUFFERING_PASSIVE, true); - m_creature->CastSpell(m_creature, ESSENCE_OF_SUFFERING_PASSIVE2, true); + DoCast(m_creature, AURA_OF_SUFFERING, true); // linked aura need core support + DoCast(m_creature, ESSENCE_OF_SUFFERING_PASSIVE, true); + DoCast(m_creature, ESSENCE_OF_SUFFERING_PASSIVE2, true); } else return; } @@ -437,7 +437,7 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI if (SoulDrainTimer <= diff) { - DoCast(SelectUnit(SELECT_TARGET_RANDOM,0), SPELL_SOUL_DRAIN); + DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_SOUL_DRAIN); SoulDrainTimer = 60000; } else SoulDrainTimer -= diff; @@ -509,7 +509,7 @@ struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI if (RuneShieldTimer <= diff) { m_creature->InterruptNonMeleeSpells(false); - m_creature->CastSpell(m_creature, SPELL_RUNE_SHIELD, true); + DoCast(m_creature, SPELL_RUNE_SHIELD, true); SoulShockTimer += 2000; DeadenTimer += 2000; RuneShieldTimer = 60000; diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp index 515dcb0c417..415faded1d8 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp @@ -179,7 +179,7 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI switch(eventId) { case EVENT_BERSERK: - m_creature->CastSpell(m_creature, SPELL_BERSERK, true); + DoCast(m_creature, SPELL_BERSERK, true); break; case EVENT_FLAME: DoCast(m_creature, SPELL_MOLTEN_PUNCH); diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp index 96409d83520..7e47eae5b25 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp @@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI if (spell->Id == SPELL_HURL_SPINE && m_creature->HasAura(SPELL_TIDAL_SHIELD)) { m_creature->RemoveAurasDueToSpell(SPELL_TIDAL_SHIELD); - m_creature->CastSpell(m_creature, SPELL_TIDAL_BURST, true); + DoCast(m_creature, SPELL_TIDAL_BURST, true); ResetTimer(); } } @@ -145,12 +145,12 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI switch(eventId) { case EVENT_SHIELD: - m_creature->CastSpell(m_creature, SPELL_TIDAL_SHIELD, true); + DoCast(m_creature, SPELL_TIDAL_SHIELD, true); ResetTimer(45000); break; case EVENT_BERSERK: DoScriptText(SAY_ENRAGE2, m_creature); - m_creature->CastSpell(m_creature, SPELL_BERSERK, true); + DoCast(m_creature, SPELL_BERSERK, true); events.DelayEvents(15000, GCD_YELL); break; case EVENT_SPINE: @@ -159,7 +159,7 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI if (!pTarget) pTarget = m_creature->getVictim(); if (pTarget) { - m_creature->CastSpell(pTarget, SPELL_IMPALING_SPINE, true); + DoCast(pTarget, SPELL_IMPALING_SPINE, true); SpineTargetGUID = pTarget->GetGUID(); //must let target summon, otherwise you cannot click the spine pTarget->SummonGameObject(GOBJECT_SPINE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), m_creature->GetOrientation(), 0, 0, 0, 0, 30); @@ -172,11 +172,11 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI } case EVENT_NEEDLE: { - //m_creature->CastSpell(m_creature, SPELL_NEEDLE_SPINE, true); + //DoCast(m_creature, SPELL_NEEDLE_SPINE, true); std::list<Unit*> pTargets; SelectTargetList(pTargets, 3, SELECT_TARGET_RANDOM, 80, true); for (std::list<Unit*>::iterator i = pTargets.begin(); i != pTargets.end(); ++i) - m_creature->CastSpell(*i, 39835, true); + DoCast(*i, 39835, true); events.ScheduleEvent(EVENT_NEEDLE, urand(15000,25000), GCD_CAST); events.DelayEvents(1500, GCD_CAST); return; diff --git a/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp b/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp index 628dd49e236..b23bb56c95f 100644 --- a/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp +++ b/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp @@ -157,9 +157,9 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance if (m_auiEncounter[1] == DONE)HandleGameObject(NULL,true,pGo);break; case 185478: ShadeOfAkamaDoor = pGo->GetGUID();break; case 185480: CommonDoor = pGo->GetGUID(); - if (m_auiEncounter[3] == DONE)HandleGameObject(NULL,true,pGo);;break; + if (m_auiEncounter[3] == DONE)HandleGameObject(NULL,true,pGo);break; case 186153: TeronDoor = pGo->GetGUID(); - if (m_auiEncounter[3] == DONE)HandleGameObject(NULL,true,pGo);;break; + if (m_auiEncounter[3] == DONE)HandleGameObject(NULL,true,pGo);break; case 185892: GuurtogDoor = pGo->GetGUID(); if (m_auiEncounter[4] == DONE)HandleGameObject(NULL,true,pGo);break; case 185479: TempleDoor = pGo->GetGUID(); diff --git a/src/bindings/scripts/scripts/outland/blades_edge_mountains.cpp b/src/bindings/scripts/scripts/outland/blades_edge_mountains.cpp index ed6de66391f..ac47bba0f09 100644 --- a/src/bindings/scripts/scripts/outland/blades_edge_mountains.cpp +++ b/src/bindings/scripts/scripts/outland/blades_edge_mountains.cpp @@ -211,7 +211,7 @@ struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI if (IntangiblePresence_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_INTANGIBLE_PRESENCE); + DoCast(m_creature->getVictim(), SPELL_INTANGIBLE_PRESENCE); IntangiblePresence_Timer = 15000+rand()%15000; } else IntangiblePresence_Timer -= diff; @@ -219,13 +219,13 @@ struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI { Unit *pTarget = m_creature->getVictim(); if (pTarget && pTarget->getPowerType() == POWER_MANA) - DoCast(pTarget,SPELL_MANA_BURN); + DoCast(pTarget, SPELL_MANA_BURN); ManaBurn_Timer = 8000+rand()%8000; } else ManaBurn_Timer -= diff; if (ArcaneBlast_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ARCANE_BLAST); + DoCast(m_creature->getVictim(), SPELL_ARCANE_BLAST); ArcaneBlast_Timer = 2500+rand()%5000; } else ArcaneBlast_Timer -= diff; @@ -264,7 +264,7 @@ struct TRINITY_DLL_DECL npc_daranelleAI : public ScriptedAI { DoScriptText(SAY_SPELL_INFLUENCE, m_creature, who); //TODO: Move the below to updateAI and run if this statement == true - m_creature->CastSpell(who,37028,true); + DoCast(who, 37028, true); } } diff --git a/src/bindings/scripts/scripts/outland/boss_doomlord_kazzak.cpp b/src/bindings/scripts/scripts/outland/boss_doomlord_kazzak.cpp index ad35d4315f9..61eb42cc6fa 100644 --- a/src/bindings/scripts/scripts/outland/boss_doomlord_kazzak.cpp +++ b/src/bindings/scripts/scripts/outland/boss_doomlord_kazzak.cpp @@ -84,7 +84,7 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI if (victim->GetTypeId() != TYPEID_PLAYER) return; - DoCast(m_creature,SPELL_CAPTURESOUL); + DoCast(m_creature, SPELL_CAPTURESOUL); DoScriptText(RAND(SAY_KILL1,SAY_KILL2,SAY_KILL3), m_creature); } @@ -110,21 +110,21 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI //Cleave_Timer if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 8000 + rand()%4000; } else Cleave_Timer -= diff; //ThunderClap_Timer if (ThunderClap_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_THUNDERCLAP); + DoCast(m_creature->getVictim(), SPELL_THUNDERCLAP); ThunderClap_Timer = 10000 + rand()%4000; } else ThunderClap_Timer -= diff; //VoidBolt_Timer if (VoidBolt_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_VOIDBOLT); + DoCast(m_creature->getVictim(), SPELL_VOIDBOLT); VoidBolt_Timer = 15000 + rand()%3000; } else VoidBolt_Timer -= diff; @@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL boss_doomlordkazzakAI : public ScriptedAI if (Enrage_Timer <= diff) { DoScriptText(EMOTE_FRENZY, m_creature); - DoCast(m_creature,SPELL_ENRAGE); + DoCast(m_creature, SPELL_ENRAGE); Enrage_Timer = 30000; } else Enrage_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/boss_doomwalker.cpp b/src/bindings/scripts/scripts/outland/boss_doomwalker.cpp index 6e19e325884..b456f1d7ef2 100644 --- a/src/bindings/scripts/scripts/outland/boss_doomwalker.cpp +++ b/src/bindings/scripts/scripts/outland/boss_doomwalker.cpp @@ -105,7 +105,7 @@ struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI { if (Enrage_Timer <= diff) { - DoCast(m_creature,SPELL_ENRAGE); + DoCast(m_creature, SPELL_ENRAGE); Enrage_Timer = 6000; InEnrage = true; } else Enrage_Timer -= diff; @@ -116,7 +116,7 @@ struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI { DoScriptText(RAND(SAY_OVERRUN_1,SAY_OVERRUN_2), m_creature); - DoCast(m_creature->getVictim(),SPELL_OVERRUN); + DoCast(m_creature->getVictim(), SPELL_OVERRUN); Overrun_Timer = 25000 + rand()%15000; } else Overrun_Timer -= diff; @@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI if (InEnrage) m_creature->RemoveAura(SPELL_ENRAGE); - DoCast(m_creature,SPELL_EARTHQUAKE); + DoCast(m_creature, SPELL_EARTHQUAKE); Quake_Timer = 30000 + rand()%25000; } else Quake_Timer -= diff; @@ -146,7 +146,7 @@ struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI pTarget = m_creature->getVictim(); if (pTarget) - DoCast(pTarget,SPELL_CHAIN_LIGHTNING); + DoCast(pTarget, SPELL_CHAIN_LIGHTNING); Chain_Timer = 7000 + rand()%20000; } else Chain_Timer -= diff; @@ -154,7 +154,7 @@ struct TRINITY_DLL_DECL boss_doomwalkerAI : public ScriptedAI //Spell Sunder Armor if (Armor_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SUNDER_ARMOR); + DoCast(m_creature->getVictim(), SPELL_SUNDER_ARMOR); Armor_Timer = 10000 + rand()%15000; } else Armor_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index ef5ef21603a..d0c7753f0ac 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -897,7 +897,7 @@ struct TRINITY_DLL_DECL mob_shield_generator_channelAI : public ScriptedAI //start visual channel if (!Casted || !Vashj->HasAura(SPELL_MAGIC_BARRIER)) { - m_creature->CastSpell(Vashj,SPELL_MAGIC_BARRIER,true); + DoCast(Vashj, SPELL_MAGIC_BARRIER, true); Casted = true; } } diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp index 270b6c3383c..eaa5ce84174 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp @@ -131,7 +131,7 @@ struct TRINITY_DLL_DECL mob_inner_demonAI : public ScriptedAI } else Link_Timer -= diff; if (!m_creature->HasAura(AURA_DEMONIC_ALIGNMENT)) - DoCast(m_creature, AURA_DEMONIC_ALIGNMENT,true); + DoCast(m_creature, AURA_DEMONIC_ALIGNMENT, true); if (ShadowBolt_Timer <= diff) { @@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI m_creature->SetDisplayId(MODEL_NIGHTELF); m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID , 0); m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); - m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true); + DoCast(m_creature, SPELL_DUAL_WIELD, true); m_creature->SetCorpseDelay(1000*60*60); if (pInstance) pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, NOT_STARTED); @@ -469,7 +469,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI // will cast only when in range of spell if (m_creature->IsWithinDist(m_creature->getVictim(), 30)) { - //m_creature->CastSpell(m_creature->getVictim(), SPELL_CHAOS_BLAST, true); + //DoCast(m_creature->getVictim(), SPELL_CHAOS_BLAST, true); int damage = 100; m_creature->CastCustomSpell(m_creature->getVictim(), SPELL_CHAOS_BLAST, &damage, NULL, NULL, false, NULL, NULL, m_creature->GetGUID()); } @@ -592,7 +592,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blind_demonformAI : public ScriptedAI void JustDied(Unit *victim) { //invisibility (blizzlike, at the end of the fight he doesn't die, he disappears) - m_creature->CastSpell(m_creature, 8149, true); + DoCast(m_creature, 8149, true); } void EnterCombat(Unit *who) @@ -614,7 +614,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blind_demonformAI : public ScriptedAI // will cast only when in range od spell if (m_creature->IsWithinDist(m_creature->getVictim(), 30)) { - //m_creature->CastSpell(m_creature->getVictim(),SPELL_CHAOS_BLAST,true); + //DoCast(m_creature->getVictim(), SPELL_CHAOS_BLAST, true); int damage = 100; m_creature->CastCustomSpell(m_creature->getVictim(), SPELL_CHAOS_BLAST, &damage, NULL, NULL, false, NULL, NULL, m_creature->GetGUID()); ChaosBlast_Timer = 3000; @@ -628,7 +628,7 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI { mob_greyheart_spellbinderAI(Creature *c) : ScriptedAI(c) { - pInstance = c->GetInstanceData();; + pInstance = c->GetInstanceData(); leotherasGUID = 0; AddedBanish = false; } diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp index c58af1495ed..51ca68112a0 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp @@ -128,7 +128,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI pInstance->SetData(DATA_THELURKERBELOWEVENT, NOT_STARTED); pInstance->SetData(DATA_STRANGE_POOL, NOT_STARTED); } - DoCast(m_creature,SPELL_SUBMERGE);//submerge anim + DoCast(m_creature, SPELL_SUBMERGE);//submerge anim m_creature->SetVisibility(VISIBILITY_OFF);//we start invis under water, submerged m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); @@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI { m_creature->RemoveAllAuras(); m_creature->RemoveFlag(UNIT_NPC_EMOTESTATE,EMOTE_STATE_SUBMERGED); - DoCast(m_creature,SPELL_EMERGE,false); + DoCast(m_creature, SPELL_EMERGE, false); WaitTimer2 = 60000;//never reached WaitTimer = 3000; } else WaitTimer2 -= diff; @@ -212,7 +212,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI if (PhaseTimer <= diff) { m_creature->InterruptNonMeleeSpells(false); - DoCast(m_creature,SPELL_SUBMERGE); + DoCast(m_creature, SPELL_SUBMERGE); PhaseTimer = 60000;//60secs submerged Submerged = true; } else PhaseTimer-=diff; @@ -232,7 +232,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI if (WhirlTimer <= diff) { WhirlTimer = 18000; - DoCast(m_creature,SPELL_WHIRL); + DoCast(m_creature, SPELL_WHIRL); } else WhirlTimer -= diff; if (CheckTimer <= diff)//check if there are players in melee range @@ -260,13 +260,13 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { if (i->getSource() && i->getSource()->isAlive() && m_creature->HasInArc((double)diff/20000*(double)M_PI*2,i->getSource()) && m_creature->IsWithinDist(i->getSource(), SPOUT_DIST) && !i->getSource()->IsInWater()) - DoCast(i->getSource(),SPELL_SPOUT,true);//only knock back palyers in arc, in 100yards, not in water + DoCast(i->getSource(), SPELL_SPOUT, true);//only knock back palyers in arc, in 100yards, not in water } } if (SpoutAnimTimer <= diff) { - DoCast(m_creature,SPELL_SPOUT_ANIM,true); + DoCast(m_creature, SPELL_SPOUT_ANIM, true); SpoutAnimTimer = 1000; } else SpoutAnimTimer -= diff; @@ -283,7 +283,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI if (!pTarget && m_creature->getVictim()) pTarget = m_creature->getVictim(); if (pTarget) - DoCast(pTarget,SPELL_GEYSER,true); + DoCast(pTarget, SPELL_GEYSER, true); GeyserTimer = rand()%5000 + 15000; } else GeyserTimer -= diff; @@ -295,7 +295,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI if (!pTarget && m_creature->getVictim()) pTarget = m_creature->getVictim(); if (pTarget) - DoCast(pTarget,SPELL_WATERBOLT,true); + DoCast(pTarget, SPELL_WATERBOLT, true); WaterboltTimer = 3000; } else WaterboltTimer -= diff; } @@ -314,7 +314,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI m_creature->RemoveAllAuras(); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); m_creature->RemoveFlag(UNIT_NPC_EMOTESTATE,EMOTE_STATE_SUBMERGED); - DoCast(m_creature,SPELL_EMERGE,true); + DoCast(m_creature, SPELL_EMERGE, true); Spawned = false; SpoutTimer = 3000; // directly cast Spout after emerging! PhaseTimer = 120000; diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp index 14b4a49f5d9..5d48d5ecf44 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp @@ -121,23 +121,23 @@ struct TRINITY_DLL_DECL boss_mekgineer_steamriggerAI : public ScriptedAI if (Shrink_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SUPER_SHRINK_RAY); + DoCast(m_creature->getVictim(), SPELL_SUPER_SHRINK_RAY); Shrink_Timer = 20000; } else Shrink_Timer -= diff; if (Saw_Blade_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(pTarget,SPELL_SAW_BLADE); + DoCast(pTarget, SPELL_SAW_BLADE); else - DoCast(m_creature->getVictim(),SPELL_SAW_BLADE); + DoCast(m_creature->getVictim(), SPELL_SAW_BLADE); Saw_Blade_Timer = 15000; } else Saw_Blade_Timer -= diff; if (Electrified_Net_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ELECTRIFIED_NET); + DoCast(m_creature->getVictim(), SPELL_ELECTRIFIED_NET); Electrified_Net_Timer = 10000; } else Electrified_Net_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp index b0c8a3eafc8..bd6223368a1 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp @@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL mob_naga_distillerAI : public ScriptedAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - DoCast(m_creature,SPELL_WARLORDS_RAGE_NAGA,true); + DoCast(m_creature, SPELL_WARLORDS_RAGE_NAGA, true); if (pInstance) pInstance->SetData(TYPE_DISTILLER,IN_PROGRESS); @@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL boss_warlord_kalithreshAI : public ScriptedAI if (Creature* distiller = me->FindNearestCreature(17954, 100.0f)) { DoScriptText(SAY_REGEN, m_creature); - DoCast(m_creature,SPELL_WARLORDS_RAGE); + DoCast(m_creature, SPELL_WARLORDS_RAGE); CAST_AI(mob_naga_distillerAI, distiller->AI())->StartRageGen(m_creature); } Rage_Timer = 3000+rand()%15000; @@ -168,7 +168,7 @@ struct TRINITY_DLL_DECL boss_warlord_kalithreshAI : public ScriptedAI if (Impale_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_IMPALE); + DoCast(pTarget, SPELL_IMPALE); Impale_Timer = 7500+rand()%5000; } else Impale_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp index 816d1c3f126..469e5160648 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp @@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_hungarfenAI : public ScriptedAI { if (!Root) { - DoCast(m_creature,SPELL_FOUL_SPORES); + DoCast(m_creature, SPELL_FOUL_SPORES); Root = true; } } @@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_hungarfenAI : public ScriptedAI if (AcidGeyser_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_ACID_GEYSER); + DoCast(pTarget, SPELL_ACID_GEYSER); AcidGeyser_Timer = 10000+rand()%7500; } else AcidGeyser_Timer -= diff; @@ -106,8 +106,8 @@ struct TRINITY_DLL_DECL mob_underbog_mushroomAI : public ScriptedAI Grow_Timer = 0; Shrink_Timer = 20000; - DoCast(m_creature,SPELL_PUTRID_MUSHROOM,true); - DoCast(m_creature,SPELL_SPORE_CLOUD,true); + DoCast(m_creature, SPELL_PUTRID_MUSHROOM, true); + DoCast(m_creature, SPELL_SPORE_CLOUD, true); } void MoveInLineOfSight(Unit *who) { return; } @@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL mob_underbog_mushroomAI : public ScriptedAI if (Grow_Timer <= diff) { - DoCast(m_creature,SPELL_GROW); + DoCast(m_creature, SPELL_GROW); Grow_Timer = 3000; } else Grow_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp index 2f5ada6b3af..b5e868954da 100644 --- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp +++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp @@ -106,7 +106,7 @@ struct TRINITY_DLL_DECL boss_the_black_stalkerAI : public ScriptedAI // Spore Striders if (HeroicMode && SporeStriders_Timer <= diff) { - DoCast(m_creature,SPELL_SUMMON_SPORE_STRIDER); + DoCast(m_creature, SPELL_SUMMON_SPORE_STRIDER); SporeStriders_Timer = 10000+rand()%5000; } else SporeStriders_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp index aacd944d02a..dec756bc3d9 100644 --- a/src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp +++ b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp @@ -159,7 +159,7 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI if (m_uiGrowth_Timer <= uiDiff) { DoScriptText(EMOTE_GROW, m_creature); - DoCast(m_creature,SPELL_GROWTH); + DoCast(m_creature, SPELL_GROWTH); m_uiGrowth_Timer = 30000; } else @@ -188,9 +188,9 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,1); if (pTarget && m_creature->IsWithinMeleeRange(m_creature->getVictim())) - DoCast(pTarget,SPELL_HURTFUL_STRIKE); + DoCast(pTarget, SPELL_HURTFUL_STRIKE); else - DoCast(m_creature->getVictim(),SPELL_HURTFUL_STRIKE); + DoCast(m_creature->getVictim(), SPELL_HURTFUL_STRIKE); m_uiHurtfulStrike_Timer= 8000; } @@ -210,7 +210,7 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI if (m_uiCaveIn_Timer <= uiDiff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_CAVE_IN); + DoCast(pTarget, SPELL_CAVE_IN); if (m_uiCaveIn_StaticTimer >= 4000) m_uiCaveIn_StaticTimer -= 2000; diff --git a/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp index f8f77afc550..ca693bbff54 100644 --- a/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp +++ b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp @@ -133,7 +133,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI Charging_Timer = 0; Roar_Timer = 0; - m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, false); + DoCast(m_creature, SPELL_DUAL_WIELD, false); Phase2 = false; @@ -258,7 +258,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI Phase2 = true; DoScriptText(SAY_ENRAGE, m_creature); - m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true); + DoCast(m_creature, SPELL_DUAL_WIELD, true); m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, 0); m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID+1, 0); } diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp index 56d01af1227..558c690460d 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp @@ -85,19 +85,19 @@ struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI if (AcidSpray_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SLIME_SPRAY); + DoCast(m_creature->getVictim(), SPELL_SLIME_SPRAY); AcidSpray_Timer = 4000+rand()%8000; } else AcidSpray_Timer -=diff; if (PoisonBolt_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_POISON_BOLT); + DoCast(m_creature->getVictim(), SPELL_POISON_BOLT); PoisonBolt_Timer = 4000+rand()%8000; } else PoisonBolt_Timer -=diff; if (PoisonSpawn_Timer <= diff) { - DoCast(m_creature,SPELL_POISON_CLOUD); + DoCast(m_creature, SPELL_POISON_CLOUD); PoisonSpawn_Timer = 20000; } else PoisonSpawn_Timer -=diff; diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp index 936eb80b0b7..615d242018a 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp @@ -193,7 +193,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI if (check_Timer <= diff) { if (!m_creature->IsNonMeleeSpellCasted(false)) - DoCast(m_creature,SPELL_EVOCATION); + DoCast(m_creature, SPELL_EVOCATION); check_Timer = 5000; } else check_Timer -= diff; return; @@ -219,7 +219,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI if (Corruption_Timer <= diff) { - DoCast(m_creature,SPELL_CORRUPTION); + DoCast(m_creature, SPELL_CORRUPTION); Corruption_Timer = 30000+rand()%20000; } else Corruption_Timer -=diff; @@ -321,7 +321,7 @@ struct TRINITY_DLL_DECL mob_shadowmoon_channelerAI : public ScriptedAI { uint64 channeler = CAST_AI(boss_kelidan_the_breakerAI, Kelidan->AI())->GetChanneled(m_creature); if (Unit *channeled = Unit::GetUnit(*m_creature, channeler)) - DoCast(channeled,SPELL_CHANNELING); + DoCast(channeled, SPELL_CHANNELING); } check_Timer = 5000; } else check_Timer -= diff; @@ -331,7 +331,7 @@ struct TRINITY_DLL_DECL mob_shadowmoon_channelerAI : public ScriptedAI if (MarkOfShadow_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget,SPELL_MARK_OF_SHADOW); + DoCast(pTarget, SPELL_MARK_OF_SHADOW); MarkOfShadow_Timer = 15000+rand()%5000; } else MarkOfShadow_Timer -=diff; diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp index 7598af0e8e6..2be4685ebad 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp @@ -103,14 +103,14 @@ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI if (AcidSpray_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ACID_SPRAY); + DoCast(m_creature->getVictim(), SPELL_ACID_SPRAY); AcidSpray_Timer = 15000+rand()%8000; } else AcidSpray_Timer -=diff; if (ExplodingBreaker_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_EXPLODING_BREAKER); + DoCast(pTarget, SPELL_EXPLODING_BREAKER); ExplodingBreaker_Timer = 4000+rand()%8000; } else ExplodingBreaker_Timer -=diff; @@ -120,7 +120,7 @@ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI Unit *pTarget; pTarget = SelectUnit(SELECT_TARGET_RANDOM,0); - DoCast(pTarget,SPELL_DOMINATION); + DoCast(pTarget, SPELL_DOMINATION); domination_timer = 120000; } else domination_timer -=diff; @@ -128,7 +128,7 @@ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI if (Knockdown_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_KNOCKDOWN); + DoCast(m_creature->getVictim(), SPELL_KNOCKDOWN); Knockdown_Timer = 4000+rand()%8000; } else Knockdown_Timer -=diff; diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp index 31947a421e6..e48f06ae5b9 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp @@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI if (Summon_Timer <= diff) { m_creature->InterruptNonMeleeSpells(false); - DoCast(m_creature,SPELL_SUMMON_FIENDISH_HOUND); + DoCast(m_creature, SPELL_SUMMON_FIENDISH_HOUND); Summon_Timer = 15000+rand()%15000; } else Summon_Timer -= diff; } @@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI if (temp->HasUnitMovementFlag(MOVEMENTFLAG_FALLING)) { m_creature->InterruptNonMeleeSpells(false); - DoCast(temp,SPELL_SHADOW_WHIP); + DoCast(temp, SPELL_SHADOW_WHIP); } } PlayerGUID = 0; @@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI if (temp && temp->GetTypeId() == TYPEID_PLAYER) { - DoCast(temp,SPELL_ORBITAL_STRIKE); + DoCast(temp, SPELL_ORBITAL_STRIKE); OrbitalStrike_Timer = 14000+rand()%2000; PlayerGUID = temp->GetGUID(); @@ -160,7 +160,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI { if (DemonicShield_Timer <= diff) { - DoCast(m_creature,SPELL_DEMONIC_SHIELD); + DoCast(m_creature, SPELL_DEMONIC_SHIELD); DemonicShield_Timer = 15000; } else DemonicShield_Timer -= diff; } @@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) { - DoCast(pTarget,HEROIC(SPELL_TREACHEROUS_AURA, H_SPELL_BANE_OF_TREACHERY)); + DoCast(pTarget, HEROIC(SPELL_TREACHEROUS_AURA, H_SPELL_BANE_OF_TREACHERY)); Aura_Timer = 8000+rand()%8000; } } else Aura_Timer -= diff; @@ -183,7 +183,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI if (pTarget) pTarget = m_creature->getVictim(); - DoCast(pTarget,HEROIC(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); + DoCast(pTarget, HEROIC(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); Shadowbolt_Timer = 4000+rand()%2500; } } else Shadowbolt_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp index 13ef2de0981..7fb673bcaba 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp @@ -118,7 +118,7 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI if (Fireball_Timer <= diff) { if (Unit *victim = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(victim, SPELL_FIREBALL,true); + DoCast(victim, SPELL_FIREBALL, true); Fireball_Timer = urand(4000,7000); } else Fireball_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp index dc156647878..900c3dea267 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp @@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL boss_watchkeeper_gargolmarAI : public ScriptedAI if (MortalWound_Timer <= diff) { - DoCast(m_creature->getVictim(),HEROIC(SPELL_MORTAL_WOUND, H_SPELL_MORTAL_WOUND)); + DoCast(m_creature->getVictim(), HEROIC(SPELL_MORTAL_WOUND, H_SPELL_MORTAL_WOUND)); MortalWound_Timer = 5000+rand()%8000; } else MortalWound_Timer -= diff; @@ -116,7 +116,7 @@ struct TRINITY_DLL_DECL boss_watchkeeper_gargolmarAI : public ScriptedAI DoScriptText(SAY_SURGE, m_creature); if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_SURGE); + DoCast(pTarget, SPELL_SURGE); Surge_Timer = 5000+rand()%8000; } else Surge_Timer -= diff; @@ -125,7 +125,7 @@ struct TRINITY_DLL_DECL boss_watchkeeper_gargolmarAI : public ScriptedAI { if (Retaliation_Timer <= diff) { - DoCast(m_creature,SPELL_RETALIATION); + DoCast(m_creature, SPELL_RETALIATION); Retaliation_Timer = 30000; } else Retaliation_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp index 49e5d3db33c..a0640fdc1f7 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp @@ -109,7 +109,7 @@ struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI { if (trigger == 2 && spell->Id == SPELL_BLAZE_TARGET) { - m_creature->CastSpell(m_creature, SPELL_BLAZE_TRAP, true); + DoCast(m_creature, SPELL_BLAZE_TRAP, true); m_creature->SetVisibility(VISIBILITY_OFF); Despawn_Timer = 130000; } @@ -122,7 +122,7 @@ struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI if (trigger == 1) //debris { m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - m_creature->CastSpell(m_creature, SPELL_DEBRIS_VISUAL, true); + DoCast(m_creature, SPELL_DEBRIS_VISUAL, true); FireBlast_Timer = 5000; Despawn_Timer = 10000; } @@ -140,7 +140,7 @@ struct TRINITY_DLL_DECL mob_abyssalAI : public ScriptedAI { if (FireBlast_Timer <= diff) { - m_creature->CastSpell(m_creature, SPELL_DEBRIS_DAMAGE, true); + DoCast(m_creature, SPELL_DEBRIS_DAMAGE, true); trigger = 3; } else FireBlast_Timer -= diff; } @@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); m_creature->addUnitState(UNIT_STAT_STUNNED); - m_creature->CastSpell(m_creature, SPELL_SHADOW_CAGE_C, true); + DoCast(m_creature, SPELL_SHADOW_CAGE_C, true); } void JustReachedHome() @@ -271,7 +271,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI if (ClickerNum >= CLICKERS_COUNT && !m_creature->HasAura(SPELL_SHADOW_CAGE)) { DoScriptText(SAY_BANISH, m_creature); - m_creature->CastSpell(m_creature, SPELL_SHADOW_CAGE, true); + DoCast(m_creature, SPELL_SHADOW_CAGE, true); } else if (ClickerNum < CLICKERS_COUNT && m_creature->HasAura(SPELL_SHADOW_CAGE)) m_creature->RemoveAurasDueToSpell(SPELL_SHADOW_CAGE); @@ -330,14 +330,14 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI if (Berserk_Timer <= diff) { - m_creature->CastSpell(m_creature, SPELL_BERSERK, true); + DoCast(m_creature, SPELL_BERSERK, true); DoScriptText(EMOTE_BERSERK, m_creature); Berserk_Timer = 60000; } else Berserk_Timer -= diff; if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_CLEAVE); + DoCast(m_creature->getVictim(), SPELL_CLEAVE); Cleave_Timer = 10000; } else Cleave_Timer -= diff; @@ -357,7 +357,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI // to avoid blastnova interruption if (!m_creature->IsNonMeleeSpellCasted(false)) { - m_creature->CastSpell(m_creature, SPELL_QUAKE_TRIGGER, true); + DoCast(m_creature, SPELL_QUAKE_TRIGGER, true); Quake_Timer = 50000; } } else Quake_Timer -= diff; @@ -372,7 +372,7 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI if (summon) { CAST_AI(mob_abyssalAI, summon->AI())->SetTrigger(2); - m_creature->CastSpell(summon, SPELL_BLAZE_TARGET, true); + DoCast(summon, SPELL_BLAZE_TARGET, true); summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } } @@ -385,8 +385,8 @@ struct TRINITY_DLL_DECL boss_magtheridonAI : public ScriptedAI { Phase3 = true; DoScriptText(SAY_CHAMBER_DESTROY, m_creature); - m_creature->CastSpell(m_creature, SPELL_CAMERA_SHAKE, true); - m_creature->CastSpell(m_creature, SPELL_DEBRIS_KNOCKDOWN, true); + DoCast(m_creature, SPELL_CAMERA_SHAKE, true); + DoCast(m_creature, SPELL_DEBRIS_KNOCKDOWN, true); if (pInstance) pInstance->SetData(DATA_COLLAPSE, true); @@ -451,7 +451,7 @@ struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI if (pInstance) pInstance->SetData(DATA_CHANNELER_EVENT, NOT_STARTED); - m_creature->CastSpell(m_creature, SPELL_SHADOW_GRASP_C, false); + DoCast(m_creature, SPELL_SHADOW_GRASP_C, false); } void JustSummoned(Creature *summon) @@ -462,7 +462,7 @@ struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI void DamageTaken(Unit*, uint32 &damage) { if (damage >= m_creature->GetHealth()) - m_creature->CastSpell(m_creature, SPELL_SOUL_TRANSFER, true); + DoCast(m_creature, SPELL_SOUL_TRANSFER, true); } void JustDied(Unit* who) @@ -499,7 +499,7 @@ struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI if (Infernal_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - m_creature->CastSpell(pTarget, SPELL_BURNING_ABYSSAL, true); + DoCast(pTarget, SPELL_BURNING_ABYSSAL, true); Infernal_Timer = 30000 + rand()%10000; } else Infernal_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp index 74d930afd3b..8b479522ff3 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp @@ -249,13 +249,13 @@ struct TRINITY_DLL_DECL boss_grand_warlock_nethekurseAI : public ScriptedAI { if (!SpinOnce) { - DoCast(m_creature->getVictim(),SPELL_DARK_SPIN); + DoCast(m_creature->getVictim(), SPELL_DARK_SPIN); SpinOnce = true; } if (Cleave_Timer <= diff) { - DoCast(m_creature->getVictim(),HEROIC(SPELL_SHADOW_CLEAVE, H_SPELL_SHADOW_SLAM)); + DoCast(m_creature->getVictim(), HEROIC(SPELL_SHADOW_CLEAVE, H_SPELL_SHADOW_SLAM)); Cleave_Timer = 6000+rand()%2500; } else Cleave_Timer -= diff; } @@ -264,14 +264,14 @@ struct TRINITY_DLL_DECL boss_grand_warlock_nethekurseAI : public ScriptedAI if (ShadowFissure_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_SHADOW_FISSURE); + DoCast(pTarget, SPELL_SHADOW_FISSURE); ShadowFissure_Timer = urand(7500,15000); } else ShadowFissure_Timer -= diff; if (DeathCoil_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_DEATH_COIL); + DoCast(pTarget, SPELL_DEATH_COIL); DeathCoil_Timer = urand(15000,20000); } else DeathCoil_Timer -= diff; @@ -342,7 +342,7 @@ struct TRINITY_DLL_DECL mob_fel_orc_convertAI : public ScriptedAI if (Hemorrhage_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_HEMORRHAGE); + DoCast(m_creature->getVictim(), SPELL_HEMORRHAGE); Hemorrhage_Timer = 15000; } else Hemorrhage_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp index ae1b5fa5d37..64c2c84890a 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp @@ -335,7 +335,7 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI if (BlastCount && BlastWave_Timer <= diff) { - DoCast(m_creature,SPELL_BLAST_WAVE); + DoCast(m_creature, SPELL_BLAST_WAVE); BlastWave_Timer = 5000; ++BlastCount; @@ -346,7 +346,7 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI if (BurningMaul_Timer <= diff) { DoScriptText(EMOTE_ENRAGE, m_creature); - DoCast(m_creature,HEROIC(SPELL_BURNING_MAUL, H_SPELL_BURNING_MAUL)); + DoCast(m_creature, HEROIC(SPELL_BURNING_MAUL, H_SPELL_BURNING_MAUL)); BurningMaul_Timer = 40000; BlastWave_Timer = 16000; BlastCount = 1; @@ -365,13 +365,13 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI if (Fear_Timer <= diff) { - DoCast(m_creature,SPELL_FEAR); + DoCast(m_creature, SPELL_FEAR); Fear_Timer = 15000+rand()%20000; } else Fear_Timer -= diff; if (ThunderClap_Timer <= diff) { - DoCast(m_creature,SPELL_THUNDERCLAP); + DoCast(m_creature, SPELL_THUNDERCLAP); ThunderClap_Timer = 15000+rand()%15000; } else ThunderClap_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp index c16c2ef8772..78e7d7a22e5 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp @@ -139,7 +139,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI if (target_num > 0) // to prevent loops { Wait_Timer = 1; - DoCast(m_creature,SPELL_BLADE_DANCE,true); + DoCast(m_creature, SPELL_BLADE_DANCE, true); target_num--; } } @@ -237,7 +237,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI if (Charge_timer) if (Charge_timer <= diff) { - DoCast(SelectUnit(SELECT_TARGET_RANDOM,0),H_SPELL_CHARGE); + DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), H_SPELL_CHARGE); Charge_timer = 0; } else Charge_timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp b/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp index fc43ed75304..6fc5a87d822 100644 --- a/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp +++ b/src/bindings/scripts/scripts/outland/hellfire_peninsula.cpp @@ -99,13 +99,13 @@ struct TRINITY_DLL_DECL npc_aeranasAI : public ScriptedAI if (Shock_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SHOCK); + DoCast(m_creature->getVictim(), SPELL_SHOCK); Shock_Timer = 10000; } else Shock_Timer -= diff; if (EnvelopingWinds_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ENVELOPING_WINDS); + DoCast(m_creature->getVictim(), SPELL_ENVELOPING_WINDS); EnvelopingWinds_Timer = 25000; } else EnvelopingWinds_Timer -= diff; @@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL npc_ancestral_wolfAI : public npc_escortAI void Reset() { pRyga = NULL; - m_creature->CastSpell(m_creature, SPELL_ANCESTRAL_WOLF_BUFF, true); + DoCast(m_creature, SPELL_ANCESTRAL_WOLF_BUFF, true); } void MoveInLineOfSight(Unit* pWho) diff --git a/src/bindings/scripts/scripts/outland/nagrand.cpp b/src/bindings/scripts/scripts/outland/nagrand.cpp index 3493c34f2c2..a5ea0623e4a 100644 --- a/src/bindings/scripts/scripts/outland/nagrand.cpp +++ b/src/bindings/scripts/scripts/outland/nagrand.cpp @@ -566,7 +566,7 @@ struct TRINITY_DLL_DECL npc_maghar_captiveAI : public npc_escortAI void Aggro(Unit* pWho) { - m_creature->CastSpell(m_creature, SPELL_EARTHBIND_TOTEM, false); + DoCast(m_creature, SPELL_EARTHBIND_TOTEM, false); } void WaypointReached(uint32 uiPointId) @@ -808,7 +808,7 @@ struct TRINITY_DLL_DECL mob_sparrowhawkAI : public ScriptedAI { if (spell->Id == SPELL_SPARROWHAWK_NET && CAST_PLR(caster)->GetQuestStatus(10987) == QUEST_STATUS_INCOMPLETE) { - m_creature->CastSpell(caster, SPELL_ITEM_CAPTIVE_SPARROWHAWK, true); + DoCast(caster, SPELL_ITEM_CAPTIVE_SPARROWHAWK, true); m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } diff --git a/src/bindings/scripts/scripts/outland/netherstorm.cpp b/src/bindings/scripts/scripts/outland/netherstorm.cpp index 3b0c08c2f3a..5f4aa66e5f8 100644 --- a/src/bindings/scripts/scripts/outland/netherstorm.cpp +++ b/src/bindings/scripts/scripts/outland/netherstorm.cpp @@ -257,7 +257,7 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI Unit* u = Unit::GetUnit((*m_creature),someplayer); if (u && u->GetTypeId() == TYPEID_PLAYER) CAST_PLR(u)->KilledMonsterCredit(m_creature->GetEntry(),m_creature->GetGUID()); - DoCast(m_creature,SPELL_DISABLE_VISUAL); + DoCast(m_creature, SPELL_DISABLE_VISUAL); } if (goConsole) { diff --git a/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp index 70626f1401b..e11332596e3 100644 --- a/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/outland/shadowmoon_valley.cpp @@ -1718,7 +1718,7 @@ struct TRINITY_DLL_DECL npc_enraged_spiritAI : public ScriptedAI if (Owner && Owner->GetTypeId() == TYPEID_PLAYER) // DoCast(Owner, credit); -- not working! CAST_PLR(Owner)->KilledMonsterCredit(credit, Summoned->GetGUID()); - DoCast(totemOspirits,SPELL_SOUL_CAPTURED); + DoCast(totemOspirits, SPELL_SOUL_CAPTURED); } } } diff --git a/src/bindings/scripts/scripts/outland/shattrath_city.cpp b/src/bindings/scripts/scripts/outland/shattrath_city.cpp index bce1abf034d..622d64365c4 100644 --- a/src/bindings/scripts/scripts/outland/shattrath_city.cpp +++ b/src/bindings/scripts/scripts/outland/shattrath_city.cpp @@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL npc_raliq_the_drunkAI : public ScriptedAI if (Uppercut_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_UPPERCUT); + DoCast(m_creature->getVictim(), SPELL_UPPERCUT); Uppercut_Timer = 15000; } else Uppercut_Timer -= diff; @@ -144,7 +144,7 @@ struct TRINITY_DLL_DECL npc_salsalabimAI : public ScriptedAI if (MagneticPull_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MAGNETIC_PULL); + DoCast(m_creature->getVictim(), SPELL_MAGNETIC_PULL); MagneticPull_Timer = 15000; } else MagneticPull_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp index a41f239c8e7..b26409bd7f0 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp @@ -148,17 +148,17 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI break; case 3: DoScriptText(SAY_WATER, m_creature); - DoCast(m_creature,SPELL_CONJURE_WATER); + DoCast(m_creature, SPELL_CONJURE_WATER); EventProgress_Timer = 7000; break; case 4: DoScriptText(SAY_BUFFS, m_creature); - DoCast(m_creature,SPELL_ICE_ARMOR); + DoCast(m_creature, SPELL_ICE_ARMOR); EventProgress_Timer = 7000; break; case 5: DoScriptText(SAY_DRINK, m_creature); - DoCast(m_creature,SPELL_ARCANE_INTELLECT); + DoCast(m_creature, SPELL_ARCANE_INTELLECT); EventProgress_Timer = 7000; break; case 6: @@ -192,13 +192,13 @@ struct TRINITY_DLL_DECL npc_millhouse_manastormAI : public ScriptedAI DoScriptText(SAY_PYRO, m_creature); - DoCast(m_creature->getVictim(),SPELL_PYROBLAST); + DoCast(m_creature->getVictim(), SPELL_PYROBLAST); Pyroblast_Timer = 40000; } else Pyroblast_Timer -=diff; if (Fireball_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FIREBALL); + DoCast(m_creature->getVictim(), SPELL_FIREBALL); Fireball_Timer = 4000; } else Fireball_Timer -=diff; @@ -270,7 +270,7 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI Phase = 1; m_creature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); - DoCast(m_creature,SPELL_TARGET_OMEGA); + DoCast(m_creature, SPELL_TARGET_OMEGA); if (pInstance) pInstance->SetData(TYPE_HARBINGERSKYRISS,NOT_STARTED); @@ -299,7 +299,7 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI void EnterCombat(Unit *who) { DoScriptText(YELL_INTRO1, m_creature); - DoCast(m_creature,SPELL_BUBBLE_VISUAL); + DoCast(m_creature, SPELL_BUBBLE_VISUAL); if (pInstance) { @@ -342,20 +342,20 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI switch(Phase) { case 2: - DoCast(m_creature,SPELL_TARGET_ALPHA); + DoCast(m_creature, SPELL_TARGET_ALPHA); pInstance->SetData(TYPE_WARDEN_1,IN_PROGRESS); pInstance->HandleGameObject(pInstance->GetData64(DATA_SPHERE_SHIELD), false); break; case 3: - DoCast(m_creature,SPELL_TARGET_BETA); + DoCast(m_creature, SPELL_TARGET_BETA); pInstance->SetData(TYPE_WARDEN_2,IN_PROGRESS); break; case 5: - DoCast(m_creature,SPELL_TARGET_DELTA); + DoCast(m_creature, SPELL_TARGET_DELTA); pInstance->SetData(TYPE_WARDEN_3,IN_PROGRESS); break; case 6: - DoCast(m_creature,SPELL_TARGET_GAMMA); + DoCast(m_creature, SPELL_TARGET_GAMMA); pInstance->SetData(TYPE_WARDEN_4,IN_PROGRESS); break; case 7: @@ -386,7 +386,7 @@ struct TRINITY_DLL_DECL npc_warden_mellicharAI : public ScriptedAI { //continue beam omega pod, unless we are about to summon skyriss if (Phase != 7) - DoCast(m_creature,SPELL_TARGET_OMEGA); + DoCast(m_creature, SPELL_TARGET_OMEGA); switch(Phase) { @@ -488,7 +488,7 @@ struct TRINITY_DLL_DECL mob_zerekethvoidzoneAI : public ScriptedAI m_creature->setFaction(16); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - DoCast(m_creature,SPELL_VOID_ZONE_DAMAGE); + DoCast(m_creature, SPELL_VOID_ZONE_DAMAGE); } void EnterCombat(Unit* who) {} diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp index 463e1f3a487..3b768f95c0d 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp @@ -199,9 +199,9 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI if (MindRend_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(pTarget,HEROIC(SPELL_MIND_REND, H_SPELL_MIND_REND)); + DoCast(pTarget, HEROIC(SPELL_MIND_REND, H_SPELL_MIND_REND)); else - DoCast(m_creature->getVictim(),HEROIC(SPELL_MIND_REND, H_SPELL_MIND_REND)); + DoCast(m_creature->getVictim(), HEROIC(SPELL_MIND_REND, H_SPELL_MIND_REND)); MindRend_Timer = 8000; } else MindRend_Timer -=diff; @@ -214,9 +214,9 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI DoScriptText(RAND(SAY_FEAR_1,SAY_FEAR_2), m_creature); if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(pTarget,SPELL_FEAR); + DoCast(pTarget, SPELL_FEAR); else - DoCast(m_creature->getVictim(),SPELL_FEAR); + DoCast(m_creature->getVictim(), SPELL_FEAR); Fear_Timer = 25000; } else Fear_Timer -=diff; @@ -229,9 +229,9 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI DoScriptText(RAND(SAY_MIND_1,SAY_MIND_2), m_creature); if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(pTarget,HEROIC(SPELL_DOMINATION, H_SPELL_DOMINATION)); + DoCast(pTarget, HEROIC(SPELL_DOMINATION, H_SPELL_DOMINATION)); else - DoCast(m_creature->getVictim(),HEROIC(SPELL_DOMINATION, H_SPELL_DOMINATION)); + DoCast(m_creature->getVictim(), HEROIC(SPELL_DOMINATION, H_SPELL_DOMINATION)); Domination_Timer = 16000+rand()%16000; } else Domination_Timer -=diff; @@ -244,7 +244,7 @@ struct TRINITY_DLL_DECL boss_harbinger_skyrissAI : public ScriptedAI return; if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(pTarget,H_SPELL_MANA_BURN); + DoCast(pTarget, H_SPELL_MANA_BURN); ManaBurn_Timer = 16000+rand()%16000; } else ManaBurn_Timer -=diff; diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp index 22bde9cfcf2..3fae1e493f9 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp @@ -79,10 +79,10 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI { switch(rand()%4) { - case 0: DoCast(m_creature,SPELL_PLANT_WHITE); break; - case 1: DoCast(m_creature,SPELL_PLANT_GREEN); break; - case 2: DoCast(m_creature,SPELL_PLANT_BLUE); break; - case 3: DoCast(m_creature,SPELL_PLANT_RED); break; + case 0: DoCast(m_creature, SPELL_PLANT_WHITE); break; + case 1: DoCast(m_creature, SPELL_PLANT_GREEN); break; + case 2: DoCast(m_creature, SPELL_PLANT_BLUE); break; + case 3: DoCast(m_creature, SPELL_PLANT_RED); break; } } @@ -110,9 +110,9 @@ struct TRINITY_DLL_DECL boss_high_botanist_freywinnAI : public ScriptedAI m_creature->RemoveAllAuras(); - DoCast(m_creature,SPELL_SUMMON_FRAYER,true); - DoCast(m_creature,SPELL_TRANQUILITY,true); - DoCast(m_creature,SPELL_TREE_FORM,true); + DoCast(m_creature, SPELL_SUMMON_FRAYER, true); + DoCast(m_creature, SPELL_TRANQUILITY, true); + DoCast(m_creature, SPELL_TREE_FORM, true); m_creature->GetMotionMaster()->MoveIdle(); MoveFree = false; diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_laj.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_laj.cpp index d90e4f708b4..2a9c0841b7b 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_laj.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_laj.cpp @@ -121,20 +121,20 @@ struct TRINITY_DLL_DECL boss_lajAI : public ScriptedAI switch(rand()%4) { case 0: - DoCast(m_creature,SPELL_SUMMON_LASHER_1,true); - DoCast(m_creature,SPELL_SUMMON_FLAYER_1,true); + DoCast(m_creature, SPELL_SUMMON_LASHER_1, true); + DoCast(m_creature, SPELL_SUMMON_FLAYER_1, true); break; case 1: - DoCast(m_creature,SPELL_SUMMON_LASHER_2,true); - DoCast(m_creature,SPELL_SUMMON_FLAYER_2,true); + DoCast(m_creature, SPELL_SUMMON_LASHER_2, true); + DoCast(m_creature, SPELL_SUMMON_FLAYER_2, true); break; case 2: - DoCast(m_creature,SPELL_SUMMON_LASHER_3,true); - DoCast(m_creature,SPELL_SUMMON_FLAYER_3,true); + DoCast(m_creature, SPELL_SUMMON_LASHER_3, true); + DoCast(m_creature, SPELL_SUMMON_FLAYER_3, true); break; case 3: - DoCast(m_creature,SPELL_SUMMON_LASHER_4,true); - DoCast(m_creature,SPELL_SUMMON_FLAYER_4,true); + DoCast(m_creature, SPELL_SUMMON_LASHER_4, true); + DoCast(m_creature, SPELL_SUMMON_FLAYER_4, true); break; } CanSummon = false; @@ -167,13 +167,13 @@ struct TRINITY_DLL_DECL boss_lajAI : public ScriptedAI if (Allergic_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ALLERGIC_REACTION); + DoCast(m_creature->getVictim(), SPELL_ALLERGIC_REACTION); Allergic_Timer = 25000+rand()%15000; } else Allergic_Timer -= diff; if (Teleport_Timer <= diff) { - DoCast(m_creature,SPELL_TELEPORT_SELF); + DoCast(m_creature, SPELL_TELEPORT_SELF); Teleport_Timer = 30000+rand()%10000; CanSummon = true; } else Teleport_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp index af3369df259..c3d72f02835 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/botanica/boss_warp_splinter.cpp @@ -169,14 +169,14 @@ struct TRINITY_DLL_DECL boss_warp_splinterAI : public ScriptedAI //Check for War Stomp if (War_Stomp_Timer <= diff) { - DoCast(m_creature->getVictim(),WAR_STOMP); + DoCast(m_creature->getVictim(), WAR_STOMP); War_Stomp_Timer = 25000 + rand()%15000; } else War_Stomp_Timer -= diff; //Check for Arcane Volley if (Arcane_Volley_Timer <= diff) { - DoCast(m_creature->getVictim(),ARCANE_VOLLEY); + DoCast(m_creature->getVictim(), ARCANE_VOLLEY); Arcane_Volley_Timer = 20000 + rand()%15000; } else Arcane_Volley_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp index 1d083692ccb..fbe0650f012 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp @@ -204,7 +204,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI if (Berserk_Timer <= diff) { - m_creature->CastSpell(m_creature, SPELL_BERSERK, true); + DoCast(m_creature, SPELL_BERSERK, true); Berserk_Timer = 60000; } else Berserk_Timer -= diff; @@ -235,7 +235,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI Platforms_Move_Timer = 30000+rand()%5000; break; case WE_QUILL: - m_creature->CastSpell(m_creature, SPELL_FLAME_QUILLS, true); + DoCast(m_creature, SPELL_FLAME_QUILLS, true); Platforms_Move_Timer = 1; WaitTimer = 10000; WaitEvent = WE_DUMMY; @@ -252,7 +252,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI m_creature->SetSpeed(MOVE_RUN, DefaultMoveSpeedRate); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); DoZoneInCombat(); - m_creature->CastSpell(m_creature, SPELL_REBIRTH, true); + DoCast(m_creature, SPELL_REBIRTH, true); MeltArmor_Timer = 60000; Charge_Timer = 7000; DiveBomb_Timer = 40000+rand()%5000; @@ -261,7 +261,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI break; case WE_METEOR: m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, false); - m_creature->CastSpell(m_creature, SPELL_DIVE_BOMB_VISUAL, false); + DoCast(m_creature, SPELL_DIVE_BOMB_VISUAL, false); WaitEvent = WE_DIVE; WaitTimer = 4000; return; @@ -269,7 +269,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) { m_creature->RemoveAurasDueToSpell(SPELL_DIVE_BOMB_VISUAL); - m_creature->CastSpell(pTarget, SPELL_DIVE_BOMB, true); + DoCast(pTarget, SPELL_DIVE_BOMB, true); float dist = 3.0f; if (m_creature->IsWithinDist3d(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 5.0f)) dist = 5.0f; @@ -293,7 +293,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI m_creature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->SetDisplayId(m_creature->GetNativeDisplayId()); - m_creature->CastSpell(m_creature, SPELL_REBIRTH_2, true); + DoCast(m_creature, SPELL_REBIRTH_2, true); break; case WE_DUMMY: default: @@ -413,7 +413,7 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI m_creature->AI()->AttackStart(pTarget); else { - m_creature->CastSpell(m_creature, SPELL_FLAME_BUFFET, true); + DoCast(m_creature, SPELL_FLAME_BUFFET, true); m_creature->setAttackTimer(BASE_ATTACK, 1500); } } @@ -447,7 +447,7 @@ struct TRINITY_DLL_DECL mob_ember_of_alarAI : public ScriptedAI if (damage >= m_creature->GetHealth() && pKiller != m_creature && !toDie) { damage = 0; - m_creature->CastSpell(m_creature, SPELL_EMBER_BLAST, true); + DoCast(m_creature, SPELL_EMBER_BLAST, true); m_creature->SetDisplayId(11686); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); if (pInstance && pInstance->GetData(DATA_ALAREVENT) == 2) diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp index 60c2e3c79df..d4bc4d54faf 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp @@ -419,7 +419,7 @@ struct TRINITY_DLL_DECL mob_solarium_priestAI : public ScriptedAI if (pTarget) { - DoCast(pTarget,SPELL_SOLARIUM_GREAT_HEAL); + DoCast(pTarget, SPELL_SOLARIUM_GREAT_HEAL); healTimer = 9000; } } else healTimer -= diff; diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp index 90cd4745a23..3ffb681b328 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp @@ -640,12 +640,12 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI //Spawn weapons if (PhaseSubphase == 1) { - m_creature->CastSpell(m_creature, SPELL_SUMMON_WEAPONS, false); + DoCast(m_creature, SPELL_SUMMON_WEAPONS, false); uint8 uiMaxWeapon = sizeof(m_auiSpellSummonWeapon)/sizeof(uint32); for (uint32 i = 0; i < uiMaxWeapon; ++i) - m_creature->CastSpell(m_creature,m_auiSpellSummonWeapon[i],true); + DoCast(m_creature, m_auiSpellSummonWeapon[i], true); PhaseSubphase = 2; Phase_Timer = TIME_PHASE_2_3; @@ -887,7 +887,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI { if (Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid())) { - m_creature->CastSpell(pUnit, SPELL_KNOCKBACK, true); + DoCast(pUnit, SPELL_KNOCKBACK, true); //Gravity lapse - needs an exception in Spell system to work pUnit->CastSpell(pUnit, SPELL_GRAVITY_LAPSE, true, 0, 0, m_creature->GetGUID()); @@ -1340,13 +1340,13 @@ struct TRINITY_DLL_DECL mob_phoenix_tkAI : public ScriptedAI void Reset() { Cycle_Timer = 2000; - m_creature->CastSpell(m_creature,SPELL_BURN,true); + DoCast(m_creature, SPELL_BURN, true); } void JustDied(Unit* killer) { //is this spell in use anylonger? - //m_creature->CastSpell(m_creature,SPELL_EMBER_BLAST,true); + //DoCast(m_creature, SPELL_EMBER_BLAST, true); m_creature->SummonCreature(NPC_PHOENIX_EGG,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),m_creature->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,16000); } diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp index bc7b2fb832f..58a657b4a00 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp @@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI // Pounding if (Pounding_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_POUNDING); + DoCast(m_creature->getVictim(), SPELL_POUNDING); DoScriptText(RAND(SAY_POUNDING1,SAY_POUNDING2), m_creature); Pounding_Timer = 15000; //cast time(3000) + cooldown time(12000) @@ -141,7 +141,7 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI // Single Target knock back, reduces aggro if (KnockAway_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_KNOCK_AWAY); + DoCast(m_creature->getVictim(), SPELL_KNOCK_AWAY); //Drop 25% aggro if (DoGetThreat(m_creature->getVictim())) @@ -153,7 +153,7 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI //Berserk if (Berserk_Timer < diff && !Enraged) { - DoCast(m_creature,SPELL_BERSERK); + DoCast(m_creature, SPELL_BERSERK); Enraged = true; } else Berserk_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp index 33306508778..dd1a287c6eb 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp @@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL mob_crystalcore_devastatorAI : public ScriptedAI //Knockaway_Timer if (Knockaway_Timer <= diff) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_KNOCKAWAY, true); + DoCast(m_creature->getVictim(), SPELL_KNOCKAWAY, true); // current aggro target is knocked away pick new target Unit* pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 0); @@ -74,7 +74,7 @@ struct TRINITY_DLL_DECL mob_crystalcore_devastatorAI : public ScriptedAI //Countercharge_Timer if (Countercharge_Timer <= diff) { - DoCast(m_creature,SPELL_COUNTERCHARGE); + DoCast(m_creature, SPELL_COUNTERCHARGE); Countercharge_Timer = 45000; } else Countercharge_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp index 29425cf758e..2f8dd1a64b9 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp @@ -88,7 +88,7 @@ struct TRINITY_DLL_DECL boss_gatewatcher_iron_handAI : public ScriptedAI //Shadow Power if (Shadow_Power_Timer <= diff) { - DoCast(m_creature,HEROIC(SPELL_SHADOW_POWER, H_SPELL_SHADOW_POWER)); + DoCast(m_creature, HEROIC(SPELL_SHADOW_POWER, H_SPELL_SHADOW_POWER)); Shadow_Power_Timer = 20000 + rand()%8000; } else Shadow_Power_Timer -= diff; @@ -97,7 +97,7 @@ struct TRINITY_DLL_DECL boss_gatewatcher_iron_handAI : public ScriptedAI { //TODO: expect cast this about 5 times in a row (?), announce it by emote only once DoScriptText(EMOTE_HAMMER, m_creature); - DoCast(m_creature->getVictim(),HEROIC(SPELL_JACKHAMMER, H_SPELL_JACKHAMMER)); + DoCast(m_creature->getVictim(), HEROIC(SPELL_JACKHAMMER, H_SPELL_JACKHAMMER)); //chance to yell, but not same time as emote (after spell in fact casted) if (rand()%2) @@ -110,7 +110,7 @@ struct TRINITY_DLL_DECL boss_gatewatcher_iron_handAI : public ScriptedAI //Stream of Machine Fluid if (Stream_of_Machine_Fluid_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_STREAM_OF_MACHINE_FLUID); + DoCast(m_creature->getVictim(), SPELL_STREAM_OF_MACHINE_FLUID); Stream_of_Machine_Fluid_Timer = 35000 + rand()%15000; } else Stream_of_Machine_Fluid_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp index d5db9f2bb16..3a5b95f706d 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp @@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL boss_nethermancer_sepethreaAI : public ScriptedAI //Frost Attack if (frost_attack_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FROST_ATTACK); + DoCast(m_creature->getVictim(), SPELL_FROST_ATTACK); frost_attack_Timer = 7000 + rand()%3000; } else frost_attack_Timer -= diff; @@ -117,7 +117,7 @@ struct TRINITY_DLL_DECL boss_nethermancer_sepethreaAI : public ScriptedAI //Dragons Breath if (dragons_breath_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_DRAGONS_BREATH); + DoCast(m_creature->getVictim(), SPELL_DRAGONS_BREATH); { if (rand()%2) return; @@ -130,14 +130,14 @@ struct TRINITY_DLL_DECL boss_nethermancer_sepethreaAI : public ScriptedAI //Knockback if (knockback_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_KNOCKBACK); + DoCast(m_creature->getVictim(), SPELL_KNOCKBACK); knockback_Timer = 15000 + rand()%10000; } else knockback_Timer -= diff; //Solarburn if (solarburn_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SOLARBURN); + DoCast(m_creature->getVictim(), SPELL_SOLARBURN); solarburn_Timer = 30000; } else solarburn_Timer -= diff; @@ -215,14 +215,14 @@ struct TRINITY_DLL_DECL mob_ragin_flamesAI : public ScriptedAI if (inferno_Timer <= diff) { - DoCast(m_creature->getVictim(),HEROIC(SPELL_INFERNO, H_SPELL_INFERNO)); + DoCast(m_creature->getVictim(), HEROIC(SPELL_INFERNO, H_SPELL_INFERNO)); m_creature->TauntApply(m_creature->getVictim()); inferno_Timer = 10000; } else inferno_Timer -= diff; if (flame_timer <= diff) { - DoCast(m_creature,SPELL_FIRE_TAIL); + DoCast(m_creature, SPELL_FIRE_TAIL); flame_timer = 500; } else flame_timer -=diff; diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp index 8ceb2247da7..9264edc6644 100644 --- a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp @@ -120,13 +120,13 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI if (ManaTap_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_MANA_TAP); + DoCast(m_creature->getVictim(), SPELL_MANA_TAP); ManaTap_Timer = 14000 + rand()%8000; } else ManaTap_Timer -= diff; if (ArcaneTorrent_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_ARCANE_TORRENT); + DoCast(m_creature->getVictim(), SPELL_ARCANE_TORRENT); ArcaneTorrent_Timer = 12000 + rand()%6000; } else ArcaneTorrent_Timer -= diff; @@ -136,7 +136,7 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI { DoScriptText(RAND(SAY_DOMINATION_1,SAY_DOMINATION_2), m_creature); - DoCast(pTarget,SPELL_DOMINATION); + DoCast(pTarget, SPELL_DOMINATION); } Domination_Timer = 25000 + rand()%5000; } else Domination_Timer -= diff; @@ -146,7 +146,7 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI { if (ArcaneExplosion_Timer <= diff) { - DoCast(m_creature->getVictim(),H_SPELL_ARCANE_EXPLOSION); + DoCast(m_creature->getVictim(), H_SPELL_ARCANE_EXPLOSION); ArcaneExplosion_Timer = 10000 + rand()%4000; } else ArcaneExplosion_Timer -= diff; } @@ -197,9 +197,9 @@ struct TRINITY_DLL_DECL mob_nether_wraithAI : public ScriptedAI if (ArcaneMissiles_Timer <= diff) { if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1)) - DoCast(pTarget,SPELL_ARCANE_MISSILES); + DoCast(pTarget, SPELL_ARCANE_MISSILES); else - DoCast(m_creature->getVictim(),SPELL_ARCANE_MISSILES); + DoCast(m_creature->getVictim(), SPELL_ARCANE_MISSILES); ArcaneMissiles_Timer = 5000 + rand()%5000; } else ArcaneMissiles_Timer -=diff; @@ -208,7 +208,7 @@ struct TRINITY_DLL_DECL mob_nether_wraithAI : public ScriptedAI { if (Detonation_Timer <= diff) { - DoCast(m_creature,SPELL_DETONATION); + DoCast(m_creature, SPELL_DETONATION); Detonation = true; } else Detonation_Timer -= diff; } diff --git a/src/bindings/scripts/scripts/outland/terokkar_forest.cpp b/src/bindings/scripts/scripts/outland/terokkar_forest.cpp index 08e5217ad64..103d466ab56 100644 --- a/src/bindings/scripts/scripts/outland/terokkar_forest.cpp +++ b/src/bindings/scripts/scripts/outland/terokkar_forest.cpp @@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL mob_unkor_the_ruthlessAI : public ScriptedAI { if (!UnkorUnfriendly_Timer) { - //DoCast(m_creature,SPELL_QUID9889); //not using spell for now + //DoCast(m_creature, SPELL_QUID9889); //not using spell for now DoNice(); } else @@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL mob_unkor_the_ruthlessAI : public ScriptedAI if (Pulverize_Timer <= diff) { - DoCast(m_creature,SPELL_PULVERIZE); + DoCast(m_creature, SPELL_PULVERIZE); Pulverize_Timer = 9000; } else Pulverize_Timer -= diff; @@ -160,7 +160,7 @@ struct TRINITY_DLL_DECL mob_infested_root_walkerAI : public ScriptedAI if (m_creature->GetHealth() <= damage) if (rand()%100 < 75) //Summon Wood Mites - m_creature->CastSpell(m_creature,39130,true); + DoCast(m_creature, 39130, true); } }; CreatureAI* GetAI_mob_infested_root_walker(Creature* pCreature) @@ -240,7 +240,7 @@ struct TRINITY_DLL_DECL mob_rotting_forest_ragerAI : public ScriptedAI if (m_creature->GetHealth() <= damage) if (rand()%100 < 75) //Summon Lots of Wood Mights - m_creature->CastSpell(m_creature,39134,true); + DoCast(m_creature, 39134, true); } }; CreatureAI* GetAI_mob_rotting_forest_rager(Creature* pCreature) @@ -342,19 +342,19 @@ struct TRINITY_DLL_DECL npc_floonAI : public ScriptedAI if (Silence_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_SILENCE); + DoCast(m_creature->getVictim(), SPELL_SILENCE); Silence_Timer = 30000; } else Silence_Timer -= diff; if (FrostNova_Timer <= diff) { - DoCast(m_creature,SPELL_FROST_NOVA); + DoCast(m_creature, SPELL_FROST_NOVA); FrostNova_Timer = 20000; } else FrostNova_Timer -= diff; if (Frostbolt_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_FROSTBOLT); + DoCast(m_creature->getVictim(), SPELL_FROSTBOLT); Frostbolt_Timer = 5000; } else Frostbolt_Timer -= diff; diff --git a/src/bindings/scripts/scripts/outland/zangarmarsh.cpp b/src/bindings/scripts/scripts/outland/zangarmarsh.cpp index 19914eb258d..ca6cd076c83 100644 --- a/src/bindings/scripts/scripts/outland/zangarmarsh.cpp +++ b/src/bindings/scripts/scripts/outland/zangarmarsh.cpp @@ -155,7 +155,7 @@ struct TRINITY_DLL_DECL npc_cooshcooshAI : public ScriptedAI if (LightningBolt_Timer <= diff) { - DoCast(m_creature->getVictim(),SPELL_LIGHTNING_BOLT); + DoCast(m_creature->getVictim(), SPELL_LIGHTNING_BOLT); LightningBolt_Timer = 5000; } else LightningBolt_Timer -= diff; diff --git a/src/bindings/scripts/scripts/world/boss_taerar.cpp b/src/bindings/scripts/scripts/world/boss_taerar.cpp index c632307919a..02c20b41da1 100644 --- a/src/bindings/scripts/scripts/world/boss_taerar.cpp +++ b/src/bindings/scripts/scripts/world/boss_taerar.cpp @@ -183,7 +183,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI int iSize = sizeof(m_auiSpellSummonShade) / sizeof(uint32); for (int i = 0; i < iSize; ++i) - m_creature->CastSpell(pTarget, m_auiSpellSummonShade[i], true); + DoCast(pTarget, m_auiSpellSummonShade[i], true); ++m_uiShadesSummoned; // prevent casting twice at same health m_bShades = true; diff --git a/src/bindings/scripts/scripts/world/guards.cpp b/src/bindings/scripts/scripts/world/guards.cpp index abaf993342e..de97510e431 100644 --- a/src/bindings/scripts/scripts/world/guards.cpp +++ b/src/bindings/scripts/scripts/world/guards.cpp @@ -2567,7 +2567,7 @@ struct TRINITY_DLL_DECL guard_shattrath_aldorAI : public guardAI Unit* temp = m_creature->getVictim(); if (temp && temp->GetTypeId() == TYPEID_PLAYER) { - DoCast(temp,SPELL_BANISHED_SHATTRATH_A); + DoCast(temp, SPELL_BANISHED_SHATTRATH_A); Banish_Timer = 9000; PlayerGUID = temp->GetGUID(); if (PlayerGUID) @@ -2763,7 +2763,7 @@ struct TRINITY_DLL_DECL guard_shattrath_scryerAI : public guardAI Unit* temp = m_creature->getVictim(); if (temp && temp->GetTypeId() == TYPEID_PLAYER) { - DoCast(temp,SPELL_BANISHED_SHATTRATH_S); + DoCast(temp, SPELL_BANISHED_SHATTRATH_S); Banish_Timer = 9000; PlayerGUID = temp->GetGUID(); if (PlayerGUID) diff --git a/src/bindings/scripts/scripts/world/npcs_special.cpp b/src/bindings/scripts/scripts/world/npcs_special.cpp index 96d0bce3400..9396f30f214 100644 --- a/src/bindings/scripts/scripts/world/npcs_special.cpp +++ b/src/bindings/scripts/scripts/world/npcs_special.cpp @@ -353,8 +353,8 @@ struct TRINITY_DLL_DECL npc_dancing_flamesAI : public ScriptedAI { active = true; can_iteract = 3500; - DoCast(m_creature,SPELL_BRAZIER,true); - DoCast(m_creature,SPELL_FIERY_AURA,false); + DoCast(m_creature, SPELL_BRAZIER, true); + DoCast(m_creature, SPELL_FIERY_AURA, false); float x, y, z; m_creature->GetPosition(x,y,z); m_creature->Relocate(x,y,z + 0.94f); @@ -398,7 +398,7 @@ struct TRINITY_DLL_DECL npc_dancing_flamesAI : public ScriptedAI case TEXTEMOTE_DANCE: { if (!pPlayer->HasAura(SPELL_SEDUCTION)) - m_creature->CastSpell(pPlayer,SPELL_SEDUCTION,true); + DoCast(pPlayer, SPELL_SEDUCTION, true); } break; } @@ -1027,7 +1027,7 @@ struct TRINITY_DLL_DECL npc_guardianAI : public ScriptedAI if (m_creature->isAttackReady()) { - m_creature->CastSpell(m_creature->getVictim(),SPELL_DEATHTOUCH, true); + DoCast(m_creature->getVictim(), SPELL_DEATHTOUCH, true); m_creature->resetAttackTimer(); } } @@ -1443,7 +1443,7 @@ struct TRINITY_DLL_DECL npc_tonk_mineAI : public ScriptedAI { if (ExplosionTimer <= diff) { - m_creature->CastSpell(m_creature, SPELL_TONK_MINE_DETONATE, true); + DoCast(m_creature, SPELL_TONK_MINE_DETONATE, true); m_creature->setDeathState(DEAD); // unsummon it } else ExplosionTimer -= diff; @@ -1592,7 +1592,7 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI else spell = SPELL_CRIPPLING_POISON; - DoCast(m_creature->getVictim(),spell); + DoCast(m_creature->getVictim(), spell); } SpellTimer = VIPER_TIMER; @@ -1600,7 +1600,7 @@ struct TRINITY_DLL_DECL npc_snake_trap_serpentsAI : public ScriptedAI else //Venomous Snake { if (rand() % 10 < 8) //80% chance to cast - DoCast(m_creature->getVictim(),SPELL_DEADLY_POISON); + DoCast(m_creature->getVictim(), SPELL_DEADLY_POISON); SpellTimer = VENOMOUS_SNAKE_TIMER + (rand() %5)*100; } } else SpellTimer-=diff; @@ -1681,7 +1681,7 @@ struct TRINITY_DLL_DECL mob_mojoAI : public ScriptedAI } m_creature->AddAura(43906,pPlayer);//add polymorph frog thing victimGUID = pPlayer->GetGUID(); - m_creature->CastSpell(m_creature,20372,true);//tag.hearts + DoCast(m_creature, 20372, true);//tag.hearts m_creature->GetMotionMaster()->MoveFollow(pPlayer,0,0); hearts = 15000; } @@ -1824,7 +1824,7 @@ struct TRINITY_DLL_DECL npc_lightwellAI : public PassiveAI void Reset() { - m_creature->CastSpell(m_creature, 59907, false); // Spell for Lightwell Charges + DoCast(m_creature, 59907, false); // Spell for Lightwell Charges } }; |