Fix single step button
authorLiza Carvelli <liza@carvel.li>
Wed, 12 Jun 2024 20:04:57 +0000 (22:04 +0200)
committerLiza Carvelli <liza@carvel.li>
Wed, 12 Jun 2024 20:04:57 +0000 (22:04 +0200)
QuestPaths/Endwalker/MSQ/H-6.1/4531_Sharing the Wealth.json
Questionable/Controller/QuestController.cs

index 66b8685cb2baf580e890ea6b4e6365e54fb1b9ba..7f55d13046c6fde76456c9aac10bcf66e73bb344 100644 (file)
           },
           "TerritoryId": 957,
           "InteractionType": "WalkTo",
-          "Fly": true,
+          "AetheryteShortcut": "Thavnair - Yedlihmad",
           "CompletionQuestVariablesFlags": [
             null,
             null,
             null,
             null,
             null,
-            128
+            -128
           ]
         },
         {
index 81b96ce162fbf71e972d79f206bf231cc335c231..45957fab750f42c0ce0898febab22f1acba7eb7f 100644 (file)
@@ -84,7 +84,8 @@ internal sealed class QuestController
             return;
 
         // not verified to work
-        if (_automatic && _currentTask == null && _taskQueue.Count == 0 && CurrentQuest is { Sequence: 0, Step: 255 }
+        if (_automatic && _currentTask == null && _taskQueue.Count == 0
+            && CurrentQuest is { Sequence: 0, Step: 0 } or { Sequence: 0, Step: 255 }
             && DateTime.Now >= CurrentQuest.StepProgress.StartedAt.AddSeconds(15))
         {
             _logger.LogWarning("Quest accept apparently didn't work out, resetting progress");
@@ -376,11 +377,13 @@ internal sealed class QuestController
 
             case ETaskResult.NextStep:
                 _logger.LogInformation("{Task} → {Result}", _currentTask, result);
+                _currentTask = null;
                 IncreaseStepCount(true);
                 return;
 
             case ETaskResult.End:
                 _logger.LogInformation("{Task} → {Result}", _currentTask, result);
+                _currentTask = null;
                 Stop("Task end");
                 return;
         }