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

Fix laser collision logic wrt transparent entities (#1018)

Browse Source
This commit is contained in:
ComicIronic
2020-05-27 23:59:45 +01:00
committed by GitHub
parent ab6bc42a4a
commit a77c1125ce
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,10 +93,11 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan
var userPosition = user.Transform.WorldPosition; //Remember world positions are ephemeral and can only be used instantaneously var userPosition = user.Transform.WorldPosition; //Remember world positions are ephemeral and can only be used instantaneously
var angle = new Angle(clickLocation.Position - userPosition); var angle = new Angle(clickLocation.Position - userPosition);
var ray = new CollisionRay(userPosition, angle.ToVec(), (int)(CollisionGroup.Impassable | CollisionGroup.MobImpassable)); var ray = new CollisionRay(userPosition, angle.ToVec(), (int)(CollisionGroup.Opaque));
var rayCastResults = IoCManager.Resolve<IPhysicsManager>().IntersectRay(user.Transform.MapID, ray, MaxLength, user).ToList(); var rayCastResults = IoCManager.Resolve<IPhysicsManager>().IntersectRay(user.Transform.MapID, ray, MaxLength, user, returnOnFirstHit: false).ToList();
if (rayCastResults.Count == 1) //The first result is guaranteed to be the closest one
if (rayCastResults.Count >= 1)
{ {
Hit(rayCastResults[0], energyModifier, user); Hit(rayCastResults[0], energyModifier, user);
AfterEffects(user, rayCastResults[0], angle, energyModifier); AfterEffects(user, rayCastResults[0], angle, energyModifier);

1
Resources/Prototypes/Entities/Mobs/human.yml
View File

@@ -109,6 +109,7 @@
- VaultImpassable - VaultImpassable
- SmallImpassable - SmallImpassable
layer: layer:
- Opaque
- MobImpassable - MobImpassable
- type: Input - type: Input
context: "human" context: "human"