v0.11.0.9

2020-12-09 16:34:16 +02:00
parent bbf06f0984
commit f433a7ba10
325 changed files with 13947 additions and 3652 deletions
@@ -0,0 +1,81 @@
+using Barotrauma.Items.Components;
+using Barotrauma.Networking;
+using System;
+using System.Xml.Linq;
+
+namespace Barotrauma.MapCreatures.Behavior
+{
+    partial class BallastFloraBehavior
+    {
+        partial void LoadPrefab(XElement element)
+        {
+            foreach (XElement subElement in element.Elements())
+            {
+                switch (subElement.Name.ToString().ToLowerInvariant())
+                {
+                    case "branchsprite":
+                    case "hiddenflowersprite":
+                        break;
+                    case "flowersprite":
+                        flowerVariants++;
+                        break;
+                    case "leafsprite":
+                        leafVariants++;
+                        break;
+                    case "targets":
+                        LoadTargets(subElement);
+                        break;
+                }
+            }
+        }
+
+        
+        public void ServerWriteSpawn(IWriteMessage msg)
+        {
+            msg.Write(Prefab.Identifier);
+            msg.Write(Offset.X);
+            msg.Write(Offset.Y);
+        }
+        
+        public void ServerWriteBranchGrowth(IWriteMessage msg, BallastFloraBranch branch, int parentId = -1)
+        {
+            var (x, y) = branch.Position;
+            msg.Write(parentId);
+            msg.Write((int)branch.ID);
+            msg.WriteRangedInteger((byte) branch.Type, 0b0000, 0b1111);
+            msg.WriteRangedInteger((byte) branch.Sides, 0b0000, 0b1111);
+            msg.WriteRangedInteger(branch.FlowerConfig.Serialize(), 0, 0xFFF);
+            msg.WriteRangedInteger(branch.LeafConfig.Serialize(), 0, 0xFFF);
+            msg.Write((ushort) branch.MaxHealth);
+            msg.Write((int) (x / VineTile.Size));
+            msg.Write((int) (y / VineTile.Size));
+        }
+        
+        public void ServerWriteBranchDamage(IWriteMessage msg, BallastFloraBranch branch, float damage)
+        {
+            msg.Write((int)branch.ID);
+            msg.Write(damage);
+            msg.Write(branch.Health);
+        }
+        
+        public void ServerWriteInfect(IWriteMessage msg, UInt16 itemID, bool infect, BallastFloraBranch infector = null)
+        {
+            msg.Write(itemID);
+            msg.Write(infect);
+            if (infect)
+            {
+                msg.Write(infector?.ID ?? -1);
+            }
+        }
+
+        public void ServerWriteBranchRemove(IWriteMessage msg, BallastFloraBranch branch)
+        {
+            msg.Write(branch.ID);
+        }
+
+        public void SendNetworkMessage(params object[] extraData)
+        {
+            GameMain.Server.CreateEntityEvent(Parent, extraData);
+        }
+    }
+}
@@ -4,6 +4,7 @@ using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Barotrauma.MapCreatures.Behavior;

 namespace Barotrauma
 {
@@ -70,6 +71,39 @@ namespace Barotrauma

        public void ServerWrite(IWriteMessage message, Client c, object[] extraData = null)
        {
+            if (extraData != null && extraData.Length >= 2 && extraData[0] is BallastFloraBehavior behavior && extraData[1] is BallastFloraBehavior.NetworkHeader header)
+            {
+                message.Write(true);
+                message.Write((byte)header);
+
+                switch (header)
+                {
+                    case BallastFloraBehavior.NetworkHeader.Spawn:
+                        behavior.ServerWriteSpawn(message);
+                        break;
+                    case BallastFloraBehavior.NetworkHeader.Kill:
+                        break;
+                    case BallastFloraBehavior.NetworkHeader.BranchCreate when extraData.Length >= 4 && extraData[2] is BallastFloraBranch branch && extraData[3] is int parentId:
+                        behavior.ServerWriteBranchGrowth(message, branch, parentId);
+                        break;
+                    case BallastFloraBehavior.NetworkHeader.BranchDamage when extraData.Length >= 4 && extraData[2] is BallastFloraBranch branch && extraData[3] is float damage:
+                        behavior.ServerWriteBranchDamage(message, branch, damage);
+                        break;
+                    case BallastFloraBehavior.NetworkHeader.BranchRemove when extraData.Length >= 3 && extraData[2] is BallastFloraBranch branch:
+                        behavior.ServerWriteBranchRemove(message, branch);
+                        break;
+                    case BallastFloraBehavior.NetworkHeader.Infect when extraData.Length >= 4 && extraData[2] is UInt16 itemID && extraData[3] is bool infect:
+                        BallastFloraBranch infector = null;
+                        if (extraData.Length >= 5 && extraData[4] is BallastFloraBranch b) { infector = b; }  
+                        behavior.ServerWriteInfect(message, itemID, infect, infector);
+                        break;
+                }
+
+                message.Write(behavior.PowerConsumptionTimer);
+                return;
+            }
+
+            message.Write(false);
            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);