2f107db...5202af9

Barotrauma/BarotraumaServer/Source/Map/Hull.cs

@@ -1,13 +1,121 @@
 using Barotrauma.Networking;
+using Lidgren.Network;
 using Microsoft.Xna.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Barotrauma
 {
-    partial class Hull : MapEntity, ISerializableEntity, IServerSerializable
+    partial class Hull : MapEntity, ISerializableEntity, IServerSerializable, IClientSerializable
     {
+        private float lastSentVolume, lastSentOxygen;
+        private float sendUpdateTimer;
+
         public override bool IsMouseOn(Vector2 position)
         {
             return false;
         }
+
+        partial void UpdateProjSpecific(float deltaTime, Camera cam)
+        {
+            if (IdFreed) { return; }
+            //update client hulls if the amount of water has changed by >10%
+            //or if oxygen percentage has changed by 5%
+            if (Math.Abs(lastSentVolume - waterVolume) > Volume * 0.1f ||
+                Math.Abs(lastSentOxygen - OxygenPercentage) > 5f)
+            {
+                sendUpdateTimer -= deltaTime;
+                if (sendUpdateTimer < 0.0f)
+                {
+                    GameMain.NetworkMember.CreateEntityEvent(this);
+                    lastSentVolume = waterVolume;
+                    lastSentOxygen = OxygenPercentage;
+                    sendUpdateTimer = NetworkUpdateInterval;
+                }                
+            }
+        }
+
+        public void ServerWrite(NetBuffer message, Client c, object[] extraData = null)
+        {
+            message.WriteRangedSingle(MathHelper.Clamp(waterVolume / Volume, 0.0f, 1.5f), 0.0f, 1.5f, 8);
+            message.WriteRangedSingle(MathHelper.Clamp(OxygenPercentage, 0.0f, 100.0f), 0.0f, 100.0f, 8);
+
+            message.Write(FireSources.Count > 0);
+            if (FireSources.Count > 0)
+            {
+                message.WriteRangedInteger(0, 16, Math.Min(FireSources.Count, 16));
+                for (int i = 0; i < Math.Min(FireSources.Count, 16); i++)
+                {
+                    var fireSource = FireSources[i];
+                    Vector2 normalizedPos = new Vector2(
+                        (fireSource.Position.X - rect.X) / rect.Width,
+                        (fireSource.Position.Y - (rect.Y - rect.Height)) / rect.Height);
+
+                    message.WriteRangedSingle(MathHelper.Clamp(normalizedPos.X, 0.0f, 1.0f), 0.0f, 1.0f, 8);
+                    message.WriteRangedSingle(MathHelper.Clamp(normalizedPos.Y, 0.0f, 1.0f), 0.0f, 1.0f, 8);
+                    message.WriteRangedSingle(MathHelper.Clamp(fireSource.Size.X / rect.Width, 0.0f, 1.0f), 0, 1.0f, 8);
+                }
+            }
+        }
+
+        //used when clients use the water/fire console commands
+        public void ServerRead(ClientNetObject type, NetBuffer msg, Client c)
+        {
+            float newWaterVolume  = msg.ReadRangedSingle(0.0f, 1.5f, 8) * Volume;
+
+            bool hasFireSources = msg.ReadBoolean();
+            int fireSourceCount = 0;
+            List<Vector3> newFireSources = new List<Vector3>();
+            if (hasFireSources)
+            {
+                fireSourceCount = msg.ReadRangedInteger(0, 16);
+                for (int i = 0; i < fireSourceCount; i++)
+                {
+                    newFireSources.Add(new Vector3(
+                        MathHelper.Clamp(msg.ReadRangedSingle(0.0f, 1.0f, 8), 0.05f, 0.95f),
+                        MathHelper.Clamp(msg.ReadRangedSingle(0.0f, 1.0f, 8), 0.05f, 0.95f),
+                        msg.ReadRangedSingle(0.0f, 1.0f, 8)));                    
+                }
+            }
+
+            if (!c.HasPermission(ClientPermissions.ConsoleCommands) || 
+                !c.PermittedConsoleCommands.Any(command => command.names.Contains("fire") || command.names.Contains("editfire")))
+            {
+                return;
+            }
+
+            WaterVolume = newWaterVolume;
+
+            for (int i = 0; i < fireSourceCount; i++)
+            {
+                Vector2 pos = new Vector2(
+                    rect.X + rect.Width * newFireSources[i].X,
+                    rect.Y - rect.Height + (rect.Height * newFireSources[i].Y));
+                float size = newFireSources[i].Z * rect.Width;
+
+                var newFire = i < FireSources.Count ?
+                    FireSources[i] :
+                    new FireSource(Submarine == null ? pos : pos + Submarine.Position, null, true);
+                newFire.Position = pos;
+                newFire.Size = new Vector2(size, newFire.Size.Y);
+
+                //ignore if the fire wasn't added to this room (invalid position)?
+                if (!FireSources.Contains(newFire))
+                {
+                    newFire.Remove();
+                    continue;
+                }
+            }
+
+            for (int i = FireSources.Count - 1; i >= fireSourceCount; i--)
+            {
+                FireSources[i].Remove();
+                if (i < FireSources.Count)
+                {
+                    FireSources.RemoveAt(i);
+                }
+            }
+        }
     }
 }

Barotrauma/BarotraumaServer/Source/Map/Structure.cs

@@ -0,0 +1,36 @@
+using Barotrauma.Networking;
+using Lidgren.Network;
+
+namespace Barotrauma
+{
+    partial class Structure : MapEntity, IDamageable, IServerSerializable, ISerializableEntity
+    {
+        partial void AdjustKarma(IDamageable attacker, float amount)
+        {
+            if (GameMain.Server != null)
+            {
+                if (Submarine == null) return;
+                if (attacker == null) return;
+                if (attacker is Character attackerCharacter)
+                {
+                    Client attackerClient = GameMain.Server.ConnectedClients.Find(c => c.Character == attackerCharacter);
+                    if (attackerClient != null)
+                    {
+                        if (attackerCharacter.TeamID == Submarine.TeamID)
+                        {
+                            attackerClient.Karma -= amount * 0.001f;
+                        }
+                    }
+                }
+            }
+        }
+
+        public void ServerWrite(NetBuffer msg, Client c, object[] extraData = null)
+        {
+            for (int i = 0; i < Sections.Length; i++)
+            {
+                msg.WriteRangedSingle(Sections[i].damage / Health, 0.0f, 1.0f, 8);
+            }
+        }
+    }
+}

Barotrauma/BarotraumaServer/Source/Map/Submarine.cs

@@ -0,0 +1,18 @@
+using Barotrauma.Networking;
+using Lidgren.Network;
+
+namespace Barotrauma
+{
+    partial class Submarine
+    {
+        public void ServerWrite(NetBuffer msg, Client c, object[] extraData = null)
+        {
+            msg.Write(ID);
+            NetBuffer tempBuffer = new NetBuffer();
+            subBody.Body.ServerWrite(tempBuffer, c, extraData);
+            msg.Write((byte)tempBuffer.LengthBytes);
+            msg.Write(tempBuffer);
+            msg.WritePadBits();
+        }
+    }
+}