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

34 files changed, 232 insertions, 232 deletions

diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
index 51d38df8122..171ad327ba2 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
@@ -57,7 +57,7 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_POISON_CLOUD, urand(5000, 9000));
+            events.ScheduleEvent(EVENT_POISON_CLOUD, 5s, 9s);
         }
 
         void DamageTaken(Unit* /*atacker*/, uint32 &damage) override
@@ -75,7 +75,7 @@ public:
             {
                 case EVENT_POISON_CLOUD:
                     DoCastVictim(SPELL_POISON_CLOUD);
-                    events.ScheduleEvent(EVENT_POISON_CLOUD, urand(25000, 50000));
+                    events.ScheduleEvent(EVENT_POISON_CLOUD, 25s, 50s);
                     break;
                 default:
                     break;
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
index 69d7409c1c1..4b68bb69deb 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
@@ -41,7 +41,7 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_THROW_NET, urand(2000, 4000));
+            events.ScheduleEvent(EVENT_THROW_NET, 2s, 4s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -56,7 +56,7 @@ public:
                 if (eventId == EVENT_THROW_NET)
                 {
                     DoCastVictim(SPELL_NET);
-                    events.ScheduleEvent(EVENT_THROW_NET, urand(4000, 7000));
+                    events.ScheduleEvent(EVENT_THROW_NET, 4s, 7s);
                 }
             }
 
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
index f78c0bf6dbb..fa71fd98c51 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
@@ -51,8 +51,8 @@ public:
         {
             _JustEngagedWith();
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_MIND_BLAST, urand(2000, 5000));
-            events.ScheduleEvent(EVENT_SLEEP, urand(9000, 12000));
+            events.ScheduleEvent(EVENT_MIND_BLAST, 2s, 5s);
+            events.ScheduleEvent(EVENT_SLEEP, 9s, 12s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -77,7 +77,7 @@ public:
                 {
                     case EVENT_MIND_BLAST:
                         DoCastVictim(SPELL_MIND_BLAST);
-                        events.ScheduleEvent(EVENT_MIND_BLAST, urand(7000, 9000));
+                        events.ScheduleEvent(EVENT_MIND_BLAST, 7s, 9s);
                         break;
                     case EVENT_SLEEP:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
@@ -85,7 +85,7 @@ public:
                             Talk(SAY_SLEEP);
                             DoCast(target, SPELL_SLEEP);
                         }
-                        events.ScheduleEvent(EVENT_SLEEP, urand(15000, 20000));
+                        events.ScheduleEvent(EVENT_SLEEP, 15s, 20s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index 6efe482eac9..2510d33bae4 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -304,14 +304,14 @@ public:
         {
             Talk(SAY_AGGRO);
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_FEAR, 42000);
-            events.ScheduleEvent(EVENT_AIR_BURST, 30000);
-            events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, urand(5000, 25000));
-            events.ScheduleEvent(EVENT_DOOMFIRE, 20000);
-            events.ScheduleEvent(EVENT_UNLEASH_SOUL_CHARGE, urand(2000, 30000));
-            events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 15000);
-            events.ScheduleEvent(EVENT_HAND_OF_DEATH, 600000);
-            events.ScheduleEvent(EVENT_DISTANCE_CHECK, 30000);
+            events.ScheduleEvent(EVENT_FEAR, 42s);
+            events.ScheduleEvent(EVENT_AIR_BURST, 30s);
+            events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, 5s, 25s);
+            events.ScheduleEvent(EVENT_DOOMFIRE, 20s);
+            events.ScheduleEvent(EVENT_UNLEASH_SOUL_CHARGE, 2s, 30s);
+            events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 15s);
+            events.ScheduleEvent(EVENT_HAND_OF_DEATH, 10min);
+            events.ScheduleEvent(EVENT_DISTANCE_CHECK, 30s);
         }
 
         void ExecuteEvent(uint32 eventId) override
@@ -320,7 +320,7 @@ public:
             {
                 case EVENT_HAND_OF_DEATH:
                     DoCastAOE(SPELL_HAND_OF_DEATH);
-                    events.ScheduleEvent(EVENT_HAND_OF_DEATH, 2000);
+                    events.ScheduleEvent(EVENT_HAND_OF_DEATH, 2s);
                     break;
                 case EVENT_UNLEASH_SOUL_CHARGE:
                     _chargeSpell = 0;
@@ -347,32 +347,32 @@ public:
                         me->RemoveAuraFromStack(_chargeSpell);
                         DoCastVictim(_unleashSpell);
                         SoulChargeCount--;
-                        events.ScheduleEvent(EVENT_UNLEASH_SOUL_CHARGE, urand(2000, 30000));
+                        events.ScheduleEvent(EVENT_UNLEASH_SOUL_CHARGE, 2s, 30s);
                     }
                     break;
                 case EVENT_FINGER_OF_DEATH:
                     if (!SelectTarget(SELECT_TARGET_RANDOM, 0, 5.0f)) // Checks if there are no targets in melee range
                     {
                         DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_FINGER_OF_DEATH);
-                        events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 1000);
+                        events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 1s);
                     }
                     else
-                        events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 5000);
+                        events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 5s);
                     break;
                 case EVENT_GRIP_OF_THE_LEGION:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_GRIP_OF_THE_LEGION);
-                    events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, urand(5000, 25000));
+                    events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, 5s, 25s);
                     break;
                 case EVENT_AIR_BURST:
                     Talk(SAY_AIR_BURST);
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
                         DoCast(target, SPELL_AIR_BURST); //not on tank
-                    events.ScheduleEvent(EVENT_AIR_BURST, urand(25000, 40000));
+                    events.ScheduleEvent(EVENT_AIR_BURST, 25s, 40s);
                     break;
                 case EVENT_FEAR:
                     DoCastAOE(SPELL_FEAR);
-                    events.ScheduleEvent(EVENT_FEAR, 42000);
+                    events.ScheduleEvent(EVENT_FEAR, 42s);
                     break;
                 case EVENT_DOOMFIRE:
                     Talk(SAY_DOOMFIRE);
@@ -380,20 +380,20 @@ public:
                         SummonDoomfire(temp);
                     else
                         SummonDoomfire(me->GetVictim());
-                    events.ScheduleEvent(EVENT_DOOMFIRE, 20000);
+                    events.ScheduleEvent(EVENT_DOOMFIRE, 20s);
                     break;
                 case EVENT_DISTANCE_CHECK:
                     if (Creature* channelTrigger = instance->GetCreature(DATA_CHANNEL_TARGET))
                         if (me->IsWithinDistInMap(channelTrigger, 75.0f))
                             DoAction(ACTION_ENRAGE);
-                    events.ScheduleEvent(EVENT_DISTANCE_CHECK, 5000);
+                    events.ScheduleEvent(EVENT_DISTANCE_CHECK, 5s);
                     break;
                 case EVENT_SUMMON_WHISP:
                     DoSpawnCreature(NPC_ANCIENT_WISP, float(rand32() % 40), float(rand32() % 40), 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
                     ++WispCount;
                     if (WispCount >= 30)
                         me->KillSelf();
-                    events.ScheduleEvent(EVENT_SUMMON_WHISP, 1500);
+                    events.ScheduleEvent(EVENT_SUMMON_WHISP, 1500ms);
                     break;
                 default:
                     break;
@@ -415,7 +415,7 @@ public:
                     // All members of raid must get this buff
                     DoCastAOE(SPELL_PROTECTION_OF_ELUNE, true);
                     HasProtected = true;
-                    events.ScheduleEvent(EVENT_SUMMON_WHISP, 1500);
+                    events.ScheduleEvent(EVENT_SUMMON_WHISP, 1500ms);
                 }
             }
         }
@@ -445,7 +445,7 @@ public:
                         break;
                 }
 
-                events.ScheduleEvent(EVENT_UNLEASH_SOUL_CHARGE, urand(2000, 30000));
+                events.ScheduleEvent(EVENT_UNLEASH_SOUL_CHARGE, 2s, 30s);
                 ++SoulChargeCount;
             }
         }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
index 7c287a9a683..6d2189b4317 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
@@ -66,10 +66,10 @@ class boss_epoch : public CreatureScript
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_CURSE_OF_EXERTION, 9300);
+                events.ScheduleEvent(EVENT_CURSE_OF_EXERTION, 9300ms);
                 events.ScheduleEvent(EVENT_TIME_WARP, 25300);
                 events.ScheduleEvent(EVENT_TIME_STOP, 21300);
-                events.ScheduleEvent(EVENT_WOUNDING_STRIKE, 5300);
+                events.ScheduleEvent(EVENT_WOUNDING_STRIKE, 5300ms);
             }
 
             void ExecuteEvent(uint32 eventId) override
@@ -79,7 +79,7 @@ class boss_epoch : public CreatureScript
                     case EVENT_CURSE_OF_EXERTION:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                             DoCast(target, SPELL_CURSE_OF_EXERTION);
