Unstable 0.16.1.0

Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs

@@ -28,11 +28,11 @@ namespace Barotrauma
                 if (!CheatsEnabled && IsCheat)
                 {
                     NewMessage("Client \"" + client.Name + "\" attempted to use the command \"" + names[0] + "\". Cheats must be enabled using \"enablecheats\" before the command can be used.", Color.Red);
-                    GameMain.Server.SendConsoleMessage("You need to enable cheats using the command \"enablecheats\" before you can use the command \"" + names[0] + "\".", client);
+                    GameMain.Server.SendConsoleMessage("You need to enable cheats using the command \"enablecheats\" before you can use the command \"" + names[0] + "\".", client, Color.Red);
 
 #if USE_STEAM
                     NewMessage("Enabling cheats will disable Steam achievements during this play session.", Color.Red);
-                    GameMain.Server.SendConsoleMessage("Enabling cheats will disable Steam achievements during this play session.", client);
+                    GameMain.Server.SendConsoleMessage("Enabling cheats will disable Steam achievements during this play session.", client, Color.Red);
 #endif
 
                     return;
@@ -367,7 +367,7 @@ namespace Barotrauma
                 }
                 else
                 {
-                    GameMain.Server.SendConsoleMessage("\"" + args[0] + "\" is not a valid bot spawn mode. (Valid modes are Fill and Normal)", client);
+                    GameMain.Server.SendConsoleMessage("\"" + args[0] + "\" is not a valid bot spawn mode. (Valid modes are Fill and Normal)", client, Color.Red);
                 }
             });
 
@@ -1046,12 +1046,12 @@ namespace Barotrauma
             }));
             AssignOnClientRequestExecute("clientlist", (Client client, Vector2 cursorWorldPos, string[] args) =>
             {
-                GameMain.Server.SendConsoleMessage("***************", client);
+                GameMain.Server.SendConsoleMessage("***************", client, Color.Cyan);
                 foreach (Client c in GameMain.Server.ConnectedClients)
                 {
-                    GameMain.Server.SendConsoleMessage("- " + c.ID.ToString() + ": " + c.Name + ", " + c.Connection.EndPointString + $", ping {c.Ping} ms", client);
+                    GameMain.Server.SendConsoleMessage("- " + c.ID.ToString() + ": " + c.Name + ", " + c.Connection.EndPointString + $", ping {c.Ping} ms", client, Color.Cyan);
                 }
-                GameMain.Server.SendConsoleMessage("***************", client);
+                GameMain.Server.SendConsoleMessage("***************", client, Color.Cyan);
             });
 
             commands.Add(new Command("enablecheats", "enablecheats: Enables cheat commands and disables Steam achievements during this play session.", (string[] args) =>
@@ -1164,13 +1164,13 @@ namespace Barotrauma
                 if (GameMain.Server == null || args.Length == 0) return;
                 if (!int.TryParse(args[0], out int maxPlayers))
                 {
-                    GameMain.Server.SendConsoleMessage(args[0] + " is not a valid player count.", client);
+                    GameMain.Server.SendConsoleMessage(args[0] + " is not a valid player count.", client, Color.Red);
                 }
                 else
                 {
                     if (maxPlayers > NetConfig.MaxPlayers)
                     {
-                        GameMain.Server.SendConsoleMessage($"Setting the maximum amount of players to {maxPlayers} failed due to exceeding the limit of {NetConfig.MaxPlayers} players per server. Using the maximum of {NetConfig.MaxPlayers} instead.", client);
+                        GameMain.Server.SendConsoleMessage($"Setting the maximum amount of players to {maxPlayers} failed due to exceeding the limit of {NetConfig.MaxPlayers} players per server. Using the maximum of {NetConfig.MaxPlayers} instead.", client, Color.Red);
                         maxPlayers = NetConfig.MaxPlayers;
                     }
 
@@ -1455,7 +1455,7 @@ namespace Barotrauma
                         }
                         else
                         {
-                            GameMain.Server.SendConsoleMessage("\"" + args[1] + "\" is not a valid ban duration.", client);
+                            GameMain.Server.SendConsoleMessage("\"" + args[1] + "\" is not a valid ban duration.", client, Color.Red);
                             return;
                         }
                     }
@@ -1575,7 +1575,7 @@ namespace Barotrauma
                     }
                     else
                     {
-                        GameMain.Server.SendConsoleMessage("\"" + args[0] + "\" is not a valid bot spawn mode. (Valid modes are Fill and Normal)", client);
+                        GameMain.Server.SendConsoleMessage("\"" + args[0] + "\" is not a valid bot spawn mode. (Valid modes are Fill and Normal)", client, Color.Red);
                     }
                 }
             );
