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

11 files changed, 77 insertions, 77 deletions

diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 2ed16192e5d..1464d3ebcbf 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -366,7 +366,7 @@ struct advisorbase_ai : public ScriptedAI
             _hasRessurrected = true;
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED);
             me->SetStandState(UNIT_STAND_STATE_STAND);
-            events.ScheduleEvent(EVENT_DELAYED_RESSURECTION, 2000);
+            events.ScheduleEvent(EVENT_DELAYED_RESSURECTION, 2s);
         }
     }
 
@@ -494,7 +494,7 @@ class boss_kaelthas : public CreatureScript
 
                         _phase = PHASE_INTRO;
                         instance->SetBossState(DATA_KAELTHAS, IN_PROGRESS);
-                        events.ScheduleEvent(EVENT_START_ENCOUNTER, 23000);
+                        events.ScheduleEvent(EVENT_START_ENCOUNTER, 23s);
                         break;
                     case ACTION_PREPARE_ADVISORS:
                         for (uint8 i = 0; i < MAX_ADVISORS; ++i)
@@ -516,7 +516,7 @@ class boss_kaelthas : public CreatureScript
                         {
                             case ADVISOR_THALADRED:
                                 Talk(SAY_INTRO_THALADRED);
-                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 7000);
+                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 7s);
                                 break;
                             case ADVISOR_SANGUINAR:
                                 Talk(SAY_INTRO_SANGUINAR);
@@ -524,20 +524,20 @@ class boss_kaelthas : public CreatureScript
                                 break;
                             case ADVISOR_CAPERNIAN:
                                 Talk(SAY_INTRO_CAPERNIAN);
-                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 7000);
+                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 7s);
                                 break;
                             case ADVISOR_TELONICUS:
                                 Talk(SAY_INTRO_TELONICUS);
-                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 8400);
+                                events.ScheduleEvent(EVENT_ACTIVE_ADVISOR, 8400ms);
                                 break;
                             case MAX_DEFEATED_ADVISORS:
                                 // Every advisor defeated - Phase 2 starts.
                                 Talk(SAY_PHASE2_WEAPON);
-                                events.ScheduleEvent(EVENT_SUMMON_WEAPONS, 3500);
+                                events.ScheduleEvent(EVENT_SUMMON_WEAPONS, 3500ms);
                                 break;
                             case MAX_KILLED_ADVISORS:
                                 // Every advisor killed - Phase 3 starts.
-                                events.ScheduleEvent(EVENT_ENGAGE_COMBAT, 5000);
+                                events.ScheduleEvent(EVENT_ENGAGE_COMBAT, 5s);
                                 break;
                             default:
                                 break;
@@ -608,14 +608,14 @@ class boss_kaelthas : public CreatureScript
                         me->SetDisableGravity(true);
                         //me->SetHover(true); -- Set in sniffs, but breaks his visual.
                         events.ScheduleEvent(EVENT_TRANSITION_2, 2000);
-                        events.ScheduleEvent(EVENT_SIZE_INCREASE, 5000);
+                        events.ScheduleEvent(EVENT_SIZE_INCREASE, 5s);
                         break;
                     case POINT_TRANSITION_HALFWAY_ASCENDING:
                         DoCast(me, SPELL_NETHER_BEAM_VISUAL3, true);
                         events.ScheduleEvent(EVENT_TRANSITION_3, 1000);
                         break;
                     case POINT_TRANSITION_TOP:
-                        events.ScheduleEvent(EVENT_EXPLODE, 10000);
+                        events.ScheduleEvent(EVENT_EXPLODE, 10s);
                         break;
                     case POINT_TRANSITION_HALFWAY_DESCENDING:
                         events.ScheduleEvent(EVENT_TRANSITION_5, 2000);
@@ -761,7 +761,7 @@ class boss_kaelthas : public CreatureScript
                             if (_pyrosCast < 3)
                             {
                                 DoCastVictim(SPELL_PYROBLAST);
-                                events.ScheduleEvent(EVENT_PYROBLAST_CAST, 3000);
+                                events.ScheduleEvent(EVENT_PYROBLAST_CAST, 3s);
                                 _pyrosCast++;
                             }
                             else