-                        events.ScheduleEvent(EVENT_CURSE_OF_EXERTION, 9300);
+                        events.ScheduleEvent(EVENT_CURSE_OF_EXERTION, 9300ms);
                         break;
                     case EVENT_TIME_WARP:
                         Talk(SAY_TIME_WARP);
@@ -92,7 +92,7 @@ class boss_epoch : public CreatureScript
                         break;
                     case EVENT_WOUNDING_STRIKE:
                         DoCastVictim(SPELL_WOUNDING_STRIKE);
-                        events.ScheduleEvent(EVENT_WOUNDING_STRIKE, 5300);
+                        events.ScheduleEvent(EVENT_WOUNDING_STRIKE, 5300ms);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp
index 789c650b61e..3b4a11fd1eb 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp
@@ -64,8 +64,8 @@ class boss_infinite_corruptor : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 7000);
-                events.ScheduleEvent(EVENT_VOID_STRIKE, 5000);
+                events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 7s);
+                events.ScheduleEvent(EVENT_VOID_STRIKE, 5s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -90,11 +90,11 @@ class boss_infinite_corruptor : public CreatureScript
                     case EVENT_CORRUPTING_BLIGHT:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true))
                             DoCast(target, SPELL_CORRUPTING_BLIGHT);
-                        events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 17000);
+                        events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 15s);
                         break;
                     case EVENT_VOID_STRIKE:
                         DoCastVictim(SPELL_VOID_STRIKE);
-                        events.ScheduleEvent(EVENT_VOID_STRIKE, 5000);
+                        events.ScheduleEvent(EVENT_VOID_STRIKE, 5s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
index 26e25312815..e0070f87aef 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
@@ -57,9 +57,9 @@ class boss_meathook : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_CHAIN, urand(12000, 17000));
-                events.ScheduleEvent(EVENT_DISEASE, urand(2000, 4000));
-                events.ScheduleEvent(EVENT_FRENZY, urand(21000, 26000));
+                events.ScheduleEvent(EVENT_CHAIN, 12s, 17s);
+                events.ScheduleEvent(EVENT_DISEASE, 2s, 4s);
+                events.ScheduleEvent(EVENT_FRENZY, 21s, 26s);
             }
 
             void ExecuteEvent(uint32 eventId) override
@@ -69,15 +69,15 @@ class boss_meathook : public CreatureScript
                     case EVENT_CHAIN:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
                             DoCast(target, SPELL_CONSTRICTING_CHAINS);
-                        events.ScheduleEvent(EVENT_CHAIN, urand(2000, 4000));
+                        events.ScheduleEvent(EVENT_CHAIN, 2s, 4s);
                         break;
                     case EVENT_DISEASE:
                         DoCastAOE(SPELL_DISEASE_EXPULSION);
-                        events.ScheduleEvent(EVENT_DISEASE, urand(1500, 4000));
+                        events.ScheduleEvent(EVENT_DISEASE, 1500ms, 4s);
                         break;
                     case EVENT_FRENZY:
                         DoCast(me, SPELL_FRENZY);
-                        events.ScheduleEvent(EVENT_FRENZY, urand(21000, 26000));
+                        events.ScheduleEvent(EVENT_FRENZY, 21s, 26s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
index cd3eababe4e..a32084847f3 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
@@ -65,9 +65,9 @@ class boss_salramm : public CreatureScript
                 Talk(SAY_AGGRO);
                 _JustEngagedWith();
 
-                events.ScheduleEvent(EVENT_CURSE_FLESH, 30000);
-                events.ScheduleEvent(EVENT_SUMMON_GHOULS, urand(19000, 24000));
-                events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(8000, 12000));
+                events.ScheduleEvent(EVENT_CURSE_FLESH, 30s);
+                events.ScheduleEvent(EVENT_SUMMON_GHOULS, 19s, 24s);
+                events.ScheduleEvent(EVENT_SHADOW_BOLT, 8s, 12s);
                 events.ScheduleEvent(EVENT_STEAL_FLESH, 12345); /// @todo: adjust timer
             }
 
@@ -77,18 +77,18 @@ class boss_salramm : public CreatureScript
                 {
                     case EVENT_CURSE_FLESH:
                         DoCastVictim(SPELL_CURSE_OF_TWISTED_FLESH);
-                        events.ScheduleEvent(EVENT_CURSE_FLESH, 37000);
+                        events.ScheduleEvent(EVENT_CURSE_FLESH, 35s);
                         break;
                     case EVENT_SUMMON_GHOULS:
                         Talk(SAY_SUMMON_GHOULS);
                         DoCast(me, SPELL_SUMMON_GHOULS);
-                        events.ScheduleEvent(EVENT_SUMMON_GHOULS, 10000);
-                        events.ScheduleEvent(EVENT_EXPLODE_GHOUL, 6000);
+                        events.ScheduleEvent(EVENT_SUMMON_GHOULS, 10s);
+                        events.ScheduleEvent(EVENT_EXPLODE_GHOUL, 6s);
                         break;
                     case EVENT_SHADOW_BOLT:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true))
                             DoCast(target, SPELL_SHADOW_BOLT);
-                        events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(8000, 12000));
+                        events.ScheduleEvent(EVENT_SHADOW_BOLT, 8s, 12s);
                         break;
                     case EVENT_STEAL_FLESH:
                         Talk(SAY_STEAL_FLESH);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
index 323d027b2d0..9607e130ddc 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
@@ -313,7 +313,7 @@ class instance_culling_of_stratholme : public InstanceMapScript
                                 default:
                                     break;
                             }
-                            events.ScheduleEvent(EVENT_INFINITE_TIMER, 60000);
+                            events.ScheduleEvent(EVENT_INFINITE_TIMER, 1min);
                             --_eventTimer;
                             break;
                         default:
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
index 25b30c130cf..bbae751f330 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
@@ -64,9 +64,9 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_SANDBREATH, urand(15000, 30000));
-            events.ScheduleEvent(EVENT_TIMESTOP, urand(10000, 15000));
-            events.ScheduleEvent(EVENT_FRENZY, urand(30000, 45000));
+            events.ScheduleEvent(EVENT_SANDBREATH, 15s, 30s);
+            events.ScheduleEvent(EVENT_TIMESTOP, 10s, 15s);
+            events.ScheduleEvent(EVENT_FRENZY, 30s, 45s);
 
             Talk(SAY_AGGRO);
         }
@@ -118,16 +118,16 @@ public:
                 {
                     case EVENT_SANDBREATH:
                         DoCastVictim(SPELL_SAND_BREATH);
-                        events.ScheduleEvent(EVENT_SANDBREATH, urand(15000, 25000));
+                        events.ScheduleEvent(EVENT_SANDBREATH, 15s, 25s);
                         break;
                     case EVENT_TIMESTOP:
                         DoCastVictim(SPELL_TIME_STOP);
-                        events.ScheduleEvent(EVENT_TIMESTOP, urand(20000, 35000));
+                        events.ScheduleEvent(EVENT_TIMESTOP, 20s, 35s);
                         break;
                     case EVENT_FRENZY:
                          Talk(EMOTE_FRENZY);
                          DoCast(me, SPELL_ENRAGE);
-                        events.ScheduleEvent(EVENT_FRENZY, urand(20000, 35000));
+                        events.ScheduleEvent(EVENT_FRENZY, 20s, 35s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
index 8b56ea6c275..f047b0a9677 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
@@ -65,11 +65,11 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(18000, 23000));
-            events.ScheduleEvent(EVENT_TIME_LAPSE, urand(10000, 15000));
-            events.ScheduleEvent(EVENT_ARCANE_DISCHARGE, urand(20000, 30000));
+            events.ScheduleEvent(EVENT_ARCANE_BLAST, 18s, 23s);
+            events.ScheduleEvent(EVENT_TIME_LAPSE, 10s, 15s);
+            events.ScheduleEvent(EVENT_ARCANE_DISCHARGE, 20s, 30s);
             if (IsHeroic())
-                events.ScheduleEvent(EVENT_ATTRACTION, urand(25000, 35000));
+                events.ScheduleEvent(EVENT_ATTRACTION, 25s, 35s);
 
             Talk(SAY_AGGRO);
         }
@@ -118,21 +118,21 @@ public:
                 {
                     case EVENT_ARCANE_BLAST:
                         DoCastVictim(SPELL_ARCANE_BLAST);
-                        events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(15000, 25000));
+                        events.ScheduleEvent(EVENT_ARCANE_BLAST, 15s, 25s);
                         break;
                     case EVENT_TIME_LAPSE:
                         Talk(SAY_BANISH);
                         DoCast(me, SPELL_TIME_LAPSE);
-                        events.ScheduleEvent(EVENT_TIME_LAPSE, urand(15000, 25000));
+                        events.ScheduleEvent(EVENT_TIME_LAPSE, 15s, 25s);
                         break;
                     case EVENT_ARCANE_DISCHARGE:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                             DoCast(target, SPELL_ARCANE_DISCHARGE);
