Reduce puddle tile friction (#16375)

Content.Server/Fluids/EntitySystems/PuddleSystem.cs

@@ -13,6 +13,7 @@ using Content.Shared.Fluids;
 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;
@@ -45,6 +46,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
     [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;
 
@@ -307,10 +309,13 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
         {
             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);
         }
     }
 

Content.Shared/Friction/TileFrictionController.cs

@@ -20,7 +20,7 @@ namespace Content.Shared.Friction
 {
     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!;
@@ -28,30 +28,14 @@ namespace Content.Shared.Friction
 
         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);
-            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);
         }
 
         private void SetStopSpeed(float value) => _stopSpeed = value;
@@ -61,10 +45,9 @@ namespace Content.Shared.Friction
         public override void Shutdown()
         {
             base.Shutdown();
-            var configManager = IoCManager.Resolve<IConfigurationManager>();
 
-            configManager.UnsubValueChanged(CCVars.TileFrictionModifier, SetFrictionModifier);
+            _configManager.UnsubValueChanged(CCVars.TileFrictionModifier, SetFrictionModifier);
-            configManager.UnsubValueChanged(CCVars.StopSpeed, SetStopSpeed);
+            _configManager.UnsubValueChanged(CCVars.StopSpeed, SetStopSpeed);
         }
 
         public override void UpdateBeforeMapSolve(bool prediction, PhysicsMapComponent mapComponent, float frameTime)
@@ -75,6 +58,7 @@ namespace Content.Shared.Friction
             var xformQuery = GetEntityQuery<TransformComponent>();
             var pullerQuery = GetEntityQuery<SharedPullerComponent>();
             var pullableQuery = GetEntityQuery<SharedPullableComponent>();
+            var gridQuery = GetEntityQuery<MapGridComponent>();
 
             foreach (var body in mapComponent.AwakeBodies)
             {
@@ -97,7 +81,7 @@ namespace Content.Shared.Friction
                     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))
@@ -130,7 +114,8 @@ namespace Content.Shared.Friction
         {
             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;
@@ -161,7 +146,8 @@ namespace Content.Shared.Friction
         {
             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;
@@ -189,42 +175,58 @@ namespace Content.Shared.Friction
         }
 
         [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
-                // If it's a map but on an empty tile then just assume it has gravity.
+                    : DefaultFriction;
-                if (tile.Tile.IsEmpty &&
-                    HasComp<MapComponent>(xform.GridUid) &&
-                    (!TryComp<GravityComponent>(xform.GridUid, out var gravity) || gravity.Enabled))
-                {
-                    return DefaultFriction;
-                }
-
-                var tileDef = _tileDefinitionManager[tile.Tile.TypeId];
-                return tileDef.Friction;
             }
 
-            return TryComp<TileFrictionModifierComponent>(xform.MapUid, out var friction) ? friction.Modifier : DefaultFriction;
+            var tile = grid.GetTileRef(xform.Coordinates);
+
+            // 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;
+            }
+
+            // 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]
+        public void SetModifier(EntityUid entityUid, float value, TileFrictionModifierComponent? friction = null)
-        private sealed class TileFrictionComponentState : ComponentState
         {
-            public float Modifier;
+            if (!Resolve(entityUid, ref friction) || value.Equals(friction.Modifier))
+                return;
 
-            public TileFrictionComponentState(float modifier)
+            friction.Modifier = value;
-            {
+            Dirty(friction);
-                Modifier = modifier;
-            }
         }
     }
 }

Content.Shared/Friction/TileFrictionModifier.cs

@@ -1,14 +1,15 @@
-namespace Content.Shared.Friction
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Friction;
+
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(TileFrictionController)), AutoGenerateComponentState]
+public sealed partial class TileFrictionModifierComponent : Component
 {
-    [RegisterComponent]
+    /// <summary>
-    [Access(typeof(TileFrictionController))]
+    ///     Multiply the tilefriction cvar by this to get the body's actual tilefriction.
-    public sealed class TileFrictionModifierComponent : Component
+    /// </summary>
-    {
+    [ViewVariables(VVAccess.ReadWrite)]
-        /// <summary>
+    [DataField("modifier"), AutoNetworkedField]
-        ///     Multiply the tilefriction cvar by this to get the body's actual tilefriction.
+    public float Modifier;
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("modifier")]
-        public float Modifier;
-    }
 }

Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml

@@ -118,7 +118,7 @@
     sprite: Mobs/Silicon/Bots/honkbot.rsi
     state: honkbot
   - type: Slippery
-    launchForwardsMultiplier: 6.0
+    launchForwardsMultiplier: 2
   - type: StepTrigger
     intersectRatio: 0.2
   - type: Physics
@@ -167,7 +167,7 @@
     sprite: Mobs/Silicon/Bots/honkbot.rsi
     state: jonkbot
   - type: Slippery
-    launchForwardsMultiplier: 7.0
+    launchForwardsMultiplier: 2
   - type: Construction
     graph: JonkBot
     node: bot

Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

@@ -230,7 +230,7 @@
     heldPrefix: peel
   - type: Slippery
     paralyzeTime: 4
-    launchForwardsMultiplier: 5
+    launchForwardsMultiplier: 2
 
 - type: entity
   name: banana peel

Resources/Prototypes/Entities/Objects/Fun/error.yml

@@ -16,7 +16,7 @@
         - ReagentId: Nutriment
           Quantity: 5
   - type: Slippery
-    launchForwardsMultiplier: 20
+    launchForwardsMultiplier: 5
   - type: StepTrigger
     intersectRatio: 0.2
   - type: CollisionWake

Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml

@@ -70,7 +70,7 @@
     state: syndie
   - type: Slippery
     paralyzeTime: 5
-    launchForwardsMultiplier: 9.0
+    launchForwardsMultiplier: 2.5
   - type: StepTrigger
   - type: Item
     heldPrefix: syndie
@@ -99,7 +99,7 @@
     state: omega
   - type: Slippery
     paralyzeTime: 7
-    launchForwardsMultiplier: 9.0
+    launchForwardsMultiplier: 3
   - type: StepTrigger
   - type: Item
     heldPrefix: omega

Resources/Prototypes/Reagents/cleaning.yml

@@ -46,5 +46,5 @@
   tileReactions:
     - !type:SpillTileReaction
       paralyzeTime: 3
-      launchForwardsMultiplier: 4
+      launchForwardsMultiplier: 2
       requiredSlipSpeed: 1