@@ -783,7 +783,7 @@ class boss_kaelthas : public CreatureScript
                                     DoCast(unit, SPELL_NETHER_BEAM);
 
                                 _netherbeamsCast++;
-                                events.ScheduleEvent(EVENT_NETHER_BEAM, 3000);
+                                events.ScheduleEvent(EVENT_NETHER_BEAM, 3s);
                             }
                             else
                                 _netherbeamsCast = 0;
@@ -823,22 +823,22 @@ class boss_kaelthas : public CreatureScript
                             if (GameObject* window = instance->GetGameObject(DATA_TEMPEST_BRIDGE_WINDOW))
                                 window->UseDoorOrButton();
 
-                            events.ScheduleEvent(EVENT_END_TRANSITION, 10000);
+                            events.ScheduleEvent(EVENT_END_TRANSITION, 10s);
                             break;
                         case EVENT_SIZE_INCREASE:
                             switch (_scaleStage)
                             {
                                 case 0:
                                     me->SetObjectScale(1.4f);
-                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 5000);
+                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 5s);
                                     break;
                                 case 1:
                                     me->SetObjectScale(1.8f);
-                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 3000);
+                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 3s);
                                     break;
                                 case 2:
                                     me->SetObjectScale(2.0f);
-                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 1000);
+                                    events.ScheduleEvent(EVENT_SIZE_INCREASE, 1s);
                                     break;
                                 case 3:
                                     me->SetObjectScale(2.2f);
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index 410480f5f50..ebabe28e45b 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -85,9 +85,9 @@ class boss_void_reaver : public CreatureScript
                 _JustEngagedWith();
 
                 events.ScheduleEvent(EVENT_POUNDING, 15000);
-                events.ScheduleEvent(EVENT_ARCANE_ORB, 3000);
-                events.ScheduleEvent(EVENT_KNOCK_AWAY, 30000);
-                events.ScheduleEvent(EVENT_BERSERK, 600000);
+                events.ScheduleEvent(EVENT_ARCANE_ORB, 3s);
+                events.ScheduleEvent(EVENT_KNOCK_AWAY, 30s);
+                events.ScheduleEvent(EVENT_BERSERK, 10min);
             }
 
             void UpdateAI(uint32 diff) override
@@ -128,7 +128,7 @@ class boss_void_reaver : public CreatureScript
                             if (target)
                                 me->CastSpell(target, SPELL_ARCANE_ORB);
 
-                            events.ScheduleEvent(EVENT_ARCANE_ORB, 3000);
+                            events.ScheduleEvent(EVENT_ARCANE_ORB, 3s);
                             break;
                         }
                         case EVENT_KNOCK_AWAY:
@@ -137,7 +137,7 @@ class boss_void_reaver : public CreatureScript
                             if (GetThreat(me->GetVictim()))
                                 ModifyThreatByPercent(me->GetVictim(), -25);
 
-                            events.ScheduleEvent(EVENT_KNOCK_AWAY, 30000);
+                            events.ScheduleEvent(EVENT_KNOCK_AWAY, 30s);
                             break;
                         case EVENT_BERSERK:
                             if (!Enraged)
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
index 3ec963d4131..50f44a7816a 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -68,8 +68,8 @@ class boss_gatewatcher_gyrokill : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10000);
-                events.ScheduleEvent(EVENT_SAW_BLADE, 20000);
+                events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10s);
+                events.ScheduleEvent(EVENT_SAW_BLADE, 20s);
                 events.ScheduleEvent(EVENT_SHADOW_POWER, 25000);
                 Talk(SAY_AGGRO);
             }
@@ -95,16 +95,16 @@ class boss_gatewatcher_gyrokill : public CreatureScript
                     {
                         case EVENT_STREAM_OF_MACHINE_FLUID:
                             DoCastVictim(SPELL_STREAM_OF_MACHINE_FLUID, true);
-                            events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, urand(13000, 17000));
+                            events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 13s, 17s);
                             break;
                         case EVENT_SAW_BLADE:
                             DoCast(me, SPELL_SAW_BLADE);
                             Talk(SAY_SAW_BLADEs);
