muffin v7.4.18

This commit is contained in:
alydev 2026-03-26 14:56:12 +10:00
parent 53aa9fdee8
commit f82b9ce2a2
50 changed files with 142364 additions and 230361 deletions

View file

@ -22,6 +22,10 @@ internal static class Action
{
return Array.Empty<ITask>();
}
if (step.DataIds.Count > 0)
{
return Array.Empty<ITask>();
}
ArgumentNullException.ThrowIfNull(step.Action, "step.Action");
ITask task = OnObject(step.DataId, quest, step.Action.Value, step.CompletionQuestVariablesFlags);
if (step.Action.Value.RequiresMount())
@ -86,6 +90,9 @@ internal static class Action
_continueAt = DateTime.Now.AddSeconds(0.5);
return true;
}
logger.LogInformation("Object {DataId} is untargetable, using action {Action} without target", base.Task.DataId, base.Task.Action);
_usedAction = gameFunctions.UseAction(base.Task.Action);
_continueAt = DateTime.Now.AddSeconds(0.5);
return true;
}
_usedAction = gameFunctions.UseAction(base.Task.Action);
@ -104,11 +111,18 @@ internal static class Action
if (base.Task.DataId.HasValue)
{
IGameObject gameObject = gameFunctions.FindObjectByDataId(base.Task.DataId.Value);
if (gameObject == null || !gameObject.IsTargetable)
if (gameObject == null)
{
return ETaskResult.StillRunning;
}
_usedAction = gameFunctions.UseAction(gameObject, base.Task.Action);
if (gameObject.IsTargetable)
{
_usedAction = gameFunctions.UseAction(gameObject, base.Task.Action);
}
else
{
_usedAction = gameFunctions.UseAction(base.Task.Action);
}
_continueAt = DateTime.Now.AddSeconds(0.5);
}
else