Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

replacing sound (collection) names with SoundSpecifier - part 1

Browse Source
This commit is contained in:
Galactic Chimp
2021-07-10 17:35:33 +02:00
parent 4500b66f28
commit ce3c59e0e6
131 changed files with 934 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Crayon/CrayonComponent.cs
View File

@@ -9,6 +9,7 @@ using Content.Shared.Interaction;
using Content.Shared.Interaction.Helpers;
using Content.Shared.Notification;
using Content.Shared.Notification.Managers;
using Content.Shared.Sound;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
@@ -31,7 +32,7 @@ namespace Content.Server.Crayon
//TODO: useSound
[DataField("useSound")]
private string? _useSound = string.Empty;
private SoundSpecifier _useSound = default!;
[ViewVariables]
public Color Color { get; set; }
@@ -135,9 +136,9 @@ namespace Content.Server.Crayon
appearance.SetData(CrayonVisuals.Rotation, eventArgs.User.Transform.LocalRotation);
}
if (!string.IsNullOrEmpty(_useSound))
if (_useSound.TryGetSound(out var useSound))
{
SoundSystem.Play(Filter.Pvs(Owner), _useSound, Owner, AudioHelpers.WithVariation(0.125f));
SoundSystem.Play(Filter.Pvs(Owner), useSound, Owner, AudioHelpers.WithVariation(0.125f));
}
// Decrease "Ammo"