-                        events.ScheduleEvent(EVENT_ARCANE_DISCHARGE, urand(20000, 30000));
+                        events.ScheduleEvent(EVENT_ARCANE_DISCHARGE, 20s, 30s);
                         break;
                     case EVENT_ATTRACTION: // Only in Heroic
                         DoCast(me, SPELL_ATTRACTION);
-                        events.ScheduleEvent(EVENT_ATTRACTION, urand(25000, 35000));
+                        events.ScheduleEvent(EVENT_ATTRACTION, 25s, 35s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
index c0d97f39c41..25a2b15fa11 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
@@ -64,11 +64,11 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_HASTE, urand(15000, 23000));
-            events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000);
-            events.ScheduleEvent(EVENT_WING_BUFFET, urand(25000, 35000));
+            events.ScheduleEvent(EVENT_HASTE, 15s, 23s);
+            events.ScheduleEvent(EVENT_MORTAL_WOUND, 8s);
+            events.ScheduleEvent(EVENT_WING_BUFFET, 25s, 35s);
             if (IsHeroic())
-                events.ScheduleEvent(EVENT_SPELL_REFLECTION, 30000);
+                events.ScheduleEvent(EVENT_SPELL_REFLECTION, 30s);
 
             Talk(SAY_AGGRO);
         }
@@ -118,19 +118,19 @@ public:
                 {
                     case EVENT_HASTE:
                         DoCast(me, SPELL_HASTE);
-                        events.ScheduleEvent(EVENT_HASTE, urand(20000, 25000));
+                        events.ScheduleEvent(EVENT_HASTE, 20s, 25s);
                         break;
                     case EVENT_MORTAL_WOUND:
                         DoCast(me, SPELL_MORTAL_WOUND);
-                        events.ScheduleEvent(EVENT_MORTAL_WOUND, urand(10000, 20000));
+                        events.ScheduleEvent(EVENT_MORTAL_WOUND, 10s, 20s);
                         break;
                     case EVENT_WING_BUFFET:
                          DoCast(me, SPELL_WING_BUFFET);
-                        events.ScheduleEvent(EVENT_WING_BUFFET, urand(20000, 30000));
+                        events.ScheduleEvent(EVENT_WING_BUFFET, 20s, 30s);
                         break;
                     case EVENT_SPELL_REFLECTION: // Only in Heroic
                         DoCast(me, SPELL_REFLECT);
-                        events.ScheduleEvent(EVENT_SPELL_REFLECTION, urand(25000, 35000));
+                        events.ScheduleEvent(EVENT_SPELL_REFLECTION, 25s, 35s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
index e63f8e03453..44936216ad9 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -164,10 +164,10 @@ public:
         {
             _JustEngagedWith();
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 20000));
-            events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(15000, 20000));
-            events.ScheduleEvent(EVENT_CLEAVE, urand(2000, 5000));
-            events.ScheduleEvent(EVENT_WING_BUFFET, urand(10000, 20000));
+            events.ScheduleEvent(EVENT_FLAME_BREATH, 10s, 20s);
+            events.ScheduleEvent(EVENT_TAIL_SWEEP, 15s, 20s);
+            events.ScheduleEvent(EVENT_CLEAVE, 2s, 5s);
+            events.ScheduleEvent(EVENT_WING_BUFFET, 10s, 20s);
             instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
         }
 
@@ -239,11 +239,11 @@ public:
                             me->GetMotionMaster()->MoveChase(tank);
                         else if (Unit* newtarget = SelectTarget(SELECT_TARGET_MINDISTANCE, 0))
                             me->GetMotionMaster()->MoveChase(newtarget);
-                        events.ScheduleEvent(EVENT_BELLOWING_ROAR, 5000);
-                        events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 20000));
-                        events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(15000, 20000));
-                        events.ScheduleEvent(EVENT_CLEAVE, urand(2000, 5000));
-                        events.ScheduleEvent(EVENT_WING_BUFFET, urand(15000, 30000));
+                        events.ScheduleEvent(EVENT_BELLOWING_ROAR, 5s);
+                        events.ScheduleEvent(EVENT_FLAME_BREATH, 10s, 20s);
+                        events.ScheduleEvent(EVENT_TAIL_SWEEP, 15s, 20s);
+                        events.ScheduleEvent(EVENT_CLEAVE, 2s, 5s);
+                        events.ScheduleEvent(EVENT_WING_BUFFET, 15s, 30s);
                         break;
                     case 10:
                         me->SetCanFly(true);
@@ -256,11 +256,11 @@ public:
                         me->SetSpeedRate(MOVE_FLIGHT, 1.0f);
                         Talk(SAY_PHASE_2_TRANS);
                         instance->SetData(DATA_ONYXIA_PHASE, Phase);
-                        events.ScheduleEvent(EVENT_WHELP_SPAWN, 5000);
+                        events.ScheduleEvent(EVENT_WHELP_SPAWN, 5s);
                         events.ScheduleEvent(EVENT_LAIR_GUARD, 15000);
                         events.ScheduleEvent(EVENT_DEEP_BREATH, 75000);
-                        events.ScheduleEvent(EVENT_MOVEMENT, 10000);
-                        events.ScheduleEvent(EVENT_FIREBALL, 18000);
+                        events.ScheduleEvent(EVENT_MOVEMENT, 10s);
+                        events.ScheduleEvent(EVENT_FIREBALL, 18s);
                         break;
                     case 11:
                         if (PointData)
@@ -362,24 +362,24 @@ public:
                             Cell::VisitGridObjects(me, searcher, 30.0f);
                             if (Floor)
                                 instance->SetGuidData(DATA_FLOOR_ERUPTION_GUID, Floor->GetGUID());
-                            events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30000);
+                            events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30s);
                             break;
                         }
                         case EVENT_FLAME_BREATH:   // Phase PHASE_START and PHASE_END
                             DoCastVictim(SPELL_FLAME_BREATH);
-                            events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 20000));
+                            events.ScheduleEvent(EVENT_FLAME_BREATH, 10s, 20s);
                             break;
                         case EVENT_TAIL_SWEEP:     // Phase PHASE_START and PHASE_END
                             DoCastAOE(SPELL_TAIL_SWEEP);
-                            events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_TAIL_SWEEP, 15s, 20s);
                             break;
                         case EVENT_CLEAVE:         // Phase PHASE_START and PHASE_END
                             DoCastVictim(SPELL_CLEAVE);
-                            events.ScheduleEvent(EVENT_CLEAVE, urand(2000, 5000));
+                            events.ScheduleEvent(EVENT_CLEAVE, 2s, 5s);
                             break;
                         case EVENT_WING_BUFFET:    // Phase PHASE_START and PHASE_END
                             DoCastVictim(SPELL_WING_BUFFET);
-                            events.ScheduleEvent(EVENT_WING_BUFFET, urand(15000, 30000));
+                            events.ScheduleEvent(EVENT_WING_BUFFET, 15s, 30s);
                             break;
                         default:
                             break;
@@ -401,7 +401,7 @@ public:
                     IsMoving = false;
                     Position const pos = me->GetHomePosition();
                     me->GetMotionMaster()->MovePoint(9, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ() + 12.0f);
-                    events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30000);
+                    events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30s);
                     return;
                 }
 
@@ -430,7 +430,7 @@ public:
                                 events.ScheduleEvent(EVENT_DEEP_BREATH, 75000);
                             }
                             else
-                                events.ScheduleEvent(EVENT_DEEP_BREATH, 1000);
+                                events.ScheduleEvent(EVENT_DEEP_BREATH, 1s);
                             break;
                         case EVENT_MOVEMENT:         // Phase PHASE_BREATH
                             if (!IsMoving && !(me->HasUnitState(UNIT_STATE_CASTING)))
@@ -446,21 +446,21 @@ public:
                                 events.ScheduleEvent(EVENT_MOVEMENT, 25000);
                             }
                             else
-                                events.ScheduleEvent(EVENT_MOVEMENT, 500);
+                                events.ScheduleEvent(EVENT_MOVEMENT, 500ms);
                             break;
                         case EVENT_FIREBALL:         // Phase PHASE_BREATH
                             if (!IsMoving)
                             {
                                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                     DoCast(target, SPELL_FIREBALL);
-                                events.ScheduleEvent(EVENT_FIREBALL, 8000);
+                                events.ScheduleEvent(EVENT_FIREBALL, 8s);
                             }
                             else
-                                events.ScheduleEvent(EVENT_FIREBALL, 1000);
+                                events.ScheduleEvent(EVENT_FIREBALL, 1s);
                             break;
                         case EVENT_LAIR_GUARD:       // Phase PHASE_BREATH
                             me->SummonCreature(NPC_LAIRGUARD, SpawnLocations[2], TEMPSUMMON_CORPSE_DESPAWN);
