(4b33eda28) Merge branch 'dev' into enemy-ai

Barotrauma/BarotraumaClient/Source/DebugConsole.cs

@@ -403,6 +403,11 @@ namespace Barotrauma
             AssignRelayToServer("help", false);
             AssignRelayToServer("verboselogging", false);
             AssignRelayToServer("freecam", false);
+#if DEBUG
+            AssignRelayToServer("simulatedlatency", false);
+            AssignRelayToServer("simulatedloss", false);
+            AssignRelayToServer("simulatedduplicateschance", false);
+#endif
 
             commands.Add(new Command("clientlist", "", (string[] args) => { }));
             AssignRelayToServer("clientlist", true);
@@ -957,6 +962,8 @@ namespace Barotrauma
                             }
                         }
                     }
+                    element.Value = lines[i];
+                    i++;
                 }
             }, isCheat: false));
 #endif

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Sonar.cs

@@ -785,8 +785,9 @@ namespace Barotrauma.Items.Components
 
                 foreach (Limb limb in c.AnimController.Limbs)
                 {
-                    float pointDist = ((limb.WorldPosition - pingSource) * displayScale).LengthSquared();
+                    if (!limb.body.Enabled) { continue; }
 
+                    float pointDist = ((limb.WorldPosition - pingSource) * displayScale).LengthSquared();
                     if (limb.SimPosition == Vector2.Zero || pointDist > DisplayRadius * DisplayRadius) continue;
 
                     if (pointDist > prevPingRadiusSqr && pointDist < pingRadiusSqr)

Barotrauma/BarotraumaClient/Source/Items/Components/Repairable.cs

@@ -1,4 +1,6 @@
-using Barotrauma.Particles;
+using Barotrauma.Networking;
+using Barotrauma.Particles;
+using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System.Collections.Generic;
@@ -112,8 +114,7 @@ namespace Barotrauma.Items.Components
             System.Diagnostics.Debug.Assert(GuiFrame.GetChild(0) is GUILayoutGroup, "Repair UI hierarchy has changed, could not find skill texts");
             foreach (GUIComponent c in GuiFrame.GetChild(0).Children)
             {
-                Skill skill = c.UserData as Skill;
-                if (skill == null) continue;
+                if (!(c.UserData is Skill skill)) continue;
 
                 GUITextBlock textBlock = (GUITextBlock)c;
                 if (character.GetSkillLevel(skill.Identifier) < skill.Level)
@@ -126,5 +127,15 @@ namespace Barotrauma.Items.Components
                 }
             }
         }
+
+        public void ClientRead(ServerNetObject type, NetBuffer msg, float sendingTime)
+        {
+            deteriorationTimer = msg.ReadSingle();
+        }
+
+        public void ClientWrite(NetBuffer msg, object[] extraData = null)
+        {
+            //no need to write anything, just letting the server know we started repairing
+        }
     }
 }

Barotrauma/BarotraumaClient/Source/Items/Components/StatusHUD.cs

@@ -181,7 +181,7 @@ namespace Barotrauma.Items.Components
                 Dictionary<AfflictionPrefab, float> combinedAfflictionStrengths = new Dictionary<AfflictionPrefab, float>();
                 foreach (Affliction affliction in allAfflictions)
                 {
-                    if (affliction.Strength < affliction.Prefab.ActivationThreshold || affliction.Strength <= 0.0f) continue;
+                    if (affliction.Strength < affliction.Prefab.ShowInHealthScannerThreshold || affliction.Strength <= 0.0f) continue;
                     if (combinedAfflictionStrengths.ContainsKey(affliction.Prefab))
                     {
                         combinedAfflictionStrengths[affliction.Prefab] += affliction.Strength;

Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs

@@ -622,7 +622,7 @@ namespace Barotrauma.Networking
 
             if (gameStarted) SetRadioButtonColor();
 
-            if (ShowNetStats)
+            if (ShowNetStats && client?.ServerConnection != null)
             {
                 netStats.AddValue(NetStats.NetStatType.ReceivedBytes, client.ServerConnection.Statistics.ReceivedBytes);
                 netStats.AddValue(NetStats.NetStatType.SentBytes, client.ServerConnection.Statistics.SentBytes);
@@ -1109,7 +1109,7 @@ namespace Barotrauma.Networking
             {
                 string errorMsg = "Level equality check failed. The level generated at your end doesn't match the level generated by the server (seed " + Level.Loaded.Seed + ").";
                 DebugConsole.ThrowError(errorMsg, createMessageBox: true);
-                GameAnalyticsManager.AddErrorEventOnce("GameClient.StartGame:LevelsDontMatch"+levelSeed, GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
+                GameAnalyticsManager.AddErrorEventOnce("GameClient.StartGame:LevelsDontMatch" + levelSeed, GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
                 CoroutineManager.StartCoroutine(EndGame(""));
                 yield return CoroutineStatus.Failure;
             }
@@ -1687,6 +1687,8 @@ namespace Barotrauma.Networking
 
                     SaveUtil.LoadGame(GameMain.GameSession.SavePath, GameMain.GameSession);
                     campaign.LastSaveID = campaign.PendingSaveID;
+
+                    DebugConsole.Log("Campaign save received, save ID " + campaign.LastSaveID);
                     //decrement campaign update ID so the server will send us the latest data
                     //(as there may have been campaign updates after the save file was created)
                     campaign.LastUpdateID--;
@@ -1704,7 +1706,7 @@ namespace Barotrauma.Networking
 
         public override void CreateEntityEvent(INetSerializable entity, object[] extraData)
         {
-            if (!(entity is IClientSerializable)) throw new InvalidCastException("entity is not IClientSerializable");
+            if (!(entity is IClientSerializable)) throw new InvalidCastException("Entity is not IClientSerializable");
             entityEventManager.CreateEvent(entity as IClientSerializable, extraData);
         }
 
@@ -1973,7 +1975,8 @@ namespace Barotrauma.Networking
             msg.Write(true); msg.WritePadBits();
             msg.Write(savePath);
             msg.Write(mapSeed);
-            msg.Write(sub.FilePath);
+            msg.Write(sub.Name);
+            msg.Write(sub.MD5Hash.Hash);
 
             client.SendMessage(msg, NetDeliveryMethod.ReliableUnordered);