tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#3935 - Refactored ToysComponent functionality into ECS (#4127)

Browse Source 
* #3935 - toys properly play sounds when: Activated, Landed (after throwing) and Used in hand

* #3935 - extracted BaseEmitSoundComponent

* #3935 - refactored EmitSound components to use ECS

* #3935 - added new components to client ignored components

* #3935 - added suggested stuff for EmitSoundSystem et al.

* #3935 added suggestions from PR

* #3935 implemented suggestions from PR

* #3935 updated namespace
This commit is contained in:
Galactic Chimp
2021-06-19 11:35:56 +02:00
committed by GitHub
parent 4093e2b5ba
commit 53671aeee7
9 changed files with 128 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Content.Server/Interaction/Components/EmitSoundOnUseComponent.cs
View File

@@ -1,45 +1,15 @@
using Content.Shared.Audio;
using Content.Shared.Interaction;
using Robust.Shared.Audio;
using Content.Server.Sound;
using Robust.Shared.GameObjects;
using Robust.Shared.Player;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.Interaction.Components
{
/// <summary>
/// Simple sound emitter that emits sound on use in hand
/// Simple sound emitter that emits sound on UseInHand
/// </summary>
[RegisterComponent]
public class EmitSoundOnUseComponent : Component, IUse
public class EmitSoundOnUseComponent : BaseEmitSoundComponent
{
/// <inheritdoc />
///
public override string Name => "EmitSoundOnUse";
[ViewVariables(VVAccess.ReadWrite)] [DataField("sound")] public string? _soundName;
[ViewVariables(VVAccess.ReadWrite)] [DataField("variation")] public float _pitchVariation;
[ViewVariables(VVAccess.ReadWrite)] [DataField("semitoneVariation")] public int _semitoneVariation;
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{
if (!string.IsNullOrWhiteSpace(_soundName))
{
if (_pitchVariation > 0.0)
{
SoundSystem.Play(Filter.Pvs(Owner), _soundName, Owner, AudioHelpers.WithVariation(_pitchVariation).WithVolume(-2f));
return true;
}
if (_semitoneVariation > 0)
{
SoundSystem.Play(Filter.Pvs(Owner), _soundName, Owner, AudioHelpers.WithSemitoneVariation(_semitoneVariation).WithVolume(-2f));
return true;
}
SoundSystem.Play(Filter.Pvs(Owner), _soundName, Owner, AudioParams.Default.WithVolume(-2f));
return true;
}
return false;
}
}
}