diff options
| author | DanVS <33371360+DanVS@users.noreply.github.com> | 2018-09-17 16:38:22 +0000 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2018-09-17 18:38:22 +0200 |
| commit | 5b0f4009df4cde413c92c73467ca9a63e79a772b (patch) | |
| tree | 26e14700c4afaac9c5e0c09a1c9ec7a143291195 /src/server/scripts/EasternKingdoms/ScarletMonastery | |
| parent | 28591fd1658e3e4842d64f330f27c233dc69aad2 (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
Diffstat (limited to 'src/server/scripts/EasternKingdoms/ScarletMonastery')
7 files changed, 34 insertions, 34 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 62671996334..b9b3af69282 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -66,7 +66,7 @@ class boss_arcanist_doan : public CreatureScript Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_SILENCE, 15 * IN_MILLISECONDS); - events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 3 * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 3s); events.ScheduleEvent(EVENT_POLYMORPH, 30 * IN_MILLISECONDS); } @@ -91,16 +91,16 @@ class boss_arcanist_doan : public CreatureScript { case EVENT_SILENCE: DoCastVictim(SPELL_SILENCE); - events.ScheduleEvent(EVENT_SILENCE, urand(15, 20) * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_SILENCE, 15s, 20s); break; case EVENT_ARCANE_EXPLOSION: DoCastVictim(SPELL_ARCANE_EXPLOSION); - events.ScheduleEvent(EVENT_SILENCE, 8 * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_SILENCE, 8s); break; case EVENT_POLYMORPH: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 30.0f, true)) DoCast(target, SPELL_POLYMORPH); - events.ScheduleEvent(EVENT_POLYMORPH, 20 * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_POLYMORPH, 20s); break; default: break; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp index 6d07ed32e9d..2768d6a840b 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp @@ -54,8 +54,8 @@ class boss_azshir_the_sleepless : public CreatureScript void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); - events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30000); - events.ScheduleEvent(EVENT_TERRIFY, 20000); + events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30s); + events.ScheduleEvent(EVENT_TERRIFY, 20s); } void JustDied(Unit* /*killer*/) override @@ -68,7 +68,7 @@ class boss_azshir_the_sleepless : public CreatureScript if (!_siphon && me->HealthBelowPctDamaged(50, damage)) { DoCastVictim(SPELL_SOUL_SIPHON); - events.ScheduleEvent(EVENT_SOUL_SIPHON, 20000); + events.ScheduleEvent(EVENT_SOUL_SIPHON, 20s); _siphon = true; } } @@ -89,15 +89,15 @@ class boss_azshir_the_sleepless : public CreatureScript { case EVENT_CALL_OF_GRAVE: DoCastVictim(SPELL_CALL_OF_THE_GRAVE); - events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30000); + events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30s); break; case EVENT_TERRIFY: DoCastVictim(SPELL_TERRIFY); - events.ScheduleEvent(EVENT_TERRIFY, 20000); + events.ScheduleEvent(EVENT_TERRIFY, 20s); break; case EVENT_SOUL_SIPHON: DoCastVictim(SPELL_SOUL_SIPHON); - events.ScheduleEvent(EVENT_SOUL_SIPHON, 20000); + events.ScheduleEvent(EVENT_SOUL_SIPHON, 20s); break; default: break; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index 7afbcb78ec1..7dd6a179526 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -64,10 +64,10 @@ class boss_bloodmage_thalnos : public CreatureScript { Talk(SAY_AGGRO); _JustEngagedWith(); - events.ScheduleEvent(EVENT_FLAME_SHOCK, 10000); - events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000); - events.ScheduleEvent(EVENT_FLAME_SPIKE, 8000); - events.ScheduleEvent(EVENT_FIRE_NOVA, 40000); + events.ScheduleEvent(EVENT_FLAME_SHOCK, 10s); + events.ScheduleEvent(EVENT_SHADOW_BOLT, 2s); + events.ScheduleEvent(EVENT_FLAME_SPIKE, 8s); + events.ScheduleEvent(EVENT_FIRE_NOVA, 40s); } void JustDied(Unit* /*killer*/) override @@ -95,19 +95,19 @@ class boss_bloodmage_thalnos : public CreatureScript { case EVENT_FLAME_SHOCK: DoCastVictim(SPELL_FLAMESHOCK); - events.ScheduleEvent(EVENT_FLAME_SHOCK, urand(10000, 15000)); + events.ScheduleEvent(EVENT_FLAME_SHOCK, 10s, 15s); break; case EVENT_SHADOW_BOLT: DoCastVictim(SPELL_SHADOWBOLT); - events.ScheduleEvent(EVENT_SHADOW_BOLT, 2000); + events.ScheduleEvent(EVENT_SHADOW_BOLT, 2s); break; case EVENT_FLAME_SPIKE: DoCastVictim(SPELL_FLAMESPIKE); - events.ScheduleEvent(EVENT_FLAME_SPIKE, 30000); + events.ScheduleEvent(EVENT_FLAME_SPIKE, 30s); break; case EVENT_FIRE_NOVA: DoCastVictim(SPELL_FIRENOVA); - events.ScheduleEvent(EVENT_FIRE_NOVA, 40000); + events.ScheduleEvent(EVENT_FIRE_NOVA, 40s); break; default: break; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index 2b6ba94f664..5f535a1244e 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -83,8 +83,8 @@ class boss_herod : public CreatureScript DoCast(me, SPELL_RUSHINGCHARGE); _JustEngagedWith(); - events.ScheduleEvent(EVENT_CLEAVE, 12000); - events.ScheduleEvent(EVENT_WHIRLWIND, 60000); + events.ScheduleEvent(EVENT_CLEAVE, 12s); + events.ScheduleEvent(EVENT_WHIRLWIND, 1min); } void KilledUnit(Unit* /*victim*/) override @@ -117,12 +117,12 @@ class boss_herod : public CreatureScript { case EVENT_CLEAVE: DoCastVictim(SPELL_CLEAVE); - events.ScheduleEvent(EVENT_CLEAVE, 12000); + events.ScheduleEvent(EVENT_CLEAVE, 12s); break; case EVENT_WHIRLWIND: Talk(SAY_WHIRLWIND); DoCastVictim(SPELL_WHIRLWIND); - events.ScheduleEvent(EVENT_WHIRLWIND, 30000); + events.ScheduleEvent(EVENT_WHIRLWIND, 30s); break; default: break; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index 4e7969f1ebb..0f5a24e2621 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -53,7 +53,7 @@ class boss_houndmaster_loksey : public CreatureScript { Talk(SAY_AGGRO); _JustEngagedWith(); - events.ScheduleEvent(EVENT_BLOODLUST, 20000); + events.ScheduleEvent(EVENT_BLOODLUST, 20s); } void JustDied(Unit* /*killer*/) override @@ -67,7 +67,7 @@ class boss_houndmaster_loksey : public CreatureScript { case EVENT_BLOODLUST: DoCast(me, SPELL_BLOODLUST); - events.ScheduleEvent(EVENT_BLOODLUST, 20000); + events.ScheduleEvent(EVENT_BLOODLUST, 20s); break; default: break; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index f2e0bd38d2c..66aa049aa47 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -67,7 +67,7 @@ class boss_interrogator_vishas : public CreatureScript { Talk(SAY_AGGRO); _JustEngagedWith(); - events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5000); + events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5s); } void KilledUnit(Unit* victim) override @@ -104,7 +104,7 @@ class boss_interrogator_vishas : public CreatureScript { case EVENT_SHADOW_WORD_PAIN: DoCastVictim(SPELL_SHADOW_WORD_PAIN); - events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(5000, 15000)); + events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5s, 15s); break; default: break; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp index ef292a811c3..d3d7dda08f6 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp @@ -52,10 +52,10 @@ class boss_scorn : public CreatureScript void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); - events.ScheduleEvent(EVENT_LICH_SLAP, 45000); - events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 30000); - events.ScheduleEvent(EVENT_MIND_FLAY, 30000); - events.ScheduleEvent(EVENT_FROST_NOVA, 30000); + events.ScheduleEvent(EVENT_LICH_SLAP, 45s); + events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 30s); + events.ScheduleEvent(EVENT_MIND_FLAY, 30s); + events.ScheduleEvent(EVENT_FROST_NOVA, 30s); } void JustDied(Unit* /*killer*/) override @@ -69,19 +69,19 @@ class boss_scorn : public CreatureScript { case EVENT_LICH_SLAP: DoCastVictim(SPELL_LICHSLAP); - events.ScheduleEvent(EVENT_LICH_SLAP, 45000); + events.ScheduleEvent(EVENT_LICH_SLAP, 45s); break; case EVENT_FROSTBOLT_VOLLEY: DoCastVictim(SPELL_FROSTBOLT_VOLLEY); - events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 20000); + events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 20s); break; case EVENT_MIND_FLAY: DoCastVictim(SPELL_MINDFLAY); - events.ScheduleEvent(EVENT_MIND_FLAY, 20000); + events.ScheduleEvent(EVENT_MIND_FLAY, 20s); break; case EVENT_FROST_NOVA: DoCastVictim(SPELL_FROSTNOVA); - events.ScheduleEvent(EVENT_FROST_NOVA, 15000); + events.ScheduleEvent(EVENT_FROST_NOVA, 15s); break; default: break; |
