Unstable v0.1300.0.0 (February 19th 2021)

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

@@ -0,0 +1,30 @@
+using Barotrauma.Networking;
+
+namespace Barotrauma
+{
+    partial class AbandonedOutpostMission : Mission
+    {
+        public override void ClientReadInitial(IReadMessage msg)
+        {
+            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 AbandonedOutpostMission.ClientReadInitial: character list contains null (mission: " + Prefab.Identifier + ")");
+            }
+            if (characters.Count != characterCount)
+            {
+                throw new System.Exception("Error in AbandonedOutpostMission.ClientReadInitial: character count does not match the server count (" + characters + " != " + characters.Count + "mission: " + Prefab.Identifier + ")");
+            }
+        }
+    }
+}

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

@@ -1,7 +1,4 @@
 using Barotrauma.Networking;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Barotrauma
 {

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

@@ -17,7 +17,7 @@ namespace Barotrauma
                 }
 
                 //team specific
-                return descriptions[GameMain.Client.Character.TeamID == Character.TeamType.Team1 ? 1 : 2];
+                return descriptions[GameMain.Client.Character.TeamID == CharacterTeamType.Team1 ? 1 : 2];
             }
         }
 

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

@@ -12,6 +12,23 @@ namespace Barotrauma
     {
         public override void ClientReadInitial(IReadMessage msg)
         {
+            byte caveCount = msg.ReadByte();
+            for (int i = 0; i < caveCount; i++)
+            {
+                byte selectedCave = msg.ReadByte();
+                if (selectedCave < 255 && Level.Loaded != null)
+                {
+                    if (selectedCave < Level.Loaded.Caves.Count)
+                    {
+                        Level.Loaded.Caves[selectedCave].DisplayOnSonar = true;
+                    }
+                    else
+                    {
+                        DebugConsole.ThrowError($"Cave index out of bounds when reading nest mission data. Index: {selectedCave}, number of caves: {Level.Loaded.Caves.Count}");
+                    }
+                }
+            }
+
             for (int i = 0; i < ResourceClusters.Count; i++)
             {
                 var amount = msg.ReadByte();

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

@@ -1,19 +1,17 @@
-using Microsoft.Xna.Framework;
-using System;
-
-namespace Barotrauma
+namespace Barotrauma
 {
     abstract partial class MissionMode : GameMode
     {
         public override void ShowStartMessage()
         {
-            if (mission == null) return;
-
-            new GUIMessageBox(mission.Name, mission.Description, new string[0], type: GUIMessageBox.Type.InGame, icon: mission.Prefab.Icon)
+            foreach (Mission mission in missions)
             {
-                IconColor = mission.Prefab.IconColor,
-                UserData = "missionstartmessage"
-            };
+                new GUIMessageBox(mission.Name, mission.Description, new string[0], type: GUIMessageBox.Type.InGame, icon: mission.Prefab.Icon)
+                {
+                    IconColor = mission.Prefab.IconColor,
+                    UserData = "missionstartmessage"
+                };
+            }
         }
     }
 }

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

@@ -8,9 +8,23 @@ namespace Barotrauma
     {
         public override void ClientReadInitial(IReadMessage msg)
         {
+            byte selectedCaveIndex = msg.ReadByte();
             nestPosition = new Vector2(
                 msg.ReadSingle(),
                 msg.ReadSingle());
+            if (selectedCaveIndex < 255 && Level.Loaded != null)
+            {
+                if (selectedCaveIndex < Level.Loaded.Caves.Count)
+                {
+                    Level.Loaded.Caves[selectedCaveIndex].DisplayOnSonar = true;
+                    SpawnNestObjects(Level.Loaded, Level.Loaded.Caves[selectedCaveIndex]);
+                }
+                else
+                {
+                    DebugConsole.ThrowError($"Cave index out of bounds when reading nest mission data. Index: {selectedCaveIndex}, number of caves: {Level.Loaded.Caves.Count}");
+                }
+            }
+
             ushort itemCount = msg.ReadUInt16();
             for (int i = 0; i < itemCount; i++)
             {