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/Stratholme | |
| 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/Stratholme')
3 files changed, 12 insertions, 12 deletions
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 d59bf249f54..b8a6cacaf0c 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -65,7 +65,7 @@ public: { _events.ScheduleEvent(EVENT_FROSTBOLT, 1 * IN_MILLISECONDS); _events.ScheduleEvent(EVENT_ICETOMB, 16 * IN_MILLISECONDS); - _events.ScheduleEvent(EVENT_DRAINLIFE, 31 * IN_MILLISECONDS); + _events.ScheduleEvent(EVENT_DRAINLIFE, 31s); } void JustDied(Unit* /*killer*/) override @@ -96,12 +96,12 @@ public: case EVENT_ICETOMB: if (rand32() % 65) DoCastVictim(SPELL_ICETOMB); - _events.ScheduleEvent(EVENT_ICETOMB, 28 * IN_MILLISECONDS); + _events.ScheduleEvent(EVENT_ICETOMB, 28s); break; case EVENT_DRAINLIFE: if (rand32() % 55) DoCastVictim(SPELL_DRAINLIFE); - _events.ScheduleEvent(EVENT_DRAINLIFE, 31 * IN_MILLISECONDS); + _events.ScheduleEvent(EVENT_DRAINLIFE, 31s); break; default: break; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp index d5472d3749c..7cd2e85b13b 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp @@ -66,10 +66,10 @@ class boss_postmaster_malown : public CreatureScript void JustEngagedWith(Unit* /*who*/) override { - events.ScheduleEvent(EVENT_WAILINGDEAD, 19000); // lasts 6 sec - events.ScheduleEvent(EVENT_BACKHAND, 8000); // 2 sec stun - events.ScheduleEvent(EVENT_CURSEOFWEAKNESS, 20000); // lasts 2 mins - events.ScheduleEvent(EVENT_CURSEOFTONGUES, 22000); + events.ScheduleEvent(EVENT_WAILINGDEAD, 19s); // lasts 6 sec + 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); } @@ -95,22 +95,22 @@ class boss_postmaster_malown : public CreatureScript case EVENT_WAILINGDEAD: if (rand32() % 100 < 65) //65% chance to cast DoCastVictim(SPELL_WAILINGDEAD, true); - events.ScheduleEvent(EVENT_WAILINGDEAD, 19000); + events.ScheduleEvent(EVENT_WAILINGDEAD, 19s); break; case EVENT_BACKHAND: if (rand32() % 100 < 45) //45% chance to cast DoCastVictim(SPELL_BACKHAND, true); - events.ScheduleEvent(EVENT_WAILINGDEAD, 8000); + events.ScheduleEvent(EVENT_WAILINGDEAD, 8s); break; case EVENT_CURSEOFWEAKNESS: if (rand32() % 100 < 3) //3% chance to cast DoCastVictim(SPELL_CURSEOFWEAKNESS, true); - events.ScheduleEvent(EVENT_WAILINGDEAD, 20000); + events.ScheduleEvent(EVENT_WAILINGDEAD, 20s); break; case EVENT_CURSEOFTONGUES: if (rand32() % 100 < 3) //3% chance to cast DoCastVictim(SPELL_CURSEOFTONGUES, true); - events.ScheduleEvent(EVENT_WAILINGDEAD, 22000); + events.ScheduleEvent(EVENT_WAILINGDEAD, 22s); break; case EVENT_CALLOFTHEGRAVE: if (rand32() % 100 < 5) //5% chance to cast diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 67d3de21fd5..7eaa863adf4 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -359,7 +359,7 @@ class instance_stratholme : public InstanceMapScript if (data == DONE) { - events.ScheduleEvent(EVENT_SLAUGHTER_SQUARE, 60000); + events.ScheduleEvent(EVENT_SLAUGHTER_SQUARE, 1min); TC_LOG_DEBUG("scripts", "Instance Stratholme: Slaugther event will continue in 1 minute."); } EncounterState[4] = data; |
