Unstable 0.1400.1.0

Barotrauma/BarotraumaClient/ClientSource/Events/EventActions/ConversationAction.cs

@@ -55,6 +55,12 @@ namespace Barotrauma
         {
             Debug.Assert(actionInstance == null || actionId == null);
 
+            if (GUI.InputBlockingMenuOpen)
+            {
+                if (actionId.HasValue) { SendIgnore(actionId.Value); }
+                return;
+            }
+
             shouldFadeToBlack = fadeToBlack;
 
             if (lastMessageBox != null && !lastMessageBox.Closed && GUIMessageBox.MessageBoxes.Contains(lastMessageBox))
@@ -368,6 +374,15 @@ namespace Barotrauma
             GameMain.Client?.ClientPeer?.Send(outmsg, DeliveryMethod.Reliable);
         }
 
+        private static void SendIgnore(UInt16 actionId)
+        {
+            IWriteMessage outmsg = new WriteOnlyMessage();
+            outmsg.Write((byte)ClientPacketHeader.EVENTMANAGER_RESPONSE);
+            outmsg.Write(actionId);
+            outmsg.Write(byte.MaxValue);
+            GameMain.Client?.ClientPeer?.Send(outmsg, DeliveryMethod.Reliable);
+        }
+
         // Too broken, left it here if I ever want to come back to it
         private static List<RichTextData> GetQuoteHighlights(string text, Color color)
         {

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/EscortMission.cs

@@ -10,7 +10,12 @@ namespace Barotrauma
 
             for (int i = 0; i < characterCount; i++)
             {
-                characters.Add(Character.ReadSpawnData(msg));
+                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++)
                 {

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);
-            }
-        }
-    }
-}