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

#4219 some small project tweaks

Browse Source
This commit is contained in:
Galactic Chimp
2021-06-27 21:55:18 +02:00
parent 4a2b9832ce
commit 6cae00bb13
9 changed files with 8 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
using Content.Server.Sound;
using Content.Server.Sound.Components;
using Robust.Shared.GameObjects;
namespace Content.Server.Interaction.Components

2
Content.Server/Light/Components/ExpendableLightComponent.cs
View File

@@ -1,6 +1,6 @@
using Content.Server.Clothing.Components;
using Content.Server.Items;
using Content.Server.Sound;
using Content.Server.Sound.Components;
using Content.Shared.ActionBlocker;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Events;

2
Content.Server/Sound/BaseEmitSoundComponent.cs → Content.Server/Sound/Components/BaseEmitSoundComponent.cs
View File

@@ -2,7 +2,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.Sound
namespace Content.Server.Sound.Components
{
/// <summary>
/// Base sound emitter which defines most of the data fields.

2
Content.Server/Sound/EmitSoundOnActivateComponent.cs → Content.Server/Sound/Components/EmitSoundOnActivateComponent.cs
View File

@@ -1,6 +1,6 @@
using Robust.Shared.GameObjects;
namespace Content.Server.Sound
namespace Content.Server.Sound.Components
{
/// <summary>
/// Simple sound emitter that emits sound on ActivateInWorld

2
Content.Server/Sound/EmitSoundOnLandComponent.cs → Content.Server/Sound/Components/EmitSoundOnLandComponent.cs
View File

@@ -1,6 +1,6 @@
using Robust.Shared.GameObjects;
namespace Content.Server.Sound
namespace Content.Server.Sound.Components
{
/// <summary>
/// Simple sound emitter that emits sound on LandEvent

2
Content.Server/Sound/LoopingLoopingSoundComponent.cs → Content.Server/Sound/Components/LoopingLoopingSoundComponent.cs
View File

@@ -3,7 +3,7 @@ using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.Network;
namespace Content.Server.Sound
namespace Content.Server.Sound.Components
{
[RegisterComponent]
public class LoopingLoopingSoundComponent : SharedLoopingSoundComponent

1
Content.Server/Sound/EmitSoundSystem.cs
View File

@@ -2,6 +2,7 @@ using Content.Shared.Audio;
using Content.Shared.Interaction;
using Content.Shared.Throwing;
using Content.Server.Interaction.Components;
using Content.Server.Sound.Components;
using Content.Server.Throwing;
using JetBrains.Annotations;
using Robust.Shared.Audio;

2
Content.Server/Throwing/EmitSoundOnThrowComponent.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Sound;
using Content.Server.Sound.Components;
using Robust.Shared.GameObjects;
namespace Content.Server.Throwing

59
Content.Server/Toys/ToysComponent.cs
View File

@@ -1,59 +0,0 @@
using Content.Shared.Audio;
using Content.Shared.Interaction;
using Content.Shared.Throwing;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.Toys
{
[RegisterComponent]
public class ToysComponent : Component, IActivate, IUse, ILand
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IRobustRandom _random = default!;
public override string Name => "Toys";
[ViewVariables]
[DataField("toySqueak")]
public string _soundCollectionName = "ToySqueak";
public void Squeak()
{
PlaySqueakEffect();
}
public void PlaySqueakEffect()
{
if (!string.IsNullOrWhiteSpace(_soundCollectionName))
{
var soundCollection = _prototypeManager.Index<SoundCollectionPrototype>(_soundCollectionName);
var file = _random.Pick(soundCollection.PickFiles);
SoundSystem.Play(Filter.Pvs(Owner), file, Owner, AudioParams.Default);
}
}
void IActivate.Activate(ActivateEventArgs eventArgs)
{
Squeak();
}
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{
Squeak();
return false;
}
void ILand.Land(LandEventArgs eventArgs)
{
Squeak();
}
}
}