v1.5.7.0 (Summer Update)
This commit is contained in:
+10
-5
@@ -13,8 +13,8 @@ namespace Barotrauma
|
||||
|
||||
public override bool AllowAutomaticItemUnequipping => true;
|
||||
public override bool AllowMultipleInstances => true;
|
||||
public override bool AllowInAnySub => true;
|
||||
public override bool AllowWhileHandcuffed => false;
|
||||
protected override bool AllowInAnySub => true;
|
||||
protected override bool AllowWhileHandcuffed => false;
|
||||
public override bool PrioritizeIfSubObjectivesActive => component != null && (component is Reactor || component is Turret);
|
||||
|
||||
private readonly ItemComponent component, controller;
|
||||
@@ -29,7 +29,12 @@ namespace Barotrauma
|
||||
/// </summary>
|
||||
public Func<PathNode, bool> EndNodeFilter;
|
||||
|
||||
public bool Override { get; set; } = true;
|
||||
public bool Override { get; init; } = true;
|
||||
|
||||
/// <summary>
|
||||
/// When true, the operate objective is never completed, unless it's abandoned.
|
||||
/// </summary>
|
||||
public bool Repeat { get; init; }
|
||||
|
||||
public override bool CanBeCompleted => base.CanBeCompleted && (!useController || controller != null);
|
||||
|
||||
@@ -50,7 +55,7 @@ namespace Barotrauma
|
||||
bool isOrder = objectiveManager.IsOrder(this);
|
||||
if (!IsAllowed)
|
||||
{
|
||||
HandleNonAllowed();
|
||||
HandleDisallowed();
|
||||
return Priority;
|
||||
}
|
||||
if (!isOrder && component.Item.ConditionPercentage <= 0)
|
||||
@@ -307,7 +312,7 @@ namespace Barotrauma
|
||||
}
|
||||
}
|
||||
|
||||
protected override bool CheckObjectiveSpecific() => isDoneOperating && !IsLoop;
|
||||
protected override bool CheckObjectiveSpecific() => isDoneOperating && !Repeat;
|
||||
|
||||
public override void Reset()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user