liza/Questionable
liza/Questionable
2
1
Fork 18
Code Pull Requests 1 Releases 84 Activity

Handle zone transitiions in new movement logic

Browse Source
This commit is contained in:
Liza 2024-08-30 13:59:33 +02:00
parent 24c1e0c5d9
commit 47d9f090a2
Signed by: liza
GPG Key ID: 7199F8D727D55F67
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.targets
View File

@ -1,5 +1,5 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<Version>2.18</Version> <Version>2.19</Version>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

18
Questionable/Controller/Steps/Shared/MoveTo.cs
View File

@ -169,6 +169,8 @@ internal static class MoveTo
private readonly Action _startAction; private readonly Action _startAction;
private readonly Vector3 _destination; private readonly Vector3 _destination;
private readonly MoveParams _moveParams; private readonly MoveParams _moveParams;
private readonly bool _isUnderwaterInitially;
private bool _canRestart;
public MoveInternal(MoveParams moveParams, public MoveInternal(MoveParams moveParams,
MovementController movementController, MovementController movementController,
@ -213,6 +215,7 @@ internal static class MoveTo
} }
_moveParams = moveParams; _moveParams = moveParams;
_canRestart = moveParams.RestartNavigation;
} }
public bool Start() public bool Start()
@ -231,13 +234,20 @@ internal static class MoveTo
if (movementStartedAt == DateTime.MaxValue || movementStartedAt.AddSeconds(2) >= DateTime.Now) if (movementStartedAt == DateTime.MaxValue || movementStartedAt.AddSeconds(2) >= DateTime.Now)
return ETaskResult.StillRunning; return ETaskResult.StillRunning;
if (_moveParams.RestartNavigation && if (_canRestart &&
Vector3.Distance(_clientState.LocalPlayer!.Position, _destination) > Vector3.Distance(_clientState.LocalPlayer!.Position, _destination) >
(_moveParams.StopDistance ?? QuestStep.DefaultStopDistance) + 5f) (_moveParams.StopDistance ?? QuestStep.DefaultStopDistance) + 5f)
{ {
_logger.LogInformation("Looks like movement was interrupted, re-attempting to move"); _canRestart = false;
_startAction(); if (_clientState.TerritoryType == _moveParams.TerritoryId)
return ETaskResult.StillRunning; {
_logger.LogInformation("Looks like movement was interrupted, re-attempting to move");
_startAction();
return ETaskResult.StillRunning;
}
else
_logger.LogInformation(
"Looks like movement was interrupted, do nothing since we're in a different territory now");
} }
return ETaskResult.TaskComplete; return ETaskResult.TaskComplete;