Unstable 0.16.0.0

2022-01-14 01:28:24 +09:00
parent d9baeaa2e1
commit 7d6421a548
237 changed files with 6430 additions and 2205 deletions
@@ -17,6 +17,12 @@ namespace Barotrauma.Items.Components
            }
        }

+        [Editable, Serialize("", false)]
+        public string Separator
+        {
+            get;
+            set;
+        }

        public ConcatComponent(Item item, XElement element)
            : base(item, element)
@@ -25,7 +31,15 @@ namespace Barotrauma.Items.Components

        protected override string Calculate(string signal1, string signal2)
        {
-            string output = signal1 + signal2;
+            string output;
+            if (string.IsNullOrEmpty(Separator))
+            {
+                output = signal1 + signal2;
+            }
+            else
+            {
+                output = signal1 + Separator + signal2;
+            }
            return output.Length <= maxOutputLength ? output : output.Substring(0, MaxOutputLength);
        }
    }