Damage rework (#2525)

* Make damage work through messages and events, make destructible not inherit ruinable or reference damageable

* Copy sound logic to destructible component for now

* Fix typo

* Fix prototype error

* Remove breakable component damageable reference

* Remove breakable construction reference

* Remove ruinable component

* Move thresholds to individual components and away from damageable

* Add threshold property to damageable component code

* Add thresholds to destructible component, add states to damageable, remove damage container, fix up mob states

* Being alive isn't normal

* Fix not reading the id

* Merge fixes

* YAML fixes

* Grammar moment

* Remove unnecessary dependency

* Update thresholds doc

* Change naming of thresholds to states in MobStateComponent

* Being alive is once again normal

* Make DamageState a byte

* Bring out classes structs and enums from DestructibleComponent

* Add test for destructible thresholds

* Merge fixes

* More merge fixes and fix rejuvenate test

* Remove IMobState.IsConscious

* More merge fixes someone please god review this shit already

* Fix rejuvenate test

* Update outdated destructible in YAML

* Fix repeatedly entering the current state

* Fix repeatedly entering the current state, add Threshold.TriggersOnce and expand test

* Update saltern

Content.Client/GameObjects/Components/Mobs/State/CriticalMobState.cs

@@ -0,0 +1,8 @@
+using Content.Shared.GameObjects.Components.Mobs.State;
+
+namespace Content.Client.GameObjects.Components.Mobs.State
+{
+    public class CriticalMobState : SharedCriticalMobState
+    {
+    }
+}

Content.Client/GameObjects/Components/Mobs/State/CriticalState.cs

@@ -1,30 +0,0 @@
-using Content.Client.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-
-namespace Content.Client.GameObjects.Components.Mobs.State
-{
-    public class CriticalState : SharedCriticalState
-    {
-        public override void EnterState(IEntity entity)
-        {
-            if (entity.TryGetComponent(out AppearanceComponent appearance))
-            {
-                appearance.SetData(DamageStateVisuals.State, DamageState.Critical);
-            }
-
-            EntitySystem.Get<StandingStateSystem>().Down(entity);
-        }
-
-        public override void ExitState(IEntity entity)
-        {
-            EntitySystem.Get<StandingStateSystem>().Standing(entity);
-        }
-
-        public override void UpdateState(IEntity entity) { }
-    }
-}

Content.Client/GameObjects/Components/Mobs/State/DeadMobState.cs

@@ -1,5 +1,4 @@
 using Content.Client.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Damage;
 using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.Components.Mobs.State;
 using Robust.Client.GameObjects;
@@ -9,10 +8,12 @@ using Robust.Shared.Interfaces.GameObjects;
 
 namespace Content.Client.GameObjects.Components.Mobs.State
 {
-    public class DeadState : SharedDeadState
+    public class DeadMobState : SharedDeadMobState
     {
         public override void EnterState(IEntity entity)
         {
+            base.EnterState(entity);
+
             if (entity.TryGetComponent(out AppearanceComponent appearance))
             {
                 appearance.SetData(DamageStateVisuals.State, DamageState.Dead);
@@ -28,6 +29,8 @@ namespace Content.Client.GameObjects.Components.Mobs.State
 
         public override void ExitState(IEntity entity)
         {
+            base.ExitState(entity);
+
             EntitySystem.Get<StandingStateSystem>().Standing(entity);
 
             if (entity.TryGetComponent(out PhysicsComponent physics))
@@ -35,7 +38,5 @@ namespace Content.Client.GameObjects.Components.Mobs.State
                 physics.CanCollide = true;
             }
         }
-
-        public override void UpdateState(IEntity entity) { }
     }
 }

Content.Client/GameObjects/Components/Mobs/State/MobStateComponent.cs

@@ -0,0 +1,13 @@
+#nullable enable
+using Content.Shared.GameObjects.Components.Mobs.State;
+using Robust.Shared.GameObjects;
+
+namespace Content.Client.GameObjects.Components.Mobs.State
+{
+    [RegisterComponent]
+    [ComponentReference(typeof(SharedMobStateComponent))]
+    [ComponentReference(typeof(IMobStateComponent))]
+    public class MobStateComponent : SharedMobStateComponent
+    {
+    }
+}

Content.Client/GameObjects/Components/Mobs/State/MobStateManagerComponent.cs

@@ -1,62 +0,0 @@
-#nullable enable
-using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Robust.Shared.GameObjects;
-
-namespace Content.Client.GameObjects.Components.Mobs.State
-{
-    [RegisterComponent]
-    [ComponentReference(typeof(SharedMobStateManagerComponent))]
-    public class MobStateManagerComponent : SharedMobStateManagerComponent
-    {
-        private readonly Dictionary<DamageState, IMobState> _behavior = new()
-        {
-            {DamageState.Alive, new NormalState()},
-            {DamageState.Critical, new CriticalState()},
-            {DamageState.Dead, new DeadState()}
-        };
-
-        private DamageState _currentDamageState;
-
-        protected override IReadOnlyDictionary<DamageState, IMobState> Behavior => _behavior;
-
-        public override DamageState CurrentDamageState
-        {
-            get => _currentDamageState;
-            protected set
-            {
-                if (_currentDamageState == value)
-                {
-                    return;
-                }
-
-                if (_currentDamageState != DamageState.Invalid)
-                {
-                    CurrentMobState.ExitState(Owner);
-                }
-
-                _currentDamageState = value;
-                CurrentMobState = Behavior[CurrentDamageState];
-                CurrentMobState.EnterState(Owner);
-
-                Dirty();
-            }
-        }
-
-        public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
-        {
-            base.HandleComponentState(curState, nextState);
-
-            if (curState is not MobStateManagerComponentState state)
-            {
-                return;
-            }
-
-            _currentDamageState = state.DamageState;
-            CurrentMobState?.ExitState(Owner);
-            CurrentMobState = Behavior[CurrentDamageState];
-            CurrentMobState.EnterState(Owner);
-        }
-    }
-}

Content.Client/GameObjects/Components/Mobs/State/NormalMobState.cs

@@ -1,25 +1,20 @@
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.Components.Mobs.State;
 using Robust.Client.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 
 namespace Content.Client.GameObjects.Components.Mobs.State
 {
-    public class NormalState : SharedNormalState
+    public class NormalMobState : SharedNormalMobState
     {
         public override void EnterState(IEntity entity)
         {
+            base.EnterState(entity);
+
             if (entity.TryGetComponent(out AppearanceComponent appearance))
             {
                 appearance.SetData(DamageStateVisuals.State, DamageState.Alive);
             }
-
-            UpdateState(entity);
         }
-
-        public override void ExitState(IEntity entity) { }
-
-        public override void UpdateState(IEntity entity) { }
     }
 }