ECS damageable (#4529)

* ECS and damage Data

* Comments and newlines

* Added Comments

* Make TryChangeDamageEvent immutable

* Remove SetAllDamage event

Use public SetAllDamage function instead

* Undo destructible mistakes

That was some shit code.

* Rename DamageData to DamageSpecifier

And misc small edits

misc

* Cache trigger prototypes.

* Renaming destructible classes & functions

* Revert "Cache trigger prototypes."

This reverts commit 86bae15ba6616884dba75f552dfdfbe2d1fb6586.

* Replace prototypes with prototype IDs.

* Split damage.yml into individual files

* move get/handle component state to system

* Update HealthChange doc

* Make godmode call Dirty() on damageable component

* Add Initialize() to fix damage test

* Make non-static

* uncache resistance set prototype and trim DamageableComponentState

* Remove unnecessary Dirty() calls during initialization

* RemoveTryChangeDamageEvent

* revert Dirty()

* Fix MobState relying on DamageableComponent.Dirty()

* Fix DisposalUnit Tests.

These were previously failing, but because the async was not await-ed, this never raised the exception.

After I fixed MobState component, this exception stopped happening and instead the assertions started being tested & failing

* Disposal test 2: electric boogaloo

* Fix typos/mistakes

also add comments and fix spacing.

* Use Uids instead of IEntity

* fix merge

* Comments, a merge issue, and making some damage ignore resistances

* Extend DamageSpecifier and use it for DamageableComponent

* fix master merge

* Fix Disposal unit test. Again.

Snapgrids were removed in master

* Execute Exectute

Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs

@@ -3,8 +3,6 @@ using Content.Shared.Damage;
 using Content.Shared.Sound;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.IoC;
-using Robust.Shared.Prototypes;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Damage.Components
@@ -19,8 +17,6 @@ namespace Content.Server.Damage.Components
 
         [DataField("minimumSpeed")]
         public float MinimumSpeed { get; set; } = 20f;
-        [DataField("baseDamage")]
-        public int BaseDamage { get; set; } = 5;
         [DataField("factor")]
         public float Factor { get; set; } = 1f;
         [DataField("soundHit", required: true)]
@@ -36,16 +32,8 @@ namespace Content.Server.Damage.Components
 
         internal TimeSpan LastHit = TimeSpan.Zero;
 
-        // TODO PROTOTYPE Replace this datafield variable with prototype references, once they are supported.
-        // Also remove Initialize override, if no longer needed.
-        [DataField("damageType")]
-        private readonly string _damageTypeID = "Blunt";
+        [DataField("damage", required: true)]
         [ViewVariables(VVAccess.ReadWrite)]
-        public DamageTypePrototype DamageType = default!;
-        protected override void Initialize()
-        {
-            base.Initialize();
-            DamageType = IoCManager.Resolve<IPrototypeManager>().Index<DamageTypePrototype>(_damageTypeID);
-        }
+        public DamageSpecifier Damage = default!;
     }
 }

Content.Server/Damage/Components/DamageOnLandComponent.cs

@@ -9,20 +9,13 @@ namespace Content.Server.Damage.Components
     public sealed class DamageOnLandComponent : Component
     {
         public override string Name => "DamageOnLand";
-
-        [DataField("amount")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public int Amount = 1;
-
+        
         [DataField("ignoreResistances")]
         [ViewVariables(VVAccess.ReadWrite)]
-        public bool IgnoreResistances;
-
-        // TODO PROTOTYPE Replace this datafield variable with prototype references, once they are supported.
-        // Also remove Initialize override, if no longer needed.
-        [DataField("damageType")] public readonly string DamageTypeId = "Blunt";
+        public bool IgnoreResistances = false;
 
+        [DataField("damage", required: true)]
         [ViewVariables(VVAccess.ReadWrite)]
-        public DamageTypePrototype DamageType = default!;
+        public DamageSpecifier Damage = default!;
     }
 }

Content.Server/Damage/Components/DamageOnToolInteractComponent.cs

@@ -2,13 +2,10 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Content.Server.Tools.Components;
 using Content.Shared.Damage;
-using Content.Shared.Damage.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Tool;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Prototypes;
-using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Damage.Components
@@ -19,28 +16,16 @@ namespace Content.Server.Damage.Components
 
         public override string Name => "DamageOnToolInteract";
 
