muffin v6.12

This commit is contained in:
alydev 2025-10-09 07:53:51 +10:00
parent e786325cda
commit 0950798597
64 changed files with 40100 additions and 58121 deletions

View file

@ -96,6 +96,8 @@ internal static class Combat
break;
case EEnemySpawnType.OverworldEnemies:
case EEnemySpawnType.FateEnemies:
yield return CreateTask(quest, sequence, step);
break;
case EEnemySpawnType.FinishCombatIfAny:
yield return CreateTask(quest, sequence, step);
break;

View file

@ -33,7 +33,12 @@ internal static class SinglePlayerDuty
{
public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, QuestStep step)
{
if (step.InteractionType != EInteractionType.SinglePlayerDuty || !bossModIpc.IsConfiguredToRunSoloInstance(quest.Id, step.SinglePlayerDutyOptions))
if (step.InteractionType != EInteractionType.SinglePlayerDuty)
{
yield break;
}
yield return new Mount.UnmountTask();
if (!bossModIpc.IsConfiguredToRunSoloInstance(quest.Id, step.SinglePlayerDutyOptions))
{
yield break;
}
@ -41,7 +46,6 @@ internal static class SinglePlayerDuty
{
throw new TaskException("Failed to get content finder condition for solo instance");
}
yield return new Mount.UnmountTask();
yield return new StartSinglePlayerDuty(cfcData.ContentFinderConditionId);
yield return new WaitAtStart.WaitDelay(TimeSpan.FromSeconds(2L));
yield return new EnableAi(cfcData.TerritoryId == 688);