muffin v7.4.12
This commit is contained in:
parent
e3e5a401c3
commit
0f9f445830
38 changed files with 13646 additions and 10442 deletions
|
|
@ -53,19 +53,20 @@ internal static class WaitAtEnd
|
|||
case EInteractionType.WaitForManualProgress:
|
||||
case EInteractionType.Snipe:
|
||||
case EInteractionType.Instruction:
|
||||
case EInteractionType.FateAction:
|
||||
return new global::_003C_003Ez__ReadOnlySingleElementList<ITask>(new WaitNextStepOrSequence());
|
||||
case EInteractionType.Duty:
|
||||
if (autoDutyIpc.IsConfiguredToRunContent(step.DutyOptions))
|
||||
{
|
||||
break;
|
||||
}
|
||||
goto IL_019d;
|
||||
goto IL_01a1;
|
||||
case EInteractionType.SinglePlayerDuty:
|
||||
if (bossModIpc.IsConfiguredToRunSoloInstance(quest.Id, step.SinglePlayerDutyOptions))
|
||||
{
|
||||
break;
|
||||
}
|
||||
goto IL_019d;
|
||||
goto IL_01a1;
|
||||
case EInteractionType.WalkTo:
|
||||
case EInteractionType.Jump:
|
||||
return new global::_003C_003Ez__ReadOnlySingleElementList<ITask>(Next(quest, sequence));
|
||||
|
|
@ -83,13 +84,13 @@ internal static class WaitAtEnd
|
|||
{
|
||||
break;
|
||||
}
|
||||
goto IL_0284;
|
||||
goto IL_0288;
|
||||
case EInteractionType.UseItem:
|
||||
if (!step.TargetTerritoryId.HasValue)
|
||||
{
|
||||
break;
|
||||
}
|
||||
goto IL_0284;
|
||||
goto IL_0288;
|
||||
case EInteractionType.AcceptQuest:
|
||||
{
|
||||
WaitQuestAccepted waitQuestAccepted = new WaitQuestAccepted(step.PickUpQuestId ?? quest.Id);
|
||||
|
|
@ -120,9 +121,9 @@ internal static class WaitAtEnd
|
|||
}
|
||||
return new global::_003C_003Ez__ReadOnlyArray<ITask>(new ITask[2] { waitQuestCompleted, waitDelay2 });
|
||||
}
|
||||
IL_019d:
|
||||
IL_01a1:
|
||||
return new global::_003C_003Ez__ReadOnlySingleElementList<ITask>(new EndAutomation());
|
||||
IL_0284:
|
||||
IL_0288:
|
||||
if (step.TerritoryId != step.TargetTerritoryId)
|
||||
{
|
||||
task = new WaitCondition.Task(() => clientState.TerritoryType == step.TargetTerritoryId, "Wait(tp to territory: " + territoryData.GetNameAndId(step.TargetTerritoryId.Value) + ")");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue