Faction Test 100.5.0.0

2022-11-18 18:32:04 +02:00
parent c772b61fc1
commit c44fb0ad3a
118 changed files with 1424 additions and 707 deletions
@@ -1618,11 +1618,7 @@ namespace Barotrauma

        public void ApplyStatusEffect(StatusEffect effect, ActionType type, float deltaTime, Character character = null, Limb limb = null, Entity useTarget = null, bool isNetworkEvent = false, bool checkCondition = true, Vector2? worldPosition = null)
        {
-            if (effect.intervalTimer > 0.0f)
-            {
-                effect.intervalTimer -= deltaTime;
-                return;
-            }
+            if (effect.ShouldWaitForInterval(this, deltaTime)) { return; }
            if (!isNetworkEvent && checkCondition)
            {
                if (condition == 0.0f && !effect.AllowWhenBroken && effect.type != ActionType.OnBroken) { return; }
@@ -2769,7 +2765,6 @@ namespace Barotrauma
                return;
            }
 #endif
-
            bool remove = false;
            foreach (ItemComponent ic in components)
            {
@@ -2799,7 +2794,6 @@ namespace Barotrauma
            {
                var abilityItem = new AbilityApplyTreatment(user, character, this);
                user.CheckTalents(AbilityEffectType.OnApplyTreatment, abilityItem);
-
            }

            if (remove) { Spawner?.AddItemToRemoveQueue(this); }