Unstable 0.16.3.0

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/AbandonedOutpostMission.cs

@@ -1,3 +1,4 @@
+using Barotrauma.Extensions;
 using Barotrauma.Networking;
 
 namespace Barotrauma
@@ -20,6 +21,9 @@ namespace Barotrauma
             }
         }
 
+        public override bool IsAtCompletionState => State > 0 && requireRescue.None();
+        public override bool IsAtFailureState => State == HostagesKilledState;
+
         public override void ClientReadInitial(IReadMessage msg)
         {
             base.ClientReadInitial(msg);

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/AlienRuinMission.cs

@@ -4,6 +4,9 @@ namespace Barotrauma
 {
     partial class AlienRuinMission : Mission
     {
+        public override bool IsAtCompletionState => State > 0;
+        public override bool IsAtFailureState => false;
+
         public override void ClientReadInitial(IReadMessage msg)
         {
             base.ClientReadInitial(msg);

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/BeaconMission.cs

@@ -0,0 +1,8 @@
+namespace Barotrauma
+{
+    partial class BeaconMission : Mission
+    {
+        public override bool IsAtCompletionState => false;
+        public override bool IsAtFailureState => false;
+    }
+}

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/CargoMission.cs

@@ -5,6 +5,9 @@ namespace Barotrauma
 {
     partial class CargoMission : Mission
     {
+        public override bool IsAtCompletionState => false;
+        public override bool IsAtFailureState => false;
+
         public override string GetMissionRewardText(Submarine sub)
         {
             string rewardText = TextManager.GetWithVariable("currencyformat", "[credits]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", GetReward(sub)));

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/CombatMission.cs

@@ -20,5 +20,8 @@ namespace Barotrauma
                 return descriptions[GameMain.Client.Character.TeamID == CharacterTeamType.Team1 ? 1 : 2];
             }
         }
+
+        public override bool IsAtCompletionState => false;
+        public override bool IsAtFailureState => false;
     }
 }

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/EscortMission.cs

@@ -4,6 +4,9 @@ namespace Barotrauma
 {
     partial class EscortMission : Mission
     {
+        public override bool IsAtCompletionState => false;
+        public override bool IsAtFailureState => State == 1;
+
         public override void ClientReadInitial(IReadMessage msg)
         {
             base.ClientReadInitial(msg);

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/GoToMission.cs

@@ -0,0 +1,8 @@
+namespace Barotrauma
+{
+    partial class GoToMission : Mission
+    {
+        public override bool IsAtCompletionState => false;
+        public override bool IsAtFailureState => false;
+    }
+}

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/MineralMission.cs

@@ -1,15 +1,14 @@
-using Barotrauma.Extensions;
-using Barotrauma.Items.Components;
+using Barotrauma.Items.Components;
 using Barotrauma.Networking;
-using Microsoft.Xna.Framework;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Barotrauma
 {
     partial class MineralMission : Mission
     {
+        public override bool IsAtCompletionState => false;
+        public override bool IsAtFailureState => false;
+
         public override void ClientReadInitial(IReadMessage msg)
         {
             base.ClientReadInitial(msg);

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/Mission.cs

@@ -19,6 +19,15 @@ 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.
+        /// </summary>
+        public abstract bool IsAtCompletionState { get; }
+        /// <summary>
+        /// State at which the mission cannot be completed anymore. Use for UI references.
+        /// </summary>
+        public abstract bool IsAtFailureState { get; }
+
         public Color GetDifficultyColor()
         {
             int v = Difficulty ?? MissionPrefab.MinDifficulty;

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/MonsterMission.cs

@@ -4,6 +4,9 @@ namespace Barotrauma
 {
     partial class MonsterMission : Mission
     {
+        public override bool IsAtCompletionState => State > 0;
+        public override bool IsAtFailureState => false;
+
         public override void ClientReadInitial(IReadMessage msg)
         {
             base.ClientReadInitial(msg);

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/NestMission.cs

@@ -6,6 +6,9 @@ namespace Barotrauma
 {
     partial class NestMission : Mission
     {
+        public override bool IsAtCompletionState => State > 0 && !requireDelivery;
+        public override bool IsAtFailureState => false;
+
         public override void ClientReadInitial(IReadMessage msg)
         {
             base.ClientReadInitial(msg);

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/PirateMission.cs

@@ -4,6 +4,9 @@ namespace Barotrauma
 {
     partial class PirateMission : Mission
     {
+        public override bool IsAtCompletionState => State > 1;
+        public override bool IsAtFailureState => false;
+
         public override void ClientReadInitial(IReadMessage msg)
         {
             base.ClientReadInitial(msg);

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/SalvageMission.cs

@@ -5,6 +5,9 @@ namespace Barotrauma
 {
     partial class SalvageMission : Mission
     {
+        public override bool IsAtCompletionState => false;
+        public override bool IsAtFailureState => false;
+
         public override void ClientReadInitial(IReadMessage msg)
         {
             base.ClientReadInitial(msg);

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/ScanMission.cs

@@ -1,5 +1,4 @@
 using Barotrauma.Networking;
-using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -23,6 +22,9 @@ namespace Barotrauma
             }
         }
 
+        public override bool IsAtCompletionState => false;
+        public override bool IsAtFailureState => false;
+
         public override void ClientReadInitial(IReadMessage msg)
         {
             base.ClientReadInitial(msg);