ECSatize CameraRecoilSystem (#5448)

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

View File

@@ -2,9 +2,9 @@ using System;
using System.Collections.Generic;
using System.Linq;
using Content.Server.Administration.Logs;
using Content.Server.Camera;
using Content.Server.Explosion.Components;
using Content.Shared.Acts;
using Content.Shared.Camera;
using Content.Shared.Database;
using Content.Shared.Interaction.Helpers;
using Content.Shared.Maps;
@@ -51,6 +51,7 @@ namespace Content.Server.Explosion.EntitySystems
[Dependency] private readonly EffectSystem _effects = default!;
[Dependency] private readonly TriggerSystem _triggers = default!;
[Dependency] private readonly AdminLogSystem _logSystem = default!;
[Dependency] private readonly CameraRecoilSystem _cameraRecoil = default!;
private bool IgnoreExplosivePassable(EntityUid e)
{
@@ -82,7 +83,7 @@ namespace Content.Server.Explosion.EntitySystems
foreach (var player in players)
{
if (player.AttachedEntity is not {Valid: true} playerEntity ||
!EntityManager.TryGetComponent(playerEntity, out CameraRecoilComponent? recoil))
!EntityManager.HasComponent<CameraRecoilComponent>(playerEntity))
{
continue;
}
@@ -99,7 +100,7 @@ namespace Content.Server.Explosion.EntitySystems
if (effect > 0.01f)
{
var kick = -delta.Normalized * effect;
recoil.Kick(kick);
_cameraRecoil.KickCamera(player.AttachedEntity.Value, kick);
}
}
}