diff options
Diffstat (limited to 'src/server/scripts/Northrend')
45 files changed, 118 insertions, 118 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index 692f4c2d25c..6c7a434ac14 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -277,13 +277,13 @@ public: if (uiMindFlayTimer <= diff) { - DoCast(me->GetVictim(), SPELL_MIND_FLAY); + DoCastVictim(SPELL_MIND_FLAY); uiMindFlayTimer = 20*IN_MILLISECONDS; } else uiMindFlayTimer -= diff; if (uiShadowBoltVolleyTimer <= diff) { - DoCast(me->GetVictim(), SPELL_SHADOW_BOLT_VOLLEY); + DoCastVictim(SPELL_SHADOW_BOLT_VOLLEY); uiShadowBoltVolleyTimer = 5*IN_MILLISECONDS; } else uiShadowBoltVolleyTimer -= diff; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 874d025f2d9..dd196866032 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -300,7 +300,7 @@ public: if (Channeling == true) { for (uint8 i = 0; i < 8; ++i) - DoCast(me->GetVictim(), SPELL_SUMMON_CARRION_BEETLES, true); + DoCastVictim(SPELL_SUMMON_CARRION_BEETLES, true); Channeling = false; } else if (CarrionBeetlesTimer <= diff) diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 384ecb06670..23705da6571 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -153,7 +153,7 @@ public: if (uiPierceTimer <= diff) { - DoCast(me->GetVictim(), SPELL_PIERCE_ARMOR); + DoCastVictim(SPELL_PIERCE_ARMOR); uiPierceTimer = 8*IN_MILLISECONDS; } else uiPierceTimer -= diff; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 5c5982c2c01..43d4f1bfdd9 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -151,7 +151,7 @@ public: if (uiMindFlayTimer <= diff) { - DoCast(me->GetVictim(), SPELL_MIND_FLAY); + DoCastVictim(SPELL_MIND_FLAY); uiMindFlayTimer = 15*IN_MILLISECONDS; } else uiMindFlayTimer -= diff; @@ -211,7 +211,7 @@ public: void JustDied(Unit* /*killer*/) { //The spell is not working propperly - DoCast(me->GetVictim(), SPELL_ACID_SPLASH, true); + DoCastVictim(SPELL_ACID_SPLASH, true); } }; @@ -257,7 +257,7 @@ public: if (uiBackstabTimer <= diff) { - DoCast(me->GetVictim(), SPELL_BACKSTAB); + DoCastVictim(SPELL_BACKSTAB); uiBackstabTimer = 12*IN_MILLISECONDS; } else uiBackstabTimer -= diff; @@ -304,7 +304,7 @@ public: if (uiShadowNovaTimer <= diff) { - DoCast(me->GetVictim(), SPELL_SHADOW_NOVA, true); + DoCastVictim(SPELL_SHADOW_NOVA, true); uiShadowNovaTimer = 17*IN_MILLISECONDS; } else uiShadowNovaTimer -= diff; @@ -343,13 +343,13 @@ public: if (uiStrikeTimer <= diff) { - DoCast(me->GetVictim(), SPELL_STRIKE, true); + DoCastVictim(SPELL_STRIKE, true); uiStrikeTimer = 15*IN_MILLISECONDS; } else uiStrikeTimer -= diff; if (uiCleaveTimer <= diff) { - DoCast(me->GetVictim(), SPELL_CLEAVE, true); + DoCastVictim(SPELL_CLEAVE, true); uiCleaveTimer = 17*IN_MILLISECONDS; } else uiCleaveTimer -= diff; @@ -400,7 +400,7 @@ public: if (uiInfectedBiteTimer <= diff) { - DoCast(me->GetVictim(), SPELL_INFECTED_BITE, true); + DoCastVictim(SPELL_INFECTED_BITE, true); uiInfectedBiteTimer = 15*IN_MILLISECONDS; } else uiInfectedBiteTimer -= diff; @@ -448,13 +448,13 @@ public: if (uiInfectedBiteTimer <= diff) { - DoCast(me->GetVictim(), SPELL_INFECTED_BITE, true); + DoCastVictim(SPELL_INFECTED_BITE, true); uiInfectedBiteTimer = 11*IN_MILLISECONDS; } else uiInfectedBiteTimer -= diff; if (uiBindingWebsTimer <= diff) { - DoCast(me->GetVictim(), SPELL_BLINDING_WEBS, true); + DoCastVictim(SPELL_BLINDING_WEBS, true); uiBindingWebsTimer = 17*IN_MILLISECONDS; } else uiBindingWebsTimer -= diff; @@ -503,13 +503,13 @@ public: if (uiInfectedBiteTimer <= diff) { - DoCast(me->GetVictim(), SPELL_INFECTED_BITE, true); + DoCastVictim(SPELL_INFECTED_BITE, true); uiInfectedBiteTimer = 15*IN_MILLISECONDS; } else uiInfectedBiteTimer -= diff; if (uiPoisonSprayTimer <= diff) { - DoCast(me->GetVictim(), SPELL_POSION_SPRAY, true); + DoCastVictim(SPELL_POSION_SPRAY, true); uiPoisonSprayTimer = 17*IN_MILLISECONDS; } else uiPoisonSprayTimer -= diff; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index a4749d63cb2..eca287a2be4 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -619,7 +619,7 @@ public: if (m_uiFlameBreathTimer <= uiDiff) { Talk(SAY_SARTHARION_BREATH); - DoCast(me->GetVictim(), RAID_MODE(SPELL_FLAME_BREATH, SPELL_FLAME_BREATH_H)); + DoCastVictim(RAID_MODE(SPELL_FLAME_BREATH, SPELL_FLAME_BREATH_H)); m_uiFlameBreathTimer = urand(25000, 35000); } else @@ -628,7 +628,7 @@ public: // Tail Sweep if (m_uiTailSweepTimer <= uiDiff) { - DoCast(me->GetVictim(), RAID_MODE(SPELL_TAIL_LASH, SPELL_TAIL_LASH_H)); + DoCastVictim(RAID_MODE(SPELL_TAIL_LASH, SPELL_TAIL_LASH_H)); m_uiTailSweepTimer = urand(15000, 20000); } else @@ -637,7 +637,7 @@ public: // Cleave if (m_uiCleaveTimer <= uiDiff) { - DoCast(me->GetVictim(), SPELL_CLEAVE); + DoCastVictim(SPELL_CLEAVE); m_uiCleaveTimer = urand(7000, 10000); } else @@ -1049,7 +1049,7 @@ public: if (m_uiShadowBreathTimer <= uiDiff) { Talk(SAY_TENEBRON_BREATH); - DoCast(me->GetVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); + DoCastVictim(RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); m_uiShadowBreathTimer = urand(20000, 25000); } else @@ -1153,7 +1153,7 @@ public: if (m_uiShadowBreathTimer <= uiDiff) { Talk(SAY_SHADRON_BREATH); - DoCast(me->GetVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); + DoCastVictim(RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); m_uiShadowBreathTimer = urand(20000, 25000); } else @@ -1237,7 +1237,7 @@ public: else { OpenPortal(); - DoCast(me->GetVictim(), SPELL_TWILIGHT_TORMENT_VESP); + DoCastVictim(SPELL_TWILIGHT_TORMENT_VESP); m_uiAcolyteVesperonTimer = urand(60000, 70000); } } @@ -1248,7 +1248,7 @@ public: if (m_uiShadowBreathTimer <= uiDiff) { Talk(SAY_VESPERON_BREATH); - DoCast(me->GetVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); + DoCastVictim(RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); m_uiShadowBreathTimer = urand(20000, 25000); } else @@ -1626,8 +1626,8 @@ public: { DoCastAOE(RAID_MODE(SPELL_VOID_BLAST, SPELL_VOID_BLAST_H)); ////twilight realm - //DoCast(me->GetVictim(), 57620, true); - //DoCast(me->GetVictim(), 57874, true); + //DoCastVictim(57620, true); + //DoCastVictim(57874, true); VoidBlast_Timer = 9000; me->RemoveAllAuras(); me->Kill(me); @@ -1676,7 +1676,7 @@ public: // twilight torment if (m_uiFadeArmorTimer <= uiDiff) { - DoCast(me->GetVictim(), SPELL_FADE_ARMOR); + DoCastVictim(SPELL_FADE_ARMOR); m_uiFadeArmorTimer = urand(5000, 10000); } else diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index b2b629dd510..a9750460bb5 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -967,7 +967,7 @@ public: if (uiEviscerateTimer <= uiDiff) { - DoCast(me->GetVictim(), SPELL_EVISCERATE); + DoCastVictim(SPELL_EVISCERATE); uiEviscerateTimer = 8000; } else uiEviscerateTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index efe9697a358..60209f04c30 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -887,7 +887,7 @@ public: events.ScheduleEvent(EVENT_SHADOW_STEP, 8000); break; case EVENT_DEADLY_POISON: - DoCast(me->GetVictim(), SPELL_DEADLY_POISON); + DoCastVictim(SPELL_DEADLY_POISON); events.ScheduleEvent(EVENT_DEADLY_POISON, 10000); break; case EVENT_ENVENOMED_DAGGER_THROW: @@ -896,7 +896,7 @@ public: events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10000); break; case EVENT_KIDNEY_SHOT: - DoCast(me->GetVictim(), SPELL_KIDNEY_SHOT); + DoCastVictim(SPELL_KIDNEY_SHOT); events.ScheduleEvent(EVENT_KIDNEY_SHOT, 10000); break; } @@ -942,11 +942,11 @@ public: switch (events.ExecuteEvent()) { case EVENT_SPECTRAL_STRIKE: - DoCast(me->GetVictim(), SPELL_SPECTRAL_STRIKE); + DoCastVictim(SPELL_SPECTRAL_STRIKE); events.ScheduleEvent(EVENT_SPECTRAL_STRIKE, 5000); break; case EVENT_SHIELD_BASH: - DoCast(me->GetVictim(), SPELL_SHIELD_BASH); + DoCastVictim(SPELL_SHIELD_BASH); events.ScheduleEvent(EVENT_SHIELD_BASH, 5000); break; case EVENT_TORTURED_ENRAGE: diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index b0befe98404..958e8c3f39f 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -223,7 +223,7 @@ class boss_drakkari_colossus : public CreatureScript switch (eventId) { case EVENT_MIGHTY_BLOW: - DoCast(me->GetVictim(), SPELL_MIGHTY_BLOW); + DoCastVictim(SPELL_MIGHTY_BLOW); events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(5000, 15000)); break; } @@ -474,13 +474,13 @@ public: if (mojoWaveTimer <= diff) { - DoCast(me->GetVictim(), SPELL_MOJO_WAVE); + DoCastVictim(SPELL_MOJO_WAVE); mojoWaveTimer = 15*IN_MILLISECONDS; } else mojoWaveTimer -= diff; if (mojoPuddleTimer <= diff) { - DoCast(me->GetVictim(), SPELL_MOJO_PUDDLE); + DoCastVictim(SPELL_MOJO_PUDDLE); mojoPuddleTimer = 18*IN_MILLISECONDS; } else mojoPuddleTimer -= diff; diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index 14dcfb9e932..6aca3a2ff88 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -83,13 +83,13 @@ public: if (uiBiteTimer <= diff) { - DoCast(me->GetVictim(), SPELL_ECK_BITE); + DoCastVictim(SPELL_ECK_BITE); uiBiteTimer = urand(8*IN_MILLISECONDS, 12*IN_MILLISECONDS); } else uiBiteTimer -= diff; if (uiSpitTimer <= diff) { - DoCast(me->GetVictim(), SPELL_ECK_SPIT); + DoCastVictim(SPELL_ECK_SPIT); uiSpitTimer = urand(6*IN_MILLISECONDS, 14*IN_MILLISECONDS); } else uiSpitTimer -= diff; diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 6f5626229e2..1d2398dbfb4 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -171,7 +171,7 @@ public: if (uiWhirlingSlashTimer <= diff) { - DoCast(me->GetVictim(), SPELL_WHIRLING_SLASH); + DoCastVictim(SPELL_WHIRLING_SLASH); uiWhirlingSlashTimer = 21*IN_MILLISECONDS; ++uiPhaseCounter; } else uiWhirlingSlashTimer -= diff; @@ -207,19 +207,19 @@ public: { if (uiPunctureTimer <= diff) { - DoCast(me->GetVictim(), SPELL_PUNCTURE); + DoCastVictim(SPELL_PUNCTURE); uiPunctureTimer = 8*IN_MILLISECONDS; } else uiPunctureTimer -= diff; if (uiEnrageTimer <= diff) { - DoCast(me->GetVictim(), SPELL_ENRAGE); + DoCastVictim(SPELL_ENRAGE); uiEnrageTimer = 20*IN_MILLISECONDS; } else uiEnrageTimer -= diff; if (uiStompTimer <= diff) { - DoCast(me->GetVictim(), SPELL_STOMP); + DoCastVictim(SPELL_STOMP); uiStompTimer = 20*IN_MILLISECONDS; } else uiStompTimer -= diff; diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index 58c82307065..bfc1b9cfcb6 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -107,27 +107,27 @@ public: { Talk(SAY_QUAKE); if (bPhase) - DoCast(me->GetVictim(), SPELL_QUAKE, true); + DoCastVictim(SPELL_QUAKE, true); else - DoCast(me->GetVictim(), SPELL_GROUND_TREMOR, true); + DoCastVictim(SPELL_GROUND_TREMOR, true); uiGroundTremorTimer = 10*IN_MILLISECONDS; } else uiGroundTremorTimer -= uiDiff; if (uiNumblingShoutTimer <= uiDiff) { if (bPhase) - DoCast(me->GetVictim(), SPELL_NUMBING_ROAR, true); + DoCastVictim(SPELL_NUMBING_ROAR, true); else - DoCast(me->GetVictim(), SPELL_NUMBING_SHOUT, true); + DoCastVictim(SPELL_NUMBING_SHOUT, true); uiNumblingShoutTimer = 10*IN_MILLISECONDS; } else uiNumblingShoutTimer -=uiDiff; if (uiDeterminedStabTimer <= uiDiff) { if (bPhase) - DoCast(me->GetVictim(), SPELL_DETERMINED_GORE); + DoCastVictim(SPELL_DETERMINED_GORE); else - DoCast(me->GetVictim(), SPELL_DETERMINED_STAB, true); + DoCastVictim(SPELL_DETERMINED_STAB, true); uiDeterminedStabTimer = 8*IN_MILLISECONDS; } else uiDeterminedStabTimer -=uiDiff; diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index 38e3a9621f6..2f252a91050 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -130,20 +130,20 @@ public: if (uiPoisonNovaTimer <= diff) { - DoCast(me->GetVictim(), SPELL_POISON_NOVA); + DoCastVictim(SPELL_POISON_NOVA); Talk(EMOTE_NOVA); uiPoisonNovaTimer = 15*IN_MILLISECONDS; } else uiPoisonNovaTimer -= diff; if (uiPowerfullBiteTimer <= diff) { - DoCast(me->GetVictim(), SPELL_POWERFULL_BITE); + DoCastVictim(SPELL_POWERFULL_BITE); uiPowerfullBiteTimer = 10*IN_MILLISECONDS; } else uiPowerfullBiteTimer -= diff; if (uiVenomBoltTimer <= diff) { - DoCast(me->GetVictim(), SPELL_VENOM_BOLT); + DoCastVictim(SPELL_VENOM_BOLT); uiVenomBoltTimer = 10*IN_MILLISECONDS; } else uiVenomBoltTimer -= diff; @@ -293,7 +293,7 @@ public: if (uiVenomousBiteTimer <= diff) { - DoCast(me->GetVictim(), SPELL_VENOMOUS_BITE); + DoCastVictim(SPELL_VENOMOUS_BITE); uiVenomousBiteTimer = 10*IN_MILLISECONDS; } else uiVenomousBiteTimer -= diff; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index f0586c74444..a213c420383 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -672,7 +672,7 @@ class npc_cult_fanatic : public CreatureScript { case EVENT_FANATIC_NECROTIC_STRIKE: DoCastVictim(SPELL_NECROTIC_STRIKE); - Events.ScheduleEvent(SPELL_NECROTIC_STRIKE, urand(11000, 13000)); + Events.ScheduleEvent(EVENT_FANATIC_NECROTIC_STRIKE, urand(11000, 13000)); break; case EVENT_FANATIC_SHADOW_CLEAVE: DoCastVictim(SPELL_SHADOW_CLEAVE); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index c34843494ba..013bfe91987 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -362,7 +362,7 @@ public: DoCast(target, SPELL_PRIMARY(id)); } else - DoCast(me->GetVictim(), SPELL_PRIMARY(id)); + DoCastVictim(SPELL_PRIMARY(id)); events.ScheduleEvent(EVENT_CAST, 15000); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 53e02f639ad..9a20dbcf498 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -105,7 +105,7 @@ public: switch (eventId) { case EVENT_WOUND: - DoCast(me->GetVictim(), SPELL_MORTAL_WOUND); + DoCastVictim(SPELL_MORTAL_WOUND); events.ScheduleEvent(EVENT_WOUND, 10000); break; case EVENT_ENRAGE: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 1138e3a463f..bad5429e547 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -464,11 +464,11 @@ class boss_gothik : public CreatureScript } break; case EVENT_BOLT: - DoCast(me->GetVictim(), RAID_MODE(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); + DoCastVictim(RAID_MODE(SPELL_SHADOW_BOLT, H_SPELL_SHADOW_BOLT)); events.ScheduleEvent(EVENT_BOLT, 1000); break; case EVENT_HARVEST: - DoCast(me->GetVictim(), SPELL_HARVEST_SOUL, true); + DoCastVictim(SPELL_HARVEST_SOUL, true); events.ScheduleEvent(EVENT_HARVEST, urand(20000, 25000)); break; case EVENT_TELEPORT: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index c124051cc0b..4c807c515e1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -126,7 +126,7 @@ public: events.ScheduleEvent(EVENT_SHOCK, urand(10000, 20000)); break; case EVENT_POISON: - DoCast(me->GetVictim(), RAID_MODE(SPELL_NECROTIC_POISON_10, SPELL_NECROTIC_POISON_25)); + DoCastVictim(RAID_MODE(SPELL_NECROTIC_POISON_10, SPELL_NECROTIC_POISON_25)); events.ScheduleEvent(EVENT_POISON, urand(10000, 20000)); break; case EVENT_FRENZY: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index cdc7de912da..831e74097d2 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -140,7 +140,7 @@ public: events.ScheduleEvent(EVENT_SLIME, 2000); break; case EVENT_SLIME: - DoCast(me->GetVictim(), SPELL_SLIME_BOLT, true); + DoCastVictim(SPELL_SLIME_BOLT, true); events.ScheduleEvent(EVENT_SLIME, 2000); break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 4b865046e60..abd3fb35a51 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -111,7 +111,7 @@ public: switch (eventId) { case EVENT_STRIKE: - DoCast(me->GetVictim(), SPELL_UNBALANCING_STRIKE); + DoCastVictim(SPELL_UNBALANCING_STRIKE); events.ScheduleEvent(EVENT_STRIKE, 30000); return; case EVENT_SHOUT: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 1a2c5294f61..2b681750573 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -260,7 +260,7 @@ public: events.ScheduleEvent(EVENT_SHIFT, 30000); return; case EVENT_CHAIN: - DoCast(me->GetVictim(), RAID_MODE(SPELL_CHAIN_LIGHTNING, H_SPELL_CHAIN_LIGHTNING)); + DoCastVictim(RAID_MODE(SPELL_CHAIN_LIGHTNING, H_SPELL_CHAIN_LIGHTNING)); events.ScheduleEvent(EVENT_CHAIN, urand(10000, 20000)); return; case EVENT_BERSERK: @@ -270,7 +270,7 @@ public: } if (events.GetTimer() > 15000 && !me->IsWithinMeleeRange(me->GetVictim())) - DoCast(me->GetVictim(), SPELL_BALL_LIGHTNING); + DoCastVictim(SPELL_BALL_LIGHTNING); else DoMeleeAttackIfReady(); } diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 9fe4c930768..06b34487c7d 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -1426,7 +1426,7 @@ class npc_nexus_lord : public CreatureScript _events.ScheduleEvent(EVENT_HASTE_BUFF, 15*IN_MILLISECONDS); break; case EVENT_NUKE_DUMMY: - DoCast(me->GetVictim(), SPELL_DUMMY_NUKE, true); + DoCastVictim(SPELL_DUMMY_NUKE, true); DoCast(me, SPELL_ALIGN_DISK_AGGRO, true); _events.ScheduleEvent(EVENT_NUKE_DUMMY, 1*IN_MILLISECONDS); break; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index c20f7da5d2e..422560f52b8 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -181,7 +181,7 @@ public: if (uiCrystalfireBreathTimer <= diff) { - DoCast(me->GetVictim(), SPELL_CRYSTALFIRE_BREATH); + DoCastVictim(SPELL_CRYSTALFIRE_BREATH); uiCrystalfireBreathTimer = 14*IN_MILLISECONDS; } else uiCrystalfireBreathTimer -= diff; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index bdc7096d2ad..f8469d6b78e 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -210,7 +210,7 @@ public: switch (eventId) { case EVENT_ARCANE_BARRAGE: - DoCast(me->GetVictim(), SPELL_ARCANE_BARRAGE); + DoCastVictim(SPELL_ARCANE_BARRAGE); events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3, 10) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; case EVENT_ARCANE_VOLLEY: diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index c7da2e695f4..b5525334f5d 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -134,7 +134,7 @@ public: events.ScheduleEvent(EVENT_CALL_AZURE, urand(20, 25) * IN_MILLISECONDS); break; case EVENT_AMPLIFY_MAGIC: - DoCast(me->GetVictim(), SPELL_CALL_AMPLIFY_MAGIC); + DoCastVictim(SPELL_CALL_AMPLIFY_MAGIC); events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(17, 20) * IN_MILLISECONDS); break; } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index 80453d62e29..f5ea71c1928 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -295,7 +295,7 @@ public: if (m_uiPummel_Timer <= uiDiff) { - DoCast(me->GetVictim(), SPELL_PUMMEL); + DoCastVictim(SPELL_PUMMEL); m_uiPummel_Timer = urand(10000, 11000); } else @@ -316,7 +316,7 @@ public: if (m_uiIntercept_Timer <= uiDiff) { //not much point is this, better random target and more often? - DoCast(me->GetVictim(), SPELL_INTERCEPT); + DoCastVictim(SPELL_INTERCEPT); m_uiIntercept_Timer = urand(45000, 46000); } else @@ -332,7 +332,7 @@ public: if (m_uiCleave_Timer <= uiDiff) { - DoCast(me->GetVictim(), SPELL_CLEAVE); + DoCastVictim(SPELL_CLEAVE); m_uiCleave_Timer = urand(8000, 9000); } else @@ -344,7 +344,7 @@ public: { if (m_uiMortalStrike_Timer <= uiDiff) { - DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE); + DoCastVictim(SPELL_MORTAL_STRIKE); m_uiMortalStrike_Timer = urand(20000, 21000); } else @@ -352,7 +352,7 @@ public: if (m_uiSlam_Timer <= uiDiff) { - DoCast(me->GetVictim(), SPELL_SLAM); + DoCastVictim(SPELL_SLAM); m_uiSlam_Timer = urand(15000, 16000); } else @@ -420,7 +420,7 @@ public: if (m_uiArcWeld_Timer <= uiDiff) { - DoCast(me->GetVictim(), SPELL_ARC_WELD); + DoCastVictim(SPELL_ARC_WELD); m_uiArcWeld_Timer = urand(20000, 21000); } else diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 5ebe44c7b22..80ebb702fed 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -265,7 +265,7 @@ public: if (uiBallLightningTimer <= uiDiff) { - DoCast(me->GetVictim(), SPELL_BALL_LIGHTNING); + DoCastVictim(SPELL_BALL_LIGHTNING); uiBallLightningTimer = urand(10*IN_MILLISECONDS, 11*IN_MILLISECONDS); } else diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index e76622280ac..9635049131f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -443,7 +443,7 @@ public: if (m_uiImmolation_Timer <= uiDiff) { - DoCast(me->GetVictim(), SPELL_IMMOLATION_STRIKE_N); + DoCastVictim(SPELL_IMMOLATION_STRIKE_N); m_uiImmolation_Timer = 5000; } else diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 3e4ebcb5929..8fe7e17adf7 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -126,7 +126,7 @@ public: if (StormOfGriefTimer <= diff) { - DoCast(me->GetVictim(), SPELL_STORM_OF_GRIEF_N, true); + DoCastVictim(SPELL_STORM_OF_GRIEF_N, true); StormOfGriefTimer = urand(15000, 20000); } else StormOfGriefTimer -= diff; @@ -145,7 +145,7 @@ public: if (target) DoCast(target, SPELL_PILLAR_OF_WOE_N); else - DoCast(me->GetVictim(), SPELL_PILLAR_OF_WOE_N); + DoCastVictim(SPELL_PILLAR_OF_WOE_N); PillarOfWoeTimer = urand(5000, 25000); } else PillarOfWoeTimer -= diff; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index c594ecf3447..83dc49556b4 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -168,7 +168,7 @@ public: if (uiStaticChargeTimer <= diff) { - DoCast(me->GetVictim(), SPELL_STATIC_CHARGE); + DoCastVictim(SPELL_STATIC_CHARGE); uiStaticChargeTimer = urand(20000, 25000); } uiStaticChargeTimer -= diff; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 33958f0a38a..19c80fd7d0e 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -924,7 +924,7 @@ class spell_biting_cold : public SpellScriptLoader for (TargetList::iterator itr = listOfTargets.begin(); itr != listOfTargets.end(); ++itr) { if (itr->first != target->GetGUID()) - return; + continue; if (itr->second >= 4) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 79b04d412d1..8f8f05a4018 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -494,7 +494,7 @@ class boss_razorscale : public CreatureScript events.CancelEvent(EVENT_BUFFET); return; case EVENT_FUSE: - DoCast(me->GetVictim(), SPELL_FUSEARMOR); + DoCastVictim(SPELL_FUSEARMOR); events.ScheduleEvent(EVENT_FUSE, 10000, 0, PHASE_PERMAGROUND); return; } @@ -864,7 +864,7 @@ class npc_darkrune_watcher : public CreatureScript if (ChainTimer <= Diff) { - DoCast(me->GetVictim(), SPELL_CHAIN_LIGHTNING); + DoCastVictim(SPELL_CHAIN_LIGHTNING); ChainTimer = urand(10000, 15000); } else @@ -924,7 +924,7 @@ class npc_darkrune_guardian : public CreatureScript if (StormTimer <= Diff) { - DoCast(me->GetVictim(), SPELL_STORMSTRIKE); + DoCastVictim(SPELL_STORMSTRIKE); StormTimer = urand(4000, 8000); } else @@ -970,7 +970,7 @@ class npc_darkrune_sentinel : public CreatureScript if (HeroicTimer <= Diff) { - DoCast(me->GetVictim(), SPELL_HEROIC_STRIKE); + DoCastVictim(SPELL_HEROIC_STRIKE); HeroicTimer = urand(4000, 6000); } else @@ -978,7 +978,7 @@ class npc_darkrune_sentinel : public CreatureScript if (WhirlTimer <= Diff) { - DoCast(me->GetVictim(), SPELL_WHIRLWIND); + DoCastVictim(SPELL_WHIRLWIND); WhirlTimer = urand(20000, 25000); } else diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 39ef5284ba7..f26e2ec5f51 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -583,7 +583,7 @@ class mob_pummeller : public CreatureScript { if (_arcingSmashTimer <= diff) { - DoCast(me->GetVictim(), SPELL_ARCING_SMASH); + DoCastVictim(SPELL_ARCING_SMASH); _arcingSmashTimer = TIMER_ARCING_SMASH; } else @@ -591,7 +591,7 @@ class mob_pummeller : public CreatureScript if (_trampleTimer <= diff) { - DoCast(me->GetVictim(), SPELL_TRAMPLE); + DoCastVictim(SPELL_TRAMPLE); _trampleTimer = TIMER_TRAMPLE; } else @@ -599,7 +599,7 @@ class mob_pummeller : public CreatureScript if (_uppercutTimer <= diff) { - DoCast(me->GetVictim(), SPELL_UPPERCUT); + DoCastVictim(SPELL_UPPERCUT); _uppercutTimer = TIMER_UPPERCUT; } else @@ -755,7 +755,7 @@ class mob_life_spark : public CreatureScript { if (me->IsWithinMeleeRange(me->GetVictim())) { - DoCast(me->GetVictim(), SPELL_SHOCK); + DoCastVictim(SPELL_SHOCK); _shockTimer = TIMER_SHOCK; } } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 0331606240f..40f704d4588 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -226,7 +226,7 @@ public: if (StoneStrike_Timer <= diff) { - DoCast(me->GetVictim(), SPELL_STONE_STRIKE); + DoCastVictim(SPELL_STONE_STRIKE); StoneStrike_Timer = 5000+rand()%5000; } else StoneStrike_Timer -= diff; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 07567eb83da..12fc9604474 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -320,7 +320,7 @@ public: if (uiChainLightingTimer <= diff) { - DoCast(me->GetVictim(), SPELL_CHAIN_LIGHTING); + DoCastVictim(SPELL_CHAIN_LIGHTING); uiChainLightingTimer = 5000 + rand() % 5000; } else uiChainLightingTimer -= diff; @@ -433,7 +433,7 @@ public: if (uiMortalWoundTimer <= diff) { - DoCast(me->GetVictim(), SPELL_MORTAL_WOUND); + DoCastVictim(SPELL_MORTAL_WOUND); uiMortalWoundTimer = 3000 + rand() % 4000; } else uiMortalWoundTimer -= diff; @@ -549,13 +549,13 @@ public: if (uiStompTimer <= diff) { - DoCast(me->GetVictim(), SPELL_STOMP); + DoCastVictim(SPELL_STOMP); uiStompTimer = 8000 + rand() % 4000; } else uiStompTimer -= diff; if (uiGoreTimer <= diff) { - DoCast(me->GetVictim(), SPELL_GORE); + DoCastVictim(SPELL_GORE); uiGoreTimer = 13000 + rand() % 4000; } else uiGoreTimer -= diff; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 2065277eb7c..bd08a27d49d 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -365,7 +365,7 @@ public: if (sinsterStrikeTimer <= diff) { - DoCast(me->GetVictim(), SPELL_SINSTER_STRIKE); + DoCastVictim(SPELL_SINSTER_STRIKE); sinsterStrikeTimer = urand(5 * IN_MILLISECONDS, 9 * IN_MILLISECONDS); } else diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 33cf1a96f80..6097e1ab84b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -266,13 +266,13 @@ public: if (m_uiFetidRot_Timer <= diff) { - DoCast(me->GetVictim(), SPELL_FETID_ROT); + DoCastVictim(SPELL_FETID_ROT); m_uiFetidRot_Timer = urand(10000, 15000); } else m_uiFetidRot_Timer -= diff; if (m_uiDarkSlash_Timer <= diff) { - DoCast(me->GetVictim(), SPELL_DARK_SLASH); + DoCastVictim(SPELL_DARK_SLASH); m_uiDarkSlash_Timer = urand(30000, 35000); } else m_uiDarkSlash_Timer -= diff; @@ -299,7 +299,7 @@ public: if (m_bIsActiveWithHALDOR && m_uiAbility_HALDOR_Timer <= diff) { - DoCast(me->GetVictim(), SPELL_SPIRIT_STRIKE); + DoCastVictim(SPELL_SPIRIT_STRIKE); m_uiAbility_HALDOR_Timer = 5000; // overtime } else m_uiAbility_HALDOR_Timer -= diff; diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 5245f3c4586..5e69959732f 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -158,7 +158,7 @@ public: if (Creature* pGuard2 = Unit::GetCreature(*me, instance ? instance->GetData64(DATA_EREKEM_GUARD_2) : 0)) { if (!pGuard1->IsAlive() && !pGuard2->IsAlive()) - DoCast(me->GetVictim(), SPELL_STORMSTRIKE); + DoCastVictim(SPELL_STORMSTRIKE); } } } @@ -191,7 +191,7 @@ public: if (uiEarthShockTimer <= diff) { - DoCast(me->GetVictim(), SPELL_EARTH_SHOCK); + DoCastVictim(SPELL_EARTH_SHOCK); uiEarthShockTimer = urand(8000, 13000); } else uiEarthShockTimer -= diff; @@ -313,19 +313,19 @@ public: if (uiStrikeTimer <= diff) { - DoCast(me->GetVictim(), SPELL_STRIKE); + DoCastVictim(SPELL_STRIKE); uiStrikeTimer = urand(4000, 8000); } else uiStrikeTimer -= diff; if (uiHowlingScreechTimer <= diff) { - DoCast(me->GetVictim(), SPELL_HOWLING_SCREECH); + DoCastVictim(SPELL_HOWLING_SCREECH); uiHowlingScreechTimer = urand(8000, 13000); } else uiHowlingScreechTimer -= diff; if (uiGushingWoundTimer <= diff) { - DoCast(me->GetVictim(), SPELL_GUSHING_WOUND); + DoCastVictim(SPELL_GUSHING_WOUND); uiGushingWoundTimer = urand(7000, 12000); } else uiGushingWoundTimer -= diff; } diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index bca65240794..35711d34709 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -110,19 +110,19 @@ public: if (uiFireboltTimer <= diff) { - DoCast(me->GetVictim(), SPELL_FIREBOLT); + DoCastVictim(SPELL_FIREBOLT); uiFireboltTimer = urand(5000, 13000); } else uiFireboltTimer -= diff; if (uiFlameBreathTimer <= diff) { - DoCast(me->GetVictim(), SPELL_FLAME_BREATH); + DoCastVictim(SPELL_FLAME_BREATH); uiFlameBreathTimer = urand(10000, 15000); } else uiFlameBreathTimer -= diff; if (uiLavaBurnTimer <= diff) { - DoCast(me->GetVictim(), SPELL_LAVA_BURN); + DoCastVictim(SPELL_LAVA_BURN); uiLavaBurnTimer = urand(15000, 23000); } @@ -130,7 +130,7 @@ public: { if (uiCauterizingFlamesTimer <= diff) { - DoCast(me->GetVictim(), SPELL_CAUTERIZING_FLAMES); + DoCastVictim(SPELL_CAUTERIZING_FLAMES); uiCauterizingFlamesTimer = urand(10000, 16000); } else uiCauterizingFlamesTimer -= diff; } diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 59ff6873a56..6519ccfbde0 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -110,7 +110,7 @@ public: if (uiCorrosiveSalivaTimer <= diff) { - DoCast(me->GetVictim(), SPELL_CORROSIVE_SALIVA); + DoCastVictim(SPELL_CORROSIVE_SALIVA); uiCorrosiveSalivaTimer = 10000; } else uiCorrosiveSalivaTimer -= diff; diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index a73c97a9157..1546db45b7a 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -171,7 +171,7 @@ public: { if (uiArcaneBuffet_Timer < uiDiff) { - DoCast(me->GetVictim(), SPELL_ARCANE_BUFFET); + DoCastVictim(SPELL_ARCANE_BUFFET); uiArcaneBuffet_Timer = 0; } else uiArcaneBuffet_Timer -= uiDiff; diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index b8e42384229..7b8641b1b32 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -130,7 +130,7 @@ public: if (SpellSummonVoidTimer <= diff) { - DoCast(me->GetVictim(), SPELL_SUMMON_VOID_SENTRY, false); + DoCastVictim(SPELL_SUMMON_VOID_SENTRY, false); SpellSummonVoidTimer = 20000; } else SpellSummonVoidTimer -=diff; @@ -143,7 +143,7 @@ public: if (SpellShroudOfDarknessTimer <= diff) { - DoCast(me->GetVictim(), SPELL_SHROUD_OF_DARKNESS); + DoCastVictim(SPELL_SHROUD_OF_DARKNESS); SpellShroudOfDarknessTimer = 20000; } else SpellShroudOfDarknessTimer -=diff; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 303a1449644..b1a9a3c7deb 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -844,7 +844,7 @@ public: { if (uiCleaveTimer <= diff) { - DoCast(me->GetVictim(), SPELL_CLEAVE); + DoCastVictim(SPELL_CLEAVE); uiCleaveTimer = 5000; } else uiCleaveTimer -= diff; @@ -861,13 +861,13 @@ public: { if (uiBrutalStrikeTimer <= diff) { - DoCast(me->GetVictim(), SPELL_BRUTAL_STRIKE); + DoCastVictim(SPELL_BRUTAL_STRIKE); uiBrutalStrikeTimer = 5000; } else uiBrutalStrikeTimer -= diff; if (uiSunderArmorTimer <= diff) { - DoCast(me->GetVictim(), SPELL_SUNDER_ARMOR); + DoCastVictim(SPELL_SUNDER_ARMOR); uiSunderArmorTimer = urand(8000, 10000); } else uiSunderArmorTimer -= diff; @@ -1054,7 +1054,7 @@ public: if (uiConcussionBlowTimer <= diff) { - DoCast(me->GetVictim(), SPELL_CONCUSSION_BLOW); + DoCastVictim(SPELL_CONCUSSION_BLOW); uiConcussionBlowTimer = 5000; } else uiConcussionBlowTimer -= diff; @@ -1249,7 +1249,7 @@ public: if (uiMortalStrikeTimer <= diff) { - DoCast(me->GetVictim(), SPELL_MORTAL_STRIKE); + DoCastVictim(SPELL_MORTAL_STRIKE); uiMortalStrikeTimer = 5000; } else uiMortalStrikeTimer -= diff; diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 13d019cb119..b0678c74695 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -1381,19 +1381,19 @@ public: { if (shadowBoltTimer <= uiDiff) { - DoCast(me->GetVictim(), SPELL_SHADOW_BOLT); + DoCastVictim(SPELL_SHADOW_BOLT); shadowBoltTimer = urand(5000, 12000); } else shadowBoltTimer -= uiDiff; if (deflectionTimer <= uiDiff) { - DoCast(me->GetVictim(), SPELL_DEFLECTION); + DoCastVictim(SPELL_DEFLECTION); deflectionTimer = urand(20000, 25000); } else deflectionTimer -= uiDiff; if (soulBlastTimer <= uiDiff) { - DoCast(me->GetVictim(), SPELL_SOUL_BLAST); + DoCastVictim(SPELL_SOUL_BLAST); soulBlastTimer = urand (12000, 18000); } else soulBlastTimer -= uiDiff; } diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 560ab86e3e4..965d197050e 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -656,7 +656,7 @@ public: break; case EVENT_CHOP: if (UpdateVictim()) - DoCast(me->GetVictim(), SPELL_CHOP); + DoCastVictim(SPELL_CHOP); _events.ScheduleEvent(EVENT_CHOP, 10000, 12000); break; default: diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 95cb6d6629f..68fdc16cfb0 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -577,7 +577,7 @@ public: if (!_summoned && !HealthAbovePct(50)) { Talk(SAY_CALL_FOR_HELP); - //DoCast(me->GetVictim(), SPELL_SUMMON_WHISKER); petai is not working correctly??? + //DoCastVictim(SPELL_SUMMON_WHISKER); petai is not working correctly??? if (Creature* whisker = me->SummonCreature(NPC_WHISKER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) _whiskerGUID = whisker->GetGUID(); @@ -780,13 +780,13 @@ public: if (_cleaveTimer <= diff) { - DoCast(me->GetVictim(), SPELL_CLEAVE); + DoCastVictim(SPELL_CLEAVE); _cleaveTimer = 9000; } else _cleaveTimer -= diff; if (_corrodeFleshTimer <= diff) { - DoCast(me->GetVictim(), SPELL_CORRODE_FLESH); + DoCastVictim(SPELL_CORRODE_FLESH); _corrodeFleshTimer = 6000; } else _corrodeFleshTimer -= diff; |