@@ -1599,7 +1599,7 @@ namespace Barotrauma
                     if (Submarine.MainSub == null || Level.Loaded == null) return;
                     if (Level.Loaded.Type == LevelData.LevelType.Outpost)
                     {
-                        GameMain.Server.SendConsoleMessage("The teleportsub command is unavailable in outpost levels!", client);
+                        GameMain.Server.SendConsoleMessage("The teleportsub command is unavailable in outpost levels!", client, Color.Red);
                         return;
                     }
 
@@ -1623,7 +1623,7 @@ namespace Barotrauma
                 {
                     if (!(GameMain.GameSession?.Campaign is MultiPlayerCampaign mpCampaign))
                     {
-                        GameMain.Server.SendConsoleMessage("No campaign active.", client);
+                        GameMain.Server.SendConsoleMessage("No campaign active.", client, Color.Red);
                         return;
                     }
                     mpCampaign.LastUpdateID++;
@@ -1671,13 +1671,13 @@ namespace Barotrauma
                         a.Identifier.Equals(args[0], StringComparison.OrdinalIgnoreCase));
                     if (afflictionPrefab == null)
                     {
-                        GameMain.Server.SendConsoleMessage("Affliction \"" + args[0] + "\" not found.", client);
+                        GameMain.Server.SendConsoleMessage("Affliction \"" + args[0] + "\" not found.", client, Color.Red);
                         return;
                     }
 
                     if (!float.TryParse(args[1], out float afflictionStrength))
                     {
-                        GameMain.Server.SendConsoleMessage("\"" + args[1] + "\" is not a valid affliction strength.", client);
+                        GameMain.Server.SendConsoleMessage("\"" + args[1] + "\" is not a valid affliction strength.", client, Color.Red);
                         return;
                     }
 
@@ -1760,7 +1760,7 @@ namespace Barotrauma
                         c.DisplayName.Equals(args[0], StringComparison.OrdinalIgnoreCase));
                     if (talentPrefab == null)
                     {
-                        GameMain.Server.SendConsoleMessage("Couldn't find the talent \"" + args[0] + "\".", client);
+                        GameMain.Server.SendConsoleMessage("Couldn't find the talent \"" + args[0] + "\".", client, Color.Red);
                         return;
                     }
                     targetCharacter.GiveTalent(talentPrefab);
@@ -1786,12 +1786,12 @@ namespace Barotrauma
                         var job = JobPrefab.Prefabs.Find(jp => jp.Name != null && jp.Name.Equals(args[0], StringComparison.OrdinalIgnoreCase));
                         if (job == null)
                         {
-                            GameMain.Server.SendConsoleMessage($"Failed to find the job \"{args[0]}\".", client);
+                            GameMain.Server.SendConsoleMessage($"Failed to find the job \"{args[0]}\".", client, Color.Red);
                             return;
                         }
                         if (!TalentTree.JobTalentTrees.TryGetValue(job.Identifier, out TalentTree talentTree))
                         {
-                            GameMain.Server.SendConsoleMessage($"No talents configured for the job \"{args[0]}\".", client);
+                            GameMain.Server.SendConsoleMessage($"No talents configured for the job \"{args[0]}\".", client, Color.Red);
                             return;
                         }
                         talentTrees.Add(talentTree);
@@ -1858,6 +1858,10 @@ namespace Barotrauma
                 (Client client, Vector2 cursorWorldPos, string[] args) =>
                 {
                     Character killedCharacter = (args.Length == 0) ? client.Character : FindMatchingCharacter(args);
+                    if (killedCharacter == null)
+                    {
+                        GameMain.Server.SendConsoleMessage("Could not find the specified character.", client, Color.Red);
+                    }
                     killedCharacter?.SetAllDamage(200.0f, 0.0f, 0.0f);
                 }
             );
@@ -1873,6 +1877,10 @@ namespace Barotrauma
                         GameMain.Server.SetClientCharacter(client, character);
                         client.SpectateOnly = false;
                     }
+                    else
+                    {
+                        GameMain.Server.SendConsoleMessage("Could not find the specified character.", client, Color.Red);
+                    }
                 }
             );
 
@@ -1899,7 +1907,7 @@ namespace Barotrauma
                     }
                     else
                     {
-                        GameMain.Server.SendConsoleMessage(args[0] + " is not a valid difficulty setting (enter a value between 0-100)", client);
+                        GameMain.Server.SendConsoleMessage(args[0] + " is not a valid difficulty setting (enter a value between 0-100)", client, Color.Red);
                         NewMessage(args[0] + " is not a valid difficulty setting (enter a value between 0-100)", Color.Red);
                     }
                 }
@@ -1923,7 +1931,7 @@ namespace Barotrauma
                     ClientPermissions permission = ClientPermissions.None;
                     if (!Enum.TryParse(perm, true, out permission))
                     {
-                        GameMain.Server.SendConsoleMessage(perm + " is not a valid permission!", senderClient);
+                        GameMain.Server.SendConsoleMessage(perm + " is not a valid permission!", senderClient, Color.Red);
                         return;
                     }
 
@@ -1955,7 +1963,7 @@ namespace Barotrauma
                     }
                     if (client.Connection == GameMain.Server.OwnerConnection)
                     {
-                        GameMain.Server.SendConsoleMessage("Cannot revoke permissions from the server owner!", senderClient);
+                        GameMain.Server.SendConsoleMessage("Cannot revoke permissions from the server owner!", senderClient, Color.Red);
                         return;
                     }
 
@@ -1964,7 +1972,7 @@ namespace Barotrauma
                     ClientPermissions permission = ClientPermissions.None;
                     if (!Enum.TryParse(perm, true, out permission))
                     {
-                        GameMain.Server.SendConsoleMessage(perm + " is not a valid permission!", senderClient);
+                        GameMain.Server.SendConsoleMessage(perm + " is not a valid permission!", senderClient, Color.Red);
                         return;
                     }
                     client.RemovePermission(permission);
@@ -1988,7 +1996,7 @@ namespace Barotrauma
                     }
                     if (client.Connection == GameMain.Server.OwnerConnection)
                     {
-                        GameMain.Server.SendConsoleMessage("Cannot modify the rank of the server owner!", senderClient);
+                        GameMain.Server.SendConsoleMessage("Cannot modify the rank of the server owner!", senderClient, Color.Red);
                         return;
                     }
 
@@ -1996,7 +2004,7 @@ namespace Barotrauma
                     PermissionPreset preset = PermissionPreset.List.Find(p => p.Name.Equals(rank, StringComparison.OrdinalIgnoreCase));
                     if (preset == null)
                     {
-                        GameMain.Server.SendConsoleMessage("Rank \"" + rank + "\" not found.", senderClient);
+                        GameMain.Server.SendConsoleMessage("Rank \"" + rank + "\" not found.", senderClient, Color.Red);
                         return;
                     }
 
@@ -2016,12 +2024,12 @@ namespace Barotrauma
                     var client = FindClient(args[0]);
                     if (client == null)
                     {
-                        GameMain.Server.SendConsoleMessage("Client \"" + args[0] + "\" not found.", senderClient);
+                        GameMain.Server.SendConsoleMessage("Client \"" + args[0] + "\" not found.", senderClient, Color.Red);
                         return;
                     }
                     if (client.Connection == GameMain.Server.OwnerConnection)
                     {
-                        GameMain.Server.SendConsoleMessage("Cannot modify the command permissions of the server owner!", senderClient);
+                        GameMain.Server.SendConsoleMessage("Cannot modify the command permissions of the server owner!", senderClient, Color.Red);
                         return;
                     }
 
@@ -2040,7 +2048,7 @@ namespace Barotrauma
                             Command matchingCommand = commands.Find(c => c.names.Contains(splitCommands[i]));
                             if (matchingCommand == null)
                             {
-                                GameMain.Server.SendConsoleMessage("Could not find the command \"" + splitCommands[i] + "\"!", senderClient);
+                                GameMain.Server.SendConsoleMessage("Could not find the command \"" + splitCommands[i] + "\"!", senderClient, Color.Red);
                             }
                             else
                             {
@@ -2078,7 +2086,7 @@ namespace Barotrauma
                     }
                     if (client.Connection == GameMain.Server.OwnerConnection)
                     {
-                        GameMain.Server.SendConsoleMessage("Cannot revoke command permissions from the server owner!", senderClient);
+                        GameMain.Server.SendConsoleMessage("Cannot revoke command permissions from the server owner!", senderClient, Color.Red);
                         return;
                     }
                     List<Command> revokedCommands = new List<Command>();
