v0.14.6.0

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

@@ -22,6 +22,13 @@ namespace Barotrauma
 
         public override void ClientReadInitial(IReadMessage msg)
         {
+            ushort targetItemCount = msg.ReadUInt16();
+            for (int i = 0; i < targetItemCount; i++)
+            {
+                var item = Item.ReadSpawnData(msg);
+                items.Add(item);
+            }
+
             byte characterCount = msg.ReadByte();
 
             for (int i = 0; i < characterCount; i++)

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

@@ -1,9 +1,28 @@
 using Barotrauma.Networking;
+using System.Globalization;
 
 namespace Barotrauma
 {
     partial class CargoMission : Mission
     {
+        public override string GetMissionRewardText(Submarine sub)
+        {
+            string rewardText = TextManager.GetWithVariable("currencyformat", "[credits]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", GetReward(sub)));
+
+            if (rewardPerCrate.HasValue)
+            {
+                string rewardPerCrateText = TextManager.GetWithVariable("currencyformat", "[credits]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", rewardPerCrate.Value));
+                return TextManager.GetWithVariables("missionrewardcargopercrate",
+                    new string[] { "[rewardpercrate]", "[itemcount]", "[maxitemcount]", "[totalreward]" },
+                    new string[] { rewardPerCrateText, itemsToSpawn.Count.ToString(), maxItemCount.ToString(), $"‖color:gui.orange‖{rewardText}‖end‖" });
+            }
+            else
+            {
+                return TextManager.GetWithVariables("missionrewardcargo",
+                    new string[] { "[totalreward]", "[itemcount]", "[maxitemcount]" },
+                    new string[] { $"‖color:gui.orange‖{rewardText}‖end‖", itemsToSpawn.Count.ToString(), maxItemCount.ToString() });
+            }
+        }
         public override void ClientReadInitial(IReadMessage msg)
         {
             items.Clear();

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

@@ -0,0 +1,37 @@
+using Barotrauma.Networking;
+
+namespace Barotrauma
+{
+    partial class EscortMission : Mission
+    {
+        public override void ClientReadInitial(IReadMessage msg)
+        {
+            byte characterCount = msg.ReadByte();
+
+            for (int i = 0; i < characterCount; i++)
+            {
+                Character character = Character.ReadSpawnData(msg);
+                characters.Add(character);
+                if (msg.ReadBoolean())
+                {
+                    terroristCharacters.Add(character);
+                }
+                ushort itemCount = msg.ReadUInt16();
+                for (int j = 0; j < itemCount; j++)
+                {
+                    Item.ReadSpawnData(msg);
+                }
+            }
+            if (characters.Contains(null))
+            {
+                throw new System.Exception("Error in EscortMission.ClientReadInitial: character list contains null (mission: " + Prefab.Identifier + ")");
+            }
+
+            if (characters.Count != characterCount)
+            {
+                throw new System.Exception("Error in EscortMission.ClientReadInitial: character count does not match the server count (" + characterCount + " != " + characters.Count + "mission: " + Prefab.Identifier + ")");
+            }
+            InitCharacters();
+        }
+    }
+}

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

@@ -21,9 +21,9 @@ namespace Barotrauma
             return ToolBox.GradientLerp(t, GUI.Style.Green, GUI.Style.Orange, GUI.Style.Red);
         }
 
-        public string GetMissionRewardText()
+        public virtual string GetMissionRewardText(Submarine sub)
         {
-            string rewardText = TextManager.GetWithVariable("currencyformat", "[credits]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", Reward));
+            string rewardText = TextManager.GetWithVariable("currencyformat", "[credits]", string.Format(CultureInfo.InvariantCulture, "{0:N0}", GetReward(sub)));
             return TextManager.GetWithVariable("missionreward", "[reward]", $"‖color:gui.orange‖{rewardText}‖end‖");
         }
 

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

@@ -1,18 +0,0 @@
-using Barotrauma.Networking;
-
-namespace Barotrauma
-{
-    partial class OutpostDestroyMission : AbandonedOutpostMission
-    {
-        public override void ClientReadInitial(IReadMessage msg)
-        {
-            base.ClientReadInitial(msg);
-            ushort itemCount = msg.ReadUInt16();
-            for (int i = 0; i < itemCount; i++)
-            {
-                var item = Item.ReadSpawnData(msg);
-                items.Add(item);
-            }
-        }
-    }
-}

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

@@ -0,0 +1,32 @@
+using Barotrauma.Networking;
+
+namespace Barotrauma
+{
+    partial class PirateMission : Mission
+    {
+        public override void ClientReadInitial(IReadMessage msg)
+        {
+            // duplicate code from escortmission, should possibly be combined, though additional loot items might be added so maybe not
+            byte characterCount = msg.ReadByte();
+
+            for (int i = 0; i < characterCount; i++)
+            {
+                characters.Add(Character.ReadSpawnData(msg));
+                ushort itemCount = msg.ReadUInt16();
+                for (int j = 0; j < itemCount; j++)
+                {
+                    Item.ReadSpawnData(msg);
+                }
+            }
+            if (characters.Contains(null))
+            {
+                throw new System.Exception("Error in PirateMission.ClientReadInitial: character list contains null (mission: " + Prefab.Identifier + ")");
+            }
+
+            if (characters.Count != characterCount)
+            {
+                throw new System.Exception("Error in PirateMission.ClientReadInitial: character count does not match the server count (" + characterCount + " != " + characters.Count + "mission: " + Prefab.Identifier + ")");
+            }
+        }
+    }
+}