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/Pet | |
| 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/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 059a9cb222c..b208551f41d 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -187,7 +187,7 @@ public: void Reset() override { _events.Reset(); - _events.ScheduleEvent(EVENT_FOCUS, 1000); + _events.ScheduleEvent(EVENT_FOCUS, 1s); } void EnterEvadeMode(EvadeReason why) override @@ -206,10 +206,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; } } @@ -229,11 +229,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 cca10c674ba..3a35dff4462 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; |