@@ -2096,7 +2104,7 @@ namespace Barotrauma
                             Command matchingCommand = commands.Find(c => c.names.Contains(splitCommands[i]));
                             if (matchingCommand == null)
                             {
-                                GameMain.Server.SendConsoleMessage("Could not find the command \"" + splitCommands[i] + "\"!", senderClient);
+                                GameMain.Server.SendConsoleMessage("Could not find the command \"" + splitCommands[i] + "\"!", senderClient, Color.Red);
                             }
                             else
                             {
@@ -2176,7 +2184,7 @@ namespace Barotrauma
                 {
                     if (args.Length < 2)
                     {
-                        GameMain.Server.SendConsoleMessage("Invalid parameters. The command should be formatted as \"setclientcharacter [client] [character]\". If the names consist of multiple words, you should surround them with quotation marks.", senderClient);
+                        GameMain.Server.SendConsoleMessage("Invalid parameters. The command should be formatted as \"setclientcharacter [client] [character]\". If the names consist of multiple words, you should surround them with quotation marks.", senderClient, Color.Red);
                         return;
                     }
 
@@ -2189,7 +2197,7 @@ namespace Barotrauma
                     var client = GameMain.Server.ConnectedClients.Find(c => c.Name == args[0]);
                     if (client == null)
                     {
-                        GameMain.Server.SendConsoleMessage("Client \"" + args[0] + "\" not found.", senderClient);
+                        GameMain.Server.SendConsoleMessage("Client \"" + args[0] + "\" not found.", senderClient, Color.Red);
                         return;
                     }
 
@@ -2206,17 +2214,18 @@ namespace Barotrauma
                     if (args.Length == 0) { return; }
                     if (!(GameMain.GameSession?.GameMode is MultiPlayerCampaign campaign))
                     {
-                        GameMain.Server.SendConsoleMessage("No campaign active!", senderClient);
+                        GameMain.Server.SendConsoleMessage("No campaign active!", senderClient, Color.Red);
                         return;
                     }
                     if (int.TryParse(args[0], out int money))
                     {
                         campaign.Money += money;
+                        GameAnalyticsManager.AddMoneyGainedEvent(money, GameAnalyticsManager.MoneySource.Cheat, "console");
                         campaign.LastUpdateID++;
                     }
                     else
                     {
-                        GameMain.Server.SendConsoleMessage($"\"{args[0]}\" is not a valid numeric value.", senderClient);
+                        GameMain.Server.SendConsoleMessage($"\"{args[0]}\" is not a valid numeric value.", senderClient, Color.Red);
                     }                    
                 }
             );
@@ -2226,7 +2235,7 @@ namespace Barotrauma
                 {
                     if (!(GameMain.GameSession?.GameMode is CampaignMode campaign))
                     {
-                        GameMain.Server.SendConsoleMessage("No campaign active!", senderClient);
+                        GameMain.Server.SendConsoleMessage("No campaign active!", senderClient, Color.Red);
                         return;
                     }
 
@@ -2234,7 +2243,7 @@ namespace Barotrauma
                     if (args.Length < 1 || !int.TryParse(args[0], out destinationIndex)) return;
                     if (destinationIndex < 0 || destinationIndex >= campaign.Map.CurrentLocation.Connections.Count)
                     {
-                        GameMain.Server.SendConsoleMessage("Index out of bounds!", senderClient);
+                        GameMain.Server.SendConsoleMessage("Index out of bounds!", senderClient, Color.Red);
                         return;
                     }
                     Location location = campaign.Map.CurrentLocation.Connections[destinationIndex].OtherLocation(campaign.Map.CurrentLocation);
@@ -2251,14 +2260,41 @@ namespace Barotrauma
                     NewMessage(tag, Color.Yellow);
                 }
             }));
