muffin v7.38.8
This commit is contained in:
parent
5e2d8f648b
commit
3e10cbbbf2
51 changed files with 2585 additions and 1972 deletions
|
|
@ -1,6 +1,7 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Dalamud.Game.ClientState.Objects.Types;
|
||||
using Dalamud.Game.Text;
|
||||
using Dalamud.Game.Text.SeStringHandling;
|
||||
using Dalamud.Plugin.Services;
|
||||
|
|
@ -42,7 +43,7 @@ internal static class Gather
|
|||
}
|
||||
}
|
||||
|
||||
internal sealed class DelayedGatheringExecutor(GatheringPointRegistry gatheringPointRegistry, TerritoryData territoryData, IClientState clientState, IServiceProvider serviceProvider, ILogger<DelayedGatheringExecutor> logger) : TaskExecutor<DelayedGatheringTask>(), IExtraTaskCreator, ITaskExecutor
|
||||
internal sealed class DelayedGatheringExecutor(GatheringPointRegistry gatheringPointRegistry, TerritoryData territoryData, IClientState clientState, IObjectTable objectTable, IServiceProvider serviceProvider, ILogger<DelayedGatheringExecutor> logger) : TaskExecutor<DelayedGatheringTask>(), IExtraTaskCreator, ITaskExecutor
|
||||
{
|
||||
protected override bool Start()
|
||||
{
|
||||
|
|
@ -56,8 +57,8 @@ internal static class Gather
|
|||
|
||||
public IEnumerable<ITask> CreateExtraTasks()
|
||||
{
|
||||
EClassJob rowId = (EClassJob)clientState.LocalPlayer.ClassJob.RowId;
|
||||
if (!gatheringPointRegistry.TryGetGatheringPointId(base.Task.GatheredItem.ItemId, rowId, out GatheringPointId gatheringPointId))
|
||||
EClassJob valueOrDefault = ((EClassJob?)(objectTable[0] as ICharacter)?.ClassJob.RowId).GetValueOrDefault();
|
||||
if (!gatheringPointRegistry.TryGetGatheringPointId(base.Task.GatheredItem.ItemId, valueOrDefault, out GatheringPointId gatheringPointId))
|
||||
{
|
||||
throw new TaskException($"No gathering point found for item {base.Task.GatheredItem.ItemId}");
|
||||
}
|
||||
|
|
@ -69,7 +70,7 @@ internal static class Gather
|
|||
{
|
||||
yield break;
|
||||
}
|
||||
switch (rowId)
|
||||
switch (valueOrDefault)
|
||||
{
|
||||
case EClassJob.Miner:
|
||||
yield return new Questionable.Controller.Steps.Interactions.Action.TriggerStatusIfMissing(EStatus.Prospect, EAction.Prospect);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue