cacahuetes/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests 1 Activity

master #3

Open
cacahuetes wants to merge 640 commits from liza/Questionable:master into cacahuetes-ShB-Healer
pull from: liza/Questionable:master
merge into: cacahuetes:cacahuetes-ShB-Healer
Conversation 0 Commits 640 Files Changed 1480 +40 -29
5 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 822f78a4d8 - Show all commits

2
GatheringPathRenderer/Windows/EditorWindow.cs
View File

@ -66,7 +66,7 @@ internal sealed class EditorWindow : Window
_target = _targetManager.Target;
var gatheringLocations = _plugin.GetLocationsInTerritory(_clientState.TerritoryType);
var location = gatheringLocations.SelectMany(context =>
var location = gatheringLocations.ToList().SelectMany(context =>
context.Root.Groups.SelectMany(group =>
group.Nodes.SelectMany(node => node.Locations
.Select(location =>

4
Questionable/Controller/GatheringController.cs
View File

@ -167,7 +167,7 @@ internal sealed unsafe class GatheringController : MiniTaskController<GatheringC
pointOnFloor = pointOnFloor.Value with { Y = pointOnFloor.Value.Y + (fly ? 3f : 0f) };
_taskQueue.Enqueue(new MoveTo.MoveTask(territoryId, pointOnFloor ?? averagePosition,
null, 50f, Fly: fly, IgnoreDistanceToObject: true));
null, 50f, Fly: fly, IgnoreDistanceToObject: true, InteractionType: EInteractionType.WalkTo));
}
_taskQueue.Enqueue(new MoveToLandingLocation.Task(territoryId, fly, currentNode));
@ -245,7 +245,7 @@ internal sealed unsafe class GatheringController : MiniTaskController<GatheringC
public override IList<string> GetRemainingTaskNames()
{
if (_taskQueue.CurrentTaskExecutor?.CurrentTask is {} currentTask)
if (_taskQueue.CurrentTaskExecutor?.CurrentTask is { } currentTask)
return [currentTask.ToString() ?? "?", .. base.GetRemainingTaskNames()];
else
return base.GetRemainingTaskNames();

4
Questionable/Controller/Steps/Gathering/MoveToLandingLocation.cs
View File

@ -8,6 +8,7 @@ using Questionable.Controller.Steps.Shared;
using Questionable.Functions;
using Questionable.Model;
using Questionable.Model.Gathering;
using Questionable.Model.Questing;
namespace Questionable.Controller.Steps.Gathering;
@ -50,7 +51,8 @@ internal static class MoveToLandingLocation
bool fly = Task.FlyBetweenNodes && gameFunctions.IsFlyingUnlocked(Task.TerritoryId);
_moveTask = new MoveTo.MoveTask(Task.TerritoryId, target, null, 0.25f,
DataId: Task.GatheringNode.DataId, Fly: fly, IgnoreDistanceToObject: true);
DataId: Task.GatheringNode.DataId, Fly: fly, IgnoreDistanceToObject: true,
InteractionType: EInteractionType.Gather);
return moveExecutor.Start(_moveTask);
}

6
Questionable/Controller/Steps/Interactions/UseItem.cs
View File

@ -62,7 +62,8 @@ internal static class UseItem
nextPosition != null ? Mount.EMountIf.AwayFromPosition : Mount.EMountIf.Always,
nextPosition),
new MoveTo.MoveTask(140, new(-408.92343f, 23.167036f, -351.16223f), null, 0.25f,
DataId: null, DisableNavmesh: true, Sprint: false, Fly: false)
DataId: null, DisableNavmesh: true, Sprint: false, Fly: false,
InteractionType: EInteractionType.WalkTo)
];
}
@ -105,7 +106,8 @@ internal static class UseItem
yield return new AetheryteShortcut.Task(null, null, EAetheryteLocation.Limsa, territoryId);
yield return new AethernetShortcut.Task(EAetheryteLocation.Limsa, EAetheryteLocation.LimsaArcanist);
yield return new WaitAtEnd.WaitDelay();
yield return new MoveTo.MoveTask(territoryId, destination, DataId: npcId, Sprint: false);
yield return new MoveTo.MoveTask(territoryId, destination, DataId: npcId, Sprint: false,
InteractionType: EInteractionType.WalkTo);
yield return new Interact.Task(npcId, null, EInteractionType.None, true);
}
}

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

