Misc state handling changes (#9265)
* misc state handling changes * ambient dirtying
This commit is contained in:
@@ -131,10 +131,6 @@ namespace Content.Client.Actions
|
|||||||
|
|
||||||
private void HandleState(EntityUid uid, ActionsComponent component, ref ComponentHandleState args)
|
private void HandleState(EntityUid uid, ActionsComponent component, ref ComponentHandleState args)
|
||||||
{
|
{
|
||||||
// Client only needs to care about local player.
|
|
||||||
if (uid != _playerManager.LocalPlayer?.ControlledEntity)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (args.Current is not ActionsComponentState state)
|
if (args.Current is not ActionsComponentState state)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -207,13 +203,13 @@ namespace Content.Client.Actions
|
|||||||
|
|
||||||
public override void AddAction(EntityUid uid, ActionType action, EntityUid? provider, ActionsComponent? comp = null, bool dirty = true)
|
public override void AddAction(EntityUid uid, ActionType action, EntityUid? provider, ActionsComponent? comp = null, bool dirty = true)
|
||||||
{
|
{
|
||||||
if (uid != _playerManager.LocalPlayer?.ControlledEntity)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!Resolve(uid, ref comp, false))
|
if (!Resolve(uid, ref comp, false))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
base.AddAction(uid, action, provider, comp, dirty);
|
base.AddAction(uid, action, provider, comp, dirty);
|
||||||
|
|
||||||
|
|
||||||
|
if (uid == _playerManager.LocalPlayer?.ControlledEntity)
|
||||||
UIDirty = true;
|
UIDirty = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -99,10 +99,8 @@ namespace Content.Client.Audio
|
|||||||
if(_playMan.LocalPlayer is null || _playMan.LocalPlayer.ControlledEntity != message.Entity ||
|
if(_playMan.LocalPlayer is null || _playMan.LocalPlayer.ControlledEntity != message.Entity ||
|
||||||
!_timing.IsFirstTimePredicted) return;
|
!_timing.IsFirstTimePredicted) return;
|
||||||
|
|
||||||
if (!TryComp<TransformComponent>(message.Entity, out var xform)) return;
|
|
||||||
|
|
||||||
// Check if we traversed to grid.
|
// Check if we traversed to grid.
|
||||||
if (_mapManager.TryGetGrid(xform.GridUid, out var grid))
|
if (message.Transform.GridUid != null)
|
||||||
{
|
{
|
||||||
if (_currentCollection == _stationAmbience) return;
|
if (_currentCollection == _stationAmbience) return;
|
||||||
ChangeAmbience(_stationAmbience);
|
ChangeAmbience(_stationAmbience);
|
||||||
|
|||||||
@@ -409,6 +409,7 @@ public abstract class SharedActionsSystem : EntitySystem
|
|||||||
|
|
||||||
var provided = comp.Actions.Where(act => act.Provider == provider).ToList();
|
var provided = comp.Actions.Where(act => act.Provider == provider).ToList();
|
||||||
|
|
||||||
|
if (provided.Count > 0)
|
||||||
RemoveActions(uid, provided, comp);
|
RemoveActions(uid, provided, comp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ namespace Content.Shared.Audio
|
|||||||
ambience.Enabled == value) return;
|
ambience.Enabled == value) return;
|
||||||
|
|
||||||
ambience.Enabled = value;
|
ambience.Enabled = value;
|
||||||
ambience.Dirty();
|
Dirty(ambience);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void HandleCompState(EntityUid uid, AmbientSoundComponent component, ref ComponentHandleState args)
|
private void HandleCompState(EntityUid uid, AmbientSoundComponent component, ref ComponentHandleState args)
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ namespace Content.Shared.Movement.Components
|
|||||||
public float SprintSpeedModifier = 1.0f;
|
public float SprintSpeedModifier = 1.0f;
|
||||||
|
|
||||||
[ViewVariables(VVAccess.ReadWrite)]
|
[ViewVariables(VVAccess.ReadWrite)]
|
||||||
public float BaseWalkSpeedVV
|
private float _baseWalkSpeedVV
|
||||||
{
|
{
|
||||||
get => BaseWalkSpeed;
|
get => BaseWalkSpeed;
|
||||||
set
|
set
|
||||||
@@ -28,7 +28,7 @@ namespace Content.Shared.Movement.Components
|
|||||||
}
|
}
|
||||||
|
|
||||||
[ViewVariables(VVAccess.ReadWrite)]
|
[ViewVariables(VVAccess.ReadWrite)]
|
||||||
public float BaseSprintSpeedVV
|
private float _baseSprintSpeedVV
|
||||||
{
|
{
|
||||||
get => BaseSprintSpeed;
|
get => BaseSprintSpeed;
|
||||||
set
|
set
|
||||||
|
|||||||
@@ -42,9 +42,12 @@ namespace Content.Shared.Movement.Systems
|
|||||||
var ev = new RefreshMovementSpeedModifiersEvent();
|
var ev = new RefreshMovementSpeedModifiersEvent();
|
||||||
RaiseLocalEvent(uid, ev);
|
RaiseLocalEvent(uid, ev);
|
||||||
|
|
||||||
|
if (MathHelper.CloseTo(ev.WalkSpeedModifier, move.WalkSpeedModifier) &&
|
||||||
|
MathHelper.CloseTo(ev.SprintSpeedModifier, move.SprintSpeedModifier))
|
||||||
|
return;
|
||||||
|
|
||||||
move.WalkSpeedModifier = ev.WalkSpeedModifier;
|
move.WalkSpeedModifier = ev.WalkSpeedModifier;
|
||||||
move.SprintSpeedModifier = ev.SprintSpeedModifier;
|
move.SprintSpeedModifier = ev.SprintSpeedModifier;
|
||||||
|
|
||||||
Dirty(move);
|
Dirty(move);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -265,6 +265,8 @@
|
|||||||
components:
|
components:
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
state: off
|
state: off
|
||||||
|
- type: AmbientSound
|
||||||
|
enabled: true
|
||||||
- type: PoweredLight
|
- type: PoweredLight
|
||||||
hasLampOnSpawn: LightBulb
|
hasLampOnSpawn: LightBulb
|
||||||
damage:
|
damage:
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
components:
|
components:
|
||||||
- type: AmbientOnPowered
|
- type: AmbientOnPowered
|
||||||
- type: AmbientSound
|
- type: AmbientSound
|
||||||
enabled: false
|
|
||||||
volume: -9
|
volume: -9
|
||||||
range: 3
|
range: 3
|
||||||
sound:
|
sound:
|
||||||
|
|||||||
Reference in New Issue
Block a user