v0.12.0.2

2021-02-10 17:08:21 +02:00
parent 5c80a59bdd
commit 694cdfee7b
353 changed files with 12897 additions and 5028 deletions
@@ -1,4 +1,5 @@
 #nullable enable
+using System;
 using System.Xml.Linq;

 namespace Barotrauma
@@ -11,6 +12,12 @@ namespace Barotrauma
        [Serialize("", true)]
        public string Condition { get; set; } = null!;

+        [Serialize(false, true, "Forces the comparison to use string instead of attempting to parse it as a boolean or a float first")]
+        public bool ForceString { get; set; }
+
+        [Serialize(false, true, "Performs the comparison against a metadata by identifier instead of a constant value")]
+        public bool CheckAgainstMetadata { get; set; }
+
        protected object? value2;
        protected object? value1;

@@ -41,13 +48,52 @@ namespace Barotrauma
            Operator = PropertyConditional.GetOperatorType(op);
            if (Operator == PropertyConditional.OperatorType.None) { return false; }

-            bool? tryBoolean = TryBoolean(campaignMode, value);
-            if (tryBoolean != null) { return tryBoolean; }
+            if (CheckAgainstMetadata)
+            {
+                object? metadata1 = campaignMode.CampaignMetadata.GetValue(Identifier);
+                object? metadata2 = campaignMode.CampaignMetadata.GetValue(value);

-            bool? tryFloat = TryFloat(campaignMode, value);
-            if (tryFloat != null) { return tryFloat; }
+                if (metadata1 == null || metadata2 == null)
+                {
+                    return Operator switch
+                    {
+                        PropertyConditional.OperatorType.Equals => metadata1 == metadata2,
+                        PropertyConditional.OperatorType.NotEquals => metadata1 != metadata2,
+                        _ => false
+                    };
+                }
+
+                if (!ForceString)
+                {
+                    switch (metadata1)
+                    {
+                        case bool bool1 when metadata2 is bool bool2:
+                            return CompareBool(bool1, bool2) ?? false;
+                        case float float1 when metadata2 is float float2:
+                            return CompareFloat(float1, float2) ?? false;
+                    }
+                }
+
+                if (metadata1 is string string1 && metadata2 is string string2)
+                {
+                    return CompareString(string1, string2) ?? false;
+                }
+
+                return false;
+            }
+
+            if (!ForceString)
+            {
+                bool? tryBoolean = TryBoolean(campaignMode, value);
+                if (tryBoolean != null) { return tryBoolean; }
+
+                bool? tryFloat = TryFloat(campaignMode, value);
+                if (tryFloat != null) { return tryFloat; }
+            }
+
+            bool? tryString = TryString(campaignMode, value);
+            if (tryString != null) { return tryString; }

-            DebugConsole.ThrowError($"{value2} ({Condition}) did not match a boolean or a float.");
            return false;
        }

@@ -55,53 +101,85 @@ namespace Barotrauma
        {
            if (bool.TryParse(value, out bool b))
            {
-                bool target = GetBool(campaignMode);
-                value1 = target;
-                value2 = b;
-                switch (Operator)
-                {
-                    case PropertyConditional.OperatorType.Equals:
-                        return target == b;
-                    case PropertyConditional.OperatorType.NotEquals:
-                        return target != b;
-                    default:
-                        DebugConsole.Log($"Only \"Equals\" and \"Not equals\" operators are allowed for a boolean (was {Operator} for {value}).");
-                        return false;
-                }
+                return CompareBool(GetBool(campaignMode), b);
            }

            DebugConsole.Log($"{value} != bool");
            return null;
        }

+        private bool? CompareBool(bool val1, bool val2)
+        {
+            value1 = val1;
+            value2 = val2;
+            switch (Operator)
+            {
+                case PropertyConditional.OperatorType.Equals:
+                    return val1 == val2;
+                case PropertyConditional.OperatorType.NotEquals:
+                    return val1 != val2;
+                default:
+                    DebugConsole.Log($"Only \"Equals\" and \"Not equals\" operators are allowed for a boolean (was {Operator} for {val2}).");
+                    return false;
+            }
+        }
+
        private bool? TryFloat(CampaignMode campaignMode, string value)
        {
            if (float.TryParse(value, out float f))
            {
-                float target = GetFloat(campaignMode);
-                value1 = target;
-                value2 = f;
-                switch (Operator)
-                {
-                    case PropertyConditional.OperatorType.Equals:
-                        return MathUtils.NearlyEqual(target, f);
-                    case PropertyConditional.OperatorType.GreaterThan:
-                        return target > f;
-                    case PropertyConditional.OperatorType.GreaterThanEquals:
-                        return target >= f;
-                    case PropertyConditional.OperatorType.LessThan:
-                        return target < f;
-                    case PropertyConditional.OperatorType.LessThanEquals:
-                        return target <= f;
-                    case PropertyConditional.OperatorType.NotEquals:
-                        return !MathUtils.NearlyEqual(target, f);
-                }
+                return CompareFloat(GetFloat(campaignMode), f);
            }

            DebugConsole.Log($"{value} != float");
            return null;
        }
-        
+
+        private bool? CompareFloat(float val1, float val2)
+        {
+            value1 = val1;
+            value2 = val2;
+            switch (Operator)
+            {
+                case PropertyConditional.OperatorType.Equals:
+                    return MathUtils.NearlyEqual(val1, val2);
+                case PropertyConditional.OperatorType.GreaterThan:
+                    return val1 > val2;
+                case PropertyConditional.OperatorType.GreaterThanEquals:
+                    return val1 >= val2;
+                case PropertyConditional.OperatorType.LessThan:
+                    return val1 < val2;
+                case PropertyConditional.OperatorType.LessThanEquals:
+                    return val1 <= val2;
+                case PropertyConditional.OperatorType.NotEquals:
+                    return !MathUtils.NearlyEqual(val1, val2);
+            }
+
+            return null;
+        }
+
+        private bool? TryString(CampaignMode campaignMode, string value)
+        {
+            return CompareString(GetString(campaignMode), value);
+        }
+
+        private bool? CompareString(string val1, string val2)
+        {
+            value1 = val1;
+            value2 = val2;
+            bool equals = string.Equals(val1, val2, StringComparison.OrdinalIgnoreCase);
+            switch (Operator)
+            { 
+                case PropertyConditional.OperatorType.Equals:
+                    return equals;
+                case PropertyConditional.OperatorType.NotEquals:
+                    return !equals;
+                default:
+                    DebugConsole.Log($"Only \"Equals\" and \"Not equals\" operators are allowed for a string (was {Operator} for {val2}).");
+                    return null;
+            }
+        }
+
        protected virtual bool GetBool(CampaignMode campaignMode)
        {
            return campaignMode.CampaignMetadata.GetBoolean(Identifier);
@@ -112,6 +190,11 @@ namespace Barotrauma
            return campaignMode.CampaignMetadata.GetFloat(Identifier);
        }

+        private string GetString(CampaignMode campaignMode)
+        {
+            return campaignMode.CampaignMetadata.GetString(Identifier);
+        }
+
        public override string ToDebugString()
        {
            string condition = "?";