Core/Scripts: Unify Chrono Literals (#22420)

* Unify Chrono Literals

* Retire IN_MILLISECONDS

* Build fix

* Build fix (sequel)

* Retire urand()

* Edge cases

* Build

* Whitespaces

* More edge cases

* Additional cases

98 files changed, 707 insertions, 707 deletions

diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
index 2831164a47d..4233021f5ae 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
@@ -99,12 +99,12 @@ class npc_av_marshal_or_warmaster : public CreatureScript
                 Initialize();
 
                 events.Reset();
-                events.ScheduleEvent(EVENT_CHARGE_TARGET, urand(2 * IN_MILLISECONDS, 12 * IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_CLEAVE, urand(1 * IN_MILLISECONDS, 11 * IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 2000);
-                events.ScheduleEvent(EVENT_WHIRLWIND, urand(5 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_ENRAGE, urand(5 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
-                events.ScheduleEvent(EVENT_CHECK_RESET, 5000);
+                events.ScheduleEvent(EVENT_CHARGE_TARGET, 2s, 12s);
+                events.ScheduleEvent(EVENT_CLEAVE, 1s, 11s);
+                events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 2s);
+                events.ScheduleEvent(EVENT_WHIRLWIND, 5s, 20s);
+                events.ScheduleEvent(EVENT_ENRAGE, 5s, 20s);
+                events.ScheduleEvent(EVENT_CHECK_RESET, 5s);
             }
 
             void JustAppeared() override
@@ -138,23 +138,23 @@ class npc_av_marshal_or_warmaster : public CreatureScript
                     {
                         case EVENT_CHARGE_TARGET:
                             DoCastVictim(SPELL_CHARGE);
-                            events.ScheduleEvent(EVENT_CHARGE, urand(10 * IN_MILLISECONDS, 25 * IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_CHARGE, 10s, 25s);
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE);
-                            events.ScheduleEvent(EVENT_CLEAVE, urand(10 * IN_MILLISECONDS, 16 * IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_CLEAVE, 10s, 16s);
                             break;
                         case EVENT_DEMORALIZING_SHOUT:
                             DoCast(me, SPELL_DEMORALIZING_SHOUT);
-                            events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 10s, 15s);
                             break;
                         case EVENT_WHIRLWIND:
                             DoCast(me, SPELL_WHIRLWIND);
-                            events.ScheduleEvent(EVENT_WHIRLWIND, urand(10 * IN_MILLISECONDS, 25 * IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_WHIRLWIND, 10s, 25s);
                             break;
                         case EVENT_ENRAGE:
                             DoCast(me, SPELL_ENRAGE);
-                            events.ScheduleEvent(EVENT_ENRAGE, urand(10 * IN_MILLISECONDS, 30 * IN_MILLISECONDS));
+                            events.ScheduleEvent(EVENT_ENRAGE, 10s, 30s);
                             break;
                         case EVENT_CHECK_RESET:
                         {
@@ -164,7 +164,7 @@ class npc_av_marshal_or_warmaster : public CreatureScript
                                 EnterEvadeMode();
                                 return;
                             }
-                            events.ScheduleEvent(EVENT_CHECK_RESET, 5000);
+                            events.ScheduleEvent(EVENT_CHECK_RESET, 5s);
                             break;
                         }
                     }
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
index 577c156fd83..07c9fe5d84c 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
@@ -80,12 +80,12 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(5 * IN_MILLISECONDS, 15 * IN_MILLISECONDS));
-            events.ScheduleEvent(EVENT_CONE_OF_COLD, 8 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_FIREBOLT, 1 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_FROSTBOLT, 4 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_SUMMON_WATER_ELEMENTAL, 3 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_CHECK_RESET, 5 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 5s, 15s);
+            events.ScheduleEvent(EVENT_CONE_OF_COLD, 8s);
+            events.ScheduleEvent(EVENT_FIREBOLT, 1s);
+            events.ScheduleEvent(EVENT_FROSTBOLT, 4s);
+            events.ScheduleEvent(EVENT_SUMMON_WATER_ELEMENTAL, 3s);
+            events.ScheduleEvent(EVENT_CHECK_RESET, 5s);
         }
 
         void JustSummoned(Creature* summoned) override
@@ -137,24 +137,24 @@ public:
                 {
                     case EVENT_ARCANE_EXPLOSION:
                         DoCastVictim(SPELL_ARCANE_EXPLOSION);
-                        events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(5 * IN_MILLISECONDS, 15 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 5s, 15s);
                         break;
                     case EVENT_CONE_OF_COLD:
                         DoCastVictim(SPELL_CONE_OF_COLD);
-                        events.ScheduleEvent(EVENT_CONE_OF_COLD, urand(10 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_CONE_OF_COLD, 10s, 20s);
                         break;
                     case EVENT_FIREBOLT:
                         DoCastVictim(SPELL_FIREBALL);
-                        events.ScheduleEvent(EVENT_FIREBOLT, urand(5 * IN_MILLISECONDS, 9 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_FIREBOLT, 5s, 9s);
                         break;
                     case EVENT_FROSTBOLT:
                         DoCastVictim(SPELL_FROSTBOLT);
-                        events.ScheduleEvent(EVENT_FROSTBOLT, urand(4 * IN_MILLISECONDS, 12 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_FROSTBOLT, 4s, 12s);
                         break;
                     case EVENT_SUMMON_WATER_ELEMENTAL:
                         if (summons.empty())
                             DoCast(SPELL_SUMMON_WATER_ELEMENTAL);
-                        events.ScheduleEvent(EVENT_SUMMON_WATER_ELEMENTAL, 50 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_SUMMON_WATER_ELEMENTAL, 50s);
                         break;
                     case EVENT_CHECK_RESET:
                         if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
@@ -165,7 +165,7 @@ public:
                         if (Creature* elemental = ObjectAccessor::GetCreature(*me, WaterElementalGUID))
                             if (elemental->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
                                 elemental->AI()->EnterEvadeMode();
-                        events.ScheduleEvent(EVENT_CHECK_RESET, 5 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_CHECK_RESET, 5s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
index 3371da03d6e..c3b90855101 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
@@ -64,11 +64,11 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_WHIRLWIND, urand(1 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
+            events.ScheduleEvent(EVENT_WHIRLWIND, 1s, 20s);
             events.ScheduleEvent(EVENT_WHIRLWIND2, urand(1 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
-            events.ScheduleEvent(EVENT_KNOCKDOWN, 12 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_FRENZY, 6 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_RANDOM_YELL, urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS)); //20 to 30 seconds
+            events.ScheduleEvent(EVENT_KNOCKDOWN, 12s);
+            events.ScheduleEvent(EVENT_FRENZY, 6s);
+            events.ScheduleEvent(EVENT_RANDOM_YELL, 20s, 30s); //20 to 30 seconds
         }
 
         void JustAppeared() override
@@ -105,7 +105,7 @@ public:
                 {
                     case EVENT_WHIRLWIND:
                         DoCastVictim(SPELL_WHIRLWIND);
-                        events.ScheduleEvent(EVENT_WHIRLWIND, urand(8 * IN_MILLISECONDS, 18 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_WHIRLWIND, 8s, 18s);
                         break;
                     case EVENT_WHIRLWIND2:
                         DoCastVictim(SPELL_WHIRLWIND2);
@@ -113,15 +113,15 @@ public:
                         break;
                     case EVENT_KNOCKDOWN:
                         DoCastVictim(SPELL_KNOCKDOWN);
-                        events.ScheduleEvent(EVENT_KNOCKDOWN, urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_KNOCKDOWN, 10s, 15s);
                         break;
                     case EVENT_FRENZY:
                         DoCastVictim(SPELL_FRENZY);
-                        events.ScheduleEvent(EVENT_FRENZY, urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_FRENZY, 20s, 30s);
                         break;
                     case EVENT_RANDOM_YELL:
                         Talk(SAY_RANDOM);
-                        events.ScheduleEvent(EVENT_RANDOM_YELL, urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_RANDOM_YELL, 20s, 30s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
index 3f12ff07c5c..cea74938db7 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
@@ -65,11 +65,11 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_CLEAVE, urand(1 * IN_MILLISECONDS, 9 * IN_MILLISECONDS));
-            events.ScheduleEvent(EVENT_FRIGHTENING_SHOUT, urand(2 * IN_MILLISECONDS, 19 * IN_MILLISECONDS));
+            events.ScheduleEvent(EVENT_CLEAVE, 1s, 9s);
+            events.ScheduleEvent(EVENT_FRIGHTENING_SHOUT, 2s, 19s);
             events.ScheduleEvent(EVENT_WHIRLWIND1, urand(1 * IN_MILLISECONDS, 13 * IN_MILLISECONDS));
             events.ScheduleEvent(EVENT_WHIRLWIND2, urand(5 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
-            events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(5 * IN_MILLISECONDS, 20 * IN_MILLISECONDS));
+            events.ScheduleEvent(EVENT_MORTAL_STRIKE, 5s, 20s);
         }
 
         void DoAction(int32 actionId) override
@@ -106,11 +106,11 @@ public:
                 {
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, urand(10 * IN_MILLISECONDS, 16 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_CLEAVE, 10s, 16s);
                         break;
                     case EVENT_FRIGHTENING_SHOUT:
                         DoCastVictim(SPELL_FRIGHTENING_SHOUT);
-                        events.ScheduleEvent(EVENT_FRIGHTENING_SHOUT, urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_FRIGHTENING_SHOUT, 10s, 15s);
                         break;
                     case EVENT_WHIRLWIND1:
                         DoCastVictim(SPELL_WHIRLWIND1);
@@ -122,7 +122,7 @@ public:
                         break;
                     case EVENT_MORTAL_STRIKE:
                         DoCastVictim(SPELL_MORTAL_STRIKE);
-                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(10 * IN_MILLISECONDS, 30 * IN_MILLISECONDS));
+                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, 10s, 30s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
index ed0eec6f793..0668419e27c 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
@@ -46,8 +46,8 @@ class boss_ambassador_flamelash : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_FIREBLAST, 2000);
-                _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, 24000);
+                _events.ScheduleEvent(EVENT_FIREBLAST, 2s);
+                _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, 24s);
             }
 
             void SummonSpirit(Unit* victim)
@@ -69,12 +69,12 @@ class boss_ambassador_flamelash : public CreatureScript
                     {
                         case EVENT_FIREBLAST:
                             DoCastVictim(SPELL_FIREBLAST);
-                            _events.ScheduleEvent(EVENT_FIREBLAST, 7000);
+                            _events.ScheduleEvent(EVENT_FIREBLAST, 7s);
                             break;
                         case EVENT_SUMMON_SPIRITS:
                             for (uint32 i = 0; i < 4; ++i)
                                 SummonSpirit(me->GetVictim());
-                            _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, 30000);
+                            _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, 30s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
index 98eecd0da8d..89605a91381 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp
@@ -174,8 +174,8 @@ struct boss_coren_direbrew : public BossAI
             EntryCheckPredicate pred(NPC_ANTAGONIST);
             summons.DoAction(ACTION_ANTAGONIST_HOSTILE, pred);
 
-            events.ScheduleEvent(EVENT_SUMMON_MOLE_MACHINE, Seconds(15));
-            events.ScheduleEvent(EVENT_DIREBREW_DISARM, Seconds(20));
+            events.ScheduleEvent(EVENT_SUMMON_MOLE_MACHINE, 15s);
+            events.ScheduleEvent(EVENT_DIREBREW_DISARM, 20s);
         }
     }
 
@@ -196,9 +196,9 @@ struct boss_coren_direbrew : public BossAI
     void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) override
     {
         if (summon->GetEntry() == NPC_ILSA_DIREBREW)
-            events.ScheduleEvent(EVENT_RESPAWN_ILSA, Seconds(1));
+            events.ScheduleEvent(EVENT_RESPAWN_ILSA, 1s);
         else if (summon->GetEntry() == NPC_URSULA_DIREBREW)
-            events.ScheduleEvent(EVENT_RESPAWN_URSULA, Seconds(1));
+            events.ScheduleEvent(EVENT_RESPAWN_URSULA, 1s);
     }
 
     void JustDied(Unit* /*killer*/) override
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
index 428ef19750e..a8b57b97429 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
@@ -65,8 +65,8 @@ class boss_emperor_dagran_thaurissan : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 me->CallForHelp(VISIBLE_RANGE);
-                _events.ScheduleEvent(EVENT_HANDOFTHAURISSAN, 4000);
-                _events.ScheduleEvent(EVENT_AVATAROFFLAME, 25000);
+                _events.ScheduleEvent(EVENT_HANDOFTHAURISSAN, 4s);
+                _events.ScheduleEvent(EVENT_AVATAROFFLAME, 25s);
             }
 
             void KilledUnit(Unit* who) override
@@ -99,11 +99,11 @@ class boss_emperor_dagran_thaurissan : public CreatureScript
                         case EVENT_HANDOFTHAURISSAN:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_HANDOFTHAURISSAN);
-                            _events.ScheduleEvent(EVENT_HANDOFTHAURISSAN, 5000);
+                            _events.ScheduleEvent(EVENT_HANDOFTHAURISSAN, 5s);
                             break;
                         case EVENT_AVATAROFFLAME:
                             DoCastVictim(SPELL_AVATAROFFLAME);
-                            _events.ScheduleEvent(EVENT_AVATAROFFLAME, 18000);
+                            _events.ScheduleEvent(EVENT_AVATAROFFLAME, 18s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
index 5afe533be9b..1005c807300 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
@@ -58,9 +58,9 @@ class boss_general_angerforge : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _events.SetPhase(PHASE_ONE);
-                _events.ScheduleEvent(EVENT_MIGHTYBLOW, 8000);
-                _events.ScheduleEvent(EVENT_HAMSTRING, 12000);
-                _events.ScheduleEvent(EVENT_CLEAVE, 16000);
+                _events.ScheduleEvent(EVENT_MIGHTYBLOW, 8s);
+                _events.ScheduleEvent(EVENT_HAMSTRING, 12s);
+                _events.ScheduleEvent(EVENT_CLEAVE, 16s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -98,15 +98,15 @@ class boss_general_angerforge : public CreatureScript
                     {
                         case EVENT_MIGHTYBLOW:
                             DoCastVictim(SPELL_MIGHTYBLOW);
-                            _events.ScheduleEvent(EVENT_MIGHTYBLOW, 18000);
+                            _events.ScheduleEvent(EVENT_MIGHTYBLOW, 18s);
                             break;
                         case EVENT_HAMSTRING:
                             DoCastVictim(SPELL_HAMSTRING);
-                            _events.ScheduleEvent(EVENT_HAMSTRING, 15000);
+                            _events.ScheduleEvent(EVENT_HAMSTRING, 15s);
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE);
-                            _events.ScheduleEvent(EVENT_CLEAVE, 9000);
+                            _events.ScheduleEvent(EVENT_CLEAVE, 9s);
                             break;
                         case EVENT_MEDIC:
                             for (uint8 i = 0; i < 2; ++i)
@@ -115,7 +115,7 @@ class boss_general_angerforge : public CreatureScript
                         case EVENT_ADDS:
                             for (uint8 i = 0; i < 3; ++i)
                                 SummonAdd(me->GetVictim());
-                            _events.ScheduleEvent(EVENT_ADDS, 25000, 0, PHASE_TWO);
+                            _events.ScheduleEvent(EVENT_ADDS, 25s, 0, PHASE_TWO);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
index b086670eecf..a4efc1abcb1 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
@@ -51,10 +51,10 @@ class boss_high_interrogator_gerstahn : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 4000);
-                _events.ScheduleEvent(EVENT_MANABURN, 14000);
-                _events.ScheduleEvent(EVENT_PSYCHIC_SCREAM, 32000);
-                _events.ScheduleEvent(EVENT_SHADOWSHIELD, 8000);
+                _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 4s);
+                _events.ScheduleEvent(EVENT_MANABURN, 14s);
+                _events.ScheduleEvent(EVENT_PSYCHIC_SCREAM, 32s);
+                _events.ScheduleEvent(EVENT_SHADOWSHIELD, 8s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -71,20 +71,20 @@ class boss_high_interrogator_gerstahn : public CreatureScript
                         case EVENT_SHADOW_WORD_PAIN:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                 DoCast(target, SPELL_SHADOWWORDPAIN);
-                            _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 7000);
+                            _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 7s);
                             break;
                         case EVENT_PSYCHIC_SCREAM:
                             DoCastVictim(SPELL_PSYCHICSCREAM);
-                            _events.ScheduleEvent(EVENT_PSYCHIC_SCREAM, 30000);
+                            _events.ScheduleEvent(EVENT_PSYCHIC_SCREAM, 30s);
                             break;
                         case EVENT_MANABURN:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                 DoCast(target, SPELL_MANABURN);
-                            _events.ScheduleEvent(EVENT_MANABURN, 10000);
+                            _events.ScheduleEvent(EVENT_MANABURN, 10s);
                             break;
                         case EVENT_SHADOWSHIELD:
                             DoCast(me, SPELL_SHADOWSHIELD);
-                            _events.ScheduleEvent(EVENT_SHADOWSHIELD, 25000);
+                            _events.ScheduleEvent(EVENT_SHADOWSHIELD, 25s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
index 5ecff6cb0d1..2374291ae51 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
@@ -55,7 +55,7 @@ class boss_magmus : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _events.SetPhase(PHASE_ONE);
-                _events.ScheduleEvent(EVENT_FIERY_BURST, 5000);
+                _events.ScheduleEvent(EVENT_FIERY_BURST, 5s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -80,11 +80,11 @@ class boss_magmus : public CreatureScript
                     {
                         case EVENT_FIERY_BURST:
                             DoCastVictim(SPELL_FIERYBURST);
-                            _events.ScheduleEvent(EVENT_FIERY_BURST, 6000);
+                            _events.ScheduleEvent(EVENT_FIERY_BURST, 6s);
                             break;
                         case EVENT_WARSTOMP:
                             DoCastVictim(SPELL_WARSTOMP);
-                            _events.ScheduleEvent(EVENT_WARSTOMP, 8000, 0, PHASE_TWO);
+                            _events.ScheduleEvent(EVENT_WARSTOMP, 8s, 0, PHASE_TWO);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
index 0d8d3ef37bd..18b4c6af0c6 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
@@ -53,10 +53,10 @@ class boss_moira_bronzebeard : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                //_events.ScheduleEvent(EVENT_HEAL, 12000); // not used atm // These times are probably wrong
-                _events.ScheduleEvent(EVENT_MINDBLAST, 16000);
-                _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 2000);
-                _events.ScheduleEvent(EVENT_SMITE, 8000);
+                //_events.ScheduleEvent(EVENT_HEAL, 12s); // not used atm // These times are probably wrong
+                _events.ScheduleEvent(EVENT_MINDBLAST, 16s);
+                _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 2s);
+                _events.ScheduleEvent(EVENT_SMITE, 8s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -72,15 +72,15 @@ class boss_moira_bronzebeard : public CreatureScript
                     {
                         case EVENT_MINDBLAST:
                             DoCastVictim(SPELL_MINDBLAST);
-                            _events.ScheduleEvent(EVENT_MINDBLAST, 14000);
+                            _events.ScheduleEvent(EVENT_MINDBLAST, 14s);
                             break;
                         case EVENT_SHADOW_WORD_PAIN:
                             DoCastVictim(SPELL_SHADOWWORDPAIN);
-                            _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 18000);
+                            _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 18s);
                             break;
                         case EVENT_SMITE:
                             DoCastVictim(SPELL_SMITE);
-                            _events.ScheduleEvent(EVENT_SMITE, 10000);
+                            _events.ScheduleEvent(EVENT_SMITE, 10s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
index 1284166be31..20605c012d0 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
@@ -163,10 +163,10 @@ class boss_doomrel : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                _events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 10000);
-                _events.ScheduleEvent(EVENT_IMMOLATE, 18000);
-                _events.ScheduleEvent(EVENT_CURSE_OF_WEAKNESS, 5000);
-                _events.ScheduleEvent(EVENT_DEMONARMOR, 16000);
+                _events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 10s);
+                _events.ScheduleEvent(EVENT_IMMOLATE, 18s);
+                _events.ScheduleEvent(EVENT_CURSE_OF_WEAKNESS, 5s);
+                _events.ScheduleEvent(EVENT_DEMONARMOR, 16s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override
@@ -203,20 +203,20 @@ class boss_doomrel : public CreatureScript
                     {
                         case EVENT_SHADOW_BOLT_VOLLEY:
                             DoCastVictim(SPELL_SHADOWBOLTVOLLEY);
-                            _events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 12000);
+                            _events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 12s);
                             break;
                         case EVENT_IMMOLATE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                                 DoCast(target, SPELL_IMMOLATE);
-                            _events.ScheduleEvent(EVENT_IMMOLATE, 25000);
+                            _events.ScheduleEvent(EVENT_IMMOLATE, 25s);
                             break;
                         case EVENT_CURSE_OF_WEAKNESS:
                             DoCastVictim(SPELL_CURSEOFWEAKNESS);
-                            _events.ScheduleEvent(EVENT_CURSE_OF_WEAKNESS, 45000);
+                            _events.ScheduleEvent(EVENT_CURSE_OF_WEAKNESS, 45s);
                             break;
                         case EVENT_DEMONARMOR:
                             DoCast(me, SPELL_DEMONARMOR);
-                            _events.ScheduleEvent(EVENT_DEMONARMOR, 300000);
+                            _events.ScheduleEvent(EVENT_DEMONARMOR, 5min);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
index a9d8bb25338..9d0cdac4297 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
@@ -53,9 +53,9 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_FIRE_NOVA, 6000);
+            events.ScheduleEvent(EVENT_FIRE_NOVA, 6s);
             events.ScheduleEvent(EVENT_CLEAVE,    8000);
-            events.ScheduleEvent(EVENT_CONFLIGURATION, 15000);
+            events.ScheduleEvent(EVENT_CONFLIGURATION, 15s);
             events.ScheduleEvent(EVENT_THUNDERCLAP,    17000);
         }
 
@@ -80,19 +80,19 @@ public:
                 {
                     case EVENT_FIRE_NOVA:
                         DoCastVictim(SPELL_FIRENOVA);
-                        events.ScheduleEvent(EVENT_FIRE_NOVA, 10000);
+                        events.ScheduleEvent(EVENT_FIRE_NOVA, 10s);
                         break;
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, 8000);
+                        events.ScheduleEvent(EVENT_CLEAVE, 8s);
                         break;
                     case EVENT_CONFLIGURATION:
                         DoCastVictim(SPELL_CONFLIGURATION);
-                        events.ScheduleEvent(EVENT_CONFLIGURATION, 18000);
+                        events.ScheduleEvent(EVENT_CONFLIGURATION, 18s);
                         break;
                     case EVENT_THUNDERCLAP:
                         DoCastVictim(SPELL_THUNDERCLAP);
