0.15.21.0

2021-12-16 01:05:43 +09:00
parent 617d9ede88
commit 7d43cb1e91
74 changed files with 487 additions and 541 deletions
@@ -22,7 +22,7 @@ namespace Barotrauma.Abilities
        private readonly bool ignoreNonHarmfulAttacks;
        public AbilityConditionAttackData(CharacterTalent characterTalent, XElement conditionElement) : base(characterTalent, conditionElement)
        {
-            itemIdentifier = conditionElement.GetAttributeString("itemidentifier", "");
+            itemIdentifier = conditionElement.GetAttributeString("itemidentifier", string.Empty);
            tags = conditionElement.GetAttributeStringArray("tags", new string[0], convertToLowerInvariant: true);
            ignoreNonHarmfulAttacks = conditionElement.GetAttributeBool("ignorenonharmfulattacks", false);

@@ -46,15 +46,10 @@ namespace Barotrauma.Abilities
                }

                Item item = attackData?.SourceAttack?.SourceItem;
-                if (item == null)
-                {
-                    DebugConsole.AddWarning($"Source Item was not found in {this} for talent {characterTalent.DebugIdentifier}!");
-                    return false;
-                }

                if (!string.IsNullOrEmpty(itemIdentifier))
                {
-                    if (item.prefab.Identifier != itemIdentifier)
+                    if (item?.prefab.Identifier != itemIdentifier)
                    {
                        return false;
                    }
@@ -62,31 +57,34 @@ namespace Barotrauma.Abilities

                if (tags.Any())
                {
-                    if (!tags.All(t => item.HasTag(t)))
+                    if (!tags.All(t => item?.HasTag(t) ?? false))
                    {
                        return false;
                    }
                }

-                switch (weapontype)
+                if (weapontype != WeaponType.Any)
                {
-                    // it is possible that an item that has both a melee and a projectile component will return true
-                    // even when not used as a melee/ranged weapon respectively
-                    // attackdata should contain data regarding whether the attack is melee or not
-                    case WeaponType.Melee:
-                        return item.GetComponent<MeleeWeapon>() != null;
-                    case WeaponType.Ranged:
-                        return item.GetComponent<Projectile>() != null;
-                    case WeaponType.HandheldRanged:
-                        {
-                            var projectile = item.GetComponent<Projectile>();
-                            return projectile?.Launcher?.GetComponent<Holdable>() != null;
-                        }
-                    case WeaponType.Turret:
-                        {
-                            var projectile = item.GetComponent<Projectile>();
-                            return projectile?.Launcher?.GetComponent<Turret>() != null;
-                        }
+                    switch (weapontype)
+                    {
+                        // it is possible that an item that has both a melee and a projectile component will return true
+                        // even when not used as a melee/ranged weapon respectively
+                        // attackdata should contain data regarding whether the attack is melee or not
+                        case WeaponType.Melee:
+                            return item?.GetComponent<MeleeWeapon>() != null;
+                        case WeaponType.Ranged:
+                            return item?.GetComponent<Projectile>() != null;
+                        case WeaponType.HandheldRanged:
+                            {
+                                var projectile = item?.GetComponent<Projectile>();
+                                return projectile?.Launcher?.GetComponent<Holdable>() != null;
+                            }
+                        case WeaponType.Turret:
+                            {
+                                var projectile = item?.GetComponent<Projectile>();
+                                return projectile?.Launcher?.GetComponent<Turret>() != null;
+                            }
+                    }
                }

                return true;
@@ -5,18 +5,21 @@ namespace Barotrauma.Abilities
 {
    class CharacterAbilityGainSimultaneousSkill : CharacterAbility
    {
-        private string skillIdentifier;
+        private readonly string skillIdentifier;
+        private readonly bool ignoreAbilitySkillGain;

        public CharacterAbilityGainSimultaneousSkill(CharacterAbilityGroup characterAbilityGroup, XElement abilityElement) : base(characterAbilityGroup, abilityElement)
        {
            skillIdentifier = abilityElement.GetAttributeString("skillidentifier", "").ToLowerInvariant();
+            ignoreAbilitySkillGain = abilityElement.GetAttributeBool("ignoreabilityskillgain", true);
        }

        protected override void ApplyEffect(AbilityObject abilityObject)
        {
-            if ((abilityObject as IAbilityValue)?.Value is float skillIncrease)
+            if (abilityObject is AbilitySkillGain abilitySkillGain)
            {
-                Character.Info?.IncreaseSkillLevel(skillIdentifier, skillIncrease);
+                if (ignoreAbilitySkillGain && !abilitySkillGain.GainedFromAbility) { return; }
+                Character.Info?.IncreaseSkillLevel(skillIdentifier, abilitySkillGain.Value, gainedFromAbility: true);
            }
            else
            {
@@ -49,11 +49,11 @@ namespace Barotrauma.Abilities
            {
                var skill = character.Info?.Job?.Skills?.GetRandom();
                if (skill == null) { return; }
-                character.Info?.IncreaseSkillLevel(skill.Identifier, skillIncrease);
+                character.Info?.IncreaseSkillLevel(skill.Identifier, skillIncrease, gainedFromAbility: true);
            }
            else
            {
-                character.Info?.IncreaseSkillLevel(skillIdentifier, skillIncrease);
+                character.Info?.IncreaseSkillLevel(skillIdentifier, skillIncrease, gainedFromAbility: true);
            }
        }
    }
@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-using System.Xml.Linq;
-
-namespace Barotrauma.Abilities
-{
-    class CharacterAbilityModifyReduceAffliction : CharacterAbility
-    {
-        float addedAmountMultiplier;
-        public override bool AllowClientSimulation => true;
-
-        public CharacterAbilityModifyReduceAffliction(CharacterAbilityGroup characterAbilityGroup, XElement abilityElement) : base(characterAbilityGroup, abilityElement)
-        {
-            addedAmountMultiplier = abilityElement.GetAttributeFloat("addedamountmultiplier", 0f);
-        }
-
-        protected override void ApplyEffect(AbilityObject abilityObject)
-        {
-            if (abilityObject is AbilityValueAffliction afflictionReduceAmount)
-            {
-                afflictionReduceAmount.Affliction.Strength -= addedAmountMultiplier * afflictionReduceAmount.Value;
-            }
-            else
-            {
-                LogabilityObjectMismatch();
-            }
-        }
-    }
-}
@@ -36,7 +36,7 @@ namespace Barotrauma.Abilities
                if (GameMain.GameSession?.RoundEnding ?? true)
                {
                    Item item = new Item(itemPrefab, Character.WorldPosition, Character.Submarine);
-                    if (!Character.Inventory.TryPutItem(item, Character))
+                    if (!Character.Inventory.TryPutItem(item, Character, item.AllowedSlots))
                    {
                        foreach (Item containedItem in Character.Inventory.AllItemsMod)
                        {
@@ -6,15 +6,19 @@ namespace Barotrauma.Abilities
 {
    class CharacterAbilityApprenticeship : CharacterAbility
    {
+        private readonly bool ignoreAbilitySkillGain;
+
        public CharacterAbilityApprenticeship(CharacterAbilityGroup characterAbilityGroup, XElement abilityElement) : base(characterAbilityGroup, abilityElement)
        {
+            ignoreAbilitySkillGain = abilityElement.GetAttributeBool("ignoreabilityskillgain", true);
        }

        protected override void ApplyEffect(AbilityObject abilityObject)
        {
-            if (abilityObject is AbilitySkillGain abilitySkillGain && !abilitySkillGain.GainedFromApprenticeship && abilitySkillGain.Character != Character)
+            if (abilityObject is AbilitySkillGain abilitySkillGain && abilitySkillGain.Character != Character)
            {
-                Character.Info?.IncreaseSkillLevel(abilitySkillGain.String, 1.0f, gainedFromApprenticeship: true);
+                if (ignoreAbilitySkillGain && !abilitySkillGain.GainedFromAbility) { return; }
+                Character.Info?.IncreaseSkillLevel(abilitySkillGain.String, 1.0f, gainedFromAbility: true);
            }
        }
    }
@@ -18,7 +18,7 @@ namespace Barotrauma.Abilities
                if (skillIdentifier != lastSkillIdentifier)
                {
                    lastSkillIdentifier = skillIdentifier;
-                    Character.Info?.IncreaseSkillLevel(skillIdentifier, 1.0f);
+                    Character.Info?.IncreaseSkillLevel(skillIdentifier, 1.0f, gainedFromAbility: true);
                }
            }
        }