diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-07-14 20:03:33 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-23 15:48:17 +0100 |
| commit | cd65f988bd18640999a4b1bbe80faff777831344 (patch) | |
| tree | 596e2c2a4a7c0a884fdaf28b84d4064730be3999 /src | |
| parent | 5507aa2f5e27308c020621d7eac3370eb75b5adc (diff) | |
Scripts/Chamber of Aspects: Use std::chrono::duration overloads of EventMap (#25027)
Contributes to #25012
(cherry picked from commit 42102871a78e4424ee18c243600327f5e1d84945)
Diffstat (limited to 'src')
3 files changed, 14 insertions, 11 deletions
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index af5abc41880..42c8be24847 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -178,7 +178,7 @@ public: events.ScheduleEvent(EVENT_FLAME_TSUNAMI, 30s); events.ScheduleEvent(EVENT_CALL_TENEBRON, 30s); events.ScheduleEvent(EVENT_CALL_SHADRON, 75s); - events.ScheduleEvent(EVENT_CALL_VESPERON, 120000); + events.ScheduleEvent(EVENT_CALL_VESPERON, 120s); } void JustDied(Unit* /*killer*/) override @@ -462,7 +462,10 @@ public: if (urand(0, 5) == 0) Talk(SAY_SARTHARION_SPECIAL); } - events.ScheduleEvent(EVENT_LAVA_STRIKE, (_isSoftEnraged ? urand(1400, 2000) : urand(5000, 20000))); + if (_isSoftEnraged) + events.ScheduleEvent(EVENT_LAVA_STRIKE, 1400ms, 2s); + else + events.ScheduleEvent(EVENT_LAVA_STRIKE, 5s, 20s); break; case EVENT_CALL_TENEBRON: CallDragon(DATA_TENEBRON); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp index 4c4f6a2574c..52c225e6f60 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp @@ -386,12 +386,12 @@ struct dummy_dragonAI : public ScriptedAI case EVENT_SHADOW_FISSURE: if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_SHADOW_FISSURE); - events.ScheduleEvent(eventId, urand(15000, 20000)); + events.ScheduleEvent(eventId, 15s, 20s); break; case EVENT_SHADOW_BREATH: Talk(SAY_BREATH); DoCastVictim(SPELL_SHADOW_BREATH); - events.ScheduleEvent(eventId, urand(20000, 25000)); + events.ScheduleEvent(eventId, 20s, 25s); break; default: break; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp index 3ff20da4e1b..c1e0a9f9ff1 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp @@ -86,13 +86,13 @@ class npc_xerestrasza : public CreatureScript me->SetWalk(true); me->GetMotionMaster()->MovePoint(0, xerestraszaMovePos); - _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_1, 16000); - _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_2, 25000); - _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_3, 32000); - _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_4, 42000); - _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_5, 51000); - _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_6, 61000); - _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_7, 69000); + _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_1, 16s); + _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_2, 25s); + _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_3, 32s); + _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_4, 42s); + _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_5, 51s); + _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_6, 61s); + _events.ScheduleEvent(EVENT_XERESTRASZA_EVENT_7, 69s); } else if (action == ACTION_INTRO_BALTHARUS && !_introDone) { |