Punching and melee hitsounds now have unique SoundCollections (#5748)

2021-12-11 20:12:40 -03:00
parent ad79a11c88
commit c041a8339f
4 changed files with 16 additions and 1 deletions
--- a/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs
+++ b/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs
@@ -14,7 +14,7 @@ namespace Content.Server.Weapon.Melee.Components

        [ViewVariables(VVAccess.ReadWrite)]
        [DataField("hitSound")]
-        public SoundSpecifier HitSound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/genhit1.ogg");
+        public SoundSpecifier HitSound { get; set; } = new SoundCollectionSpecifier("GenericHit");

        [ViewVariables(VVAccess.ReadWrite)]
        [DataField("missSound")]
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -265,6 +265,8 @@
  - type: AnimationPlayer
  - type: Buckle
  - type: UnarmedCombat
+    hitSound:
+      collection: Punch
    range: 0.8
    arcwidth: 30
    arc: fist
--- a/Resources/Prototypes/SoundCollections/generic_hit.yml
+++ b/Resources/Prototypes/SoundCollections/generic_hit.yml
@@ -0,0 +1,6 @@
+- type: soundCollection
+  id: GenericHit
+  files:
+    - /Audio/Weapons/genhit1.ogg
+    - /Audio/Weapons/genhit2.ogg
+    - /Audio/Weapons/genhit3.ogg
--- a/Resources/Prototypes/SoundCollections/punching.yml
+++ b/Resources/Prototypes/SoundCollections/punching.yml
@@ -0,0 +1,7 @@
+- type: soundCollection
+  id: Punch
+  files:
+    - /Audio/Weapons/punch1.ogg
+    - /Audio/Weapons/punch2.ogg
+    - /Audio/Weapons/punch3.ogg
+    - /Audio/Weapons/punch4.ogg