-                            events.ScheduleEvent(EVENT_LAIR_GUARD, 30000);
+                            events.ScheduleEvent(EVENT_LAIR_GUARD, 30s);
                             break;
                         case EVENT_WHELP_SPAWN:      // Phase PHASE_BREATH
                             me->SummonCreature(NPC_WHELP, SpawnLocations[0], TEMPSUMMON_CORPSE_DESPAWN);
@@ -468,10 +468,10 @@ public:
                             if (SummonWhelpCount >= RAID_MODE(20, 40))
                             {
                                 SummonWhelpCount = 0;
-                                events.ScheduleEvent(EVENT_WHELP_SPAWN, 90000);
+                                events.ScheduleEvent(EVENT_WHELP_SPAWN, 90s);
                             }
                             else
-                                events.ScheduleEvent(EVENT_WHELP_SPAWN, 500);
+                                events.ScheduleEvent(EVENT_WHELP_SPAWN, 500ms);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
index 1e7c3e2343e..f744e36da36 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
@@ -71,9 +71,9 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_AMNENNARSWRATH, 8000);
-            events.ScheduleEvent(EVENT_FROSTBOLT, 1000);
-            events.ScheduleEvent(EVENT_FROST_NOVA, urand(10000, 15000));
+            events.ScheduleEvent(EVENT_AMNENNARSWRATH, 8s);
+            events.ScheduleEvent(EVENT_FROSTBOLT, 1s);
+            events.ScheduleEvent(EVENT_FROST_NOVA, 10s, 15s);
             Talk(SAY_AGGRO);
         }
 
@@ -104,15 +104,15 @@ public:
                 {
                     case EVENT_AMNENNARSWRATH:
                         DoCastVictim(SPELL_AMNENNARSWRATH);
-                        events.ScheduleEvent(EVENT_AMNENNARSWRATH, 12000);
+                        events.ScheduleEvent(EVENT_AMNENNARSWRATH, 12s);
                         break;
                     case EVENT_FROSTBOLT:
                         DoCastVictim(SPELL_FROSTBOLT);
-                        events.ScheduleEvent(EVENT_FROSTBOLT, 8000);
+                        events.ScheduleEvent(EVENT_FROSTBOLT, 8s);
                         break;
                     case EVENT_FROST_NOVA:
                         DoCast(me, SPELL_FROST_NOVA);
-                        events.ScheduleEvent(EVENT_FROST_NOVA, 15000);
+                        events.ScheduleEvent(EVENT_FROST_NOVA, 15s);
                         break;
                 }
 
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp
index 1ae4a0d8ba3..437bcfb0abd 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp
@@ -63,8 +63,8 @@ public:
             _JustEngagedWith();
             events.Reset();
             Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_FIREBALL, 100);
-            events.ScheduleEvent(EVENT_FIRE_NOVA, urand(8000, 12000));
+            events.ScheduleEvent(EVENT_FIREBALL, 100ms);
+            events.ScheduleEvent(EVENT_FIRE_NOVA, 8s, 12s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -112,11 +112,11 @@ public:
                 {
                     case EVENT_FIREBALL:
                         DoCastVictim(SPELL_FIREBALL);
-                        events.ScheduleEvent(EVENT_FIREBALL, urand(2400, 3800));
+                        events.ScheduleEvent(EVENT_FIREBALL, 2400ms, 3800ms);
                         break;
                     case EVENT_FIRE_NOVA:
                         DoCast(me, SPELL_FIRE_NOVA);
-                        events.ScheduleEvent(EVENT_FIRE_NOVA, urand(11000, 16000));
+                        events.ScheduleEvent(EVENT_FIRE_NOVA, 11s, 16s);
                         break;
                 }
 
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp
index 2f7a6353675..9d801bdface 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp
@@ -54,8 +54,8 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             _JustEngagedWith();
-            events.ScheduleEvent(EVENT_WEB_SPRAY, urand(3000, 5000));
-            events.ScheduleEvent(EVENT_CURSE_OF_TUTENKASH, urand(9000, 14000));
+            events.ScheduleEvent(EVENT_WEB_SPRAY, 3s, 5s);
+            events.ScheduleEvent(EVENT_CURSE_OF_TUTENKASH, 9s, 14s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -83,11 +83,11 @@ public:
                             if (!target->HasAura(SPELL_WEB_SPRAY))
                                 DoCast(target, SPELL_WEB_SPRAY);
                         }
-                        events.ScheduleEvent(EVENT_WEB_SPRAY, urand(6000, 8000));
+                        events.ScheduleEvent(EVENT_WEB_SPRAY, 6s, 8s);
                         break;
                     case EVENT_CURSE_OF_TUTENKASH:
                         DoCast(me, SPELL_CURSE_OF_TUTENKASH);
-                        events.ScheduleEvent(EVENT_CURSE_OF_TUTENKASH, urand(15000, 25000));
+                        events.ScheduleEvent(EVENT_CURSE_OF_TUTENKASH, 15s, 25s);
                         break;
                 }
 
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
index 8f281d85bb6..08ca7b91e8d 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
@@ -116,8 +116,8 @@ public:
                 Talk(SAY_WATCH_OUT, who);
             else
             {
-                events.ScheduleEvent(EVENT_FIREBALL, 1000);
-                events.ScheduleEvent(EVENT_FROST_NOVA, urand(8000, 12000));
+                events.ScheduleEvent(EVENT_FIREBALL, 1s);
+                events.ScheduleEvent(EVENT_FROST_NOVA, 8s, 12s);
                 if (urand(0, 100) > 40)
                     Talk(SAY_AGGRO, who);
             }
@@ -146,7 +146,7 @@ public:
             if (type == WAYPOINT_MOTION_TYPE && id == POINT_REACH_IDOL)
             {
                 channeling = true;
-                events.ScheduleEvent(EVENT_CHANNEL, 2000);
+                events.ScheduleEvent(EVENT_CHANNEL, 2s);
             }
         }
 
@@ -164,14 +164,14 @@ public:
                     case EVENT_CHANNEL:
                         Talk(SAY_EVENT_START);
                         DoCast(me, SPELL_IDOL_SHUTDOWN_VISUAL);
-                        events.ScheduleEvent(EVENT_IDOL_ROOM_SPAWNER, 100);
+                        events.ScheduleEvent(EVENT_IDOL_ROOM_SPAWNER, 100ms);
                         events.ScheduleEvent(EVENT_PROGRESS, 120000);
                         break;
                     case EVENT_IDOL_ROOM_SPAWNER:
                         if (Creature* creature = me->SummonCreature(NPC_IDOL_ROOM_SPAWNER, PosSummonSpawner[urand(0,2)], TEMPSUMMON_TIMED_DESPAWN, 4000))
                             creature->AI()->SetData(0,spawnerCount);
                         if (++spawnerCount < 8)
-                            events.ScheduleEvent(EVENT_IDOL_ROOM_SPAWNER, 35000);
+                            events.ScheduleEvent(EVENT_IDOL_ROOM_SPAWNER, 35s);
                         break;
                     case EVENT_PROGRESS:
                     {
@@ -180,23 +180,23 @@ public:
                             case 0:
                                 Talk(SAY_EVENT_THREE_MIN_LEFT);
                                 ++eventProgress;
-                                 events.ScheduleEvent(EVENT_PROGRESS, 60000);
+                                 events.ScheduleEvent(EVENT_PROGRESS, 1min);
                                  break;
                             case 1:
                                 Talk(SAY_EVENT_TWO_MIN_LEFT);
                                 ++eventProgress;
-                                events.ScheduleEvent(EVENT_PROGRESS, 60000);
+                                events.ScheduleEvent(EVENT_PROGRESS, 1min);
                                 break;
                             case 2:
                                 Talk(SAY_EVENT_ONE_MIN_LEFT);
                                 ++eventProgress;
-                                events.ScheduleEvent(EVENT_PROGRESS, 60000);
+                                events.ScheduleEvent(EVENT_PROGRESS, 1min);
                                 break;
                             case 3:
                                 events.CancelEvent(EVENT_IDOL_ROOM_SPAWNER);
                                 me->InterruptSpell(CURRENT_CHANNELED_SPELL);
                                 Talk(SAY_EVENT_END);
-                                events.ScheduleEvent(EVENT_COMPLETE, 3000);
+                                events.ScheduleEvent(EVENT_COMPLETE, 3s);
                                 break;
                         }
                           break;
@@ -230,13 +230,13 @@ public:
                         if (me->HasUnitState(UNIT_STATE_CASTING) || !UpdateVictim())
                             return;
                         DoCastVictim(SPELL_FIREBALL);
-                        events.ScheduleEvent(EVENT_FIREBALL, 8000);
+                        events.ScheduleEvent(EVENT_FIREBALL, 8s);
                         break;
                     case EVENT_FROST_NOVA:
                         if (me->HasUnitState(UNIT_STATE_CASTING) || !UpdateVictim())
                             return;
                         DoCast(me, SPELL_FROST_NOVA);
