diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index f4bde03dcd7..e70810e6182 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -269,10 +269,10 @@ struct boss_twin_baseAI : public BossAI me->SetCombatPulseDelay(5); me->setActive(true); - events.ScheduleEvent(EVENT_TWIN_SPIKE, 20 * IN_MILLISECONDS); - events.ScheduleEvent(EVENT_BERSERK, IsHeroic() ? 6 * MINUTE*IN_MILLISECONDS : 10 * MINUTE*IN_MILLISECONDS); + events.ScheduleEvent(EVENT_TWIN_SPIKE, 20s); + events.ScheduleEvent(EVENT_BERSERK, IsHeroic() ? 6min : 8min); if (IsHeroic()) - events.ScheduleEvent(EVENT_TOUCH, urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS)); + events.ScheduleEvent(EVENT_TOUCH, 10s, 15s); } void DoAction(int32 action) override @@ -308,7 +308,7 @@ struct boss_twin_baseAI : public BossAI { case EVENT_TWIN_SPIKE: DoCastVictim(SpikeSpellId); - events.ScheduleEvent(EVENT_TWIN_SPIKE, 20 * IN_MILLISECONDS); + events.Repeat(20s); break; case EVENT_TOUCH: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true, true, OtherEssenceSpellId)) @@ -317,7 +317,7 @@ struct boss_twin_baseAI : public BossAI args.AddSpellMod(SPELLVALUE_MAX_TARGETS, 1); // @todo spellmgr correction instead? me->CastSpell(target, TouchSpellId, args); } - events.ScheduleEvent(EVENT_TOUCH, urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS)); + events.Repeat(10s, 15s); break; case EVENT_BERSERK: DoCast(me, SPELL_BERSERK); @@ -424,7 +424,7 @@ class boss_fjola : public CreatureScript break; } ++CurrentStage; - events.ScheduleEvent(EVENT_SPECIAL_ABILITY, 45 * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_SPECIAL_ABILITY, 45s); } else boss_twin_baseAI::ExecuteEvent(eventId); @@ -433,7 +433,7 @@ class boss_fjola : public CreatureScript void JustEngagedWith(Unit* who) override { instance->DoStartCriteriaTimer(CriteriaStartEvent::SendEvent, EVENT_START_TWINS_FIGHT); - events.ScheduleEvent(EVENT_SPECIAL_ABILITY, 45 * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_SPECIAL_ABILITY, 45s); me->SummonCreature(NPC_BULLET_CONTROLLER, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 0.0f, TEMPSUMMON_MANUAL_DESPAWN); boss_twin_baseAI::JustEngagedWith(who); } @@ -561,7 +561,7 @@ struct npc_unleashed_ballAI : public ScriptedAI void Initialize() { - RangeCheckTimer = 0.5*IN_MILLISECONDS; + RangeCheckTimer = 500; } void MoveToNextPoint() @@ -628,9 +628,9 @@ class npc_unleashed_dark : public CreatureScript { DoCastAOE(SPELL_UNLEASHED_DARK); me->GetMotionMaster()->MoveIdle(); - me->DespawnOrUnsummon(1*IN_MILLISECONDS); + me->DespawnOrUnsummon(1s); } - RangeCheckTimer = 0.5*IN_MILLISECONDS; + RangeCheckTimer = 500; } else RangeCheckTimer -= diff; @@ -660,9 +660,9 @@ class npc_unleashed_light : public CreatureScript { DoCastAOE(SPELL_UNLEASHED_LIGHT); me->GetMotionMaster()->MoveIdle(); - me->DespawnOrUnsummon(1 * IN_MILLISECONDS); + me->DespawnOrUnsummon(1s); } - RangeCheckTimer = IN_MILLISECONDS / 2; + RangeCheckTimer = 500; } else RangeCheckTimer -= diff; |