v0.10.6.2

2020-10-29 17:55:26 +02:00
parent 20a69375ca
commit bbf06f0984
255 changed files with 6196 additions and 3096 deletions
@@ -8,14 +8,7 @@ namespace Barotrauma
    partial class ConditionalSprite
    {
        public readonly List<PropertyConditional> conditionals = new List<PropertyConditional>();
-        public bool IsActive
-        {
-            get
-            {
-                if (Target == null) { return false; }
-                return Comparison == PropertyConditional.Comparison.And ? conditionals.All(c => c.Matches(Target)) : conditionals.Any(c => c.Matches(Target));
-            }
-        }
+        public bool IsActive { get; private set; } = true;

        public readonly PropertyConditional.Comparison Comparison;
        public readonly bool Exclusive;
@@ -55,5 +48,17 @@ namespace Barotrauma
                }
            }
        }
+
+        public void CheckConditionals()
+        {
+            if (Target == null)
+            {
+                IsActive = false;
+            }
+            else
+            {
+                IsActive = Comparison == PropertyConditional.Comparison.And ? conditionals.All(c => c.Matches(Target)) : conditionals.Any(c => c.Matches(Target));
+            }
+        }
    }
 }