muffin v7.4.10
This commit is contained in:
parent
2df81c5d15
commit
b8dd142c23
47 changed files with 3604 additions and 1058 deletions
|
|
@ -11,7 +11,6 @@ using FFXIVClientStructs.FFXIV.Client.Game.UI;
|
|||
using Microsoft.Extensions.Logging;
|
||||
using Questionable.Controller.Steps.Shared;
|
||||
using Questionable.Controller.Utils;
|
||||
using Questionable.External;
|
||||
using Questionable.Functions;
|
||||
using Questionable.Model;
|
||||
using Questionable.Model.Questing;
|
||||
|
|
@ -20,7 +19,7 @@ namespace Questionable.Controller.Steps.Interactions;
|
|||
|
||||
internal static class Interact
|
||||
{
|
||||
internal sealed class Factory(AutomatonIpc automatonIpc, Configuration configuration) : ITaskFactory
|
||||
internal sealed class Factory(Configuration configuration) : ITaskFactory
|
||||
{
|
||||
public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, QuestStep step)
|
||||
{
|
||||
|
|
@ -41,7 +40,7 @@ internal static class Interact
|
|||
}
|
||||
else if (step.InteractionType == EInteractionType.Snipe)
|
||||
{
|
||||
if (!automatonIpc.IsAutoSnipeEnabled)
|
||||
if (!configuration.General.AutoSnipe)
|
||||
{
|
||||
yield break;
|
||||
}
|
||||
|
|
@ -73,21 +72,21 @@ internal static class Interact
|
|||
SkipStepConditions stepIf = skipConditions.StepIf;
|
||||
if (stepIf != null && stepIf.Never)
|
||||
{
|
||||
goto IL_0247;
|
||||
goto IL_024f;
|
||||
}
|
||||
}
|
||||
if (step.InteractionType != EInteractionType.PurchaseItem)
|
||||
{
|
||||
skipMarkerCheck = ((step.DataId == 1052475) ? 1 : 0);
|
||||
goto IL_0248;
|
||||
goto IL_0250;
|
||||
}
|
||||
}
|
||||
goto IL_0247;
|
||||
IL_0247:
|
||||
goto IL_024f;
|
||||
IL_024f:
|
||||
skipMarkerCheck = 1;
|
||||
goto IL_0248;
|
||||
IL_0248:
|
||||
yield return new Task(value, quest, interactionType2, (byte)skipMarkerCheck != 0, step.PickUpItemId, step.TaxiStandId, step.SkipConditions?.StepIf, step.CompletionQuestVariablesFlags);
|
||||
goto IL_0250;
|
||||
IL_0250:
|
||||
yield return new Task(value, quest, interactionType2, (byte)skipMarkerCheck != 0, step.PickUpItemId ?? step.GCPurchase?.ItemId, step.TaxiStandId, step.SkipConditions?.StepIf, step.CompletionQuestVariablesFlags);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue