diff options
author | Kittnz <frederik156@hotmail.com> | 2016-02-13 12:31:29 +0100 |
---|---|---|
committer | Kittnz <frederik156@hotmail.com> | 2016-02-13 12:31:29 +0100 |
commit | af5f4ae85be270f8f139dad8be7a522e6cf2fe8b (patch) | |
tree | 47eb154da995d2c69ce547ea32adb4a41b14e13d /src | |
parent | 2322ef3f501489b5723ebe922c966e7d77b7b55e (diff) |
Pet/Misc: Improve Egbert's AI even more
Diffstat (limited to 'src')
-rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index bb28f660e1d..80b4fac4333 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -2575,9 +2575,8 @@ class npc_train_wrecker : public CreatureScript enum EgbertMisc { - SPELL_EGBERT = 40670, - SPELL_EGBERT2 = 40669, - EVENT_RETURN = 3, + SPELL_EGBERT = 40669, + EVENT_RETURN = 3 }; class npc_egbert : public CreatureScript @@ -2599,7 +2598,6 @@ public: _events.Reset(); if (Unit* owner = me->GetCharmerOrOwner()) me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, me->GetFollowAngle()); - me->CastSpell(me, SPELL_EGBERT); } void EnterEvadeMode(EvadeReason why) override @@ -2618,12 +2616,12 @@ public: { if (!me->IsWithinDist(owner, 40.f)) { - me->RemoveAura(SPELL_EGBERT2); + me->RemoveAura(SPELL_EGBERT); me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, me->GetFollowAngle()); } } - if (me->HasAura(SPELL_EGBERT2)) + if (me->HasAura(SPELL_EGBERT)) _events.ScheduleEvent(EVENT_RETURN, urandms(5, 20)); while (uint32 eventId = _events.ExecuteEvent()) @@ -2631,7 +2629,7 @@ public: switch (eventId) { case EVENT_RETURN: - me->RemoveAura(SPELL_EGBERT2); + me->RemoveAura(SPELL_EGBERT); break; default: break; |