-            
+
+            commands.Add(new Command("sendchatmessage", "Sends a chat message with specified type and color.", (string[] args) =>
+            {
+                if (args.Length < 2) { return; }
+
+                ChatMessageType chatMessageType = ChatMessageType.Default;
+                Color? chatMessageColor = null;
+
+                if (args.Length >= 3 && int.TryParse(args[2], out int result))
+                {
+                    chatMessageType = (ChatMessageType)result;
+                }
+
+                if (args.Length >= 7 &&
+                    int.TryParse(args[3], out int r) &&
+                    int.TryParse(args[4], out int g) &&
+                    int.TryParse(args[5], out int b) &&
+                    int.TryParse(args[6], out int a))
+                {
+                    chatMessageColor = new Color(r, g, b, a);
+                }
+
+                foreach (var client in GameMain.Server.ConnectedClients)
+                {
+                    GameMain.Server.SendDirectChatMessage(ChatMessage.Create(args[0], args[1], chatMessageType, null, null, textColor: chatMessageColor), client);
+                }
+            }));
+
             AssignOnClientRequestExecute(
                 "setskill",
                 (senderClient, cursorWorldPos, args) =>
                 {
                     if (args.Length < 2)
                     {
-                        GameMain.Server.SendConsoleMessage($"Missing arguments. Expected at least 2 but got {args.Length} (skill, level, name)", senderClient);
+                        GameMain.Server.SendConsoleMessage($"Missing arguments. Expected at least 2 but got {args.Length} (skill, level, name)", senderClient, Color.Red);
                         return;
                     }
 
@@ -2268,7 +2304,7 @@ namespace Barotrauma
 
                     if (character?.Info?.Job == null)
                     {
-                        GameMain.Server.SendConsoleMessage("Character is not valid.", senderClient);
+                        GameMain.Server.SendConsoleMessage("Character is not valid.", senderClient, Color.Red);
                         return;
                     }
 
@@ -2295,7 +2331,7 @@ namespace Barotrauma
                     }
                     else
                     {
-                        GameMain.Server.SendConsoleMessage($"{levelString} is not a valid level. Expected number or \"max\".", senderClient);
+                        GameMain.Server.SendConsoleMessage($"{levelString} is not a valid level. Expected number or \"max\".", senderClient, Color.Red);
                     }                  
                 }
             );
@@ -2389,7 +2425,7 @@ namespace Barotrauma
             if (string.IsNullOrWhiteSpace(command)) return;
             if (!client.HasPermission(ClientPermissions.ConsoleCommands) && client.Connection != GameMain.Server.OwnerConnection)
             {
-                GameMain.Server.SendConsoleMessage("You are not permitted to use console commands!", client);
+                GameMain.Server.SendConsoleMessage("You are not permitted to use console commands!", client, Color.Red);
                 GameServer.Log(GameServer.ClientLogName(client) + " attempted to execute the console command \"" + command + "\" without a permission to use console commands.", ServerLog.MessageType.ConsoleUsage);
                 return;
             }
@@ -2398,19 +2434,19 @@ namespace Barotrauma
             Command matchingCommand = commands.Find(c => c.names.Contains(splitCommand[0].ToLowerInvariant()));
             if (matchingCommand != null && !client.PermittedConsoleCommands.Contains(matchingCommand) && client.Connection != GameMain.Server.OwnerConnection)
             {
-                GameMain.Server.SendConsoleMessage("You are not permitted to use the command\"" + matchingCommand.names[0] + "\"!", client);
+                GameMain.Server.SendConsoleMessage("You are not permitted to use the command\"" + matchingCommand.names[0] + "\"!", client, Color.Red);
                 GameServer.Log(GameServer.ClientLogName(client) + " attempted to execute the console command \"" + command + "\" without a permission to use the command.", ServerLog.MessageType.ConsoleUsage);
                 return;
             }
             else if (matchingCommand == null)
             {
-                GameMain.Server.SendConsoleMessage("Command \"" + splitCommand[0] + "\" not found.", client);
+                GameMain.Server.SendConsoleMessage("Command \"" + splitCommand[0] + "\" not found.", client, Color.Red);
                 return;
             }
 
             if (!MathUtils.IsValid(cursorWorldPos))
             {
-                GameMain.Server.SendConsoleMessage("Could not execute command \"" + command + "\" - invalid cursor position.", client);
+                GameMain.Server.SendConsoleMessage("Could not execute command \"" + command + "\" - invalid cursor position.", client, Color.Red);
                 NewMessage(GameServer.ClientLogName(client) + " attempted to execute the console command \"" + command + "\" with invalid cursor position.", Color.White);
                 return;
             }

Barotrauma/BarotraumaServer/ServerSource/GameMain.cs

@@ -36,7 +36,7 @@ namespace Barotrauma
         public static GameServer Server;
         public static NetworkMember NetworkMember
         {
-            get { return Server as NetworkMember; }
+            get { return Server; }
         }
 
         public static GameSession GameSession;
@@ -64,6 +64,9 @@ namespace Barotrauma
 
         private static Stopwatch stopwatch;
 
+        private static Queue<int> prevUpdateRates = new Queue<int>();
+        private static int updateCount = 0;
+
         private static ContentPackage vanillaContent;
         public static ContentPackage VanillaContent
         {
@@ -364,6 +367,8 @@ namespace Barotrauma
                 DebugConsole.NewMessage("WARNING: Stopwatch frequency under 1500 ticks per second. Expect significant syncing accuracy issues.", Color.Yellow);
             }
 
