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

Core/Movement: MoveCirclePath new features

Browse Source 
* Duration limit
* Customizable speed
Port From (https://github.com/TrinityCore/TrinityCore/commit/88242a42ceabed65520dfccb6e32ff5d8ce63012)
This commit is contained in:
hondacrx
2024-02-21 21:02:28 -05:00
parent e46c8c7e25
commit a9b13b7891
2 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Movement/Generators/GenericMovementGenerator.cs
+24 -8
View File
@@ -13,23 +13,31 @@ namespace Game.Movement
MovementGeneratorType _type; MovementGeneratorType _type;
uint _pointId; uint _pointId;
TimeTracker _duration; TimeTracker _duration;
bool _durationTracksSpline;
uint _arrivalSpellId; uint _arrivalSpellId;
ObjectGuid _arrivalSpellTargetGuid; ObjectGuid _arrivalSpellTargetGuid;
public GenericMovementGenerator(Action<MoveSplineInit> initializer, MovementGeneratorType type, uint id, uint arrivalSpellId = 0, ObjectGuid arrivalSpellTargetGuid = default) public GenericMovementGenerator(Action<MoveSplineInit> initializer, MovementGeneratorType type, uint id, GenericMovementGeneratorArgs args = default)
{ {
_splineInit = initializer; _splineInit = initializer;
_type = type; _type = type;
_pointId = id; _pointId = id;
_duration = new(); _durationTracksSpline = true;
_arrivalSpellId = arrivalSpellId;
_arrivalSpellTargetGuid = arrivalSpellTargetGuid;
Mode = MovementGeneratorMode.Default; Mode = MovementGeneratorMode.Default;
Priority = MovementGeneratorPriority.Normal; Priority = MovementGeneratorPriority.Normal;
Flags = MovementGeneratorFlags.InitializationPending; Flags = MovementGeneratorFlags.InitializationPending;
BaseUnitState = UnitState.Roaming; BaseUnitState = UnitState.Roaming;
if (args.ArrivalSpellId.HasValue)
_arrivalSpellId = args.ArrivalSpellId.Value;
if (args.ArrivalSpellTarget.HasValue)
_arrivalSpellTargetGuid = args.ArrivalSpellTarget.Value;
if (args.Duration.HasValue)
{
_duration = new(args.Duration.Value);
_durationTracksSpline = false;
}
} }
public override void Initialize(Unit owner) public override void Initialize(Unit owner)
@@ -46,7 +54,9 @@ namespace Game.Movement
MoveSplineInit init = new(owner); MoveSplineInit init = new(owner);
_splineInit(init); _splineInit(init);
_duration.Reset((uint)init.Launch()); int duration = init.Launch();
if (_durationTracksSpline)
_duration = new((uint)duration);
} }
public override void Reset(Unit owner) public override void Reset(Unit owner)
@@ -60,10 +70,9 @@ namespace Game.Movement
return false; return false;
// Cyclic splines never expire, so update the duration only if it's not cyclic // Cyclic splines never expire, so update the duration only if it's not cyclic
if (!owner.MoveSpline.IsCyclic()) _duration?.Update(diff);
_duration.Update(diff);
if (_duration.Passed() || owner.MoveSpline.Finalized()) if ((_duration != null && _duration.Passed()) || owner.MoveSpline.Finalized())
{ {
AddFlag(MovementGeneratorFlags.InformEnabled); AddFlag(MovementGeneratorFlags.InformEnabled);
return false; return false;
@@ -97,4 +106,11 @@ namespace Game.Movement
public override MovementGeneratorType GetMovementGeneratorType() { return _type; } public override MovementGeneratorType GetMovementGeneratorType() { return _type; }
} }
struct GenericMovementGeneratorArgs
{
public uint? ArrivalSpellId;
public ObjectGuid? ArrivalSpellTarget;
public TimeSpan? Duration;
}
} }
Source/Game/Movement/MotionMaster.cs
+22 -9
View File
@@ -795,7 +795,7 @@ namespace Game.Movement
arrivalSpellTargetGuid = arrivalCast.Target; arrivalSpellTargetGuid = arrivalCast.Target;
} }
GenericMovementGenerator movement = new(initializer, MovementGeneratorType.Effect, id, arrivalSpellId, arrivalSpellTargetGuid); GenericMovementGenerator movement = new(initializer, MovementGeneratorType.Effect, id, new GenericMovementGeneratorArgs() { ArrivalSpellId = arrivalSpellId, ArrivalSpellTarget = arrivalSpellTargetGuid });
movement.Priority = MovementGeneratorPriority.Highest; movement.Priority = MovementGeneratorPriority.Highest;
movement.BaseUnitState = UnitState.Jumping; movement.BaseUnitState = UnitState.Jumping;
Add(movement); Add(movement);
@@ -828,14 +828,14 @@ namespace Game.Movement
arrivalSpellTargetGuid = arrivalCast.Target; arrivalSpellTargetGuid = arrivalCast.Target;
} }
GenericMovementGenerator movement = new GenericMovementGenerator(initializer, MovementGeneratorType.Effect, id, arrivalSpellId, arrivalSpellTargetGuid); GenericMovementGenerator movement = new GenericMovementGenerator(initializer, MovementGeneratorType.Effect, id, new GenericMovementGeneratorArgs() { ArrivalSpellId = arrivalSpellId, ArrivalSpellTarget = arrivalSpellTargetGuid });
movement.Priority = MovementGeneratorPriority.Highest; movement.Priority = MovementGeneratorPriority.Highest;
movement.BaseUnitState = UnitState.Jumping; movement.BaseUnitState = UnitState.Jumping;
movement.AddFlag(MovementGeneratorFlags.PersistOnDeath); movement.AddFlag(MovementGeneratorFlags.PersistOnDeath);
Add(movement); Add(movement);
} }
public void MoveCirclePath(float x, float y, float z, float radius, bool clockwise, byte stepCount) public void MoveCirclePath(float x, float y, float z, float radius, bool clockwise, byte stepCount, TimeSpan? duration = null, float? speed = null, MovementWalkRunSpeedSelectionMode speedSelectionMode = MovementWalkRunSpeedSelectionMode.Default)
{ {
var initializer = (MoveSplineInit init) => var initializer = (MoveSplineInit init) =>
{ {
@@ -851,7 +851,7 @@ namespace Game.Movement
Vector3 point = new(); Vector3 point = new();
point.X = (float)(x + radius * Math.Cos(angle)); point.X = (float)(x + radius * Math.Cos(angle));
point.Y = (float)(y + radius * Math.Sin(angle)); point.Y = (float)(y + radius * Math.Sin(angle));
if (_owner.IsFlying()) if (_owner.IsFlying())
point.Z = z; point.Z = z;
else else
@@ -859,21 +859,34 @@ namespace Game.Movement
init.Path().Add(point); init.Path().Add(point);
} }
init.SetCyclic();
if (_owner.IsFlying()) if (_owner.IsFlying())
{ {
init.SetFly(); init.SetFly();
init.SetCyclic();
init.SetAnimation(AnimTier.Hover); init.SetAnimation(AnimTier.Hover);
} }
else else
{
init.SetWalk(true); init.SetWalk(true);
init.SetCyclic();
switch (speedSelectionMode)
{
case MovementWalkRunSpeedSelectionMode.ForceRun:
init.SetWalk(false);
break;
case MovementWalkRunSpeedSelectionMode.ForceWalk:
init.SetWalk(true);
break;
case MovementWalkRunSpeedSelectionMode.Default:
default:
break;
} }
if (speed.HasValue)
init.SetVelocity(speed.Value);
}; };
Add(new GenericMovementGenerator(initializer, MovementGeneratorType.Effect, 0)); Add(new GenericMovementGenerator(initializer, MovementGeneratorType.Effect, 0, new GenericMovementGeneratorArgs() { Duration = duration }));
} }
public void MoveSmoothPath(uint pointId, Vector3[] pathPoints, int pathSize, bool walk = false, bool fly = false) public void MoveSmoothPath(uint pointId, Vector3[] pathPoints, int pathSize, bool walk = false, bool fly = false)