diff options
Diffstat (limited to 'src')
13 files changed, 36 insertions, 36 deletions
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index 8fb20313a3c..2d3091869e5 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -65,10 +65,10 @@ public: { Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_WHIRLWIND, 1s, 20s); - events.ScheduleEvent(EVENT_WHIRLWIND2, urand(1 * IN_MILLISECONDS, 20 * IN_MILLISECONDS)); + events.ScheduleEvent(EVENT_WHIRLWIND2, 1s, 20s); events.ScheduleEvent(EVENT_KNOCKDOWN, 12s); events.ScheduleEvent(EVENT_FRENZY, 6s); - events.ScheduleEvent(EVENT_RANDOM_YELL, 20s, 30s); //20 to 30 seconds + events.ScheduleEvent(EVENT_RANDOM_YELL, 20s, 30s); } void JustAppeared() override @@ -109,7 +109,7 @@ public: break; case EVENT_WHIRLWIND2: DoCastVictim(SPELL_WHIRLWIND2); - events.ScheduleEvent(EVENT_WHIRLWIND2, urand(7 * IN_MILLISECONDS, 25 * IN_MILLISECONDS)); + events.ScheduleEvent(EVENT_WHIRLWIND2, 7s, 25s); break; case EVENT_KNOCKDOWN: DoCastVictim(SPELL_KNOCKDOWN); diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index e7ab653e3ad..febb663d33d 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -67,8 +67,8 @@ public: Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_CLEAVE, 1s, 9s); events.ScheduleEvent(EVENT_FRIGHTENING_SHOUT, 2s, 19s); - events.ScheduleEvent(EVENT_WHIRLWIND1, urand(1 * IN_MILLISECONDS, 13 * IN_MILLISECONDS)); - events.ScheduleEvent(EVENT_WHIRLWIND2, urand(5 * IN_MILLISECONDS, 20 * IN_MILLISECONDS)); + events.ScheduleEvent(EVENT_WHIRLWIND1, 1s, 13s); + events.ScheduleEvent(EVENT_WHIRLWIND2, 5s, 20s); events.ScheduleEvent(EVENT_MORTAL_STRIKE, 5s, 20s); } @@ -114,11 +114,11 @@ public: break; case EVENT_WHIRLWIND1: DoCastVictim(SPELL_WHIRLWIND1); - events.ScheduleEvent(EVENT_WHIRLWIND1, urand(6 * IN_MILLISECONDS, 10 * IN_MILLISECONDS)); + events.ScheduleEvent(EVENT_WHIRLWIND1, 6s, 10s); break; case EVENT_WHIRLWIND2: DoCastVictim(SPELL_WHIRLWIND2); - events.ScheduleEvent(EVENT_WHIRLWIND2, urand(10 * IN_MILLISECONDS, 25 * IN_MILLISECONDS)); + events.ScheduleEvent(EVENT_WHIRLWIND2, 10s, 25s); break; case EVENT_MORTAL_STRIKE: DoCastVictim(SPELL_MORTAL_STRIKE); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 0f5d44370ca..943108e202c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -260,22 +260,22 @@ public: { case EVENT_ICY_TOUCH: DoCastVictim(SPELL_ICY_TOUCH); - events.DelayEvents(1000, GCD_CAST); + events.DelayEvents(1s, GCD_CAST); events.ScheduleEvent(EVENT_ICY_TOUCH, 5s, GCD_CAST); break; case EVENT_PLAGUE_STRIKE: DoCastVictim(SPELL_PLAGUE_STRIKE); - events.DelayEvents(1000, GCD_CAST); + events.DelayEvents(1s, GCD_CAST); events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 5s, GCD_CAST); break; case EVENT_BLOOD_STRIKE: DoCastVictim(SPELL_BLOOD_STRIKE); - events.DelayEvents(1000, GCD_CAST); + events.DelayEvents(1s, GCD_CAST); events.ScheduleEvent(EVENT_BLOOD_STRIKE, 5s, GCD_CAST); break; case EVENT_DEATH_COIL: DoCastVictim(SPELL_DEATH_COIL); - events.DelayEvents(1000, GCD_CAST); + events.DelayEvents(1s, GCD_CAST); events.ScheduleEvent(EVENT_DEATH_COIL, 5s, GCD_CAST); break; } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp index a9d9b422951..f058d2ac3d6 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp @@ -86,7 +86,7 @@ class boss_doctor_theolen_krastinov : public CreatureScript case EVENT_FRENZY: DoCast(me, SPELL_FRENZY, true); Talk(EMOTE_FRENZY_KILL); - events.ScheduleEvent(EVENT_FRENZY, 120000); + events.ScheduleEvent(EVENT_FRENZY, 120s); break; default: break; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index 4c0170b3a47..813eb2d6898 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -126,7 +126,7 @@ class boss_kirtonos_the_herald : public CreatureScript void IsSummonedBy(WorldObject* /*summoner*/) override { - events.ScheduleEvent(INTRO_1, 500); + events.ScheduleEvent(INTRO_1, 500ms); me->SetDisableGravity(true); me->SetReactState(REACT_PASSIVE); me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE)); @@ -141,7 +141,7 @@ class boss_kirtonos_the_herald : public CreatureScript void MovementInform(uint32 type, uint32 id) override { if (type == WAYPOINT_MOTION_TYPE && id == POINT_KIRTONOS_LAND) - events.ScheduleEvent(INTRO_2, 1500); + events.ScheduleEvent(INTRO_2, 1500ms); } void UpdateAI(uint32 diff) override @@ -159,13 +159,13 @@ class boss_kirtonos_the_herald : public CreatureScript break; case INTRO_2: me->GetMotionMaster()->MovePoint(0, PosMove[0]); - events.ScheduleEvent(INTRO_3, 1000); + events.ScheduleEvent(INTRO_3, 1s); break; case INTRO_3: if (GameObject* gate = ObjectAccessor::GetGameObject(*me, instance->GetGuidData(GO_GATE_KIRTONOS))) gate->SetGoState(GO_STATE_READY); me->SetFacingTo(0.01745329f); - events.ScheduleEvent(INTRO_4, 3000); + events.ScheduleEvent(INTRO_4, 3s); break; case INTRO_4: if (GameObject* brazier = ObjectAccessor::GetGameObject(*me, instance->GetGuidData(GO_BRAZIER_OF_THE_HERALD))) @@ -174,14 +174,14 @@ class boss_kirtonos_the_herald : public CreatureScript me->SetDisableGravity(false); DoCast(me, SPELL_KIRTONOS_TRANSFORM); me->SetCanFly(false); - events.ScheduleEvent(INTRO_5, 1000); + events.ScheduleEvent(INTRO_5, 1s); break; case INTRO_5: me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); me->SetVirtualItem(0, uint32(WEAPON_KIRTONOS_STAFF)); me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE)); me->SetReactState(REACT_AGGRESSIVE); - events.ScheduleEvent(INTRO_6, 5000); + events.ScheduleEvent(INTRO_6, 5s); break; case INTRO_6: me->GetMotionMaster()->MovePoint(0, PosMove[1]); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index cba9360a972..20f85be5003 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -69,7 +69,7 @@ public: { events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 10s); events.ScheduleEvent(EVENT_BONE_SHIELD, 2s); - events.ScheduleEvent(EVENT_SUMMON_MINIONS, 15000); + events.ScheduleEvent(EVENT_SUMMON_MINIONS, 15s); } void JustSummoned(Creature* summoned) override @@ -102,11 +102,11 @@ public: { case EVENT_SHADOWBOLT_VOLLEY: DoCastVictim(SPELL_SHADOWBOLT_VOLLEY); - events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 15000); + events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 15s); break; case EVENT_BONE_SHIELD: DoCastVictim(SPELL_BONE_SHIELD); - events.ScheduleEvent(EVENT_BONE_SHIELD, 45000); + events.ScheduleEvent(EVENT_BONE_SHIELD, 45s); break; case EVENT_SUMMON_MINIONS: DoCast(SPELL_SUMMON_BONE_MINIONS); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index 2b85881e47f..6aa017d5174 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -60,7 +60,7 @@ public: events.ScheduleEvent(EVENT_FROSTBOLT, 8s); events.ScheduleEvent(EVENT_CHILL_NOVA, 12s); events.ScheduleEvent(EVENT_FREEZE, 18s); - events.ScheduleEvent(EVENT_FEAR, 45000); + events.ScheduleEvent(EVENT_FEAR, 45s); } void UpdateAI(uint32 diff) override @@ -100,7 +100,7 @@ public: break; case EVENT_FROSTVOLLEY: DoCastVictim(SPELL_FROSTVOLLEY); - events.ScheduleEvent(EVENT_FROSTVOLLEY, 15000); + events.ScheduleEvent(EVENT_FROSTVOLLEY, 15s); break; default: break; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index 614be107515..8aa0f5cb5d2 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -62,8 +62,8 @@ public: void JustEngagedWith(Unit* /*who*/) override { - _events.ScheduleEvent(EVENT_FROSTBOLT, 1 * IN_MILLISECONDS); - _events.ScheduleEvent(EVENT_ICETOMB, 16 * IN_MILLISECONDS); + _events.ScheduleEvent(EVENT_FROSTBOLT, 1s); + _events.ScheduleEvent(EVENT_ICETOMB, 16s); _events.ScheduleEvent(EVENT_DRAINLIFE, 31s); } @@ -90,7 +90,7 @@ public: case EVENT_FROSTBOLT: if (rand32() % 90) DoCastVictim(SPELL_FROSTBOLT); - _events.ScheduleEvent(EVENT_FROSTBOLT, 3.5 * IN_MILLISECONDS); + _events.ScheduleEvent(EVENT_FROSTBOLT, 3500ms); break; case EVENT_ICETOMB: if (rand32() % 65) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp index f2c30abed5f..349af762e8e 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp @@ -69,7 +69,7 @@ class boss_postmaster_malown : public CreatureScript events.ScheduleEvent(EVENT_BACKHAND, 8s); // 2 sec stun events.ScheduleEvent(EVENT_CURSEOFWEAKNESS, 20s); // lasts 2 mins events.ScheduleEvent(EVENT_CURSEOFTONGUES, 22s); - events.ScheduleEvent(EVENT_CALLOFTHEGRAVE, 25000); + events.ScheduleEvent(EVENT_CALLOFTHEGRAVE, 25s); } void KilledUnit(Unit* /*victim*/) override @@ -114,7 +114,7 @@ class boss_postmaster_malown : public CreatureScript case EVENT_CALLOFTHEGRAVE: if (rand32() % 100 < 5) //5% chance to cast DoCastVictim(SPELL_CALLOFTHEGRAVE, true); - events.ScheduleEvent(EVENT_WAILINGDEAD, 25000); + events.ScheduleEvent(EVENT_WAILINGDEAD, 25s); break; default: break; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 54dfbe4ee72..953c9a4f1fa 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -257,7 +257,7 @@ class instance_stratholme : public InstanceMapScript if (EncounterState[0] == IN_PROGRESS || EncounterState[0] == FAIL) break; EncounterState[0] = data; - events.ScheduleEvent(EVENT_BARON_RUN, 2700000); + events.ScheduleEvent(EVENT_BARON_RUN, 45min); TC_LOG_DEBUG("scripts", "Instance Stratholme: Baron run in progress."); break; case FAIL: diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 9ae97dc81b7..69326b242e3 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -238,7 +238,7 @@ public: void MovementInform(uint32, uint32) override { if (phase == PHASE_FLIGHT) - events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1); + events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1ms); } void DamageTaken(Unit*, uint32 &damage) override @@ -343,7 +343,7 @@ public: } case 4: DespawnSummons(NPC_VAPOR_TRAIL); - events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1); + events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1ms); break; case 5: { @@ -377,14 +377,14 @@ public: x = 2 * breathX - x; y = 2 * breathY - y; me->GetMotionMaster()->MovePoint(0, x, y, z); - events.ScheduleEvent(EVENT_SUMMON_FOG, 1); + events.ScheduleEvent(EVENT_SUMMON_FOG, 1ms); break; } case 8: me->CastStop(SPELL_FOG_BREATH); me->RemoveAurasDueToSpell(SPELL_FOG_BREATH); ++uiBreathCount; - events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1); + events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1ms); if (uiBreathCount < 3) uiFlightCount = 4; break; diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index 5e8b9eda4f5..9a7894428de 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -74,7 +74,7 @@ public: void JustEngagedWith(Unit* /*who*/) override { Talk(YELL_TWILIGHT_CORRUPTOR_AGGRO); - _events.ScheduleEvent(EVENT_SOUL_CORRUPTION, 15000); + _events.ScheduleEvent(EVENT_SOUL_CORRUPTION, 15s); _events.ScheduleEvent(EVENT_CREATURE_OF_NIGHTMARE, 30s); } @@ -114,7 +114,7 @@ public: case EVENT_CREATURE_OF_NIGHTMARE: if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_CREATURE_OF_NIGHTMARE); - _events.ScheduleEvent(EVENT_CREATURE_OF_NIGHTMARE, 45000); + _events.ScheduleEvent(EVENT_CREATURE_OF_NIGHTMARE, 45s); break; default: break; diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index 7a0e143b197..fd8f067dd34 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -126,7 +126,7 @@ public: DoPlaySoundToSet(me, SOUND_AGGRO); _events.ScheduleEvent(EVENT_FADE, 30s); _events.ScheduleEvent(EVENT_SUMMON_SKELETON, 20s); - _events.ScheduleEvent(EVENT_BLACK_ARROW, 15000); + _events.ScheduleEvent(EVENT_BLACK_ARROW, 15s); _events.ScheduleEvent(EVENT_SHOOT, 8s); _events.ScheduleEvent(EVENT_MULTI_SHOT, 10s); } |