Release 1.11.4.1 (Winter Update)

2025-12-08 14:56:47 +00:00
parent 21e34e5cd8
commit 598966f200
121 changed files with 1614 additions and 819 deletions
@@ -403,14 +403,19 @@ namespace Barotrauma
            return (Duration == 0.0f) ? dmg : dmg * deltaTime;
        }

-        public float GetTotalDamage(bool includeStructureDamage = false)
+        /// <summary>
+        /// Returns the total damage (vitality decrease) this attack causes on characters.
+        /// </summary>
+        public float GetTotalCharacterDamage()
        {
-            float totalDamage = includeStructureDamage ? StructureDamage : 0.0f;
+            float totalDamage = 0.0f;
            foreach (Affliction affliction in Afflictions.Keys)
            {
-                totalDamage += affliction.GetVitalityDecrease(null);
+                float afflictionVitalityDecrease =  affliction.GetVitalityDecrease(null);
+                if (affliction.AffectedByAttackMultipliers) { afflictionVitalityDecrease *= DamageMultiplier; }
+                totalDamage += afflictionVitalityDecrease;
            }
-            return totalDamage * DamageMultiplier;
+            return totalDamage;
        }

        public Attack(float damage, float bleedingDamage, float burnDamage, float structureDamage, float itemDamage, float range = 0.0f)