Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Chamber of Aspects: Use std::chrono::duration overloads of EventMap (#25027)

Browse Source 
Contributes to #25012

(cherry picked from commit 42102871a7)
This commit is contained in:
Peter Keresztes Schmidt
2020-07-14 20:03:33 +02:00
committed by Shauren
parent 5507aa2f5e
commit cd65f988bd
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
View File

@@ -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);

4
src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp
View File

@@ -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;

14
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp
View File

@@ -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)
{