Unstable 0.1500.1.0 (BaroDev edition)

Barotrauma/BarotraumaServer/ServerSource/Characters/Character.cs

@@ -28,6 +28,15 @@ namespace Barotrauma
                 }
             }
 
+            if (HasAbilityFlag(AbilityFlags.RetainExperienceForNewCharacter))
+            {
+                var ownerClient = GameMain.Server.ConnectedClients.Find(c => c.Character == this);
+                if (ownerClient != null)
+                {
+                    (GameMain.GameSession?.GameMode as MultiPlayerCampaign)?.SaveExperiencePoints(ownerClient);
+                }
+            }
+
             healthUpdateTimer = 0.0f;
 
             if (CauseOfDeath.Killer != null && CauseOfDeath.Killer.IsTraitor && CauseOfDeath.Killer != this)

Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterInfo.cs

@@ -73,6 +73,7 @@ namespace Barotrauma
                     msg.Write(savedStatValue.RemoveOnDeath);
                 }
             }
+            msg.Write((ushort)ExperiencePoints);
         }
     }
 }

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

@@ -27,6 +27,29 @@ namespace Barotrauma
 
         public bool GameOver { get; private set; }
 
+        class SavedExperiencePoints
+        {
+            public readonly ulong SteamID;
+            public readonly string EndPoint;
+            public readonly int ExperiencePoints;
+
+            public SavedExperiencePoints(Client client)
+            {
+                SteamID = client.SteamID;
+                EndPoint = client.Connection.EndPointString;
+                ExperiencePoints = client.Character?.Info?.ExperiencePoints ?? 0;
+            }
+
+            public SavedExperiencePoints(XElement element)
+            {
+                SteamID = element.GetAttributeUInt64("steamid", 0);
+                EndPoint = element.GetAttributeString("endpoint", string.Empty);
+                ExperiencePoints = element.GetAttributeInt("points", 0);
+            }
+        }
+
+        private readonly List<SavedExperiencePoints> savedExperiencePoints = new List<SavedExperiencePoints>();
+
         public override bool Paused
         {
             get { return ForceMapUI || CoroutineManager.IsCoroutineRunning("LevelTransition"); }
@@ -155,6 +178,20 @@ namespace Barotrauma
                     c.InGame && (IsOwner(c) || c.HasPermission(ClientPermissions.ManageCampaign)));
         }
 
+        public void SaveExperiencePoints(Client client)
+        {
+            ClearSavedExperiencePoints(client);
+            savedExperiencePoints.Add(new SavedExperiencePoints(client));
+        }
+        public int GetSavedExperiencePoints(Client client)
+        {
+            return savedExperiencePoints.Find(s => s.SteamID != 0 && client.SteamID == s.SteamID || client.EndpointMatches(s.EndPoint))?.ExperiencePoints ?? 0;
+        }
+        public void ClearSavedExperiencePoints(Client client)
+        {
+            savedExperiencePoints.RemoveAll(s => s.SteamID != 0 && client.SteamID == s.SteamID || client.EndpointMatches(s.EndPoint));
+        }
+
         public void LoadPets()
         {
             if (petsElement != null)
@@ -259,6 +296,16 @@ namespace Barotrauma
             Map.ProgressWorld(transitionType, (float)(Timing.TotalTime - GameMain.GameSession.RoundStartTime));
 
             bool success = GameMain.Server.ConnectedClients.Any(c => c.InGame && c.Character != null && !c.Character.IsDead);
+            if (success)
+            {
+                foreach (Client c in GameMain.Server.ConnectedClients)
+                {
+                    if (c.Character?.HasAbilityFlag(AbilityFlags.RetainExperienceForNewCharacter) ?? false)
+                    {
+                        (GameMain.GameSession?.GameMode as MultiPlayerCampaign)?.SaveExperiencePoints(c);
+                    }
+                }
+            }
 
             GameMain.GameSession.EndRound("", traitorResults, transitionType);
             
@@ -965,6 +1012,15 @@ namespace Barotrauma
             // save bots
             CrewManager.SaveMultiplayer(modeElement);
 
+            XElement savedExperiencePointsElement = new XElement("SavedExperiencePoints");
+            foreach (var savedExperiencePoint in savedExperiencePoints)
+            {
+                savedExperiencePointsElement.Add(new XElement("Point",
+                    new XAttribute("steamid", savedExperiencePoint.SteamID),
+                    new XAttribute("endpoint", savedExperiencePoint?.EndPoint ?? string.Empty),
+                    new XAttribute("points", savedExperiencePoint.ExperiencePoints)));
+            }
+
             // save available submarines
             XElement availableSubsElement = new XElement("AvailableSubs");
             for (int i = 0; i < GameMain.NetLobbyScreen.CampaignSubmarines.Count; i++)

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

@@ -0,0 +1,20 @@
+using Barotrauma.Networking;
+
+namespace Barotrauma.Items.Components
+{
+    partial class GeneticMaterial : ItemComponent
+    {
+        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        {
+            msg.Write(tainted);
+            if (tainted)
+            {
+                msg.Write(selectedTaintedEffect?.UIntIdentifier ?? 0);
+            }
+            else
+            {
+                msg.Write(selectedEffect?.UIntIdentifier ?? 0);
+            }
+        }
+    }
+}

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

@@ -19,13 +19,13 @@ namespace Barotrauma.Items.Components
                 GameServer.Log(GameServer.CharacterLogName(c.Character) + " entered \"" + newOutputValue + "\" on " + item.Name,
                     ServerLog.MessageType.ItemInteraction);
                 OutputValue = newOutputValue;
-                ShowOnDisplay(newOutputValue);
+                ShowOnDisplay(newOutputValue, addToHistory: true);
                 item.SendSignal(newOutputValue, "signal_out");
                 item.CreateServerEvent(this);
             }
         }
 
-        partial void ShowOnDisplay(string input, bool addToHistory = true)
+        partial void ShowOnDisplay(string input, bool addToHistory)
         {
             if (addToHistory)
             {

Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs

@@ -2358,6 +2358,12 @@ namespace Barotrauma.Networking
 
                         characterData.HasSpawned = true;
                     }
+                    if (GameMain.GameSession?.GameMode is MultiPlayerCampaign mpCampaign && spawnedCharacter.Info != null)
+                    {
+                        spawnedCharacter.Info.SetExperience(Math.Max(spawnedCharacter.Info.ExperiencePoints, mpCampaign.GetSavedExperiencePoints(teamClients[i])));
+                        mpCampaign.ClearSavedExperiencePoints(teamClients[i]);
+                    }
+
                     spawnedCharacter.OwnerClientEndPoint = teamClients[i].Connection.EndPointString;
                     spawnedCharacter.OwnerClientName = teamClients[i].Name;
                 }

Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs

@@ -379,6 +379,12 @@ namespace Barotrauma.Networking
                 }
                 else
                 {
+                    if (GameMain.GameSession?.GameMode is MultiPlayerCampaign mpCampaign && character.Info != null)
+                    {
+                        character.Info.SetExperience(Math.Max(character.Info.ExperiencePoints, mpCampaign.GetSavedExperiencePoints(clients[i])));
+                        mpCampaign.ClearSavedExperiencePoints(clients[i]);
+                    }
+
                     //tell the respawning client they're no longer a traitor
                     if (GameMain.Server.TraitorManager?.Traitors != null && clients[i].Character != null)
                     {