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

Fix EmbeddableProjectileComponent and ThrowingAngleComponent interaction (#30112)

Browse Source 
* fix embeddable offset with throwing angle

* number
This commit is contained in:
slarticodefast
2024-07-19 11:42:58 +02:00
committed by GitHub
parent e7911c3720
commit eaace152ae
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Projectiles/SharedProjectileSystem.cs
View File

@@ -120,7 +120,10 @@ public abstract partial class SharedProjectileSystem : EntitySystem
if (component.Offset != Vector2.Zero) if (component.Offset != Vector2.Zero)
{ {
_transform.SetLocalPosition(uid, xform.LocalPosition + xform.LocalRotation.RotateVec(component.Offset), var rotation = xform.LocalRotation;
if (TryComp<ThrowingAngleComponent>(uid, out var throwingAngleComp))
rotation += throwingAngleComp.Angle;
_transform.SetLocalPosition(uid, xform.LocalPosition + rotation.RotateVec(component.Offset),
xform); xform);
} }

2
Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
View File

@@ -5,7 +5,7 @@
description: Definition of a Classic. Keeping murder affordable since 200,000 BCE. description: Definition of a Classic. Keeping murder affordable since 200,000 BCE.
components: components:
- type: EmbeddableProjectile - type: EmbeddableProjectile
offset: 0.15,0.15 offset: -0.15,0.0
- type: ThrowingAngle - type: ThrowingAngle
angle: 225 angle: 225
- type: LandAtCursor - type: LandAtCursor