Unstable 1.2.4.0

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

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Xml.Linq;
 
 namespace Barotrauma.Abilities
 {
@@ -11,6 +10,12 @@ namespace Barotrauma.Abilities
 
         private readonly List<PropertyConditional> conditionals = new List<PropertyConditional>();
 
+        /// <summary>
+        /// If enabled, the conditional is checked on the target of the ability (e.g. the character that was killed if the effect type is OnKillCharacter).
+        /// Defaults to true, except in the case of <see cref="AbilityConditionHasPermanentStat"/>, which by default targets the character who has the talent.
+        /// </summary>
+        private readonly bool targetAbilityTarget = false;
+
         public AbilityConditionCharacter(CharacterTalent characterTalent, ContentXElement conditionElement) : base(characterTalent, conditionElement)
         {
             targetTypes = ParseTargetTypes(
@@ -25,30 +30,47 @@ namespace Barotrauma.Abilities
                 }
             }
 
-            if (!targetTypes.Any() && !conditionals.Any())
+            //don't log this error if this is a subclass of AbilityConditionCharacter
+            //(in that case not having any conditionals here is ok)
+            if (!targetTypes.Any() && !conditionals.Any() && GetType() == typeof(AbilityConditionCharacter))
             {
                 DebugConsole.ThrowError($"Error in talent \"{characterTalent}\". No target types or conditionals defined - the condition will match any character.",
                     contentPackage: conditionElement.ContentPackage);
             }
+
+            targetAbilityTarget = conditionElement.GetAttributeBool(nameof(targetAbilityTarget), this is not AbilityConditionHasPermanentStat);
         }
 
-        protected override bool MatchesConditionSpecific(AbilityObject abilityObject)
+        public sealed override bool MatchesCondition()
         {
-            if (abilityObject is IAbilityCharacter abilityCharacter)
+            //by default data-reliant conditions don't accept null, but in this case it's ok,
+            //because we can assume it's the character who has the talent
+            return MatchesCondition(abilityObject: null);
+        }
+
+        public sealed override bool MatchesCondition(AbilityObject abilityObject)
+        {
+            return invert ? !MatchesConditionSpecific(abilityObject) : MatchesConditionSpecific(abilityObject);
+        }
+
+        protected sealed override bool MatchesConditionSpecific(AbilityObject abilityObject)
+        {
+            Character targetCharacter =
+                targetAbilityTarget ?
+                (abilityObject as IAbilityCharacter)?.Character ?? character :
+                character;
+            if (targetCharacter is null) { return false; }
+            if (!IsViableTarget(targetTypes, targetCharacter)) { return false; }
+            foreach (var conditional in conditionals)
             {
-                if (abilityCharacter.Character is not Character character) { return false; }
-                if (!IsViableTarget(targetTypes, character)) { return false; }
-                foreach (var conditional in conditionals)
-                {
-                    if (!conditional.Matches(character)) { return false; }
-                }
-                return true;
-            }
-            else
-            {
-                LogAbilityConditionError(abilityObject, typeof(IAbilityCharacter));
-                return false;
+                if (!conditional.Matches(targetCharacter)) { return false; }
             }
+            return MatchesCharacter(targetCharacter);
+        }
+
+        protected virtual bool MatchesCharacter(Character character)
+        {
+            return true;
         }
     }
 }

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

@@ -1,6 +1,6 @@
 namespace Barotrauma.Abilities
 {
-    internal sealed class AbilityConditionCharacterNotLooted : AbilityConditionData
+    internal sealed class AbilityConditionCharacterNotLooted : AbilityConditionCharacter
     {
         private readonly Identifier identifier;
 
@@ -9,11 +9,9 @@ namespace Barotrauma.Abilities
             identifier = conditionElement.GetAttributeIdentifier("identifier", Identifier.Empty);
         }
 
-        protected override bool MatchesConditionSpecific(AbilityObject abilityObject)
+        protected override bool MatchesCharacter(Character character)
         {
-            if (abilityObject is not IAbilityCharacter ability) { return false; }
-
-            return !ability.Character.MarkedAsLooted.Contains(identifier);
+            return character != null &&!character.MarkedAsLooted.Contains(identifier);
         }
     }
 }

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

