Fix diona scream and add clap, snap, and laugh sounds (#13852)

diff --git a/Resources/Audio/Voice/Diona/attributions.yml b/Resources/Audio/Voice/Diona/attributions.yml
index e3bd965dc2db920352ce30cd827342cc193c7dbf..5402ff65d3d88a01ac5b2745f06dc683401061fd 100644 (file)
--- a/Resources/Audio/Voice/Diona/attributions.yml
+++ b/Resources/Audio/Voice/Diona/attributions.yml
@@ -2,3 +2,15 @@
   license: "CC-BY-4.0"
   copyright: "Made by InspectorJ (http://www.jshaw.co.uk/) of freesound.org. Modified by Morb0 for SS14 with the following modifications: Noise reduced, cropped, converted to mono"
   source: "https://freesound.org/people/InspectorJ/sounds/352201/"
+- files: ["diona_snap.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Made by JasonElrod on freesound.org. Modified by cropping and re-encoding to Ogg Vorbis."
+  source: "https://freesound.org/people/JasonElrod/sounds/85433/"
+- files: ["diona_clap.ogg"]
+  license: "CC0-1.0"
+  copyright: "Made by Alexbuk on freesound.org. Modified by cropping and re-encoding to Ogg Vorbis."
+  source: "https://freesound.org/people/Alexbuk/sounds/391774/"
+- files: ["diona_rustle1.ogg", "diona_rustle2.ogg", "diona_rustle3.ogg"]
+  license: "CC0-1.0"
+  copyright: "Made by nicoproson on freesound.org. The three files were cropped out of the source file and re-encoded to Ogg Vorbis."
+  source: "https://freesound.org/people/nicoproson/sounds/631406/"

diff --git a/Resources/Audio/Voice/Diona/diona_clap.ogg b/Resources/Audio/Voice/Diona/diona_clap.ogg
new file mode 100644 (file)
index 0000000..acd81ff
Binary files /dev/null and b/Resources/Audio/Voice/Diona/diona_clap.ogg differ

diff --git a/Resources/Audio/Voice/Diona/diona_rustle1.ogg b/Resources/Audio/Voice/Diona/diona_rustle1.ogg
new file mode 100644 (file)
index 0000000..5d79779
Binary files /dev/null and b/Resources/Audio/Voice/Diona/diona_rustle1.ogg differ

diff --git a/Resources/Audio/Voice/Diona/diona_rustle2.ogg b/Resources/Audio/Voice/Diona/diona_rustle2.ogg
new file mode 100644 (file)
index 0000000..8f8add4
Binary files /dev/null and b/Resources/Audio/Voice/Diona/diona_rustle2.ogg differ

diff --git a/Resources/Audio/Voice/Diona/diona_rustle3.ogg b/Resources/Audio/Voice/Diona/diona_rustle3.ogg
new file mode 100644 (file)
index 0000000..151fc5d
Binary files /dev/null and b/Resources/Audio/Voice/Diona/diona_rustle3.ogg differ

diff --git a/Resources/Audio/Voice/Diona/diona_snap.ogg b/Resources/Audio/Voice/Diona/diona_snap.ogg
new file mode 100644 (file)
index 0000000..7e0e490
Binary files /dev/null and b/Resources/Audio/Voice/Diona/diona_snap.ogg differ

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 7ff6fa01cad4e101e10e34b5f768e701138746e1..e90646741fa85223f41a3f8b98f6c609675943c5 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1360,7 +1360,7 @@
       makeSentient: true
       name: ghost-role-information-giant-spider-name
       description: ghost-role-information-giant-spider-description
-      
+
 - type: entity
   name: possum
   parent: SimpleMobBase
@@ -2020,11 +2020,6 @@
     damage:
       types:
         Blunt: 0.1
-  - type: Vocal
-    maleScream: /Audio/Animals/mouse_squeak.ogg
-    femaleScream: /Audio/Animals/mouse_squeak.ogg
-    unsexedScream: /Audio/Animals/mouse_squeak.ogg
-    wilhelmProbability: 0.001
   - type: CombatMode
     disarmAction:
       enabled: false

diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
index b5b230fc6afaedc1babf647a02e6340410976efa..79dfcdcf4bf19eb7bde77c822909a2d31c6f7f55 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Player/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
@@ -24,9 +24,6 @@
           Asphyxiation: -1.0
     - type: MobMover
     - type: InputMover
-    - type: Vocal
-      maleScream: /Audio/Voice/Diona/diona_scream.ogg
-      femaleScream: /Audio/Voice/Diona/diona_scream.ogg
     - type: Alerts
     - type: Eye
     - type: CameraRecoil

diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index 2e7f5940442637e31506717a513c6a4b1eba0475..7b71d861b1dbc02ff5b02d308c519d3458ba541e 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -50,6 +50,13 @@
   - type: MovementSpeedModifier
     baseWalkSpeed : 1.5
     baseSprintSpeed : 3.5
+  - type: Vocal
+    sounds:
+      Male: UnisexDiona
+      Female: UnisexDiona
+      Unsexed: UnisexDiona
+  - type: BodyEmotes
+    soundsId: DionaBodyEmotes
 
 - type: entity
   save: false

diff --git a/Resources/Prototypes/SoundCollections/emotes.yml b/Resources/Prototypes/SoundCollections/emotes.yml
index c66b5f562c05fc5fd82fb3c48be549b468809772..bc9bd7838e8ce2d4d2b2fe8b8c087a3a55f21944 100644 (file)
--- a/Resources/Prototypes/SoundCollections/emotes.yml
+++ b/Resources/Prototypes/SoundCollections/emotes.yml
@@ -23,3 +23,10 @@
     - /Audio/Effects/Emotes/snap1.ogg
     - /Audio/Effects/Emotes/snap2.ogg
     - /Audio/Effects/Emotes/snap3.ogg
+
+- type: soundCollection
+  id: DionaLaugh
+  files:
+    - /Audio/Voice/Diona/diona_rustle1.ogg
+    - /Audio/Voice/Diona/diona_rustle2.ogg
+    - /Audio/Voice/Diona/diona_rustle3.ogg

diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index d731fc9d61a535ab4794e7791fdedaaa30c2f943..0f469bf35f0ca81d446e03d83167923f62d55302 100644 (file)
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -36,6 +36,16 @@
     params:
       variation: 0.125
 
+- type: emoteSounds
+  id: UnisexDiona
+  sounds:
+    Scream:
+      path: /Audio/Voice/Diona/diona_scream.ogg
+    Laugh:
+      collection: DionaLaugh
+  params:
+    variation: 0.125
+
 # body emotes
 - type: emoteSounds
   id: GeneralBodyEmotes
@@ -47,6 +57,16 @@
       params:
         volume: -6
 
+- type: emoteSounds
+  id: DionaBodyEmotes
+  sounds:
+    Clap:
+      path: /Audio/Voice/Diona/diona_clap.ogg
+    Snap:
+      path: /Audio/Voice/Diona/diona_snap.ogg
+      params:
+        volume: -10
+
 # mobs
 - type: emoteSounds
   id: Zombie