-                        events.ScheduleEvent(EVENT_FROST_NOVA, 15000);
+                        events.ScheduleEvent(EVENT_FROST_NOVA, 15s);
                         break;
                 }
             }
@@ -333,7 +333,7 @@ public:
 
         void JustEngagedWith(Unit* /*who*/) override
         {
-            events.ScheduleEvent(EVENT_WEB, urand(5000, 8000));
+            events.ScheduleEvent(EVENT_WEB, 5s, 8s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -349,7 +349,7 @@ public:
                 {
                     case EVENT_WEB:
                         DoCastVictim(SPELL_WEB);
-                        events.ScheduleEvent(EVENT_WEB, urand(7000, 16000));
+                        events.ScheduleEvent(EVENT_WEB, 7s, 16s);
                         break;
                 }
             }
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
index 72a4f5e873a..f4427e0f6bd 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
@@ -142,11 +142,11 @@ class boss_ayamiss : public CreatureScript
             {
                 BossAI::JustEngagedWith(attacker);
 
-                events.ScheduleEvent(EVENT_STINGER_SPRAY, urand(20000, 30000));
-                events.ScheduleEvent(EVENT_POISON_STINGER, 5000);
-                events.ScheduleEvent(EVENT_SUMMON_SWARMER, 5000);
-                events.ScheduleEvent(EVENT_SWARMER_ATTACK, 60000);
-                events.ScheduleEvent(EVENT_PARALYZE, 15000);
+                events.ScheduleEvent(EVENT_STINGER_SPRAY, 20s, 30s);
+                events.ScheduleEvent(EVENT_POISON_STINGER, 5s);
+                events.ScheduleEvent(EVENT_SUMMON_SWARMER, 5s);
+                events.ScheduleEvent(EVENT_SWARMER_ATTACK, 1min);
+                events.ScheduleEvent(EVENT_PARALYZE, 15s);
 
                 me->SetCanFly(true);
                 me->SetDisableGravity(true);
@@ -171,8 +171,8 @@ class boss_ayamiss : public CreatureScript
                         me->GetMotionMaster()->MovePoint(POINT_GROUND, VictimPos);
                     }
                     ResetThreatList();
-                    events.ScheduleEvent(EVENT_LASH, urand(5000, 8000));
-                    events.ScheduleEvent(EVENT_TRASH, urand(3000, 6000));
+                    events.ScheduleEvent(EVENT_LASH, 5s, 8s);
+                    events.ScheduleEvent(EVENT_TRASH, 3s, 6s);
                     events.CancelEvent(EVENT_POISON_STINGER);
                 }
                 else
@@ -193,11 +193,11 @@ class boss_ayamiss : public CreatureScript
                     {
                         case EVENT_STINGER_SPRAY:
                             DoCast(me, SPELL_STINGER_SPRAY);
-                            events.ScheduleEvent(EVENT_STINGER_SPRAY, urand(15000, 20000));
+                            events.ScheduleEvent(EVENT_STINGER_SPRAY, 15s, 20s);
                             break;
                         case EVENT_POISON_STINGER:
                             DoCastVictim(SPELL_POISON_STINGER);
-                            events.ScheduleEvent(EVENT_POISON_STINGER, urand(2000, 3000));
+                            events.ScheduleEvent(EVENT_POISON_STINGER, 2s, 3s);
                             break;
                         case EVENT_PARALYZE:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true))
@@ -207,7 +207,7 @@ class boss_ayamiss : public CreatureScript
                                 uint8 Index = urand(0, 1);
                                 me->SummonCreature(NPC_LARVA, LarvaPos[Index], TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
                             }
-                            events.ScheduleEvent(EVENT_PARALYZE, 15000);
+                            events.ScheduleEvent(EVENT_PARALYZE, 15s);
                             break;
                         case EVENT_SWARMER_ATTACK:
                             for (GuidList::iterator i = _swarmers.begin(); i != _swarmers.end(); ++i)
@@ -216,22 +216,22 @@ class boss_ayamiss : public CreatureScript
                                         swarmer->AI()->AttackStart(target);
 
                             _swarmers.clear();
-                            events.ScheduleEvent(EVENT_SWARMER_ATTACK, 60000);
+                            events.ScheduleEvent(EVENT_SWARMER_ATTACK, 1min);
                             break;
                         case EVENT_SUMMON_SWARMER:
                         {
                             Position Pos = me->GetRandomPoint(SwarmerPos, 80.0f);
                             me->SummonCreature(NPC_SWARMER, Pos);
-                            events.ScheduleEvent(EVENT_SUMMON_SWARMER, 5000);
+                            events.ScheduleEvent(EVENT_SUMMON_SWARMER, 5s);
                             break;
                         }
                         case EVENT_TRASH:
                             DoCastVictim(SPELL_TRASH);
-                            events.ScheduleEvent(EVENT_TRASH, urand(5000, 7000));
+                            events.ScheduleEvent(EVENT_TRASH, 5s, 7s);
                             break;
                         case EVENT_LASH:
                             DoCastVictim(SPELL_LASH);
-                            events.ScheduleEvent(EVENT_LASH, urand(8000, 15000));
+                            events.ScheduleEvent(EVENT_LASH, 8s, 15s);
                             break;
                     }
                 }
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index de35c64119b..712bc51d16f 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -91,9 +91,9 @@ class boss_buru : public CreatureScript
                 Talk(EMOTE_TARGET, who);
                 DoCast(me, SPELL_THORNS);
 
-                events.ScheduleEvent(EVENT_DISMEMBER, 5000);
-                events.ScheduleEvent(EVENT_GATHERING_SPEED, 9000);
-                events.ScheduleEvent(EVENT_FULL_SPEED, 60000);
+                events.ScheduleEvent(EVENT_DISMEMBER, 5s);
+                events.ScheduleEvent(EVENT_GATHERING_SPEED, 9s);
+                events.ScheduleEvent(EVENT_FULL_SPEED, 1min);
 
                 _phase = PHASE_EGG;
             }
@@ -118,8 +118,8 @@ class boss_buru : public CreatureScript
 
                 me->RemoveAurasDueToSpell(SPELL_FULL_SPEED);
                 me->RemoveAurasDueToSpell(SPELL_GATHERING_SPEED);
