Move step sound distance and footstep variation to MobMoverComponent (#27799)
This commit is contained in:
parent
25de511094
commit
96b145c5e9
|
|
@ -14,6 +14,15 @@ namespace Content.Shared.Movement.Components
|
|||
|
||||
[DataField] public float PushStrength = 600f;
|
||||
|
||||
[DataField, AutoNetworkedField]
|
||||
public float StepSoundMoveDistanceRunning = 2;
|
||||
|
||||
[DataField, AutoNetworkedField]
|
||||
public float StepSoundMoveDistanceWalking = 1.5f;
|
||||
|
||||
[DataField, AutoNetworkedField]
|
||||
public float FootstepVariation;
|
||||
|
||||
[ViewVariables(VVAccess.ReadWrite)]
|
||||
public EntityCoordinates LastPosition { get; set; }
|
||||
|
||||
|
|
|
|||
|
|
@ -60,11 +60,6 @@ namespace Content.Shared.Movement.Systems
|
|||
protected EntityQuery<CanMoveInAirComponent> CanMoveInAirQuery;
|
||||
protected EntityQuery<NoRotateOnMoveComponent> NoRotateQuery;
|
||||
|
||||
private const float StepSoundMoveDistanceRunning = 2;
|
||||
private const float StepSoundMoveDistanceWalking = 1.5f;
|
||||
|
||||
private const float FootstepVariation = 0f;
|
||||
|
||||
/// <summary>
|
||||
/// <see cref="CCVars.StopSpeed"/>
|
||||
/// </summary>
|
||||
|
|
@ -260,7 +255,7 @@ namespace Content.Shared.Movement.Systems
|
|||
|
||||
var audioParams = sound.Params
|
||||
.WithVolume(sound.Params.Volume + soundModifier)
|
||||
.WithVariation(sound.Params.Variation ?? FootstepVariation);
|
||||
.WithVariation(sound.Params.Variation ?? mobMover.FootstepVariation);
|
||||
|
||||
// If we're a relay target then predict the sound for all relays.
|
||||
if (relayTarget != null)
|
||||
|
|
@ -406,7 +401,9 @@ namespace Content.Shared.Movement.Systems
|
|||
return false;
|
||||
|
||||
var coordinates = xform.Coordinates;
|
||||
var distanceNeeded = mover.Sprinting ? StepSoundMoveDistanceRunning : StepSoundMoveDistanceWalking;
|
||||
var distanceNeeded = mover.Sprinting
|
||||
? mobMover.StepSoundMoveDistanceRunning
|
||||
: mobMover.StepSoundMoveDistanceWalking;
|
||||
|
||||
// Handle footsteps.
|
||||
if (!weightless)
|
||||
|
|
|
|||
Loading…
Reference in New Issue