tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make hitscan effects use grid / map coordinates (#5621)

Browse Source
This commit is contained in:
metalgearsloth
2021-12-01 00:38:13 +11:00
committed by GitHub
parent c5ba483be5
commit 4c2f915e7e
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Server/Projectiles/Components/HitscanComponent.cs
View File

@@ -53,7 +53,18 @@ namespace Content.Server.Projectiles.Components
_startTime = _gameTiming.CurTime; _startTime = _gameTiming.CurTime;
_deathTime = _startTime + TimeSpan.FromSeconds(1); _deathTime = _startTime + TimeSpan.FromSeconds(1);
var afterEffect = AfterEffects(user.Transform.Coordinates, angle, distance, 1.0f); var mapManager = IoCManager.Resolve<IMapManager>();
// We'll get the effects relative to the grid / map of the firer
var gridOrMap = user.Transform.GridID == GridId.Invalid ? mapManager.GetMapEntityId(user.Transform.MapID) :
mapManager.GetGrid(user.Transform.GridID).GridEntityId;
var parentXform = Owner.EntityManager.GetComponent<TransformComponent>(gridOrMap);
var localCoordinates = new EntityCoordinates(gridOrMap, parentXform.InvWorldMatrix.Transform(user.Transform.WorldPosition));
var localAngle = angle - parentXform.WorldRotation;
var afterEffect = AfterEffects(localCoordinates, localAngle, distance, 1.0f);
if (afterEffect != null) if (afterEffect != null)
{ {
effectSystem.CreateParticle(afterEffect); effectSystem.CreateParticle(afterEffect);
@@ -62,13 +73,13 @@ namespace Content.Server.Projectiles.Components
// if we're too close we'll stop the impact and muzzle / impact sprites from clipping // if we're too close we'll stop the impact and muzzle / impact sprites from clipping
if (distance > 1.0f) if (distance > 1.0f)
{ {
var impactEffect = ImpactFlash(distance, angle); var impactEffect = ImpactFlash(distance, localAngle);
if (impactEffect != null) if (impactEffect != null)
{ {
effectSystem.CreateParticle(impactEffect); effectSystem.CreateParticle(impactEffect);
} }
var muzzleEffect = MuzzleFlash(user.Transform.Coordinates, angle); var muzzleEffect = MuzzleFlash(localCoordinates, localAngle);
if (muzzleEffect != null) if (muzzleEffect != null)
{ {
effectSystem.CreateParticle(muzzleEffect); effectSystem.CreateParticle(muzzleEffect);
@@ -78,8 +89,8 @@ namespace Content.Server.Projectiles.Components
if (hitEntity != null && _soundHitWall != null) if (hitEntity != null && _soundHitWall != null)
{ {
// TODO: No wall component so ? // TODO: No wall component so ?
var offset = angle.ToVec().Normalized / 2; var offset = localAngle.ToVec().Normalized / 2;
var coordinates = user.Transform.Coordinates.Offset(offset); var coordinates = localCoordinates.Offset(offset);
SoundSystem.Play(Filter.Pvs(coordinates), _soundHitWall.GetSound(), coordinates); SoundSystem.Play(Filter.Pvs(coordinates), _soundHitWall.GetSound(), coordinates);
} }