-                events.ScheduleEvent(EVENT_GATHERING_SPEED, 9000);
-                events.ScheduleEvent(EVENT_FULL_SPEED, 60000);
+                events.ScheduleEvent(EVENT_GATHERING_SPEED, 9s);
+                events.ScheduleEvent(EVENT_FULL_SPEED, 1min);
 
                 if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
                 {
@@ -149,18 +149,18 @@ class boss_buru : public CreatureScript
                     {
                         case EVENT_DISMEMBER:
                             DoCastVictim(SPELL_DISMEMBER);
-                            events.ScheduleEvent(EVENT_DISMEMBER, 5000);
+                            events.ScheduleEvent(EVENT_DISMEMBER, 5s);
                             break;
                         case EVENT_GATHERING_SPEED:
                             DoCast(me, SPELL_GATHERING_SPEED);
-                            events.ScheduleEvent(EVENT_GATHERING_SPEED, 9000);
+                            events.ScheduleEvent(EVENT_GATHERING_SPEED, 9s);
                             break;
                         case EVENT_FULL_SPEED:
                             DoCast(me, SPELL_FULL_SPEED);
                             break;
                         case EVENT_CREEPING_PLAGUE:
                             DoCast(me, SPELL_CREEPING_PLAGUE);
-                            events.ScheduleEvent(EVENT_CREEPING_PLAGUE, 6000);
+                            events.ScheduleEvent(EVENT_CREEPING_PLAGUE, 6s);
                             break;
                         case EVENT_RESPAWN_EGG:
                             if (Creature* egg = ObjectAccessor::GetCreature(*me, Eggs.front()))
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
index 4d04a982154..8ffeb7a6608 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
@@ -66,10 +66,10 @@ class boss_kurinnaxx : public CreatureScript
             {
                 _Reset();
                 Initialize();
-                events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000);
-                events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000));
-                events.ScheduleEvent(EVENT_TRASH, 1000);
-                events.ScheduleEvent(EVENT_WIDE_SLASH, 11000);
+                events.ScheduleEvent(EVENT_MORTAL_WOUND, 8s);
+                events.ScheduleEvent(EVENT_SANDTRAP, 5s, 15s);
+                events.ScheduleEvent(EVENT_TRASH, 1s);
+                events.ScheduleEvent(EVENT_WIDE_SLASH, 11s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override
@@ -104,22 +104,22 @@ class boss_kurinnaxx : public CreatureScript
                     {
                         case EVENT_MORTAL_WOUND:
                             DoCastVictim(SPELL_MORTALWOUND);
-                            events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000);
+                            events.ScheduleEvent(EVENT_MORTAL_WOUND, 8s);
                             break;
                         case EVENT_SANDTRAP:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
                                 target->CastSpell(target, SPELL_SANDTRAP, true);
                             else if (Unit* victim = me->GetVictim())
                                 victim->CastSpell(victim, SPELL_SANDTRAP, true);
-                            events.ScheduleEvent(EVENT_SANDTRAP, urand(5000, 15000));
+                            events.ScheduleEvent(EVENT_SANDTRAP, 5s, 15s);
                             break;
                         case EVENT_WIDE_SLASH:
                             DoCast(me, SPELL_WIDE_SLASH);
-                            events.ScheduleEvent(EVENT_WIDE_SLASH, 11000);
+                            events.ScheduleEvent(EVENT_WIDE_SLASH, 11s);
                             break;
                         case EVENT_TRASH:
                             DoCast(me, SPELL_TRASH);
-                            events.ScheduleEvent(EVENT_WIDE_SLASH, 16000);
+                            events.ScheduleEvent(EVENT_WIDE_SLASH, 15s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
index c86432eecd3..449b356df0e 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
@@ -73,8 +73,8 @@ class boss_moam : public CreatureScript
                 _Reset();
                 me->SetPower(POWER_MANA, 0);
                 Initialize();
-                events.ScheduleEvent(EVENT_STONE_PHASE, 90000);
-                //events.ScheduleEvent(EVENT_WIDE_SLASH, 11000);
+                events.ScheduleEvent(EVENT_STONE_PHASE, 90s);
+                //events.ScheduleEvent(EVENT_WIDE_SLASH, 11s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override
@@ -93,7 +93,7 @@ class boss_moam : public CreatureScript
                     case ACTION_STONE_PHASE_END:
                     {
                         me->RemoveAurasDueToSpell(SPELL_ENERGIZE);
-                        events.ScheduleEvent(EVENT_STONE_PHASE, 90000);
+                        events.ScheduleEvent(EVENT_STONE_PHASE, 90s);
                         _isStonePhase = false;
                         break;
                     }
@@ -103,7 +103,7 @@ class boss_moam : public CreatureScript
                         DoCast(me, SPELL_SUMMON_MANA_FIEND_2);
                         DoCast(me, SPELL_SUMMON_MANA_FIEND_3);
                         DoCast(me, SPELL_ENERGIZE);
-                        events.ScheduleEvent(EVENT_STONE_PHASE_END, 90000);
+                        events.ScheduleEvent(EVENT_STONE_PHASE_END, 90s);
                         break;
                     }
                     default:
@@ -158,16 +158,16 @@ class boss_moam : public CreatureScript
                             for (std::list<Unit*>::iterator itr = targetList.begin(); itr != targetList.end(); ++itr)
                                 DoCast(*itr, SPELL_DRAIN_MANA);
 
-                            events.ScheduleEvent(EVENT_DRAIN_MANA, urand(5000, 15000));
+                            events.ScheduleEvent(EVENT_DRAIN_MANA, 5s, 15s);
                             break;
                         }/*
                         case EVENT_WIDE_SLASH:
                             DoCast(me, SPELL_WIDE_SLASH);
-                            events.ScheduleEvent(EVENT_WIDE_SLASH, 11000);
+                            events.ScheduleEvent(EVENT_WIDE_SLASH, 11s);
                             break;
                         case EVENT_TRASH:
                             DoCast(me, SPELL_TRASH);
-                            events.ScheduleEvent(EVENT_WIDE_SLASH, 16000);
+                            events.ScheduleEvent(EVENT_WIDE_SLASH, 15s);
                             break;*/
                         default:
                             break;
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
index dacac70ac42..8e2cc7fd88e 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -143,9 +143,9 @@ class boss_ossirian : public CreatureScript
             {
                 _JustEngagedWith();
                 events.Reset();
-                events.ScheduleEvent(EVENT_SILENCE, 30000);
-                events.ScheduleEvent(EVENT_CYCLONE, 20000);
-                events.ScheduleEvent(EVENT_STOMP, 30000);
+                events.ScheduleEvent(EVENT_SILENCE, 30s);
+                events.ScheduleEvent(EVENT_CYCLONE, 20s);
+                events.ScheduleEvent(EVENT_STOMP, 30s);
 
                 DoCast(me, SPELL_SUPREME);
                 Talk(SAY_AGGRO);
@@ -256,15 +256,15 @@ class boss_ossirian : public CreatureScript
                     {
                         case EVENT_SILENCE:
                             DoCast(me, SPELL_SILENCE);
-                            events.ScheduleEvent(EVENT_SILENCE, urand(20000, 30000));
+                            events.ScheduleEvent(EVENT_SILENCE, 20s, 30s);
                             break;
                         case EVENT_CYCLONE:
                             DoCastVictim(SPELL_CYCLONE);
-                            events.ScheduleEvent(EVENT_CYCLONE, 20000);
+                            events.ScheduleEvent(EVENT_CYCLONE, 20s);
                             break;
                         case EVENT_STOMP:
                             DoCast(me, SPELL_STOMP);
-                            events.ScheduleEvent(EVENT_STOMP, 30000);
+                            events.ScheduleEvent(EVENT_STOMP, 30s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
index 7598c990833..ec48fc3fec3 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
@@ -77,8 +77,8 @@ class boss_rajaxx : public CreatureScript
             {
                 _Reset();
                 Initialize();
-                events.ScheduleEvent(EVENT_DISARM, 10000);
-                events.ScheduleEvent(EVENT_THUNDERCRASH, 12000);
+                events.ScheduleEvent(EVENT_DISARM, 10s);
+                events.ScheduleEvent(EVENT_THUNDERCRASH, 12s);
             }
 
             void JustDied(Unit* /*killer*/) override
@@ -108,11 +108,11 @@ class boss_rajaxx : public CreatureScript
                     {
                         case EVENT_DISARM:
                             DoCastVictim(SPELL_DISARM);
-                            events.ScheduleEvent(EVENT_DISARM, 22000);
+                            events.ScheduleEvent(EVENT_DISARM, 22s);
                             break;
                         case EVENT_THUNDERCRASH:
                             DoCast(me, SPELL_THUNDERCRASH);
-                            events.ScheduleEvent(EVENT_THUNDERCRASH, 21000);
+                            events.ScheduleEvent(EVENT_THUNDERCRASH, 21s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
index 4bc180eb775..7abc8d35d7c 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
@@ -136,10 +136,10 @@ class boss_skeram : public CreatureScript
                 _JustEngagedWith();
                 events.Reset();
 
-                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(6000, 12000));
-                events.ScheduleEvent(EVENT_FULLFILMENT, 15000);
-                events.ScheduleEvent(EVENT_BLINK, urand(30000, 45000));
-                events.ScheduleEvent(EVENT_EARTH_SHOCK, 2000);
+                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6s, 12s);
+                events.ScheduleEvent(EVENT_FULLFILMENT, 15s);
+                events.ScheduleEvent(EVENT_BLINK, 30s, 45s);
+                events.ScheduleEvent(EVENT_EARTH_SHOCK, 2s);
 
                 Talk(SAY_AGGRO);
             }
@@ -157,22 +157,22 @@ class boss_skeram : public CreatureScript
                     {
                         case EVENT_ARCANE_EXPLOSION:
                             DoCastAOE(SPELL_ARCANE_EXPLOSION, true);
-                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(8000, 18000));
+                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 8s, 18s);
                             break;
                         case EVENT_FULLFILMENT:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 45.0f, true))
                                 DoCast(target, SPELL_TRUE_FULFILLMENT);
-                            events.ScheduleEvent(EVENT_FULLFILMENT, urand(20000, 30000));
+                            events.ScheduleEvent(EVENT_FULLFILMENT, 20s, 30s);
                             break;
                         case EVENT_BLINK:
                             DoCast(me, BlinkSpells[urand(0, 2)]);
                             ResetThreatList();
                             me->SetVisible(true);
-                            events.ScheduleEvent(EVENT_BLINK, urand(10000, 30000));
+                            events.ScheduleEvent(EVENT_BLINK, 10s, 30s);
                             break;
                         case EVENT_EARTH_SHOCK:
                             DoCastVictim(SPELL_EARTH_SHOCK);
-                            events.ScheduleEvent(EVENT_EARTH_SHOCK, 2000);
+                            events.ScheduleEvent(EVENT_EARTH_SHOCK, 2s);
                             break;
                     }
                 }
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
index 662d637d546..9511232b539 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
@@ -164,7 +164,7 @@ class boss_viscidus : public CreatureScript
                         _phase = PHASE_MELEE;
                         DoCast(me, SPELL_VISCIDUS_FREEZE);
                         me->RemoveAura(SPELL_VISCIDUS_SLOWED_MORE);
