Понижение макс громкости и радиуса слышимости

space-sunrise · Jun 21, 2024 · 3669529 · 3669529
1 parent 5f190a2
commit 3669529
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/Content.Server/_Sunrise/TapePlayer/TapePlayerSystem.cs b/Content.Server/_Sunrise/TapePlayer/TapePlayerSystem.cs
@@ -84,8 +84,10 @@ private void OnTapePlayerPlay(EntityUid uid, TapePlayerComponent component, ref
                 return;
             }
 
+            var volume = SharedAudioSystem.GainToVolume(component.Volume) - component.DecreaseVolume;
+
             var audioParams = AudioParams.Default
-                .WithVolume(SharedAudioSystem.GainToVolume(component.Volume))
+                .WithVolume(volume)
                 .WithMaxDistance(component.MaxDistance)
                 .WithRolloffFactor(component.RolloffFactor)
                 .WithLoop(component.Loop);
@@ -119,7 +121,8 @@ private void OnTapePlayerSetTime(EntityUid uid, TapePlayerComponent component, T
     private void OnTapePlayerSetVolume(EntityUid uid, TapePlayerComponent component, TapePlayerSetVolumeMessage args)
     {
         component.Volume = args.Volume;
-        Audio.SetVolume(component.AudioStream, SharedAudioSystem.GainToVolume(args.Volume));
+        var volume = SharedAudioSystem.GainToVolume(component.Volume) - component.DecreaseVolume;
+        Audio.SetVolume(component.AudioStream, volume);
         Dirty(uid, component);
     }
 

diff --git a/Content.Shared/_Sunrise/TapePlayer/TapePlayerComponent.cs b/Content.Shared/_Sunrise/TapePlayer/TapePlayerComponent.cs
@@ -24,6 +24,10 @@ public sealed partial class TapePlayerComponent : Component
     [ViewVariables]
     public float Volume = 0.5f;
 
+    [DataField]
+    [ViewVariables]
+    public float DecreaseVolume = 0f;
+
     [DataField]
     [ViewVariables(VVAccess.ReadWrite)]
     public float RolloffFactor = 1f;

diff --git a/Resources/Prototypes/Entities/Structures/Machines/jukebox.yml b/Resources/Prototypes/Entities/Structures/Machines/jukebox.yml
@@ -13,8 +13,9 @@
     anchored: true
   # Sunrise-Start
   - type: TapePlayer
-    rolloffFactor: 1
-    maxDistance: 20
+    rolloffFactor: 1.5
+    maxDistance: 15
+    decreaseVolume: 5
     tapeSlot:
       insertSound: /Audio/_Sunrise/TapePlayer/insert_tape.ogg
       ejectSound: /Audio/_Sunrise/TapePlayer/eject_tape.ogg

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/boombox.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/boombox.yml
@@ -12,8 +12,9 @@
     - state: "off"
       map: ["enum.TapePlayerVisualLayers.Base"]
   - type: TapePlayer
-    rolloffFactor: 1.2
-    maxDistance: 15
+    rolloffFactor: 2
+    maxDistance: 10
+    decreaseVolume: 5
   - type: MeleeWeapon
     attackRate: 0.75
     damage:
@@ -40,6 +41,7 @@
   - type: TapePlayer
     rolloffFactor: 1
     maxDistance: 20
+    decreaseVolume: 0
   - type: MeleeWeapon
     attackRate: 0.75
     damage:

diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/tape_player.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/tape_player.yml
@@ -11,8 +11,9 @@
     - state: "off"
       map: ["enum.TapePlayerVisualLayers.Base"]
   - type: TapePlayer
-    rolloffFactor: 1.2
-    maxDistance: 10
+    rolloffFactor: 3
+    maxDistance: 5
+    decreaseVolume: 10
     tapeSlot:
       insertSound: /Audio/_Sunrise/TapePlayer/insert_tape.ogg
       ejectSound: /Audio/_Sunrise/TapePlayer/eject_tape.ogg