Add composite destructible thresholds (#3102)

* Add composite destructible thresholds

* Reorder yaml properties

* Update YAML

* Fix YAML

* Re-fix YAML

* Add missing nullable enable

* Go back window component is explosive

* rider

Content.IntegrationTests/Tests/Destructible/DestructibleDamageClassTest.cs

@@ -12,11 +12,12 @@ using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototy
 namespace Content.IntegrationTests.Tests.Destructible
 {
     [TestFixture]
-    [TestOf(typeof(TotalDamageClassesTrigger))]
+    [TestOf(typeof(DamageClassTrigger))]
+    [TestOf(typeof(AndTrigger))]
     public class DestructibleDamageClassTest : ContentIntegrationTest
     {
         [Test]
-        public async Task Test()
+        public async Task AndTest()
         {
             var server = StartServerDummyTicker(new ServerContentIntegrationOption
             {
@@ -82,7 +83,12 @@ namespace Content.IntegrationTests.Tests.Destructible
                 Assert.That(threshold.Behaviors, Is.Empty);
                 Assert.NotNull(threshold.Trigger);
                 Assert.That(threshold.Triggered, Is.True);
-                Assert.IsInstanceOf<TotalDamageClassesTrigger>(threshold.Trigger);
+                Assert.IsInstanceOf<AndTrigger>(threshold.Trigger);
+
+                var trigger = (AndTrigger) threshold.Trigger;
+
+                Assert.IsInstanceOf<DamageClassTrigger>(trigger.Triggers[0]);
+                Assert.IsInstanceOf<DamageClassTrigger>(trigger.Triggers[1]);
 
                 sThresholdListenerComponent.ThresholdsReached.Clear();
 
@@ -139,7 +145,12 @@ namespace Content.IntegrationTests.Tests.Destructible
                 Assert.That(threshold.Behaviors, Is.Empty);
                 Assert.NotNull(threshold.Trigger);
                 Assert.That(threshold.Triggered, Is.True);
-                Assert.IsInstanceOf<TotalDamageClassesTrigger>(threshold.Trigger);
+                Assert.IsInstanceOf<AndTrigger>(threshold.Trigger);
+
+                trigger = (AndTrigger) threshold.Trigger;
+
+                Assert.IsInstanceOf<DamageClassTrigger>(trigger.Triggers[0]);
+                Assert.IsInstanceOf<DamageClassTrigger>(trigger.Triggers[1]);
 
                 sThresholdListenerComponent.ThresholdsReached.Clear();
 

Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs

@@ -12,7 +12,8 @@ using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototy
 namespace Content.IntegrationTests.Tests.Destructible
 {
     [TestFixture]
-    [TestOf(typeof(TotalDamageTypesTrigger))]
+    [TestOf(typeof(DamageTypeTrigger))]
+    [TestOf(typeof(AndTrigger))]
     public class DestructibleDamageTypeTest : ContentIntegrationTest
     {
         [Test]
@@ -82,7 +83,12 @@ namespace Content.IntegrationTests.Tests.Destructible
                 Assert.That(threshold.Behaviors, Is.Empty);
                 Assert.NotNull(threshold.Trigger);
                 Assert.That(threshold.Triggered, Is.True);
-                Assert.IsInstanceOf<TotalDamageTypesTrigger>(threshold.Trigger);
+                Assert.IsInstanceOf<AndTrigger>(threshold.Trigger);
+
+                var trigger = (AndTrigger) threshold.Trigger;
+
+                Assert.IsInstanceOf<DamageTypeTrigger>(trigger.Triggers[0]);
+                Assert.IsInstanceOf<DamageTypeTrigger>(trigger.Triggers[1]);
 
                 sThresholdListenerComponent.ThresholdsReached.Clear();
 
@@ -139,7 +145,12 @@ namespace Content.IntegrationTests.Tests.Destructible
                 Assert.That(threshold.Behaviors, Is.Empty);
                 Assert.NotNull(threshold.Trigger);
                 Assert.That(threshold.Triggered, Is.True);
-                Assert.IsInstanceOf<TotalDamageTypesTrigger>(threshold.Trigger);
+                Assert.IsInstanceOf<AndTrigger>(threshold.Trigger);
+
+                trigger = (AndTrigger) threshold.Trigger;
+
+                Assert.IsInstanceOf<DamageTypeTrigger>(trigger.Triggers[0]);
+                Assert.IsInstanceOf<DamageTypeTrigger>(trigger.Triggers[1]);
 
                 sThresholdListenerComponent.ThresholdsReached.Clear();
 

Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs

@@ -21,11 +21,11 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 20
         triggersOnce: false
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 50
         triggersOnce: false
       behaviors:
@@ -48,7 +48,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 50
       behaviors:
       - !type:PlaySoundBehavior
@@ -70,13 +70,16 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTypesTrigger
+        !type:AndTrigger
-        damage:
+        triggers:
-          Blunt: 10
+        - !type:DamageTypeTrigger
-          Slash: 10
+          type: Blunt
+          damage: 10
+        - !type:DamageTypeTrigger
+          type: Slash
+          damage: 10
   - type: TestThresholdListener
 
-
 - type: entity
   id: {DestructibleDamageClassEntityId}
   name: {DestructibleDamageClassEntityId}
@@ -85,10 +88,14 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageClassesTrigger
+        !type:AndTrigger
-        damage:
+        triggers:
-          Brute: 10
+        - !type:DamageClassTrigger
-          Burn: 10
+          class: Brute
+          damage: 10
+        - !type:DamageClassTrigger
+          class: Burn
+          damage: 10
   - type: TestThresholdListener";
     }
 }

Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs

@@ -191,7 +191,7 @@ namespace Content.IntegrationTests.Tests.Destructible
 
                 // Verify the first one, should be the lowest one (20)
                 msg = sThresholdListenerComponent.ThresholdsReached[0];
-                var trigger = (TotalDamageTrigger) msg.Threshold.Trigger;
+                var trigger = (DamageTrigger) msg.Threshold.Trigger;
                 Assert.NotNull(trigger);
                 Assert.That(trigger.Damage, Is.EqualTo(20));
 
@@ -202,7 +202,7 @@ namespace Content.IntegrationTests.Tests.Destructible
 
                 // Verify the second one, should be the highest one (50)
                 msg = sThresholdListenerComponent.ThresholdsReached[1];
-                trigger = (TotalDamageTrigger) msg.Threshold.Trigger;
+                trigger = (DamageTrigger) msg.Threshold.Trigger;
                 Assert.NotNull(trigger);
                 Assert.That(trigger.Damage, Is.EqualTo(50));
 

Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/AndTrigger.cs

@@ -0,0 +1,37 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using Content.Server.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Components.Damage;
+using Robust.Shared.Interfaces.Serialization;
+using Robust.Shared.Serialization;
+
+namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers
+{
+    /// <summary>
+    ///     A trigger that will activate when all of its triggers have activated.
+    /// </summary>
+    [Serializable]
+    public class AndTrigger : IThresholdTrigger
+    {
+        public List<IThresholdTrigger> Triggers { get; set; } = new();
+
+        void IExposeData.ExposeData(ObjectSerializer serializer)
+        {
+            serializer.DataField(this, x => x.Triggers, "triggers", new List<IThresholdTrigger>());
+        }
+
+        public bool Reached(IDamageableComponent damageable, DestructibleSystem system)
+        {
+            foreach (var trigger in Triggers)
+            {
+                if (!trigger.Reached(damageable, system))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}

Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageClassTrigger.cs

@@ -1,6 +1,5 @@
 #nullable enable
 using System;
-using System.Collections.Generic;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Damage;
 using Content.Shared.GameObjects.Components.Damage;
@@ -10,39 +9,37 @@ using Robust.Shared.Serialization;
 namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers
 {
     /// <summary>
-    ///     A trigger that will activate when all of the damage types received
+    ///     A trigger that will activate when the amount of damage received
-    ///     are above the specified threshold.
+    ///     of the specified class is above the specified threshold.
     /// </summary>
     [Serializable]
-    public class TotalDamageTypesTrigger : IThresholdTrigger
+    public class DamageClassTrigger : IThresholdTrigger
     {
         /// <summary>
-        ///     The amount of damage at which this threshold will trigger.
+        ///     The class to check the damage of.
-        ///     The damage requirements of all <see cref="DamageType"/> must be met.
         /// </summary>
-        private Dictionary<DamageType, int> Damage { get; set; } = new();
+        public DamageClass? Class { get; set; }
+
+        /// <summary>
+        ///     The amount of damage at which this threshold will trigger.
+        /// </summary>
+        public int Damage { get; set; }
 
         void IExposeData.ExposeData(ObjectSerializer serializer)
         {
-            serializer.DataField(this, x => x.Damage, "damage", new Dictionary<DamageType, int>());
+            serializer.DataField(this, x => x.Class, "class", null);
+            serializer.DataField(this, x => x.Damage, "damage", 0);
         }
 
         public bool Reached(IDamageableComponent damageable, DestructibleSystem system)
         {
-            foreach (var (type, damageRequired) in Damage)
+            if (Class == null)
             {
-                if (!damageable.TryGetDamage(type, out var damageReceived))
+                return false;
-                {
-                    return false;
-                }
-
-                if (damageReceived < damageRequired)
-                {
-                    return false;
-                }
             }
 
-            return true;
+            return damageable.TryGetDamage(Class.Value, out var damageReceived) &&
+                   damageReceived >= Damage;
         }
     }
 }

Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTrigger.cs

@@ -8,16 +8,16 @@ using Robust.Shared.Serialization;
 namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers
 {
     /// <summary>
-    ///     A trigger that will activate when the amount of total damage received
+    ///     A trigger that will activate when the amount of damage received
     ///     is above the specified threshold.
     /// </summary>
     [Serializable]
-    public class TotalDamageTrigger : IThresholdTrigger
+    public class DamageTrigger : IThresholdTrigger
     {
         /// <summary>
-        ///     The amount of total damage at which this threshold will trigger.
+        ///     The amount of damage at which this threshold will trigger.
         /// </summary>
-        public int Damage { get; private set; }
+        public int Damage { get; set; }
 
         void IExposeData.ExposeData(ObjectSerializer serializer)
         {

Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs

@@ -0,0 +1,39 @@
+#nullable enable
+using System;
+using Content.Server.GameObjects.EntitySystems;
+using Content.Shared.Damage;
+using Content.Shared.GameObjects.Components.Damage;
+using Robust.Shared.Interfaces.Serialization;
+using Robust.Shared.Serialization;
+
+namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers
+{
+    /// <summary>
+    ///     A trigger that will activate when the amount of damage received
+    ///     of the specified type is above the specified threshold.
+    /// </summary>
+    [Serializable]
+    public class DamageTypeTrigger : IThresholdTrigger
+    {
+        public DamageType? Type { get; set; }
+
+        public int Damage { get; set; }
+
+        void IExposeData.ExposeData(ObjectSerializer serializer)
+        {
+            serializer.DataField(this, x => x.Type, "type", null);
+            serializer.DataField(this, x => x.Damage, "damage", 0);
+        }
+
+        public bool Reached(IDamageableComponent damageable, DestructibleSystem system)
+        {
+            if (Type == null)
+            {
+                return false;
+            }
+
+            return damageable.TryGetDamage(Type.Value, out var damageReceived) &&
+                   damageReceived >= Damage;
+        }
+    }
+}

Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/OrTrigger.cs

@@ -0,0 +1,37 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using Content.Server.GameObjects.EntitySystems;
+using Content.Shared.GameObjects.Components.Damage;
+using Robust.Shared.Interfaces.Serialization;
+using Robust.Shared.Serialization;
+
+namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers
+{
+    /// <summary>
+    ///     A trigger that will activate when any of its triggers have activated.
+    /// </summary>
+    [Serializable]
+    public class OrTrigger : IThresholdTrigger
+    {
+        public List<IThresholdTrigger> Triggers { get; } = new();
+
+        void IExposeData.ExposeData(ObjectSerializer serializer)
+        {
+            serializer.DataField(this, x => x.Triggers, "triggers", new List<IThresholdTrigger>());
+        }
+
+        public bool Reached(IDamageableComponent damageable, DestructibleSystem system)
+        {
+            foreach (var trigger in Triggers)
+            {
+                if (trigger.Reached(damageable, system))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}

Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/TotalDamageClassesTrigger.cs

@@ -1,48 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Robust.Shared.Interfaces.Serialization;
-using Robust.Shared.Serialization;
-
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers
-{
-    /// <summary>
-    ///     A trigger that will activate when all of the damage classes received
-    ///     are above the specified threshold.
-    /// </summary>
-    [Serializable]
-    public class TotalDamageClassesTrigger : IThresholdTrigger
-    {
-        /// <summary>
-        ///     The amount of damage at which this threshold will trigger.
-        ///     The damage requirements of all <see cref="DamageClass"/> must be met.
-        /// </summary>
-        private Dictionary<DamageClass, int> Damage { get; set; } = new();
-
-        void IExposeData.ExposeData(ObjectSerializer serializer)
-        {
-            serializer.DataField(this, x => x.Damage, "damage", new Dictionary<DamageClass, int>());
-        }
-
-        public bool Reached(IDamageableComponent damageable, DestructibleSystem system)
-        {
-            foreach (var (type, damageRequired) in Damage)
-            {
-                if (!damageable.TryGetDamage(type, out var damageReceived))
-                {
-                    return false;
-                }
-
-                if (damageReceived < damageRequired)
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-}

Content.Server/GameObjects/Components/WindowComponent.cs

@@ -46,7 +46,7 @@ namespace Content.Server.GameObjects.Components
             {
                 foreach (var threshold in destructible.Thresholds)
                 {
-                    if (threshold.Trigger is not TotalDamageTrigger trigger)
+                    if (threshold.Trigger is not DamageTrigger trigger)
                     {
                         continue;
                     }
@@ -65,12 +65,12 @@ namespace Content.Server.GameObjects.Components
             }
 
             var damage = damageable.TotalDamage;
-            TotalDamageTrigger? trigger = null;
+            DamageTrigger? trigger = null;
 
             // TODO: Pretend this does not exist until https://github.com/space-wizards/space-station-14/pull/2783 is merged
             foreach (var threshold in destructible.Thresholds)
             {
-                if ((trigger = threshold.Trigger as TotalDamageTrigger) != null)
+                if ((trigger = threshold.Trigger as DamageTrigger) != null)
                 {
                     break;
                 }

Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml

@@ -61,7 +61,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 500
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Furniture/beds.yml

@@ -26,7 +26,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 75
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml

@@ -24,7 +24,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 30
       behaviors:
       - !type:PlaySoundBehavior

Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml

@@ -25,7 +25,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 50
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml

@@ -16,7 +16,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Furniture/seats.yml

@@ -35,7 +35,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 50
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Furniture/storage.yml

@@ -32,7 +32,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 30
       behaviors:
       - !type:PlaySoundBehavior
@@ -79,7 +79,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 30
       behaviors:
       - !type:PlaySoundBehavior

Resources/Prototypes/Entities/Constructible/Furniture/tables.yml

@@ -40,7 +40,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 15
       behaviors:
       - !type:PlaySoundBehavior
@@ -68,7 +68,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 1
       behaviors:
       - !type:PlaySoundBehavior
@@ -99,7 +99,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 1
       behaviors:
       - !type:PlaySoundBehavior
@@ -127,7 +127,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 15
       behaviors:
       - !type:PlaySoundBehavior
@@ -158,7 +158,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 75
       behaviors:
       - !type:PlaySoundBehavior
@@ -189,7 +189,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 5
       behaviors:
       - !type:PlaySoundBehavior
@@ -220,7 +220,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 20
       behaviors:
       - !type:PlaySoundBehavior
@@ -251,7 +251,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 15
       behaviors:
       - !type:PlaySoundBehavior
@@ -282,7 +282,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 15
       behaviors:
       - !type:PlaySoundBehavior
@@ -313,7 +313,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 50
       behaviors:
       - !type:PlaySoundBehavior
@@ -336,7 +336,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 1
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml

@@ -20,7 +20,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml

@@ -14,7 +14,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Ground/gasfilters.yml

@@ -14,7 +14,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Ground/kitchen.yml

@@ -24,7 +24,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 50
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Ground/pipes.yml

@@ -15,7 +15,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Ground/pumps.yml

@@ -14,7 +14,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml

@@ -14,7 +14,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Ground/vents.yml

@@ -14,7 +14,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Power/computers.yml

@@ -99,7 +99,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Power/debug_power.yml

@@ -32,7 +32,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Power/power_base.yml

@@ -258,7 +258,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml

@@ -33,7 +33,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 50
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Power/wires.yml

@@ -23,7 +23,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior
@@ -56,7 +56,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -95,7 +95,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -136,7 +136,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:SpawnEntitiesBehavior

Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/ame_controller.yml

@@ -26,7 +26,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 500
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/ame_structure.yml

@@ -26,7 +26,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 500
       behaviors:
       - !type:SpawnEntitiesBehavior

Resources/Prototypes/Entities/Constructible/Specific/Medical/cloning_machine.yml

@@ -35,7 +35,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Specific/Medical/medical_scanner.yml

@@ -35,7 +35,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml

@@ -22,7 +22,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 75
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml

@@ -36,7 +36,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 50
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -87,7 +87,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 25
       behaviors:
       - !type:SpawnEntitiesBehavior

Resources/Prototypes/Entities/Constructible/Specific/disposal.yml

@@ -18,7 +18,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior
@@ -154,7 +154,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior
@@ -397,7 +397,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml

@@ -34,7 +34,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 150
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml

@@ -28,7 +28,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 50
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml

@@ -44,7 +44,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_base.yml

@@ -40,7 +40,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml

@@ -28,7 +28,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 10
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml

@@ -19,7 +19,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Walls/girder.yml

@@ -33,7 +33,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 50
       behaviors:
       - !type:SpawnEntitiesBehavior

Resources/Prototypes/Entities/Constructible/Walls/lighting.yml

@@ -44,7 +44,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 50
       behaviors:
       - !type:DoActsBehavior
@@ -73,8 +73,13 @@
       enabled: true
       offset: "0.5, 0"
     - type: Destructible
-      deadThreshold: 25
+      thresholds:
-      resistances: metallicResistances
+      - trigger:
+          !type:DamageTrigger
+          damage: 25
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
     - type: Construction
       graph: lightFixture
       node: bulbLight
@@ -104,7 +109,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 25
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml

@@ -30,7 +30,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Walls/signs.yml

@@ -13,7 +13,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 5
       behaviors:
       - !type:DoActsBehavior

Resources/Prototypes/Entities/Constructible/Walls/walls.yml

@@ -52,7 +52,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -80,7 +80,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -108,7 +108,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -137,7 +137,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -165,7 +165,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -193,7 +193,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -222,7 +222,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -250,7 +250,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -278,7 +278,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -306,7 +306,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -334,7 +334,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -367,7 +367,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 600
       behaviors:
       - !type:DoActsBehavior
@@ -397,7 +397,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 1000
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -425,7 +425,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -453,7 +453,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -485,7 +485,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:DoActsBehavior
@@ -511,7 +511,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior
@@ -539,7 +539,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 300
       behaviors:
       - !type:SpawnEntitiesBehavior

Resources/Prototypes/Entities/Constructible/Walls/windows.yml

@@ -31,7 +31,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 15
       behaviors:
       - !type:PlaySoundCollectionBehavior
@@ -70,7 +70,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 75
       behaviors:
       - !type:PlaySoundCollectionBehavior
@@ -103,7 +103,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:PlaySoundCollectionBehavior

Resources/Prototypes/Entities/Effects/chemistry_effects.yml

@@ -126,7 +126,7 @@
     - type: Destructible
       thresholds:
       - trigger:
-          !type:TotalDamageTrigger
+          !type:DamageTrigger
           damage: 50
         behaviors:
         - !type:DoActsBehavior

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -165,9 +165,9 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTypesTrigger
+        !type:DamageTypeTrigger
-        damage:
+        type: Blunt
-          Blunt: 400
+        damage: 400
       behaviors:
       - !type:GibBehavior { }
   - type: HeatResistance

Resources/Prototypes/Entities/Objects/Consumable/drinks.yml

@@ -27,7 +27,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 5
       behaviors:
       - !type:PlaySoundCollectionBehavior

Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml

@@ -20,7 +20,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 5
       behaviors:
       - !type:PlaySoundCollectionBehavior

Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml

@@ -132,7 +132,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 10
       behaviors:
       - !type:PlaySoundBehavior
@@ -163,7 +163,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 20
       behaviors:
       - !type:PlaySoundBehavior

Resources/Prototypes/Entities/Objects/Power/lights.yml

@@ -12,7 +12,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 5
       behaviors:
       - !type:PlaySoundCollectionBehavior
@@ -20,7 +20,7 @@
       - !type:DoActsBehavior
         acts: [ "Breakage" ]
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 10
       behaviors:
       - !type:PlaySoundCollectionBehavior

Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml

@@ -26,7 +26,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 10
       behaviors:
       - !type:DoActsBehavior
@@ -60,7 +60,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 10
       behaviors:
       - !type:DoActsBehavior
@@ -94,7 +94,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 10
       behaviors:
       - !type:DoActsBehavior
@@ -127,7 +127,7 @@
   - type: Destructible
     thresholds:
     - trigger:
-        !type:TotalDamageTrigger
+        !type:DamageTrigger
         damage: 50
       behaviors:
       - !type:DoActsBehavior