-                            events.ScheduleEvent(EVENT_SAW_BLADE, urand(20000, 30000));
+                            events.ScheduleEvent(EVENT_SAW_BLADE, 20s, 30s);
                             break;
                         case EVENT_SHADOW_POWER:
                             DoCast(me, SPELL_SHADOW_POWER);
-                            events.ScheduleEvent(EVENT_SAW_BLADE, urand(25000, 35000));
+                            events.ScheduleEvent(EVENT_SAW_BLADE, 25s, 35s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
index 584706c13ba..fc5a0243cf4 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
@@ -99,7 +99,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript
                     {
                         case EVENT_STREAM_OF_MACHINE_FLUID:
                             DoCastVictim(SPELL_STREAM_OF_MACHINE_FLUID, true);
-                            events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, urand(35000, 50000));
+                            events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 35s, 50s);
                             break;
                         case EVENT_JACKHAMMER:
                             Talk(EMOTE_HAMMER);
@@ -107,11 +107,11 @@ class boss_gatewatcher_iron_hand : public CreatureScript
                             DoCastVictim(SPELL_JACKHAMMER, true);
                             if (roll_chance_i(50))
                                 Talk(SAY_HAMMER);
-                            events.ScheduleEvent(EVENT_JACKHAMMER, 30000);
+                            events.ScheduleEvent(EVENT_JACKHAMMER, 30s);
                             break;
                         case EVENT_SHADOW_POWER:
                             DoCast(me, SPELL_SHADOW_POWER);
-                            events.ScheduleEvent(EVENT_SHADOW_POWER, urand(20000, 28000));
+                            events.ScheduleEvent(EVENT_SHADOW_POWER, 20s, 28s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
index c8f1a3666aa..81e61522f29 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
@@ -80,13 +80,13 @@ class boss_mechano_lord_capacitus : public CreatureScript
             {
                 _JustEngagedWith();
                 Talk(YELL_AGGRO);
-                events.ScheduleEvent(EVENT_HEADCRACK, 10 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 15 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10 * IN_MILLISECONDS);
-                events.ScheduleEvent(EVENT_BERSERK, 3 * MINUTE * IN_MILLISECONDS);
+                events.ScheduleEvent(EVENT_HEADCRACK, 10s);
+                events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 15s);
+                events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10s);
+                events.ScheduleEvent(EVENT_BERSERK, 3min);
 
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_POSITIVE_SHIFT, 15 * IN_MILLISECONDS);
+                    events.ScheduleEvent(EVENT_POSITIVE_SHIFT, 15s);
             }
 
             void KilledUnit(Unit* /*victim*/) override
@@ -116,27 +116,27 @@ class boss_mechano_lord_capacitus : public CreatureScript
                     {
                         case EVENT_HEADCRACK:
                             DoCastVictim(SPELL_HEADCRACK);
-                            events.ScheduleEvent(EVENT_HEADCRACK, 10 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_HEADCRACK, 10s);
                             break;
                         case EVENT_REFLECTIVE_DAMAGE_SHIELD:
                             Talk(YELL_REFLECTIVE_DAMAGE_SHIELD);
                             DoCast(me, SPELL_REFLECTIVE_DAMAGE_SHIELD);
-                            events.ScheduleEvent(EVENT_REFLECTIVE_MAGIE_SHIELD, 30 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_REFLECTIVE_MAGIE_SHIELD, 30s);
                             break;
                         case EVENT_REFLECTIVE_MAGIE_SHIELD:
                             Talk(YELL_REFLECTIVE_MAGIC_SHIELD);
                             DoCast(me, SPELL_REFLECTIVE_MAGIC_SHIELD);
-                            events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 30 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 30s);
                             break;
                         case EVENT_POSITIVE_SHIFT:
                             DoCastAOE(SPELL_POLARITY_SHIFT);
