Only auto-accept leves
This commit is contained in:
parent
3a27fc1211
commit
c9d9cfb787
@ -784,7 +784,7 @@ internal sealed class GameUiController : IDisposable
|
||||
AddonJournalResult* addon = (AddonJournalResult*)args.Addon;
|
||||
|
||||
string questName = addon->AtkTextNode250->NodeText.ToString();
|
||||
if (_questController.CurrentQuest != null &&
|
||||
if (_questController.CurrentQuest is { Quest.Id: LeveId } &&
|
||||
GameFunctions.GameStringEquals(_questController.CurrentQuest.Quest.Info.Name, questName))
|
||||
addon->FireCallbackInt(0);
|
||||
else
|
||||
|
@ -1,4 +1,5 @@
|
||||
using System.Collections.Generic;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using FFXIVClientStructs.FFXIV.Common.Math;
|
||||
using LLib.GameData;
|
||||
@ -24,7 +25,9 @@ internal sealed class LeveData
|
||||
|
||||
public void AddQuestSteps(LeveInfo leveInfo, QuestRoot questRoot)
|
||||
{
|
||||
LeveStepData leveStepData = Leves.Single(x => x.IssuerDataId == leveInfo.IssuerDataId);
|
||||
LeveStepData leveStepData = Leves.SingleOrDefault(x => x.IssuerDataId == leveInfo.IssuerDataId)
|
||||
?? throw new InvalidOperationException(
|
||||
$"No leve location for issuer data id {leveInfo.IssuerDataId} found");
|
||||
|
||||
QuestSequence? startSequence = questRoot.QuestSequence.FirstOrDefault(x => x.Sequence == 0);
|
||||
if (startSequence == null)
|
||||
|
@ -12,7 +12,8 @@ internal sealed class UniqueStartStopValidator : IQuestValidator
|
||||
if (quest.Id is SatisfactionSupplyNpcId)
|
||||
yield break;
|
||||
|
||||
var questAccepts = FindQuestStepsWithInteractionType(quest, EInteractionType.AcceptQuest)
|
||||
var questAccepts =
|
||||
FindQuestStepsWithInteractionType(quest, [EInteractionType.AcceptQuest, EInteractionType.AcceptLeve])
|
||||
.Where(x => x.Step.PickUpQuestId == null)
|
||||
.ToList();
|
||||
foreach (var accept in questAccepts)
|
||||
@ -44,7 +45,8 @@ internal sealed class UniqueStartStopValidator : IQuestValidator
|
||||
};
|
||||
}
|
||||
|
||||
var questCompletes = FindQuestStepsWithInteractionType(quest, EInteractionType.CompleteQuest)
|
||||
var questCompletes =
|
||||
FindQuestStepsWithInteractionType(quest, [EInteractionType.CompleteQuest, EInteractionType.CompleteLeve])
|
||||
.Where(x => x.Step.TurnInQuestId == null)
|
||||
.ToList();
|
||||
foreach (var complete in questCompletes)
|
||||
@ -78,6 +80,6 @@ internal sealed class UniqueStartStopValidator : IQuestValidator
|
||||
}
|
||||
|
||||
private static IEnumerable<(QuestSequence Sequence, int StepId, QuestStep Step)> FindQuestStepsWithInteractionType(
|
||||
Quest quest, EInteractionType interactionType)
|
||||
=> quest.AllSteps().Where(x => x.Step.InteractionType == interactionType);
|
||||
Quest quest, List<EInteractionType> interactionType)
|
||||
=> quest.AllSteps().Where(x => interactionType.Contains(x.Step.InteractionType));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user