Fix Crystal Tower quests ignoring 'NextQuestId'
This commit is contained in:
parent
dcdc288b08
commit
22aa81cf75
@ -1,4 +1,6 @@
|
|||||||
using Microsoft.Extensions.Logging;
|
using System.Linq;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using Questionable.Data;
|
||||||
using Questionable.Functions;
|
using Questionable.Functions;
|
||||||
using Questionable.Model;
|
using Questionable.Model;
|
||||||
using Questionable.Model.Questing;
|
using Questionable.Model.Questing;
|
||||||
@ -21,7 +23,7 @@ internal static class NextQuest
|
|||||||
return null;
|
return null;
|
||||||
|
|
||||||
// probably irrelevant, since pick up is handled elsewhere (and, in particular, checks for aetherytes and stuff)
|
// probably irrelevant, since pick up is handled elsewhere (and, in particular, checks for aetherytes and stuff)
|
||||||
if (questFunctions.GetPriorityQuests().Contains(step.NextQuestId))
|
if (questFunctions.GetPriorityQuests(onlyClassAndRoleQuests: true).Contains(step.NextQuestId))
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
return new SetQuestTask(step.NextQuestId, quest.Id);
|
return new SetQuestTask(step.NextQuestId, quest.Id);
|
||||||
|
@ -401,14 +401,15 @@ internal sealed unsafe class QuestFunctions
|
|||||||
return 1000 * quest.AllSteps().Count(x => x.Step.AetheryteShortcut != null);
|
return 1000 * quest.AllSteps().Count(x => x.Step.AetheryteShortcut != null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ElementId> GetPriorityQuests()
|
public List<ElementId> GetPriorityQuests(bool onlyClassAndRoleQuests = false)
|
||||||
{
|
{
|
||||||
List<ElementId> priorityQuests =
|
List<ElementId> priorityQuests = [];
|
||||||
[
|
if (!onlyClassAndRoleQuests)
|
||||||
new QuestId(1157), // Garuda (Hard)
|
{
|
||||||
new QuestId(1158), // Titan (Hard)
|
priorityQuests.Add(new QuestId(1157)); // Garuda (Hard)
|
||||||
..QuestData.CrystalTowerQuests
|
priorityQuests.Add(new QuestId(1158)); // Titan (Hard)
|
||||||
];
|
priorityQuests.AddRange(QuestData.CrystalTowerQuests);
|
||||||
|
}
|
||||||
|
|
||||||
EClassJob classJob = (EClassJob?)_clientState.LocalPlayer?.ClassJob.RowId ?? EClassJob.Adventurer;
|
EClassJob classJob = (EClassJob?)_clientState.LocalPlayer?.ClassJob.RowId ?? EClassJob.Adventurer;
|
||||||
uint[] shadowbringersRoleQuestChapters = QuestData.AllRoleQuestChapters.Select(x => x[0]).ToArray();
|
uint[] shadowbringersRoleQuestChapters = QuestData.AllRoleQuestChapters.Select(x => x[0]).ToArray();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user