-                            events.ScheduleEvent(EVENT_POSITIVE_SHIFT, urand(45, 60) * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_POSITIVE_SHIFT, 45s, 60s);
                             break;
                         case EVENT_SUMMON_NETHER_CHARGE:
                         {
                             Position pos = me->GetRandomNearPosition(5.0f);
                             me->SummonCreature(NPC_NETHER_CHARGE, pos, TEMPSUMMON_TIMED_DESPAWN, 18000);
-                            events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10 * IN_MILLISECONDS);
+                            events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10s);
                             break;
                         }
                         case EVENT_BERSERK:
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index e364704c588..a797348fe32 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -72,11 +72,11 @@ class boss_nethermancer_sepethrea : public CreatureScript
             void JustEngagedWith(Unit* who) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_FROST_ATTACK, urand(7000, 10000));
-                events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(12000, 18000));
-                events.ScheduleEvent(EVENT_DRAGONS_BREATH, urand(18000, 22000));
-                events.ScheduleEvent(EVENT_KNOCKBACK, urand(22000, 28000));
-                events.ScheduleEvent(EVENT_SOLARBURN, 30000);
+                events.ScheduleEvent(EVENT_FROST_ATTACK, 7s, 10s);
+                events.ScheduleEvent(EVENT_ARCANE_BLAST, 12s, 18s);
+                events.ScheduleEvent(EVENT_DRAGONS_BREATH, 18s, 22s);
+                events.ScheduleEvent(EVENT_KNOCKBACK, 22s, 28s);
+                events.ScheduleEvent(EVENT_SOLARBURN, 30s);
                 Talk(SAY_AGGRO);
                 DoCast(who, SPELL_SUMMON_RAGIN_FLAMES);
                 Talk(SAY_SUMMON);
@@ -109,7 +109,7 @@ class boss_nethermancer_sepethrea : public CreatureScript
                     {
                         case EVENT_FROST_ATTACK:
                             DoCastVictim(SPELL_FROST_ATTACK, true);
-                            events.ScheduleEvent(EVENT_FROST_ATTACK, urand(7000, 10000));
+                            events.ScheduleEvent(EVENT_FROST_ATTACK, 7s, 10s);
                             break;
                         case EVENT_ARCANE_BLAST:
                             DoCastVictim(SPELL_ARCANE_BLAST, true);
@@ -117,17 +117,17 @@ class boss_nethermancer_sepethrea : public CreatureScript
                             break;
                         case EVENT_DRAGONS_BREATH:
                             DoCastVictim(SPELL_DRAGONS_BREATH, true);
-                            events.ScheduleEvent(EVENT_DRAGONS_BREATH, urand(12000, 22000));
+                            events.ScheduleEvent(EVENT_DRAGONS_BREATH, 12s, 22s);
                             if (roll_chance_i(50))
                                 Talk(SAY_DRAGONS_BREATH);
                             break;
                         case EVENT_KNOCKBACK:
                             DoCastVictim(SPELL_KNOCKBACK, true);
-                            events.ScheduleEvent(EVENT_KNOCKBACK, urand(15000, 25000));
+                            events.ScheduleEvent(EVENT_KNOCKBACK, 15s, 25s);
                             break;
                         case EVENT_SOLARBURN:
                             DoCastVictim(SPELL_SOLARBURN, true);
-                            events.ScheduleEvent(EVENT_SOLARBURN, 30000);
+                            events.ScheduleEvent(EVENT_SOLARBURN, 30s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
index d7767be345f..11b0548b7ce 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -79,11 +79,11 @@ class boss_pathaleon_the_calculator : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_SUMMON, 30000);
-                events.ScheduleEvent(EVENT_MANA_TAP, urand(12000, 20000));
-                events.ScheduleEvent(EVENT_ARCANE_TORRENT, urand(16000, 25000));
-                events.ScheduleEvent(EVENT_DOMINATION, urand(25000, 40000));
-                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(8000, 13000));
+                events.ScheduleEvent(EVENT_SUMMON, 30s);
+                events.ScheduleEvent(EVENT_MANA_TAP, 12s, 20s);
+                events.ScheduleEvent(EVENT_ARCANE_TORRENT, 16s, 25s);
+                events.ScheduleEvent(EVENT_DOMINATION, 25s, 40s);
+                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 8s, 13s);
                 Talk(SAY_AGGRO);
             }
 
@@ -131,24 +131,24 @@ class boss_pathaleon_the_calculator : public CreatureScript
                                 }
                             }
                             Talk(SAY_SUMMON);
