Fix StartSingleQuest IPC

diff --git a/Questionable/Controller/ContextMenuController.cs b/Questionable/Controller/ContextMenuController.cs
index 45230c5f06d7e4b87f96d8666b254f90240a41b4..153dc2bf348f5f38d23991c1412829d286a5647e 100644 (file)
--- a/Questionable/Controller/ContextMenuController.cs
+++ b/Questionable/Controller/ContextMenuController.cs
@@ -181,7 +181,7 @@ internal sealed class ContextMenuController : IDisposable
                 }
             ];
             _questController.SetGatheringQuest(quest);
-            _questController.StartSingleQuest("SatisfactionSupply prepare gathering");
+            _questController.StartGatheringQuest("SatisfactionSupply prepare gathering");
         }
         else
             _chatGui.PrintError($"No associated quest ({info.QuestId}).", "Questionable");

diff --git a/Questionable/Controller/GameUi/InteractionUiController.cs b/Questionable/Controller/GameUi/InteractionUiController.cs
index c4c70b982fd97bc55fb05b4c92257a82f8c48b71..74b5fd4ae70785fa40f31d834b5f2f67f9912001 100644 (file)
--- a/Questionable/Controller/GameUi/InteractionUiController.cs
+++ b/Questionable/Controller/GameUi/InteractionUiController.cs
@@ -525,7 +525,7 @@ internal sealed class InteractionUiController : IDisposable
                             return null;
 
                         _questController.GatheringQuest.SetSequence(1);
-                        _questController.StartSingleQuest("SatisfactionSupply turn in");
+                        _questController.StartGatheringQuest("SatisfactionSupply turn in");
                     }
 
                     return i;

diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs
index 0fc2d41aaaa844ef17a096edf6e51294f56534fb..5f874f12af9a3831c74761e2407a4f7262a52f99 100644 (file)
--- a/Questionable/Controller/QuestController.cs
+++ b/Questionable/Controller/QuestController.cs
@@ -281,9 +281,13 @@ internal sealed class QuestController : MiniTaskController<QuestController>
                     _logger.LogInformation("Next quest {QuestId} accepted or completed",
                         _nextQuest.Quest.Id);
 
-                    // if (_nextQuest.Quest.Id is LeveId)
-                    //  _startedQuest = _nextQuest;
+                    if (AutomationType == EAutomationType.SingleQuestA)
+                    {
+                        _startedQuest = _nextQuest;
+                        AutomationType = EAutomationType.SingleQuestB;
+                    }
 
+                    _logger.LogDebug("Started: {StartedQuest}", _startedQuest?.Quest.Id);
                     _nextQuest = null;
                 }
             }
@@ -349,7 +353,15 @@ internal sealed class QuestController : MiniTaskController<QuestController>
                             Stop("Quest level too high");
                         }
                         else
+                        {
+                            if (AutomationType == EAutomationType.SingleQuestB)
+                            {
+                                _logger.LogInformation("Single quest is finished");
+                                AutomationType = EAutomationType.Manual;
+                            }
+
                             CheckNextTasks("Different Quest");
+                        }
                     }
                     else if (_startedQuest != null)
                     {
@@ -521,7 +533,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
 
     private void CheckNextTasks(string label)
     {
-        if (AutomationType == EAutomationType.Automatic)
+        if (AutomationType is EAutomationType.Automatic or EAutomationType.SingleQuestA or EAutomationType.SingleQuestB)
         {
             using var scope = _logger.BeginScope(label);
 
@@ -597,10 +609,17 @@ internal sealed class QuestController : MiniTaskController<QuestController>
         ExecuteNextStep();
     }
 
+    public void StartGatheringQuest(string label)
+    {
+        using var scope = _logger.BeginScope($"GQ/{label}");
+        AutomationType = EAutomationType.GatheringOnly;
+        ExecuteNextStep();
+    }
+
     public void StartSingleQuest(string label)
     {
         using var scope = _logger.BeginScope($"SQ/{label}");
-        AutomationType = EAutomationType.CurrentQuestOnly;
+        AutomationType = EAutomationType.SingleQuestA;
         ExecuteNextStep();
     }
 
@@ -881,6 +900,8 @@ internal sealed class QuestController : MiniTaskController<QuestController>
     {
         Manual,
         Automatic,
-        CurrentQuestOnly,
+        GatheringOnly,
+        SingleQuestA,
+        SingleQuestB,
     }
 }

diff --git a/Questionable/Controller/Steps/Common/NextQuest.cs b/Questionable/Controller/Steps/Common/NextQuest.cs
index 8262a9ec668b1a09d9da8b3e97a9ebdfa70510f8..7f8cff161c5e023342969381cb49af0d22cbbb31 100644 (file)
--- a/Questionable/Controller/Steps/Common/NextQuest.cs
+++ b/Questionable/Controller/Steps/Common/NextQuest.cs
@@ -44,9 +44,15 @@ internal static class NextQuest
     {
         protected override bool Start()
         {
-            if (questFunctions.IsQuestLocked(Task.NextQuestId, Task.CurrentQuestId))
+            if (questController.AutomationType is QuestController.EAutomationType.SingleQuestA or QuestController.EAutomationType.SingleQuestB)
+            {
+                logger.LogInformation("Won't set next quest to {QuestId}, automation type is CurrentQuestOnly", Task.NextQuestId);
+                questController.SetNextQuest(null);
+            }
+            else if (questFunctions.IsQuestLocked(Task.NextQuestId, Task.CurrentQuestId))
             {
                 logger.LogInformation("Can't set next quest to {QuestId}, quest is locked", Task.NextQuestId);
+                questController.SetNextQuest(null);
             }
             else if (questRegistry.TryGetQuest(Task.NextQuestId, out Quest? quest))
             {