diff options
| author | DanVS <33371360+DanVS@users.noreply.github.com> | 2018-09-17 16:38:22 +0000 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-11-09 00:26:59 +0100 |
| commit | 28cb2af1c5dbaf9b3644a7919edc1603f0d75dbf (patch) | |
| tree | 2d45d4a3d9713307418cc3a5dbef49306d090542 /src/server/scripts/Pet | |
| parent | e8e8e4b9d6ae72615334c5ef5f62d14a77729f55 (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/Pet')
| -rw-r--r-- | src/server/scripts/Pet/pet_generic.cpp | 10 | ||||
| -rw-r--r-- | src/server/scripts/Pet/pet_shaman.cpp | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index 4d0ffbac70c..e94c20e2c83 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -188,7 +188,7 @@ public: void Reset() override { _events.Reset(); - _events.ScheduleEvent(EVENT_FOCUS, 1000); + _events.ScheduleEvent(EVENT_FOCUS, 1s); } void EnterEvadeMode(EvadeReason why) override @@ -207,10 +207,10 @@ public: switch (emote) { case TEXT_EMOTE_BOW: - _events.ScheduleEvent(EVENT_FOCUS, 1000); + _events.ScheduleEvent(EVENT_FOCUS, 1s); break; case TEXT_EMOTE_DRINK: - _events.ScheduleEvent(EVENT_DRINK, 1000); + _events.ScheduleEvent(EVENT_DRINK, 1s); break; } } @@ -230,11 +230,11 @@ public: case EVENT_FOCUS: if (Unit* owner = me->GetCharmerOrOwner()) me->SetFacingToObject(owner); - _events.ScheduleEvent(EVENT_EMOTE, 1000); + _events.ScheduleEvent(EVENT_EMOTE, 1s); break; case EVENT_EMOTE: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); - _events.ScheduleEvent(EVENT_FOLLOW, 1000); + _events.ScheduleEvent(EVENT_FOLLOW, 1s); break; case EVENT_FOLLOW: if (Unit* owner = me->GetCharmerOrOwner()) diff --git a/src/server/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp index 99a48185025..64f80c125c6 100644 --- a/src/server/scripts/Pet/pet_shaman.cpp +++ b/src/server/scripts/Pet/pet_shaman.cpp @@ -68,7 +68,7 @@ class npc_pet_shaman_earth_elemental : public CreatureScript if (_events.ExecuteEvent() == EVENT_SHAMAN_ANGEREDEARTH) { DoCastVictim(SPELL_SHAMAN_ANGEREDEARTH); - _events.ScheduleEvent(EVENT_SHAMAN_ANGEREDEARTH, urand(5000, 20000)); + _events.ScheduleEvent(EVENT_SHAMAN_ANGEREDEARTH, 5s, 20s); } DoMeleeAttackIfReady(); @@ -96,8 +96,8 @@ class npc_pet_shaman_fire_elemental : public CreatureScript void Reset() override { _events.Reset(); - _events.ScheduleEvent(EVENT_SHAMAN_FIRENOVA, urand(5000, 20000)); - _events.ScheduleEvent(EVENT_SHAMAN_FIREBLAST, urand(5000, 20000)); + _events.ScheduleEvent(EVENT_SHAMAN_FIRENOVA, 5s, 20s); + _events.ScheduleEvent(EVENT_SHAMAN_FIREBLAST, 5s, 20s); _events.ScheduleEvent(EVENT_SHAMAN_FIRESHIELD, 0); me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); } @@ -118,15 +118,15 @@ class npc_pet_shaman_fire_elemental : public CreatureScript { case EVENT_SHAMAN_FIRENOVA: DoCastVictim(SPELL_SHAMAN_FIRENOVA); - _events.ScheduleEvent(EVENT_SHAMAN_FIRENOVA, urand(5000, 20000)); + _events.ScheduleEvent(EVENT_SHAMAN_FIRENOVA, 5s, 20s); break; case EVENT_SHAMAN_FIRESHIELD: DoCastVictim(SPELL_SHAMAN_FIRESHIELD); - _events.ScheduleEvent(EVENT_SHAMAN_FIRESHIELD, 2000); + _events.ScheduleEvent(EVENT_SHAMAN_FIRESHIELD, 2s); break; case EVENT_SHAMAN_FIREBLAST: DoCastVictim(SPELL_SHAMAN_FIREBLAST); - _events.ScheduleEvent(EVENT_SHAMAN_FIREBLAST, urand(5000, 20000)); + _events.ScheduleEvent(EVENT_SHAMAN_FIREBLAST, 5s, 20s); break; default: break; |