Skip to content

Commit

Permalink
Throwing system hotfix (space-wizards#29935)
Browse files Browse the repository at this point in the history
throwing system hotfix
  • Loading branch information
slarticodefast authored and themias committed Aug 9, 2024
1 parent 1a132da commit 635696d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion Content.Shared/Hands/Components/HandsComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public sealed partial class HandsComponent : Component
/// </summary>
[DataField]
[ViewVariables(VVAccess.ReadWrite)]
public float BaseThrowspeed { get; set; } = 10f;
public float BaseThrowspeed { get; set; } = 11f;

/// <summary>
/// Distance after which longer throw targets stop increasing throw impulse.
Expand Down
8 changes: 0 additions & 8 deletions Content.Shared/Throwing/ThrowingSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ public sealed class ThrowingSystem : EntitySystem

public const float PushbackDefault = 2f;

/// <summary>
/// The minimum amount of time an entity needs to be thrown before the timer can be run.
/// Anything below this threshold never enters the air.
/// </summary>
public const float MinFlyTime = 0.15f;
public const float FlyTimePercentage = 0.8f;

private float _frictionModifier;
Expand Down Expand Up @@ -168,9 +163,6 @@ public void TryThrow(EntityUid uid,
var flyTime = direction.Length() / baseThrowSpeed;
if (compensateFriction)
flyTime *= FlyTimePercentage;

if (flyTime < MinFlyTime)
flyTime = 0f;
comp.ThrownTime = _gameTiming.CurTime;
comp.LandTime = comp.ThrownTime + TimeSpan.FromSeconds(flyTime);
comp.PlayLandSound = playSound;
Expand Down

0 comments on commit 635696d

Please sign in to comment.