Damageable Cleanup + Bugfix (#42076)

* Does not build do not PR

* using blah blah blah rider hates me

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
index 72e8901631fba38963946eb94afce77a458c5c06..20b0877548d03c31ae3f56ac296a4ecf3fd331b9 100644 (file)
--- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
+++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
@@ -164,7 +164,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                 var damageToDeal = FixedPoint2.New(types.Count * 5);
                 DamageSpecifier damage = new(group3, damageToDeal);
 
-                sDamageableSystem.TryChangeDamage(uid, damage, true);
+                sDamageableSystem.ChangeDamage(uid, damage, true);
 
                 Assert.Multiple(() =>
                 {
@@ -178,7 +178,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                 });
 
                 // Heal
-                sDamageableSystem.TryChangeDamage(uid, -damage);
+                sDamageableSystem.ChangeDamage(uid, -damage);
 
                 Assert.Multiple(() =>
                 {
@@ -197,7 +197,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                 Assert.That(types, Has.Count.EqualTo(3));
 
                 damage = new DamageSpecifier(group3, 14);
-                sDamageableSystem.TryChangeDamage(uid, damage, true);
+                sDamageableSystem.ChangeDamage(uid, damage, true);
 
                 Assert.Multiple(() =>
                 {
@@ -209,7 +209,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                 });
 
                 // Heal
-                sDamageableSystem.TryChangeDamage(uid, -damage);
+                sDamageableSystem.ChangeDamage(uid, -damage);
 
                 Assert.Multiple(() =>
                 {
@@ -225,7 +225,7 @@ namespace Content.IntegrationTests.Tests.Damageable
                     Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
                 });
                 damage = new DamageSpecifier(group1, FixedPoint2.New(10)) + new DamageSpecifier(type2b, FixedPoint2.New(10));
-                sDamageableSystem.TryChangeDamage(uid, damage, true);
+                sDamageableSystem.ChangeDamage(uid, damage, true);
 
                 Assert.Multiple(() =>
                 {
@@ -245,9 +245,9 @@ namespace Content.IntegrationTests.Tests.Damageable
                 Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
 
                 // Test 'wasted' healing
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(type3a, 5));
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(type3b, 7));
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(group3, -11));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(type3a, 5));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(type3b, 7));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(group3, -11));
 
                 Assert.Multiple(() =>
                 {
@@ -257,11 +257,11 @@ namespace Content.IntegrationTests.Tests.Damageable
                 });
 
                 // Test Over-Healing
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(group3, FixedPoint2.New(-100)));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(group3, FixedPoint2.New(-100)));
                 Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
 
                 // Test that if no health change occurred, returns false
-                sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(group3, -100));
+                sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(group3, -100));
                 Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
             });
             await pair.CleanReturnAsync();

diff --git a/Content.Shared/Damage/Systems/DamageableSystem.API.cs b/Content.Shared/Damage/Systems/DamageableSystem.API.cs
index e1c44f55be38bfcf5d6aa9e4e7067e778d43d466..e08e742b411ef42d8e0fd45bcb28767b88fa0769 100644 (file)
--- a/Content.Shared/Damage/Systems/DamageableSystem.API.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.API.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using System.Net.Sockets;
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
@@ -103,7 +102,7 @@ public sealed partial class DamageableSystem
         //! Empty just checks if the DamageSpecifier is _literally_ empty, as in, is internal dictionary of damage types is empty.
         // If you deal 0.0 of some damage type, Empty will be false!
         newDamage = ChangeDamage(ent, damage, ignoreResistances, interruptsDoAfters, origin, ignoreGlobalModifiers);
-        return !damage.Empty;
+        return !newDamage.Empty;
     }
 
     /// <summary>

diff --git a/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs b/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs
index 5ca7fe1992bb2e12477965dc4cc0a8af4098304d..0175b5fb5e9f78c2964ffadf8507b272197b0f84 100644 (file)
--- a/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.BenchmarkHelpers.cs
@@ -11,7 +11,7 @@ public sealed partial class DamageableSystem
     {
         foreach (var (uid, damageable) in damageables)
         {
-            TryChangeDamage((uid, damageable), damage);
+            ChangeDamage((uid, damageable), damage);
         }
     }
 }