Unstable 1.8.4.0

Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/AbilityConditionals/AbilityCondition.cs

@@ -69,21 +69,20 @@ namespace Barotrauma.Abilities
             switch (targetType)
             {
                 case TargetType.Enemy:
-                    return !HumanAIController.IsFriendly(character, targetCharacter);
+                    return !HumanAIController.IsFriendly(character, targetCharacter, onlySameTeam: false);
                 case TargetType.Ally:
-                    return HumanAIController.IsFriendly(character, targetCharacter);
+                    return HumanAIController.IsFriendly(character, targetCharacter, onlySameTeam: true);
                 case TargetType.NotSelf:
                     return targetCharacter != character;
                 case TargetType.Alive:
                     return !targetCharacter.IsDead;
                 case TargetType.Monster:
-                    return !targetCharacter.IsHuman;
+                    return !targetCharacter.IsHuman && !targetCharacter.IsPet;
                 case TargetType.InFriendlySubmarine:
                     return targetCharacter.Submarine != null && targetCharacter.Submarine.TeamID == character.TeamID;
                 default:
                     return true;
             }
         }
-
     }
 }

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

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 
@@ -7,31 +6,13 @@ namespace Barotrauma.Abilities
 {
     class AbilityConditionMission : AbilityConditionData
     {
-        private readonly ImmutableHashSet<MissionType> missionType;
+        private readonly ImmutableHashSet<Identifier> missionType;
         private readonly bool isAffiliated;
 
         public AbilityConditionMission(CharacterTalent characterTalent, ContentXElement conditionElement) : base(characterTalent, conditionElement)
         {
-            string[] missionTypeStrings = conditionElement.GetAttributeStringArray("missiontype", new []{ "None" })!;
-            HashSet<MissionType> missionTypes = new HashSet<MissionType>();
+            missionType = conditionElement.GetAttributeIdentifierImmutableHashSet("missiontype", ImmutableHashSet<Identifier>.Empty)!;
             isAffiliated = conditionElement.GetAttributeBool("isaffiliated", false);
-
-            foreach (string missionTypeString in missionTypeStrings)
-            {
-                if (!Enum.TryParse(missionTypeString, out MissionType parsedMission) || parsedMission is MissionType.None)
-                {
-                    if (!isAffiliated)
-                    {
-                        DebugConsole.ThrowError($"Error in AbilityConditionMission \"{characterTalent.DebugIdentifier}\" - \"{missionTypeString}\" is not a valid mission type.",
-                            contentPackage: conditionElement.ContentPackage);
-                    }
-                    continue;
-                }
-
-                missionTypes.Add(parsedMission);
-            }
-
-            missionType = missionTypes.ToImmutableHashSet();
         }
 
         protected override bool MatchesConditionSpecific(AbilityObject abilityObject)

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

@@ -8,7 +8,7 @@ namespace Barotrauma.Abilities
 
         protected override bool MatchesConditionSpecific()
         {
-            foreach (Character c in GameSession.GetSessionCrewCharacters(CharacterType.Both))
+            foreach (Character c in Character.GetFriendlyCrew(character))
             {
                 if (!c.IsDead && c.IsUnconscious)
                 {

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

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Xml.Linq;
 
 namespace Barotrauma.Abilities
 {
@@ -14,8 +13,8 @@ namespace Barotrauma.Abilities
 
         protected override bool MatchesConditionSpecific()
         {
-            IEnumerable<Character> crewmembers = Character.GetFriendlyCrew(character);
-            int differentCrewAmount = crewmembers.Select(c => c.Info?.Job?.Prefab.Identifier).Distinct().Count();
+            IEnumerable<Character> crewMembers = Character.GetFriendlyCrew(character);
+            int differentCrewAmount = crewMembers.Select(c => c.Info.Job?.Prefab.Identifier).Distinct().Count();
             return differentCrewAmount >= amount;
         }
     }

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

@@ -1,18 +1,13 @@
-using Barotrauma.Items.Components;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-
-namespace Barotrauma.Abilities
+namespace Barotrauma.Abilities
 {
     class AbilityConditionHasSkill : AbilityConditionDataless
     {
-        private readonly string skillIdentifier;
+        private readonly Identifier skillIdentifier;
         private readonly float minValue;
 
         public AbilityConditionHasSkill(CharacterTalent characterTalent, ContentXElement conditionElement) : base(characterTalent, conditionElement)
         {
-            skillIdentifier = conditionElement.GetAttributeString("skillidentifier", string.Empty);
+            skillIdentifier = conditionElement.GetAttributeIdentifier("skillidentifier", Identifier.Empty);
             minValue = conditionElement.GetAttributeFloat("minvalue", 0f);
         }
 

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

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
+using System.Linq;
 
 namespace Barotrauma.Abilities
 {
@@ -14,7 +12,7 @@ namespace Barotrauma.Abilities
 
         protected override bool MatchesConditionSpecific()
         {
-            return Character.GetFriendlyCrew(character).Where(c => c.Info != null && (c.Info.GetCurrentLevel() - character.Info.GetCurrentLevel() >= levelsBehind)).Any();
+            return Character.GetFriendlyCrew(character).Any(c => c.Info.GetCurrentLevel() - character.Info.GetCurrentLevel() >= levelsBehind);
         }
     }
 }

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

@@ -9,7 +9,7 @@ namespace Barotrauma.Abilities
         protected override bool MatchesCharacter(Character character)
         {
             int ownLevel = character.Info.GetCurrentLevel();
-            foreach (Character otherCharacter in GameSession.GetSessionCrewCharacters(CharacterType.Both))
+            foreach (Character otherCharacter in Character.GetFriendlyCrew(character))
             {
                 if (otherCharacter == character) { continue; }
                 if (otherCharacter.Info.GetCurrentLevel() < ownLevel) { return false; }

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

@@ -13,13 +13,15 @@
         {
             if (GameMain.GameSession == null) { return false; }
 
-            foreach (Character character in GameMain.GameSession.Casualties)
+            foreach (Character deadCharacter in GameMain.GameSession.Casualties)
             {
-                if (assistantsDontCount && character.Info?.Job?.Prefab.Identifier == "assistant")
+                if (deadCharacter.TeamID != character.TeamID) { continue; }
+
+                if (assistantsDontCount && deadCharacter.Info?.Job?.Prefab.Identifier == "assistant")
                 {
                     continue;
                 }
-                if (character.CauseOfDeath != null && character.CauseOfDeath.Type != CauseOfDeathType.Disconnected)
+                if (deadCharacter.CauseOfDeath != null && deadCharacter.CauseOfDeath.Type != CauseOfDeathType.Disconnected)
                 {
                     return false;
                 }

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

@@ -14,7 +14,8 @@
             float waterVolume = 0.0f, totalVolume = 0.0f;
             foreach (Hull hull in Hull.HullList)
             {
-                if (hull.Submarine != character.Submarine) { continue; }
+                if (hull.Submarine is not { } hullSubmarine) { continue; }
+                if (hullSubmarine != character.Submarine || hullSubmarine.TeamID != character.TeamID) { continue; }
                 waterVolume += hull.WaterVolume;
                 totalVolume += hull.Volume;
             }