-                        events.ScheduleEvent(EVENT_RESET_PHASE, 15000);
+                        events.ScheduleEvent(EVENT_RESET_PHASE, 15s);
                     }
                     else if (_hitcounter >= HITCOUNTER_SLOW_MORE)
                     {
@@ -190,8 +190,8 @@ class boss_viscidus : public CreatureScript
             void InitSpells()
             {
                 DoCast(me, SPELL_TOXIN);
-                events.ScheduleEvent(EVENT_POISONBOLT_VOLLEY, urand(10000, 15000));
-                events.ScheduleEvent(EVENT_POISON_SHOCK, urand(7000, 12000));
+                events.ScheduleEvent(EVENT_POISONBOLT_VOLLEY, 10s, 15s);
+                events.ScheduleEvent(EVENT_POISON_SHOCK, 7s, 12s);
             }
 
             void EnterEvadeMode(EvadeReason why) override
@@ -233,11 +233,11 @@ class boss_viscidus : public CreatureScript
                     {
                         case EVENT_POISONBOLT_VOLLEY:
                             DoCast(me, SPELL_POISONBOLT_VOLLEY);
-                            events.ScheduleEvent(EVENT_POISONBOLT_VOLLEY, urand(10000, 15000));
+                            events.ScheduleEvent(EVENT_POISONBOLT_VOLLEY, 10s, 15s);
                             break;
                         case EVENT_POISON_SHOCK:
                             DoCast(me, SPELL_POISON_SHOCK);
-                            events.ScheduleEvent(EVENT_POISON_SHOCK, urand(7000, 12000));
+                            events.ScheduleEvent(EVENT_POISON_SHOCK, 7s, 12s);
                             break;
                         case EVENT_RESET_PHASE:
                             _hitcounter = 0;
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
index 634fb802083..253275f516c 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp
@@ -76,8 +76,8 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             Talk(SAY_SANCT_INVADE);
-            events.ScheduleEvent(EVENT_SHADOW_BOLT, 1000);
-            events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 10000);
+            events.ScheduleEvent(EVENT_SHADOW_BOLT, 1s);
+            events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 10s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -103,7 +103,7 @@ public:
                 {
                     case EVENT_SHADOW_BOLT:
                         DoCastVictim(SPELL_SHADOW_BOLT);
-                        events.ScheduleEvent(EVENT_SHADOW_BOLT, 4000);
+                        events.ScheduleEvent(EVENT_SHADOW_BOLT, 4s);
                         break;
                     case EVENT_WARD_OF_ZUM_RAH:
                         DoCast(me,SPELL_WARD_OF_ZUM_RAH);
@@ -114,7 +114,7 @@ public:
                     case EVENT_SHADOWBOLT_VOLLEY:
                         if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                             DoCast(target, SPELL_SHADOWBOLT_VOLLEY);
-                        events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 9000);
+                        events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 9s);
                         break;
                     default:
                         break;
@@ -125,20 +125,20 @@ public:
             {
                 _ward80 = true;
                 Talk(SAY_WARD);
-                events.ScheduleEvent(EVENT_WARD_OF_ZUM_RAH, 1000);
+                events.ScheduleEvent(EVENT_WARD_OF_ZUM_RAH, 1s);
             }
 
             if (!_ward40 && HealthBelowPct(40))
             {
                 _ward40 = true;
                 Talk(SAY_WARD);
-                events.ScheduleEvent(EVENT_WARD_OF_ZUM_RAH, 1000);
+                events.ScheduleEvent(EVENT_WARD_OF_ZUM_RAH, 1s);
             }
 
             if (!_heal30 && HealthBelowPct(30))
             {
                 _heal30 = true;
-                events.ScheduleEvent(EVENT_HEALING_WAVE, 3000);
+                events.ScheduleEvent(EVENT_HEALING_WAVE, 3s);
             }
 
             DoMeleeAttackIfReady();
diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp
index ef22f8451dd..cec6b99fed1 100644
--- a/src/server/scripts/Kalimdor/boss_azuregos.cpp
+++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp
@@ -73,13 +73,13 @@ class boss_azuregos : public CreatureScript
                 DoCast(me, SPELL_MARK_OF_FROST_AURA, true);
                 _enraged = false;
 
-                events.ScheduleEvent(EVENT_MARK_OF_FROST, 35000);
-                events.ScheduleEvent(EVENT_MANA_STORM, urand(5000, 17000));
-                events.ScheduleEvent(EVENT_CHILL, urand(10000, 30000));
-                events.ScheduleEvent(EVENT_BREATH, urand(2000, 8000));
-                events.ScheduleEvent(EVENT_TELEPORT, 30000);
-                events.ScheduleEvent(EVENT_REFLECT, urand(15000, 30000));
-                events.ScheduleEvent(EVENT_CLEAVE, 7000);
+                events.ScheduleEvent(EVENT_MARK_OF_FROST, 35s);
+                events.ScheduleEvent(EVENT_MANA_STORM, 5s, 17s);
+                events.ScheduleEvent(EVENT_CHILL, 10s, 30s);
+                events.ScheduleEvent(EVENT_BREATH, 2s, 8s);
+                events.ScheduleEvent(EVENT_TELEPORT, 30s);
+                events.ScheduleEvent(EVENT_REFLECT, 15s, 30s);
+                events.ScheduleEvent(EVENT_CLEAVE, 7s);
             }
 
             void KilledUnit(Unit* who) override
@@ -109,11 +109,11 @@ class boss_azuregos : public CreatureScript
                             break;
                         case EVENT_CHILL:
                             DoCastVictim(SPELL_CHILL);
-                            events.ScheduleEvent(EVENT_CHILL, urand(13000, 25000));
+                            events.ScheduleEvent(EVENT_CHILL, 13s, 25s);
                             break;
                         case EVENT_BREATH:
                             DoCastVictim(SPELL_FROST_BREATH);
-                            events.ScheduleEvent(EVENT_BREATH, urand(10000, 15000));
+                            events.ScheduleEvent(EVENT_BREATH, 10s, 15s);
                             break;
                         case EVENT_TELEPORT:
                         {
@@ -123,16 +123,16 @@ class boss_azuregos : public CreatureScript
                                     DoTeleportPlayer(player, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+3, player->GetOrientation());
 
                             ResetThreatList();
-                            events.ScheduleEvent(EVENT_TELEPORT, 30000);
+                            events.ScheduleEvent(EVENT_TELEPORT, 30s);
                             break;
                         }
                         case EVENT_REFLECT:
                             DoCast(me, SPELL_REFLECT);
-                            events.ScheduleEvent(EVENT_REFLECT, urand(20000, 35000));
+                            events.ScheduleEvent(EVENT_REFLECT, 20s, 35s);
                             break;
                         case EVENT_CLEAVE:
                             DoCastVictim(SPELL_CLEAVE);
-                            events.ScheduleEvent(EVENT_CLEAVE, 7000);
+                            events.ScheduleEvent(EVENT_CLEAVE, 7s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
index 2cfbc12cba2..965793ba7b2 100644
--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -368,7 +368,7 @@ public:
             if (quest->GetQuestId() == QUEST_A_CRY_FOR_HELP)
             {
                 _player = player->GetGUID();
-                _events.ScheduleEvent(EVENT_ACCEPT_QUEST, Seconds(2));
+                _events.ScheduleEvent(EVENT_ACCEPT_QUEST, 2s);
             }
         }
 
@@ -383,7 +383,7 @@ public:
                         break;
                     case 28:
                         player->GroupEventHappens(QUEST_A_CRY_FOR_HELP, me);
-                        _events.ScheduleEvent(EVENT_TALK_END, Seconds(2));
+                        _events.ScheduleEvent(EVENT_TALK_END, 2s);
                         SetRun(true);
                         break;
                     case 29:
@@ -407,12 +407,12 @@ public:
                         if (Player* player = ObjectAccessor::GetPlayer(*me, _player))
                             Talk(SAY_START, player);
                         me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
-                        _events.ScheduleEvent(EVENT_START_ESCORT, Seconds(1));
+                        _events.ScheduleEvent(EVENT_START_ESCORT, 1s);
                         break;
                     case EVENT_START_ESCORT:
                         if (Player* player = ObjectAccessor::GetPlayer(*me, _player))
                             EscortAI::Start(true, false, player->GetGUID());
-                        _events.ScheduleEvent(EVENT_STAND, Seconds(2));
+                        _events.ScheduleEvent(EVENT_STAND, 2s);
                         break;
                     case EVENT_STAND: // Remove kneel standstate. Using a separate delayed event because it causes unwanted delay before starting waypoint movement.
                         me->SetByteValue(UNIT_FIELD_BYTES_1, 0, 0);
@@ -420,7 +420,7 @@ public:
                     case EVENT_TALK_END:
                         if (Player* player = ObjectAccessor::GetPlayer(*me, _player))
                             Talk(SAY_END1, player);
-                        _events.ScheduleEvent(EVENT_COWLEN_TALK, Seconds(2));
+                        _events.ScheduleEvent(EVENT_COWLEN_TALK, 2s);
                         break;
                     case EVENT_COWLEN_TALK:
                         if (Creature* cowlen = me->FindNearestCreature(NPC_COWLEN, 50.0f, true))
diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
index 0adaf778e13..10370878955 100644
--- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
@@ -258,7 +258,7 @@ public:
         {
             _events.ScheduleEvent(EVENT_UPPERCUT,      15 * IN_MILLISECONDS);
             _events.ScheduleEvent(EVENT_IMMOLATE,      10 * IN_MILLISECONDS);
-            _events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 5 * IN_MILLISECONDS);
+            _events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 5s);
         }
 
         void JustDied(Unit* killer) override
@@ -293,15 +293,15 @@ public:
                 {
                     case EVENT_UPPERCUT:
                         DoCastVictim(SPELL_UPPERCUT);
-                        _events.ScheduleEvent(EVENT_UPPERCUT, urand(10, 12) * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_UPPERCUT, 10s, 12s);
                         break;
                     case EVENT_IMMOLATE:
                         DoCastVictim(SPELL_IMMOLATE);
-                        _events.ScheduleEvent(EVENT_IMMOLATE, urand(15, 20) * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_IMMOLATE, 15s, 20s);
                         break;
                     case EVENT_CURSE_OF_BLOOD:
                         DoCastVictim(SPELL_CURSE_OF_BLOOD);
-                        _events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, urand(20, 25) * IN_MILLISECONDS);
+                        _events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 20s, 25s);
                         break;
                     default:
                         break;
@@ -414,10 +414,10 @@ public:
             me->SetCanDualWield(true);
 
             _events.Reset();
-            _events.ScheduleEvent(EVENT_FROST_SHOCK, 1 * IN_MILLISECONDS);
-            _events.ScheduleEvent(EVENT_HEALING_SURGE, 5 * IN_MILLISECONDS);
-            _events.ScheduleEvent(EVENT_SEARING_TOTEM, 15 * IN_MILLISECONDS);
-            _events.ScheduleEvent(EVENT_STRENGTH_OF_EARTH_TOTEM, 20 * IN_MILLISECONDS);
+            _events.ScheduleEvent(EVENT_FROST_SHOCK, 1s);
+            _events.ScheduleEvent(EVENT_HEALING_SURGE, 5s);
+            _events.ScheduleEvent(EVENT_SEARING_TOTEM, 15s);
+            _events.ScheduleEvent(EVENT_STRENGTH_OF_EARTH_TOTEM, 20s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -433,7 +433,7 @@ public:
                         case EVENT_FROST_SHOCK:
                             DoCastVictim(SPELL_FROST_SHOCK);
                             _events.DelayEvents(1 * IN_MILLISECONDS);
-                            _events.ScheduleEvent(EVENT_FROST_SHOCK, urand(10, 15) * IN_MILLISECONDS);
+                            _events.ScheduleEvent(EVENT_FROST_SHOCK, 10s, 15s);
                             break;
                         case EVENT_SEARING_TOTEM:
                             DoCast(me, SPELL_SEARING_TOTEM);
@@ -456,10 +456,10 @@ public:
                             if (target)
                             {
                                 DoCast(target, SPELL_HEALING_SURGE);
-                                _events.ScheduleEvent(EVENT_HEALING_SURGE, 10 * IN_MILLISECONDS);
+                                _events.ScheduleEvent(EVENT_HEALING_SURGE, 10s);
                             }
                             else
-                                _events.ScheduleEvent(EVENT_HEALING_SURGE, 2 * IN_MILLISECONDS);
+                                _events.ScheduleEvent(EVENT_HEALING_SURGE, 2s);
                             break;
                         }
                         default:
diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp
index 7ed3b05e7b8..da79bc7518d 100644
--- a/src/server/scripts/Kalimdor/zone_durotar.cpp
+++ b/src/server/scripts/Kalimdor/zone_durotar.cpp
@@ -104,7 +104,7 @@ class npc_tiger_matriarch_credit : public CreatureScript
            npc_tiger_matriarch_creditAI(Creature* creature) : ScriptedAI(creature)
            {
                SetCombatMovement(false);
-               events.ScheduleEvent(EVENT_CHECK_SUMMON_AURA, 2000);
+               events.ScheduleEvent(EVENT_CHECK_SUMMON_AURA, 2s);
            }
 
             void UpdateAI(uint32 diff) override
@@ -134,7 +134,7 @@ class npc_tiger_matriarch_credit : public CreatureScript
                         }
                     }
 
-                    events.ScheduleEvent(EVENT_CHECK_SUMMON_AURA, 5000);
+                    events.ScheduleEvent(EVENT_CHECK_SUMMON_AURA, 5s);
                 }
             }
 
@@ -162,8 +162,8 @@ class npc_tiger_matriarch : public CreatureScript
             void JustEngagedWith(Unit* /*target*/) override
             {
                 _events.Reset();
-                _events.ScheduleEvent(EVENT_POUNCE, 100);
-                _events.ScheduleEvent(EVENT_NOSUMMON, 50000);
+                _events.ScheduleEvent(EVENT_POUNCE, 100ms);
+                _events.ScheduleEvent(EVENT_NOSUMMON, 50s);
             }
 
             void IsSummonedBy(Unit* summoner) override
@@ -234,7 +234,7 @@ class npc_tiger_matriarch : public CreatureScript
                     {
                         case EVENT_POUNCE:
                             DoCastVictim(SPELL_POUNCE);
-                            _events.ScheduleEvent(EVENT_POUNCE, 30000);
+                            _events.ScheduleEvent(EVENT_POUNCE, 30s);
                             break;
                         case EVENT_NOSUMMON: // Reapply SPELL_NO_SUMMON_AURA
                             if (Unit* tiger = ObjectAccessor::GetUnit(*me, _tigerGuid))
@@ -243,7 +243,7 @@ class npc_tiger_matriarch : public CreatureScript
                                     if (Unit* vehSummoner = tiger->ToTempSummon()->GetSummoner())
                                         me->AddAura(SPELL_NO_SUMMON_AURA, vehSummoner);
                             }
-                            _events.ScheduleEvent(EVENT_NOSUMMON, 50000);
+                            _events.ScheduleEvent(EVENT_NOSUMMON, 50s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp
index a96048242c0..9561bf2a668 100644
--- a/src/server/scripts/Kalimdor/zone_moonglade.cpp
+++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp
@@ -434,8 +434,8 @@ public:
         void JustEngagedWith(Unit* /*attacker*/) override
         {
             events.Reset();
-            events.ScheduleEvent(EVENT_CAST_CLEAVE, urand(3000, 5000));
-            events.ScheduleEvent(EVENT_CAST_STARFALL, urand(8000, 10000));
+            events.ScheduleEvent(EVENT_CAST_CLEAVE, 3s, 5s);
+            events.ScheduleEvent(EVENT_CAST_STARFALL, 8s, 10s);
         }
 
         void JustDied(Unit* /*killer*/) override
@@ -465,12 +465,12 @@ public:
             {
                 case EVENT_CAST_CLEAVE:
                     DoCastVictim(SPELL_OMEN_CLEAVE);
-                    events.ScheduleEvent(EVENT_CAST_CLEAVE, urand(8000, 10000));
+                    events.ScheduleEvent(EVENT_CAST_CLEAVE, 8s, 10s);
                     break;
                 case EVENT_CAST_STARFALL:
                     if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(target, SPELL_OMEN_STARFALL);
-                    events.ScheduleEvent(EVENT_CAST_STARFALL, urand(14000, 16000));
+                    events.ScheduleEvent(EVENT_CAST_STARFALL, 14s, 16s);
                     break;
             }
 
diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
index 0abb55f0107..c039b450c93 100644
--- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
@@ -781,7 +781,7 @@ public:
                         if (Creature* portal = ObjectAccessor::GetCreature(*me, stormwindPortalGUID))
                             portal->DespawnOrUnsummon();
 
-                        events.ScheduleEvent(EVENT_HERALD_RESET, 60000);
+                        events.ScheduleEvent(EVENT_HERALD_RESET, 1min);
                         break;
                     }
                     case EVENT_HERALD_RESET:
diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
index 855429b3cd8..db2be431293 100644
--- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
@@ -627,7 +627,7 @@ public:
                     if (Player* player = GetPlayerForEscort())
                     {
                         player->GroupEventHappens(QUEST_ESCAPE, me);
-                        me->DespawnOrUnsummon(3min);
+                        me->DespawnOrUnsummon(5min);
                         me->SummonCreature(NPC_PILOT_WIZZ, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 180000);
                     }
                     break;
diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp
index f90f86b2494..4db3f7126ae 100644
--- a/src/server/scripts/Kalimdor/zone_winterspring.cpp
+++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp
@@ -390,7 +390,7 @@ public:
                     SetEscortPaused(true);
                     DoSummonPriestess();
                     Talk(SAY_RANSHALLA_ALTAR_2);
-                    events.ScheduleEvent(EVENT_RESUME, 2000);
+                    events.ScheduleEvent(EVENT_RESUME, 2s);
                     break;
                 case 44:
                     // Stop the escort and turn towards the altar