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

30
Content.Server/WireHacking/WiresComponent.cs
View File

@@ -11,6 +11,7 @@ using Content.Shared.Examine;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Helpers;
using Content.Shared.Notification.Managers;
using Content.Shared.Sound;
using Content.Shared.Tool;
using Content.Shared.Wires;
using JetBrains.Annotations;
@@ -146,6 +147,15 @@ namespace Content.Server.WireHacking
[DataField("LayoutId")]
private string? _layoutId = default;
[DataField("pulseSound")]
private SoundSpecifier _pulseSound = new SoundPathSpecifier("/Audio/Effects/multitool_pulse.ogg");
[DataField("screwdriverOpenSound")]
private SoundSpecifier _screwdriverOpenSound = new SoundPathSpecifier("/Audio/Machines/screwdriveropen.ogg");
[DataField("screwdriverCloseSound")]
private SoundSpecifier _screwdriverCloseSound = new SoundPathSpecifier("/Audio/Machines/screwdriverclose.ogg");
[ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(WiresUiKey.Key);
protected override void Initialize()
@@ -447,7 +457,8 @@ namespace Content.Server.WireHacking
return;
}
SoundSystem.Play(Filter.Pvs(Owner), "/Audio/Effects/multitool_pulse.ogg", Owner);
if(_pulseSound.TryGetSound(out var pulseSound))
SoundSystem.Play(Filter.Pvs(Owner), pulseSound, Owner);
break;
}
@@ -497,8 +508,21 @@ namespace Content.Server.WireHacking
else if (await tool.UseTool(eventArgs.User, Owner, 0.5f, ToolQuality.Screwing))
{
IsPanelOpen = !IsPanelOpen;
SoundSystem.Play(Filter.Pvs(Owner), IsPanelOpen ? "/Audio/Machines/screwdriveropen.ogg" : "/Audio/Machines/screwdriverclose.ogg",
Owner);
if (IsPanelOpen)
{
if(_screwdriverOpenSound.TryGetSound(out var openSound))
{
SoundSystem.Play(Filter.Pvs(Owner), openSound, Owner);
}
}
else
{
if (_screwdriverCloseSound.TryGetSound(out var closeSound))
{
SoundSystem.Play(Filter.Pvs(Owner), closeSound, Owner);
}
}
return true;
}