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

Add Slowdown to Dragging Items that Slow when Held (#29364)

Browse Source 
* Add slowdown to dragging Items that slow when held

* Heh, fancy

* Heh, fancy

* rename SetMovementSpeedModifiers to GetHeldMovementSpeedModifiers because it was not setting anything
This commit is contained in:
Cojoke
2024-07-01 00:33:08 -05:00
committed by GitHub
parent 195a1c1810
commit 7555952738
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Item/HeldSpeedModifierSystem.cs
View File

@@ -29,7 +29,7 @@ public sealed class HeldSpeedModifierSystem : EntitySystem
_movementSpeedModifier.RefreshMovementSpeedModifiers(args.User);
}
private void OnRefreshMovementSpeedModifiers(EntityUid uid, HeldSpeedModifierComponent component, HeldRelayedEvent<RefreshMovementSpeedModifiersEvent> args)
public (float,float) GetHeldMovementSpeedModifiers(EntityUid uid, HeldSpeedModifierComponent component)
{
var walkMod = component.WalkModifier;
var sprintMod = component.SprintModifier;
@@ -39,6 +39,12 @@ public sealed class HeldSpeedModifierSystem : EntitySystem
sprintMod = clothingSpeedModifier.SprintModifier;
}
return (walkMod, sprintMod);
}
private void OnRefreshMovementSpeedModifiers(EntityUid uid, HeldSpeedModifierComponent component, HeldRelayedEvent<RefreshMovementSpeedModifiersEvent> args)
{
var (walkMod, sprintMod) = GetHeldMovementSpeedModifiers(uid, component);
args.Args.ModifySpeed(walkMod, sprintMod);
}
}

11
Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
View File

@@ -8,6 +8,7 @@ using Content.Shared.Hands;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Input;
using Content.Shared.Interaction;
using Content.Shared.Item;
using Content.Shared.Movement.Events;
using Content.Shared.Movement.Pulling.Components;
using Content.Shared.Movement.Pulling.Events;
@@ -43,6 +44,7 @@ public sealed class PullingSystem : EntitySystem
[Dependency] private readonly SharedInteractionSystem _interaction = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly HeldSpeedModifierSystem _clothingMoveSpeed = default!;
public override void Initialize()
{
@@ -192,6 +194,14 @@ public sealed class PullingSystem : EntitySystem
private void OnRefreshMovespeed(EntityUid uid, PullerComponent component, RefreshMovementSpeedModifiersEvent args)
{
if (TryComp<HeldSpeedModifierComponent>(component.Pulling, out var heldMoveSpeed) && component.Pulling.HasValue)
{
var (walkMod, sprintMod) =
_clothingMoveSpeed.GetHeldMovementSpeedModifiers(component.Pulling.Value, heldMoveSpeed);
args.ModifySpeed(walkMod, sprintMod);
return;
}
args.ModifySpeed(component.WalkSpeedModifier, component.SprintSpeedModifier);
}
@@ -459,6 +469,7 @@ public sealed class PullingSystem : EntitySystem
// Messaging
var message = new PullStartedMessage(pullerUid, pullableUid);
_modifierSystem.RefreshMovementSpeedModifiers(pullerUid);
_alertsSystem.ShowAlert(pullerUid, pullerComp.PullingAlert);
_alertsSystem.ShowAlert(pullableUid, pullableComp.PulledAlert);