aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/EasternKingdoms/MagistersTerrace
diff options
context:
space:
mode:
authorDanVS <33371360+DanVS@users.noreply.github.com>2018-09-17 16:38:22 +0000
committerShauren <shauren.trinity@gmail.com>2021-11-09 00:26:59 +0100
commit28cb2af1c5dbaf9b3644a7919edc1603f0d75dbf (patch)
tree2d45d4a3d9713307418cc3a5dbef49306d090542 /src/server/scripts/EasternKingdoms/MagistersTerrace
parente8e8e4b9d6ae72615334c5ef5f62d14a77729f55 (diff)
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 (cherry picked from commit 5b0f4009df4cde413c92c73467ca9a63e79a772b)
Diffstat (limited to 'src/server/scripts/EasternKingdoms/MagistersTerrace')
-rw-r--r--src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp12
-rw-r--r--src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp12
-rw-r--r--src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp4
4 files changed, 15 insertions, 15 deletions
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index bf1be4eee1f..5e1bdfc522f 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -94,7 +94,7 @@ class boss_selin_fireheart : public CreatureScript
{
case ACTION_SWITCH_PHASE:
events.SetPhase(PHASE_NORMAL);
- events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2000, 0, PHASE_NORMAL);
+ events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2s, 0, PHASE_NORMAL);
AttackStart(me->GetVictim());
me->GetMotionMaster()->MoveChase(me->GetVictim());
break;
@@ -137,7 +137,7 @@ class boss_selin_fireheart : public CreatureScript
_JustEngagedWith();
events.SetPhase(PHASE_NORMAL);
- events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2100, 0, PHASE_NORMAL);
+ events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2100ms, 0, PHASE_NORMAL);
}
void KilledUnit(Unit* victim) override
@@ -155,7 +155,7 @@ class boss_selin_fireheart : public CreatureScript
{
CrystalChosen->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
CrystalChosen->CastSpell(me, SPELL_MANA_RAGE, true);
- events.ScheduleEvent(EVENT_EMPOWER, 10000, PHASE_DRAIN);
+ events.ScheduleEvent(EVENT_EMPOWER, 10s, PHASE_DRAIN);
}
}
}
@@ -184,7 +184,7 @@ class boss_selin_fireheart : public CreatureScript
{
case EVENT_FEL_EXPLOSION:
DoCastAOE(SPELL_FEL_EXPLOSION);
- events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2000, 0, PHASE_NORMAL);
+ events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2s, 0, PHASE_NORMAL);
break;
case EVENT_DRAIN_CRYSTAL:
SelectNearestCrystal();
@@ -193,12 +193,12 @@ class boss_selin_fireheart : public CreatureScript
case EVENT_DRAIN_MANA:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true))
DoCast(target, SPELL_DRAIN_MANA);
- events.ScheduleEvent(EVENT_DRAIN_MANA, 10000, 0, PHASE_NORMAL);
+ events.ScheduleEvent(EVENT_DRAIN_MANA, 10s, 0, PHASE_NORMAL);
break;
case EVENT_DRAIN_LIFE:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true))
DoCast(target, SPELL_DRAIN_LIFE);
- events.ScheduleEvent(EVENT_DRAIN_LIFE, 10000, 0, PHASE_NORMAL);
+ events.ScheduleEvent(EVENT_DRAIN_LIFE, 10s, 0, PHASE_NORMAL);
break;
case EVENT_EMPOWER:
{
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
index 6cfa9eec32f..c1bd50e2d9f 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
@@ -88,8 +88,8 @@ class boss_vexallus : public CreatureScript
Talk(SAY_AGGRO);
_JustEngagedWith();
- events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8000);
- events.ScheduleEvent(EVENT_ARCANE_SHOCK, 5000);
+ events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8s);
+ events.ScheduleEvent(EVENT_ARCANE_SHOCK, 5s);
}
void JustSummoned(Creature* summoned) override
@@ -113,7 +113,7 @@ class boss_vexallus : public CreatureScript
{
_enraged = true;
events.Reset();
- events.ScheduleEvent(EVENT_OVERLOAD, 1200);
+ events.ScheduleEvent(EVENT_OVERLOAD, 1200ms);
return;
}
else
@@ -149,16 +149,16 @@ class boss_vexallus : public CreatureScript
case EVENT_CHAIN_LIGHTNING:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
DoCast(target, SPELL_CHAIN_LIGHTNING);
- events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8000);
+ events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8s);
break;
case EVENT_ARCANE_SHOCK:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true))
DoCast(target, SPELL_ARCANE_SHOCK);
- events.ScheduleEvent(EVENT_ARCANE_SHOCK, 8000);
+ events.ScheduleEvent(EVENT_ARCANE_SHOCK, 8s);
break;
case EVENT_OVERLOAD:
DoCastVictim(SPELL_OVERLOAD);
- events.ScheduleEvent(EVENT_OVERLOAD, 2000);
+ events.ScheduleEvent(EVENT_OVERLOAD, 2s);
break;
default:
break;
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index 61507222774..314d2d8fbd7 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -155,7 +155,7 @@ class instance_magisters_terrace : public InstanceMapScript
{
if (eventId == EVENT_SPAWN_KALECGOS)
if (!instance->GetCreature(KalecgosGUID) && Events.Empty())
- Events.ScheduleEvent(EVENT_SPAWN_KALECGOS, Minutes(1));
+ Events.ScheduleEvent(EVENT_SPAWN_KALECGOS, 1min);
}
void Update(uint32 diff) override
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
index 5aa70d5fa89..d7092d7a9da 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
@@ -81,7 +81,7 @@ public:
me->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
me->SetDisableGravity(false);
me->SetHover(false);
- events.ScheduleEvent(EVENT_KALECGOS_LANDING, Seconds(2));
+ events.ScheduleEvent(EVENT_KALECGOS_LANDING, 2s);
}
}
@@ -94,7 +94,7 @@ public:
case EVENT_KALECGOS_LANDING:
DoCastAOE(SPELL_CAMERA_SHAKE);
me->SetObjectScale(0.6f);
- events.ScheduleEvent(EVENT_KALECGOS_TRANSFORM, Seconds(1));
+ events.ScheduleEvent(EVENT_KALECGOS_TRANSFORM, 1s);
break;
case EVENT_KALECGOS_TRANSFORM:
DoCast(me, SPELL_ORB_KILL_CREDIT, true);