Unstable 0.1500.8.0

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

@@ -11,6 +11,7 @@ namespace Barotrauma.Abilities
         protected readonly List<StatusEffect> statusEffects;
 
         private readonly bool nearbyCharactersAppliesToSelf;
+        private readonly bool nearbyCharactersAppliesToAllies;
         private readonly bool applyToSelected;
 
         readonly List<ISerializableEntity> targets = new List<ISerializableEntity>();
@@ -20,6 +21,7 @@ namespace Barotrauma.Abilities
             statusEffects = CharacterAbilityGroup.ParseStatusEffects(CharacterTalent, abilityElement.GetChildElement("statuseffects"));
             applyToSelected = abilityElement.GetAttributeBool("applytoselected", false);
             nearbyCharactersAppliesToSelf = abilityElement.GetAttributeBool("nearbycharactersappliestoself", true);
+            nearbyCharactersAppliesToAllies = abilityElement.GetAttributeBool("nearbycharactersappliestoallies", true);
         }
 
         protected void ApplyEffectSpecific(Character targetCharacter)
@@ -40,6 +42,10 @@ namespace Barotrauma.Abilities
                     {
                         targets.RemoveAll(c => c == Character);
                     }
+                    if (!nearbyCharactersAppliesToAllies)
+                    {
+                        targets.RemoveAll(c => c is Character otherCharacter && HumanAIController.IsFriendly(otherCharacter, Character));
+                    }
                     statusEffect.SetUser(Character);
                     statusEffect.Apply(ActionType.OnAbility, EffectDeltaTime, targetCharacter, targets);
                 }
@@ -56,17 +62,20 @@ namespace Barotrauma.Abilities
             }
         }
         protected override void ApplyEffect()
-        {
-            ApplyEffectSpecific(Character);
-        }
-
-        protected override void ApplyEffect(AbilityObject abilityObject)
         {
             if (applyToSelected && Character.SelectedCharacter is Character selectedCharacter)
             {
                 ApplyEffectSpecific(selectedCharacter);
             }
-            else if ((abilityObject as IAbilityCharacter)?.Character is Character targetCharacter)
+            else
+            {
+                ApplyEffectSpecific(Character);
+            }
+        }
+
+        protected override void ApplyEffect(AbilityObject abilityObject)
+        {
+            if ((abilityObject as IAbilityCharacter)?.Character is Character targetCharacter)
             {
                 ApplyEffectSpecific(targetCharacter);
             }

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

@@ -15,7 +15,7 @@ namespace Barotrauma.Abilities
         private readonly bool setValue;
 
         //private readonly float maximumValue;
-
+        public override bool AllowClientSimulation => true;
         public override bool AppliesEffectOnIntervalUpdate => true;
 
         public CharacterAbilityGivePermanentStat(CharacterAbilityGroup characterAbilityGroup, XElement abilityElement) : base(characterAbilityGroup, abilityElement)

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

@@ -6,6 +6,7 @@ namespace Barotrauma.Abilities
     {
         private readonly string statIdentifier;
         public override bool AppliesEffectOnIntervalUpdate => true;
+        public override bool AllowClientSimulation => true;
 
         public CharacterAbilityResetPermanentStat(CharacterAbilityGroup characterAbilityGroup, XElement abilityElement) : base(characterAbilityGroup, abilityElement)
         {

Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/Abilities/CustomAbilities/CharacterAbilityTandemFire.cs

@@ -31,7 +31,7 @@ namespace Barotrauma.Abilities
                 }
             }
 
-            if (closestCharacter.SelectedConstruction == null || !Character.SelectedConstruction.HasTag(tag)) { return; }
+            if (closestCharacter.SelectedConstruction == null || !closestCharacter.SelectedConstruction.HasTag(tag)) { return; }
 
             if (closestDistance < squaredMaxDistance)
             {

Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/TalentTree.cs

@@ -66,6 +66,11 @@ namespace Barotrauma
             }
         }
 
+        public bool TalentIsInTree(string talentIdentifier)
+        {
+            return TalentSubTrees.SelectMany(s => s.TalentOptionStages.SelectMany(o => o.Talents.Select(t => t.Identifier))).Any(c => c == talentIdentifier);
+        }
+
         public static void LoadFromFile(ContentFile file)
         {
             DebugConsole.Log("Loading talent tree: " + file.Path);