+            Stopwatch performanceCounterTimer = Stopwatch.StartNew();
+
             stopwatch = Stopwatch.StartNew();
             long prevTicks = stopwatch.ElapsedTicks;
             while (ShouldRun)
@@ -371,9 +376,11 @@ namespace Barotrauma
                 long currTicks = stopwatch.ElapsedTicks;
                 double elapsedTime = Math.Max(currTicks - prevTicks, 0) / frequency;
                 Timing.Accumulator += elapsedTime;
-                if (Timing.Accumulator > 1.0)
+                if (Timing.Accumulator > Timing.AccumulatorMax)
                 {
-                    //prevent spiral of death
+                    //prevent spiral of death:
+                    //if the game's running too slowly then we have no choice but to skip a bunch of steps
+                    //otherwise it snowballs and becomes unplayable
                     Timing.Accumulator = Timing.Step;
                 }
                 prevTicks = currTicks;
@@ -392,6 +399,7 @@ namespace Barotrauma
                     CoroutineManager.Update((float)Timing.Step, (float)Timing.Step);
 
                     Timing.Accumulator -= Timing.Step;
+                    updateCount++;
                 }
 
 #if !DEBUG
@@ -407,10 +415,34 @@ namespace Barotrauma
                 DebugConsole.UpdateCommandLine((int)(Timing.Accumulator * 800));
 #endif
 
-                int frameTime = (int)(((double)(stopwatch.ElapsedTicks - prevTicks) / frequency) * 1000.0);
+                int frameTime = (int)((stopwatch.ElapsedTicks - prevTicks) / frequency * 1000.0);
                 frameTime = Math.Max(0, frameTime);
                 
                 Thread.Sleep(Math.Max(((int)(Timing.Step * 1000.0) - frameTime) / 2, 0));
+
+                if (performanceCounterTimer.ElapsedMilliseconds > 1000)
+                {
+                    int updateRate = (int)Math.Round(updateCount / (double)(performanceCounterTimer.ElapsedMilliseconds / 1000.0));
+                    prevUpdateRates.Enqueue(updateRate);
+                    if (prevUpdateRates.Count >= 10)
+                    {
+                        int avgUpdateRate = (int)prevUpdateRates.Average();
+                        if (avgUpdateRate < Timing.FixedUpdateRate * 0.98 && GameSession != null && Timing.TotalTime > GameSession.RoundStartTime + 1.0)
+                        {
+                            DebugConsole.AddWarning($"Running slowly ({avgUpdateRate} updates/s)!");
+                            foreach (Client c in Server.ConnectedClients)
+                            {
+                                if (c.Connection == Server.OwnerConnection || c.Permissions != ClientPermissions.None)
+                                {
+                                    Server.SendConsoleMessage($"Server running slowly ({avgUpdateRate} updates/s)!", c, Color.Orange);
+                                }
+                            }
+                        }
+                        prevUpdateRates.Clear();
+                    }
+                    performanceCounterTimer.Restart();
+                    updateCount = 0;
+                }
             }
             stopwatch.Stop();
 
@@ -429,8 +461,9 @@ namespace Barotrauma
         public static void ResetFrameTime()
         {
             Timing.Accumulator = 0.0f;
-            stopwatch?.Reset();
-            stopwatch?.Start();
+            stopwatch?.Restart();
+            prevUpdateRates.Clear();
+            updateCount = 0;
         }
         
         public CoroutineHandle ShowLoading(IEnumerable<CoroutineStatus> loader, bool waitKeyHit = true)

Barotrauma/BarotraumaServer/ServerSource/GameSession/CargoManager.cs

@@ -55,6 +55,7 @@ namespace Barotrauma
                 SoldItems.Add(item);
                 Location.StoreCurrentBalance -= itemValue;
                 campaign.Money += itemValue;
+                GameAnalyticsManager.AddMoneyGainedEvent(itemValue, GameAnalyticsManager.MoneySource.Store, item.ItemPrefab.Identifier);
             }
             OnSoldItemsChanged?.Invoke();
         }

Barotrauma/BarotraumaServer/ServerSource/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -285,11 +285,15 @@ namespace Barotrauma
                     break;
                 case TransitionType.ProgressToNextLocation:
                     Map.MoveToNextLocation();
+                    TotalPassedLevels++;
                     break;
                 case TransitionType.End:
                     EndCampaign();
                     IsFirstRound = true;
                     break;
+                case TransitionType.ProgressToNextEmptyLocation:
+                    TotalPassedLevels++;
+                    break;
             }
 
             Map.ProgressWorld(transitionType, (float)(Timing.TotalTime - GameMain.GameSession.RoundStartTime));
