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

Core/Movement: Made fixed ChaseAngle optional and added possibility to ignore setting walk/run depending on target

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/51872d50ff250df0bad130ab7843b69ea921a1f1)
This commit is contained in:
Hondacrx
2024-09-02 22:31:06 -04:00
parent 2590e31d57
commit ba2aa0d0c0
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Movement/Generators/FollowMovementGenerator.cs
+11 -8
View File
@@ -16,7 +16,8 @@ namespace Game.Movement
static float FOLLOW_RANGE_TOLERANCE = 1.0f; static float FOLLOW_RANGE_TOLERANCE = 1.0f;
float _range; float _range;
ChaseAngle _angle; ChaseAngle? _angle;
bool _ignoreTargetWalk;
TimeTracker _checkTimer; TimeTracker _checkTimer;
TimeTracker _duration; TimeTracker _duration;
@@ -25,11 +26,12 @@ namespace Game.Movement
AbstractFollower _abstractFollower; AbstractFollower _abstractFollower;
public FollowMovementGenerator(Unit target, float range, ChaseAngle angle, TimeSpan? duration, ActionResultSetter<MovementStopReason> scriptResult = null) public FollowMovementGenerator(Unit target, float range, ChaseAngle? angle, TimeSpan? duration, bool ignoreTargetWalk = false, ActionResultSetter<MovementStopReason> scriptResult = null)
{ {
_abstractFollower = new AbstractFollower(target); _abstractFollower = new AbstractFollower(target);
_range = range; _range = range;
_angle = angle; _angle = angle;
_ignoreTargetWalk = ignoreTargetWalk;
Mode = MovementGeneratorMode.Default; Mode = MovementGeneratorMode.Default;
Priority = MovementGeneratorPriority.Normal; Priority = MovementGeneratorPriority.Normal;
@@ -131,16 +133,16 @@ namespace Game.Movement
// select angle // select angle
float tAngle; float tAngle;
float curAngle = target.GetRelativeAngle(owner); float curAngle = target.GetRelativeAngle(owner);
if (_angle.IsAngleOkay(curAngle)) if (!_angle.HasValue || _angle.Value.IsAngleOkay(curAngle))
tAngle = curAngle; tAngle = curAngle;
else else
{ {
float diffUpper = Position.NormalizeOrientation(curAngle - _angle.UpperBound()); float diffUpper = Position.NormalizeOrientation(curAngle - _angle.Value.UpperBound());
float diffLower = Position.NormalizeOrientation(_angle.LowerBound() - curAngle); float diffLower = Position.NormalizeOrientation(_angle.Value.LowerBound() - curAngle);
if (diffUpper < diffLower) if (diffUpper < diffLower)
tAngle = _angle.UpperBound(); tAngle = _angle.Value.UpperBound();
else else
tAngle = _angle.LowerBound(); tAngle = _angle.Value.LowerBound();
} }
target.GetNearPoint(owner, out x, out y, out z, range, target.ToAbsoluteAngle(tAngle)); target.GetNearPoint(owner, out x, out y, out z, range, target.ToAbsoluteAngle(tAngle));
@@ -167,7 +169,8 @@ namespace Game.Movement
MoveSplineInit init = new(owner); MoveSplineInit init = new(owner);
init.MovebyPath(_path.GetPath()); init.MovebyPath(_path.GetPath());
init.SetWalk(target.IsWalking()); if (!_ignoreTargetWalk)
init.SetWalk(target.IsWalking());
init.SetFacing(target.GetOrientation()); init.SetFacing(target.GetOrientation());
init.Launch(); init.Launch();
} }
Source/Game/Movement/MotionMaster.cs
+4 -4
View File
@@ -552,12 +552,12 @@ namespace Game.Movement
scriptResult.SetResult(MovementStopReason.Interrupted); scriptResult.SetResult(MovementStopReason.Interrupted);
} }
public void MoveFollow(Unit target, float dist, float angle = 0.0f, TimeSpan? duration = null, MovementSlot slot = MovementSlot.Active, ActionResultSetter<MovementStopReason> scriptResult = null) public void MoveFollow(Unit target, float dist, float angle = 0.0f, TimeSpan? duration = null, bool ignoreTargetWalk = false, MovementSlot slot = MovementSlot.Active, ActionResultSetter<MovementStopReason> scriptResult = null)
{ {
MoveFollow(target, dist, new ChaseAngle(angle), duration, slot, scriptResult); MoveFollow(target, dist, new ChaseAngle(angle), duration, ignoreTargetWalk, slot, scriptResult);
} }
public void MoveFollow(Unit target, float dist, ChaseAngle angle, TimeSpan? duration = null, MovementSlot slot = MovementSlot.Active, ActionResultSetter<MovementStopReason> scriptResult = null) public void MoveFollow(Unit target, float dist, ChaseAngle? angle = null, TimeSpan? duration = null, bool ignoreTargetWalk = false, MovementSlot slot = MovementSlot.Active, ActionResultSetter<MovementStopReason> scriptResult = null)
{ {
// Ignore movement request if target not exist // Ignore movement request if target not exist
if (target == null || target == _owner) if (target == null || target == _owner)
@@ -567,7 +567,7 @@ namespace Game.Movement
return; return;
} }
Add(new FollowMovementGenerator(target, dist, angle, duration, scriptResult), slot); Add(new FollowMovementGenerator(target, dist, angle, duration, ignoreTargetWalk, scriptResult), slot);
} }
public void MoveChase(Unit target, float dist, float angle = 0.0f) { MoveChase(target, new ChaseRange(dist), new ChaseAngle(angle)); } public void MoveChase(Unit target, float dist, float angle = 0.0f) { MoveChase(target, new ChaseRange(dist), new ChaseAngle(angle)); }