Scripts/Stonecore: Use std::chrono::duration overloads of EventMap

5 files changed, 78 insertions, 78 deletions

diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
index aa95e7be17e..422e526ff98 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
@@ -97,9 +97,9 @@ class boss_corborus : public CreatureScript
 
                 countTrashingCharge = 0;
 
-                events.ScheduleEvent(EVENT_DAMPENING_WAVE, 10000);
-                events.ScheduleEvent(EVENT_CRYSTAL_BARRAGE, 15000);
-                events.ScheduleEvent(EVENT_SUBMERGE, 36000);
+                events.ScheduleEvent(EVENT_DAMPENING_WAVE, 10s);
+                events.ScheduleEvent(EVENT_CRYSTAL_BARRAGE, 15s);
+                events.ScheduleEvent(EVENT_SUBMERGE, 36s);
             }
 
             void DoAction(int32 action) override
@@ -120,7 +120,7 @@ class boss_corborus : public CreatureScript
                             Millhouse->HandleEmoteCommand(EMOTE_ONESHOT_KNOCKDOWN);
                         }
 
-                        events.ScheduleEvent(EVENT_CORBORUS_CHARGE, 1000);
+                        events.ScheduleEvent(EVENT_CORBORUS_CHARGE, 1s);
                         break;
                     }
                     default:
@@ -154,7 +154,7 @@ class boss_corborus : public CreatureScript
                             // Make Corborus charge
                             DoCast(me, SPELL_RING_WYRM_CHARGE, true);
 
-                            events.ScheduleEvent(EVENT_CORBORUS_KNOCKBACK, 1000);
+                            events.ScheduleEvent(EVENT_CORBORUS_KNOCKBACK, 1s);
                             break;
                         case EVENT_CORBORUS_KNOCKBACK:
                             // Spawn Twilight Documents (quest gameobject)
@@ -164,7 +164,7 @@ class boss_corborus : public CreatureScript
                             // Knockback Millhouse and other mobs
                             instance->SetData(DATA_MILLHOUSE_EVENT_KNOCKBACK, 0);
 
-                            events.ScheduleEvent(EVENT_CORBORUS_FACEPLAYERS, 2000);
+                            events.ScheduleEvent(EVENT_CORBORUS_FACEPLAYERS, 2s);
                             break;
                         case EVENT_CORBORUS_FACEPLAYERS:
                             // Face Corborus to players and set new home position
@@ -179,17 +179,17 @@ class boss_corborus : public CreatureScript
                             break;
                         case EVENT_DAMPENING_WAVE:
                             DoCastVictim(SPELL_DAMPENING_WAVE);
-                            events.ScheduleEvent(EVENT_DAMPENING_WAVE, 15000);
+                            events.ScheduleEvent(EVENT_DAMPENING_WAVE, 15s);
                             break;
                         case EVENT_CRYSTAL_BARRAGE:
                             if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true))
                                 DoCast(target, SPELL_CRYSTAL_BARRAGE);
-                            events.ScheduleEvent(EVENT_CRYSTAL_BARRAGE, 10000);
+                            events.ScheduleEvent(EVENT_CRYSTAL_BARRAGE, 10s);
                             break;
                         case EVENT_SUBMERGE:
-                            events.RescheduleEvent(EVENT_DAMPENING_WAVE, 35000);
-                            events.RescheduleEvent(EVENT_CRYSTAL_BARRAGE, 30000);
-                            events.RescheduleEvent(EVENT_SUBMERGE, 100000);
+                            events.RescheduleEvent(EVENT_DAMPENING_WAVE, 35s);
+                            events.RescheduleEvent(EVENT_CRYSTAL_BARRAGE, 30s);
+                            events.RescheduleEvent(EVENT_SUBMERGE, 100s);
 
                             me->SetReactState(REACT_PASSIVE);
                             me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
@@ -199,27 +199,27 @@ class boss_corborus : public CreatureScript
                             DoCast(me, SPELL_SUBMERGE);
 
                             countTrashingCharge = 0;
