Fix EmbeddableProjectileComponent and ThrowingAngleComponent interaction (#30112)

* fix embeddable offset with throwing angle * number
2024-07-19 11:42:58 +02:00
parent e7911c3720
commit eaace152ae
2 changed files with 5 additions and 2 deletions
--- a/Content.Shared/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -120,7 +120,10 @@ public abstract partial class SharedProjectileSystem : EntitySystem

        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);
        }

--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -5,7 +5,7 @@
  description: Definition of a Classic. Keeping murder affordable since 200,000 BCE.
  components:
  - type: EmbeddableProjectile
-    offset: 0.15,0.15
+    offset: -0.15,0.0
  - type: ThrowingAngle
    angle: 225
  - type: LandAtCursor