tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

15
Content.Server/Tools/Components/MultitoolComponent.cs
View File

@@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.Collections.Generic;
using Content.Shared.Interaction;
using Content.Shared.NetIDs;
using Content.Shared.Sound;
using Content.Shared.Tool;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
@@ -32,13 +33,10 @@ namespace Content.Server.Tools.Components
public string Sprite { get; } = string.Empty;
[DataField("useSound")]
public string Sound { get; } = string.Empty;
[DataField("useSoundCollection")]
public string SoundCollection { get; } = string.Empty;
public SoundSpecifier Sound { get; } = default!;
[DataField("changeSound")]
public string ChangeSound { get; } = string.Empty;
public SoundSpecifier ChangeSound { get; } = default!;
}
public override string Name => "MultiTool";
@@ -62,8 +60,8 @@ namespace Content.Server.Tools.Components
_currentTool = (_currentTool + 1) % _tools.Count;
SetTool();
var current = _tools[_currentTool];
if(!string.IsNullOrEmpty(current.ChangeSound))
SoundSystem.Play(Filter.Pvs(Owner), current.ChangeSound, Owner);
if(current.ChangeSound.TryGetSound(out var changeSound))
SoundSystem.Play(Filter.Pvs(Owner), changeSound, Owner);
}
private void SetTool()
@@ -73,7 +71,6 @@ namespace Content.Server.Tools.Components
var current = _tools[_currentTool];
_tool.UseSound = current.Sound;
_tool.UseSoundCollection = current.SoundCollection;
_tool.Qualities = current.Behavior;
if (_sprite == null) return;