-                            events.ScheduleEvent(EVENT_TELEPORT, 500);
+                            events.ScheduleEvent(EVENT_TELEPORT, 500ms);
                             break;
                         case EVENT_TELEPORT:
                             if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true))
                                 DoCast(target, SPELL_TRASHING_CHARGE_TELEPORT);
                             countTrashingCharge += 1;
                             if (countTrashingCharge <= 4)
-                                events.ScheduleEvent(EVENT_TRASHING_CHARGE, 1000);
+                                events.ScheduleEvent(EVENT_TRASHING_CHARGE, 1s);
                             else
-                                events.ScheduleEvent(EVENT_EMERGE, 2500);
+                                events.ScheduleEvent(EVENT_EMERGE, 2500ms);
                             break;
                         case EVENT_TRASHING_CHARGE:
                             DoCast(me, SPELL_SUMMON_TRASHING_CHARGE);
                             DoCast(me, SPELL_TRASHING_CHARGE_VISUAL);
-                            events.ScheduleEvent(EVENT_TELEPORT, 5000);
+                            events.ScheduleEvent(EVENT_TELEPORT, 5s);
                             break;
                         case EVENT_EMERGE:
                             me->RemoveAllAuras();
                             me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
                             DoCast(me, SPELL_EMERGE);
-                            events.ScheduleEvent(EVENT_ATTACK, 2500);
+                            events.ScheduleEvent(EVENT_ATTACK, 2500ms);
                             break;
                         case EVENT_ATTACK:
                             me->SetReactState(REACT_AGGRESSIVE);
@@ -271,8 +271,8 @@ class npc_rock_borer : public CreatureScript
 
             void IsSummonedBy(WorldObject* /*summoner*/) override
             {
-                events.ScheduleEvent(EVENT_EMERGED, 1200);
-                events.ScheduleEvent(EVENT_ROCK_BORE, urand(15000, 20000)); // Need sniffs for this timer
+                events.ScheduleEvent(EVENT_EMERGED, 1200ms);
+                events.ScheduleEvent(EVENT_ROCK_BORE, 15s, 20s); // Need sniffs for this timer
                 DoZoneInCombat();
                 DoCast(me, SPELL_ROCK_BORER_EMERGE);
             }
@@ -297,7 +297,7 @@ class npc_rock_borer : public CreatureScript
                             break;
                         case EVENT_ROCK_BORE:
                             DoCast(me, SPELL_ROCK_BORE);
-                            events.ScheduleEvent(EVENT_ROCK_BORE, urand(15000, 20000)); // Need sniffs for this timer
+                            events.ScheduleEvent(EVENT_ROCK_BORE, 15s, 20s); // Need sniffs for this timer
                             break;
                         default:
                             break;
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
index 797c7b69eb0..0fdd8114fa4 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
@@ -141,13 +141,13 @@ class boss_high_priestess_azil : public CreatureScript
                 me->SetDisableGravity(false);
                 me->SetReactState(REACT_PASSIVE);
 
-                events.ScheduleEvent(EVENT_INTRO_MOVE, 2000);
-                events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 6000);
-                events.ScheduleEvent(EVENT_FORCE_GRIP, urand(8000,10000));
-                events.ScheduleEvent(EVENT_SUMMON_GRAVITY_WELL, 16000);
-                events.ScheduleEvent(EVENT_ENERGY_SHIELD, urand(35000,36000));
-                events.ScheduleEvent(EVENT_SUMMON_WAVE_SOUTH, 0);
-                events.ScheduleEvent(EVENT_SUMMON_WAVE_WEST, 40000);
+                events.ScheduleEvent(EVENT_INTRO_MOVE, 2s);
+                events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 6s);
+                events.ScheduleEvent(EVENT_FORCE_GRIP, 8s, 10s);
+                events.ScheduleEvent(EVENT_SUMMON_GRAVITY_WELL, 16s);
+                events.ScheduleEvent(EVENT_ENERGY_SHIELD, 35s, 36s);
+                events.ScheduleEvent(EVENT_SUMMON_WAVE_SOUTH, 0s);
+                events.ScheduleEvent(EVENT_SUMMON_WAVE_WEST, 40s);
             }
 
             void JustEngagedWith(Unit* who) override
