From 8b1af46a2b37fa6cff90124e150e63e06d9707fe Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sun, 13 Aug 2023 16:18:48 +0100
Subject: [PATCH] add throwing star (#18700)

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 .../EmbeddableProjectileComponent.cs          |   7 +
 .../Projectiles/SharedProjectileSystem.cs     | 241 +++++++++---------
 Resources/Audio/Weapons/attributions.yml      |   9 +
 Resources/Audio/Weapons/star_hit.ogg          | Bin 0 -> 6596 bytes
 .../Weapons/Throwable/throwing_stars.yml      |  26 ++
 .../Throwable/throwing_star.rsi/icon.png      | Bin 0 -> 676 bytes
 .../Throwable/throwing_star.rsi/meta.json     |  14 +
 7 files changed, 180 insertions(+), 117 deletions(-)
 create mode 100644 Resources/Audio/Weapons/star_hit.ogg
 create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml
 create mode 100644 Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/meta.json

diff --git a/Content.Shared/Projectiles/EmbeddableProjectileComponent.cs b/Content.Shared/Projectiles/EmbeddableProjectileComponent.cs
index 3fd46f6efb..cf9c15a10d 100644
--- a/Content.Shared/Projectiles/EmbeddableProjectileComponent.cs
+++ b/Content.Shared/Projectiles/EmbeddableProjectileComponent.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 
 namespace Content.Shared.Projectiles;
@@ -33,4 +34,10 @@ public sealed partial class EmbeddableProjectileComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("offset"), AutoNetworkedField]
     public Vector2 Offset = Vector2.Zero;
+
+    /// <summary>
+    /// Sound to play after embedding into a hit target.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField("sound"), AutoNetworkedField]
+    public SoundSpecifier? Sound;
 }
diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
index 541a2dfbee..9365956601 100644
--- a/Content.Shared/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -5,6 +5,7 @@ using Content.Shared.Projectiles;
 using Content.Shared.Sound.Components;
 using Content.Shared.Throwing;
 using Content.Shared.Weapons.Ranged.Components;
+using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Physics;
@@ -13,145 +14,151 @@ using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Projectiles
+namespace Content.Shared.Projectiles;
+
+public abstract class SharedProjectileSystem : EntitySystem
 {
-    public abstract class SharedProjectileSystem : EntitySystem
+    public const string ProjectileFixture = "projectile";
+
+    [Dependency] private readonly INetManager _netManager = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
     {
-        public const string ProjectileFixture = "projectile";
+        base.Initialize();
 
-        [Dependency] private readonly INetManager _netManager = default!;
-        [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-        [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-        [Dependency] private readonly SharedTransformSystem _transform = default!;
+        SubscribeLocalEvent<ProjectileComponent, PreventCollideEvent>(PreventCollision);
+        SubscribeLocalEvent<EmbeddableProjectileComponent, ProjectileHitEvent>(OnEmbedProjectileHit);
+        SubscribeLocalEvent<EmbeddableProjectileComponent, ThrowDoHitEvent>(OnEmbedThrowDoHit);
+        SubscribeLocalEvent<EmbeddableProjectileComponent, ActivateInWorldEvent>(OnEmbedActivate);
+        SubscribeLocalEvent<EmbeddableProjectileComponent, RemoveEmbeddedProjectileEvent>(OnEmbedRemove);
+    }
 
-        public override void Initialize()
+    private void OnEmbedActivate(EntityUid uid, EmbeddableProjectileComponent component, ActivateInWorldEvent args)
+    {
+        // Nuh uh
+        if (component.RemovalTime == null)
+            return;
+
+        if (args.Handled || !TryComp<PhysicsComponent>(uid, out var physics) || physics.BodyType != BodyType.Static)
+            return;
+
+        args.Handled = true;
+
+        _doAfter.TryStartDoAfter(new DoAfterArgs(args.User, component.RemovalTime.Value,
+            new RemoveEmbeddedProjectileEvent(), eventTarget: uid, target: uid)
         {
-            base.Initialize();
-            SubscribeLocalEvent<ProjectileComponent, PreventCollideEvent>(PreventCollision);
-            SubscribeLocalEvent<EmbeddableProjectileComponent, ProjectileHitEvent>(OnEmbedProjectileHit);
-            SubscribeLocalEvent<EmbeddableProjectileComponent, ThrowDoHitEvent>(OnEmbedThrowDoHit);
-            SubscribeLocalEvent<EmbeddableProjectileComponent, ActivateInWorldEvent>(OnEmbedActivate);
-            SubscribeLocalEvent<EmbeddableProjectileComponent, RemoveEmbeddedProjectileEvent>(OnEmbedRemove);
+            DistanceThreshold = SharedInteractionSystem.InteractionRange,
+        });
+    }
+
+    private void OnEmbedRemove(EntityUid uid, EmbeddableProjectileComponent component, RemoveEmbeddedProjectileEvent args)
+    {
+        // Whacky prediction issues.
+        if (args.Cancelled || _netManager.IsClient)
+            return;
+
+        if (component.DeleteOnRemove)
+        {
+            QueueDel(uid);
+            return;
         }
 
-        private void OnEmbedActivate(EntityUid uid, EmbeddableProjectileComponent component, ActivateInWorldEvent args)
+        var xform = Transform(uid);
+        TryComp<PhysicsComponent>(uid, out var physics);
+        _physics.SetBodyType(uid, BodyType.Dynamic, body: physics, xform: xform);
+        _transform.AttachToGridOrMap(uid, xform);
+
+        // Land it just coz uhhh yeah
+        var landEv = new LandEvent(args.User, true);
+        RaiseLocalEvent(uid, ref landEv);
+        _physics.WakeBody(uid, body: physics);
+    }
+
+    private void OnEmbedThrowDoHit(EntityUid uid, EmbeddableProjectileComponent component, ThrowDoHitEvent args)
+    {
+        Embed(uid, args.Target, component);
+    }
+
+    private void OnEmbedProjectileHit(EntityUid uid, EmbeddableProjectileComponent component, ref ProjectileHitEvent args)
+    {
+        Embed(uid, args.Target, component);
+
+        // Raise a specific event for projectiles.
+        if (TryComp<ProjectileComponent>(uid, out var projectile))
         {
-            // Nuh uh
-            if (component.RemovalTime == null)
-                return;
+            var ev = new ProjectileEmbedEvent(projectile.Shooter, projectile.Weapon, args.Target);
+            RaiseLocalEvent(uid, ref ev);
+        }
+    }
 
-            if (args.Handled || !TryComp<PhysicsComponent>(uid, out var physics) || physics.BodyType != BodyType.Static)
-                return;
+    private void Embed(EntityUid uid, EntityUid target, EmbeddableProjectileComponent component)
+    {
+        TryComp<PhysicsComponent>(uid, out var physics);
+        _physics.SetLinearVelocity(uid, Vector2.Zero, body: physics);
+        _physics.SetBodyType(uid, BodyType.Static, body: physics);
+        var xform = Transform(uid);
+        _transform.SetParent(uid, xform, target);
 
-            args.Handled = true;
-
-            _doAfter.TryStartDoAfter(new DoAfterArgs(args.User, component.RemovalTime.Value,
-                new RemoveEmbeddedProjectileEvent(), eventTarget: uid, target: uid)
-            {
-                DistanceThreshold = SharedInteractionSystem.InteractionRange,
-            });
+        if (component.Offset != Vector2.Zero)
+        {
+            _transform.SetLocalPosition(xform, xform.LocalPosition + xform.LocalRotation.RotateVec(component.Offset));
         }
 
-        private void OnEmbedRemove(EntityUid uid, EmbeddableProjectileComponent component, RemoveEmbeddedProjectileEvent args)
+        if (component.Sound != null)
         {
-            // Whacky prediction issues.
-            if (args.Cancelled || _netManager.IsClient)
-                return;
-
-            if (component.DeleteOnRemove)
-            {
-                QueueDel(uid);
-                return;
-            }
-
-            var xform = Transform(uid);
-            TryComp<PhysicsComponent>(uid, out var physics);
-            _physics.SetBodyType(uid, BodyType.Dynamic, body: physics, xform: xform);
-            _transform.AttachToGridOrMap(uid, xform);
-
-            // Land it just coz uhhh yeah
-            var landEv = new LandEvent(args.User, true);
-            RaiseLocalEvent(uid, ref landEv);
-            _physics.WakeBody(uid, body: physics);
+            _audio.PlayPredicted(component.Sound, uid, null);
         }
+    }
 
-        private void OnEmbedThrowDoHit(EntityUid uid, EmbeddableProjectileComponent component, ThrowDoHitEvent args)
+    private void PreventCollision(EntityUid uid, ProjectileComponent component, ref PreventCollideEvent args)
+    {
+        if (component.IgnoreShooter && args.OtherEntity == component.Shooter)
         {
-            Embed(uid, args.Target, component);
+            args.Cancelled = true;
         }
+    }
 
-        private void OnEmbedProjectileHit(EntityUid uid, EmbeddableProjectileComponent component, ref ProjectileHitEvent args)
-        {
-            Embed(uid, args.Target, component);
+    public void SetShooter(ProjectileComponent component, EntityUid uid)
+    {
+        if (component.Shooter == uid)
+            return;
 
-            // Raise a specific event for projectiles.
-            if (TryComp<ProjectileComponent>(uid, out var projectile))
-            {
-                var ev = new ProjectileEmbedEvent(projectile.Shooter, projectile.Weapon, args.Target);
-                RaiseLocalEvent(uid, ref ev);
-            }
-        }
-
-        private void Embed(EntityUid uid, EntityUid target, EmbeddableProjectileComponent component)
-        {
-            TryComp<PhysicsComponent>(uid, out var physics);
-            _physics.SetLinearVelocity(uid, Vector2.Zero, body: physics);
-            _physics.SetBodyType(uid, BodyType.Static, body: physics);
-            var xform = Transform(uid);
-            _transform.SetParent(uid, xform, target);
-
-            if (component.Offset != Vector2.Zero)
-            {
-                _transform.SetLocalPosition(xform, xform.LocalPosition + xform.LocalRotation.RotateVec(component.Offset));
-            }
-        }
-
-        private void PreventCollision(EntityUid uid, ProjectileComponent component, ref PreventCollideEvent args)
-        {
-            if (component.IgnoreShooter && args.OtherEntity == component.Shooter)
-            {
-                args.Cancelled = true;
-            }
-        }
-
-        public void SetShooter(ProjectileComponent component, EntityUid uid)
-        {
-            if (component.Shooter == uid)
-                return;
-
-            component.Shooter = uid;
-            Dirty(uid, component);
-        }
-
-        [Serializable, NetSerializable]
-        private sealed class RemoveEmbeddedProjectileEvent : DoAfterEvent
-        {
-            public override DoAfterEvent Clone() => this;
-        }
+        component.Shooter = uid;
+        Dirty(uid, component);
     }
 
     [Serializable, NetSerializable]
-    public sealed class ImpactEffectEvent : EntityEventArgs
+    private sealed class RemoveEmbeddedProjectileEvent : DoAfterEvent
     {
-        public string Prototype;
-        public EntityCoordinates Coordinates;
-
-        public ImpactEffectEvent(string prototype, EntityCoordinates coordinates)
-        {
-            Prototype = prototype;
-            Coordinates = coordinates;
-        }
+        public override DoAfterEvent Clone() => this;
     }
-
-    /// <summary>
-    /// Raised when entity is just about to be hit with projectile but can reflect it
-    /// </summary>
-    [ByRefEvent]
-    public record struct ProjectileReflectAttemptEvent(EntityUid ProjUid, ProjectileComponent Component, bool Cancelled);
-
-    /// <summary>
-    /// Raised when projectile hits other entity
-    /// </summary>
-    [ByRefEvent]
-    public readonly record struct ProjectileHitEvent(EntityUid Target);
 }
+
+[Serializable, NetSerializable]
+public sealed class ImpactEffectEvent : EntityEventArgs
+{
+    public string Prototype;
+    public EntityCoordinates Coordinates;
+
+    public ImpactEffectEvent(string prototype, EntityCoordinates coordinates)
+    {
+        Prototype = prototype;
+        Coordinates = coordinates;
+    }
+}
+
+/// <summary>
+/// Raised when entity is just about to be hit with projectile but can reflect it
+/// </summary>
+[ByRefEvent]
+public record struct ProjectileReflectAttemptEvent(EntityUid ProjUid, ProjectileComponent Component, bool Cancelled);
+
+/// <summary>
+/// Raised when projectile hits other entity
+/// </summary>
+[ByRefEvent]
+public readonly record struct ProjectileHitEvent(EntityUid Target);
diff --git a/Resources/Audio/Weapons/attributions.yml b/Resources/Audio/Weapons/attributions.yml
index 5eaba3cacb..6e59d34d59 100644
--- a/Resources/Audio/Weapons/attributions.yml
+++ b/Resources/Audio/Weapons/attributions.yml
@@ -19,3 +19,12 @@
   copyright: "User Mystovski on freesound.org. Modified by LankLTE on github."
   source: "https://freesound.org/people/Mystovski/sounds/201111/"
 
+- files: ["genhit3.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from tgstation."
+  source: "https://github.com/tgstation/tgstation/blob/a7f525bce9a359ab5282fc754078cd4b5678a006/sound/weapons/genhit3.ogg"
+
+- files: ["star_hit.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Based on genhit3.ogg from tgstation, modified by deltanedas on github."
+  source: "https://github.com/deltanedas"
diff --git a/Resources/Audio/Weapons/star_hit.ogg b/Resources/Audio/Weapons/star_hit.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..5de4051e8b84b10336e64fe001177ca01482636b
GIT binary patch
literal 6596
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

literal 0
HcmV?d00001

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml
new file mode 100644
index 0000000000..198f634c16
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml
@@ -0,0 +1,26 @@
+- type: entity
+  parent: BaseItem
+  id: ThrowingStar
+  name: throwing star
+  description: An ancient weapon still used to this day, due to its ease of lodging itself into its victim's body parts.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Throwable/throwing_star.rsi
+    state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 5
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/star_hit.ogg
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 8
+        Piercing: 10
diff --git a/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/icon.png b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..239b0304ab09683b2cc5ed3ebd90e8d901e75847
GIT binary patch
literal 676
zcmV;V0$crwP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004QX+uL$X=7sm
z04R}lk-JO7P!z_0ZLQW99dr<J$WX<hf+&ci*1@HSR0XRpN$f-DBP1;%u7Zn$;2^sA
z8vGA*6<ierK@mjU+<h%l;<={KB6`Ek`SIQR9ZtT0Kb|x5PQw`F3ne=-8Pn#I3tH0)
zA%Zm1$cSz_*7)>voPXEn9X?fW2UM^B@BO)2ms5@jzL4;UY1t)VnTGgk$x^%}+-YX@
zW#L2Ns4W8uUn$-2_*rqr<9EgOY+?fZs;8EzW227EteqF`7mnm}WwSbu`jWO(VQxlh
zx9lDq5=;_9!=TIxIZ6yjEl6g6`v!k}QxwHx%G+WMTO1j(;*E-0maZwOY0*>i<XBU=
z|IX7%4-a|W+hP!Wa^1IHXxf3ww(EW!xo+hc0*`P}sQHVM)98oj+chn60O1WdyR2!(
zE}U;d*Mp_o`i~Tl?N6uS^%UBZ&~XDTi(XdMb58DIc3pnaHSFy}pWF{GeFNm;XZ^uw
zdxZc1010qNS#tmY3labT3lag+-G2N4007)cL_t(o!|jx@4TCTcMZcp+Kw;6b0Sv$Z
zG;~bEC`{s#0T_S*U;{ct0aT!mM3gebiL5C1D$CaS-~Brq5ClOGENI(yv%TYH6WlZn
z>bl;XB`^#Fx~{WI!YYAvT`^6QRSWJ{1I}t$dEfV#=lNK_i@GXKF;-1sW6ZIi=Q(`e
zhv#{Sq6k@*Ax%^DQ3p8j96I)$)-TKQI19rNK@dP|jU-847QgJkGgVb>OlBNM#BqEG
zlcFfpS7+daf@}rdD9chgc?GnbeRuK?&}zECq5JvoSP%r^zu5s5wOd5rQC6S;0000<
KMNUMnLSTaZr8Efu

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/meta.json b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/meta.json
new file mode 100644
index 0000000000..44d65d9d5e
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created for SS14 by deltanedas (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}