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

Fix knockdown help sound

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-01-09 12:17:13 +01:00
parent 670d277963
commit 7986c0ff73
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/GameObjects/Components/Mobs/StunnableComponent.cs
View File

@@ -12,12 +12,6 @@ namespace Content.Client.GameObjects.Components.Mobs
[ComponentReference(typeof(SharedStunnableComponent))] [ComponentReference(typeof(SharedStunnableComponent))]
public class StunnableComponent : SharedStunnableComponent public class StunnableComponent : SharedStunnableComponent
{ {
protected override void OnInteractHand()
{
EntitySystem.Get<AudioSystem>()
.Play("/Audio/Effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.25f));
}
public override void HandleComponentState(ComponentState? curState, ComponentState? nextState) public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
{ {
base.HandleComponentState(curState, nextState); base.HandleComponentState(curState, nextState);

8
Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs
View File

@@ -1,10 +1,12 @@
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Shared.Alert; using Content.Shared.Alert;
using Content.Shared.Audio;
using Content.Shared.Chemistry; using Content.Shared.Chemistry;
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.Components.Movement; using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Interfaces.GameObjects.Components;
using NFluidsynth; using NFluidsynth;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.Timers; using Robust.Shared.GameObjects.Components.Timers;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
@@ -108,6 +110,12 @@ namespace Content.Server.GameObjects.Components.Mobs
} }
} }
protected override void OnInteractHand()
{
EntitySystem.Get<AudioSystem>()
.PlayFromEntity("/Audio/Effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.05f));
}
public override ComponentState GetComponentState() public override ComponentState GetComponentState()
{ {
return new StunnableComponentState(StunnedTimer, KnockdownTimer, SlowdownTimer, WalkModifierOverride, return new StunnableComponentState(StunnedTimer, KnockdownTimer, SlowdownTimer, WalkModifierOverride,

2
Content.Shared/GameObjects/Components/Mobs/SharedStunnableComponent.cs
View File

@@ -232,6 +232,8 @@ namespace Content.Shared.GameObjects.Components.Mobs
KnockdownTimer -= _helpKnockdownRemove; KnockdownTimer -= _helpKnockdownRemove;
OnInteractHand();
SetAlert(); SetAlert();
Dirty(); Dirty();