diff options
9 files changed, 34 insertions, 34 deletions
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp index 4f4df740093..f073a57470f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp @@ -84,7 +84,7 @@ class boss_epoch : public CreatureScript case EVENT_CURSE_OF_EXERTION: if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_CURSE_OF_EXERTION); - events.ScheduleEvent(EVENT_CURSE_OF_EXERTION, 9300); + events.ScheduleEvent(EVENT_CURSE_OF_EXERTION, 9300ms); break; case EVENT_TIME_WARP: Talk(SAY_TIME_WARP); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp index 054d3928748..4dd3d2e221b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp @@ -51,17 +51,17 @@ float PortalLocation[4][4]= struct Wave { uint32 PortalBoss; //protector of current portal - uint32 NextPortalTime; //time to next portal, or 0 if portal boss need to be killed + Milliseconds NextPortalTime; //time to next portal, or 0 if portal boss need to be killed }; static Wave RiftWaves[]= { - { RIFT_BOSS, 0 }, - { NPC_CRONO_LORD_DEJA, 0 }, - { RIFT_BOSS, 120000 }, - { NPC_TEMPORUS, 140000 }, - { RIFT_BOSS, 120000 }, - { NPC_AEONUS, 0 } + { RIFT_BOSS, 0s }, + { NPC_CRONO_LORD_DEJA, 0s }, + { RIFT_BOSS, 120s }, + { NPC_TEMPORUS, 140s }, + { RIFT_BOSS, 120s }, + { NPC_AEONUS, 0s } }; enum EventIds @@ -195,7 +195,7 @@ public: TC_LOG_DEBUG("scripts", "Instance The Black Morass: Starting event."); InitWorldState(); m_auiEncounter[1] = IN_PROGRESS; - ScheduleEventNextPortal(15000); + ScheduleEventNextPortal(15s); } if (data == DONE) @@ -227,7 +227,7 @@ public: if (data == SPECIAL) { if (mRiftPortalCount < 7) - ScheduleEventNextPortal(5000); + ScheduleEventNextPortal(5s); } else m_auiEncounter[1] = data; @@ -338,9 +338,9 @@ public: } } - void ScheduleEventNextPortal(uint32 nextPortalTime) + void ScheduleEventNextPortal(Milliseconds nextPortalTime) { - if (nextPortalTime > 0) + if (nextPortalTime > 0s) Events.RescheduleEvent(EVENT_NEXT_PORTAL, nextPortalTime); } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index f51415d6dd5..ca2a8553974 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -257,8 +257,8 @@ public: Talk(SAY_PHASE_2_TRANS); instance->SetData(DATA_ONYXIA_PHASE, Phase); events.ScheduleEvent(EVENT_WHELP_SPAWN, 5s); - events.ScheduleEvent(EVENT_LAIR_GUARD, 15000); - events.ScheduleEvent(EVENT_DEEP_BREATH, 75000); + events.ScheduleEvent(EVENT_LAIR_GUARD, 15s); + events.ScheduleEvent(EVENT_DEEP_BREATH, 75s); events.ScheduleEvent(EVENT_MOVEMENT, 10s); events.ScheduleEvent(EVENT_FIREBALL, 18s); break; @@ -427,7 +427,7 @@ public: Talk(EMOTE_BREATH); if (PointData) /// @todo: In what cases is this null? What should we do? DoCast(me, PointData->SpellId); - events.ScheduleEvent(EVENT_DEEP_BREATH, 75000); + events.ScheduleEvent(EVENT_DEEP_BREATH, 75s); } else events.ScheduleEvent(EVENT_DEEP_BREATH, 1s); @@ -443,7 +443,7 @@ public: me->GetMotionMaster()->MovePoint(PointData->LocId, PointData->fX, PointData->fY, PointData->fZ); IsMoving = true; - events.ScheduleEvent(EVENT_MOVEMENT, 25000); + events.ScheduleEvent(EVENT_MOVEMENT, 25s); } else events.ScheduleEvent(EVENT_MOVEMENT, 500ms); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp index d81bb49a69c..07567285467 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp @@ -55,7 +55,7 @@ public: void Reset() override { _Reset(); - events.ScheduleEvent(EVENT_OOC_1, 10000); + events.ScheduleEvent(EVENT_OOC_1, 10s); } void JustEngagedWith(Unit* who) override @@ -84,19 +84,19 @@ public: { case EVENT_OOC_1: Talk(SAY_OOC_1); - events.ScheduleEvent(EVENT_OOC_2, 8000); + events.ScheduleEvent(EVENT_OOC_2, 8s); break; case EVENT_OOC_2: Talk(SAY_OOC_2); - events.ScheduleEvent(EVENT_OOC_3, 3000); + events.ScheduleEvent(EVENT_OOC_3, 3s); break; case EVENT_OOC_3: me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); - events.ScheduleEvent(EVENT_OOC_4, 6000); + events.ScheduleEvent(EVENT_OOC_4, 6s); break; case EVENT_OOC_4: Talk(SAY_OOC_3); - events.ScheduleEvent(EVENT_OOC_1, 14000); + events.ScheduleEvent(EVENT_OOC_1, 14s); break; } } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 57da04b2bc8..c45dbc6b3e6 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -164,7 +164,7 @@ public: Talk(SAY_EVENT_START); DoCastSelf(SPELL_IDOL_SHUTDOWN_VISUAL); events.ScheduleEvent(EVENT_IDOL_ROOM_SPAWNER, 100ms); - events.ScheduleEvent(EVENT_PROGRESS, 120000); + events.ScheduleEvent(EVENT_PROGRESS, 120s); break; case EVENT_IDOL_ROOM_SPAWNER: if (Creature* creature = me->SummonCreature(NPC_IDOL_ROOM_SPAWNER, PosSummonSpawner[urand(0,2)], TEMPSUMMON_TIMED_DESPAWN, 4000)) diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index 1c70d3fa91f..f06aa6a134e 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -132,7 +132,7 @@ class boss_buru : public CreatureScript { ChaseNewVictim(); Eggs.push_back(EggGUID); - events.ScheduleEvent(EVENT_RESPAWN_EGG, 100000); + events.ScheduleEvent(EVENT_RESPAWN_EGG, 100s); } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 930568be559..b2e762f57ac 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -187,12 +187,12 @@ class boss_skeram : public CreatureScript Talk(SAY_SPLIT); _hpct -= 25.0f; me->SetVisible(false); - events.RescheduleEvent(EVENT_BLINK, 2000); + events.RescheduleEvent(EVENT_BLINK, 2s); } if (me->IsWithinMeleeRange(me->GetVictim())) { - events.RescheduleEvent(EVENT_EARTH_SHOCK, 2000); + events.RescheduleEvent(EVENT_EARTH_SHOCK, 2s); DoMeleeAttackIfReady(); } } diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 4dd1556c951..a45e65460ef 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -255,8 +255,8 @@ public: void JustEngagedWith(Unit* /*who*/) override { - _events.ScheduleEvent(EVENT_UPPERCUT, 15 * IN_MILLISECONDS); - _events.ScheduleEvent(EVENT_IMMOLATE, 10 * IN_MILLISECONDS); + _events.ScheduleEvent(EVENT_UPPERCUT, 15s); + _events.ScheduleEvent(EVENT_IMMOLATE, 10s); _events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 5s); } @@ -422,18 +422,18 @@ public: { case EVENT_FROST_SHOCK: DoCastVictim(SPELL_FROST_SHOCK); - _events.DelayEvents(1 * IN_MILLISECONDS); + _events.DelayEvents(1s); _events.ScheduleEvent(EVENT_FROST_SHOCK, 10s, 15s); break; case EVENT_SEARING_TOTEM: DoCast(me, SPELL_SEARING_TOTEM); - _events.DelayEvents(1 * IN_MILLISECONDS); - _events.ScheduleEvent(EVENT_SEARING_TOTEM, urand(110, 130) * IN_MILLISECONDS); + _events.DelayEvents(1s); + _events.ScheduleEvent(EVENT_SEARING_TOTEM, 110s, 130s); break; case EVENT_STRENGTH_OF_EARTH_TOTEM: DoCast(me, SPELL_STRENGTH_OF_EARTH_TOTEM); - _events.DelayEvents(1 * IN_MILLISECONDS); - _events.ScheduleEvent(EVENT_STRENGTH_OF_EARTH_TOTEM, urand(110, 130) * IN_MILLISECONDS); + _events.DelayEvents(1s); + _events.ScheduleEvent(EVENT_STRENGTH_OF_EARTH_TOTEM, 110s, 130s); break; case EVENT_HEALING_SURGE: { diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index 168713ea0a6..3d1af018a97 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -91,7 +91,7 @@ public: if (me->HasAura(SPELL_OMEN_STARFALL)) me->RemoveAurasDueToSpell(SPELL_OMEN_STARFALL); - events.RescheduleEvent(EVENT_CAST_STARFALL, urand(14000, 16000)); + events.RescheduleEvent(EVENT_CAST_STARFALL, 14s, 16s); } } @@ -139,7 +139,7 @@ public: void Reset() override { events.Reset(); - events.ScheduleEvent(EVENT_DESPAWN, 5*MINUTE*IN_MILLISECONDS); + events.ScheduleEvent(EVENT_DESPAWN, 5min); } void UpdateAI(uint32 diff) override |