(d82a5d3f3) Use the wait delay for all objectives that are not orders (instead of just idle).

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:28:41 +03:00
parent 874bc07cfd
commit eadd063950
11 changed files with 297 additions and 580 deletions
@@ -115,17 +115,20 @@ namespace Barotrauma
public virtual void Update(float deltaTime)
{
var subObjective = objectiveManager.CurrentObjective?.CurrentSubObjective;
if (objectiveManager.CurrentOrder == this)
{
Priority = AIObjectiveManager.OrderPriority;
}
else if (objectiveManager.CurrentObjective == this || subObjective == this)
else if (objectiveManager.WaitTimer <= 0)
{
Priority += Devotion * PriorityModifier * deltaTime;
var subObjective = objectiveManager.CurrentObjective?.CurrentSubObjective;
if ((objectiveManager.CurrentObjective == this || subObjective == this))
{
Priority += Devotion * PriorityModifier * deltaTime;
}
Priority = MathHelper.Clamp(Priority, 0, 100);
subObjectives.ForEach(so => so.Update(deltaTime));
}
Priority = MathHelper.Clamp(Priority, 0, 100);
subObjectives.ForEach(so => so.Update(deltaTime));
}
/// <summary>