-                        events.ScheduleEvent(EVENT_THUNDERCLAP, 20000);
+                        events.ScheduleEvent(EVENT_THUNDERCLAP, 20s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
index d4be9a658a5..6dc1ebf3ad8 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
@@ -62,8 +62,8 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_FATAL_BITE, urand(17000,20000));
-            events.ScheduleEvent(EVENT_INFECTED_BITE, urand(10000,12000));
+            events.ScheduleEvent(EVENT_FATAL_BITE, 17s, 20s);
+            events.ScheduleEvent(EVENT_INFECTED_BITE, 10s, 12s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -87,11 +87,11 @@ public:
                 {
                     case EVENT_FATAL_BITE:
                         DoCastVictim(SPELL_FATAL_BITE);
-                        events.ScheduleEvent(EVENT_FATAL_BITE, urand(8000,10000));
+                        events.ScheduleEvent(EVENT_FATAL_BITE, 8s, 10s);
                         break;
                     case EVENT_INFECTED_BITE:
                         DoCast(me, SPELL_INFECTED_BITE);
-                        events.ScheduleEvent(EVENT_FATAL_BITE, urand(8000,10000));
+                        events.ScheduleEvent(EVENT_FATAL_BITE, 8s, 10s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
index 5364891bb13..170e273ee81 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
@@ -82,10 +82,10 @@ public:
         {
             _JustEngagedWith();
 
-            events.ScheduleEvent(EVENT_CORROSIVE_ACID, urand(8000, 16000));
-            events.ScheduleEvent(EVENT_FREEZE, urand(8000, 16000));
-            events.ScheduleEvent(EVENT_FLAME_BREATH, urand(8000, 16000));
-            events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(12000, 18000));
+            events.ScheduleEvent(EVENT_CORROSIVE_ACID, 8s, 16s);
+            events.ScheduleEvent(EVENT_FREEZE, 8s, 16s);
+            events.ScheduleEvent(EVENT_FLAME_BREATH, 8s, 16s);
+            events.ScheduleEvent(EVENT_KNOCK_AWAY, 12s, 18s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -98,7 +98,7 @@ public:
             switch (data)
             {
                 case 1:
-                    events.ScheduleEvent(EVENT_SUMMONED_1, 1000);
+                    events.ScheduleEvent(EVENT_SUMMONED_1, 1s);
                     break;
                 default:
                     break;
@@ -129,7 +129,7 @@ public:
                                 portcullis->UseDoorOrButton();
                             if (Creature* victor = me->FindNearestCreature(NPC_LORD_VICTOR_NEFARIUS, 75.0f, true))
                                 victor->AI()->SetData(1, 1);
-                            events.ScheduleEvent(EVENT_SUMMONED_2, 2000);
+                            events.ScheduleEvent(EVENT_SUMMONED_2, 2s);
                             break;
                         case EVENT_SUMMONED_2:
                             me->GetMotionMaster()->MovePath(GYTH_PATH_1, false);
@@ -152,19 +152,19 @@ public:
                 {
                     case EVENT_CORROSIVE_ACID:
                         DoCast(me, SPELL_CORROSIVE_ACID);
-                        events.ScheduleEvent(EVENT_CORROSIVE_ACID, urand(10000, 16000));
+                        events.ScheduleEvent(EVENT_CORROSIVE_ACID, 10s, 16s);
                         break;
                     case EVENT_FREEZE:
                         DoCast(me, SPELL_FREEZE);
-                        events.ScheduleEvent(EVENT_FREEZE, urand(10000, 16000));
+                        events.ScheduleEvent(EVENT_FREEZE, 10s, 16s);
                         break;
                     case EVENT_FLAME_BREATH:
                         DoCast(me, SPELL_FLAMEBREATH);
-                        events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 16000));
+                        events.ScheduleEvent(EVENT_FLAME_BREATH, 10s, 16s);
                         break;
                     case EVENT_KNOCK_AWAY:
                         DoCastVictim(SPELL_KNOCK_AWAY);
-                        events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(14000, 20000));
+                        events.ScheduleEvent(EVENT_KNOCK_AWAY, 14s, 20s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
index e6d11afcf9f..95ca7337886 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
@@ -64,8 +64,8 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_REND, urand(17000,20000));
-            events.ScheduleEvent(EVENT_THRASH, urand(10000,12000));
+            events.ScheduleEvent(EVENT_REND, 17s, 20s);
+            events.ScheduleEvent(EVENT_THRASH, 10s, 12s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -92,7 +92,7 @@ public:
                 {
                     case EVENT_REND:
                         DoCastVictim(SPELL_REND);
-                        events.ScheduleEvent(EVENT_REND, urand(8000,10000));
+                        events.ScheduleEvent(EVENT_REND, 8s, 10s);
                         break;
                     case EVENT_THRASH:
                         DoCast(me, SPELL_THRASH);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
index c9c96e82a33..23878690a29 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
@@ -79,11 +79,11 @@ public:
                 {
                     case EVENT_FRENZY:
                         DoCastVictim(SPELL_FRENZY);
-                        events.ScheduleEvent(EVENT_FRENZY, 60000);
+                        events.ScheduleEvent(EVENT_FRENZY, 1min);
                         break;
                     case EVENT_KNOCK_AWAY:
                         DoCastVictim(SPELL_KNOCK_AWAY);
-                        events.ScheduleEvent(EVENT_KNOCK_AWAY, 12000);
+                        events.ScheduleEvent(EVENT_KNOCK_AWAY, 12s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
index cf63ed6ef69..a4445117151 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
@@ -67,8 +67,8 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, urand(6000,8000));
-            events.ScheduleEvent(EVENT_SHADOW_WRATH, urand(9000,18000));
+            events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, 6s, 8s);
+            events.ScheduleEvent(EVENT_SHADOW_WRATH, 9s, 18s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -92,15 +92,15 @@ public:
                 {
                     case EVENT_SUMMON_SPECTRAL_ASSASSIN:
                         DoCast(me, SPELL_SUMMON_SPECTRAL_ASSASSIN);
-                        events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, urand(30000,35000));
+                        events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, 30s, 35s);
                         break;
                     case EVENT_SHADOW_BOLT_VOLLEY:
                         DoCastVictim(SPELL_SHADOW_BOLT_VOLLEY);
-                        events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, urand(4000,6000));
+                        events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 4s, 6s);
                         break;
                     case EVENT_SHADOW_WRATH:
                         DoCastVictim(SPELL_SHADOW_WRATH);
-                        events.ScheduleEvent(EVENT_SHADOW_WRATH, urand(19000,24000));
+                        events.ScheduleEvent(EVENT_SHADOW_WRATH, 19s, 24s);
                         break;
                     default:
                         break;
@@ -125,7 +125,7 @@ public:
                 if (HealthBelowPct(15))
                 {
                     DoCast(me, SPELL_FRENZY);
-                    events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, urand(7000,14000));
+                    events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 7s, 14s);
                     frenzy15 = true;
                 }
             }
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
index 37bc783acf2..6a008081e11 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
@@ -56,7 +56,7 @@ public:
         {
             _JustEngagedWith();
             events.ScheduleEvent(EVENT_CRYSTALIZE,   20 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_MOTHERS_MILK, 10 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_MOTHERS_MILK, 10s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -86,7 +86,7 @@ public:
                 {
                     case EVENT_CRYSTALIZE:
                         DoCast(me, SPELL_CRYSTALIZE);
-                        events.ScheduleEvent(EVENT_CRYSTALIZE, 15 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_CRYSTALIZE, 15s);
                         break;
                     case EVENT_MOTHERS_MILK:
                         DoCast(me, SPELL_MOTHERSMILK);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
index 81b83ba3a1c..4f211367df5 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
@@ -79,10 +79,10 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_BLAST_WAVE, 20 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_SHOUT,       2 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_CLEAVE,      6 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_KNOCK_AWAY, 12 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_BLAST_WAVE, 20s);
+            events.ScheduleEvent(EVENT_SHOUT, 2s);
+            events.ScheduleEvent(EVENT_CLEAVE, 6s);
+            events.ScheduleEvent(EVENT_KNOCK_AWAY, 12s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -118,19 +118,19 @@ public:
                 {
                     case EVENT_BLAST_WAVE:
                         DoCastVictim(SPELL_BLASTWAVE);
-                        events.ScheduleEvent(EVENT_BLAST_WAVE, 20 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_BLAST_WAVE, 20s);
                         break;
                     case EVENT_SHOUT:
                         DoCastVictim(SPELL_SHOUT);
-                        events.ScheduleEvent(EVENT_SHOUT, 10 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_SHOUT, 10s);
                         break;
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, 7 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_CLEAVE, 7s);
                         break;
                     case EVENT_KNOCK_AWAY:
                         DoCastVictim(SPELL_KNOCKAWAY);
-                        events.ScheduleEvent(EVENT_KNOCK_AWAY, 14 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_KNOCK_AWAY, 14s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
index cafbc0cebf9..8fcd81fc0c5 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
@@ -90,9 +90,9 @@ public:
             me->RemoveAura(SPELL_EMBERSEER_FULL_STRENGTH);
             me->RemoveAura(SPELL_EMBERSEER_GROWING);
             me->RemoveAura(SPELL_EMBERSEER_GROWING_TRIGGER);
-            events.ScheduleEvent(EVENT_RESPAWN, 5000);
+            events.ScheduleEvent(EVENT_RESPAWN, 5s);
             // Hack for missing trigger spell
-            events.ScheduleEvent(EVENT_FIRE_SHIELD, 3000);
+            events.ScheduleEvent(EVENT_FIRE_SHIELD, 3s);
 
             // Open doors on reset
             if (instance->GetBossState(DATA_PYROGAURD_EMBERSEER) == IN_PROGRESS)
@@ -104,7 +104,7 @@ public:
             switch (data)
             {
                 case 1:
-                    events.ScheduleEvent(EVENT_PLAYER_CHECK, 5000);
+                    events.ScheduleEvent(EVENT_PLAYER_CHECK, 5s);
                     break;
                 case 2:
                    // Close these two doors on Blackhand Incarcerators aggro
@@ -127,7 +127,7 @@ public:
         {
             // ### TODO Check combat timing ###
             events.ScheduleEvent(EVENT_FIRENOVA,    6000);
-            events.ScheduleEvent(EVENT_FLAMEBUFFET, 3000);
+            events.ScheduleEvent(EVENT_FLAMEBUFFET, 3s);
             events.ScheduleEvent(EVENT_PYROBLAST,  14000);
         }
 
@@ -163,7 +163,7 @@ public:
                     Talk(YELL_FREE_OF_BONDS);
                     me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                     me->SetImmuneToPC(false);
-                    events.ScheduleEvent(EVENT_ENTER_COMBAT, 2000);
+                    events.ScheduleEvent(EVENT_ENTER_COMBAT, 2s);
                 }
             }
         }
@@ -249,7 +249,7 @@ public:
                         case EVENT_FIRE_SHIELD:
                             // #### Spell isn't doing any damage ??? ####
                             DoCast(me, SPELL_FIRE_SHIELD);
-                            events.ScheduleEvent(EVENT_FIRE_SHIELD, 3000);
+                            events.ScheduleEvent(EVENT_FIRE_SHIELD, 3s);
                             break;
                         case EVENT_PLAYER_CHECK:
                         {
@@ -289,20 +289,20 @@ public:
                 {
                     case EVENT_FIRE_SHIELD:
                         DoCast(me, SPELL_FIRE_SHIELD);
-                        events.ScheduleEvent(EVENT_FIRE_SHIELD, 3000);
+                        events.ScheduleEvent(EVENT_FIRE_SHIELD, 3s);
                         break;
                     case EVENT_FIRENOVA:
                         DoCast(me, SPELL_FIRENOVA);
-                        events.ScheduleEvent(EVENT_FIRENOVA, 6000);
+                        events.ScheduleEvent(EVENT_FIRENOVA, 6s);
                         break;
                     case EVENT_FLAMEBUFFET:
                         DoCast(me, SPELL_FLAMEBUFFET);
-                        events.ScheduleEvent(EVENT_FLAMEBUFFET, 14000);
+                        events.ScheduleEvent(EVENT_FLAMEBUFFET, 14s);
                         break;
                     case EVENT_PYROBLAST:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                             DoCast(target, SPELL_PYROBLAST);
-                        events.ScheduleEvent(EVENT_PYROBLAST, 15000);
+                        events.ScheduleEvent(EVENT_PYROBLAST, 15s);
                         break;
                     default:
                         break;
@@ -365,7 +365,7 @@ public:
             }
 
             if (data == 1 && value == 2)
-                _events.ScheduleEvent(EVENT_ENCAGED_EMBERSEER, 1000);
+                _events.ScheduleEvent(EVENT_ENCAGED_EMBERSEER, 1s);
         }
 
         void JustEngagedWith(Unit* /*who*/) override
@@ -383,8 +383,8 @@ public:
                     DoZoneInCombat(creature);    // AI()->AttackStart(me->GetVictim());
             }
 
-            _events.ScheduleEvent(EVENT_STRIKE, urand(8000, 16000));
-            _events.ScheduleEvent(EVENT_ENCAGE, urand(10000, 20000));
+            _events.ScheduleEvent(EVENT_STRIKE, 8s, 16s);
+            _events.ScheduleEvent(EVENT_ENCAGE, 10s, 20s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -421,11 +421,11 @@ public:
                 {
                     case EVENT_STRIKE:
                         DoCastVictim(SPELL_STRIKE, true);
-                        _events.ScheduleEvent(EVENT_STRIKE, urand(14000, 23000));
+                        _events.ScheduleEvent(EVENT_STRIKE, 14s, 23s);
                         break;
                     case EVENT_ENCAGE:
                         DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), EVENT_ENCAGE, true);
-                        _events.ScheduleEvent(EVENT_ENCAGE, urand(6000, 12000));
+                        _events.ScheduleEvent(EVENT_ENCAGE, 6s, 12s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
index 23d17913c89..ddb84d0528b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
@@ -50,8 +50,8 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_SHOOT,      1000);
-            events.ScheduleEvent(EVENT_STUN_BOMB, 16000);
+            events.ScheduleEvent(EVENT_SHOOT, 1s);
+            events.ScheduleEvent(EVENT_STUN_BOMB, 16s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -75,11 +75,11 @@ public:
                 {
                     case EVENT_SHOOT:
                         DoCastVictim(SPELL_SHOOT);
-                        events.ScheduleEvent(EVENT_SHOOT, 500);
+                        events.ScheduleEvent(EVENT_SHOOT, 500ms);
                         break;
                     case EVENT_STUN_BOMB:
                         DoCastVictim(SPELL_STUNBOMB);
-                        events.ScheduleEvent(EVENT_STUN_BOMB, 14000);
+                        events.ScheduleEvent(EVENT_STUN_BOMB, 14s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
index 3e11df677f4..899b4379fc2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
@@ -185,9 +185,9 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_WHIRLWIND,     urand(13000, 15000));
-            events.ScheduleEvent(EVENT_CLEAVE,        urand(15000, 17000));
-            events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(17000, 19000));
+            events.ScheduleEvent(EVENT_WHIRLWIND, 13s, 15s);
+            events.ScheduleEvent(EVENT_CLEAVE, 15s, 17s);
+            events.ScheduleEvent(EVENT_MORTAL_STRIKE, 17s, 19s);
         }
 
         void IsSummonedBy(Unit* /*summoner*/) override
@@ -266,7 +266,7 @@ public:
                             if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->AI()->Talk(SAY_NEFARIUS_1);
                             events.ScheduleEvent(EVENT_WAVE_1, 2000);
-                            events.ScheduleEvent(EVENT_TURN_TO_REND, 4000);
+                            events.ScheduleEvent(EVENT_TURN_TO_REND, 4s);
                             events.ScheduleEvent(EVENT_WAVES_TEXT_1, 20000);
                             break;
                         case EVENT_TURN_TO_REND:
@@ -350,14 +350,14 @@ public:
                             if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->AI()->Talk(SAY_NEFARIUS_7);
                             Talk(SAY_BLACKHAND_2);
-                            events.ScheduleEvent(EVENT_PATH_REND, 1000);
+                            events.ScheduleEvent(EVENT_PATH_REND, 1s);
                             events.ScheduleEvent(EVENT_WAVES_COMPLETE_TEXT_3, 4000);
                             break;
                         case EVENT_WAVES_COMPLETE_TEXT_3:
                             if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
                                 victor->AI()->Talk(SAY_NEFARIUS_8);
-                            events.ScheduleEvent(EVENT_PATH_NEFARIUS, 1000);
-                            events.ScheduleEvent(EVENT_PATH_REND, 1000);
+                            events.ScheduleEvent(EVENT_PATH_NEFARIUS, 1s);
+                            events.ScheduleEvent(EVENT_PATH_REND, 1s);
                             break;
                         case EVENT_PATH_NEFARIUS:
                             if (Creature* victor = ObjectAccessor::GetCreature(*me, victorGUID))
@@ -429,15 +429,15 @@ public:
                 {
                     case EVENT_WHIRLWIND:
                         DoCast(SPELL_WHIRLWIND);
-                        events.ScheduleEvent(EVENT_WHIRLWIND, urand(13000, 18000));
+                        events.ScheduleEvent(EVENT_WHIRLWIND, 13s, 18s);
                         break;
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, urand(10000, 14000));
+                        events.ScheduleEvent(EVENT_CLEAVE, 10s, 14s);
                         break;
                     case EVENT_MORTAL_STRIKE:
                         DoCastVictim(SPELL_MORTAL_STRIKE);
-                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(14000, 16000));
+                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, 14s, 16s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
index 7b0b5e4a1d9..db1976a523b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
@@ -57,9 +57,9 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 2 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 2s);
             events.ScheduleEvent(EVENT_HEX,     8 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_CLEAVE, 14 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_CLEAVE, 14s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -83,16 +83,16 @@ public:
                 {
                     case EVENT_CURSE_OF_BLOOD:
                         DoCastVictim(SPELL_CURSEOFBLOOD);
-                        events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 45 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 45s);
                         break;
                     case EVENT_HEX:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                             DoCast(target, SPELL_HEX);
-                        events.ScheduleEvent(EVENT_HEX, 15 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_HEX, 15s);
                         break;
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, 7 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_CLEAVE, 7s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
index c9f0921f516..5c7136ea8e4 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
@@ -149,12 +149,12 @@ struct boss_the_beast : public BossAI
     void JustEngagedWith(Unit* /*who*/) override
     {
         _JustEngagedWith();
-        events.ScheduleEvent(EVENT_FLAME_BREAK, Seconds(12));
-        events.ScheduleEvent(EVENT_IMMOLATE, Seconds(3));
-        events.ScheduleEvent(EVENT_TERRIFYING_ROAR, Seconds(23));
-        events.ScheduleEvent(EVENT_BERSERKER_CHARGE, Seconds(2));
-        events.ScheduleEvent(EVENT_FIREBALL, Seconds(8), Seconds(21));
-        events.ScheduleEvent(EVENT_FIREBLAST, Seconds(5), Seconds(8));
+        events.ScheduleEvent(EVENT_FLAME_BREAK, 12s);
+        events.ScheduleEvent(EVENT_IMMOLATE, 3s);
+        events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 23s);
+        events.ScheduleEvent(EVENT_BERSERKER_CHARGE, 2s);
+        events.ScheduleEvent(EVENT_FIREBALL, 8s, 21s);
+        events.ScheduleEvent(EVENT_FIREBLAST, 5s, 8s);
     }
 
     void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
index 799518a3955..3447c9386e3 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
@@ -56,8 +56,8 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(SPELL_REND, urand(17000,20000));
-            events.ScheduleEvent(SPELL_STRIKE, urand(10000,12000));
+            events.ScheduleEvent(SPELL_REND, 17s, 20s);
+            events.ScheduleEvent(SPELL_STRIKE, 10s, 12s);
             Talk(SAY_AGGRO);
         }
 
@@ -82,11 +82,11 @@ public:
                 {
                     case SPELL_REND:
                         DoCastVictim(SPELL_REND);
-                        events.ScheduleEvent(SPELL_REND, urand(8000,10000));
+                        events.ScheduleEvent(SPELL_REND, 8s, 10s);
                         break;
                     case SPELL_STRIKE:
                         DoCastVictim(SPELL_STRIKE);
-                        events.ScheduleEvent(SPELL_STRIKE, urand(8000,10000));
+                        events.ScheduleEvent(SPELL_STRIKE, 8s, 10s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
index de759584eb5..bda6c5496dd 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
@@ -57,12 +57,12 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_SNAP_KICK, 8 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_SNAP_KICK, 8s);
             events.ScheduleEvent(EVENT_CLEAVE,   14 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_UPPERCUT, 20 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_MORTAL_STRIKE, 12 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_UPPERCUT, 20s);
+            events.ScheduleEvent(EVENT_MORTAL_STRIKE, 12s);
             events.ScheduleEvent(EVENT_PUMMEL,   32 * IN_MILLISECONDS);
-            events.ScheduleEvent(EVENT_THROW_AXE, 1 * IN_MILLISECONDS);
+            events.ScheduleEvent(EVENT_THROW_AXE, 1s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -86,27 +86,27 @@ public:
                 {
                     case EVENT_SNAP_KICK:
                         DoCastVictim(SPELL_SNAPKICK);
-                        events.ScheduleEvent(EVENT_SNAP_KICK, 6 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_SNAP_KICK, 6s);
                         break;
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, 12 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_CLEAVE, 12s);
                         break;
                     case EVENT_UPPERCUT:
                         DoCastVictim(SPELL_UPPERCUT);
-                        events.ScheduleEvent(EVENT_UPPERCUT, 14 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_UPPERCUT, 14s);
                         break;
                     case EVENT_MORTAL_STRIKE:
                         DoCastVictim(SPELL_MORTALSTRIKE);
-                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, 10 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, 10s);
                         break;
                     case EVENT_PUMMEL:
                         DoCastVictim(SPELL_PUMMEL);
-                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, 16 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_MORTAL_STRIKE, 16s);
                         break;
                     case EVENT_THROW_AXE:
                         DoCastVictim(SPELL_THROWAXE);
-                        events.ScheduleEvent(EVENT_THROW_AXE, 8 * IN_MILLISECONDS);
+                        events.ScheduleEvent(EVENT_THROW_AXE, 8s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
index 5561643f525..1c1ef82814e 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
@@ -284,7 +284,7 @@ public:
                     if (data == AREATRIGGER_DRAGONSPIRE_HALL)
                     {
                         if (GetBossState(DATA_DRAGONSPIRE_ROOM) != DONE)
-                            Events.ScheduleEvent(EVENT_DARGONSPIRE_ROOM_STORE, 1000);
+                            Events.ScheduleEvent(EVENT_DARGONSPIRE_ROOM_STORE, 1s);
                     }
                     break;
                 default:
@@ -380,12 +380,12 @@ public:
                 {
                     case EVENT_DARGONSPIRE_ROOM_STORE:
                         Dragonspireroomstore();
-                        Events.ScheduleEvent(EVENT_DARGONSPIRE_ROOM_CHECK, 3000);
+                        Events.ScheduleEvent(EVENT_DARGONSPIRE_ROOM_CHECK, 3s);
                         break;
                     case EVENT_DARGONSPIRE_ROOM_CHECK:
                         Dragonspireroomcheck();
                         if ((GetBossState(DATA_DRAGONSPIRE_ROOM) != DONE))
-                            Events.ScheduleEvent(EVENT_DARGONSPIRE_ROOM_CHECK, 3000);
+                            Events.ScheduleEvent(EVENT_DARGONSPIRE_ROOM_CHECK, 3s);
                         break;
                     default:
                          break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
index b6512a7a3b6..0553e748017 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
@@ -57,11 +57,11 @@ public:
             _JustEngagedWith();
             Talk(SAY_AGGRO);
 
-            events.ScheduleEvent(EVENT_CLEAVE, 8000);
-            events.ScheduleEvent(EVENT_BLASTWAVE, 12000);
-            events.ScheduleEvent(EVENT_MORTALSTRIKE, 20000);
-            events.ScheduleEvent(EVENT_KNOCKBACK, 30000);
-            events.ScheduleEvent(EVENT_CHECK, 1000);
+            events.ScheduleEvent(EVENT_CLEAVE, 8s);
+            events.ScheduleEvent(EVENT_BLASTWAVE, 12s);
+            events.ScheduleEvent(EVENT_MORTALSTRIKE, 20s);
+            events.ScheduleEvent(EVENT_KNOCKBACK, 30s);
+            events.ScheduleEvent(EVENT_CHECK, 1s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -77,21 +77,21 @@ public:
                 {
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, 7000);
+                        events.ScheduleEvent(EVENT_CLEAVE, 7s);
                         break;
                     case EVENT_BLASTWAVE:
                         DoCastVictim(SPELL_BLASTWAVE);
-                        events.ScheduleEvent(EVENT_BLASTWAVE, urand(8000, 16000));
+                        events.ScheduleEvent(EVENT_BLASTWAVE, 8s, 16s);
                         break;
                     case EVENT_MORTALSTRIKE:
                         DoCastVictim(SPELL_MORTALSTRIKE);
-                        events.ScheduleEvent(EVENT_MORTALSTRIKE, urand(25000, 35000));
+                        events.ScheduleEvent(EVENT_MORTALSTRIKE, 25s, 35s);
                         break;
                     case EVENT_KNOCKBACK:
                         DoCastVictim(SPELL_KNOCKBACK);
                         if (GetThreat(me->GetVictim()))
                             ModifyThreatByPercent(me->GetVictim(), -50);
-                        events.ScheduleEvent(EVENT_KNOCKBACK, urand(15000, 30000));
+                        events.ScheduleEvent(EVENT_KNOCKBACK, 15s, 30s);
                         break;
                     case EVENT_CHECK:
                         if (me->GetDistance(me->GetHomePosition()) > 150.0f)
@@ -99,7 +99,7 @@ public:
                             Talk(SAY_LEASH);
                             EnterEvadeMode(EVADE_REASON_BOUNDARY);
                         }
-                        events.ScheduleEvent(EVENT_CHECK, 1000);
+                        events.ScheduleEvent(EVENT_CHECK, 1s);
                         break;
                 }
             }
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
index 758f90e20ca..2d5ff24296f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
@@ -199,8 +199,8 @@ public:
             events.ScheduleEvent(EVENT_SHIMMER, 0);
             events.ScheduleEvent(EVENT_BREATH_1, 30000);
             events.ScheduleEvent(EVENT_BREATH_2, 60000);
-            events.ScheduleEvent(EVENT_AFFLICTION, 10000);
-            events.ScheduleEvent(EVENT_FRENZY, 15000);
+            events.ScheduleEvent(EVENT_AFFLICTION, 10s);
+            events.ScheduleEvent(EVENT_FRENZY, 15s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -228,7 +228,7 @@ public:
                             DoCast(me, spell);
                             CurrentVurln_Spell = spell;
                             Talk(EMOTE_SHIMMER);
-                            events.ScheduleEvent(EVENT_SHIMMER, 45000);
+                            events.ScheduleEvent(EVENT_SHIMMER, 45s);
                             break;
                         }
                     case EVENT_BREATH_1:
@@ -260,11 +260,11 @@ public:
                                 }
                             }
                         }
-                        events.ScheduleEvent(EVENT_AFFLICTION, 10000);
+                        events.ScheduleEvent(EVENT_AFFLICTION, 10s);
                         break;
                     case EVENT_FRENZY:
                         DoCast(me, SPELL_FRENZY);
-                        events.ScheduleEvent(EVENT_FRENZY, urand(10000, 15000));
+                        events.ScheduleEvent(EVENT_FRENZY, 10s, 15s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
index cd1024c3fdf..987c10a1a7a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
@@ -47,9 +47,9 @@ public:
         {
             _JustEngagedWith();
 
-            events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
-            events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
-            events.ScheduleEvent(EVENT_SHADOWOFEBONROC, urand(8000, 10000));
+            events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s);
+            events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
+            events.ScheduleEvent(EVENT_SHADOWOFEBONROC, 8s, 10s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -68,15 +68,15 @@ public:
                 {
                     case EVENT_SHADOWFLAME:
                         DoCastVictim(SPELL_SHADOWFLAME);
-                        events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
+                        events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s);
                         break;
                     case EVENT_WINGBUFFET:
                         DoCastVictim(SPELL_WINGBUFFET);
-                        events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
+                        events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
                         break;
                     case EVENT_SHADOWOFEBONROC:
                         DoCastVictim(SPELL_SHADOWOFEBONROC);
-                        events.ScheduleEvent(EVENT_SHADOWOFEBONROC, urand(8000, 10000));
+                        events.ScheduleEvent(EVENT_SHADOWOFEBONROC, 8s, 10s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
index b721c9434f8..ea80e19a7c8 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
@@ -47,9 +47,9 @@ public:
         {
             _JustEngagedWith();
 
-            events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
-            events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
-            events.ScheduleEvent(EVENT_FLAMEBUFFET, 5000);
+            events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s);
+            events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
+            events.ScheduleEvent(EVENT_FLAMEBUFFET, 5s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -68,17 +68,17 @@ public:
                 {
                     case EVENT_SHADOWFLAME:
                         DoCastVictim(SPELL_SHADOWFLAME);
-                        events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
+                        events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s);
                         break;
                     case EVENT_WINGBUFFET:
                         DoCastVictim(SPELL_WINGBUFFET);
                         if (GetThreat(me->GetVictim()))
                             ModifyThreatByPercent(me->GetVictim(), -75);
-                        events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
+                        events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
                         break;
                     case EVENT_FLAMEBUFFET:
                         DoCastVictim(SPELL_FLAMEBUFFET);
-                        events.ScheduleEvent(EVENT_FLAMEBUFFET, 5000);
+                        events.ScheduleEvent(EVENT_FLAMEBUFFET, 5s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
index e0b1c63f089..57daabc25ab 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
@@ -52,9 +52,9 @@ public:
         {
             _JustEngagedWith();
 
-            events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
-            events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
-            events.ScheduleEvent(EVENT_FRENZY, 10000);
+            events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s);
+            events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
+            events.ScheduleEvent(EVENT_FRENZY, 10s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -73,18 +73,18 @@ public:
                 {
                     case EVENT_SHADOWFLAME:
                         DoCastVictim(SPELL_SHADOWFLAME);
-                        events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
+                        events.ScheduleEvent(EVENT_SHADOWFLAME, 10s, 20s);
                         break;
                     case EVENT_WINGBUFFET:
                         DoCastVictim(SPELL_WINGBUFFET);
                         if (GetThreat(me->GetVictim()))
                             ModifyThreatByPercent(me->GetVictim(), -75);
-                        events.ScheduleEvent(EVENT_WINGBUFFET, 30000);
+                        events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
                         break;
                     case EVENT_FRENZY:
                         Talk(EMOTE_FRENZY);
                         DoCast(me, SPELL_FRENZY);
-                        events.ScheduleEvent(EVENT_FRENZY, urand(8000, 10000));
+                        events.ScheduleEvent(EVENT_FRENZY, 8s, 10s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
index c5629194054..654a14afc4b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
@@ -215,10 +215,10 @@ public:
             me->SetStandState(UNIT_STAND_STATE_STAND);
             me->SetImmuneToPC(false);
             AttackStart(target);
-            events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(3000, 10000));
-            events.ScheduleEvent(EVENT_FEAR, urand(10000, 20000));
-            //events.ScheduleEvent(EVENT_MIND_CONTROL, urand(30000, 35000));
-            events.ScheduleEvent(EVENT_SPAWN_ADD, 10000);
+            events.ScheduleEvent(EVENT_SHADOW_BOLT, 3s, 10s);
+            events.ScheduleEvent(EVENT_FEAR, 10s, 20s);
+            //events.ScheduleEvent(EVENT_MIND_CONTROL, 30s, 35s);
+            events.ScheduleEvent(EVENT_SPAWN_ADD, 10s);
         }
 
         void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) override
@@ -322,17 +322,17 @@ public:
                                     break;
                             }
                             ResetThreatList();
-                            events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(3000, 10000));
+                            events.ScheduleEvent(EVENT_SHADOW_BOLT, 3s, 10s);
                             break;
                         case EVENT_FEAR:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true))
                                 DoCast(target, SPELL_FEAR);
-                            events.ScheduleEvent(EVENT_FEAR, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_FEAR, 10s, 20s);
                             break;
                         case EVENT_MIND_CONTROL:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true))
                                 DoCast(target, SPELL_SHADOW_COMMAND);
-                            events.ScheduleEvent(EVENT_MIND_CONTROL, urand(30000, 35000));
+                            events.ScheduleEvent(EVENT_MIND_CONTROL, 30s, 35s);
                             break;
                         case EVENT_SPAWN_ADD:
                             for (uint8 i=0; i<2; ++i)
@@ -366,7 +366,7 @@ public:
                                     return;
                                 }
                             }
-                            events.ScheduleEvent(EVENT_SPAWN_ADD, 4000);
+                            events.ScheduleEvent(EVENT_SPAWN_ADD, 4s);
                             break;
                     }
 
@@ -428,12 +428,12 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_SHADOWFLAME, 12000);
-            events.ScheduleEvent(EVENT_FEAR, urand(25000, 35000));
-            events.ScheduleEvent(EVENT_VEILOFSHADOW, urand(25000, 35000));
-            events.ScheduleEvent(EVENT_CLEAVE, 7000);
-            //events.ScheduleEvent(EVENT_TAILLASH, 10000);
-            events.ScheduleEvent(EVENT_CLASSCALL, urand(30000, 35000));
+            events.ScheduleEvent(EVENT_SHADOWFLAME, 12s);
+            events.ScheduleEvent(EVENT_FEAR, 25s, 35s);
+            events.ScheduleEvent(EVENT_VEILOFSHADOW, 25s, 35s);
+            events.ScheduleEvent(EVENT_CLEAVE, 7s);
+            //events.ScheduleEvent(EVENT_TAILLASH, 10s);
+            events.ScheduleEvent(EVENT_CLASSCALL, 30s, 35s);
             Talk(SAY_RANDOM);
         }
 
@@ -494,24 +494,24 @@ public:
                 {
                     case EVENT_SHADOWFLAME:
                         DoCastVictim(SPELL_SHADOWFLAME);
-                        events.ScheduleEvent(EVENT_SHADOWFLAME, 12000);
+                        events.ScheduleEvent(EVENT_SHADOWFLAME, 12s);
                         break;
                     case EVENT_FEAR:
                         DoCastVictim(SPELL_BELLOWINGROAR);
-                        events.ScheduleEvent(EVENT_FEAR, urand(25000, 35000));
+                        events.ScheduleEvent(EVENT_FEAR, 25s, 35s);
                         break;
                     case EVENT_VEILOFSHADOW:
                         DoCastVictim(SPELL_VEILOFSHADOW);
-                        events.ScheduleEvent(EVENT_VEILOFSHADOW, urand(25000, 35000));
+                        events.ScheduleEvent(EVENT_VEILOFSHADOW, 25s, 35s);
                         break;
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, 7000);
+                        events.ScheduleEvent(EVENT_CLEAVE, 7s);
                         break;
                     case EVENT_TAILLASH:
                         // Cast NYI since we need a better check for behind target
                         DoCastVictim(SPELL_TAILLASH);
-                        events.ScheduleEvent(EVENT_TAILLASH, 10000);
+                        events.ScheduleEvent(EVENT_TAILLASH, 10s);
                         break;
                     case EVENT_CLASSCALL:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
@@ -560,7 +560,7 @@ public:
                             default:
                                 break;
                         }
-                        events.ScheduleEvent(EVENT_CLASSCALL, urand(30000, 35000));
+                        events.ScheduleEvent(EVENT_CLASSCALL, 30s, 35s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
index c4cdce697ae..dee8bb5c645 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
@@ -100,10 +100,10 @@ public:
 
         void DoChangePhase()
         {
-            events.ScheduleEvent(EVENT_CLEAVE, 15000);
-            events.ScheduleEvent(EVENT_STOMP, 35000);
-            events.ScheduleEvent(EVENT_FIREBALL, 7000);
-            events.ScheduleEvent(EVENT_CONFLAGRATION, 12000);
+            events.ScheduleEvent(EVENT_CLEAVE, 15s);
+            events.ScheduleEvent(EVENT_STOMP, 35s);
+            events.ScheduleEvent(EVENT_FIREBALL, 7s);
+            events.ScheduleEvent(EVENT_CONFLAGRATION, 12s);
 
             secondPhase = true;
             me->RemoveAllAuras();
@@ -139,19 +139,19 @@ public:
                 {
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, urand(7000, 10000));
+                        events.ScheduleEvent(EVENT_CLEAVE, 7s, 10s);
                         break;
                     case EVENT_STOMP:
                         DoCastVictim(SPELL_WARSTOMP);
-                        events.ScheduleEvent(EVENT_STOMP, urand(15000, 25000));
+                        events.ScheduleEvent(EVENT_STOMP, 15s, 25s);
                         break;
                     case EVENT_FIREBALL:
                         DoCastVictim(SPELL_FIREBALLVOLLEY);
-                        events.ScheduleEvent(EVENT_FIREBALL, urand(12000, 15000));
+                        events.ScheduleEvent(EVENT_FIREBALL, 12s, 15s);
                         break;
                     case EVENT_CONFLAGRATION:
                         DoCastVictim(SPELL_CONFLAGRATION);
-                        events.ScheduleEvent(EVENT_CONFLAGRATION, 30000);
+                        events.ScheduleEvent(EVENT_CONFLAGRATION, 30s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
index 61730d9815c..680f6927ba2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
@@ -103,12 +103,12 @@ public:
             // now drop damage requirement to be able to take loot
             me->ResetPlayerDamageReq();
 
-            events.ScheduleEvent(EVENT_CLEAVE, 10000);
-            events.ScheduleEvent(EVENT_FLAMEBREATH, 15000);
-            events.ScheduleEvent(EVENT_FIRENOVA, 20000);
-            events.ScheduleEvent(EVENT_TAILSWIPE, 11000);
-            events.ScheduleEvent(EVENT_BURNINGADRENALINE_CASTER, 15000);
-            events.ScheduleEvent(EVENT_BURNINGADRENALINE_TANK, 45000);
+            events.ScheduleEvent(EVENT_CLEAVE, 10s);
+            events.ScheduleEvent(EVENT_FLAMEBREATH, 15s);
+            events.ScheduleEvent(EVENT_FIRENOVA, 20s);
+            events.ScheduleEvent(EVENT_TAILSWIPE, 11s);
+            events.ScheduleEvent(EVENT_BURNINGADRENALINE_CASTER, 15s);
+            events.ScheduleEvent(EVENT_BURNINGADRENALINE_TANK, 45s);
         }
 
         void BeginSpeech(Unit* target)
@@ -171,16 +171,16 @@ public:
                 switch (eventId)
                 {
                     case EVENT_CLEAVE:
-                        events.ScheduleEvent(EVENT_CLEAVE, 15000);
+                        events.ScheduleEvent(EVENT_CLEAVE, 15s);
                         DoCastVictim(SPELL_CLEAVE);
                         break;
                     case EVENT_FLAMEBREATH:
                         DoCastVictim(SPELL_FLAMEBREATH);
-                        events.ScheduleEvent(EVENT_FLAMEBREATH, urand(8000, 14000));
+                        events.ScheduleEvent(EVENT_FLAMEBREATH, 8s, 14s);
                         break;
                     case EVENT_FIRENOVA:
                         DoCastVictim(SPELL_FIRENOVA);
-                        events.ScheduleEvent(EVENT_FIRENOVA, 15000);
+                        events.ScheduleEvent(EVENT_FIRENOVA, 15s);
                         break;
                     case EVENT_TAILSWIPE:
                         //Only cast if we are behind
@@ -188,7 +188,7 @@ public:
                         {
                         DoCast(me->GetVictim(), SPELL_TAILSWIPE);
                         }*/
-                        events.ScheduleEvent(EVENT_TAILSWIPE, 15000);
+                        events.ScheduleEvent(EVENT_TAILSWIPE, 15s);
                         break;
                     case EVENT_BURNINGADRENALINE_CASTER:
                         {
@@ -200,12 +200,12 @@ public:
                             }
                         }
                         //reschedule the event
-                        events.ScheduleEvent(EVENT_BURNINGADRENALINE_CASTER, 15000);
+                        events.ScheduleEvent(EVENT_BURNINGADRENALINE_CASTER, 15s);
                         break;
                     case EVENT_BURNINGADRENALINE_TANK:
                         //Vael has to cast it himself; contrary to the previous commit's comment. Nothing happens otherwise.
                         me->CastSpell(me->GetVictim(), SPELL_BURNINGADRENALINE, true);
-                        events.ScheduleEvent(EVENT_BURNINGADRENALINE_TANK, 45000);
+                        events.ScheduleEvent(EVENT_BURNINGADRENALINE_TANK, 45s);
                         break;
                 }
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
index 76b25640969..68cfe34cda3 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
@@ -195,7 +195,7 @@ public:
                 switch (data)
                 {
                     case IN_PROGRESS:
-                        _events.ScheduleEvent(EVENT_RAZOR_SPAWN, 45 * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_RAZOR_SPAWN, 45s);
                         EggEvent = data;
                         EggCount = 0;
                         break;
@@ -213,7 +213,7 @@ public:
                                 razor->RemoveAurasDueToSpell(42013); // MindControl
                                 DoRemoveAurasDueToSpellOnPlayers(42013);
                             }
-                            _events.ScheduleEvent(EVENT_RAZOR_PHASE_TWO, 1 * IN_MILLISECONDS);
+                            _events.ScheduleEvent(EVENT_RAZOR_PHASE_TWO, 1s);
                             _events.CancelEvent(EVENT_RAZOR_SPAWN);
                         }
                         if (EggEvent == NOT_STARTED)
@@ -245,7 +245,7 @@ public:
                         for (uint8 i = urand(2, 5); i > 0; --i)
                             if (Creature* summon = instance->SummonCreature(Entry[urand(0, 4)], SummonPosition[urand(0, 7)]))
                                 summon->AI()->DoZoneInCombat();
-                        _events.ScheduleEvent(EVENT_RAZOR_SPAWN, urand(12, 17) * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_RAZOR_SPAWN, 12s, 17s);
                         break;
                     case EVENT_RAZOR_PHASE_TWO:
                         _events.CancelEvent(EVENT_RAZOR_SPAWN);
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
index 0461c7a188c..9ddafbf0088 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
@@ -65,9 +65,9 @@ class boss_baron_geddon : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_INFERNO, 45000);
-                events.ScheduleEvent(EVENT_IGNITE_MANA, 30000);
-                events.ScheduleEvent(EVENT_LIVING_BOMB, 35000);
+                events.ScheduleEvent(EVENT_INFERNO, 45s);
+                events.ScheduleEvent(EVENT_IGNITE_MANA, 30s);
+                events.ScheduleEvent(EVENT_LIVING_BOMB, 35s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -95,17 +95,17 @@ class boss_baron_geddon : public CreatureScript
                     {
                         case EVENT_INFERNO:
                             DoCast(me, SPELL_INFERNO);
-                            events.ScheduleEvent(EVENT_INFERNO, 45000);
+                            events.ScheduleEvent(EVENT_INFERNO, 45s);
                             break;
                         case EVENT_IGNITE_MANA:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_IGNITE_MANA))
                                 DoCast(target, SPELL_IGNITE_MANA);
-                            events.ScheduleEvent(EVENT_IGNITE_MANA, 30000);
+                            events.ScheduleEvent(EVENT_IGNITE_MANA, 30s);
                             break;
                         case EVENT_LIVING_BOMB:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                                 DoCast(target, SPELL_LIVING_BOMB);
-                            events.ScheduleEvent(EVENT_LIVING_BOMB, 35000);
+                            events.ScheduleEvent(EVENT_LIVING_BOMB, 35s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
index 59e9710f99b..8e1d37e0af2 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
@@ -60,8 +60,8 @@ class boss_garr : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_ANTIMAGIC_PULSE, 25000);
-                events.ScheduleEvent(EVENT_MAGMA_SHACKLES, 15000);
+                events.ScheduleEvent(EVENT_ANTIMAGIC_PULSE, 25s);
+                events.ScheduleEvent(EVENT_MAGMA_SHACKLES, 15s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -80,11 +80,11 @@ class boss_garr : public CreatureScript
                     {
                         case EVENT_ANTIMAGIC_PULSE:
                             DoCast(me, SPELL_ANTIMAGIC_PULSE);
-                            events.ScheduleEvent(EVENT_ANTIMAGIC_PULSE, urand(10000, 15000));
+                            events.ScheduleEvent(EVENT_ANTIMAGIC_PULSE, 10s, 15s);
                             break;
                         case EVENT_MAGMA_SHACKLES:
                             DoCast(me, SPELL_MAGMA_SHACKLES);
-                            events.ScheduleEvent(EVENT_MAGMA_SHACKLES, urand(8000, 12000));
+                            events.ScheduleEvent(EVENT_MAGMA_SHACKLES, 8s, 12s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
index 61857d518d7..7da36b01e95 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
@@ -56,9 +56,9 @@ class boss_gehennas : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_GEHENNAS_CURSE, 12000);
-                events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 10000);
-                events.ScheduleEvent(EVENT_SHADOW_BOLT, 6000);
+                events.ScheduleEvent(EVENT_GEHENNAS_CURSE, 12s);
+                events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 10s);
+                events.ScheduleEvent(EVENT_SHADOW_BOLT, 6s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -77,17 +77,17 @@ class boss_gehennas : public CreatureScript
                     {
                         case EVENT_GEHENNAS_CURSE:
                             DoCastVictim(SPELL_GEHENNAS_CURSE);
-                            events.ScheduleEvent(EVENT_GEHENNAS_CURSE, urand(22000, 30000));
+                            events.ScheduleEvent(EVENT_GEHENNAS_CURSE, 22s, 30s);
                             break;
                         case EVENT_RAIN_OF_FIRE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_RAIN_OF_FIRE);
-                            events.ScheduleEvent(EVENT_RAIN_OF_FIRE, urand(4000, 12000));
+                            events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 4s, 12s);
                             break;
                         case EVENT_SHADOW_BOLT:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                                 DoCast(target, SPELL_SHADOW_BOLT);
-                            events.ScheduleEvent(EVENT_SHADOW_BOLT, 7000);
+                            events.ScheduleEvent(EVENT_SHADOW_BOLT, 7s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
index 4c12217a1de..36481d10a8d 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
@@ -74,7 +74,7 @@ class boss_golemagg : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_PYROBLAST, 7000);
+                events.ScheduleEvent(EVENT_PYROBLAST, 7s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override
@@ -83,7 +83,7 @@ class boss_golemagg : public CreatureScript
                     return;
 
                 DoCast(me, SPELL_ENRAGE, true);
-                events.ScheduleEvent(EVENT_EARTHQUAKE, 3000);
+                events.ScheduleEvent(EVENT_EARTHQUAKE, 3s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -103,11 +103,11 @@ class boss_golemagg : public CreatureScript
                         case EVENT_PYROBLAST:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 DoCast(target, SPELL_PYROBLAST);
-                            events.ScheduleEvent(EVENT_PYROBLAST, 7000);
+                            events.ScheduleEvent(EVENT_PYROBLAST, 7s);
                             break;
                         case EVENT_EARTHQUAKE:
                             DoCastVictim(SPELL_EARTHQUAKE);
-                            events.ScheduleEvent(EVENT_EARTHQUAKE, 3000);
+                            events.ScheduleEvent(EVENT_EARTHQUAKE, 3s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
index ce4bed33f4c..1c891edbdc5 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
@@ -56,9 +56,9 @@ class boss_lucifron : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_IMPENDING_DOOM, 10000);
-                events.ScheduleEvent(EVENT_LUCIFRON_CURSE, 20000);
-                events.ScheduleEvent(EVENT_SHADOW_SHOCK, 6000);
+                events.ScheduleEvent(EVENT_IMPENDING_DOOM, 10s);
+                events.ScheduleEvent(EVENT_LUCIFRON_CURSE, 20s);
+                events.ScheduleEvent(EVENT_SHADOW_SHOCK, 6s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -77,15 +77,15 @@ class boss_lucifron : public CreatureScript
                     {
                         case EVENT_IMPENDING_DOOM:
                             DoCastVictim(SPELL_IMPENDING_DOOM);
-                            events.ScheduleEvent(EVENT_IMPENDING_DOOM, 20000);
+                            events.ScheduleEvent(EVENT_IMPENDING_DOOM, 20s);
                             break;
                         case EVENT_LUCIFRON_CURSE:
                             DoCastVictim(SPELL_LUCIFRON_CURSE);
-                            events.ScheduleEvent(EVENT_LUCIFRON_CURSE, 15000);
+                            events.ScheduleEvent(EVENT_LUCIFRON_CURSE, 15s);
                             break;
                         case EVENT_SHADOW_SHOCK:
                             DoCastVictim(SPELL_SHADOW_SHOCK);
-                            events.ScheduleEvent(EVENT_SHADOW_SHOCK, 6000);
+                            events.ScheduleEvent(EVENT_SHADOW_SHOCK, 6s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
index 27271d9dca6..522bae90f73 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
@@ -68,9 +68,9 @@ class boss_magmadar : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_FRENZY, 30000);
-                events.ScheduleEvent(EVENT_PANIC, 20000);
-                events.ScheduleEvent(EVENT_LAVA_BOMB, 12000);
+                events.ScheduleEvent(EVENT_FRENZY, 30s);
+                events.ScheduleEvent(EVENT_PANIC, 20s);
+                events.ScheduleEvent(EVENT_LAVA_BOMB, 12s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -90,16 +90,16 @@ class boss_magmadar : public CreatureScript
                         case EVENT_FRENZY:
                             Talk(EMOTE_FRENZY);
                             DoCast(me, SPELL_FRENZY);
-                            events.ScheduleEvent(EVENT_FRENZY, 15000);
+                            events.ScheduleEvent(EVENT_FRENZY, 15s);
                             break;
                         case EVENT_PANIC:
                             DoCastVictim(SPELL_PANIC);
-                            events.ScheduleEvent(EVENT_PANIC, 35000);
+                            events.ScheduleEvent(EVENT_PANIC, 35s);
                             break;
                         case EVENT_LAVA_BOMB:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_LAVA_BOMB))
                                 DoCast(target, SPELL_LAVA_BOMB);
-                            events.ScheduleEvent(EVENT_LAVA_BOMB, 12000);
+                            events.ScheduleEvent(EVENT_LAVA_BOMB, 12s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
index ac481ecd11c..ee60435feef 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
@@ -93,10 +93,10 @@ class boss_majordomo : public CreatureScript
             {
                 BossAI::JustEngagedWith(who);
                 Talk(SAY_AGGRO);
-                events.ScheduleEvent(EVENT_MAGIC_REFLECTION, 30000);
-                events.ScheduleEvent(EVENT_DAMAGE_REFLECTION, 15000);
-                events.ScheduleEvent(EVENT_BLAST_WAVE, 10000);
-                events.ScheduleEvent(EVENT_TELEPORT, 20000);
+                events.ScheduleEvent(EVENT_MAGIC_REFLECTION, 30s);
+                events.ScheduleEvent(EVENT_DAMAGE_REFLECTION, 15s);
+                events.ScheduleEvent(EVENT_BLAST_WAVE, 10s);
+                events.ScheduleEvent(EVENT_TELEPORT, 20s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -131,20 +131,20 @@ class boss_majordomo : public CreatureScript
                         {
                             case EVENT_MAGIC_REFLECTION:
                                 DoCast(me, SPELL_MAGIC_REFLECTION);
-                                events.ScheduleEvent(EVENT_MAGIC_REFLECTION, 30000);
+                                events.ScheduleEvent(EVENT_MAGIC_REFLECTION, 30s);
                                 break;
                             case EVENT_DAMAGE_REFLECTION:
                                 DoCast(me, SPELL_DAMAGE_REFLECTION);
-                                events.ScheduleEvent(EVENT_DAMAGE_REFLECTION, 30000);
+                                events.ScheduleEvent(EVENT_DAMAGE_REFLECTION, 30s);
                                 break;
                             case EVENT_BLAST_WAVE:
                                 DoCastVictim(SPELL_BLAST_WAVE);
-                                events.ScheduleEvent(EVENT_BLAST_WAVE, 10000);
+                                events.ScheduleEvent(EVENT_BLAST_WAVE, 10s);
                                 break;
                             case EVENT_TELEPORT:
                                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                                     DoCast(target, SPELL_TELEPORT);
-                                events.ScheduleEvent(EVENT_TELEPORT, 20000);
+                                events.ScheduleEvent(EVENT_TELEPORT, 20s);
                                 break;
                             default:
                                 break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
index c779ae9db33..157501bc7d6 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
@@ -110,13 +110,13 @@ class boss_ragnaros : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_ERUPTION, 15000);
-                events.ScheduleEvent(EVENT_WRATH_OF_RAGNAROS, 30000);
-                events.ScheduleEvent(EVENT_HAND_OF_RAGNAROS, 25000);
-                events.ScheduleEvent(EVENT_LAVA_BURST, 10000);
-                events.ScheduleEvent(EVENT_ELEMENTAL_FIRE, 3000);
-                events.ScheduleEvent(EVENT_MAGMA_BLAST, 2000);
-                events.ScheduleEvent(EVENT_SUBMERGE, 180000);
+                events.ScheduleEvent(EVENT_ERUPTION, 15s);
+                events.ScheduleEvent(EVENT_WRATH_OF_RAGNAROS, 30s);
+                events.ScheduleEvent(EVENT_HAND_OF_RAGNAROS, 25s);
+                events.ScheduleEvent(EVENT_LAVA_BURST, 10s);
+                events.ScheduleEvent(EVENT_ELEMENTAL_FIRE, 3s);
+                events.ScheduleEvent(EVENT_MAGMA_BLAST, 2s);
+                events.ScheduleEvent(EVENT_SUBMERGE, 3min);
             }
 
             void KilledUnit(Unit* /*victim*/) override
@@ -207,27 +207,27 @@ class boss_ragnaros : public CreatureScript
                         {
                             case EVENT_ERUPTION:
                                 DoCastVictim(SPELL_ERRUPTION);
-                                events.ScheduleEvent(EVENT_ERUPTION, urand(20000, 45000));
+                                events.ScheduleEvent(EVENT_ERUPTION, 20s, 45s);
                                 break;
                             case EVENT_WRATH_OF_RAGNAROS:
                                 DoCastVictim(SPELL_WRATH_OF_RAGNAROS);
                                 if (urand(0, 1))
                                     Talk(SAY_WRATH);
-                                events.ScheduleEvent(EVENT_WRATH_OF_RAGNAROS, 25000);
+                                events.ScheduleEvent(EVENT_WRATH_OF_RAGNAROS, 25s);
                                 break;
                             case EVENT_HAND_OF_RAGNAROS:
                                 DoCast(me, SPELL_HAND_OF_RAGNAROS);
                                 if (urand(0, 1))
                                     Talk(SAY_HAND);
-                                events.ScheduleEvent(EVENT_HAND_OF_RAGNAROS, 20000);
+                                events.ScheduleEvent(EVENT_HAND_OF_RAGNAROS, 20s);
                                 break;
                             case EVENT_LAVA_BURST:
                                 DoCastVictim(SPELL_LAVA_BURST);
-                                events.ScheduleEvent(EVENT_LAVA_BURST, 10000);
+                                events.ScheduleEvent(EVENT_LAVA_BURST, 10s);
                                 break;
                             case EVENT_ELEMENTAL_FIRE:
                                 DoCastVictim(SPELL_ELEMENTAL_FIRE);
-                                events.ScheduleEvent(EVENT_ELEMENTAL_FIRE, urand(10000, 14000));
+                                events.ScheduleEvent(EVENT_ELEMENTAL_FIRE, 10s, 14s);
                                 break;
                             case EVENT_MAGMA_BLAST:
                                 if (!me->IsWithinMeleeRange(me->GetVictim()))
@@ -240,7 +240,7 @@ class boss_ragnaros : public CreatureScript
                                         _hasYelledMagmaBurst = true;
                                     }
                                 }
-                                events.ScheduleEvent(EVENT_MAGMA_BLAST, 2500);
+                                events.ScheduleEvent(EVENT_MAGMA_BLAST, 2500ms);
                                 break;
                             case EVENT_SUBMERGE:
                             {
@@ -291,7 +291,7 @@ class boss_ragnaros : public CreatureScript
                                         _emergeTimer = 90000;
                                     }
                                 }
-                                events.ScheduleEvent(EVENT_SUBMERGE, 180000);
+                                events.ScheduleEvent(EVENT_SUBMERGE, 3min);
                                 break;
                             }
                             default:
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
index 601b0e35b17..ca9d1740047 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
@@ -52,11 +52,11 @@ class boss_shazzrah : public CreatureScript
             void JustEngagedWith(Unit* target) override
             {
                 BossAI::JustEngagedWith(target);
-                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6000);
-                events.ScheduleEvent(EVENT_SHAZZRAH_CURSE, 10000);
-                events.ScheduleEvent(EVENT_MAGIC_GROUNDING, 24000);
-                events.ScheduleEvent(EVENT_COUNTERSPELL, 15000);
-                events.ScheduleEvent(EVENT_SHAZZRAH_GATE, 45000);
+                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6s);
+                events.ScheduleEvent(EVENT_SHAZZRAH_CURSE, 10s);
+                events.ScheduleEvent(EVENT_MAGIC_GROUNDING, 24s);
+                events.ScheduleEvent(EVENT_COUNTERSPELL, 15s);
+                events.ScheduleEvent(EVENT_SHAZZRAH_GATE, 45s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -75,7 +75,7 @@ class boss_shazzrah : public CreatureScript
                     {
                         case EVENT_ARCANE_EXPLOSION:
                             DoCastVictim(SPELL_ARCANE_EXPLOSION);
-                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(4000, 7000));
+                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 4s, 7s);
                             break;
                         // Triggered subsequent to using "Gate of Shazzrah".
                         case EVENT_ARCANE_EXPLOSION_TRIGGERED:
@@ -84,22 +84,22 @@ class boss_shazzrah : public CreatureScript
                         case EVENT_SHAZZRAH_CURSE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_SHAZZRAH_CURSE))
                                 DoCast(target, SPELL_SHAZZRAH_CURSE);
-                            events.ScheduleEvent(EVENT_SHAZZRAH_CURSE, urand(25000, 30000));
+                            events.ScheduleEvent(EVENT_SHAZZRAH_CURSE, 25s, 30s);
                             break;
                         case EVENT_MAGIC_GROUNDING:
                             DoCast(me, SPELL_MAGIC_GROUNDING);
-                            events.ScheduleEvent(EVENT_MAGIC_GROUNDING, 35000);
+                            events.ScheduleEvent(EVENT_MAGIC_GROUNDING, 35s);
                             break;
                         case EVENT_COUNTERSPELL:
                             DoCastVictim(SPELL_COUNTERSPELL);
-                            events.ScheduleEvent(EVENT_COUNTERSPELL, urand(16000, 20000));
+                            events.ScheduleEvent(EVENT_COUNTERSPELL, 16s, 20s);
                             break;
                         case EVENT_SHAZZRAH_GATE:
                             ResetThreatList();
                             DoCastAOE(SPELL_SHAZZRAH_GATE_DUMMY);
-                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION_TRIGGERED, 2000);
-                            events.RescheduleEvent(EVENT_ARCANE_EXPLOSION, urand(3000, 6000));
-                            events.ScheduleEvent(EVENT_SHAZZRAH_GATE, 45000);
+                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION_TRIGGERED, 2s);
+                            events.RescheduleEvent(EVENT_ARCANE_EXPLOSION, 3s, 6s);
+                            events.ScheduleEvent(EVENT_SHAZZRAH_GATE, 45s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
index d358c0bd678..5c589935953 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
@@ -70,11 +70,11 @@ class boss_sulfuron : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 BossAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_DARK_STRIKE, 10000);
-                events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 15000);
-                events.ScheduleEvent(EVENT_INSPIRE, 13000);
-                events.ScheduleEvent(EVENT_KNOCKDOWN, 6000);
-                events.ScheduleEvent(EVENT_FLAMESPEAR, 2000);
+                events.ScheduleEvent(EVENT_DARK_STRIKE, 10s);
+                events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 15s);
+                events.ScheduleEvent(EVENT_INSPIRE, 13s);
+                events.ScheduleEvent(EVENT_KNOCKDOWN, 6s);
+                events.ScheduleEvent(EVENT_FLAMESPEAR, 2s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -93,11 +93,11 @@ class boss_sulfuron : public CreatureScript
                     {
                         case EVENT_DARK_STRIKE:
                             DoCast(me, SPELL_DARK_STRIKE);
-                            events.ScheduleEvent(EVENT_DARK_STRIKE, urand(15000, 18000));
+                            events.ScheduleEvent(EVENT_DARK_STRIKE, 15s, 18s);
                             break;
                         case EVENT_DEMORALIZING_SHOUT:
                             DoCastVictim(SPELL_DEMORALIZING_SHOUT);
-                            events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 15s, 20s);
                             break;
                         case EVENT_INSPIRE:
                         {
@@ -106,17 +106,17 @@ class boss_sulfuron : public CreatureScript
                                 DoCast(Trinity::Containers::SelectRandomContainerElement(healers), SPELL_INSPIRE);
 
                             DoCast(me, SPELL_INSPIRE);
-                            events.ScheduleEvent(EVENT_INSPIRE, urand(20000, 26000));
+                            events.ScheduleEvent(EVENT_INSPIRE, 20s, 26s);
                             break;
                         }
                         case EVENT_KNOCKDOWN:
                             DoCastVictim(SPELL_KNOCKDOWN);
-                            events.ScheduleEvent(EVENT_KNOCKDOWN, urand(12000, 15000));
+                            events.ScheduleEvent(EVENT_KNOCKDOWN, 12s, 15s);
                             break;
                         case EVENT_FLAMESPEAR:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                                 DoCast(target, SPELL_FLAMESPEAR);
-                            events.ScheduleEvent(EVENT_FLAMESPEAR, urand(12000, 16000));
+                            events.ScheduleEvent(EVENT_FLAMESPEAR, 12s, 16s);
                             break;
                         default:
                             break;
@@ -160,9 +160,9 @@ class npc_flamewaker_priest : public CreatureScript
             void JustEngagedWith(Unit* victim) override
             {
                 ScriptedAI::JustEngagedWith(victim);
-                events.ScheduleEvent(EVENT_HEAL, urand(15000, 30000));
-                events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 2000);
-                events.ScheduleEvent(EVENT_IMMOLATE, 8000);
+                events.ScheduleEvent(EVENT_HEAL, 15s, 30s);
+                events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 2s);
+                events.ScheduleEvent(EVENT_IMMOLATE, 8s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -182,17 +182,17 @@ class npc_flamewaker_priest : public CreatureScript
                         case EVENT_HEAL:
                             if (Unit* target = DoSelectLowestHpFriendly(60.0f, 1))
                                 DoCast(target, SPELL_HEAL);
-                            events.ScheduleEvent(EVENT_HEAL, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_HEAL, 15s, 20s);
                             break;
                         case EVENT_SHADOW_WORD_PAIN:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_SHADOWWORDPAIN))
                                 DoCast(target, SPELL_SHADOWWORDPAIN);
-                            events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(18000, 26000));
+                            events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 18s, 26s);
                             break;
                         case EVENT_IMMOLATE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_IMMOLATE))
                                 DoCast(target, SPELL_IMMOLATE);
-                            events.ScheduleEvent(EVENT_IMMOLATE, urand(15000, 25000));
+                            events.ScheduleEvent(EVENT_IMMOLATE, 15s, 25s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
index cfcc553fa7c..066385c81ef 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
@@ -82,9 +82,9 @@ public:
             _JustEngagedWith();
             Talk(SAY_AGGRO);
 
-            events.ScheduleEvent(EVENT_HATEFUL_BOLT, Seconds(12));
-            events.ScheduleEvent(EVENT_SUMMON_ASTRAL_FLARE, Seconds(10));
-            events.ScheduleEvent(EVENT_BERSERK, Minutes(12));
+            events.ScheduleEvent(EVENT_HATEFUL_BOLT, 12s);
+            events.ScheduleEvent(EVENT_SUMMON_ASTRAL_FLARE, 10s);
+            events.ScheduleEvent(EVENT_BERSERK, 12min);
         }
 
         void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
index 42cf8079c41..b1d773df250 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
@@ -71,10 +71,10 @@ public:
             Talk(SAY_AGGRO);
 
             DoCastSelf(SPELL_HOLYGROUND, true);
-            events.ScheduleEvent(EVENT_REPENTANCE, Seconds(33), Seconds(45));
-            events.ScheduleEvent(EVENT_HOLYFIRE, Seconds(8));
-            events.ScheduleEvent(EVENT_HOLYWRATH, Seconds(15), Seconds(25));
-            events.ScheduleEvent(EVENT_ENRAGE, Minutes(10));
+            events.ScheduleEvent(EVENT_REPENTANCE, 33s, 45s);
+            events.ScheduleEvent(EVENT_HOLYFIRE, 8s);
+            events.ScheduleEvent(EVENT_HOLYWRATH, 15s, 25s);
+            events.ScheduleEvent(EVENT_ENRAGE, 10min);
         }
 
         void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
index 23fba8cc3f5..61f25fbf907 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
@@ -215,18 +215,18 @@ public:
                         events.ScheduleEvent(EVENT_START_INTRO_PATH, Milliseconds(1));
                         break;
                     case POINT_INTRO_END:
-                        events.ScheduleEvent(EVENT_END_INTRO, Seconds(2));
+                        events.ScheduleEvent(EVENT_END_INTRO, 2s);
                         break;
                     case POINT_INTRO_LANDING:
                         me->SetDisableGravity(false);
                         me->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
-                        events.ScheduleEvent(EVENT_INTRO_LANDING, Seconds(3));
+                        events.ScheduleEvent(EVENT_INTRO_LANDING, 3s);
                         break;
                     case POINT_PHASE_TWO_LANDING:
                         events.SetPhase(PHASE_GROUND);
                         me->SetDisableGravity(false);
                         me->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
-                        events.ScheduleEvent(EVENT_LANDED, Seconds(3));
+                        events.ScheduleEvent(EVENT_LANDED, 3s);
                         break;
                     case POINT_PHASE_TWO_END:
                         events.ScheduleEvent(EVENT_END_PHASE_TWO, Milliseconds(1));
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
index 586beb3e52b..c1a3cbbe1bf 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
@@ -78,12 +78,12 @@ public:
             summons.DoAction(ACTION_DESPAWN_IMPS, pred);
             _Reset();
 
-            events.ScheduleEvent(EVENT_SHADOWBOLT, Seconds(1));
-            events.ScheduleEvent(EVENT_SUMMON_KILREK, Seconds(3));
-            events.ScheduleEvent(EVENT_SACRIFICE, Seconds(30));
+            events.ScheduleEvent(EVENT_SHADOWBOLT, 1s);
+            events.ScheduleEvent(EVENT_SUMMON_KILREK, 3s);
+            events.ScheduleEvent(EVENT_SACRIFICE, 30s);
             events.ScheduleEvent(EVENT_SUMMON_PORTAL_1, Seconds(10));
             events.ScheduleEvent(EVENT_SUMMON_PORTAL_2, Seconds(11));
-            events.ScheduleEvent(EVENT_ENRAGE, Minutes(10));
+            events.ScheduleEvent(EVENT_ENRAGE, 10min);
         }
 
         void JustEngagedWith(Unit* /*who*/) override
@@ -95,7 +95,7 @@ public:
         void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override
         {
             if (spell->Id == SPELL_BROKEN_PACT)
-                events.ScheduleEvent(EVENT_SUMMON_KILREK, Seconds(32));
+                events.ScheduleEvent(EVENT_SUMMON_KILREK, 32s);
         }
 
         void KilledUnit(Unit* victim) override
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index a8f9c0e94c4..64493786c11 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -94,7 +94,7 @@ class boss_selin_fireheart : public CreatureScript
                 {
                     case ACTION_SWITCH_PHASE:
                         events.SetPhase(PHASE_NORMAL);
-                        events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2000, 0, PHASE_NORMAL);
+                        events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2s, 0, PHASE_NORMAL);
                         AttackStart(me->GetVictim());
                         me->GetMotionMaster()->MoveChase(me->GetVictim());
                         break;
@@ -137,7 +137,7 @@ class boss_selin_fireheart : public CreatureScript
                 _JustEngagedWith();
 
                 events.SetPhase(PHASE_NORMAL);
-                events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2100, 0, PHASE_NORMAL);
+                events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2100ms, 0, PHASE_NORMAL);
              }
 
             void KilledUnit(Unit* victim) override
@@ -155,7 +155,7 @@ class boss_selin_fireheart : public CreatureScript
                     {
                         CrystalChosen->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                         CrystalChosen->CastSpell(me, SPELL_MANA_RAGE, true);
-                        events.ScheduleEvent(EVENT_EMPOWER, 10000, PHASE_DRAIN);
+                        events.ScheduleEvent(EVENT_EMPOWER, 10s, PHASE_DRAIN);
                     }
                 }
             }
@@ -184,7 +184,7 @@ class boss_selin_fireheart : public CreatureScript
                     {
                         case EVENT_FEL_EXPLOSION:
                             DoCastAOE(SPELL_FEL_EXPLOSION);
-                            events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2000, 0, PHASE_NORMAL);
+                            events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2s, 0, PHASE_NORMAL);
                             break;
                         case EVENT_DRAIN_CRYSTAL:
                             SelectNearestCrystal();
@@ -193,12 +193,12 @@ class boss_selin_fireheart : public CreatureScript
                         case EVENT_DRAIN_MANA:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true))
                                 DoCast(target, SPELL_DRAIN_MANA);
-                            events.ScheduleEvent(EVENT_DRAIN_MANA, 10000, 0, PHASE_NORMAL);
+                            events.ScheduleEvent(EVENT_DRAIN_MANA, 10s, 0, PHASE_NORMAL);
                             break;
                         case EVENT_DRAIN_LIFE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true))
                                 DoCast(target, SPELL_DRAIN_LIFE);
-                            events.ScheduleEvent(EVENT_DRAIN_LIFE, 10000, 0, PHASE_NORMAL);
+                            events.ScheduleEvent(EVENT_DRAIN_LIFE, 10s, 0, PHASE_NORMAL);
                             break;
                         case EVENT_EMPOWER:
                         {
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
index 95c29ed6bf3..df2dbe776dd 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
@@ -88,8 +88,8 @@ class boss_vexallus : public CreatureScript
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8000);
-                events.ScheduleEvent(EVENT_ARCANE_SHOCK, 5000);
+                events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8s);
+                events.ScheduleEvent(EVENT_ARCANE_SHOCK, 5s);
             }
 
             void JustSummoned(Creature* summoned) override
@@ -113,7 +113,7 @@ class boss_vexallus : public CreatureScript
                     {
                         _enraged = true;
                         events.Reset();
-                        events.ScheduleEvent(EVENT_OVERLOAD, 1200);
+                        events.ScheduleEvent(EVENT_OVERLOAD, 1200ms);
                         return;
                     }
                     else
@@ -149,16 +149,16 @@ class boss_vexallus : public CreatureScript
                         case EVENT_CHAIN_LIGHTNING:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                                 DoCast(target, SPELL_CHAIN_LIGHTNING);
-                            events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8000);
+                            events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8s);
                             break;
                         case EVENT_ARCANE_SHOCK:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true))
                                 DoCast(target, SPELL_ARCANE_SHOCK);
-                            events.ScheduleEvent(EVENT_ARCANE_SHOCK, 8000);
+                            events.ScheduleEvent(EVENT_ARCANE_SHOCK, 8s);
                             break;
                         case EVENT_OVERLOAD:
                             DoCastVictim(SPELL_OVERLOAD);
-                            events.ScheduleEvent(EVENT_OVERLOAD, 2000);
+                            events.ScheduleEvent(EVENT_OVERLOAD, 2s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index bd8635cd3f2..037ac5e4354 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -155,7 +155,7 @@ class instance_magisters_terrace : public InstanceMapScript
             {
                 if (eventId == EVENT_SPAWN_KALECGOS)
                     if (!instance->GetCreature(KalecgosGUID) && Events.Empty())
-                       Events.ScheduleEvent(EVENT_SPAWN_KALECGOS, Minutes(1));
+                       Events.ScheduleEvent(EVENT_SPAWN_KALECGOS, 1min);
             }
 
             void Update(uint32 diff) override
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
index 9406b6ed41f..48181fbeea1 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
@@ -82,7 +82,7 @@ public:
                 me->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
                 me->SetDisableGravity(false);
                 me->SetHover(false);
-                events.ScheduleEvent(EVENT_KALECGOS_LANDING, Seconds(2));
+                events.ScheduleEvent(EVENT_KALECGOS_LANDING, 2s);
             }
         }
 
@@ -95,7 +95,7 @@ public:
                 case EVENT_KALECGOS_LANDING:
                     DoCastAOE(SPELL_CAMERA_SHAKE);
                     me->SetObjectScale(0.6f);
