using Content.Shared.Popups;
using Content.Shared.Slippery;
using Content.Shared.Fluids.Components;
+using Content.Shared.Friction;
using Content.Shared.StepTrigger.Components;
using Content.Shared.StepTrigger.Systems;
using Robust.Server.GameObjects;
[Dependency] private readonly SharedPopupSystem _popups = default!;
[Dependency] private readonly StepTriggerSystem _stepTrigger = default!;
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+ [Dependency] private readonly TileFrictionController _tile = default!;
public static float PuddleVolume = 1000;
{
var comp = EnsureComp<StepTriggerComponent>(entityUid);
_stepTrigger.SetActive(entityUid, true, comp);
+ var friction = EnsureComp<TileFrictionModifierComponent>(entityUid);
+ _tile.SetModifier(entityUid, TileFrictionController.DefaultFriction * 0.5f, friction);
}
else if (TryComp<StepTriggerComponent>(entityUid, out var comp))
{
_stepTrigger.SetActive(entityUid, false, comp);
+ RemCompDeferred<TileFrictionModifierComponent>(entityUid);
}
}
{
public sealed class TileFrictionController : VirtualController
{
- [Dependency] private readonly IMapManager _mapManager = default!;
+ [Dependency] private readonly IConfigurationManager _configManager = default!;
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
[Dependency] private readonly SharedGravitySystem _gravity = default!;
[Dependency] private readonly SharedMoverController _mover = default!;
private float _stopSpeed;
private float _frictionModifier;
- private const float DefaultFriction = 0.3f;
+ public const float DefaultFriction = 0.3f;
public override void Initialize()
{
base.Initialize();
- var configManager = IoCManager.Resolve<IConfigurationManager>();
-
- configManager.OnValueChanged(CCVars.TileFrictionModifier, SetFrictionModifier, true);
- configManager.OnValueChanged(CCVars.StopSpeed, SetStopSpeed, true);
-
- SubscribeLocalEvent<TileFrictionModifierComponent, ComponentGetState>(OnGetState);
- SubscribeLocalEvent<TileFrictionModifierComponent, ComponentHandleState>(OnHandleState);
- }
-
- private void OnHandleState(EntityUid uid, TileFrictionModifierComponent component, ref ComponentHandleState args)
- {
- if (args.Current is not TileFrictionComponentState tileState) return;
- component.Modifier = tileState.Modifier;
- }
-
- private void OnGetState(EntityUid uid, TileFrictionModifierComponent component, ref ComponentGetState args)
- {
- args.State = new TileFrictionComponentState(component.Modifier);
+ _configManager.OnValueChanged(CCVars.TileFrictionModifier, SetFrictionModifier, true);
+ _configManager.OnValueChanged(CCVars.StopSpeed, SetStopSpeed, true);
}
private void SetStopSpeed(float value) => _stopSpeed = value;
public override void Shutdown()
{
base.Shutdown();
- var configManager = IoCManager.Resolve<IConfigurationManager>();
- configManager.UnsubValueChanged(CCVars.TileFrictionModifier, SetFrictionModifier);
- configManager.UnsubValueChanged(CCVars.StopSpeed, SetStopSpeed);
+ _configManager.UnsubValueChanged(CCVars.TileFrictionModifier, SetFrictionModifier);
+ _configManager.UnsubValueChanged(CCVars.StopSpeed, SetStopSpeed);
}
public override void UpdateBeforeMapSolve(bool prediction, PhysicsMapComponent mapComponent, float frameTime)
var xformQuery = GetEntityQuery<TransformComponent>();
var pullerQuery = GetEntityQuery<SharedPullerComponent>();
var pullableQuery = GetEntityQuery<SharedPullableComponent>();
+ var gridQuery = GetEntityQuery<MapGridComponent>();
foreach (var body in mapComponent.AwakeBodies)
{
continue;
}
- var surfaceFriction = GetTileFriction(uid, body, xform);
+ var surfaceFriction = GetTileFriction(uid, body, xform, gridQuery, frictionQuery);
var bodyModifier = 1f;
if (frictionQuery.TryGetComponent(uid, out var frictionComp))
{
var speed = body.LinearVelocity.Length;
- if (speed <= 0.0f) return;
+ if (speed <= 0.0f)
+ return;
// This is the *actual* amount that speed will drop by, we just do some multiplication around it to be easier.
var drop = 0.0f;
{
var speed = MathF.Abs(body.AngularVelocity);
- if (speed <= 0.0f) return;
+ if (speed <= 0.0f)
+ return;
// This is the *actual* amount that speed will drop by, we just do some multiplication around it to be easier.
var drop = 0.0f;
}
[Pure]
- private float GetTileFriction(EntityUid uid, PhysicsComponent body, TransformComponent xform)
+ private float GetTileFriction(
+ EntityUid uid,
+ PhysicsComponent body,
+ TransformComponent xform,
+ EntityQuery<MapGridComponent> gridQuery,
+ EntityQuery<TileFrictionModifierComponent> frictionQuery)
{
// TODO: Make IsWeightless event-based; we already have grid traversals tracked so just raise events
if (_gravity.IsWeightless(uid, body, xform))
return 0.0f;
- if (!xform.Coordinates.IsValid(EntityManager)) return 0.0f;
+ if (!xform.Coordinates.IsValid(EntityManager))
+ return 0.0f;
- if (_mapManager.TryGetGrid(xform.GridUid, out var grid))
+ // If not on a grid then return the map's friction.
+ if (!gridQuery.TryGetComponent(xform.GridUid, out var grid))
{
- var tile = grid.GetTileRef(xform.Coordinates);
+ return frictionQuery.TryGetComponent(xform.MapUid, out var friction)
+ ? friction.Modifier
+ : DefaultFriction;
+ }
- // If it's a map but on an empty tile then just assume it has gravity.
- if (tile.Tile.IsEmpty &&
- HasComp<MapComponent>(xform.GridUid) &&
- (!TryComp<GravityComponent>(xform.GridUid, out var gravity) || gravity.Enabled))
- {
- return DefaultFriction;
- }
+ var tile = grid.GetTileRef(xform.Coordinates);
- var tileDef = _tileDefinitionManager[tile.Tile.TypeId];
- return tileDef.Friction;
+ // If it's a map but on an empty tile then just assume it has gravity.
+ if (tile.Tile.IsEmpty &&
+ HasComp<MapComponent>(xform.GridUid) &&
+ (!TryComp<GravityComponent>(xform.GridUid, out var gravity) || gravity.Enabled))
+ {
+ return DefaultFriction;
}
- return TryComp<TileFrictionModifierComponent>(xform.MapUid, out var friction) ? friction.Modifier : DefaultFriction;
+ // If there's an anchored ent that modifies friction then fallback to that instead.
+ var anc = grid.GetAnchoredEntitiesEnumerator(tile.GridIndices);
+
+ while (anc.MoveNext(out var tileEnt))
+ {
+ if (frictionQuery.TryGetComponent(tileEnt, out var friction))
+ return friction.Modifier;
+ }
+
+ var tileDef = _tileDefinitionManager[tile.Tile.TypeId];
+ return tileDef.Friction;
}
- [NetSerializable, Serializable]
- private sealed class TileFrictionComponentState : ComponentState
+ public void SetModifier(EntityUid entityUid, float value, TileFrictionModifierComponent? friction = null)
{
- public float Modifier;
+ if (!Resolve(entityUid, ref friction) || value.Equals(friction.Modifier))
+ return;
- public TileFrictionComponentState(float modifier)
- {
- Modifier = modifier;
- }
+ friction.Modifier = value;
+ Dirty(friction);
}
}
}
projects / space-station-14.git / commitdiff