-                            events.ScheduleEvent(EVENT_SUMMON, urand(30000, 45000));
+                            events.ScheduleEvent(EVENT_SUMMON, 30s, 45s);
                             break;
                         case EVENT_MANA_TAP:
                             DoCastVictim(SPELL_MANA_TAP, true);
-                            events.ScheduleEvent(EVENT_MANA_TAP, urand(14000, 22000));
+                            events.ScheduleEvent(EVENT_MANA_TAP, 14s, 22s);
                             break;
                         case EVENT_ARCANE_TORRENT:
                             DoCastVictim(SPELL_ARCANE_TORRENT, true);
-                            events.ScheduleEvent(EVENT_ARCANE_TORRENT, urand(12000, 18000));
+                            events.ScheduleEvent(EVENT_ARCANE_TORRENT, 12s, 18s);
                             break;
                         case EVENT_DOMINATION:
                             Talk(SAY_DOMINATION);
                             DoCastVictim(SPELL_DOMINATION, true);
-                            events.ScheduleEvent(EVENT_DOMINATION, urand(25000, 30000));
+                            events.ScheduleEvent(EVENT_DOMINATION, 25s, 30s);
                             break;
                         case EVENT_ARCANE_EXPLOSION: // Heroic only
                             DoCastVictim(H_SPELL_ARCANE_EXPLOSION, true);
-                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, urand(10000, 14000));
+                            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 10s, 14s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
index dce22c470b2..9d820af9c68 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
@@ -87,11 +87,11 @@ class boss_dalliah_the_doomsayer : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, urand(1000, 4000));
-                events.ScheduleEvent(EVENT_WHIRLWIND, urand(7000, 9000));
+                events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, 1s, 4s);
+                events.ScheduleEvent(EVENT_WHIRLWIND, 7s, 9s);
                 if (IsHeroic())
-                    events.ScheduleEvent(EVENT_SHADOW_WAVE, urand(11000, 16000));
-                events.ScheduleEvent(EVENT_ME_FIRST, 6000);
+                    events.ScheduleEvent(EVENT_SHADOW_WAVE, 11s, 16s);
+                events.ScheduleEvent(EVENT_ME_FIRST, 6s);
                 Talk(SAY_AGGRO);
             }
 
@@ -105,7 +105,7 @@ class boss_dalliah_the_doomsayer : public CreatureScript
                 switch (data)
                 {
                     case 1:
-                        events.ScheduleEvent(EVENT_SOCCOTHRATES_DEATH, 6000);
+                        events.ScheduleEvent(EVENT_SOCCOTHRATES_DEATH, 6s);
                         soccothratesDeath = true;
                         break;
                     default:
@@ -148,13 +148,13 @@ class boss_dalliah_the_doomsayer : public CreatureScript
                     {
                         case EVENT_GIFT_OF_THE_DOOMSAYER:
                             DoCastVictim(SPELL_GIFT_OF_THE_DOOMSAYER, true);
-                            events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, urand(16000, 21000));
+                            events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, 16s, 21s);
                             break;
                         case EVENT_WHIRLWIND:
                             DoCast(me, SPELL_WHIRLWIND);
                             Talk(SAY_WHIRLWIND);
-                            events.ScheduleEvent(EVENT_WHIRLWIND, urand(19000, 21000));
-                            events.ScheduleEvent(EVENT_HEAL, 6000);
+                            events.ScheduleEvent(EVENT_WHIRLWIND, 19s, 21s);
+                            events.ScheduleEvent(EVENT_HEAL, 6s);
                             break;
                         case EVENT_HEAL:
                             DoCast(me, SPELL_HEAL);
@@ -162,7 +162,7 @@ class boss_dalliah_the_doomsayer : public CreatureScript
                             break;
                         case EVENT_SHADOW_WAVE:
                             DoCastVictim(SPELL_SHADOW_WAVE, true);
