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

Fix mobs playing a falling sound when dying from crit (#2425)

Browse Source 
* Fix falling sound playing twice when dying

* But actually
This commit is contained in:
DrSmugleaf
2020-10-29 10:26:23 +01:00
committed by GitHub
parent 650e7385b9
commit ec25dbe4a7
5 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/GameObjects/EntitySystems/StandingStateSystem.cs
View File

@@ -24,12 +24,6 @@ namespace Content.Client.GameObjects.EntitySystems
appearance.SetData(RotationVisuals.RotationState, newState); appearance.SetData(RotationVisuals.RotationState, newState);
} }
if (playSound)
{
var file = AudioHelpers.GetRandomFileFromSoundCollection("bodyfall");
Get<AudioSystem>().Play(file, entity, AudioHelpers.WithVariation(0.25f));
}
return true; return true;
} }

2
Content.Server/GameObjects/Components/Mobs/State/CriticalState.cs
View File

@@ -38,8 +38,6 @@ namespace Content.Server.GameObjects.Components.Mobs.State
public override void ExitState(IEntity entity) public override void ExitState(IEntity entity)
{ {
EntitySystem.Get<StandingStateSystem>().Standing(entity);
if (entity.TryGetComponent(out ServerOverlayEffectsComponent overlay)) if (entity.TryGetComponent(out ServerOverlayEffectsComponent overlay))
{ {
overlay.ClearOverlays(); overlay.ClearOverlays();

2
Content.Server/GameObjects/Components/Mobs/State/DeadState.cs
View File

@@ -44,8 +44,6 @@ namespace Content.Server.GameObjects.Components.Mobs.State
public override void ExitState(IEntity entity) public override void ExitState(IEntity entity)
{ {
EntitySystem.Get<StandingStateSystem>().Standing(entity);
if (entity.TryGetComponent(out IPhysicsComponent physics)) if (entity.TryGetComponent(out IPhysicsComponent physics))
{ {
physics.CanCollide = true; physics.CanCollide = true;

8
Content.Server/GameObjects/Components/Mobs/State/NormalState.cs
View File

@@ -1,10 +1,10 @@
using Content.Server.GameObjects.Components.Body; using Content.Server.GameObjects.Components.Damage;
using Content.Server.GameObjects.Components.Damage; using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Components.Body;
using Content.Shared.GameObjects.Components.Damage; using Content.Shared.GameObjects.Components.Damage;
using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.Components.Mobs.State; using Content.Shared.GameObjects.Components.Mobs.State;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
namespace Content.Server.GameObjects.Components.Mobs.State namespace Content.Server.GameObjects.Components.Mobs.State
@@ -13,6 +13,8 @@ namespace Content.Server.GameObjects.Components.Mobs.State
{ {
public override void EnterState(IEntity entity) public override void EnterState(IEntity entity)
{ {
EntitySystem.Get<StandingStateSystem>().Standing(entity);
if (entity.TryGetComponent(out AppearanceComponent appearance)) if (entity.TryGetComponent(out AppearanceComponent appearance))
{ {
appearance.SetData(DamageStateVisuals.State, DamageState.Alive); appearance.SetData(DamageStateVisuals.State, DamageState.Alive);

2
Content.Server/GameObjects/EntitySystems/StandingStateSystem.cs
View File

@@ -25,13 +25,13 @@ namespace Content.Server.GameObjects.EntitySystems
if (newState != oldState) if (newState != oldState)
{ {
appearance.SetData(RotationVisuals.RotationState, newState); appearance.SetData(RotationVisuals.RotationState, newState);
}
if (playSound) if (playSound)
{ {
var file = AudioHelpers.GetRandomFileFromSoundCollection("bodyfall"); var file = AudioHelpers.GetRandomFileFromSoundCollection("bodyfall");
Get<AudioSystem>().PlayFromEntity(file, entity, AudioHelpers.WithVariation(0.25f)); Get<AudioSystem>().PlayFromEntity(file, entity, AudioHelpers.WithVariation(0.25f));
} }
}
return true; return true;
} }