Build 1.1.4.0

2023-03-31 18:40:44 +03:00
parent efba17e0ff
commit 9470edead3
483 changed files with 17487 additions and 8548 deletions
@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.Xml.Linq;
-using System.Linq;
-
-namespace Barotrauma
+namespace Barotrauma
 {
    partial class ConditionalSprite
    {
@@ -144,13 +144,7 @@ namespace Barotrauma
                    default:
                        continue;
                }
-                foreach (XAttribute attribute in subElement.Attributes())
-                {
-                    if (PropertyConditional.IsValid(attribute))
-                    {
-                        conditionalList.Add(new PropertyConditional(attribute));
-                    }
-                }
+                conditionalList.AddRange(PropertyConditional.FromXElement(subElement));
            }
        }

@@ -188,7 +182,6 @@ namespace Barotrauma

        public float GetRotation(ref float rotationState, float randomRotationFactor)
        {
-            RotationSpeed = -Math.Abs(RotationSpeed);
            switch (RotationAnim)
            {
                case AnimationType.Sine: