Makes Match[sticks/box] ECS, Makes Matchsticks ignite plasma

Content.Server/Light/Components/MatchstickComponent.cs

@@ -1,14 +1,11 @@
-using System.Threading.Tasks;
-using Content.Shared.Audio;
-using Content.Shared.Interaction;
 using Content.Shared.Smoking;
 using Content.Shared.Sound;
 using Content.Shared.Temperature;
 using Content.Server.Items;
+using Content.Server.Light.EntitySystems;
 using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
+using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
@@ -16,94 +13,38 @@ namespace Content.Server.Light.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IHotItem))]
-    public class MatchstickComponent : Component, IHotItem, IInteractUsing
+    [Friend(typeof(MatchstickSystem))]
+    public class MatchstickComponent : Component, IHotItem
     {
         public override string Name => "Matchstick";
 
-        private SharedBurningStates _currentState = SharedBurningStates.Unlit;
+        /// <summary>
+        /// Current state to matchstick. Can be <code>Unlit</code>, <code>Lit</code> or <code>Burnt</code>.
+        /// </summary>
+        [ViewVariables]
+        public SharedBurningStates CurrentState = SharedBurningStates.Unlit;
 
         /// <summary>
         /// How long will matchstick last in seconds.
         /// </summary>
         [ViewVariables(VVAccess.ReadOnly)]
         [DataField("duration")]
-        private int _duration = 10;
+        public int Duration = 10;
 
         /// <summary>
         /// Sound played when you ignite the matchstick.
         /// </summary>
-        [DataField("igniteSound", required: true)] private SoundSpecifier _igniteSound = default!;
+        [DataField("igniteSound", required: true)] public SoundSpecifier IgniteSound = default!;
 
         /// <summary>
         /// Point light component. Gives matches a glow in dark effect.
         /// </summary>
         [ComponentDependency]
-        private readonly PointLightComponent? _pointLightComponent = default!;
-
-        /// <summary>
-        /// Current state to matchstick. Can be <code>Unlit</code>, <code>Lit</code> or <code>Burnt</code>.
-        /// </summary>
-        [ViewVariables]
-        public SharedBurningStates CurrentState
-        {
-            get => _currentState;
-            private set
-            {
-                _currentState = value;
-
-                if (_pointLightComponent != null)
-                {
-                    _pointLightComponent.Enabled = _currentState == SharedBurningStates.Lit;
-                }
-
-                if (Owner.TryGetComponent(out ItemComponent? item))
-                {
-                    switch (_currentState)
-                    {
-                        case SharedBurningStates.Lit:
-                            item.EquippedPrefix = "lit";
-                            break;
-                        default:
-                            item.EquippedPrefix = "unlit";
-                            break;
-                    }
-                }
-
-                if (Owner.TryGetComponent(out AppearanceComponent? appearance))
-                {
-                    appearance.SetData(SmokingVisuals.Smoking, _currentState);
-                }
-            }
-        }
+        public readonly PointLightComponent? PointLightComponent = default!;
 
         bool IHotItem.IsCurrentlyHot()
         {
             return CurrentState == SharedBurningStates.Lit;
         }
-
-        public void Ignite(IEntity user)
-        {
-            // Play Sound
-            SoundSystem.Play(
-                Filter.Pvs(Owner), _igniteSound.GetSound(), Owner,
-                AudioHelpers.WithVariation(0.125f).WithVolume(-0.125f));
-
-            // Change state
-            CurrentState = SharedBurningStates.Lit;
-            Owner.SpawnTimer(_duration * 1000, () => CurrentState = SharedBurningStates.Burnt);
-        }
-
-        async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
-        {
-            if (eventArgs.Target.TryGetComponent<IHotItem>(out var hotItem)
-                && hotItem.IsCurrentlyHot()
-                && CurrentState == SharedBurningStates.Unlit)
-            {
-                Ignite(eventArgs.User);
-                return true;
-            }
-
-            return false;
-        }
     }
 }