@@ -697,6 +701,7 @@ namespace Barotrauma
                 {
                     this.PurchasedHullRepairs = true;
                     Money -= hullRepairCost;
+                    GameAnalyticsManager.AddMoneySpentEvent(hullRepairCost, GameAnalyticsManager.MoneySink.Service, "hullrepairs");
                 }
                 else if (!purchasedHullRepairs)
                 {
@@ -710,6 +715,7 @@ namespace Barotrauma
                 {
                     this.PurchasedItemRepairs = true;
                     Money -= itemRepairCost;
+                    GameAnalyticsManager.AddMoneySpentEvent(itemRepairCost, GameAnalyticsManager.MoneySink.Service, "devicerepairs");
                 }
                 else if (!purchasedItemRepairs)
                 {
@@ -728,6 +734,7 @@ namespace Barotrauma
                 {
                     this.PurchasedLostShuttles = true;
                     Money -= shuttleRetrieveCost;
+                    GameAnalyticsManager.AddMoneySpentEvent(shuttleRetrieveCost, GameAnalyticsManager.MoneySink.Service, "retrieveshuttle");
                 }
                 else if (!purchasedItemRepairs)
                 {
@@ -998,7 +1005,9 @@ namespace Barotrauma
                 new XAttribute("purchasedhullrepairs", PurchasedHullRepairs),
                 new XAttribute("purchaseditemrepairs", PurchasedItemRepairs),
                 new XAttribute("cheatsenabled", CheatsEnabled));
+
             modeElement.Add(Settings.Save());
+            modeElement.Add(SaveStats());
             CampaignMetadata?.Save(modeElement);
             Map.Save(modeElement);
             CargoManager?.SavePurchasedItems(modeElement);

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Growable.cs

@@ -1,13 +1,14 @@
-using System;
-using System.ComponentModel;
-using System.Linq;
+using Barotrauma.Networking;
+using System;
 using System.Xml.Linq;
-using Barotrauma.Networking;
 
 namespace Barotrauma.Items.Components
 {
     internal partial class Growable
     {
+        private const int serverHealthUpdateDelay = 10;
+        private int serverHealthUpdateTimer;
+
         partial void LoadVines(XElement element)
         {
             foreach (XElement subElement in element.Elements())

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Signal/WifiComponent.cs

@@ -0,0 +1,12 @@
+using Barotrauma.Networking;
+
+namespace Barotrauma.Items.Components
+{
+    partial class WifiComponent
+    {
+        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        {
+            msg.WriteRangedInteger(Channel, MinChannel, MaxChannel);
+        }
+    }
+}

Barotrauma/BarotraumaServer/ServerSource/Networking/ChatMessage.cs

@@ -212,6 +212,11 @@ namespace Barotrauma.Networking
             {
                 msg.Write(Sender.ID);
             }
+            msg.Write(customTextColor != null);
+            if (customTextColor != null)
+            {
+                msg.WriteColorR8G8B8A8(customTextColor.Value);
+            }
             msg.WritePadBits();
             if (Type == ChatMessageType.ServerMessageBoxInGame)
             {

Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs

@@ -726,7 +726,15 @@ namespace Barotrauma.Networking
                     }
                     break;
                 case ClientPacketHeader.REQUEST_STARTGAMEFINALIZE:
-                    if (gameStarted && connectedClient != null)
+                    if (connectedClient == null)
+                    {
+                        DebugConsole.AddWarning("Received a REQUEST_STARTGAMEFINALIZE message. Client not connected, ignoring the message.");
+                    }
+                    else if (!gameStarted)
+                    {
+                        DebugConsole.AddWarning("Received a REQUEST_STARTGAMEFINALIZE message. Game not started, ignoring the message.");
+                    }
+                    else
                     {
                         SendRoundStartFinalize(connectedClient);
                     }
@@ -746,7 +754,7 @@ namespace Barotrauma.Networking
                         string seed = inc.ReadString();
                         string subName = inc.ReadString();
                         string subHash = inc.ReadString();
-                        CampaignSettings settings = new CampaignSettings(inc);
+                        CampaignSettings settings = new CampaignSettings(inc);    
 
                         var matchingSub = SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == subName && s.MD5Hash.Hash == subHash);
 
@@ -769,6 +777,7 @@ namespace Barotrauma.Networking
                             {
                                 ServerSettings.RadiationEnabled = settings.RadiationEnabled;
                                 ServerSettings.MaxMissionCount = settings.MaxMissionCount;
+                                ServerSettings.SaveSettings();
                                 MultiPlayerCampaign.StartNewCampaign(localSavePath, matchingSub.FilePath, seed, settings);
                             }
                         }
@@ -1904,7 +1913,7 @@ namespace Barotrauma.Networking
 
             int chatMessageBytes = outmsg.LengthBytes;
             WriteChatMessages(outmsg, c);
-            chatMessageBytes = outmsg.LengthBytes - outmsg.LengthBytes;
+            chatMessageBytes = outmsg.LengthBytes - chatMessageBytes;
 
             outmsg.Write((byte)ServerNetObject.END_OF_MESSAGE);
             
@@ -1927,7 +1936,11 @@ namespace Barotrauma.Networking
                     warningMsg +=
                         "    Settings buffer size: " + settingsBuf.LengthBytes + " bytes\n";
                 }
-                if (GameSettings.VerboseLogging) { DebugConsole.AddWarning(warningMsg); }
+#if DEBUG || UNSTABLE
+                DebugConsole.ThrowError(warningMsg);
+#else
+                if (GameSettings.VerboseLogging) { DebugConsole.AddWarning(warningMsg); }                
+#endif
                 GameAnalyticsManager.AddErrorEventOnce("GameServer.ClientWriteIngame1:ClientWriteLobby" + outmsg.LengthBytes, GameAnalyticsManager.ErrorSeverity.Warning, warningMsg);
             }
             
@@ -1943,12 +1956,16 @@ namespace Barotrauma.Networking
                 //these large initial messages until the client acknowledges receiving them
                 c.LastRecvLobbyUpdate++;
 
-                SendVoteStatus(new List<Client>() { c });
             }
             else
             {
                 serverPeer.Send(outmsg, c.Connection, DeliveryMethod.Unreliable);
             }
