From 2726c4873d79f1031ab77c5c7134dcba72af88e1 Mon Sep 17 00:00:00 2001 From: alydev Date: Wed, 22 Oct 2025 13:20:12 +1000 Subject: [PATCH] muffin v6.31 --- .../QuestController.cs | 26 +++++++++++++------ .../QuestJournalUtils.cs | 14 +--------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/Questionable/Questionable.Controller/QuestController.cs b/Questionable/Questionable.Controller/QuestController.cs index 2ddf1a2..c8b8b96 100644 --- a/Questionable/Questionable.Controller/QuestController.cs +++ b/Questionable/Questionable.Controller/QuestController.cs @@ -1140,16 +1140,26 @@ internal sealed class QuestController : MiniTaskController { List list = (from q in _questRegistry.AllQuests.Where(delegate(Quest quest) { - if (!quest.Root.Disabled && !_questFunctions.IsQuestRemoved(quest.Id) && _questFunctions.IsReadyToAcceptQuest(quest.Id) && !_questFunctions.IsQuestComplete(quest.Id) && !_questFunctions.IsQuestAccepted(quest.Id)) + if (quest.Root.Disabled || _questFunctions.IsQuestRemoved(quest.Id) || _questFunctions.IsQuestComplete(quest.Id) || _questFunctions.IsQuestAccepted(quest.Id) || quest.Info.IsRepeatable) { - QuestSequence? questSequence = quest.FindSequence(0); - if (questSequence == null) - { - return false; - } - return questSequence.Steps.FirstOrDefault()?.IsTeleportableForPriorityQuests() == true; + return false; } - return false; + if (quest.Info.AlliedSociety != EAlliedSociety.None) + { + _logger.LogDebug("Excluding allied society quest {QuestId} from bulk add", quest.Id); + return false; + } + if (quest.Info is QuestInfo { MoogleDeliveryLevel: >0 }) + { + _logger.LogDebug("Excluding moogle delivery quest {QuestId} from bulk add", quest.Id); + return false; + } + if (!_questFunctions.IsReadyToAcceptQuest(quest.Id)) + { + _logger.LogTrace("Quest {QuestId} not ready to accept", quest.Id); + return false; + } + return true; }) select q.Id).ToList(); _logger.LogInformation("Adding {Count} available quests to priority queue", list.Count); diff --git a/Questionable/Questionable.Windows.JournalComponents/QuestJournalUtils.cs b/Questionable/Questionable.Windows.JournalComponents/QuestJournalUtils.cs index d566956..9a82b87 100644 --- a/Questionable/Questionable.Windows.JournalComponents/QuestJournalUtils.cs +++ b/Questionable/Questionable.Windows.JournalComponents/QuestJournalUtils.cs @@ -266,19 +266,7 @@ internal sealed class QuestJournalUtils public void AddAllAvailableQuests() { - int num = _questRegistry.AllQuests.Count(delegate(Quest quest) - { - if (!quest.Root.Disabled && !_questFunctions.IsQuestRemoved(quest.Id) && _questFunctions.IsReadyToAcceptQuest(quest.Id) && !_questFunctions.IsQuestComplete(quest.Id) && !_questFunctions.IsQuestAccepted(quest.Id) && !_questController.ManualPriorityQuests.Any((Quest q) => q.Id.Equals(quest.Id))) - { - QuestSequence? questSequence = quest.FindSequence(0); - if (questSequence == null) - { - return false; - } - return questSequence.Steps.FirstOrDefault()?.IsTeleportableForPriorityQuests() == true; - } - return false; - }); + int num = _questRegistry.AllQuests.Count((Quest quest) => !quest.Root.Disabled && !_questFunctions.IsQuestRemoved(quest.Id) && _questFunctions.IsReadyToAcceptQuest(quest.Id) && !_questFunctions.IsQuestComplete(quest.Id) && !_questFunctions.IsQuestAccepted(quest.Id) && !quest.Info.IsRepeatable && quest.Info.AlliedSociety == EAlliedSociety.None && !(quest.Info is QuestInfo { MoogleDeliveryLevel: >0 }) && !_questController.ManualPriorityQuests.Any((Quest q) => q.Id.Equals(quest.Id))); using (ImRaii.Disabled(num == 0)) { if (ImGuiComponents.IconButton(FontAwesomeIcon.ListOl))