Unstable 0.15.13.0

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

@@ -14,8 +14,9 @@ namespace Barotrauma.Abilities
 
         protected override bool MatchesConditionSpecific(AbilityObject abilityObject)
         {
-            if ((abilityObject as IAbilityCharacter)?.Character is Character character)
+            if (abilityObject is IAbilityCharacter abilityCharacter)
             {
+                if (!(abilityCharacter.Character is Character character)) { return false; }
                 if (!IsViableTarget(targetTypes, character)) { return false; }
 
                 return true;

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

@@ -0,0 +1,23 @@
+using System.Xml.Linq;
+
+namespace Barotrauma.Abilities
+{
+    class AbilityConditionGeneHarvester : AbilityConditionData
+    {
+
+        public AbilityConditionGeneHarvester(CharacterTalent characterTalent, XElement conditionElement) : base(characterTalent, conditionElement) { }
+
+        protected override bool MatchesConditionSpecific(AbilityObject abilityObject)
+        {
+            if (abilityObject is AbilityCharacterKill abilityCharacterKill)
+            {
+                return abilityCharacterKill.Killer.Submarine == null || abilityCharacterKill.Killer.TeamID != abilityCharacterKill.Killer.Submarine.TeamID;
+            }
+            else
+            {
+                LogAbilityConditionError(abilityObject, typeof(AbilityCharacterKill));
+                return false;
+            }
+        }
+    }
+}

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

@@ -136,6 +136,7 @@ namespace Barotrauma.Abilities
         public float DamageMultiplier { get; set; } = 1f;
         public float AddedPenetration { get; set; } = 0f;
         public List<Affliction> Afflictions { get; set; }
+        public bool ShouldImplode { get; set; } = false;
         public Attack SourceAttack { get; }
         public Character Character { get; set; }
         public Character Attacker { get; set; }

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

@@ -37,12 +37,7 @@ namespace Barotrauma.Abilities
                 attackData.DamageMultiplier += addedDamageMultiplier;
                 attackData.AddedPenetration += addedPenetration;
 
-                if (implode)
-                {
-                    // might have issues, as the method used to be private and only used for pressure death
-                    attackData.Character?.Implode();
-                }
-
+                attackData.ShouldImplode = implode;
             }
             else
             {

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

@@ -19,11 +19,10 @@ namespace Barotrauma.Abilities
             moneyPerMission = abilityElement.GetAttributeInt("moneypermission", 0);
         }
 
-        protected override void ApplyEffect()
+        protected override void ApplyEffect(AbilityObject abilityObject)
         {
             if (Character?.Info is CharacterInfo info)
             {
-
                 Character.GiveMoney(moneyPerMission * info.MissionsCompletedSinceDeath);
             }
         }