Unstable 0.16.3.0

Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/AbilityConditionals/AbilityConditionData/AbilityConditionCharacter.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Xml.Linq;
 
 namespace Barotrauma.Abilities
@@ -7,9 +8,26 @@ namespace Barotrauma.Abilities
     {
         private readonly List<TargetType> targetTypes;
 
+        private List<PropertyConditional> conditionals = new List<PropertyConditional>();
+
         public AbilityConditionCharacter(CharacterTalent characterTalent, XElement conditionElement) : base(characterTalent, conditionElement)
         {
             targetTypes = ParseTargetTypes(conditionElement.GetAttributeStringArray("targettypes", new string[0], convertToLowerInvariant: true));
+
+            foreach (XElement subElement in conditionElement.Elements())
+            {
+                if (subElement.Name.ToString().Equals("conditional", StringComparison.OrdinalIgnoreCase))
+                {
+                    foreach (XAttribute attribute in subElement.Attributes())
+                    {
+                        if (PropertyConditional.IsValid(attribute))
+                        {
+                            conditionals.Add(new PropertyConditional(attribute));
+                        }
+                    }
+                    break;
+                }
+            }
         }
 
         protected override bool MatchesConditionSpecific(AbilityObject abilityObject)
@@ -18,7 +36,10 @@ namespace Barotrauma.Abilities
             {
                 if (!(abilityCharacter.Character is Character character)) { return false; }
                 if (!IsViableTarget(targetTypes, character)) { return false; }
-
+                foreach (var conditional in conditionals)
+                {
+                    if (!conditional.Matches(character)) { return false; }
+                }
                 return true;
             }
             else