Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pet/Misc: Improve Egbert's AI even more

Browse Source 
(cherry picked from commit af5f4ae85b)
This commit is contained in:
Kittnz
2016-02-13 12:31:29 +01:00
committed by Shauren
parent a6a8b5b3d4
commit b33afb6958
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/updates/world/2016_04_05_14_world_2016_02_13_00_world.sql Normal file
View File

@@ -0,0 +1,4 @@
SET @ENTRY:=23258;
SET @AURA:=40670;
DELETE FROM `creature_template_addon` WHERE `entry` = @ENTRY;
INSERT INTO `creature_template_addon` (`entry`, `auras`) VALUES (@ENTRY, @AURA);

12
src/server/scripts/World/npcs_special.cpp
View File

@@ -2516,9 +2516,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
@@ -2540,7 +2539,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
@@ -2559,12 +2557,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())
@@ -2572,7 +2570,7 @@ public:
switch (eventId)
{
case EVENT_RETURN:
me->RemoveAura(SPELL_EGBERT2);
me->RemoveAura(SPELL_EGBERT);
break;
default:
break;