@@ -180,7 +180,7 @@ class boss_high_priestess_azil : public CreatureScript
                     case POINT_FLY_UP:
                         me->SetCanFly(true);
                         me->SetDisableGravity(true);
-                        events.ScheduleEvent(EVENT_EARTH_FURY_FLY_ABOVE_PLATFORM, 1000);
+                        events.ScheduleEvent(EVENT_EARTH_FURY_FLY_ABOVE_PLATFORM, 1s);
                         break;
                     case POINT_ABOVE_PLATFORM:
                         me->SetFacingTo(5.218534f);
@@ -188,7 +188,7 @@ class boss_high_priestess_azil : public CreatureScript
                         DoCast(me, SPELL_SEISMIC_SHARD_SUMMON_1);
                         DoCast(me, SPELL_SEISMIC_SHARD_SUMMON_2);
                         DoCast(me, SPELL_SEISMIC_SHARD_SUMMON_3);
-                        events.ScheduleEvent(EVENT_EARTH_FURY_PREPARE_SHARD, 6700);
+                        events.ScheduleEvent(EVENT_EARTH_FURY_PREPARE_SHARD, 6700ms);
                         break;
                     case POINT_GROUND:
                         DoCast(me, SPELL_EJECT_ALL_PASSENGERS);
@@ -197,9 +197,9 @@ class boss_high_priestess_azil : public CreatureScript
                         me->SetReactState(REACT_AGGRESSIVE);
                         DoStartMovement(me->GetVictim());
                         // Find more sniffs to correct these timers, this was copied from Reset() void.
-                        events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 6000);
-                        events.ScheduleEvent(EVENT_FORCE_GRIP, urand(8000, 10000));
-                        events.ScheduleEvent(EVENT_SUMMON_GRAVITY_WELL, 16000);
+                        events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 6s);
+                        events.ScheduleEvent(EVENT_FORCE_GRIP, 8s, 10s);
+                        events.ScheduleEvent(EVENT_SUMMON_GRAVITY_WELL, 16s);
                         break;
                     default:
                         break;
@@ -226,27 +226,27 @@ class boss_high_priestess_azil : public CreatureScript
                         case EVENT_CURSE_OF_BLOOD:
                             if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true))
                                 DoCast(target, SPELL_CURSE_OF_BLOOD);
-                            events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, urand(13000, 15000));
+                            events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 13s, 15s);
                             break;
                         case EVENT_FORCE_GRIP:
                             DoCastVictim(SPELL_FORCE_GRIP);
-                            events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, urand(13000, 15000));
+                            events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 13s, 15s);
                             break;
                         case EVENT_SUMMON_GRAVITY_WELL:
                             if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true))
                                 DoCast(target, SPELL_SUMMON_GRAVITY_WELL);
-                            events.ScheduleEvent(EVENT_SUMMON_GRAVITY_WELL, urand(13000, 15000));
+                            events.ScheduleEvent(EVENT_SUMMON_GRAVITY_WELL, 13s, 15);
                             break;
                         case EVENT_ENERGY_SHIELD:
                             events.Reset();
                             DoCast(me, SPELL_EARTH_FURY_ENERGY_SHIELD);
-                            events.ScheduleEvent(EVENT_EARTH_FURY, 0);
+                            events.ScheduleEvent(EVENT_EARTH_FURY, 0s);
                             break;
                         case EVENT_EARTH_FURY:
                             countSeismicShard = 3;
                             me->SetReactState(REACT_PASSIVE);
                             me->SetFacingTo(5.862942f);
-                            events.ScheduleEvent(EVENT_EARTH_FURY_FLY_UP, 1600);
+                            events.ScheduleEvent(EVENT_EARTH_FURY_FLY_UP, 1600ms);
                             break;
                         case EVENT_EARTH_FURY_FLY_UP:
                             Talk(SAY_PHASE_TWO);
