(99feac023) Unstable 0.9.704.0

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

@@ -0,0 +1,25 @@
+using Barotrauma.Networking;
+
+namespace Barotrauma
+{
+    partial class CargoMission : Mission
+    {
+        public override void ClientReadInitial(IReadMessage msg)
+        {
+            ushort itemCount = msg.ReadUInt16();
+            for (int i = 0; i < itemCount; i++)
+            {
+                items.Add(Item.ReadSpawnData(msg));
+            }
+            if (items.Contains(null))
+            {
+                throw new System.Exception("Error in CargoMission.ClientReadInitial: item list contains null (mission: " + Prefab.Identifier + ")");
+            }
+            if (items.Count != itemCount)
+            {
+                throw new System.Exception("Error in CargoMission.ClientReadInitial: item count does not match the server count (" + itemCount + " != " + items.Count + "mission: " + Prefab.Identifier + ")");
+            }
+            if (requiredDeliveryAmount == 0) { requiredDeliveryAmount = items.Count; }
+        }
+    }
+}

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

@@ -1,4 +1,6 @@
-namespace Barotrauma
+using Barotrauma.Networking;
+
+namespace Barotrauma
 {
     partial class CombatMission
     {
@@ -18,5 +20,10 @@
                 return descriptions[GameMain.Client.Character.TeamID == Character.TeamType.Team1 ? 1 : 2];
             }
         }
+
+        public override void ClientReadInitial(IReadMessage msg)
+        {
+            //do nothing
+        }
     }
 }

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

@@ -23,5 +23,7 @@ namespace Barotrauma
         {
             State = msg.ReadInt16();
         }
+
+        public abstract void ClientReadInitial(IReadMessage msg);
     }
 }

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

@@ -0,0 +1,25 @@
+using Barotrauma.Networking;
+
+namespace Barotrauma
+{
+    partial class MonsterMission : Mission
+    {
+        public override void ClientReadInitial(IReadMessage msg)
+        {
+            byte monsterCount = msg.ReadByte();
+            for (int i = 0; i < monsterCount; i++)
+            {
+                monsters.Add(Character.ReadSpawnData(msg));
+            }
+            if (monsters.Contains(null))
+            {
+                throw new System.Exception("Error in MonsterMission.ClientReadInitial: monster list contains null (mission: " + Prefab.Identifier + ")");
+            }
+            if (monsters.Count != monsterCount)
+            {
+                throw new System.Exception("Error in MonsterMission.ClientReadInitial: monster count does not match the server count (" + monsterCount + " != " + monsters.Count + "mission: " + Prefab.Identifier + ")");
+            }
+            InitializeMonsters(monsters);
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+using Barotrauma.Networking;
+using FarseerPhysics;
+
+namespace Barotrauma
+{
+    partial class SalvageMission : Mission
+    {
+        public override void ClientReadInitial(IReadMessage msg)
+        {
+            item = Item.ReadSpawnData(msg);
+            if (item == null)
+            {
+                throw new System.Exception("Error in SalvageMission.ClientReadInitial: spawned item was null (mission: " + Prefab.Identifier + ")");
+            }
+
+            item.body.FarseerBody.BodyType = BodyType.Kinematic;
+        }
+    }
+}