-                    events.ScheduleEvent(EVENT_KALECGOS_TRANSFORM, Seconds(1));
+                    events.ScheduleEvent(EVENT_KALECGOS_TRANSFORM, 1s);
                     break;
                 case EVENT_KALECGOS_TRANSFORM:
                     DoCast(me, SPELL_ORB_KILL_CREDIT, true);
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index 33b490065fb..18f8b4a616a 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -137,10 +137,10 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_ICY_TOUCH, 1000, GCD_CAST);
-            events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3000, GCD_CAST);
-            events.ScheduleEvent(EVENT_BLOOD_STRIKE, 2000, GCD_CAST);
-            events.ScheduleEvent(EVENT_DEATH_COIL, 5000, GCD_CAST);
+            events.ScheduleEvent(EVENT_ICY_TOUCH, 1s, GCD_CAST);
+            events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3s, GCD_CAST);
+            events.ScheduleEvent(EVENT_BLOOD_STRIKE, 2s, GCD_CAST);
+            events.ScheduleEvent(EVENT_DEATH_COIL, 5s, GCD_CAST);
         }
 
         void MovementInform(uint32 type, uint32 id) override
@@ -258,22 +258,22 @@ public:
                     case EVENT_ICY_TOUCH:
                         DoCastVictim(SPELL_ICY_TOUCH);
                         events.DelayEvents(1000, GCD_CAST);
-                        events.ScheduleEvent(EVENT_ICY_TOUCH, 5000, GCD_CAST);
+                        events.ScheduleEvent(EVENT_ICY_TOUCH, 5s, GCD_CAST);
                         break;
                     case EVENT_PLAGUE_STRIKE:
                         DoCastVictim(SPELL_PLAGUE_STRIKE);
                         events.DelayEvents(1000, GCD_CAST);
-                        events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 5000, GCD_CAST);
+                        events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 5s, GCD_CAST);
                         break;
                     case EVENT_BLOOD_STRIKE:
                         DoCastVictim(SPELL_BLOOD_STRIKE);
                         events.DelayEvents(1000, GCD_CAST);
-                        events.ScheduleEvent(EVENT_BLOOD_STRIKE, 5000, GCD_CAST);
+                        events.ScheduleEvent(EVENT_BLOOD_STRIKE, 5s, GCD_CAST);
                         break;
                     case EVENT_DEATH_COIL:
                         DoCastVictim(SPELL_DEATH_COIL);
                         events.DelayEvents(1000, GCD_CAST);
-                        events.ScheduleEvent(EVENT_DEATH_COIL, 5000, GCD_CAST);
+                        events.ScheduleEvent(EVENT_DEATH_COIL, 5s, GCD_CAST);
                         break;
                     }
                 }
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
index 62671996334..b9b3af69282 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
@@ -66,7 +66,7 @@ class boss_arcanist_doan : public CreatureScript
                 Talk(SAY_AGGRO);
 
                 events.ScheduleEvent(EVENT_SILENCE,         15 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 3 * IN_MILLISECONDS);
+                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 3s);
                 events.ScheduleEvent(EVENT_POLYMORPH,       30 * IN_MILLISECONDS);
             }
 
@@ -91,16 +91,16 @@ class boss_arcanist_doan : public CreatureScript
                     {
                         case EVENT_SILENCE:
                             DoCastVictim(SPELL_SILENCE);
-                            events.ScheduleEvent(EVENT_SILENCE, urand(15, 20) * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_SILENCE, 15s, 20s);
                             break;
                         case EVENT_ARCANE_EXPLOSION:
                             DoCastVictim(SPELL_ARCANE_EXPLOSION);
-                            events.ScheduleEvent(EVENT_SILENCE, 8 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_SILENCE, 8s);
                             break;
                         case EVENT_POLYMORPH:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 30.0f, true))
                                 DoCast(target, SPELL_POLYMORPH);
-                            events.ScheduleEvent(EVENT_POLYMORPH, 20 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_POLYMORPH, 20s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
index 6d07ed32e9d..2768d6a840b 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
@@ -54,8 +54,8 @@ class boss_azshir_the_sleepless : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30000);
-                events.ScheduleEvent(EVENT_TERRIFY, 20000);
+                events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30s);
+                events.ScheduleEvent(EVENT_TERRIFY, 20s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -68,7 +68,7 @@ class boss_azshir_the_sleepless : public CreatureScript
                 if (!_siphon && me->HealthBelowPctDamaged(50, damage))
                 {
                     DoCastVictim(SPELL_SOUL_SIPHON);
-                    events.ScheduleEvent(EVENT_SOUL_SIPHON, 20000);
+                    events.ScheduleEvent(EVENT_SOUL_SIPHON, 20s);
                     _siphon = true;
                 }
             }
@@ -89,15 +89,15 @@ class boss_azshir_the_sleepless : public CreatureScript
                     {
                         case EVENT_CALL_OF_GRAVE:
                             DoCastVictim(SPELL_CALL_OF_THE_GRAVE);
-                            events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30000);
+                            events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30s);
                             break;
                         case EVENT_TERRIFY:
                             DoCastVictim(SPELL_TERRIFY);
-                            events.ScheduleEvent(EVENT_TERRIFY, 20000);
+                            events.ScheduleEvent(EVENT_TERRIFY, 20s);
                             break;
                         case EVENT_SOUL_SIPHON:
                             DoCastVictim(SPELL_SOUL_SIPHON);
-                            events.ScheduleEvent(EVENT_SOUL_SIPHON, 20000);
+                            events.ScheduleEvent(EVENT_SOUL_SIPHON, 20s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
index 7afbcb78ec1..7dd6a179526 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
@@ -64,10 +64,10 @@ class boss_bloodmage_thalnos : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_FLAME_SHOCK, 10000);
-                events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000);
-                events.ScheduleEvent(EVENT_FLAME_SPIKE, 8000);
-                events.ScheduleEvent(EVENT_FIRE_NOVA, 40000);
+                events.ScheduleEvent(EVENT_FLAME_SHOCK, 10s);
+                events.ScheduleEvent(EVENT_SHADOW_BOLT, 2s);
+                events.ScheduleEvent(EVENT_FLAME_SPIKE, 8s);
+                events.ScheduleEvent(EVENT_FIRE_NOVA, 40s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -95,19 +95,19 @@ class boss_bloodmage_thalnos : public CreatureScript
                 {
                     case EVENT_FLAME_SHOCK:
                         DoCastVictim(SPELL_FLAMESHOCK);
-                        events.ScheduleEvent(EVENT_FLAME_SHOCK, urand(10000, 15000));
+                        events.ScheduleEvent(EVENT_FLAME_SHOCK, 10s, 15s);
                         break;
                     case EVENT_SHADOW_BOLT:
                         DoCastVictim(SPELL_SHADOWBOLT);
-                        events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000);
+                        events.ScheduleEvent(EVENT_SHADOW_BOLT, 2s);
                         break;
                     case EVENT_FLAME_SPIKE:
                         DoCastVictim(SPELL_FLAMESPIKE);
-                        events.ScheduleEvent(EVENT_FLAME_SPIKE, 30000);
+                        events.ScheduleEvent(EVENT_FLAME_SPIKE, 30s);
                         break;
                     case EVENT_FIRE_NOVA:
                         DoCastVictim(SPELL_FIRENOVA);
-                        events.ScheduleEvent(EVENT_FIRE_NOVA, 40000);
+                        events.ScheduleEvent(EVENT_FIRE_NOVA, 40s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index 2b6ba94f664..5f535a1244e 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -83,8 +83,8 @@ class boss_herod : public CreatureScript
                 DoCast(me, SPELL_RUSHINGCHARGE);
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_CLEAVE, 12000);
-                events.ScheduleEvent(EVENT_WHIRLWIND, 60000);
+                events.ScheduleEvent(EVENT_CLEAVE, 12s);
+                events.ScheduleEvent(EVENT_WHIRLWIND, 1min);
             }
 
             void KilledUnit(Unit* /*victim*/) override
@@ -117,12 +117,12 @@ class boss_herod : public CreatureScript
                 {
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE);
-                        events.ScheduleEvent(EVENT_CLEAVE, 12000);
+                        events.ScheduleEvent(EVENT_CLEAVE, 12s);
                         break;
                     case EVENT_WHIRLWIND:
                         Talk(SAY_WHIRLWIND);
                         DoCastVictim(SPELL_WHIRLWIND);
-                        events.ScheduleEvent(EVENT_WHIRLWIND, 30000);
+                        events.ScheduleEvent(EVENT_WHIRLWIND, 30s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
index 4e7969f1ebb..0f5a24e2621 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
@@ -53,7 +53,7 @@ class boss_houndmaster_loksey : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_BLOODLUST, 20000);
+                events.ScheduleEvent(EVENT_BLOODLUST, 20s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -67,7 +67,7 @@ class boss_houndmaster_loksey : public CreatureScript
                 {
                     case EVENT_BLOODLUST:
                         DoCast(me, SPELL_BLOODLUST);
-                        events.ScheduleEvent(EVENT_BLOODLUST, 20000);
+                        events.ScheduleEvent(EVENT_BLOODLUST, 20s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
index f2e0bd38d2c..66aa049aa47 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
@@ -67,7 +67,7 @@ class boss_interrogator_vishas : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5000);
+                events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5s);
             }
 
             void KilledUnit(Unit* victim) override
@@ -104,7 +104,7 @@ class boss_interrogator_vishas : public CreatureScript
                 {
                     case EVENT_SHADOW_WORD_PAIN:
                         DoCastVictim(SPELL_SHADOW_WORD_PAIN);
-                        events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(5000, 15000));
+                        events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5s, 15s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
index ef292a811c3..d3d7dda08f6 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
@@ -52,10 +52,10 @@ class boss_scorn : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_LICH_SLAP, 45000);
-                events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 30000);
-                events.ScheduleEvent(EVENT_MIND_FLAY, 30000);
-                events.ScheduleEvent(EVENT_FROST_NOVA, 30000);
+                events.ScheduleEvent(EVENT_LICH_SLAP, 45s);
+                events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 30s);
+                events.ScheduleEvent(EVENT_MIND_FLAY, 30s);
+                events.ScheduleEvent(EVENT_FROST_NOVA, 30s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -69,19 +69,19 @@ class boss_scorn : public CreatureScript
                 {
                     case EVENT_LICH_SLAP:
                         DoCastVictim(SPELL_LICHSLAP);
-                        events.ScheduleEvent(EVENT_LICH_SLAP, 45000);
+                        events.ScheduleEvent(EVENT_LICH_SLAP, 45s);
                         break;
                     case EVENT_FROSTBOLT_VOLLEY:
                         DoCastVictim(SPELL_FROSTBOLT_VOLLEY);
-                        events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 20000);
+                        events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 20s);
                         break;
                     case EVENT_MIND_FLAY:
                         DoCastVictim(SPELL_MINDFLAY);
-                        events.ScheduleEvent(EVENT_MIND_FLAY, 20000);
+                        events.ScheduleEvent(EVENT_MIND_FLAY, 20s);
                         break;
                     case EVENT_FROST_NOVA:
                         DoCastVictim(SPELL_FROSTNOVA);
-                        events.ScheduleEvent(EVENT_FROST_NOVA, 15000);
+                        events.ScheduleEvent(EVENT_FROST_NOVA, 15s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
index 805f113a9b0..da7ce55f362 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
@@ -79,10 +79,10 @@ class boss_darkmaster_gandling : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_ARCANEMISSILES, 4500);
-                events.ScheduleEvent(EVENT_SHADOWSHIELD, 12000);
-                events.ScheduleEvent(EVENT_CURSE, 2000);
-                events.ScheduleEvent(EVENT_SHADOW_PORTAL, 16000);
+                events.ScheduleEvent(EVENT_ARCANEMISSILES, 4500ms);
+                events.ScheduleEvent(EVENT_SHADOWSHIELD, 12s);
+                events.ScheduleEvent(EVENT_CURSE, 2s);
+                events.ScheduleEvent(EVENT_SHADOW_PORTAL, 15s);
 
                 if (GameObject* gate = ObjectAccessor::GetGameObject(*me, instance->GetGuidData(GO_GATE_GANDLING)))
                     gate->SetGoState(GO_STATE_READY);
@@ -110,21 +110,21 @@ class boss_darkmaster_gandling : public CreatureScript
                     {
                         case EVENT_ARCANEMISSILES:
                             DoCastVictim(SPELL_ARCANEMISSILES, true);
-                            events.ScheduleEvent(EVENT_ARCANEMISSILES, 8000);
+                            events.ScheduleEvent(EVENT_ARCANEMISSILES, 8s);
                             break;
                         case EVENT_SHADOWSHIELD:
                             DoCast(me, SPELL_SHADOWSHIELD);
-                            events.ScheduleEvent(EVENT_SHADOWSHIELD, urand(14000, 28000));
+                            events.ScheduleEvent(EVENT_SHADOWSHIELD, 14s, 28s);
                             break;
                         case EVENT_CURSE:
                             DoCastVictim(SPELL_CURSE, true);
-                            events.ScheduleEvent(EVENT_CURSE, urand(15000, 27000));
+                            events.ScheduleEvent(EVENT_CURSE, 15s, 27s);
                             break;
                         case EVENT_SHADOW_PORTAL:
                             if (HealthAbovePct(3))
                             {
                                 DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_SHADOW_PORTAL, true);
-                                events.ScheduleEvent(EVENT_SHADOW_PORTAL, urand(17000, 27000));
+                                events.ScheduleEvent(EVENT_SHADOW_PORTAL, 17s, 27s);
                             }
                     }
 
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
index 42d2af0ffa9..388ccb1de8d 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
@@ -56,9 +56,9 @@ class boss_doctor_theolen_krastinov : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_REND, 8000);
-                events.ScheduleEvent(EVENT_BACKHAND, 9000);
-                events.ScheduleEvent(EVENT_FRENZY, 1000);
+                events.ScheduleEvent(EVENT_REND, 8s);
+                events.ScheduleEvent(EVENT_BACKHAND, 9s);
+                events.ScheduleEvent(EVENT_FRENZY, 1s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -77,11 +77,11 @@ class boss_doctor_theolen_krastinov : public CreatureScript
                     {
                         case EVENT_REND:
                             DoCastVictim(SPELL_REND, true);
-                            events.ScheduleEvent(EVENT_REND, 10000);
+                            events.ScheduleEvent(EVENT_REND, 10s);
                             break;
                         case EVENT_BACKHAND:
                             DoCastVictim(SPELL_BACKHAND, true);
-                            events.ScheduleEvent(EVENT_BACKHAND, 10000);
+                            events.ScheduleEvent(EVENT_BACKHAND, 10s);
                             break;
                         case EVENT_FRENZY:
                             DoCast(me, SPELL_FRENZY, true);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
index 74cdc44bf0d..5962355ff41 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
@@ -54,10 +54,10 @@ class boss_illucia_barov : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_CURSEOFAGONY, 18000);
-                events.ScheduleEvent(EVENT_SHADOWSHOCK, 9000);
-                events.ScheduleEvent(EVENT_SILENCE, 5000);
-                events.ScheduleEvent(EVENT_FEAR, 30000);
+                events.ScheduleEvent(EVENT_CURSEOFAGONY, 18s);
+                events.ScheduleEvent(EVENT_SHADOWSHOCK, 9s);
+                events.ScheduleEvent(EVENT_SILENCE, 5s);
+                events.ScheduleEvent(EVENT_FEAR, 30s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -76,19 +76,19 @@ class boss_illucia_barov : public CreatureScript
                     {
                         case EVENT_CURSEOFAGONY:
                             DoCastVictim(SPELL_CURSEOFAGONY, true);
-                            events.ScheduleEvent(EVENT_CURSEOFAGONY, 30000);
+                            events.ScheduleEvent(EVENT_CURSEOFAGONY, 30s);
                             break;
                         case EVENT_SHADOWSHOCK:
                             DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_SHADOWSHOCK, true);
-                            events.ScheduleEvent(EVENT_SHADOWSHOCK, 12000);
+                            events.ScheduleEvent(EVENT_SHADOWSHOCK, 12s);
                             break;
                         case EVENT_SILENCE:
                             DoCastVictim(SPELL_SILENCE, true);
-                            events.ScheduleEvent(EVENT_SILENCE, 14000);
+                            events.ScheduleEvent(EVENT_SILENCE, 14s);
                             break;
                         case EVENT_FEAR:
                             DoCastVictim(SPELL_FEAR, true);
-                            events.ScheduleEvent(EVENT_FEAR, 30000);
+                            events.ScheduleEvent(EVENT_FEAR, 30s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
index 04a0ec1748e..b2f2373103d 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
@@ -73,11 +73,11 @@ class boss_instructor_malicia : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_CALLOFGRAVES, 4000);
-                events.ScheduleEvent(EVENT_CORRUPTION, 8000);
-                events.ScheduleEvent(EVENT_RENEW, 32000);
-                events.ScheduleEvent(EVENT_FLASHHEAL, 38000);
-                events.ScheduleEvent(EVENT_HEALINGTOUCH, 45000);
+                events.ScheduleEvent(EVENT_CALLOFGRAVES, 4s);
+                events.ScheduleEvent(EVENT_CORRUPTION, 8s);
+                events.ScheduleEvent(EVENT_RENEW, 32s);
+                events.ScheduleEvent(EVENT_FLASHHEAL, 38s);
+                events.ScheduleEvent(EVENT_HEALINGTOUCH, 45s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -96,28 +96,28 @@ class boss_instructor_malicia : public CreatureScript
                     {
                         case EVENT_CALLOFGRAVES:
                             DoCastVictim(SPELL_CALLOFGRAVES, true);
-                            events.ScheduleEvent(EVENT_CALLOFGRAVES, 65000);
+                            events.ScheduleEvent(EVENT_CALLOFGRAVES, 65s);
                             break;
                         case EVENT_CORRUPTION:
                             DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_CORRUPTION, true);
-                            events.ScheduleEvent(EVENT_CORRUPTION, 24000);
+                            events.ScheduleEvent(EVENT_CORRUPTION, 24s);
                             break;
                         case EVENT_RENEW:
                             DoCast(me, SPELL_RENEW);
-                            events.ScheduleEvent(EVENT_RENEW, 10000);
+                            events.ScheduleEvent(EVENT_RENEW, 10s);
                             break;
                         case EVENT_FLASHHEAL:
                             //5 Flashheals will be cast
                             DoCast(me, SPELL_FLASHHEAL);
                             if (FlashCounter < 2)
                             {
-                                events.ScheduleEvent(EVENT_FLASHHEAL, 5000);
+                                events.ScheduleEvent(EVENT_FLASHHEAL, 5s);
                                 ++FlashCounter;
                             }
                             else
                             {
                                 FlashCounter=0;
-                                events.ScheduleEvent(EVENT_FLASHHEAL, 30000);
+                                events.ScheduleEvent(EVENT_FLASHHEAL, 30s);
                             }
                             break;
                         case EVENT_HEALINGTOUCH:
@@ -125,13 +125,13 @@ class boss_instructor_malicia : public CreatureScript
                             DoCast(me, SPELL_HEALINGTOUCH);
                             if (TouchCounter < 2)
                             {
-                                events.ScheduleEvent(EVENT_HEALINGTOUCH, 5500);
+                                events.ScheduleEvent(EVENT_HEALINGTOUCH, 5500ms);
                                 ++TouchCounter;
                             }
                             else
                             {
                                 TouchCounter=0;
-                                events.ScheduleEvent(EVENT_HEALINGTOUCH, 30000);
+                                events.ScheduleEvent(EVENT_HEALINGTOUCH, 30s);
                             }
                             break;
                         default:
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
index b869764b602..89a4213fc20 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
@@ -60,8 +60,8 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 15000);
-            events.ScheduleEvent(EVENT_ILLUSION, 30000);
+            events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 15s);
+            events.ScheduleEvent(EVENT_ILLUSION, 30s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -85,15 +85,15 @@ public:
                 {
                     case EVENT_CURSE_OF_BLOOD:
                         DoCastVictim(SPELL_CURSE_OF_BLOOD);
-                        events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 30000);
+                        events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 30s);
                         break;
                     case EVENT_ILLUSION:
                         DoCast(SPELL_ILLUSION);
                         me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                         me->SetDisplayId(11686);  // Invisible Model
                         ModifyThreatByPercent(me->GetVictim(), -99);
-                        events.ScheduleEvent(EVENT_SET_VISIBILITY, 3000);
-                        events.ScheduleEvent(EVENT_ILLUSION, 25000);
+                        events.ScheduleEvent(EVENT_SET_VISIBILITY, 3s);
+                        events.ScheduleEvent(EVENT_ILLUSION, 25s);
                         break;
                     case EVENT_SET_VISIBILITY:
                         me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
index 42c19ca65f3..c4cb3ab29d3 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
@@ -89,14 +89,14 @@ class boss_kirtonos_the_herald : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                events.ScheduleEvent(EVENT_SWOOP, urand(8000, 8000));
-                events.ScheduleEvent(EVENT_WING_FLAP, urand(15000, 15000));
-                events.ScheduleEvent(EVENT_PIERCE_ARMOR, urand(18000, 18000));
-                events.ScheduleEvent(EVENT_DISARM, urand(22000, 22000));
-                events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(42000, 42000));
-                events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, urand(53000, 53000));
-                events.ScheduleEvent(EVENT_DOMINATE_MIND, urand(34000, 48000));
-                events.ScheduleEvent(EVENT_KIRTONOS_TRANSFORM, urand(20000, 20000));
+                events.ScheduleEvent(EVENT_SWOOP, 8s, 8s);
+                events.ScheduleEvent(EVENT_WING_FLAP, 15s, 15s);
+                events.ScheduleEvent(EVENT_PIERCE_ARMOR, 18s, 18s);
+                events.ScheduleEvent(EVENT_DISARM, 22s, 22s);
+                events.ScheduleEvent(EVENT_SHADOW_BOLT, 42s, 42s);
+                events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, 53s, 53s);
+                events.ScheduleEvent(EVENT_DOMINATE_MIND, 34s, 48s);
+                events.ScheduleEvent(EVENT_KIRTONOS_TRANSFORM, 20s, 20s);
                 _JustEngagedWith();
             }
 
@@ -203,31 +203,31 @@ class boss_kirtonos_the_herald : public CreatureScript
                     {
                         case EVENT_SWOOP:
                             DoCast(me, SPELL_SWOOP);
-                            events.ScheduleEvent(EVENT_SWOOP, 15000);
+                            events.ScheduleEvent(EVENT_SWOOP, 15s);
                             break;
                         case EVENT_WING_FLAP:
                             DoCast(me, SPELL_WING_FLAP);
-                            events.ScheduleEvent(EVENT_WING_FLAP, 13000);
+                            events.ScheduleEvent(EVENT_WING_FLAP, 13s);
                             break;
                         case EVENT_PIERCE_ARMOR:
                             DoCastVictim(SPELL_PIERCE_ARMOR, true);
-                            events.ScheduleEvent(EVENT_PIERCE_ARMOR, 12000);
+                            events.ScheduleEvent(EVENT_PIERCE_ARMOR, 12s);
                             break;
                         case EVENT_DISARM:
                             DoCastVictim(SPELL_DISARM, true);
-                            events.ScheduleEvent(EVENT_DISARM, 11000);
+                            events.ScheduleEvent(EVENT_DISARM, 11s);
                             break;
                         case EVENT_SHADOW_BOLT:
                             DoCastVictim(SPELL_SHADOW_BOLT, true);
-                            events.ScheduleEvent(EVENT_SHADOW_BOLT, 42000);
+                            events.ScheduleEvent(EVENT_SHADOW_BOLT, 42s);
                             break;
                         case EVENT_CURSE_OF_TONGUES:
                             DoCastVictim(SPELL_CURSE_OF_TONGUES, true);
-                            events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, 35000);
+                            events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, 35s);
                             break;
                         case EVENT_DOMINATE_MIND:
                             DoCastVictim(SPELL_DOMINATE_MIND, true);
-                            events.ScheduleEvent(EVENT_DOMINATE_MIND, urand(44000, 48000));
+                            events.ScheduleEvent(EVENT_DOMINATE_MIND, 44s, 48s);
                             break;
                         case EVENT_KIRTONOS_TRANSFORM:
                             if (me->HasAura(SPELL_KIRTONOS_TRANSFORM))
@@ -242,7 +242,7 @@ class boss_kirtonos_the_herald : public CreatureScript
                                 me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 0, uint32(WEAPON_KIRTONOS_STAFF));
                                 me->SetCanFly(true);
                             }
