erdelf/qstbak
1
0
Fork 0
forked from aly/qstbak
Code Pull requests Activity

muffin v6.31

Browse source
This commit is contained in:
alydev 2025-10-22 13:20:12 +10:00
parent 9003b9c19d
commit 2726c4873d
2 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Questionable/Questionable.Controller/QuestController.cs
View file

@ -1140,16 +1140,26 @@ internal sealed class QuestController : MiniTaskController<QuestController>
{ {
List<ElementId> list = (from q in _questRegistry.AllQuests.Where(delegate(Quest quest) List<ElementId> 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 false;
} }
return questSequence.Steps.FirstOrDefault()?.IsTeleportableForPriorityQuests() == true; if (quest.Info.AlliedSociety != EAlliedSociety.None)
} {
_logger.LogDebug("Excluding allied society quest {QuestId} from bulk add", quest.Id);
return false; 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(); select q.Id).ToList();
_logger.LogInformation("Adding {Count} available quests to priority queue", list.Count); _logger.LogInformation("Adding {Count} available quests to priority queue", list.Count);

14
Questionable/Questionable.Windows.JournalComponents/QuestJournalUtils.cs
View file

@ -266,19 +266,7 @@ internal sealed class QuestJournalUtils
public void AddAllAvailableQuests() public void AddAllAvailableQuests()
{ {
int num = _questRegistry.AllQuests.Count(delegate(Quest quest) 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)));
{
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;
});
using (ImRaii.Disabled(num == 0)) using (ImRaii.Disabled(num == 0))
{ {
if (ImGuiComponents.IconButton(FontAwesomeIcon.ListOl)) if (ImGuiComponents.IconButton(FontAwesomeIcon.ListOl))