Unstable 0.1400.0.0

Barotrauma/BarotraumaShared/SharedSource/Map/Levels/LevelObjects/LevelTrigger.cs

@@ -140,6 +140,11 @@ namespace Barotrauma
             get;
             private set;
         }
+        public float GlobalForceDecreaseInterval
+        {
+            get;
+            private set;
+        }
 
         private readonly TriggerForceMode forceMode;
         public TriggerForceMode ForceMode
@@ -234,6 +239,7 @@ namespace Barotrauma
             ForceFluctuationInterval = element.GetAttributeFloat("forcefluctuationinterval", 0.01f);
             ForceFluctuationStrength = Math.Max(element.GetAttributeFloat("forcefluctuationstrength", 0.0f), 0.0f);
             ForceFalloff = element.GetAttributeBool("forcefalloff", true);
+            GlobalForceDecreaseInterval = element.GetAttributeFloat("globalforcedecreaseinterval", 0.0f);
 
             ForceVelocityLimit = ConvertUnits.ToSimUnits(element.GetAttributeFloat("forcevelocitylimit", float.MaxValue));
             string forceModeStr = element.GetAttributeString("forcemode", "Force");
@@ -434,6 +440,8 @@ namespace Barotrauma
             }
         }
 
+        private readonly List<ISerializableEntity> targets = new List<ISerializableEntity>();
+
         public void Update(float deltaTime)
         {
             if (ParentTrigger != null && !ParentTrigger.IsTriggered) { return; }
@@ -457,7 +465,13 @@ namespace Barotrauma
 
             if (!UseNetworkSyncing || isNotClient)
             {
-                if (ForceFluctuationStrength > 0.0f)
+                if (GlobalForceDecreaseInterval > 0.0f && Level.Loaded?.LevelObjectManager != null && 
+                    Level.Loaded.LevelObjectManager.GlobalForceDecreaseTimer % (GlobalForceDecreaseInterval * 2) < GlobalForceDecreaseInterval)
+                {
+                    NeedsNetworkSyncing |= currentForceFluctuation > 0.0f;
+                    currentForceFluctuation = 0.0f;                    
+                }
+                else if (ForceFluctuationStrength > 0.0f)
                 {
                     //no need for force fluctuation (or network updates) if the trigger limits velocity and there are no triggerers
                     if (forceMode != TriggerForceMode.LimitVelocity || triggerers.Any())
@@ -533,8 +547,8 @@ namespace Barotrauma
                     if (effect.HasTargetType(StatusEffect.TargetType.NearbyItems) ||
                         effect.HasTargetType(StatusEffect.TargetType.NearbyCharacters))
                     {
-                        var targets = new List<ISerializableEntity>();
-                        effect.GetNearbyTargets(worldPosition, targets);
+                        targets.Clear();
+                        targets.AddRange(effect.GetNearbyTargets(worldPosition, targets));
                         effect.Apply(effect.type, deltaTime, triggerer, targets);
                     }
                 }