@@ -257,7 +257,7 @@ class boss_high_priestess_azil : public CreatureScript
                             break;
                         case EVENT_EARTH_FURY_PREPARE_SHARD:
                             DoCast(me, SPELL_SEISMIC_SHARD_PREPARE);
-                            events.ScheduleEvent(EVENT_EARTH_FURY_LAUNCH_SHARD, 1800);
+                            events.ScheduleEvent(EVENT_EARTH_FURY_LAUNCH_SHARD, 1800ms);
                             break;
                         case EVENT_EARTH_FURY_LAUNCH_SHARD:
                             if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true))
@@ -267,7 +267,7 @@ class boss_high_priestess_azil : public CreatureScript
                                 DoCast(me, SPELL_SEISMIC_SHARD_LAUNCH);
                                 countSeismicShard -= 1;
                             }
-                            events.ScheduleEvent(countSeismicShard > 0 ? EVENT_EARTH_FURY_PREPARE_SHARD : EVENT_EARTH_FURY_FLY_DOWN, 4800);
+                            events.ScheduleEvent(countSeismicShard > 0 ? EVENT_EARTH_FURY_PREPARE_SHARD : EVENT_EARTH_FURY_FLY_DOWN, 4800ms);
                             break;
                         case EVENT_EARTH_FURY_FLY_DOWN:
                         {
@@ -281,12 +281,12 @@ class boss_high_priestess_azil : public CreatureScript
                         case EVENT_SUMMON_WAVE_SOUTH:
                             if (Creature* worldtrigger = me->FindNearestCreature(NPC_WORLDTRIGGER, 150.0f))
                                 worldtrigger->CastSpell(worldtrigger, SPELL_SUMMON_WAVE_SOUTH);
-                            events.ScheduleEvent(EVENT_SUMMON_WAVE_SOUTH, 12000);
+                            events.ScheduleEvent(EVENT_SUMMON_WAVE_SOUTH, 12s);
                             break;
                         case EVENT_SUMMON_WAVE_WEST:
                             if (Creature* worldtrigger = me->FindNearestCreature(NPC_WORLDTRIGGER, 150.0f))
                                 worldtrigger->CastSpell(worldtrigger, SPELL_SUMMON_WAVE_WEST);
-                            events.ScheduleEvent(EVENT_SUMMON_WAVE_WEST, 20000);
+                            events.ScheduleEvent(EVENT_SUMMON_WAVE_WEST, 20s);
                             break;
                         default:
                             break;
@@ -351,8 +351,8 @@ public:
         npc_gravity_wellAI(Creature* creature) : ScriptedAI(creature)
         {
             DoCast(me, SPELL_GRAVITY_WELL_VISUAL);
-            events.ScheduleEvent(EVENT_GRAVITY_WELL_AURA_DAMAGE, 3200);
-            events.ScheduleEvent(EVENT_GRAVITY_WELL_AURA_PULL, 4500);
+            events.ScheduleEvent(EVENT_GRAVITY_WELL_AURA_DAMAGE, 3200ms);
+            events.ScheduleEvent(EVENT_GRAVITY_WELL_AURA_PULL, 4500ms);
             if (!IsHeroic())
                 me->DespawnOrUnsummon(23200);
         }
@@ -417,7 +417,7 @@ public:
             init.SetFly();
             init.Launch();
 
-            events.ScheduleEvent(EVENT_SEISMIC_SHARD_MOUNT, 2400);
+            events.ScheduleEvent(EVENT_SEISMIC_SHARD_MOUNT, 2400ms);
         }
 
         void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
index c359e2f5a84..81aff022649 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
@@ -87,9 +87,9 @@ class boss_ozruk : public CreatureScript
 
                 me->SetReactState(REACT_AGGRESSIVE);
 
-                events.ScheduleEvent(EVENT_ELEMENTIUM_BULWARK, 5000);
-                events.ScheduleEvent(EVENT_GROUND_SLAM, 10000);
-                events.ScheduleEvent(EVENT_ELEMENTIUM_SPIKE_SHIELD, 13000);
+                events.ScheduleEvent(EVENT_ELEMENTIUM_BULWARK, 5s);
+                events.ScheduleEvent(EVENT_GROUND_SLAM, 10s);
+                events.ScheduleEvent(EVENT_ELEMENTIUM_SPIKE_SHIELD, 13s);
             }
 
             void JustEngagedWith(Unit* who) override
@@ -148,23 +148,23 @@ class boss_ozruk : public CreatureScript
                             me->SetReactState(REACT_PASSIVE);
                             me->AttackStop();
                             DoCast(me, SPELL_GROUND_SLAM);
-                            events.ScheduleEvent(EVENT_START_ATTACK, 4600);
+                            events.ScheduleEvent(EVENT_START_ATTACK, 4600ms);
                             break;
                         case EVENT_ELEMENTIUM_SPIKE_SHIELD:
                             DoCast(me, SPELL_ELEMENTIUM_SPIKE_SHIELD);
                             Talk(SAY_ELEMENTIUM_SPIKE_SHIELD);
-                            events.ScheduleEvent(EVENT_SHATTER, 10000);
+                            events.ScheduleEvent(EVENT_SHATTER, 10s);
                             break;
                         case EVENT_SHATTER:
                             summons.DespawnEntry(NPC_BOUNCER_SPIKE);
                             me->SetReactState(REACT_PASSIVE);
                             me->AttackStop();
                             DoCast(me, SPELL_SHATTER);
-                            events.ScheduleEvent(EVENT_START_ATTACK, 4600);
+                            events.ScheduleEvent(EVENT_START_ATTACK, 4600ms);
                             // Spells are cast in same order everytime after Shatter, so we schedule them here
-                            events.ScheduleEvent(EVENT_ELEMENTIUM_BULWARK, urand(3000,4000));
-                            events.ScheduleEvent(EVENT_GROUND_SLAM, urand(7000,9000));
-                            events.ScheduleEvent(EVENT_ELEMENTIUM_SPIKE_SHIELD, urand(10000,12000));
+                            events.ScheduleEvent(EVENT_ELEMENTIUM_BULWARK, 3s, 4s);
+                            events.ScheduleEvent(EVENT_GROUND_SLAM, 7s, 9s);
+                            events.ScheduleEvent(EVENT_ELEMENTIUM_SPIKE_SHIELD, 10s, 12s);
                             break;
                         case EVENT_START_ATTACK:
                             me->SetReactState(REACT_AGGRESSIVE);
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
index 6ad15eebe2f..0bf68975566 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
@@ -143,10 +143,10 @@ class boss_slabhide : public CreatureScript
             {
                 BossAI::JustEngagedWith(who);
 
-                events.ScheduleEvent(EVENT_HANDLE_ROCK_WALLS, 4000);
-                events.ScheduleEvent(EVENT_LAVA_FISSURE, urand(6000, 8000));
-                events.ScheduleEvent(EVENT_SAND_BLAST, urand(8000, 10000));
-                events.ScheduleEvent(EVENT_AIR_PHASE, 10000);
+                events.ScheduleEvent(EVENT_HANDLE_ROCK_WALLS, 4s);
+                events.ScheduleEvent(EVENT_LAVA_FISSURE, 6s, 8s);
+                events.ScheduleEvent(EVENT_SAND_BLAST, 8s, 10s);
+                events.ScheduleEvent(EVENT_AIR_PHASE, 10s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -207,15 +207,15 @@ class boss_slabhide : public CreatureScript
                         break;
                     case POINT_SLABHIDE_MIDDLE:
                         _isFlying = true;
-                        events.ScheduleEvent(EVENT_TAKEOFF, 100);
+                        events.ScheduleEvent(EVENT_TAKEOFF, 100ms);
                         break;
                     case POINT_SLABHIDE_IN_AIR:
-                        events.ScheduleEvent(EVENT_STALACTITE, 400);
+                        events.ScheduleEvent(EVENT_STALACTITE, 400ms);
                         break;
                     case POINT_SLABHIDE_LAND:
                         _isFlying = false;
                         //DoCast(me, SPELL_COOLDOWN_5S); // unknown purpose
-                        events.ScheduleEvent(EVENT_ATTACK, 1200);
+                        events.ScheduleEvent(EVENT_ATTACK, 1200ms);
                         break;
                     default:
                         break;
@@ -242,18 +242,18 @@ class boss_slabhide : public CreatureScript
                         case EVENT_LAVA_FISSURE:
                             if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true))
                                 DoCast(target, SPELL_LAVA_FISSURE);
-                            events.ScheduleEvent(EVENT_LAVA_FISSURE, urand(6000, 8000));
+                            events.ScheduleEvent(EVENT_LAVA_FISSURE, 6s, 8s);
                             break;
                         case EVENT_SAND_BLAST:
                             DoCast(me, SPELL_SAND_BLAST);
-                            events.ScheduleEvent(EVENT_SAND_BLAST, urand(8000, 11000));
+                            events.ScheduleEvent(EVENT_SAND_BLAST, 8s, 11s);
                             break;
                         case EVENT_AIR_PHASE:
                             events.Reset();
                             me->SetReactState(REACT_PASSIVE);
                             me->AttackStop();
                             me->GetMotionMaster()->MovePoint(POINT_SLABHIDE_MIDDLE, SlabhideMiddlePos);
-                            events.ScheduleEvent(EVENT_AIR_PHASE, 60000);
+                            events.ScheduleEvent(EVENT_AIR_PHASE, 1min);
                             break;
                         case EVENT_TAKEOFF:
                             me->GetMotionMaster()->MoveTakeoff(POINT_SLABHIDE_IN_AIR, SlabhideInAirPos);
@@ -266,7 +266,7 @@ class boss_slabhide : public CreatureScript
 
                             DoCast(me, SPELL_STALACTITE_SUMMON);
 
-                            events.ScheduleEvent(EVENT_LAND, 8000);
+                            events.ScheduleEvent(EVENT_LAND, 8s);
                             break;
                         case EVENT_LAND:
                         {
@@ -281,8 +281,8 @@ class boss_slabhide : public CreatureScript
                             me->SetAnimTier(UNIT_BYTE1_FLAG_NONE, false);
                             me->SetHover(false);
 
-                            events.ScheduleEvent(EVENT_LAVA_FISSURE, urand(6000, 8000));
-                            events.ScheduleEvent(EVENT_SAND_BLAST, urand(8000, 10000));
+                            events.ScheduleEvent(EVENT_LAVA_FISSURE, 6s, 8s);
+                            events.ScheduleEvent(EVENT_SAND_BLAST, 8s, 10s);
                             DoCast(me, SPELL_CRYSTAL_STORM);
                             me->SetReactState(REACT_AGGRESSIVE);
                             break;
@@ -332,7 +332,7 @@ public:
         npc_lava_fissureAI(Creature* creature) : ScriptedAI(creature)
         {
             DoCast(me, SPELL_LAVA_FISSURE_CRACK, true);
-            events.ScheduleEvent(EVENT_LAVA_FISSURE_ERUPTION, 6000);
+            events.ScheduleEvent(EVENT_LAVA_FISSURE_ERUPTION, 6s);
         }
 
         void UpdateAI(uint32 diff) override
@@ -376,7 +376,7 @@ public:
         {
             me->SetDisableGravity(true);
             DoCast(me, SPELL_STALACTITE_SHADE, true);
-            events.ScheduleEvent(EVENT_STALACTITE_MISSLE, 5600);
+            events.ScheduleEvent(EVENT_STALACTITE_MISSLE, 5600ms);
         }
 
         void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
index ba6b5e7bca2..c02632284aa 100644
--- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
@@ -112,9 +112,9 @@ class npc_sc_millhouse_manastorm : public CreatureScript
 
             void ScheduleEvents()
             {
-                events.ScheduleEvent(EVENT_SHADOWFURY, 3000);
-                events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 5000);
-                events.ScheduleEvent(EVENT_FEAR, 8000);
+                events.ScheduleEvent(EVENT_SHADOWFURY, 3s);
+                events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 5s);
+                events.ScheduleEvent(EVENT_FEAR, 8s);
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -184,7 +184,7 @@ class npc_sc_millhouse_manastorm : public CreatureScript
                             me->SetFacingToObject(worldtrigger);
                         DoCast(me, SPELL_ANCHOR_HERE);
                         DoCast(me, SPELL_TIGULE_AND_FORORS_SPECIAL_BLEND);