@@ -2,15 +2,13 @@
 
 namespace Barotrauma.Abilities
 {
-    internal sealed class AbilityConditionCharacterUnconcious : AbilityConditionData
+    internal sealed class AbilityConditionCharacterUnconcious : AbilityConditionCharacter
     {
         public AbilityConditionCharacterUnconcious(CharacterTalent characterTalent, ContentXElement conditionElement) : base(characterTalent, conditionElement) { }
 
-        protected override bool MatchesConditionSpecific(AbilityObject abilityObject)
+        protected override bool MatchesCharacter(Character character)
         {
-            if (abilityObject is not IAbilityCharacter targetCharacter) { return false; }
-
-            return targetCharacter.Character.IsUnconscious;
+            return character is { IsUnconscious: true };
         }
     }
 }

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

@@ -0,0 +1,19 @@
+using Barotrauma.Items.Components;
+
+namespace Barotrauma.Abilities
+{
+    class AbilityConditionItemIsStatic : AbilityConditionData
+    {
+        public AbilityConditionItemIsStatic(CharacterTalent characterTalent, ContentXElement conditionElement) : base(characterTalent, conditionElement) { }
+
+        protected override bool MatchesConditionSpecific(AbilityObject abilityObject)
+        {
+            if (abilityObject is IAbilityItem { Item: var item })
+            {
+                return item.GetComponent<Holdable>() is null && item.GetComponent<Wearable>() is null;
+            }
+
+            return false;
+        }
+    }
+}

Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/AbilityConditionals/AbilityConditionDataless/AbilityConditionHasPermanentStat.cs

@@ -1,6 +1,8 @@
-namespace Barotrauma.Abilities
+using System;
+
+namespace Barotrauma.Abilities
 {
-    class AbilityConditionHasPermanentStat : AbilityConditionDataless
+    class AbilityConditionHasPermanentStat : AbilityConditionCharacter
     {
         private readonly Identifier statIdentifier;
         private readonly StatTypes statType;
@@ -21,8 +23,13 @@
             placeholder = conditionElement.GetAttributeEnum("placeholder", PermanentStatPlaceholder.None);
         }
 
-        protected override bool MatchesConditionSpecific()
+        protected override bool MatchesCharacter(Character character)
         {
+            if (character?.Info == null)
+            {
+                DebugConsole.AddWarning($"Error in {nameof(AbilityConditionHasPermanentStat.MatchesCharacter)}: character {character} has no CharacterInfo. Are you trying to use the condition on a non-player character?\n{Environment.StackTrace.CleanupStackTrace()}");
+                return false;
+            }
             Identifier identifier = CharacterAbilityGivePermanentStat.HandlePlaceholders(placeholder, statIdentifier);
             return character.Info.GetSavedStatValue(statType, identifier) >= min;
         }

Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/AbilityConditionals/AbilityConditionDataless/AbilityConditionLowestLevel.cs

@@ -2,21 +2,18 @@
 
 namespace Barotrauma.Abilities
 {
-    internal sealed class AbilityConditionLowestLevel : AbilityConditionDataless
+    internal sealed class AbilityConditionLowestLevel : AbilityConditionCharacter
     {
         public AbilityConditionLowestLevel(CharacterTalent characterTalent, ContentXElement conditionElement) : base(characterTalent, conditionElement) { }
 
-        protected override bool MatchesConditionSpecific()
+        protected override bool MatchesCharacter(Character character)
         {
             int ownLevel = character.Info.GetCurrentLevel();
-
-            foreach (Character crew in GameSession.GetSessionCrewCharacters(CharacterType.Both))
+            foreach (Character otherCharacter in GameSession.GetSessionCrewCharacters(CharacterType.Both))
             {
-                if (crew == character) { continue; }
-
-                if (crew.Info.GetCurrentLevel() < ownLevel) { return false; }
+                if (otherCharacter == character) { continue; }
+                if (otherCharacter.Info.GetCurrentLevel() < ownLevel) { return false; }
             }
-
             return true;
         }
     }