@ -36,7 +36,7 @@ internal static class MoveTo
{
if (step.Position != null)
{
return CreateMountTasks(quest.Id, step, step.Position.Value);
return CreateMoveTasks(step, step.Position.Value);
}
else if (step is { DataId: not null, StopDistance: not null })
{
@ -44,17 +44,17 @@ internal static class MoveTo
}
else if (step is { InteractionType: EInteractionType.AttuneAetheryte, Aetheryte: not null })
{
return CreateMountTasks(quest.Id, step, aetheryteData.Locations[step.Aetheryte.Value]);
return CreateMoveTasks(step, aetheryteData.Locations[step.Aetheryte.Value]);
}
else if (step is { InteractionType: EInteractionType.AttuneAethernetShard, AethernetShard: not null })
{
return CreateMountTasks(quest.Id, step, aetheryteData.Locations[step.AethernetShard.Value]);
return CreateMoveTasks(step, aetheryteData.Locations[step.AethernetShard.Value]);
}
return [];
}
public IEnumerable<ITask> CreateMountTasks(ElementId questId, QuestStep step, Vector3 destination)
private IEnumerable<ITask> CreateMoveTasks(QuestStep step, Vector3 destination)
{
if (step.InteractionType == EInteractionType.Jump && step.JumpDestination != null &&
(clientState.LocalPlayer!.Position - step.JumpDestination.Position).Length() <=
@ -71,13 +71,9 @@ internal static class MoveTo
{
yield return new WaitCondition.Task(() => movementController.IsNavmeshReady,
"Wait(navmesh ready)");
}
yield return new MoveTask(step, destination);
}
else
{
yield return new MoveTask(step, destination);
}
if (step is { Fly: true, Land: true })
yield return new LandTask();
@ -94,7 +90,7 @@ internal static class MoveTo
private readonly Mount.MountExecutor _mountExecutor;
private readonly Mount.UnmountExecutor _unmountExecutor;
private Action _startAction = null!;
private Action? _startAction;
private Vector3 _destination;
private bool _canRestart;
private ITaskExecutor? _nestedExecutor;
@ -115,13 +111,10 @@ internal static class MoveTo
_mountExecutor = mountExecutor;
_unmountExecutor = unmountExecutor;
_cannotExecuteAtThisTime = dataManager.GetString<LogMessage>(579, x => x.Text)!;
}
private void Initialize()
private void PrepareMovementIfNeeded()
{
_destination = Task.Destination;
if (!_gameFunctions.IsFlyingUnlocked(Task.TerritoryId))
{
Task = Task with { Fly = false, Land = false };
@ -147,18 +140,22 @@ internal static class MoveTo
ignoreDistanceToObject: Task.IgnoreDistanceToObject,
land: Task.Land);
}
_canRestart = Task.RestartNavigation;
}
protected override bool Start()
{
Initialize();
_canRestart = Task.RestartNavigation;
_destination = Task.Destination;
float stopDistance = Task.StopDistance ?? QuestStep.DefaultStopDistance;
Vector3? position = _clientState.LocalPlayer?.Position;
float actualDistance = position == null ? float.MaxValue : Vector3.Distance(position.Value, _destination);
bool requiresMovement = actualDistance > stopDistance;
if (requiresMovement)
PrepareMovementIfNeeded();
// might be able to make this optional
if (Task.Mount == true)
{
var mountTask = new Mount.MountTask(Task.TerritoryId, Mount.EMountIf.Always);
@ -207,13 +204,21 @@ internal static class MoveTo
if (_nestedExecutor.Update() == ETaskResult.TaskComplete)
{
_nestedExecutor = null;
_logger.LogInformation("Moving to {Destination}", _destination.ToString("G", CultureInfo.InvariantCulture));
if (_startAction != null)
{
_logger.LogInformation("Moving to {Destination}",
_destination.ToString("G", CultureInfo.InvariantCulture));
_startAction();
}
else
return ETaskResult.TaskComplete;
}
return ETaskResult.StillRunning;
}
if (_startAction == null)
return ETaskResult.TaskComplete;
if (_movementController.IsPathfinding || _movementController.IsPathRunning)
return ETaskResult.StillRunning;
@ -268,7 +273,8 @@ internal static class MoveTo
bool Fly = false,
bool Land = false,
bool IgnoreDistanceToObject = false,
bool RestartNavigation = true) : ITask
bool RestartNavigation = true,
EInteractionType InteractionType = EInteractionType.None) : ITask
{
public MoveTask(QuestStep step, Vector3 destination)
: this(step.TerritoryId,
@ -281,7 +287,8 @@ internal static class MoveTo
step.Fly == true,
step.Land == true,
step.IgnoreDistanceToObject == true,
step.RestartNavigationIfCancelled != false)
step.RestartNavigationIfCancelled != false,
step.InteractionType)
{
}