-                            events.ScheduleEvent(EVENT_KIRTONOS_TRANSFORM, urand(16000, 18000));
+                            events.ScheduleEvent(EVENT_KIRTONOS_TRANSFORM, 16s, 18s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
index 7e915e7545b..3d008083fa3 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
@@ -67,8 +67,8 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 10000);
-            events.ScheduleEvent(EVENT_BONE_SHIELD, 2000);
+            events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 10s);
+            events.ScheduleEvent(EVENT_BONE_SHIELD, 2s);
             events.ScheduleEvent(EVENT_SUMMON_MINIONS, 15000);
         }
 
@@ -110,7 +110,7 @@ public:
                         break;
                     case EVENT_SUMMON_MINIONS:
                         DoCast(SPELL_SUMMON_BONE_MINIONS);
-                        events.ScheduleEvent(EVENT_SUMMON_MINIONS, 12000);
+                        events.ScheduleEvent(EVENT_SUMMON_MINIONS, 12s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
index cf13c5ab77d..f180d09db89 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
@@ -58,8 +58,8 @@ class boss_lord_alexei_barov : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_IMMOLATE, 7000);
-                events.ScheduleEvent(EVENT_VEILOFSHADOW, 15000);
+                events.ScheduleEvent(EVENT_IMMOLATE, 7s);
+                events.ScheduleEvent(EVENT_VEILOFSHADOW, 15s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -78,11 +78,11 @@ class boss_lord_alexei_barov : public CreatureScript
                     {
                         case EVENT_IMMOLATE:
                             DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_IMMOLATE, true);
-                            events.ScheduleEvent(EVENT_IMMOLATE, 12000);
+                            events.ScheduleEvent(EVENT_IMMOLATE, 12s);
                             break;
                         case EVENT_VEILOFSHADOW:
                             DoCastVictim(SPELL_VEILOFSHADOW, true);
-                            events.ScheduleEvent(EVENT_VEILOFSHADOW, 20000);
+                            events.ScheduleEvent(EVENT_VEILOFSHADOW, 20s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
index a234db44497..860137bd836 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
@@ -53,10 +53,10 @@ class boss_lorekeeper_polkelt : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_VOLATILEINFECTION, 38000);
-                events.ScheduleEvent(EVENT_DARKPLAGUE, 8000);
-                events.ScheduleEvent(EVENT_CORROSIVEACID, 45000);
-                events.ScheduleEvent(EVENT_NOXIOUSCATALYST, 35000);
+                events.ScheduleEvent(EVENT_VOLATILEINFECTION, 38s);
+                events.ScheduleEvent(EVENT_DARKPLAGUE, 8s);
+                events.ScheduleEvent(EVENT_CORROSIVEACID, 45s);
+                events.ScheduleEvent(EVENT_NOXIOUSCATALYST, 35s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -75,19 +75,19 @@ class boss_lorekeeper_polkelt : public CreatureScript
                     {
                         case EVENT_VOLATILEINFECTION:
                             DoCastVictim(SPELL_VOLATILEINFECTION, true);
-                            events.ScheduleEvent(EVENT_VOLATILEINFECTION, 32000);
+                            events.ScheduleEvent(EVENT_VOLATILEINFECTION, 32s);
                             break;
                         case EVENT_DARKPLAGUE:
                             DoCastVictim(SPELL_DARKPLAGUE, true);
-                            events.ScheduleEvent(EVENT_DARKPLAGUE, 8000);
+                            events.ScheduleEvent(EVENT_DARKPLAGUE, 8s);
                             break;
                         case EVENT_CORROSIVEACID:
                             DoCastVictim(SPELL_CORROSIVEACID, true);
-                            events.ScheduleEvent(EVENT_CORROSIVEACID, 25000);
+                            events.ScheduleEvent(EVENT_CORROSIVEACID, 25s);
                             break;
                         case EVENT_NOXIOUSCATALYST:
                             DoCastVictim(SPELL_NOXIOUSCATALYST, true);
-                            events.ScheduleEvent(EVENT_NOXIOUSCATALYST, 38000);
+                            events.ScheduleEvent(EVENT_NOXIOUSCATALYST, 38s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
index 486e6a489c3..e6ee8513e5f 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
@@ -56,10 +56,10 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_ICE_ARMOR, 2000);
-            events.ScheduleEvent(EVENT_FROSTBOLT, 8000);
-            events.ScheduleEvent(EVENT_CHILL_NOVA, 12000);
-            events.ScheduleEvent(EVENT_FREEZE, 18000);
+            events.ScheduleEvent(EVENT_ICE_ARMOR, 2s);
+            events.ScheduleEvent(EVENT_FROSTBOLT, 8s);
+            events.ScheduleEvent(EVENT_CHILL_NOVA, 12s);
+            events.ScheduleEvent(EVENT_FREEZE, 18s);
             events.ScheduleEvent(EVENT_FEAR, 45000);
         }
 
@@ -79,24 +79,24 @@ public:
                 {
                     case EVENT_ICE_ARMOR:
                         DoCast(me, SPELL_ICE_ARMOR);
-                        events.ScheduleEvent(EVENT_ICE_ARMOR, 180000);
+                        events.ScheduleEvent(EVENT_ICE_ARMOR, 3min);
                         break;
                     case EVENT_FROSTBOLT:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                             DoCast(target, SPELL_FROSTBOLT);
-                        events.ScheduleEvent(EVENT_FROSTBOLT, 8000);
+                        events.ScheduleEvent(EVENT_FROSTBOLT, 8s);
                         break;
                     case EVENT_FREEZE:
                         DoCastVictim(SPELL_FREEZE);
-                        events.ScheduleEvent(EVENT_FREEZE, 24000);
+                        events.ScheduleEvent(EVENT_FREEZE, 24s);
                         break;
                     case EVENT_FEAR:
                         DoCastVictim(SPELL_FEAR);
-                        events.ScheduleEvent(EVENT_FEAR, 30000);
+                        events.ScheduleEvent(EVENT_FEAR, 30s);
                         break;
                     case EVENT_CHILL_NOVA:
                         DoCastVictim(SPELL_CHILL_NOVA);
-                        events.ScheduleEvent(EVENT_CHILL_NOVA, 14000);
+                        events.ScheduleEvent(EVENT_CHILL_NOVA, 14s);
                         break;
                     case EVENT_FROSTVOLLEY:
                         DoCastVictim(SPELL_FROSTVOLLEY);
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
index f2cc647ac41..acb5eddff87 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
@@ -53,10 +53,10 @@ class boss_the_ravenian : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_TRAMPLE, 24000);
-                events.ScheduleEvent(EVENT_CLEAVE, 15000);
-                events.ScheduleEvent(EVENT_SUNDERINCLEAVE, 40000);
-                events.ScheduleEvent(EVENT_KNOCKAWAY, 32000);
+                events.ScheduleEvent(EVENT_TRAMPLE, 24s);
+                events.ScheduleEvent(EVENT_CLEAVE, 15s);
+                events.ScheduleEvent(EVENT_SUNDERINCLEAVE, 40s);
+                events.ScheduleEvent(EVENT_KNOCKAWAY, 32s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -75,19 +75,19 @@ class boss_the_ravenian : public CreatureScript
                     {
                         case EVENT_TRAMPLE:
                             DoCastVictim(SPELL_TRAMPLE, true);
-                            events.ScheduleEvent(EVENT_TRAMPLE, 10000);
+                            events.ScheduleEvent(EVENT_TRAMPLE, 10s);
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE, true);
-                            events.ScheduleEvent(EVENT_CLEAVE, 7000);
+                            events.ScheduleEvent(EVENT_CLEAVE, 7s);
                             break;
                         case EVENT_SUNDERINCLEAVE:
                             DoCastVictim(SPELL_SUNDERINCLEAVE, true);
-                            events.ScheduleEvent(EVENT_SUNDERINCLEAVE, 20000);
+                            events.ScheduleEvent(EVENT_SUNDERINCLEAVE, 20s);
                             break;
                         case EVENT_KNOCKAWAY:
                             DoCastVictim(SPELL_KNOCKAWAY, true);
-                            events.ScheduleEvent(EVENT_KNOCKAWAY, 12000);
+                            events.ScheduleEvent(EVENT_KNOCKAWAY, 12s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
index 573f0462734..b7ff7e327e5 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
@@ -55,8 +55,8 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_FIRE_SHIELD, 2000);
-            events.ScheduleEvent(EVENT_BLAST_WAVE, 14000);
+            events.ScheduleEvent(EVENT_FIRE_SHIELD, 2s);
+            events.ScheduleEvent(EVENT_BLAST_WAVE, 14s);
         }
 
         void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -65,7 +65,7 @@ public:
             {
                 DoCast(me, SPELL_FRENZY);
                 Talk(EMOTE_FRENZY);
-                events.ScheduleEvent(EVENT_FRENZY, 24000);
+                events.ScheduleEvent(EVENT_FRENZY, 24s);
             }
         }
 
@@ -85,16 +85,16 @@ public:
                 {
                     case EVENT_FIRE_SHIELD:
                         DoCast(me, SPELL_FIRE_SHIELD);
-                        events.ScheduleEvent(EVENT_FIRE_SHIELD, 90000);
+                        events.ScheduleEvent(EVENT_FIRE_SHIELD, 90s);
                         break;
                     case EVENT_BLAST_WAVE:
                         DoCast(me, SPELL_BLAST_WAVE);
-                        events.ScheduleEvent(EVENT_BLAST_WAVE, 12000);
+                        events.ScheduleEvent(EVENT_BLAST_WAVE, 12s);
                         break;
                     case EVENT_FRENZY:
                         DoCast(me, SPELL_FRENZY);
                         Talk(EMOTE_FRENZY);
-                        events.ScheduleEvent(EVENT_FRENZY, 24000);
+                        events.ScheduleEvent(EVENT_FRENZY, 24s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
index 9778c0ad40d..b92177a2bc2 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
@@ -210,16 +210,16 @@ class boss_apothecary_hummel : public CreatureScript
                             break;
                         case EVENT_HUMMEL_SAY_2:
                             Talk(SAY_INTRO_2);
-                            events.ScheduleEvent(EVENT_START_FIGHT, Seconds(4));
+                            events.ScheduleEvent(EVENT_START_FIGHT, 4s);
                             break;
                         case EVENT_START_FIGHT:
                         {
                             me->SetImmuneToAll(false);
                             DoZoneInCombat();
-                            events.ScheduleEvent(EVENT_CALL_BAXTER, Seconds(6));
-                            events.ScheduleEvent(EVENT_CALL_FRYE, Seconds(14));
+                            events.ScheduleEvent(EVENT_CALL_BAXTER, 6s);
+                            events.ScheduleEvent(EVENT_CALL_FRYE, 14s);
                             events.ScheduleEvent(EVENT_PERFUME_SPRAY, Milliseconds(3640));
-                            events.ScheduleEvent(EVENT_CHAIN_REACTION, Seconds(15));
+                            events.ScheduleEvent(EVENT_CHAIN_REACTION, 15s);
 
                             Talk(SAY_SUMMON_ADDS);
                             std::vector<Creature*> trashs;
@@ -343,8 +343,8 @@ class npc_apothecary_baxter : public CreatureScript
             void Reset() override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_COLOGNE_SPRAY, Seconds(7));
-                _events.ScheduleEvent(EVENT_CHAIN_REACTION, Seconds(12));
+                _events.ScheduleEvent(EVENT_COLOGNE_SPRAY, 7s);
+                _events.ScheduleEvent(EVENT_CHAIN_REACTION, 12s);
             }
 
             void JustDied(Unit* /*killer*/) override
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
index e4ef77f2838..95c974f9029 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -257,10 +257,10 @@ class boss_archmage_arugal : public CreatureScript
             {
                 _JustEngagedWith();
                 Talk(SAY_AGGRO);
-                events.ScheduleEvent(EVENT_CURSE, Seconds(7));
-                events.ScheduleEvent(EVENT_TELEPORT, Seconds(15));
-                events.ScheduleEvent(EVENT_VOID_BOLT, Seconds(1));
-                events.ScheduleEvent(EVENT_THUNDERSHOCK, Seconds(10));
+                events.ScheduleEvent(EVENT_CURSE, 7s);
+                events.ScheduleEvent(EVENT_TELEPORT, 15s);
+                events.ScheduleEvent(EVENT_VOID_BOLT, 1s);
+                events.ScheduleEvent(EVENT_THUNDERSHOCK, 10s);
             }
 
             void AttackStart(Unit* who) override
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
index d59bf249f54..b8a6cacaf0c 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp
@@ -65,7 +65,7 @@ public:
         {
             _events.ScheduleEvent(EVENT_FROSTBOLT,  1 * IN_MILLISECONDS);
             _events.ScheduleEvent(EVENT_ICETOMB,   16 * IN_MILLISECONDS);
-            _events.ScheduleEvent(EVENT_DRAINLIFE, 31 * IN_MILLISECONDS);
+            _events.ScheduleEvent(EVENT_DRAINLIFE, 31s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -96,12 +96,12 @@ public:
                     case EVENT_ICETOMB:
                         if (rand32() % 65)
                             DoCastVictim(SPELL_ICETOMB);
-                        _events.ScheduleEvent(EVENT_ICETOMB, 28 * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_ICETOMB, 28s);
                         break;
                     case EVENT_DRAINLIFE:
                         if (rand32() % 55)
                             DoCastVictim(SPELL_DRAINLIFE);
-                        _events.ScheduleEvent(EVENT_DRAINLIFE, 31 * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_DRAINLIFE, 31s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
index d5472d3749c..7cd2e85b13b 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
@@ -66,10 +66,10 @@ class boss_postmaster_malown : public CreatureScript
 
             void JustEngagedWith(Unit* /*who*/) override
             {
-                events.ScheduleEvent(EVENT_WAILINGDEAD, 19000);     // lasts 6 sec
-                events.ScheduleEvent(EVENT_BACKHAND, 8000);         // 2 sec stun
-                events.ScheduleEvent(EVENT_CURSEOFWEAKNESS, 20000); // lasts 2 mins
-                events.ScheduleEvent(EVENT_CURSEOFTONGUES, 22000);
+                events.ScheduleEvent(EVENT_WAILINGDEAD, 19s);     // lasts 6 sec
+                events.ScheduleEvent(EVENT_BACKHAND, 8s);         // 2 sec stun
+                events.ScheduleEvent(EVENT_CURSEOFWEAKNESS, 20s); // lasts 2 mins
+                events.ScheduleEvent(EVENT_CURSEOFTONGUES, 22s);
                 events.ScheduleEvent(EVENT_CALLOFTHEGRAVE, 25000);
             }
 
@@ -95,22 +95,22 @@ class boss_postmaster_malown : public CreatureScript
                         case EVENT_WAILINGDEAD:
                             if (rand32() % 100 < 65) //65% chance to cast
                                 DoCastVictim(SPELL_WAILINGDEAD, true);
-                            events.ScheduleEvent(EVENT_WAILINGDEAD, 19000);
+                            events.ScheduleEvent(EVENT_WAILINGDEAD, 19s);
                             break;
                         case EVENT_BACKHAND:
                             if (rand32() % 100 < 45) //45% chance to cast
                                 DoCastVictim(SPELL_BACKHAND, true);
-                            events.ScheduleEvent(EVENT_WAILINGDEAD, 8000);
+                            events.ScheduleEvent(EVENT_WAILINGDEAD, 8s);
                             break;
                         case EVENT_CURSEOFWEAKNESS:
                             if (rand32() % 100 < 3) //3% chance to cast
                                 DoCastVictim(SPELL_CURSEOFWEAKNESS, true);
-                            events.ScheduleEvent(EVENT_WAILINGDEAD, 20000);
+                            events.ScheduleEvent(EVENT_WAILINGDEAD, 20s);
                             break;
                         case EVENT_CURSEOFTONGUES:
                             if (rand32() % 100 < 3) //3% chance to cast
                                 DoCastVictim(SPELL_CURSEOFTONGUES, true);
-                            events.ScheduleEvent(EVENT_WAILINGDEAD, 22000);
+                            events.ScheduleEvent(EVENT_WAILINGDEAD, 22s);
                             break;
                         case EVENT_CALLOFTHEGRAVE:
                             if (rand32() % 100 < 5) //5% chance to cast
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
index 67d3de21fd5..7eaa863adf4 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
@@ -359,7 +359,7 @@ class instance_stratholme : public InstanceMapScript
 
                         if (data == DONE)
                         {
-                            events.ScheduleEvent(EVENT_SLAUGHTER_SQUARE, 60000);
+                            events.ScheduleEvent(EVENT_SLAUGHTER_SQUARE, 1min);
                             TC_LOG_DEBUG("scripts", "Instance Stratholme: Slaugther event will continue in 1 minute.");
                         }
                         EncounterState[4] = data;
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
index 135bb109f51..60cfc8c0fde 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
@@ -158,7 +158,7 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_BERSERK, 600000);
+            events.ScheduleEvent(EVENT_BERSERK, 10min);
 
             me->setActive(true);
             DoZoneInCombat();
@@ -253,15 +253,15 @@ public:
                     me->StopMoving();
                     me->SetSpeedRate(MOVE_RUN, 2.0f);
 
-                    events.ScheduleEvent(EVENT_CLEAVE, urand(5000, 10000));
-                    events.ScheduleEvent(EVENT_CORROSION, urand(10000, 20000));
-                    events.ScheduleEvent(EVENT_GAS_NOVA, urand(15000, 20000));
-                    events.ScheduleEvent(EVENT_ENCAPSULATE, urand(20000, 25000));
-                    events.ScheduleEvent(EVENT_FLIGHT, 60000);
+                    events.ScheduleEvent(EVENT_CLEAVE, 5s, 10s);
+                    events.ScheduleEvent(EVENT_CORROSION, 10s, 20s);
+                    events.ScheduleEvent(EVENT_GAS_NOVA, 15s, 20s);
+                    events.ScheduleEvent(EVENT_ENCAPSULATE, 20s, 25s);
+                    events.ScheduleEvent(EVENT_FLIGHT, 1min);
                     break;
                 case PHASE_FLIGHT:
                     me->SetDisableGravity(true);
-                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1000);
+                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1s);
                     uiFlightCount = 0;
                     uiBreathCount = 0;
                     break;
@@ -281,7 +281,7 @@ public:
                     me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
                     me->StopMoving();
                     Talk(YELL_TAKEOFF);
-                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 2000);
+                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 2s);
                     break;
                 case 1:
                     me->GetMotionMaster()->MovePoint(0, me->GetPositionX()+1, me->GetPositionY(), me->GetPositionZ()+10);
@@ -306,7 +306,7 @@ public:
                         Vapor->CastSpell(Vapor, SPELL_VAPOR_TRIGGER, true);
                     }
 
-                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 10000);
+                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 10s);
                     break;
                 }
                 case 3:
@@ -334,7 +334,7 @@ public:
                         pVapor->CastSpell(pVapor, SPELL_VAPOR_TRIGGER, true);
                     }
 
-                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 10000);
+                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 10s);
                     break;
                 }
                 case 4:
@@ -363,7 +363,7 @@ public:
                 case 6:
                     me->SetFacingTo(me->GetAbsoluteAngle(breathX, breathY));
                     //DoTextEmote("takes a deep breath.", nullptr);
-                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 10000);
+                    events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 10s);
                     break;
                 case 7:
                 {
@@ -424,24 +424,24 @@ public:
                     case EVENT_BERSERK:
                         Talk(YELL_BERSERK);
                         DoCast(me, SPELL_BERSERK, true);
-                        events.ScheduleEvent(EVENT_BERSERK, 10000);
+                        events.ScheduleEvent(EVENT_BERSERK, 10s);
                         break;
                     case EVENT_CLEAVE:
                         DoCastVictim(SPELL_CLEAVE, false);
-                        events.ScheduleEvent(EVENT_CLEAVE, urand(5000, 10000));
+                        events.ScheduleEvent(EVENT_CLEAVE, 5s, 10s);
                         break;
                     case EVENT_CORROSION:
                         DoCastVictim(SPELL_CORROSION, false);
-                        events.ScheduleEvent(EVENT_CORROSION, urand(20000, 30000));
+                        events.ScheduleEvent(EVENT_CORROSION, 20s, 30s);
                         break;
                     case EVENT_GAS_NOVA:
                         DoCast(me, SPELL_GAS_NOVA, false);
-                        events.ScheduleEvent(EVENT_GAS_NOVA, urand(20000, 25000));
+                        events.ScheduleEvent(EVENT_GAS_NOVA, 20s, 25s);
                         break;
                     case EVENT_ENCAPSULATE:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true))
                             DoCast(target, SPELL_ENCAPSULATE_CHANNEL, false);
-                        events.ScheduleEvent(EVENT_ENCAPSULATE, urand(25000, 30000));
+                        events.ScheduleEvent(EVENT_ENCAPSULATE, 25s, 30s);
                         break;
                     case EVENT_FLIGHT:
                         EnterPhase(PHASE_FLIGHT);
@@ -475,7 +475,7 @@ public:
                                 me->CastSpell(Fog, SPELL_FOG_FORCE, true);
                             }
                         }
-                        events.ScheduleEvent(EVENT_SUMMON_FOG, 1000);
+                        events.ScheduleEvent(EVENT_SUMMON_FOG, 1s);
                         break;
                 }
             }
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index 025bc44ed6a..e8bd49093cf 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -152,12 +152,12 @@ struct boss_kalecgos : public BossAI
         _isEnraged = false;
         _isBanished = false;
         _Reset();
-        events.ScheduleEvent(EVENT_ARCANE_BUFFET, Seconds(8));
-        events.ScheduleEvent(EVENT_FROST_BREATH, Seconds(15));
-        events.ScheduleEvent(EVENT_WILD_MAGIC, Seconds(10));
-        events.ScheduleEvent(EVENT_TAIL_LASH, Seconds(25));
-        events.ScheduleEvent(EVENT_SPECTRAL_BLAST, Seconds(20), Seconds(25));
-        events.ScheduleEvent(EVENT_CHECK_TIMER, Seconds(1));
+        events.ScheduleEvent(EVENT_ARCANE_BUFFET, 8s);
+        events.ScheduleEvent(EVENT_FROST_BREATH, 15s);
+        events.ScheduleEvent(EVENT_WILD_MAGIC, 10s);
+        events.ScheduleEvent(EVENT_TAIL_LASH, 25s);
+        events.ScheduleEvent(EVENT_SPECTRAL_BLAST, 20s, 25s);
+        events.ScheduleEvent(EVENT_CHECK_TIMER, 1s);
     }
 
     void EnterEvadeMode(EvadeReason /*why*/) override
@@ -190,7 +190,7 @@ struct boss_kalecgos : public BossAI
         switch (action)
         {
             case ACTION_START_OUTRO:
-                events.ScheduleEvent(EVENT_OUTRO_START, Seconds(1));
+                events.ScheduleEvent(EVENT_OUTRO_START, 1s);
                 break;
             case ACTION_ENRAGE:
                 _isEnraged = true;
@@ -361,8 +361,8 @@ struct boss_kalecgos_human : public ScriptedAI
         if (Creature* sath = _instance->GetCreature(DATA_SATHROVARR))
             _sathGUID = sath->GetGUID();
 
-        _events.ScheduleEvent(EVENT_REVITALIZE, Seconds(5));
-        _events.ScheduleEvent(EVENT_HEROIC_STRIKE, Seconds(3));
+        _events.ScheduleEvent(EVENT_REVITALIZE, 5s);
+        _events.ScheduleEvent(EVENT_HEROIC_STRIKE, 3s);
     }
 
     void JustDied(Unit* /*killer*/) override
@@ -456,10 +456,10 @@ struct boss_sathrovarr : public BossAI
         _isEnraged = false;
         _isBanished = false;
         _Reset();