-        [DataField("damage")]
-        protected int Damage;
-
         [DataField("tools")]
         private List<ToolQuality> _tools = new();
 
-        // TODO PROTOTYPE Replace these datafield variable with prototype references, once they are supported.
-        // Also remove Initialize override, if no longer needed.
-        [DataField("weldingDamageType")]
-        private readonly string _weldingDamageTypeID = "Heat";
+        [DataField("weldingDamage", required: true)]
         [ViewVariables(VVAccess.ReadWrite)]
-        public DamageTypePrototype WeldingDamageType = default!;
-        [DataField("defaultDamageType")]
-        private readonly string _defaultDamageTypeID = "Blunt";
+        public DamageSpecifier WeldingDamage = default!;
+
+        [DataField("defaultDamage", required: true)]
         [ViewVariables(VVAccess.ReadWrite)]
-        public DamageTypePrototype DefaultDamageType = default!;
-        protected override void Initialize()
-        {
-            base.Initialize();
-            WeldingDamageType = IoCManager.Resolve<IPrototypeManager>().Index<DamageTypePrototype>(_weldingDamageTypeID);
-            DefaultDamageType = IoCManager.Resolve<IPrototypeManager>().Index<DamageTypePrototype>(_defaultDamageTypeID);
-        }
+        public DamageSpecifier DefaultDamage = default!;
 
         async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
         {
@@ -50,30 +35,22 @@ namespace Content.Server.Damage.Components
                 {
                     if (tool.HasQuality(ToolQuality.Welding) && toolQuality == ToolQuality.Welding)
                     {
-                        if (eventArgs.Using.TryGetComponent(out WelderComponent? welder))
+                        if (eventArgs.Using.TryGetComponent(out WelderComponent? welder) && welder.WelderLit)
                         {
-                            if (welder.WelderLit) return CallDamage(eventArgs, tool);
+                            EntitySystem.Get<DamageableSystem>().TryChangeDamage(eventArgs.Target.Uid, WeldingDamage);
+                            return true;
                         }
                         break; //If the tool quality is welding and its not lit or its not actually a welder that can be lit then its pointless to continue.
                     }
 
-                    if (tool.HasQuality(toolQuality)) return CallDamage(eventArgs, tool);
+                    if (tool.HasQuality(toolQuality))
+                    {
+                        EntitySystem.Get<DamageableSystem>().TryChangeDamage(eventArgs.Target.Uid, DefaultDamage);
+                        return true;
+                    }
                 }
             }
             return false;
         }
-
-        protected bool CallDamage(InteractUsingEventArgs eventArgs, ToolComponent tool)
-        {
-            if (!eventArgs.Target.TryGetComponent<IDamageableComponent>(out var damageable))
-                return false;
-
-            damageable.TryChangeDamage(tool.HasQuality(ToolQuality.Welding)
-                    ? WeldingDamageType
-                    : DefaultDamageType,
-                Damage);
-
-            return true;
-        }
     }
 }

Content.Server/Damage/Components/DamageOtherOnHitComponent.cs

@@ -3,8 +3,7 @@ using Content.Shared.Damage;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Prototypes;
-using Robust.Shared.IoC;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Damage.Components
 {
@@ -14,21 +13,13 @@ namespace Content.Server.Damage.Components
     {
         public override string Name => "DamageOtherOnHit";
 
-        [DataField("amount")]
-        public int Amount { get; } = 1;
-
         [DataField("ignoreResistances")]
-        public bool IgnoreResistances { get; } = false;
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool IgnoreResistances = false;
+
+        [DataField("damage", required: true)]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public DamageSpecifier Damage = default!;
 
-        // TODO PROTOTYPE Replace this datafield variable with prototype references, once they are supported.
-        // Also remove Initialize override, if no longer needed.
-        [DataField("damageType")]
-        private readonly string _damageTypeID = "Blunt";
-        public DamageTypePrototype DamageType { get; set; } =  default!;
-        protected override void Initialize()
-        {
-            base.Initialize();
-            DamageType = IoCManager.Resolve<IPrototypeManager>().Index<DamageTypePrototype>(_damageTypeID);
-        }
     }
 }