From 8b6b5e894bc361424a6be17c9f54f4ddcfaa2d3d Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Wed, 12 Jun 2024 22:04:57 +0200 Subject: [PATCH] Fix single step button --- QuestPaths/Endwalker/MSQ/H-6.1/4531_Sharing the Wealth.json | 4 ++-- Questionable/Controller/QuestController.cs | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/QuestPaths/Endwalker/MSQ/H-6.1/4531_Sharing the Wealth.json b/QuestPaths/Endwalker/MSQ/H-6.1/4531_Sharing the Wealth.json index 66b8685c..7f55d130 100644 --- a/QuestPaths/Endwalker/MSQ/H-6.1/4531_Sharing the Wealth.json +++ b/QuestPaths/Endwalker/MSQ/H-6.1/4531_Sharing the Wealth.json @@ -55,14 +55,14 @@ }, "TerritoryId": 957, "InteractionType": "WalkTo", - "Fly": true, + "AetheryteShortcut": "Thavnair - Yedlihmad", "CompletionQuestVariablesFlags": [ null, null, null, null, null, - 128 + -128 ] }, { diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs index 81b96ce1..45957fab 100644 --- a/Questionable/Controller/QuestController.cs +++ b/Questionable/Controller/QuestController.cs @@ -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; }