v1.2.7.0 (Winter Update hotfix)

2023-12-20 15:00:42 +02:00
parent 7f295c291e
commit ada8d6f260
35 changed files with 181 additions and 80 deletions
@@ -1,8 +1,7 @@
-using System;
 using Barotrauma.Items.Components;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Xml.Linq;

 namespace Barotrauma.Abilities
 {
@@ -25,11 +24,15 @@ namespace Barotrauma.Abilities
        private readonly Identifier[] tags;
        private readonly WeaponType weapontype;
        private readonly bool ignoreNonHarmfulAttacks;
+
+        private readonly bool ignoreOwnAttacks;
+
        public AbilityConditionAttackData(CharacterTalent characterTalent, ContentXElement conditionElement) : base(characterTalent, conditionElement)
        {
-            itemIdentifier = conditionElement.GetAttributeString("itemidentifier", string.Empty);
-            tags = conditionElement.GetAttributeIdentifierArray("tags", Array.Empty<Identifier>());
-            ignoreNonHarmfulAttacks = conditionElement.GetAttributeBool("ignorenonharmfulattacks", false);
+            itemIdentifier = conditionElement.GetAttributeString(nameof(itemIdentifier), string.Empty);
+            tags = conditionElement.GetAttributeIdentifierArray(nameof(tags), Array.Empty<Identifier>());
+            ignoreNonHarmfulAttacks = conditionElement.GetAttributeBool(nameof(ignoreNonHarmfulAttacks), false);
+            ignoreOwnAttacks = conditionElement.GetAttributeBool(nameof(ignoreOwnAttacks), false);

            string weaponTypeStr = conditionElement.GetAttributeString("weapontype", "Any");
            if (!Enum.TryParse(weaponTypeStr, ignoreCase: true, out weapontype))
@@ -43,6 +46,8 @@ namespace Barotrauma.Abilities
        {
            if (abilityObject is AbilityAttackData attackData)
            {
+                if (ignoreOwnAttacks && attackData.Attacker == character) { return false; }
+
                if (ignoreNonHarmfulAttacks && attackData.SourceAttack != null)
                {
                    if (attackData.SourceAttack.Stun <= 0.0f && (attackData.SourceAttack.Afflictions?.All(a => a.Key.Prefab.IsBuff) ?? true)) 
@@ -0,0 +1,47 @@
+#nullable enable
+
+namespace Barotrauma.Abilities
+{
+    internal sealed class CharacterAbilityReplaceAffliction : CharacterAbility
+    {
+        private readonly Identifier afflictionId;
+        private readonly Identifier newAfflictionId;
+        private readonly float strengthMultiplier;
+
+        public CharacterAbilityReplaceAffliction(CharacterAbilityGroup characterAbilityGroup, ContentXElement abilityElement) : base(characterAbilityGroup, abilityElement)
+        {
+            afflictionId = abilityElement.GetAttributeIdentifier("afflictionid", abilityElement.GetAttributeIdentifier("affliction", Identifier.Empty));
+            newAfflictionId = abilityElement.GetAttributeIdentifier("newafflictionid", abilityElement.GetAttributeIdentifier("newaffliction", Identifier.Empty));
+
+            strengthMultiplier = abilityElement.GetAttributeFloat("strengthmultiplier", 1.0f);
+
+            if (afflictionId.IsEmpty)
+            {
+                DebugConsole.ThrowError($"Error in {nameof(CharacterAbilityReplaceAffliction)} - affliction identifier not set.");
+            }
+        }
+
+        protected override void ApplyEffect()
+        {
+            var affliction = Character.CharacterHealth.GetAffliction(afflictionId);
+            if (affliction != null)
+            {
+                float afflictionStrength = affliction.Strength;
+                Limb limb = Character.CharacterHealth.GetAfflictionLimb(affliction);
+                Character.CharacterHealth.ReduceAfflictionOnAllLimbs(affliction.Identifier, afflictionStrength);
+                if (!newAfflictionId.IsEmpty && AfflictionPrefab.Prefabs.TryGet(newAfflictionId, out var newAfflictionPrefab))
+                {
+                    Character.CharacterHealth.ApplyAffliction(targetLimb: limb, newAfflictionPrefab.Instantiate(afflictionStrength * strengthMultiplier));
+                }
+            }
+        }
+
+        protected override void VerifyState(bool conditionsMatched, float timeSinceLastUpdate)
+        {
+            if (conditionsMatched)
+            {
+                ApplyEffect();
+            }
+        }
+    }
+}
@@ -1,14 +1,13 @@
 using System.Collections.Generic;
-using System.Linq;

 namespace Barotrauma.Abilities
 {
    class CharacterAbilityGroupInterval : CharacterAbilityGroup
    {
-        private float interval { get; set; }
+        private readonly float interval;
        public float TimeSinceLastUpdate { get; private set; }

-        private float effectDelay;
+        private readonly float effectDelay;
        private float effectDelayTimer;