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

Core/Movement: Some movement fixes

Browse Source
This commit is contained in:
hondacrx
2022-07-11 22:20:56 -04:00
parent f41b65ffa6
commit 077ac3988d
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Movement/Generators/ChaseMovementGenerator.cs
+2 -2
View File
@@ -266,9 +266,9 @@ namespace Game.Movement
static bool PositionOkay(Unit owner, Unit target, float? minDistance, float? maxDistance, ChaseAngle? angle)
{
float distSq = owner.GetExactDistSq(target);
if (minDistance.HasValue && distSq < MathF.Sqrt(minDistance.Value))
if (minDistance.HasValue && distSq < minDistance.Value * minDistance.Value)
return false;
if (maxDistance.HasValue && distSq > MathF.Sqrt(maxDistance.Value))
if (maxDistance.HasValue && distSq > maxDistance.Value * maxDistance.Value)
return false;
if (angle.HasValue && !angle.Value.IsAngleOkay(target.GetRelativeAngle(owner)))
return false;
Source/Game/Movement/Generators/FollowMovementGenerator.cs
+1 -1
View File
@@ -210,7 +210,7 @@ namespace Game.Movement
static bool PositionOkay(Unit owner, Unit target, float range, ChaseAngle? angle = null)
{
if (owner.GetExactDistSq(target) > MathF.Sqrt(owner.GetCombatReach() + target.GetCombatReach() + range))
if (owner.GetExactDistSq(target) > (owner.GetCombatReach() + target.GetCombatReach() + range) * (owner.GetCombatReach() + target.GetCombatReach() + range))
return false;
return !angle.HasValue || angle.Value.IsAngleOkay(target.GetRelativeAngle(owner));