Unstable 0.16.5.0

This commit is contained in:
Markus Isberg
2022-02-17 00:03:08 +09:00
parent 2190fe08ef
commit a0696ecb74
51 changed files with 197 additions and 96 deletions
@@ -21,8 +21,8 @@ namespace Barotrauma
}
}
public override bool IsAtCompletionState => State > 0 && requireRescue.None();
public override bool IsAtFailureState => State == HostagesKilledState;
public override bool DisplayAsCompleted => State > 0 && requireRescue.None();
public override bool DisplayAsFailed => State == HostagesKilledState;
public override void ClientReadInitial(IReadMessage msg)
{
@@ -4,8 +4,8 @@ namespace Barotrauma
{
partial class AlienRuinMission : Mission
{
public override bool IsAtCompletionState => State > 0;
public override bool IsAtFailureState => false;
public override bool DisplayAsCompleted => State > 0;
public override bool DisplayAsFailed => false;
public override void ClientReadInitial(IReadMessage msg)
{
@@ -2,7 +2,7 @@
{
partial class BeaconMission : Mission
{
public override bool IsAtCompletionState => false;
public override bool IsAtFailureState => false;
public override bool DisplayAsCompleted => State > 0;
public override bool DisplayAsFailed => false;
}
}
@@ -5,8 +5,8 @@ namespace Barotrauma
{
partial class CargoMission : Mission
{
public override bool IsAtCompletionState => false;
public override bool IsAtFailureState => false;
public override bool DisplayAsCompleted => false;
public override bool DisplayAsFailed => false;
public override string GetMissionRewardText(Submarine sub)
{
@@ -21,7 +21,7 @@ namespace Barotrauma
}
}
public override bool IsAtCompletionState => false;
public override bool IsAtFailureState => false;
public override bool DisplayAsCompleted => false;
public override bool DisplayAsFailed => false;
}
}
@@ -4,8 +4,8 @@ namespace Barotrauma
{
partial class EscortMission : Mission
{
public override bool IsAtCompletionState => false;
public override bool IsAtFailureState => State == 1;
public override bool DisplayAsCompleted => false;
public override bool DisplayAsFailed => State == 1;
public override void ClientReadInitial(IReadMessage msg)
{
@@ -2,7 +2,7 @@
{
partial class GoToMission : Mission
{
public override bool IsAtCompletionState => false;
public override bool IsAtFailureState => false;
public override bool DisplayAsCompleted => false;
public override bool DisplayAsFailed => false;
}
}
@@ -6,8 +6,8 @@ namespace Barotrauma
{
partial class MineralMission : Mission
{
public override bool IsAtCompletionState => false;
public override bool IsAtFailureState => false;
public override bool DisplayAsCompleted => false;
public override bool DisplayAsFailed => false;
public override void ClientReadInitial(IReadMessage msg)
{
@@ -20,13 +20,13 @@ namespace Barotrauma
public virtual IEnumerable<Entity> HudIconTargets => Enumerable.Empty<Entity>();
/// <summary>
/// State at which the only thing left to do is to reach the end of the level. Use for UI references.
/// Is the mission at a state at which the only thing left to do is to reach the end of the level?
/// </summary>
public abstract bool IsAtCompletionState { get; }
public abstract bool DisplayAsCompleted { get; }
/// <summary>
/// State at which the mission cannot be completed anymore. Use for UI references.
/// Is the mission at a state at which the mission cannot be completed anymore?
/// </summary>
public abstract bool IsAtFailureState { get; }
public abstract bool DisplayAsFailed { get; }
public Color GetDifficultyColor()
{
@@ -4,8 +4,8 @@ namespace Barotrauma
{
partial class MonsterMission : Mission
{
public override bool IsAtCompletionState => State > 0;
public override bool IsAtFailureState => false;
public override bool DisplayAsCompleted => State > 0;
public override bool DisplayAsFailed => false;
public override void ClientReadInitial(IReadMessage msg)
{
@@ -6,8 +6,8 @@ namespace Barotrauma
{
partial class NestMission : Mission
{
public override bool IsAtCompletionState => State > 0 && !requireDelivery;
public override bool IsAtFailureState => false;
public override bool DisplayAsCompleted => State > 0 && !requireDelivery;
public override bool DisplayAsFailed => false;
public override void ClientReadInitial(IReadMessage msg)
{
@@ -4,8 +4,8 @@ namespace Barotrauma
{
partial class PirateMission : Mission
{
public override bool IsAtCompletionState => State > 1;
public override bool IsAtFailureState => false;
public override bool DisplayAsCompleted => State > 1;
public override bool DisplayAsFailed => false;
public override void ClientReadInitial(IReadMessage msg)
{
@@ -5,8 +5,8 @@ namespace Barotrauma
{
partial class SalvageMission : Mission
{
public override bool IsAtCompletionState => false;
public override bool IsAtFailureState => false;
public override bool DisplayAsCompleted => false;
public override bool DisplayAsFailed => false;
public override void ClientReadInitial(IReadMessage msg)
{
@@ -22,8 +22,8 @@ namespace Barotrauma
}
}
public override bool IsAtCompletionState => false;
public override bool IsAtFailureState => false;
public override bool DisplayAsCompleted => false;
public override bool DisplayAsFailed => false;
public override void ClientReadInitial(IReadMessage msg)
{