SignalSwitch refactor (#93)

SerbiaStrong-220 · Jul 2, 2023 · f130678 · f130678
1 parent add0ff2
commit f130678
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 8 deletions.
diff --git a/Content.Server/DeviceLinking/Components/SignalSwitchComponent.cs b/Content.Server/DeviceLinking/Components/SignalSwitchComponent.cs
@@ -27,6 +27,13 @@ public sealed class SignalSwitchComponent : Component
         public bool State;
 
         [DataField("clickSound")]
-        public SoundSpecifier ClickSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/lightswitch.ogg");
+        public SoundSpecifier ClickSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/lightswitch.ogg")
+        {
+            Params = new AudioParams()
+            {
+                Volume = 8f,
+                Variation = 0.125f
+            }
+        };
     }
 }
diff --git a/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs b/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs
@@ -1,15 +1,18 @@
 using Content.Server.DeviceLinking.Components;
-using Content.Server.MachineLinking.System;
 using Content.Shared.Audio;
+using Content.Shared.DeviceLinking;
 using Content.Shared.Interaction;
+using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
 
 namespace Content.Server.DeviceLinking.Systems
 {
     public sealed class SignalSwitchSystem : EntitySystem
     {
-        [Dependency] private readonly DeviceLinkSystem _signalSystem = default!;
+        [Dependency] private readonly SharedAudioSystem _audio = default!;
+        [Dependency] private readonly DeviceLinkSystem _signal = default!;
+        [Dependency] private readonly AppearanceSystem _appearance = default!;
 
         public override void Initialize()
         {
@@ -21,7 +24,8 @@ public override void Initialize()
 
         private void OnInit(EntityUid uid, SignalSwitchComponent component, ComponentInit args)
         {
-            _signalSystem.EnsureSourcePorts(uid, component.OnPort, component.OffPort);
+            _signal.EnsureSourcePorts(uid, component.OnPort, component.OffPort);
+            _appearance.SetData(uid, SignalSwitchVisuals.State, component.State);
         }
 
         private void OnActivated(EntityUid uid, SignalSwitchComponent component, ActivateInWorldEvent args)
@@ -30,9 +34,10 @@ private void OnActivated(EntityUid uid, SignalSwitchComponent component, Activat
                 return;
 
             component.State = !component.State;
-            _signalSystem.InvokePort(uid, component.State ? component.OnPort : component.OffPort);
-            SoundSystem.Play(component.ClickSound.GetSound(), Filter.Pvs(component.Owner), component.Owner,
-                AudioHelpers.WithVariation(0.125f).WithVolume(8f));
+
+            _appearance.SetData(uid, SignalSwitchVisuals.State, component.State);
+            _signal.InvokePort(uid, component.State ? component.OnPort : component.OffPort);
+            _audio.PlayPvs(component.ClickSound, uid);
 
             args.Handled = true;
         }

diff --git a/Content.Shared/DeviceLinking/SignalSwitchShared.cs b/Content.Shared/DeviceLinking/SignalSwitchShared.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.DeviceLinking;
+
+[Serializable, NetSerializable]
+public enum SignalSwitchVisuals
+{
+    State
+}
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -15,7 +15,9 @@
     canCollide: false
   - type: Sprite
     sprite: Structures/Wallmounts/switch.rsi
-    state: on
+    layers:
+    - state: off
+      map: [ "indicator" ]
   - type: SignalSwitch
   - type: UseDelay
     delay: 0.5 # prevent light-toggling auto-clickers.
@@ -32,6 +34,13 @@
     ports:
       - On
       - Off
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.SignalSwitchVisuals.State:
+        indicator:
+          True: {state: on}
+          False: {state: off}
 
 - type: entity
   id: SignalButton