-                        events.ScheduleEvent(EVENT_READY_FOR_COMBAT, 10000);
+                        events.ScheduleEvent(EVENT_READY_FOR_COMBAT, 10s);
                         break;
                     case POINT_MILLHOUSE_GROUP_3:
                         me->AddUnitFlag(UNIT_FLAG_IN_COMBAT);
@@ -192,13 +192,13 @@ class npc_sc_millhouse_manastorm : public CreatureScript
                         me->SetFacingTo(5.931499f);
                         DoCast(me, SPELL_ANCHOR_HERE);
                         DoCast(me, SPELL_TIGULE_AND_FORORS_SPECIAL_BLEND);
-                        events.ScheduleEvent(EVENT_READY_FOR_COMBAT, 10000);
+                        events.ScheduleEvent(EVENT_READY_FOR_COMBAT, 10s);
                         break;
                     case POINT_MILLHOUSE_GROUP_4:
                         me->SetFacingTo(3.455752f);
                         DoCast(me, SPELL_ANCHOR_HERE);
                         Talk(SAY_MILLHOUSE_EVENT_2);
-                        events.ScheduleEvent(EVENT_CAST_IMPENDING_DOOM, 1000);
+                        events.ScheduleEvent(EVENT_CAST_IMPENDING_DOOM, 1s);
                         break;
                     default:
                         break;
@@ -223,17 +223,17 @@ class npc_sc_millhouse_manastorm : public CreatureScript
                     {
                         case EVENT_FROSTBOLT_VOLLEY:
                             DoCastAOE(SPELL_FROSTBOLT_VOLLEY);
-                            events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 7000);
+                            events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 7s);
                             break;
                         case EVENT_SHADOWFURY:
                             if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true))
                                 DoCast(target, SPELL_SHADOWFURY);
-                            events.ScheduleEvent(EVENT_SHADOWFURY, 7000);
+                            events.ScheduleEvent(EVENT_SHADOWFURY, 7s);
                             break;
                         case EVENT_FEAR:
                             if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true))
                                 DoCast(target, SPELL_FEAR);
-                            events.ScheduleEvent(EVENT_FEAR, 18000);
+                            events.ScheduleEvent(EVENT_FEAR, 18s);
                             break;
                         case EVENT_READY_FOR_COMBAT:
                             me->RemoveUnitFlag(UNIT_FLAG_IN_COMBAT);
@@ -243,13 +243,13 @@ class npc_sc_millhouse_manastorm : public CreatureScript
                         case EVENT_CAST_IMPENDING_DOOM:
                             DoCast(me, SPELL_IMPENDING_DOOM);
                             DoCast(me, SPELL_IMPENDING_DOOM_CHANNEL);
-                            events.ScheduleEvent(EVENT_INTERRUPT_IMPENDING_DOOM, urand(15000,20000));
+                            events.ScheduleEvent(EVENT_INTERRUPT_IMPENDING_DOOM, 15s, 20s);
                             break;
                         case EVENT_INTERRUPT_IMPENDING_DOOM:
                             me->InterruptNonMeleeSpells(true);
                             me->RemoveAllAuras();
                             me->HandleEmoteCommand(EMOTE_ONESHOT_KNOCKDOWN);
-                            events.ScheduleEvent(EVENT_CAST_IMPENDING_DOOM, 3000);
+                            events.ScheduleEvent(EVENT_CAST_IMPENDING_DOOM, 3s);
                             break;
                         default:
                             break;