Skip to content

Mass Contests Affect Camera Shake #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DangerRevolution merged 2 commits into from
Jul 21, 2024
Merged

Mass Contests Affect Camera Shake #560

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57b6fab
Update CameraRecoilSystem.cs
VMSolidus Jul 18, 2024
bfcbcb8
Update CameraRecoilSystem.cs
VMSolidus Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Content.Client/Camera/CameraRecoilSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
using System.Numerics;
using Content.Shared.Camera;
using Content.Shared.CCVar;
using Content.Shared.Contests;
using Robust.Shared.Configuration;

namespace Content.Client.Camera;

public sealed class CameraRecoilSystem : SharedCameraRecoilSystem
{
[Dependency] private readonly IConfigurationManager _configManager = default!;
[Dependency] private readonly ContestsSystem _contests = default!;

private float _intensity;

Expand Down Expand Up @@ -37,15 +39,15 @@ public override void KickCamera(EntityUid uid, Vector2 recoil, CameraRecoilCompo
if (!Resolve(uid, ref component, false))
return;

recoil *= _intensity;
var massRatio = _contests.MassContest(uid);
var maxRecoil = KickMagnitudeMax / massRatio;
recoil *= _intensity / massRatio;

// Use really bad math to "dampen" kicks when we're already kicked.
var existing = component.CurrentKick.Length();
var dampen = existing / KickMagnitudeMax;
component.CurrentKick += recoil * (1 - dampen);
component.CurrentKick += recoil * (1 - existing);

if (component.CurrentKick.Length() > KickMagnitudeMax)
component.CurrentKick = component.CurrentKick.Normalized() * KickMagnitudeMax;
if (component.CurrentKick.Length() > maxRecoil)
component.CurrentKick = component.CurrentKick.Normalized() * maxRecoil;

component.LastKickTime = 0;
}
Expand Down