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

ECSatize CameraRecoilSystem (#5448)

Browse Source 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Acruid
2021-12-26 22:50:12 -08:00
committed by GitHub
parent e235002a54
commit b3b171da7f
11 changed files with 176 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
View File

@@ -3,9 +3,9 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Content.Server.Administration.Logs;
using Content.Server.Camera;
using Content.Server.Projectiles.Components;
using Content.Server.Weapon.Ranged.Ammunition.Components;
using Content.Shared.Camera;
using Content.Shared.Damage;
using Content.Shared.Database;
using Content.Shared.Examine;
@@ -208,9 +208,10 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
var direction = (targetPos - Entities.GetComponent<TransformComponent>(shooter).WorldPosition).ToAngle();
var angle = GetRecoilAngle(direction);
// This should really be client-side but for now we'll just leave it here
if (Entities.TryGetComponent(shooter, out CameraRecoilComponent? recoilComponent))
if (Entities.HasComponent<CameraRecoilComponent>(shooter))
{
recoilComponent.Kick(-angle.ToVec() * 0.15f);
var kick = -angle.ToVec() * 0.15f;
EntitySystem.Get<CameraRecoilSystem>().KickCamera(shooter, kick);
}
// This section probably needs tweaking so there can be caseless hitscan etc.