Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Re-implement recoil (#9406)

Browse Source 
* Re-implement recoil

Playing around with the values atm

* Update constants

* final tweaks
This commit is contained in:
metalgearsloth
2022-07-14 22:01:25 +10:00
committed by GitHub
parent d9e423cebb
commit 38fc066fb9
8 changed files with 76 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Camera/CameraRecoilSystem.cs Normal file
View File

@@ -0,0 +1,14 @@
using Content.Shared.Camera;
using Robust.Shared.Player;
namespace Content.Server.Camera;
public sealed class CameraRecoilSystem : SharedCameraRecoilSystem
{
public override void KickCamera(EntityUid euid, Vector2 kickback, CameraRecoilComponent? component = null)
{
if (!Resolve(euid, ref component, false)) return;
RaiseNetworkEvent(new CameraKickEvent(euid, kickback), Filter.Entities(euid));
}
}

2
Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
View File

@@ -31,7 +31,7 @@ public sealed partial class ExplosionSystem : EntitySystem
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly NodeGroupSystem _nodeGroupSystem = default!;
[Dependency] private readonly CameraRecoilSystem _recoilSystem = default!;
[Dependency] private readonly SharedCameraRecoilSystem _recoilSystem = default!;
[Dependency] private readonly EntityLookupSystem _entityLookup = default!;
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly ThrowingSystem _throwingSystem = default!;

4
Content.Server/Gravity/EntitySystems/GravityShakeSystem.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Server.Gravity.EntitySystems
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly CameraRecoilSystem _cameraRecoil = default!;
[Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!;
private Dictionary<EntityUid, uint> _gridsToShake = new();
@@ -83,7 +83,7 @@ namespace Content.Server.Gravity.EntitySystems
}
var kick = new Vector2(_random.NextFloat(), _random.NextFloat()) * GravityKick;
_cameraRecoil.KickCamera(player.AttachedEntity.Value, kick);
_sharedCameraRecoil.KickCamera(player.AttachedEntity.Value, kick);
}
}
}

4
Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
View File

@@ -29,7 +29,7 @@ namespace Content.Server.PneumaticCannon
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly StunSystem _stun = default!;
[Dependency] private readonly AtmosphereSystem _atmos = default!;
[Dependency] private readonly CameraRecoilSystem _cameraRecoil = default!;
[Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!;
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
[Dependency] private readonly ThrowingSystem _throwingSystem = default!;
[Dependency] private readonly StorageSystem _storageSystem = default!;
@@ -231,7 +231,7 @@ namespace Content.Server.PneumaticCannon
if (EntityManager.HasComponent<CameraRecoilComponent>(data.User))
{
var kick = Vector2.One * data.Strength;
_cameraRecoil.KickCamera(data.User, kick);
_sharedCameraRecoil.KickCamera(data.User, kick);
}
_throwingSystem.TryThrow(ent, data.Direction, data.Strength, data.User, GetPushbackRatioFromPower(comp.Power));

4
Content.Server/Projectiles/SharedProjectileSystem.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Server.Projectiles
{
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly CameraRecoilSystem _cameraRecoil = default!;
[Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!;
[Dependency] private readonly GunSystem _guns = default!;
public override void Initialize()
@@ -56,7 +56,7 @@ namespace Content.Server.Projectiles
if (HasComp<CameraRecoilComponent>(otherEntity))
{
var direction = args.OurFixture.Body.LinearVelocity.Normalized;
_cameraRecoil.KickCamera(otherEntity, direction);
_sharedCameraRecoil.KickCamera(otherEntity, direction);
}
if (component.DeleteOnCollide)