-                            events.ScheduleEvent(EVENT_SHADOW_WAVE, urand(11000, 16000));
+                            events.ScheduleEvent(EVENT_SHADOW_WAVE, 11s, 16s);
                             break;
                         case EVENT_ME_FIRST:
                             if (Creature* soccothrates = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_SOCCOTHRATES)))
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
index 812ca3e1132..49dd986d5a8 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
@@ -114,9 +114,9 @@ class boss_wrath_scryer_soccothrates : public CreatureScript
             void JustEngagedWith(Unit* /*who*/) override
             {
                 _JustEngagedWith();
-                events.ScheduleEvent(EVENT_FELFIRE_SHOCK, urand(12000, 14000));
-                events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(11000, 12000));
-                events.ScheduleEvent(EVENT_ME_FIRST, 6000);
+                events.ScheduleEvent(EVENT_FELFIRE_SHOCK, 12s, 14s);
+                events.ScheduleEvent(EVENT_KNOCK_AWAY, 11s, 12s);
+                events.ScheduleEvent(EVENT_ME_FIRST, 6s);
                 Talk(SAY_AGGRO);
                 preFight = false;
             }
@@ -143,7 +143,7 @@ class boss_wrath_scryer_soccothrates : public CreatureScript
                 switch (data)
                 {
                     case 1:
-                        events.ScheduleEvent(EVENT_DALLIAH_DEATH, 6000);
+                        events.ScheduleEvent(EVENT_DALLIAH_DEATH, 6s);
                         dalliahDeath = true;
                         break;
                     default:
@@ -246,12 +246,12 @@ class boss_wrath_scryer_soccothrates : public CreatureScript
                     {
                         case EVENT_FELFIRE_SHOCK:
                             DoCastVictim(SPELL_FELFIRE_SHOCK, true);
-                            events.ScheduleEvent(EVENT_FELFIRE_SHOCK, urand(12000, 14000));
+                            events.ScheduleEvent(EVENT_FELFIRE_SHOCK, 12s, 14s);
                             break;
                         case EVENT_KNOCK_AWAY:
                             DoCast(me, SPELL_KNOCK_AWAY);
                             Talk(SAY_KNOCK_AWAY);
-                            events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(11000, 12000));
+                            events.ScheduleEvent(EVENT_KNOCK_AWAY, 11s, 12s);
                             break;
                         case EVENT_ME_FIRST:
                             if (Creature* dalliah = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_DALLIAH)))
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
index b51224570b8..042e8ccf577 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
@@ -66,7 +66,7 @@ class boss_zereketh_the_unbound : public CreatureScript
                 _JustEngagedWith();
                 events.ScheduleEvent(EVENT_VOID_ZONE, urand (6000, 10000));
                 events.ScheduleEvent(EVENT_SHADOW_NOVA, urand (6000, 10000));
-                events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, urand(12000, 20000));
+                events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, 12s, 20s);
                 Talk(SAY_AGGRO);
             }
 
@@ -102,7 +102,7 @@ class boss_zereketh_the_unbound : public CreatureScript
                         case EVENT_SEED_OF_CORRUPTION:
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true))
                                 DoCast(target, SPELL_SEED_OF_CORRUPTION);
-                            events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, urand(12000, 20000));
+                            events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, 12s, 20s);
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
index 5bea3017ffa..b22be14450b 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
@@ -72,9 +72,9 @@ class boss_thorngrin_the_tender : public CreatureScript
             {
                 _JustEngagedWith();
                 Talk(SAY_AGGRO);
-                events.ScheduleEvent(EVENT_SACRIFICE, 5700);
+                events.ScheduleEvent(EVENT_SACRIFICE, 5700ms);
                 events.ScheduleEvent(EVENT_HELLFIRE, IsHeroic() ? urand(17400, 19300) : 18000);
-                events.ScheduleEvent(EVENT_ENRAGE, 12000);
+                events.ScheduleEvent(EVENT_ENRAGE, 12s);
             }
 
             void KilledUnit(Unit* /*victim*/) override
@@ -132,7 +132,7 @@ class boss_thorngrin_the_tender : public CreatureScript
                         case EVENT_ENRAGE:
                             Talk(EMOTE_ENRAGE);
                             DoCast(me, SPELL_ENRAGE);
-                            events.ScheduleEvent(EVENT_ENRAGE, 33000);
+                            events.ScheduleEvent(EVENT_ENRAGE, 33s);
                             break;
                         default:
                             break;