Build 0.20.7.0

2022-11-18 18:13:38 +02:00
parent 8c8fd865c5
commit ecb6d40b4b
111 changed files with 1346 additions and 701 deletions
@@ -95,11 +95,7 @@ namespace Barotrauma
        public override void Apply(ActionType type, float deltaTime, Entity entity, IReadOnlyList<ISerializableEntity> targets, Vector2? worldPosition = null)
        {
            if (this.type != type) { return; }
-            if (intervalTimer > 0.0f)
-            {
-                intervalTimer -= deltaTime;
-                return;
-            }
+            if (ShouldWaitForInterval(entity, deltaTime)) { return; }
            if (!HasRequiredItems(entity)) { return; }
            if (delayType == DelayTypes.ReachCursor && Character.Controlled == null) { return; }
            if (!Stackable) 
@@ -416,22 +416,26 @@ namespace Barotrauma
                return false;
            }

-
            switch (Operator)
            {
                case OperatorType.Equals:
-                    if (type == typeof(bool))
                    {
-                        return property.GetBoolValue(target) == (AttributeValue == "true" || AttributeValue == "True");
+                        if (type == typeof(bool))
+                        {
+                            return property.GetBoolValue(target) == (AttributeValue == "true" || AttributeValue == "True");
+                        }
+                        var value = property.GetValue(target);
+                        return Equals(value, AttributeValue);
                    }
-                    return property.GetValue(target).ToString().Equals(AttributeValue);
-
                case OperatorType.NotEquals:
-                    if (type == typeof(bool))
                    {
-                        return property.GetBoolValue(target) != (AttributeValue == "true" || AttributeValue == "True");
+                        if (type == typeof(bool))
+                        {
+                            return property.GetBoolValue(target) != (AttributeValue == "true" || AttributeValue == "True");
+                        }
+                        var value = property.GetValue(target);
+                        return !Equals(value, AttributeValue);
                    }
-                    return !property.GetValue(target).ToString().Equals(AttributeValue);
                case OperatorType.GreaterThan:
                case OperatorType.LessThanEquals:
                case OperatorType.LessThan:
@@ -441,6 +445,18 @@ namespace Barotrauma
                    break;
            }
            return false;
+
+            static bool Equals(object value, string desiredValue)
+            {
+                if (value == null)
+                {
+                    return desiredValue.Equals("null", StringComparison.OrdinalIgnoreCase);
+                }
+                else
+                {
+                    return value.ToString().Equals(desiredValue);
+                }
+            }
        }
    }

@@ -343,7 +343,7 @@ namespace Barotrauma
        private readonly float lifeTime;
        private float lifeTimer;

-        public float intervalTimer;
+        public Dictionary<Entity, float> intervalTimers = new Dictionary<Entity, float>();

        public static readonly List<DurationListElement> DurationList = new List<DurationListElement>();

@@ -1120,6 +1120,26 @@ namespace Barotrauma
            }
        }

+        private static readonly List<Entity> intervalsToRemove = new List<Entity>();
+        public bool ShouldWaitForInterval(Entity entity, float deltaTime)
+        {
+            if (Interval > 0.0f && entity != null)
+            {
+                if (intervalTimers.ContainsKey(entity))
+                {
+                    intervalTimers[entity] -= deltaTime;
+                    if (intervalTimers[entity] > 0.0f) { return true; }
+                }
+                intervalsToRemove.Clear();
+                intervalsToRemove.AddRange(intervalTimers.Keys.Where(e => e.Removed));
+                foreach (var toRemove in intervalsToRemove)
+                {
+                    intervalTimers.Remove(toRemove);
+                }
+            }
+            return false;
+        }
+
        public virtual void Apply(ActionType type, float deltaTime, Entity entity, ISerializableEntity target, Vector2? worldPosition = null)
        {
            if (this.type != type || !HasRequiredItems(entity)) { return; }
@@ -1147,12 +1167,7 @@ namespace Barotrauma
        public virtual void Apply(ActionType type, float deltaTime, Entity entity, IReadOnlyList<ISerializableEntity> targets, Vector2? worldPosition = null)
        {
            if (this.type != type) { return; }
-
-            if (intervalTimer > 0.0f)
-            {
-                intervalTimer -= deltaTime;
-                return;
-            }
+            if (ShouldWaitForInterval(entity, deltaTime)) { return; }

            currentTargets.Clear();
            foreach (ISerializableEntity target in targets)
@@ -1255,11 +1270,8 @@ namespace Barotrauma
                lifeTimer -= deltaTime;
                if (lifeTimer <= 0) { return; }
            }
-            if (intervalTimer > 0.0f)
-            {
-                intervalTimer -= deltaTime;
-                return;
-            }
+            if (ShouldWaitForInterval(entity, deltaTime)) { return; }
+
            Hull hull = GetHull(entity);
            Vector2 position = GetPosition(entity, targets, worldPosition);
            if (useItemCount > 0)
@@ -1942,7 +1954,10 @@ namespace Barotrauma

            ApplyProjSpecific(deltaTime, entity, targets, hull, position, playSound: true);

-            intervalTimer = Interval;
+            if (Interval > 0.0f && entity != null)
+            {
+                intervalTimers[entity] = Interval;
+            }

            static Character CharacterFromTarget(ISerializableEntity target)
            {