forked from aly/qstbak
muffin v7.4.18
This commit is contained in:
parent
53aa9fdee8
commit
f82b9ce2a2
50 changed files with 142364 additions and 230361 deletions
|
|
@ -120,6 +120,8 @@ internal static class FateFarming
|
|||
|
||||
private ushort _trackedFateId;
|
||||
|
||||
private bool _fateWasActive;
|
||||
|
||||
protected override bool Start()
|
||||
{
|
||||
_trackedFateId = gameFunctions.GetCurrentFateId();
|
||||
|
|
@ -138,6 +140,13 @@ internal static class FateFarming
|
|||
logger.LogInformation("Required status {StatusId} lost during FATE action loop, ending cycle to re-apply", base.Task.RequiredStatusId.Value);
|
||||
return ETaskResult.TaskComplete;
|
||||
}
|
||||
bool flag = gameFunctions.GetCurrentFateId() != 0;
|
||||
if (_fateWasActive && !flag)
|
||||
{
|
||||
logger.LogInformation("FATE {FateId} is no longer active, cycle complete", _trackedFateId);
|
||||
return ETaskResult.TaskComplete;
|
||||
}
|
||||
_fateWasActive = flag;
|
||||
if (_trackedFateId == 0)
|
||||
{
|
||||
_trackedFateId = gameFunctions.GetCurrentFateId();
|
||||
|
|
@ -156,8 +165,8 @@ internal static class FateFarming
|
|||
IGameObject gameObject = gameFunctions.FindObjectByDataId(target.DataId, null, warnIfMissing: false);
|
||||
if (gameObject != null && gameObject.IsTargetable)
|
||||
{
|
||||
bool flag = gameFunctions.UseAction(gameObject, target.Action);
|
||||
_nextActionAt = (flag ? DateTime.Now.AddSeconds(2.5) : DateTime.Now.AddSeconds(0.5));
|
||||
bool flag2 = gameFunctions.UseAction(gameObject, target.Action);
|
||||
_nextActionAt = (flag2 ? DateTime.Now.AddSeconds(2.5) : DateTime.Now.AddSeconds(0.5));
|
||||
return ETaskResult.StillRunning;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue