Unstable 0.17.0.0

This commit is contained in:
Markus Isberg
2022-02-26 02:43:01 +09:00
parent a83f375681
commit 3974067915
913 changed files with 32472 additions and 32364 deletions
@@ -10,8 +10,8 @@ namespace Barotrauma
{
public virtual float Devotion => AIObjectiveManager.baseDevotion;
public abstract string Identifier { get; set; }
public virtual string DebugTag => Identifier;
public abstract Identifier Identifier { get; set; }
public virtual string DebugTag => Identifier.Value;
public virtual bool ForceRun => false;
public virtual bool IgnoreUnsafeHulls => false;
public virtual bool AbandonWhenCannotCompleteSubjectives => true;
@@ -83,7 +83,7 @@ namespace Barotrauma
public readonly Character character;
public readonly AIObjectiveManager objectiveManager;
public string Option { get; private set; }
public readonly Identifier Option;
private bool _abandon;
public bool Abandon
@@ -157,11 +157,11 @@ namespace Barotrauma
return subObjective == null ? this : subObjective.GetActiveObjective();
}
public AIObjective(Character character, AIObjectiveManager objectiveManager, float priorityModifier, string option = null)
public AIObjective(Character character, AIObjectiveManager objectiveManager, float priorityModifier, Identifier option = default)
{
this.objectiveManager = objectiveManager;
this.character = character;
Option = option ?? string.Empty;
Option = option;
PriorityModifier = priorityModifier;
}