-        events.ScheduleEvent(EVENT_SHADOWBOLT, Seconds(7), Seconds(10));
-        events.ScheduleEvent(EVENT_AGONY_CURSE, Seconds(20));
-        events.ScheduleEvent(EVENT_CORRUPTION_STRIKE, Seconds(13));
-        events.ScheduleEvent(EVENT_CHECK_TIMER, Seconds(1));
+        events.ScheduleEvent(EVENT_SHADOWBOLT, 7s, 10s);
+        events.ScheduleEvent(EVENT_AGONY_CURSE, 20s);
+        events.ScheduleEvent(EVENT_CORRUPTION_STRIKE, 13s);
+        events.ScheduleEvent(EVENT_CHECK_TIMER, 1s);
     }
 
     void JustEngagedWith(Unit* /*who*/) override
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index 1dfbce63c42..ee33327a754 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -117,11 +117,11 @@ class boss_akilzon : public CreatureScript
             {
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_STATIC_DISRUPTION, urand(10000, 20000)); // 10 to 20 seconds (bosskillers)
-                events.ScheduleEvent(EVENT_GUST_OF_WIND, urand(20000, 30000));      // 20 to 30 seconds(bosskillers)
-                events.ScheduleEvent(EVENT_CALL_LIGHTNING, urand(10000, 20000));    // totaly random timer. can't find any info on this
-                events.ScheduleEvent(EVENT_ELECTRICAL_STORM, 60000);                // 60 seconds(bosskillers)
-                events.ScheduleEvent(EVENT_RAIN, urand(47000, 52000));
+                events.ScheduleEvent(EVENT_STATIC_DISRUPTION, 10s, 20s); // 10 to 20 seconds (bosskillers)
+                events.ScheduleEvent(EVENT_GUST_OF_WIND, 20s, 30s);      // 20 to 30 seconds(bosskillers)
+                events.ScheduleEvent(EVENT_CALL_LIGHTNING, 10s, 20s);    // totaly random timer. can't find any info on this
+                events.ScheduleEvent(EVENT_ELECTRICAL_STORM, 1min);                // 60 seconds(bosskillers)
+                events.ScheduleEvent(EVENT_RAIN, 47s, 52s);
                 events.ScheduleEvent(EVENT_ENRAGE, 10*MINUTE*IN_MILLISECONDS);      // 10 minutes till enrage(bosskillers)
 
                 Talk(SAY_AGGRO);
@@ -212,7 +212,7 @@ class boss_akilzon : public CreatureScript
                 if (StormCount > 10)
                 {
                     StormCount = 0; // finish
-                    events.ScheduleEvent(EVENT_SUMMON_EAGLES, 5000);
+                    events.ScheduleEvent(EVENT_SUMMON_EAGLES, 5s);
                     me->InterruptNonMeleeSpells(false);
                     CloudGUID.Clear();
                     if (Cloud)
@@ -220,7 +220,7 @@ class boss_akilzon : public CreatureScript
                     SetWeather(WEATHER_STATE_FINE, 0.0f);
                     isRaining = false;
                 }
-                events.ScheduleEvent(EVENT_STORM_SEQUENCE, 1000);
+                events.ScheduleEvent(EVENT_STORM_SEQUENCE, 1s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -246,7 +246,7 @@ class boss_akilzon : public CreatureScript
                             }
                             /*if (float dist = me->IsWithinDist3d(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 5.0f) dist = 5.0f;
                             SDisruptAOEVisual_Timer = 1000 + floor(dist / 30 * 1000.0f);*/
-                            events.ScheduleEvent(EVENT_STATIC_DISRUPTION, urand(10000, 18000));
+                            events.ScheduleEvent(EVENT_STATIC_DISRUPTION, 10s, 18s);
                             break;
                             }
                         case EVENT_GUST_OF_WIND:
@@ -256,12 +256,12 @@ class boss_akilzon : public CreatureScript
                                     target = me->GetVictim();
                                 if (target)
                                     DoCast(target, SPELL_GUST_OF_WIND);
-                                events.ScheduleEvent(EVENT_GUST_OF_WIND, urand(20000, 30000));
+                                events.ScheduleEvent(EVENT_GUST_OF_WIND, 20s, 30s);
                                 break;
                             }
                         case EVENT_CALL_LIGHTNING:
                             DoCastVictim(SPELL_CALL_LIGHTNING);
-                            events.ScheduleEvent(EVENT_CALL_LIGHTNING, urand(12000, 17000)); // totaly random timer. can't find any info on this
+                            events.ScheduleEvent(EVENT_CALL_LIGHTNING, 12s, 17s); // totaly random timer. can't find any info on this
                             break;
                         case EVENT_ELECTRICAL_STORM:
                             {
@@ -297,8 +297,8 @@ class boss_akilzon : public CreatureScript
                                         Cloud->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                                     }
                                 StormCount = 1;
-                                events.ScheduleEvent(EVENT_ELECTRICAL_STORM, 60000); // 60 seconds(bosskillers)
-                                events.ScheduleEvent(EVENT_RAIN, urand(47000, 52000));
+                                events.ScheduleEvent(EVENT_ELECTRICAL_STORM, 1min); // 60 seconds(bosskillers)
+                                events.ScheduleEvent(EVENT_RAIN, 47s, 52s);
                                 break;
                             }
                         case EVENT_RAIN:
@@ -308,7 +308,7 @@ class boss_akilzon : public CreatureScript
                                 isRaining = true;
                             }
                             else
-                                events.ScheduleEvent(EVENT_RAIN, 1000);
+                                events.ScheduleEvent(EVENT_RAIN, 1s);
                             break;
                         case EVENT_STORM_SEQUENCE:
                             {
@@ -355,7 +355,7 @@ class boss_akilzon : public CreatureScript
                         case EVENT_ENRAGE:
                              Talk(SAY_ENRAGE);
                              DoCast(me, SPELL_BERSERK, true);
-                            events.ScheduleEvent(EVENT_ENRAGE, 600000);
+                            events.ScheduleEvent(EVENT_ENRAGE, 10min);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
index 54cac735a1e..c7883e1f03f 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
@@ -138,7 +138,7 @@ class boss_arlokk : public CreatureScript
                 _JustEngagedWith();
                 events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(7000, 9000), 0, PHASE_ONE);
                 events.ScheduleEvent(EVENT_GOUGE, urand(12000, 15000), 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_SUMMON_PROWLERS, 6000, 0, PHASE_ALL);
+                events.ScheduleEvent(EVENT_SUMMON_PROWLERS, 6s, 0, PHASE_ALL);
                 events.ScheduleEvent(EVENT_MARK_OF_ARLOKK, urand(9000, 11000), 0, PHASE_ALL);
                 events.ScheduleEvent(EVENT_TRANSFORM, urand(15000, 20000), 0, PHASE_ONE);
                 Talk(SAY_AGGRO);
@@ -223,7 +223,7 @@ class boss_arlokk : public CreatureScript
                                     ++_summonCountB;
                                 }
                             }
-                            events.ScheduleEvent(EVENT_SUMMON_PROWLERS, 6000, 0, PHASE_ALL);
+                            events.ScheduleEvent(EVENT_SUMMON_PROWLERS, 6s, 0, PHASE_ALL);
                             break;
                         case EVENT_MARK_OF_ARLOKK:
                         {
@@ -255,7 +255,7 @@ class boss_arlokk : public CreatureScript
                             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
                             DoCast(me, SPELL_VANISH_VISUAL);
                             DoCast(me, SPELL_VANISH);
-                            events.ScheduleEvent(EVENT_VANISH, 1000, 0, PHASE_ONE);
+                            events.ScheduleEvent(EVENT_VANISH, 1s, 0, PHASE_ONE);
                             break;
                         }
                         case EVENT_VANISH:
@@ -372,7 +372,7 @@ class npc_zulian_prowler : public CreatureScript
 
                 if (Unit* arlokk = ObjectAccessor::GetUnit(*me, _instance->GetGuidData(NPC_ARLOKK)))
                     me->GetMotionMaster()->MovePoint(0, arlokk->GetPositionX(), arlokk->GetPositionY(), arlokk->GetPositionZ());
-                _events.ScheduleEvent(EVENT_ATTACK, 6000);
+                _events.ScheduleEvent(EVENT_ATTACK, 6s);
             }
 
             void JustEngagedWith(Unit* /*who*/) override
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
index e3d354cbfef..df6870b33d5 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
@@ -63,9 +63,9 @@ class boss_gahzranka : public CreatureScript // gahzranka
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_FROSTBREATH, 8000);
-                events.ScheduleEvent(EVENT_MASSIVEGEYSER, 25000);
-                events.ScheduleEvent(EVENT_SLAM, 17000);
+                events.ScheduleEvent(EVENT_FROSTBREATH, 8s);
+                events.ScheduleEvent(EVENT_MASSIVEGEYSER, 25s);
+                events.ScheduleEvent(EVENT_SLAM, 15s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -84,15 +84,15 @@ class boss_gahzranka : public CreatureScript // gahzranka
                     {
                         case EVENT_FROSTBREATH:
                             DoCastVictim(SPELL_FROSTBREATH, true);
-                            events.ScheduleEvent(EVENT_FROSTBREATH, urand(7000, 11000));
+                            events.ScheduleEvent(EVENT_FROSTBREATH, 7s, 11s);
                             break;
                         case EVENT_MASSIVEGEYSER:
                             DoCastVictim(SPELL_MASSIVEGEYSER, true);
-                            events.ScheduleEvent(EVENT_MASSIVEGEYSER, urand(22000, 32000));
+                            events.ScheduleEvent(EVENT_MASSIVEGEYSER, 22s, 32s);
                             break;
                         case EVENT_SLAM:
                             DoCastVictim(SPELL_SLAM, true);
-                            events.ScheduleEvent(EVENT_SLAM, urand(12000, 20000));
+                            events.ScheduleEvent(EVENT_SLAM, 12s, 20s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
index dc125e5aead..25874441307 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
@@ -61,8 +61,8 @@ class boss_grilek : public CreatureScript // grilek
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_AVATAR, urand(15000, 25000));
-                events.ScheduleEvent(EVENT_GROUND_TREMOR, urand(15000, 25000));
+                events.ScheduleEvent(EVENT_AVATAR, 15s, 25s);
+                events.ScheduleEvent(EVENT_GROUND_TREMOR, 15s, 25s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -89,11 +89,11 @@ class boss_grilek : public CreatureScript // grilek
 
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                                 AttackStart(target);
-                            events.ScheduleEvent(EVENT_AVATAR, urand(25000, 35000));
+                            events.ScheduleEvent(EVENT_AVATAR, 25s, 35s);
                             break;
                         case EVENT_GROUND_TREMOR:
                             DoCastVictim(SPELL_GROUND_TREMOR, true);
-                            events.ScheduleEvent(EVENT_GROUND_TREMOR, urand(12000, 16000));
+                            events.ScheduleEvent(EVENT_GROUND_TREMOR, 12s, 16s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
index 707e998d15c..8a1691491d0 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
@@ -87,21 +87,21 @@ class boss_hakkar : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_BLOOD_SIPHON, 90000);
-                events.ScheduleEvent(EVENT_CORRUPTED_BLOOD, 25000);
-                events.ScheduleEvent(EVENT_CAUSE_INSANITY, 17000);
-                events.ScheduleEvent(EVENT_WILL_OF_HAKKAR, 17000);
-                events.ScheduleEvent(EVENT_ENRAGE, 600000);
+                events.ScheduleEvent(EVENT_BLOOD_SIPHON, 90s);
+                events.ScheduleEvent(EVENT_CORRUPTED_BLOOD, 25s);
+                events.ScheduleEvent(EVENT_CAUSE_INSANITY, 15s);
+                events.ScheduleEvent(EVENT_WILL_OF_HAKKAR, 15s);
+                events.ScheduleEvent(EVENT_ENRAGE, 10min);
                 if (instance->GetBossState(DATA_JEKLIK) != DONE)
-                    events.ScheduleEvent(EVENT_ASPECT_OF_JEKLIK, 4000);
+                    events.ScheduleEvent(EVENT_ASPECT_OF_JEKLIK, 4s);
                 if (instance->GetBossState(DATA_VENOXIS) != DONE)
-                    events.ScheduleEvent(EVENT_ASPECT_OF_VENOXIS, 7000);
+                    events.ScheduleEvent(EVENT_ASPECT_OF_VENOXIS, 7s);
                 if (instance->GetBossState(DATA_MARLI) != DONE)
-                    events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 12000);
+                    events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 12s);
                 if (instance->GetBossState(DATA_THEKAL) != DONE)
-                    events.ScheduleEvent(EVENT_ASPECT_OF_THEKAL, 8000);
+                    events.ScheduleEvent(EVENT_ASPECT_OF_THEKAL, 8s);
                 if (instance->GetBossState(DATA_ARLOKK) != DONE)
-                    events.ScheduleEvent(EVENT_ASPECT_OF_ARLOKK, 18000);
+                    events.ScheduleEvent(EVENT_ASPECT_OF_ARLOKK, 18s);
                 Talk(SAY_AGGRO);
             }
 
@@ -121,44 +121,44 @@ class boss_hakkar : public CreatureScript
                     {
                         case EVENT_BLOOD_SIPHON:
                             DoCastVictim(SPELL_BLOOD_SIPHON, true);
-                            events.ScheduleEvent(EVENT_BLOOD_SIPHON, 90000);
+                            events.ScheduleEvent(EVENT_BLOOD_SIPHON, 90s);
                             break;
                         case EVENT_CORRUPTED_BLOOD:
                             DoCastVictim(SPELL_CORRUPTED_BLOOD, true);
-                            events.ScheduleEvent(EVENT_CORRUPTED_BLOOD, urand(30000, 45000));
+                            events.ScheduleEvent(EVENT_CORRUPTED_BLOOD, 30s, 45s);
                             break;
                         case EVENT_CAUSE_INSANITY:
                             // DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_CAUSE_INSANITY);
-                            // events.ScheduleEvent(EVENT_CAUSE_INSANITY, urand(35000, 45000));
+                            // events.ScheduleEvent(EVENT_CAUSE_INSANITY, 35s, 45s);
                             break;
                         case EVENT_WILL_OF_HAKKAR:
                             DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_WILL_OF_HAKKAR);
-                            events.ScheduleEvent(EVENT_WILL_OF_HAKKAR, urand(25000, 35000));
+                            events.ScheduleEvent(EVENT_WILL_OF_HAKKAR, 25s, 35s);
                             break;
                         case EVENT_ENRAGE:
                             if (!me->HasAura(SPELL_ENRAGE))
                                 DoCast(me, SPELL_ENRAGE);
-                            events.ScheduleEvent(EVENT_ENRAGE, 90000);
+                            events.ScheduleEvent(EVENT_ENRAGE, 90s);
                             break;
                         case EVENT_ASPECT_OF_JEKLIK:
                             DoCastVictim(SPELL_ASPECT_OF_JEKLIK, true);
-                            events.ScheduleEvent(EVENT_ASPECT_OF_JEKLIK, urand(10000, 14000));
+                            events.ScheduleEvent(EVENT_ASPECT_OF_JEKLIK, 10s, 14s);
                             break;
                         case EVENT_ASPECT_OF_VENOXIS:
                             DoCastVictim(SPELL_ASPECT_OF_VENOXIS, true);
-                            events.ScheduleEvent(EVENT_ASPECT_OF_VENOXIS, 8000);
+                            events.ScheduleEvent(EVENT_ASPECT_OF_VENOXIS, 8s);
                             break;
                         case EVENT_ASPECT_OF_MARLI:
                             DoCastVictim(SPELL_ASPECT_OF_MARLI, true);
-                            events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 10000);
+                            events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 10s);
                             break;
                         case EVENT_ASPECT_OF_THEKAL:
                             DoCastVictim(SPELL_ASPECT_OF_THEKAL, true);
-                            events.ScheduleEvent(EVENT_ASPECT_OF_THEKAL, 15000);
+                            events.ScheduleEvent(EVENT_ASPECT_OF_THEKAL, 15s);
                             break;
                         case EVENT_ASPECT_OF_ARLOKK:
                             DoCastVictim(SPELL_ASPECT_OF_ARLOKK, true);
-                            events.ScheduleEvent(EVENT_ASPECT_OF_ARLOKK, urand(10000, 15000));
+                            events.ScheduleEvent(EVENT_ASPECT_OF_ARLOKK, 10s, 15s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
index f673247b779..d9dddb81ad4 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
@@ -63,9 +63,9 @@ class boss_hazzarah : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_MANABURN, urand(4000, 10000));
-                events.ScheduleEvent(EVENT_SLEEP, urand(10000, 18000));
-                events.ScheduleEvent(EVENT_ILLUSIONS, urand(10000, 18000));
+                events.ScheduleEvent(EVENT_MANABURN, 4s, 10s);
+                events.ScheduleEvent(EVENT_SLEEP, 10s, 18s);
+                events.ScheduleEvent(EVENT_ILLUSIONS, 10s, 18s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -84,11 +84,11 @@ class boss_hazzarah : public CreatureScript
                     {
                         case EVENT_MANABURN:
                             DoCastVictim(SPELL_MANABURN, true);
-                            events.ScheduleEvent(EVENT_MANABURN, urand(8000, 16000));
+                            events.ScheduleEvent(EVENT_MANABURN, 8s, 16s);
                             break;
                         case EVENT_SLEEP:
                             DoCastVictim(SPELL_SLEEP, true);
-                            events.ScheduleEvent(EVENT_SLEEP, urand(12000, 20000));
+                            events.ScheduleEvent(EVENT_SLEEP, 12s, 20s);
                             break;
                         case EVENT_ILLUSIONS:
                             // We will summon 3 illusions that will spawn on a random gamer and attack this gamer
@@ -99,7 +99,7 @@ class boss_hazzarah : public CreatureScript
                                     if (Creature* Illusion = me->SummonCreature(NPC_NIGHTMARE_ILLUSION, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000))
                                         Illusion->AI()->AttackStart(target);
                             }
-                            events.ScheduleEvent(EVENT_ILLUSIONS, urand(15000, 25000));
+                            events.ScheduleEvent(EVENT_ILLUSIONS, 15s, 25s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
index 8773f347188..fa901495833 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
@@ -102,10 +102,10 @@ class boss_jeklik : public CreatureScript
                 Talk(SAY_AGGRO);
                 events.SetPhase(PHASE_ONE);
 
-                events.ScheduleEvent(EVENT_CHARGE_JEKLIK, 20000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_SONIC_BURST, 8000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_SCREECH, 13000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_SPAWN_BATS, 60000, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_CHARGE_JEKLIK, 20s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_SONIC_BURST, 8s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_SCREECH, 13s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_SPAWN_BATS, 60s, 0, PHASE_ONE);
 
                 me->SetCanFly(true);
                 DoCast(me, SPELL_BAT_FORM);
@@ -119,11 +119,11 @@ class boss_jeklik : public CreatureScript
                     me->SetCanFly(false);
                     ResetThreatList();
                     events.SetPhase(PHASE_TWO);
-                    events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 6000, 0, PHASE_TWO);
-                    events.ScheduleEvent(EVENT_MIND_FLAY, 11000, 0, PHASE_TWO);
-                    events.ScheduleEvent(EVENT_CHAIN_MIND_FLAY, 26000, 0, PHASE_TWO);
-                    events.ScheduleEvent(EVENT_GREATER_HEAL, 50000, 0, PHASE_TWO);
-                    events.ScheduleEvent(EVENT_SPAWN_FLYING_BATS, 10000, 0, PHASE_TWO);
+                    events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 6s, 0, PHASE_TWO);
+                    events.ScheduleEvent(EVENT_MIND_FLAY, 11s, 0, PHASE_TWO);
+                    events.ScheduleEvent(EVENT_CHAIN_MIND_FLAY, 26s, 0, PHASE_TWO);
+                    events.ScheduleEvent(EVENT_GREATER_HEAL, 50s, 0, PHASE_TWO);
+                    events.ScheduleEvent(EVENT_SPAWN_FLYING_BATS, 10s, 0, PHASE_TWO);
                     return;
                 }
             }
@@ -163,7 +163,7 @@ class boss_jeklik : public CreatureScript
                                 for (uint8 i = 0; i < 6; ++i)
                                     if (Creature* bat = me->SummonCreature(NPC_BLOODSEEKER_BAT, SpawnBat[i], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000))
                                         bat->AI()->AttackStart(target);
-                            events.ScheduleEvent(EVENT_SPAWN_BATS, 60000, 0, PHASE_ONE);
+                            events.ScheduleEvent(EVENT_SPAWN_BATS, 1min, 0, PHASE_ONE);
                             break;
                         case EVENT_SHADOW_WORD_PAIN:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
@@ -172,7 +172,7 @@ class boss_jeklik : public CreatureScript
                             break;
                         case EVENT_MIND_FLAY:
                             DoCastVictim(SPELL_MIND_FLAY);
-                            events.ScheduleEvent(EVENT_MIND_FLAY, 16000, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_MIND_FLAY, 16s, 0, PHASE_TWO);
                             break;
                         case EVENT_CHAIN_MIND_FLAY:
                             me->InterruptNonMeleeSpells(false);
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
index 510ce1938cd..e724c333d8e 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
@@ -90,11 +90,11 @@ class boss_jindo : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_BRAIN_WASH_TOTEM, 20000);
-                events.ScheduleEvent(EVENT_POWERFULL_HEALING_WARD, 16000);
-                events.ScheduleEvent(EVENT_HEX, 8000);
-                events.ScheduleEvent(EVENT_DELUSIONS_OF_JINDO, 10000);
-                events.ScheduleEvent(EVENT_TELEPORT, 5000);
+                events.ScheduleEvent(EVENT_BRAIN_WASH_TOTEM, 20s);
+                events.ScheduleEvent(EVENT_POWERFULL_HEALING_WARD, 15s);
+                events.ScheduleEvent(EVENT_HEX, 8s);
+                events.ScheduleEvent(EVENT_DELUSIONS_OF_JINDO, 10s);
+                events.ScheduleEvent(EVENT_TELEPORT, 5s);
                 Talk(SAY_AGGRO);
             }
 
@@ -114,11 +114,11 @@ class boss_jindo : public CreatureScript
                     {
                         case EVENT_BRAIN_WASH_TOTEM:
                             DoCast(me, SPELL_BRAIN_WASH_TOTEM);
-                            events.ScheduleEvent(EVENT_BRAIN_WASH_TOTEM, urand(18000, 26000));
+                            events.ScheduleEvent(EVENT_BRAIN_WASH_TOTEM, 18s, 26s);
                             break;
                         case EVENT_POWERFULL_HEALING_WARD:
                             DoCast(me, SPELL_POWERFULL_HEALING_WARD);
-                            events.ScheduleEvent(EVENT_POWERFULL_HEALING_WARD, urand(14000, 20000));
+                            events.ScheduleEvent(EVENT_POWERFULL_HEALING_WARD, 14s, 20s);
                             break;
                         case EVENT_HEX:
                             if (Unit* target = me->GetVictim())
@@ -127,7 +127,7 @@ class boss_jindo : public CreatureScript
                                 if (GetThreat(target))
                                     ModifyThreatByPercent(target, -80);
                             }
-                            events.ScheduleEvent(EVENT_HEX, urand(12000, 20000));
+                            events.ScheduleEvent(EVENT_HEX, 12s, 20s);
                             break;
                         case EVENT_DELUSIONS_OF_JINDO:
                             // Casting the delusion curse with a shade so shade will attack the same target with the curse.
@@ -136,7 +136,7 @@ class boss_jindo : public CreatureScript
                                 DoCast(target, SPELL_SHADE_OF_JINDO, true);
                                 DoCast(target, SPELL_DELUSIONS_OF_JINDO);
                             }
-                            events.ScheduleEvent(EVENT_DELUSIONS_OF_JINDO, urand(4000, 12000));
+                            events.ScheduleEvent(EVENT_DELUSIONS_OF_JINDO, 4s, 12s);
                             break;
                         case EVENT_TELEPORT:
                             // Teleports a random player and spawns 9 Sacrificed Trolls to attack player
@@ -151,7 +151,7 @@ class boss_jindo : public CreatureScript
                                     if (Creature* SacrificedTroll = me->SummonCreature(NPC_SACRIFICED_TROLL, Formation[i].GetPositionX(), Formation[i].GetPositionY(), Formation[i].GetPositionZ(), Formation[i].GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000))
                                         SacrificedTroll->AI()->AttackStart(target);
                             }
-                            events.ScheduleEvent(EVENT_TELEPORT, urand(15000, 23000));
+                            events.ScheduleEvent(EVENT_TELEPORT, 15s, 23s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
index 1768773dcf9..3f48aea76cf 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -131,7 +131,7 @@ class boss_mandokir : public CreatureScript
                     _Reset();
                     Initialize();
                     me->SetImmuneToAll(true);
-                    events.ScheduleEvent(EVENT_CHECK_START, 1000);
+                    events.ScheduleEvent(EVENT_CHECK_START, 1s);
                     if (Creature* speaker = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_VILEBRANCH_SPEAKER)))
                         if (!speaker->IsAlive())
                             speaker->Respawn(true);
@@ -158,11 +158,11 @@ class boss_mandokir : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_OVERPOWER, urand(7000, 9000));
-                events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(12000, 18000));
-                events.ScheduleEvent(EVENT_WHIRLWIND, urand(24000, 30000));
-                events.ScheduleEvent(EVENT_WATCH_PLAYER, urand(13000, 15000));
-                events.ScheduleEvent(EVENT_CHARGE_PLAYER, urand(33000, 38000));
+                events.ScheduleEvent(EVENT_OVERPOWER, 7s, 9s);
+                events.ScheduleEvent(EVENT_MORTAL_STRIKE, 12s, 18s);
+                events.ScheduleEvent(EVENT_WHIRLWIND, 24s, 30s);
+                events.ScheduleEvent(EVENT_WATCH_PLAYER, 13s, 15s);
+                events.ScheduleEvent(EVENT_CHARGE_PLAYER, 33s, 38s);
                 me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
                 Talk(SAY_AGGRO);
                 me->Dismount();
@@ -232,10 +232,10 @@ class boss_mandokir : public CreatureScript
                                     if (instance->GetBossState(DATA_MANDOKIR) == SPECIAL)
                                     {
                                         me->GetMotionMaster()->MovePoint(0, PosMandokir[1].m_positionX, PosMandokir[1].m_positionY, PosMandokir[1].m_positionZ);
-                                        events.ScheduleEvent(EVENT_STARTED, 6000);
+                                        events.ScheduleEvent(EVENT_STARTED, 6s);
                                     }
                                     else
-                                        events.ScheduleEvent(EVENT_CHECK_START, 1000);
+                                        events.ScheduleEvent(EVENT_CHECK_START, 1s);
                                     break;
                                 case EVENT_STARTED:
                                     me->SetImmuneToAll(false);
@@ -258,16 +258,16 @@ class boss_mandokir : public CreatureScript
                     {
                         case EVENT_OVERPOWER:
                             DoCastVictim(SPELL_OVERPOWER, true);
-                            events.ScheduleEvent(EVENT_OVERPOWER, urand(6000, 12000));
+                            events.ScheduleEvent(EVENT_OVERPOWER, 6s, 12s);
                             break;
                         case EVENT_MORTAL_STRIKE:
                             if (me->GetVictim() && me->EnsureVictim()->HealthBelowPct(50))
                                 DoCastVictim(SPELL_MORTAL_STRIKE, true);
-                            events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(12000, 18000));
+                            events.ScheduleEvent(EVENT_MORTAL_STRIKE, 12s, 18s);
                             break;
                         case EVENT_WHIRLWIND:
                             DoCast(me, SPELL_WHIRLWIND);
-                            events.ScheduleEvent(EVENT_WHIRLWIND, urand(22000, 26000));
+                            events.ScheduleEvent(EVENT_WHIRLWIND, 22s, 26s);
                             break;
                         case EVENT_WATCH_PLAYER:
                             if (Unit* player = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
@@ -275,11 +275,11 @@ class boss_mandokir : public CreatureScript
                                 DoCast(player, SPELL_WATCH);
                                 Talk(SAY_WATCH, player);
                             }
-                            events.ScheduleEvent(EVENT_WATCH_PLAYER, urand(12000, 15000));
+                            events.ScheduleEvent(EVENT_WATCH_PLAYER, 12s, 15s);
                             break;
                         case EVENT_CHARGE_PLAYER:
                             DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true), SPELL_CHARGE);
-                            events.ScheduleEvent(EVENT_CHARGE_PLAYER, urand(22000, 30000));
+                            events.ScheduleEvent(EVENT_CHARGE_PLAYER, 22s, 30s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
index 5cd5d52aada..29a0da8a379 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
@@ -101,7 +101,7 @@ class boss_marli : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_SPAWN_START_SPIDERS, 1000, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_SPAWN_START_SPIDERS, 1s, 0, PHASE_ONE);
                 Talk(SAY_AGGRO);
             }
 
@@ -127,16 +127,16 @@ class boss_marli : public CreatureScript
                                     if (Creature* spider = me->SummonCreature(NPC_SPIDER, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000))
                                         spider->AI()->AttackStart(target);
                             }
-                            events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 12000, 0, PHASE_TWO);
-                            events.ScheduleEvent(EVENT_TRANSFORM, 45000, 0, PHASE_TWO);
-                            events.ScheduleEvent(EVENT_POISON_VOLLEY, 15000);
-                            events.ScheduleEvent(EVENT_SPAWN_SPIDER, 30000);
-                            events.ScheduleEvent(EVENT_TRANSFORM, 45000, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 12s, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_TRANSFORM, 45s, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_POISON_VOLLEY, 15s);
+                            events.ScheduleEvent(EVENT_SPAWN_SPIDER, 30s);
+                            events.ScheduleEvent(EVENT_TRANSFORM, 45s, 0, PHASE_TWO);
                             events.SetPhase(PHASE_TWO);
                             break;
                         case EVENT_POISON_VOLLEY:
                             DoCastVictim(SPELL_POISON_VOLLEY, true);
-                            events.ScheduleEvent(EVENT_POISON_VOLLEY, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_POISON_VOLLEY, 10s, 20s);
                             break;
                         case EVENT_ASPECT_OF_MARLI:
                             DoCastVictim(SPELL_ASPECT_OF_MARLI, true);
@@ -146,7 +146,7 @@ class boss_marli : public CreatureScript
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 if (Creature* spider = me->SummonCreature(NPC_SPIDER, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000))
                                     spider->AI()->AttackStart(target);
-                            events.ScheduleEvent(EVENT_SPAWN_SPIDER, urand(12000, 17000));
+                            events.ScheduleEvent(EVENT_SPAWN_SPIDER, 12s, 17s);
                             break;
                         case EVENT_TRANSFORM:
                         {
@@ -162,8 +162,8 @@ class boss_marli : public CreatureScript
                             DoCastVictim(SPELL_ENVOLWINGWEB);
                             if (GetThreat(me->GetVictim()))
                                 ModifyThreatByPercent(me->GetVictim(), -100);
-                            events.ScheduleEvent(EVENT_CHARGE_PLAYER, 1500, 0, PHASE_THREE);
-                            events.ScheduleEvent(EVENT_TRANSFORM_BACK, 25000, 0, PHASE_THREE);
+                            events.ScheduleEvent(EVENT_CHARGE_PLAYER, 1500ms, 0, PHASE_THREE);
+                            events.ScheduleEvent(EVENT_TRANSFORM_BACK, 25s, 0, PHASE_THREE);
                             events.SetPhase(PHASE_THREE);
                             break;
                         }
@@ -182,7 +182,7 @@ class boss_marli : public CreatureScript
                                 DoCast(target, SPELL_CHARGE);
                                 AttackStart(target);
                             }
-                            events.ScheduleEvent(EVENT_CHARGE_PLAYER, 8000, 0, PHASE_THREE);
+                            events.ScheduleEvent(EVENT_CHARGE_PLAYER, 8s, 0, PHASE_THREE);
                             break;
                         }
                         case EVENT_TRANSFORM_BACK:
@@ -195,10 +195,10 @@ class boss_marli : public CreatureScript
                             me->UpdateDamagePhysical(BASE_ATTACK);
                             */
                             me->ApplyStatPctModifier(UNIT_MOD_DAMAGE_MAINHAND, TOTAL_PCT, DamageDecrease); // hack
-                            events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 12000, 0, PHASE_TWO);
-                            events.ScheduleEvent(EVENT_TRANSFORM, 45000, 0, PHASE_TWO);
-                            events.ScheduleEvent(EVENT_POISON_VOLLEY, 15000);
-                            events.ScheduleEvent(EVENT_SPAWN_SPIDER, 30000);
+                            events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, 12s, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_TRANSFORM, 45s, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_POISON_VOLLEY, 15s);
+                            events.ScheduleEvent(EVENT_SPAWN_SPIDER, 30s);
                             events.ScheduleEvent(EVENT_TRANSFORM, urand(35000, 60000), 0, PHASE_TWO);
                             events.SetPhase(PHASE_TWO);
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
index f45d31f02af..9e1a6883bef 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
@@ -123,10 +123,10 @@ class boss_thekal : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_MORTALCLEAVE, 4000, 0, PHASE_ONE);     // Phase 1
-                events.ScheduleEvent(EVENT_SILENCE, 9000, 0, PHASE_ONE);          // Phase 1
-                events.ScheduleEvent(EVENT_CHECK_TIMER, 10000, 0, PHASE_ONE);     // Phase 1
-                events.ScheduleEvent(EVENT_RESURRECT_TIMER, 10000, 0, PHASE_ONE); // Phase 1
+                events.ScheduleEvent(EVENT_MORTALCLEAVE, 4s, 0, PHASE_ONE);     // Phase 1
+                events.ScheduleEvent(EVENT_SILENCE, 9s, 0, PHASE_ONE);          // Phase 1
+                events.ScheduleEvent(EVENT_CHECK_TIMER, 10s, 0, PHASE_ONE);     // Phase 1
+                events.ScheduleEvent(EVENT_RESURRECT_TIMER, 10s, 0, PHASE_ONE); // Phase 1
                 Talk(SAY_AGGRO);
             }
 
@@ -173,14 +173,14 @@ class boss_thekal : public CreatureScript
                                 */
                                 me->ApplyStatPctModifier(UNIT_MOD_DAMAGE_MAINHAND, TOTAL_PCT, DamageIncrease); // hack
                                 ResetThreatList();
-                                events.ScheduleEvent(EVENT_FRENZY, 30000, 0, PHASE_TWO);          // Phase 2
-                                events.ScheduleEvent(EVENT_FORCEPUNCH, 4000, 0, PHASE_TWO);       // Phase 2
-                                events.ScheduleEvent(EVENT_SPELL_CHARGE, 12000, 0, PHASE_TWO);    // Phase 2
-                                events.ScheduleEvent(EVENT_ENRAGE, 32000, 0, PHASE_TWO);          // Phase 2
-                                events.ScheduleEvent(EVENT_SUMMONTIGERS, 25000, 0, PHASE_TWO);    // Phase 2
+                                events.ScheduleEvent(EVENT_FRENZY, 30s, 0, PHASE_TWO);          // Phase 2
+                                events.ScheduleEvent(EVENT_FORCEPUNCH, 4s, 0, PHASE_TWO);       // Phase 2
+                                events.ScheduleEvent(EVENT_SPELL_CHARGE, 12s, 0, PHASE_TWO);    // Phase 2
+                                events.ScheduleEvent(EVENT_ENRAGE, 32s, 0, PHASE_TWO);          // Phase 2
+                                events.ScheduleEvent(EVENT_SUMMONTIGERS, 25s, 0, PHASE_TWO);    // Phase 2
                                 events.SetPhase(PHASE_TWO);
                             }
-                            events.ScheduleEvent(EVENT_RESURRECT_TIMER, 10000, 0, PHASE_ONE);
+                            events.ScheduleEvent(EVENT_RESURRECT_TIMER, 10s, 0, PHASE_ONE);
                             break;
                         case EVENT_CHECK_TIMER:
                             //Check_Timer for the death of LorKhan and Zath.
@@ -212,11 +212,11 @@ class boss_thekal : public CreatureScript
                                     }
                                 }
                             }
-                            events.ScheduleEvent(EVENT_CHECK_TIMER, 5000, 0, PHASE_ONE);
+                            events.ScheduleEvent(EVENT_CHECK_TIMER, 5s, 0, PHASE_ONE);
                             break;
                         case EVENT_FRENZY:
                             DoCast(me, SPELL_FRENZY);
-                            events.ScheduleEvent(EVENT_FRENZY, 30000, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_FRENZY, 30s, 0, PHASE_TWO);
                             break;
                         case EVENT_FORCEPUNCH:
                             DoCastVictim(SPELL_FORCEPUNCH, true);
@@ -237,7 +237,7 @@ class boss_thekal : public CreatureScript
                                 DoCast(me, SPELL_ENRAGE);
                                 Enraged = true;
                             }
-                            events.ScheduleEvent(EVENT_ENRAGE, 30000);
+                            events.ScheduleEvent(EVENT_ENRAGE, 30s);
                             break;
                         case EVENT_SUMMONTIGERS:
                             DoCastVictim(SPELL_SUMMONTIGERS, true);
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
index 069c3669b0c..7375c69884f 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
@@ -125,13 +125,13 @@ class boss_venoxis : public CreatureScript
                 _JustEngagedWith();
                 me->SetReactState(REACT_AGGRESSIVE);
                 // Always running events
-                events.ScheduleEvent(EVENT_THRASH, 5000);
+                events.ScheduleEvent(EVENT_THRASH, 5s);
                 // Phase one events (regular form)
-                events.ScheduleEvent(EVENT_HOLY_NOVA, 5000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_DISPEL_MAGIC, 35000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_HOLY_FIRE, 10000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_RENEW, 30000, 0, PHASE_ONE);
-                events.ScheduleEvent(EVENT_HOLY_WRATH, 60000, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_HOLY_NOVA, 5s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_DISPEL_MAGIC, 35s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_HOLY_FIRE, 10s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_RENEW, 30s, 0, PHASE_ONE);
+                events.ScheduleEvent(EVENT_HOLY_WRATH, 1min, 0, PHASE_ONE);
 
                 events.SetPhase(PHASE_ONE);
 
@@ -146,13 +146,13 @@ class boss_venoxis : public CreatureScript
                 {
                     _transformed = true;
                     // schedule the event that changes our phase
-                    events.ScheduleEvent(EVENT_TRANSFORM, 100);
+                    events.ScheduleEvent(EVENT_TRANSFORM, 100ms);
                 }
                 // we're losing health, bad, go frenzy
                 else if (!_frenzied && !HealthAbovePct(20))
                 {
                     _frenzied = true;
-                    events.ScheduleEvent(EVENT_FRENZY, 100);
+                    events.ScheduleEvent(EVENT_FRENZY, 100ms);
                 }
             }
 
@@ -174,7 +174,7 @@ class boss_venoxis : public CreatureScript
                         // thrash is available in all phases
                         case EVENT_THRASH:
                             DoCast(me, SPELL_THRASH, true);
-                            events.ScheduleEvent(EVENT_THRASH, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_THRASH, 10s, 20s);
                             break;
                         // troll form spells and Actions (first part)
                         case EVENT_DISPEL_MAGIC:
@@ -230,7 +230,7 @@ class boss_venoxis : public CreatureScript
                         case EVENT_PARASITIC_SERPENT:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM))
                                 DoCast(target, SPELL_SUMMON_PARASITIC_SERPENT);
-                            events.ScheduleEvent(EVENT_PARASITIC_SERPENT, 15000, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_PARASITIC_SERPENT, 15s, 0, PHASE_TWO);
                             break;
                         case EVENT_FRENZY:
                             // frenzy at 20% health
@@ -248,9 +248,9 @@ class boss_venoxis : public CreatureScript
                             ResetThreatList();
 
                             // phase two events (snakeform)
-                            events.ScheduleEvent(EVENT_VENOM_SPIT, 5000, 0, PHASE_TWO);
-                            events.ScheduleEvent(EVENT_POISON_CLOUD, 10000, 0, PHASE_TWO);
-                            events.ScheduleEvent(EVENT_PARASITIC_SERPENT, 30000, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_VENOM_SPIT, 5s, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_POISON_CLOUD, 10s, 0, PHASE_TWO);
+                            events.ScheduleEvent(EVENT_PARASITIC_SERPENT, 30s, 0, PHASE_TWO);
 
                             // transformed, start phase two
                             events.SetPhase(PHASE_TWO);
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
index fdfcaf48190..51be8ea5f3e 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
@@ -61,8 +61,8 @@ class boss_wushoolay : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, urand(5000, 10000));
-                events.ScheduleEvent(EVENT_LIGHTNINGWAVE, urand(8000, 16000));
+                events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, 5s, 10s);
+                events.ScheduleEvent(EVENT_LIGHTNINGWAVE, 8s, 16s);
             }
 
             void UpdateAI(uint32 diff) override
@@ -81,11 +81,11 @@ class boss_wushoolay : public CreatureScript
                     {
                         case EVENT_LIGHTNINGCLOUD:
                             DoCastVictim(SPELL_LIGHTNINGCLOUD, true);
-                            events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, 15s, 20s);
                             break;
                         case EVENT_LIGHTNINGWAVE:
                             DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_LIGHTNINGWAVE);
-                            events.ScheduleEvent(EVENT_LIGHTNINGWAVE, urand(12000, 16000));
+                            events.ScheduleEvent(EVENT_LIGHTNINGWAVE, 12s, 16s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp
index f3a8e575196..5fffe164336 100644
--- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp
@@ -76,7 +76,7 @@ public:
         {
             Talk(YELL_TWILIGHT_CORRUPTOR_AGGRO);
             _events.ScheduleEvent(EVENT_SOUL_CORRUPTION, 15000);
-            _events.ScheduleEvent(EVENT_CREATURE_OF_NIGHTMARE, 30000);
+            _events.ScheduleEvent(EVENT_CREATURE_OF_NIGHTMARE, 30s);
         }
 
         void KilledUnit(Unit* victim) override
@@ -110,7 +110,7 @@ public:
                 {
                     case EVENT_SOUL_CORRUPTION:
                         DoCastAOE(SPELL_SOUL_CORRUPTION);
-                        _events.ScheduleEvent(EVENT_SOUL_CORRUPTION, urand(15000, 19000));
+                        _events.ScheduleEvent(EVENT_SOUL_CORRUPTION, 15s, 19s);
                         break;
                     case EVENT_CREATURE_OF_NIGHTMARE:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
diff --git a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
index 579aa03182a..474c94ccb98 100644
--- a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
@@ -78,7 +78,7 @@ public:
                 damage = 0;
                 me->CombatStop(true);
                 EnterEvadeMode();
-                _events.ScheduleEvent(EVENT_EMOTE_RUDE, Seconds(3));
+                _events.ScheduleEvent(EVENT_EMOTE_RUDE, 3s);
             }
         }
 
@@ -92,22 +92,22 @@ public:
                 {
                     case EVENT_EMOTE_RUDE:
                         me->HandleEmoteCommand(EMOTE_ONESHOT_RUDE);
-                        _events.ScheduleEvent(EVENT_TALK, Seconds(2));
+                        _events.ScheduleEvent(EVENT_TALK, 2s);
                         break;
                     case EVENT_TALK:
                         Talk(SAY_COMPLETE);
-                        _events.ScheduleEvent(EVENT_DRINK, Seconds(5));
+                        _events.ScheduleEvent(EVENT_DRINK, 5s);
                         break;
                     case EVENT_DRINK:
                         if (Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID))
                             player->AreaExploredOrEventHappens(QUEST_590);
                         _playerGUID.Clear();
                         DoCastSelf(SPELL_DRINK);
-                        _events.ScheduleEvent(EVENT_SET_QUESTGIVER_FLAG, Seconds(12));
+                        _events.ScheduleEvent(EVENT_SET_QUESTGIVER_FLAG, 12s);
                         break;
                     case EVENT_SET_QUESTGIVER_FLAG:
                         me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
-                        _events.ScheduleEvent(EVENT_STAND, Seconds(3));
+                        _events.ScheduleEvent(EVENT_STAND, 3s);
                         break;
                     case EVENT_STAND:
                         me->SetStandState(UNIT_STAND_STATE_STAND);
diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp
index c03ec16bfb0..03031998dbb 100644
--- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp
@@ -126,11 +126,11 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             DoPlaySoundToSet(me, SOUND_AGGRO);
-            _events.ScheduleEvent(EVENT_FADE, 30000);
-            _events.ScheduleEvent(EVENT_SUMMON_SKELETON, 20000);
+            _events.ScheduleEvent(EVENT_FADE, 30s);
+            _events.ScheduleEvent(EVENT_SUMMON_SKELETON, 20s);
             _events.ScheduleEvent(EVENT_BLACK_ARROW, 15000);
-            _events.ScheduleEvent(EVENT_SHOOT, 8000);
-            _events.ScheduleEvent(EVENT_MULTI_SHOT, 10000);
+            _events.ScheduleEvent(EVENT_SHOOT, 8s);
+            _events.ScheduleEvent(EVENT_MULTI_SHOT, 10s);
         }
 
         void SetGUID(ObjectGuid const& guid, int32 id) override
@@ -146,8 +146,8 @@ public:
                 for (uint8 i = 0; i < 4; ++i)
                     me->SummonCreature(NPC_HIGHBORNE_LAMENTER, HighborneLoc[i][0], HighborneLoc[i][1], HIGHBORNE_LOC_Y, HighborneLoc[i][2], TEMPSUMMON_TIMED_DESPAWN, 160000);
 
-                _events.ScheduleEvent(EVENT_LAMENT_OF_THE_HIGHBORN, 2000);
-                _events.ScheduleEvent(EVENT_SUNSORROW_WHISPER, 10000);
+                _events.ScheduleEvent(EVENT_LAMENT_OF_THE_HIGHBORN, 2s);
+                _events.ScheduleEvent(EVENT_SUNSORROW_WHISPER, 10s);
             }
         }
 
@@ -189,26 +189,26 @@ public:
                         if (Unit* victim = me->GetVictim())
                             if (me->GetDistance(victim) > 10.0f)
                                 DoCast(victim, SPELL_MULTI_SHOT);
-                        _events.ScheduleEvent(EVENT_FADE, urand(30000, 35000));
+                        _events.ScheduleEvent(EVENT_FADE, 30s, 35s);
                         break;
                     case EVENT_SUMMON_SKELETON:
                         DoCast(me, SPELL_SUMMON_SKELETON);
-                        _events.ScheduleEvent(EVENT_SUMMON_SKELETON, urand(20000, 30000));
+                        _events.ScheduleEvent(EVENT_SUMMON_SKELETON, 20s, 30s);
                         break;
                     case EVENT_BLACK_ARROW:
                         if (Unit* victim = me->GetVictim())
                             DoCast(victim, SPELL_BLACK_ARROW);
-                        _events.ScheduleEvent(EVENT_BLACK_ARROW, urand(15000, 20000));
+                        _events.ScheduleEvent(EVENT_BLACK_ARROW, 15s, 20s);
                         break;
                     case EVENT_SHOOT:
                         if (Unit* victim = me->GetVictim())
                             DoCast(victim, SPELL_SHOT);
-                        _events.ScheduleEvent(EVENT_SHOOT, urand(8000, 10000));
+                        _events.ScheduleEvent(EVENT_SHOOT, 8s, 10s);
                         break;
                     case EVENT_MULTI_SHOT:
                         if (Unit* victim = me->GetVictim())
                             DoCast(victim, SPELL_MULTI_SHOT);
-                        _events.ScheduleEvent(EVENT_MULTI_SHOT, urand(10000, 13000));
+                        _events.ScheduleEvent(EVENT_MULTI_SHOT, 10s, 13s);
                         break;
                     case EVENT_LAMENT_OF_THE_HIGHBORN:
                         if (!me->HasAura(SPELL_SYLVANAS_CAST))
@@ -222,7 +222,7 @@ public:
                         else
                         {
                             DoSummon(NPC_HIGHBORNE_BUNNY, me, 10.0f, 3000, TEMPSUMMON_TIMED_DESPAWN);
-                            _events.ScheduleEvent(EVENT_LAMENT_OF_THE_HIGHBORN, 2000);
+                            _events.ScheduleEvent(EVENT_LAMENT_OF_THE_HIGHBORN, 2s);
                         }
                         break;
                     case EVENT_SUNSORROW_WHISPER: