Core/Movement: Allow specifying timeout for random movement

Port From (https://github.com/TrinityCore/TrinityCore/commit/66b29fba44be39609fb79f2b35d82078b6656f91)
This commit is contained in:
hondacrx
2023-03-13 03:00:03 -04:00
parent 383ca52a00
commit 3db8d740f9
2 changed files with 27 additions and 9 deletions
@@ -9,7 +9,14 @@ namespace Game.Movement
{
public class RandomMovementGenerator : MovementGeneratorMedium<Creature>
{
public RandomMovementGenerator(float spawnDist = 0.0f)
PathGenerator _path;
TimeTracker _timer;
TimeTracker _duration;
Position _reference;
float _wanderDistance;
uint _wanderSteps;
public RandomMovementGenerator(float spawnDist = 0.0f, TimeSpan? duration = null)
{
_timer = new TimeTracker();
_reference = new();
@@ -19,6 +26,8 @@ namespace Game.Movement
Priority = MovementGeneratorPriority.Normal;
Flags = MovementGeneratorFlags.InitializationPending;
BaseUnitState = UnitState.Roaming;
if (duration.HasValue)
_duration = new TimeTracker(duration.Value);
}
public override void DoInitialize(Creature owner)
@@ -56,6 +65,17 @@ namespace Game.Movement
if (HasFlag(MovementGeneratorFlags.Finalized | MovementGeneratorFlags.Paused))
return true;
if (_duration != null)
{
_duration.Update(diff);
if (_duration.Passed())
{
RemoveFlag(MovementGeneratorFlags.Transitory);
AddFlag(MovementGeneratorFlags.InformEnabled);
return false;
}
}
if (owner.HasUnitState(UnitState.NotMove) || owner.IsMovementPreventedByCasting())
{
AddFlag(MovementGeneratorFlags.Interrupted);
@@ -90,6 +110,10 @@ namespace Game.Movement
// TODO: Research if this modification is needed, which most likely isnt
owner.SetWalk(false);
}
if (movementInform && HasFlag(MovementGeneratorFlags.InformEnabled))
if (owner.IsAIEnabled())
owner.GetAI().MovementInform(MovementGeneratorType.Random, 0);
}
public override void Pause(uint timer = 0)
@@ -197,11 +221,5 @@ namespace Game.Movement
{
return MovementGeneratorType.Random;
}
PathGenerator _path;
TimeTracker _timer;
Position _reference;
float _wanderDistance;
uint _wanderSteps;
}
}
+2 -2
View File
@@ -545,10 +545,10 @@ namespace Game.Movement
Add(new FollowMovementGenerator(target, SharedConst.PetFollowDist, new ChaseAngle(SharedConst.PetFollowAngle)));
}
public void MoveRandom(float wanderDistance = 0.0f)
public void MoveRandom(float wanderDistance = 0.0f, TimeSpan? duration = null)
{
if (_owner.IsTypeId(TypeId.Unit))
Add(new RandomMovementGenerator(wanderDistance), MovementSlot.Default);
Add(new RandomMovementGenerator(wanderDistance, duration), MovementSlot.Default);
}
public void MoveFollow(Unit target, float dist, float angle = 0.0f, MovementSlot slot = MovementSlot.Active) { MoveFollow(target, dist, new ChaseAngle(angle), slot); }