From 5e8de17b55745166984515dd39891d392196ad31 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 16 Jul 2024 20:41:27 +0200 Subject: [PATCH] Disable some tribal quests for now --- .../Dailies/4562_Waste Not, Want None of That.json | 1 + .../Dailies/4562_Waste Not, Want None of That.md | 12 ++++++++++++ .../Tribal/Arkasodara/Dailies/4563_Seedy Affair.json | 1 + .../Tribal/Arkasodara/Dailies/4563_Seedy Affair.md | 7 +++++++ Questionable/Windows/QuestWindow.cs | 10 ++++++++++ 5 files changed, 31 insertions(+) create mode 100644 QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4562_Waste Not, Want None of That.md create mode 100644 QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.md diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4562_Waste Not, Want None of That.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4562_Waste Not, Want None of That.json index 391185dc..20ee2a3d 100644 --- a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4562_Waste Not, Want None of That.json +++ b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4562_Waste Not, Want None of That.json @@ -1,6 +1,7 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "Disabled": true, "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4562_Waste Not, Want None of That.md b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4562_Waste Not, Want None of That.md new file mode 100644 index 00000000..05681950 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4562_Waste Not, Want None of That.md @@ -0,0 +1,12 @@ +## Seedy Affair + +First NPC: +``` +0 ?? 0 0 0 0 + 32 → 1042390 +``` + +Second NPC: +``` +1 16 0 0 0 64 → 1042389 +``` diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.json index 039d3c69..3215d4c5 100644 --- a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.json +++ b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.json @@ -1,6 +1,7 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "Disabled": true, "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.md b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.md new file mode 100644 index 00000000..17a1c889 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.md @@ -0,0 +1,7 @@ +## Seedy Affair + +QuestWork: +``` +0 ?? 0 0 0 0 + 19 → 2012884 +``` diff --git a/Questionable/Windows/QuestWindow.cs b/Questionable/Windows/QuestWindow.cs index 9fd5c9ec..1f3f617c 100644 --- a/Questionable/Windows/QuestWindow.cs +++ b/Questionable/Windows/QuestWindow.cs @@ -49,6 +49,7 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig private readonly IGameGui _gameGui; private readonly QuestSelectionWindow _questSelectionWindow; private readonly QuestValidationWindow _questValidationWindow; + private readonly ICommandManager _commandManager; private readonly ILogger _logger; public QuestWindow(IDalamudPluginInterface pluginInterface, @@ -70,6 +71,7 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig IGameGui gameGui, QuestSelectionWindow questSelectionWindow, QuestValidationWindow questValidationWindow, + ICommandManager commandManager, ILogger logger) : base("Questionable###Questionable", ImGuiWindowFlags.AlwaysAutoResize) { @@ -92,6 +94,7 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig _gameGui = gameGui; _questSelectionWindow = questSelectionWindow; _questValidationWindow = questValidationWindow; + _commandManager = commandManager; _logger = logger; #if DEBUG @@ -264,6 +267,13 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig ImGui.PopStyleColor(); ImGui.EndDisabled(); + if (_commandManager.Commands.TryGetValue("/questinfo", out var commandInfo)) + { + ImGui.SameLine(); + if (ImGuiComponents.IconButton(FontAwesomeIcon.Atlas)) + _commandManager.DispatchCommand("/questinfo", currentQuest.Quest.QuestId.ToString(CultureInfo.InvariantCulture), commandInfo); + } + bool autoAcceptNextQuest = _configuration.General.AutoAcceptNextQuest; if (ImGui.Checkbox("Automatically accept next quest", ref autoAcceptNextQuest)) {