Build 0.21.6.0 (1.0 pre-patch)

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

@@ -75,13 +75,14 @@ namespace Barotrauma.Abilities
                         if (wt == WeaponType.Any || !weapontype.HasFlag(wt)) { continue; }
                         switch (wt)
                         {
-                            // it is possible that an item that has both a melee and a projectile component will return true
-                            // even when not used as a melee/ranged weapon respectively
-                            // attackdata should contain data regarding whether the attack is melee or not
                             case WeaponType.Melee:
+                                //if the item has an active projectile component (has been fired), don't consider it a melee weapon
+                                if (item?.GetComponent<Projectile>() is { IsActive: true }) { continue; }
                                 if (item?.GetComponent<MeleeWeapon>() != null) { return true; }
                                 break;
                             case WeaponType.Ranged:
+                                //if the item has a melee weapon component that's being used now, don't consider it a projectile
+                                if (item?.GetComponent<MeleeWeapon>() is { Hitting: true }) { continue; }
                                 if (item?.GetComponent<Projectile>() != null) { return true; }
                                 break;
                             case WeaponType.HandheldRanged:

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

@@ -28,7 +28,6 @@ namespace Barotrauma.Abilities
                             conditionals.Add(new PropertyConditional(attribute));
                         }
                     }
-                    break;
                 }
             }
 

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

@@ -37,19 +37,7 @@ namespace Barotrauma.Abilities
 
             if (itemPrefab != null)
             {
-                if (category != MapEntityCategory.None)
-                {
-                    if (!itemPrefab.Category.HasFlag(category)) { return false; }
-                }
-
-                if (identifiers.Any())
-                {
-                    if (!identifiers.Any(t => itemPrefab.Identifier == t))
-                    {
-                        return false;
-                    }
-                }
-                return !tags.Any() || tags.Any(t => itemPrefab.Tags.Any(p => t == p));
+                return MatchesItem(itemPrefab);
             }
             else
             {
@@ -57,5 +45,22 @@ namespace Barotrauma.Abilities
                 return false;
             }
         }
+
+        public bool MatchesItem(ItemPrefab itemPrefab)
+        {
+            if (category != MapEntityCategory.None)
+            {
+                if (!itemPrefab.Category.HasFlag(category)) { return false; }
+            }
+
+            if (identifiers.Any())
+            {
+                if (!identifiers.Any(t => itemPrefab.Identifier == t))
+                {
+                    return false;
+                }
+            }
+            return !tags.Any() || tags.Any(t => itemPrefab.Tags.Any(p => t == p));
+        }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/CharacterAbilityGiveItemStatToTags.cs

@@ -17,6 +17,14 @@ namespace Barotrauma.Abilities
             tags = abilityElement.GetAttributeIdentifierImmutableHashSet("tags", ImmutableHashSet<Identifier>.Empty);
         }
 
+        public override void InitializeAbility(bool addingFirstTime)
+        {
+            if (addingFirstTime)
+            {
+                VerifyState(conditionsMatched: true, timeSinceLastUpdate: 0.0f);
+            }
+        }
+
         protected override void VerifyState(bool conditionsMatched, float timeSinceLastUpdate)
         {
             if (conditionsMatched)

Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/CharacterAbilityRemoveRandomIngredient.cs

@@ -1,19 +1,35 @@
 #nullable enable
 
+using Barotrauma.Extensions;
 using Barotrauma.Items.Components;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Barotrauma.Abilities
 {
     internal sealed class CharacterAbilityRemoveRandomIngredient : CharacterAbility
     {
-        public CharacterAbilityRemoveRandomIngredient(CharacterAbilityGroup characterAbilityGroup, ContentXElement abilityElement) : base(characterAbilityGroup, abilityElement) { }
+        private readonly AbilityConditionItem? condition;
+
+        public CharacterAbilityRemoveRandomIngredient(CharacterAbilityGroup characterAbilityGroup, ContentXElement abilityElement) : base(characterAbilityGroup, abilityElement) 
+        {
+            var conditionElement = abilityElement.GetChildElement(nameof(AbilityConditionItem));
+            if (conditionElement != null)
+            {
+                condition = new AbilityConditionItem(CharacterTalent, conditionElement);
+            }
+        }
 
         protected override void ApplyEffect(AbilityObject abilityObject)
         {
             if (abilityObject is not Fabricator.AbilityFabricationItemIngredients { Items.Count: > 0 } ingredients) { return; }
 
-            int randomIndex = Rand.Int(ingredients.Items.Count, Rand.RandSync.Unsynced);
-            ingredients.Items.RemoveAt(randomIndex);
+            List<Item> applicableIngredients = condition == null ?
+                ingredients.Items.ToList() :
+                ingredients.Items.Where(it => condition.MatchesItem(it.Prefab)).ToList();
+            if (applicableIngredients.None()) { return; }
+
+            ingredients.Items.Remove(applicableIngredients.GetRandom(Rand.RandSync.Unsynced));
         }
     }
 }