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

Fix #1016 (#1068)

Browse Source
This commit is contained in:
Clyybber
2020-06-03 17:06:14 +02:00
committed by GitHub
parent 0f43e5e6ad
commit 892d6b425d
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs
View File

@@ -100,7 +100,11 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan
if (rayCastResults.Count >= 1) if (rayCastResults.Count >= 1)
{ {
Hit(rayCastResults[0], energyModifier, user); Hit(rayCastResults[0], energyModifier, user);
AfterEffects(user, rayCastResults[0], angle, energyModifier); AfterEffects(user, rayCastResults[0].Distance, angle, energyModifier);
}
else
{
AfterEffects(user, MaxLength, angle, energyModifier);
} }
} }
@@ -114,17 +118,16 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan
} }
} }
protected virtual void AfterEffects(IEntity user, RayCastResults ray, Angle angle, float energyModifier) protected virtual void AfterEffects(IEntity user, float distance, Angle angle, float energyModifier)
{ {
var time = IoCManager.Resolve<IGameTiming>().CurTime; var time = IoCManager.Resolve<IGameTiming>().CurTime;
var dist = ray.Distance; var offset = angle.ToVec() * distance / 2;
var offset = angle.ToVec() * dist / 2;
var message = new EffectSystemMessage var message = new EffectSystemMessage
{ {
EffectSprite = _spritename, EffectSprite = _spritename,
Born = time, Born = time,
DeathTime = time + TimeSpan.FromSeconds(1), DeathTime = time + TimeSpan.FromSeconds(1),
Size = new Vector2(dist, 1f), Size = new Vector2(distance, 1f),
Coordinates = user.Transform.GridPosition.Translated(offset), Coordinates = user.Transform.GridPosition.Translated(offset),
//Rotated from east facing //Rotated from east facing
Rotation = (float) angle.Theta, Rotation = (float) angle.Theta,