Consider quest step complete if QuestWork matches + maybe fix some interact interruptions

diff --git a/Questionable/Controller/Steps/Interactions/Interact.cs b/Questionable/Controller/Steps/Interactions/Interact.cs
index 3cb137c46ea53b69d68e226831f8c4ab576914c6..ac8f5109a9d9936e63587cfb4c73defdd7954e51 100644 (file)
--- a/Questionable/Controller/Steps/Interactions/Interact.cs
+++ b/Questionable/Controller/Steps/Interactions/Interact.cs
@@ -7,6 +7,7 @@ using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using Microsoft.Extensions.Logging;
 using Questionable.Controller.Steps.Shared;
+using Questionable.Controller.Utils;
 using Questionable.Functions;
 using Questionable.Model;
 using Questionable.Model.Questing;
@@ -57,7 +58,7 @@ internal static class Interact
             yield return new Task(step.DataId.Value, quest, step.InteractionType,
                 step.TargetTerritoryId != null || quest.Id is SatisfactionSupplyNpcId ||
                 step.SkipConditions is { StepIf.Never: true } || step.InteractionType == EInteractionType.PurchaseItem,
-                step.PickUpItemId, step.SkipConditions?.StepIf);
+                step.PickUpItemId, step.SkipConditions?.StepIf, step.CompletionQuestVariablesFlags);
         }
     }
 
@@ -67,15 +68,25 @@ internal static class Interact
         EInteractionType InteractionType,
         bool SkipMarkerCheck = false,
         uint? PickUpItemId = null,
-        SkipStepConditions? SkipConditions = null) : ITask
+        SkipStepConditions? SkipConditions = null,
+        List<QuestWorkValue?>? CompletionQuestVariablesFlags = null) : ITask
     {
+        public List<QuestWorkValue?> CompletionQuestVariablesFlags { get; } = CompletionQuestVariablesFlags ?? [];
+
+        public bool HasCompletionQuestVariablesFlags { get; } =
+            Quest != null &&
+            CompletionQuestVariablesFlags != null &&
+            QuestWorkUtils.HasCompletionFlags(CompletionQuestVariablesFlags);
+
         public bool ShouldRedoOnInterrupt() => true;
 
-        public override string ToString() => $"Interact({DataId})";
+        public override string ToString() =>
+            $"Interact{(HasCompletionQuestVariablesFlags ? "*" : "")}({DataId})";
     }
 
     internal sealed class DoInteract(
         GameFunctions gameFunctions,
+        QuestFunctions questFunctions,
         ICondition condition,
         ILogger<DoInteract> logger)
         : TaskExecutor<Task>, IConditionChangeAware
@@ -151,13 +162,22 @@ internal static class Interact
                         return ETaskResult.TaskComplete;
                 }
             }
-            else
+            else if (InteractionType == EInteractionType.Gather && condition[ConditionFlag.Gathering])
+                return ETaskResult.TaskComplete;
+            else if (Quest != null && Task.HasCompletionQuestVariablesFlags)
             {
-                if (ProgressContext != null && (ProgressContext.WasSuccessful() ||
-                                                _interactionState == EInteractionState.InteractionConfirmed))
-                    return ETaskResult.TaskComplete;
-
-                if (InteractionType == EInteractionType.Gather && condition[ConditionFlag.Gathering])
+                var questWork = questFunctions.GetQuestProgressInfo(Quest.Id);
+                return questWork != null &&
+                       QuestWorkUtils.MatchesQuestWork(Task.CompletionQuestVariablesFlags, questWork)
+                    ? ETaskResult.TaskComplete
+                    : ETaskResult.StillRunning;
+            }
+            else if (ProgressContext != null)
+            {
+                if (ProgressContext.WasInterrupted())
+                    return ETaskResult.StillRunning;
+                else if (ProgressContext.WasSuccessful() ||
+                         _interactionState == EInteractionState.InteractionConfirmed)
                     return ETaskResult.TaskComplete;
             }