Unstable v0.19.3.0

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

@@ -1,6 +1,4 @@
-using System.Xml.Linq;
-
-namespace Barotrauma.Abilities
+namespace Barotrauma.Abilities
 {
     class AbilityConditionAboveVitality : AbilityConditionDataless
     {
@@ -13,7 +11,7 @@ namespace Barotrauma.Abilities
 
         protected override bool MatchesConditionSpecific()
         {
-            return character.HealthPercentage / 100f > vitalityPercentage;
+            return character.Vitality / character.MaxVitality > vitalityPercentage;
         }
     }
 }

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

@@ -1,11 +1,10 @@
 using System.Linq;
-using System.Xml.Linq;
 
 namespace Barotrauma.Abilities
 {
     class AbilityConditionAlliesAboveVitality : AbilityConditionDataless
     {
-        float vitalityPercentage;
+        readonly float vitalityPercentage;
 
         public AbilityConditionAlliesAboveVitality(CharacterTalent characterTalent, ContentXElement conditionElement) : base(characterTalent, conditionElement)
         {

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

@@ -1,7 +1,4 @@
-using System.Linq;
-using System.Xml.Linq;
-
-namespace Barotrauma.Abilities
+namespace Barotrauma.Abilities
 {
     class AbilityConditionCoauthor : AbilityConditionDataless
     {

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

@@ -1,7 +1,4 @@
-using System.Linq;
-using System.Xml.Linq;
-
-namespace Barotrauma.Abilities
+namespace Barotrauma.Abilities
 {
     class AbilityConditionCrouched : AbilityConditionDataless
     {

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

@@ -1,28 +1,22 @@
-using System.Linq;
-using System.Xml.Linq;
-
-namespace Barotrauma.Abilities
+namespace Barotrauma.Abilities
 {
     class AbilityConditionHasAffliction : AbilityConditionDataless
     {
-        private string afflictionIdentifier;
-        private float minimumPercentage;
-
+        private readonly Identifier afflictionIdentifier;
+        private readonly float minimumPercentage;
 
         public AbilityConditionHasAffliction(CharacterTalent characterTalent, ContentXElement conditionElement) : base(characterTalent, conditionElement)
         {
-            afflictionIdentifier = conditionElement.GetAttributeString("afflictionidentifier", "");
+            afflictionIdentifier = conditionElement.GetAttributeIdentifier("afflictionidentifier", Identifier.Empty);
             minimumPercentage = conditionElement.GetAttributeFloat("minimumpercentage", 0f);
         }
 
         protected override bool MatchesConditionSpecific()
         {
-            if (!string.IsNullOrEmpty(afflictionIdentifier))
+            if (!afflictionIdentifier.IsEmpty)
             {
                 var affliction = character.CharacterHealth.GetAffliction(afflictionIdentifier);
-
                 if (affliction == null) { return false; }
-
                 return minimumPercentage <= affliction.Strength / affliction.Prefab.MaxStrength;
             }
             return false;

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

@@ -3,55 +3,43 @@ using Barotrauma.Items.Components;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
+using Barotrauma.Extensions;
 
 namespace Barotrauma.Abilities
 {
     class AbilityConditionHasItem : AbilityConditionDataless
     {
-        // not used for anything atm, will be used for clown subclass
         private readonly string[] tags;
-        private InvSlotType? invSlotType;
-        bool requireAll;
-
-        private List<Item> items = new List<Item>();
+        readonly bool requireAll;
 
         public AbilityConditionHasItem(CharacterTalent characterTalent, ContentXElement conditionElement) : base(characterTalent, conditionElement)
         {
-            tags = conditionElement.GetAttributeStringArray("tags", Array.Empty<string>(), convertToLowerInvariant: true);
+            tags = conditionElement.GetAttributeStringArray("tags", Array.Empty<string>());
             requireAll = conditionElement.GetAttributeBool("requireall", false);
-            //this.invSlotType = invSlotType;
         }
 
         protected override bool MatchesConditionSpecific()
         {
-            items.Clear();
-            if (tags.Any())
+            if (tags.None())
             {
-                foreach (string tag in tags)
-                {
-                    // there is a better method, should use that instead
-                    if (character.GetEquippedItem(tag, invSlotType) is Item foundItem)
-                    {
-                        items.Add(foundItem);
-                    }
-                }
-
-            }
-            else
-            {
-                if (character.GetEquippedItem(null, invSlotType) is Item foundItem)
-                {
-                    items.Add(foundItem);
-                }
+                return character.GetEquippedItem(null) is Item;
             }
 
             if (requireAll)
             {
-                return (items.Count >= tags.Count());
+                foreach (string tag in tags)
+                {
+                    if (character.GetEquippedItem(tag) == null) { return false; }
+                }
+                return true;
             }
             else
             {
-                return items.Any();
+                foreach (string tag in tags)
+                {
+                    if (character.GetEquippedItem(tag) != null) { return true; }
+                }
+                return false;
             }
         }
     }

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

@@ -1,7 +1,4 @@
-using System.Linq;
-using System.Xml.Linq;
-
-namespace Barotrauma.Abilities
+namespace Barotrauma.Abilities
 {
     class AbilityConditionHasVelocity : AbilityConditionDataless
     {

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

@@ -1,7 +1,4 @@
-using System.Linq;
-using System.Xml.Linq;
-
-namespace Barotrauma.Abilities
+namespace Barotrauma.Abilities
 {
     class AbilityConditionShipFlooded : AbilityConditionDataless
     {
@@ -14,8 +11,14 @@ namespace Barotrauma.Abilities
         protected override bool MatchesConditionSpecific()
         {
             if (!character.IsInFriendlySub) { return false; }
-            float currentFloodPercentage = character.Submarine.GetHulls(false).Average(h => h.WaterPercentage);
-            return currentFloodPercentage / 100 > floodPercentage;
+            float waterVolume = 0.0f, totalVolume = 0.0f;
+            foreach (Hull hull in Hull.HullList)
+            {
+                if (hull.Submarine != character.Submarine) { continue; }
+                waterVolume += hull.WaterVolume;
+                totalVolume += hull.Volume;
+            }
+            return (waterVolume / totalVolume) > floodPercentage;
         }
     }
 }