Unstable v0.19.3.0

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/CheckAfflictionAction.cs

@@ -1,8 +1,6 @@
 #nullable enable
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Xml.Linq;
 
 namespace Barotrauma
 {
@@ -20,6 +18,9 @@ namespace Barotrauma
         [Serialize(true, IsPropertySaveable.Yes, "When set to false when TargetLimb is not specified prevent checking limb-specific afflictions")]
         public bool AllowLimbAfflictions { get; set; }
 
+        [Serialize(0.0f, IsPropertySaveable.Yes, "Minimum strength of the affliction")]
+        public float MinStrength { get; set; }
+
         public CheckAfflictionAction(ScriptedEvent parentEvent, ContentXElement element) : base(parentEvent, element) { }
 
         protected override bool? DetermineSuccess()
@@ -32,14 +33,15 @@ namespace Barotrauma
                 if (target.CharacterHealth == null) { continue; }
                 if (TargetLimb == LimbType.None)
                 {
-                    if (target.CharacterHealth.GetAffliction(Identifier, AllowLimbAfflictions) != null) { return true; }
+                    var affliction = target.CharacterHealth.GetAffliction(Identifier, AllowLimbAfflictions);
+                    if (affliction != null && affliction.Strength >= MinStrength) { return true; }
                 }
                 IEnumerable<Affliction> afflictions = target.CharacterHealth.GetAllAfflictions().Where(affliction =>
                 {
                     LimbType? limbType = target.CharacterHealth.GetAfflictionLimb(affliction)?.type;
                     if (limbType == null) { return false; }
 
-                    return limbType == TargetLimb || true;
+                    return limbType == TargetLimb && affliction.Strength >= MinStrength;
                 });
 
                 if (afflictions.Any(a => a.Identifier == Identifier)) { return true; }