+
+            if (isInitialUpdate)
+            {
+                SendVoteStatus(new List<Client>() { c });
+            }
         }
 
         private void WriteChatMessages(IWriteMessage outmsg, Client c)
@@ -2893,9 +2910,9 @@ namespace Barotrauma.Networking
             SendDirectChatMessage(msg, recipient);
         }
 
-        public void SendConsoleMessage(string txt, Client recipient)
+        public void SendConsoleMessage(string txt, Client recipient, Color? color = null)
         {
-            ChatMessage msg = ChatMessage.Create("", txt, ChatMessageType.Console, null);
+            ChatMessage msg = ChatMessage.Create("", txt, ChatMessageType.Console, sender: null, textColor: color);
             SendDirectChatMessage(msg, recipient);
         }
 

Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs

@@ -115,10 +115,14 @@ namespace Barotrauma.Networking
             return ShouldStartRespawnCountdown(characterToRespawnCount);
         }
 
+        private int GetMinCharactersToRespawn()
+        {
+            return Math.Max((int)(GameMain.Server.ConnectedClients.Count * GameMain.Server.ServerSettings.MinRespawnRatio), 1);
+        }
+
         private bool ShouldStartRespawnCountdown(int characterToRespawnCount)
         {
-            int totalCharacterCount = GameMain.Server.ConnectedClients.Count;
-            return (float)characterToRespawnCount >= Math.Max((float)totalCharacterCount * GameMain.Server.ServerSettings.MinRespawnRatio, 1.0f);
+            return characterToRespawnCount >= GetMinCharactersToRespawn();
         }
 
         partial void UpdateWaiting(float deltaTime)
@@ -129,7 +133,7 @@ namespace Barotrauma.Networking
             }
 
             pendingRespawnCount = GetClientsToRespawn().Count();
-            requiredRespawnCount = (int)Math.Max((float)GameMain.Server.ConnectedClients.Count * GameMain.Server.ServerSettings.MinRespawnRatio, 1.0f);
+            requiredRespawnCount = GetMinCharactersToRespawn();
             if (pendingRespawnCount != prevPendingRespawnCount || 
                 requiredRespawnCount != prevRequiredRespawnCount)
             {

Barotrauma/BarotraumaServer/ServerSource/Networking/ServerSettings.cs

@@ -223,11 +223,6 @@ namespace Barotrauma.Networking
                     AutoRestart = autoRestart;
                 }
 
-                RadiationEnabled = incMsg.ReadBoolean();
-
-                int maxMissionCount = MaxMissionCount + incMsg.ReadByte() - 1;
-                MaxMissionCount = MathHelper.Clamp(maxMissionCount, CampaignSettings.MinMissionCountLimit, CampaignSettings.MaxMissionCountLimit);
-
                 changed |= true;
                 UpdateFlag(NetFlags.Misc);
             }