diff --git a/CHANGELOG.md b/CHANGELOG.md index 1942d5390..66399cb1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,2 @@ -- Feature: Adjusted quest window buttons -alydev -- Change: show Remaining Tasks dropdown (if enabled) even if 0 tasks -alydev \ No newline at end of file +- bug fix: add description to journal progress button -alydev +- bug fix(?): restore 1 second delay for accept/complete quest -alydev \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets index 167ee08dc..b13ee0e64 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,6 +1,6 @@ - 15.306.1.12 + 15.306.1.13 diff --git a/QuestPaths/4.x - Stormblood/Class Quests/CUL/2607_Teach a Man to Make Fish.json b/QuestPaths/4.x - Stormblood/Class Quests/CUL/2607_Teach a Man to Make Fish.json index 2b5005af2..ddda333e4 100644 --- a/QuestPaths/4.x - Stormblood/Class Quests/CUL/2607_Teach a Man to Make Fish.json +++ b/QuestPaths/4.x - Stormblood/Class Quests/CUL/2607_Teach a Man to Make Fish.json @@ -83,6 +83,17 @@ "Fly": true, "RestartNavigationIfCancelled": false }, + { + "Position": { + "X": 319.92804, + "Y": -121.95376, + "Z": -317.30713 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "RestartNavigationIfCancelled": false + }, { "DataId": 1020157, "Position": { diff --git a/Questionable/Controller/Steps/Shared/WaitAtEnd.cs b/Questionable/Controller/Steps/Shared/WaitAtEnd.cs index bda2edb62..85d173b18 100644 --- a/Questionable/Controller/Steps/Shared/WaitAtEnd.cs +++ b/Questionable/Controller/Steps/Shared/WaitAtEnd.cs @@ -38,9 +38,9 @@ public IEnumerable CreateAllTasks(Quest quest, QuestSequence sequence, Qu WaitCondition.Task notInCombat = new(() => !condition[ConditionFlag.InCombat], "Wait(not in combat)"); return [ - new WaitDelay(), + new WaitDelay(TimeSpan.FromSeconds(1)), notInCombat, - new WaitDelay(), + new WaitDelay(TimeSpan.FromSeconds(1)), Next(quest, sequence) ]; @@ -69,7 +69,7 @@ public IEnumerable CreateAllTasks(Quest quest, QuestSequence sequence, Qu return [ new WaitObjectAtPosition(step.DataId.Value, step.Position.Value, step.NpcWaitDistance ?? 0.5f), - new WaitDelay(), + new WaitDelay(TimeSpan.FromSeconds(1)), Next(quest, sequence) ]; @@ -108,7 +108,7 @@ public IEnumerable CreateAllTasks(Quest quest, QuestSequence sequence, Qu case EInteractionType.AcceptQuest: { WaitQuestAccepted accept = new(step.PickUpQuestId ?? quest.Id); - WaitDelay delay = new(); + WaitDelay delay = new(TimeSpan.FromSeconds(1)); if (step.PickUpQuestId != null) { if (redoUtil.IsRedoActive()) // Can't accept other quests during NG+ @@ -122,7 +122,7 @@ public IEnumerable CreateAllTasks(Quest quest, QuestSequence sequence, Qu case EInteractionType.CompleteQuest: { WaitQuestCompleted complete = new(step.TurnInQuestId ?? quest.Id); - WaitDelay delay = new(); + WaitDelay delay = new(TimeSpan.FromSeconds(1)); List tasks = [complete, delay, .. RedeemRewardItems.CreateRedeemTasks(questData, dataManager)]; if (step.TurnInQuestId != null) tasks.Add(Next(quest, sequence)); diff --git a/Questionable/Resources/I18N.xml b/Questionable/Resources/I18N.xml index 425108de3..fbd25f04c 100644 --- a/Questionable/Resources/I18N.xml +++ b/Questionable/Resources/I18N.xml @@ -694,6 +694,7 @@ + Priority Quests 優先クエスト 优先任务 @@ -1008,6 +1009,7 @@ + Quest Validation クエスト検証 任务验证 @@ -2323,6 +2325,7 @@ + This quest is not yet supported. このクエストはまだサポートされていません。 此任务尚不支持。 @@ -2486,7 +2489,6 @@ 战斗中 - No active quest Geen aktiewe soeke nie @@ -3021,6 +3023,7 @@ 设置尽可能优先执行的优先任务。 + Rebuild Navmesh ナビメッシュを再構築 重建导航网格 @@ -3044,6 +3047,7 @@ 重新加载数据 + Stuck? スタックしていますか? 卡住了? @@ -3920,4 +3924,28 @@ Remaining Tasks + + + Instant Quests + + + + Use Questionable theme + + + + When disabled, Questionable's windows use your Dalamud style/theme instead. + + + + No supported quests + + + + Reset sequence progess and reload quest data from disk + + + + Utility to browse quest data used by this plugin + \ No newline at end of file diff --git a/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs b/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs index 5d7fa7bed..9a1ef2ba8 100644 --- a/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs +++ b/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs @@ -62,6 +62,7 @@ internal void DrawRebuildNavmeshButton(bool showLabel = false) internal void DrawReloadDataButton(bool showLabel = false) { if (QstWidgets.RailButton(FontAwesomeIcon.RedoAlt, _L("Reload Data"), + _L("Reset sequence progess and reload quest data from disk"), showLabel: showLabel)) Reload?.Invoke(this, EventArgs.Empty); } @@ -69,6 +70,7 @@ internal void DrawReloadDataButton(bool showLabel = false) internal void DrawJournalProgressButton(bool showLabel = false) { if (QstWidgets.RailButton(FontAwesomeIcon.BookBookmark, _L("Journal Progress"), + _L("Utility to browse quest data used by this plugin"), showLabel: showLabel)) journalProgressWindow.ToggleOrUncollapse(); }