Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AI/TotemAI: Tell Shaman Totems to stay put and stop moving.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/007eb8c9311320217fdda0bc0e6c05044254edfe)
This commit is contained in:
hondacrx
2021-12-24 20:20:05 -05:00
parent 925119c2ca
commit bd3768c4ef
3 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/AI/CoreAI/PassiveAI.cs
+1
View File
@@ -90,6 +90,7 @@ namespace Game.AI
public override void MoveInLineOfSight(Unit unit) { }
public override void AttackStart(Unit unit) { }
public override void UpdateAI(uint diff) { }
public override void JustAppeared() { }
public override void EnterEvadeMode(EvadeReason why) { }
public override void OnCharmed(bool isNew) { }
}
Source/Game/AI/CoreAI/PetAI.cs
+20 -19
View File
@@ -387,7 +387,7 @@ namespace Game.AI
me.RemoveUnitFlag(UnitFlags.PetInCombat); // on player pets, this flag indicates that we're actively going after a target - we're returning, so remove it
}
void DoAttack(Unit target, bool chase)
{
// Handles attack with or without chase and also resets flags
@@ -431,28 +431,28 @@ namespace Game.AI
switch (type)
{
case MovementGeneratorType.Point:
{
// Pet is returning to where stay was clicked. data should be
// pet's GUIDLow since we set that as the waypoint ID
if (id == me.GetGUID().GetCounter() && me.GetCharmInfo().IsReturning())
{
// Pet is returning to where stay was clicked. data should be
// pet's GUIDLow since we set that as the waypoint ID
if (id == me.GetGUID().GetCounter() && me.GetCharmInfo().IsReturning())
{
ClearCharmInfoFlags();
me.GetCharmInfo().SetIsAtStay(true);
me.GetMotionMaster().MoveIdle();
}
break;
ClearCharmInfoFlags();
me.GetCharmInfo().SetIsAtStay(true);
me.GetMotionMaster().MoveIdle();
}
break;
}
case MovementGeneratorType.Follow:
{
// If data is owner's GUIDLow then we've reached follow point,
// otherwise we're probably chasing a creature
if (me.GetCharmerOrOwner() && me.GetCharmInfo() != null && id == me.GetCharmerOrOwner().GetGUID().GetCounter() && me.GetCharmInfo().IsReturning())
{
// If data is owner's GUIDLow then we've reached follow point,
// otherwise we're probably chasing a creature
if (me.GetCharmerOrOwner() && me.GetCharmInfo() != null && id == me.GetCharmerOrOwner().GetGUID().GetCounter() && me.GetCharmInfo().IsReturning())
{
ClearCharmInfoFlags();
me.GetCharmInfo().SetIsFollowing(true);
}
break;
ClearCharmInfoFlags();
me.GetCharmInfo().SetIsFollowing(true);
}
break;
}
default:
break;
}
@@ -534,7 +534,7 @@ namespace Game.AI
break;
case TextEmotes.Soothe:
if (me.IsPet() && me.ToPet().IsPetGhoul())
me.HandleEmoteCommand( Emote.OneshotOmnicastGhoul);
me.HandleEmoteCommand(Emote.OneshotOmnicastGhoul);
break;
}
}
@@ -637,6 +637,7 @@ namespace Game.AI
// default CreatureAI functions which interfere with the PetAI
public override void MoveInLineOfSight(Unit who) { }
public override void MoveInLineOfSight_Safe(Unit who) { }
public override void JustAppeared() { } // we will control following manually
public override void EnterEvadeMode(EvadeReason why) { }
}
}
Source/Game/AI/CoreAI/TotemAI.cs
+7 -1
View File
@@ -25,11 +25,15 @@ namespace Game.AI
{
ObjectGuid _victimGuid;
public TotemAI(Creature c) : base(c)
public TotemAI(Creature creature) : base(creature)
{
_victimGuid = ObjectGuid.Empty;
}
public override void MoveInLineOfSight(Unit who) { }
public override void JustAppeared() { }
public override void EnterEvadeMode(EvadeReason why)
{
me.CombatStop(true);
@@ -77,5 +81,7 @@ namespace Game.AI
else
_victimGuid.Clear();
}
public override void AttackStart(Unit victim) { }
}
}