Scurrets - Audio Improvements (#38482)

* Scurret audio tuning

* Add new sfx

* Update sneezing sfx

* YAML support

* Rename a folder

diff --git a/Resources/Audio/Animals/attributions.yml b/Resources/Audio/Animals/attributions.yml
index 59d8bc5a6e17770133c20a0d8dd2c22221093b26..f91d98b9744f5d92ee6a81ca891cb78cd5785648 100644 (file)
--- a/Resources/Audio/Animals/attributions.yml
+++ b/Resources/Audio/Animals/attributions.yml
@@ -162,11 +162,14 @@
   - wawa_chatter.ogg
   - wawa_chillin.ogg
   - wawa_depression.ogg
+  - wawa_despair.ogg
   - wawa_exclaim.ogg
   - wawa_mock.ogg
   - wawa_protest.ogg
   - wawa_question.ogg
   - wawa_statement.ogg
+  - wawa_the_end.ogg
+  - wawa_yawn.ogg
   copyright: "created by FairlySadPanda"
   license: "CC-BY-4.0"
   source: "https://github.com/space-wizards/space-station-14/pull/37936"

diff --git a/Resources/Audio/Animals/wawa_achoo.ogg b/Resources/Audio/Animals/wawa_achoo.ogg
index 56670c2d05966075a6826d6c9b30afc22b162d04..411c4b5b0a94e8b593a58ff050fd287d44f3ceb8 100644 (file)
Binary files a/Resources/Audio/Animals/wawa_achoo.ogg and b/Resources/Audio/Animals/wawa_achoo.ogg differ

diff --git a/Resources/Audio/Animals/wawa_chatter.ogg b/Resources/Audio/Animals/wawa_chatter.ogg
index 7e2a7ec3ca0589cde9b155447840c2349e0f5692..5537611307313fdc5066ef4c4a3db69deb7ef3ea 100644 (file)
Binary files a/Resources/Audio/Animals/wawa_chatter.ogg and b/Resources/Audio/Animals/wawa_chatter.ogg differ

diff --git a/Resources/Audio/Animals/wawa_chillin.ogg b/Resources/Audio/Animals/wawa_chillin.ogg
index 5955fdf96794462d9ae50ff82a1a219c7635f121..d548f6a26f1e0a6d83a8a5ee7e7069b995dfa206 100644 (file)
Binary files a/Resources/Audio/Animals/wawa_chillin.ogg and b/Resources/Audio/Animals/wawa_chillin.ogg differ

diff --git a/Resources/Audio/Animals/wawa_depression.ogg b/Resources/Audio/Animals/wawa_depression.ogg
index 3f8167acb78072362ec3784afec2b3e650d0b953..d592654a07b343cfb2cae873486675a6687c703f 100644 (file)
Binary files a/Resources/Audio/Animals/wawa_depression.ogg and b/Resources/Audio/Animals/wawa_depression.ogg differ

diff --git a/Resources/Audio/Animals/wawa_despair.ogg b/Resources/Audio/Animals/wawa_despair.ogg
new file mode 100644 (file)
index 0000000..ce4ecc4
Binary files /dev/null and b/Resources/Audio/Animals/wawa_despair.ogg differ

diff --git a/Resources/Audio/Animals/wawa_exclaim.ogg b/Resources/Audio/Animals/wawa_exclaim.ogg
index 99f280091f9ea893e9831c307aff3fddb99c1199..6c9d9dfcd0e4e964c90266e2b360aa828c2fa901 100644 (file)
Binary files a/Resources/Audio/Animals/wawa_exclaim.ogg and b/Resources/Audio/Animals/wawa_exclaim.ogg differ

diff --git a/Resources/Audio/Animals/wawa_mock.ogg b/Resources/Audio/Animals/wawa_mock.ogg
index 355c2aa841ba6a2f30577daf247b9365b38095cf..6d188ec0543de1f9ed0a5837d4a5ca3aa568bba7 100644 (file)
Binary files a/Resources/Audio/Animals/wawa_mock.ogg and b/Resources/Audio/Animals/wawa_mock.ogg differ

diff --git a/Resources/Audio/Animals/wawa_protest.ogg b/Resources/Audio/Animals/wawa_protest.ogg
index cc1cf60a0403091adf73239654ceb9640a4404ab..50d52ac27d9c6990b26a7eee8f2f8eebd6bd6a14 100644 (file)
Binary files a/Resources/Audio/Animals/wawa_protest.ogg and b/Resources/Audio/Animals/wawa_protest.ogg differ

diff --git a/Resources/Audio/Animals/wawa_question.ogg b/Resources/Audio/Animals/wawa_question.ogg
index ce9008a5d8c0a2946252791a7e5ccd6365fcec22..757b86bdfd64025d025e9891b6bdbe7fdd70129f 100644 (file)
Binary files a/Resources/Audio/Animals/wawa_question.ogg and b/Resources/Audio/Animals/wawa_question.ogg differ

diff --git a/Resources/Audio/Animals/wawa_statement.ogg b/Resources/Audio/Animals/wawa_statement.ogg
index 21f9e8a23e98df93dce92406c78972694e98fed8..560df24a8072833c885ddfbc855e462beb0d9a3d 100644 (file)
Binary files a/Resources/Audio/Animals/wawa_statement.ogg and b/Resources/Audio/Animals/wawa_statement.ogg differ

diff --git a/Resources/Audio/Animals/wawa_the_end.ogg b/Resources/Audio/Animals/wawa_the_end.ogg
new file mode 100644 (file)
index 0000000..9350de1
Binary files /dev/null and b/Resources/Audio/Animals/wawa_the_end.ogg differ

diff --git a/Resources/Audio/Animals/wawa_yawn.ogg b/Resources/Audio/Animals/wawa_yawn.ogg
new file mode 100644 (file)
index 0000000..766c856
Binary files /dev/null and b/Resources/Audio/Animals/wawa_yawn.ogg differ

diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index 9cfaa54122156435b7b68f67d362eed014ab6f5d..f3302204210b087a67b9f580457436857d59afc9 100644 (file)
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -246,3 +246,8 @@
   license: "CC-BY-SA-3.0"
   copyright: "Created by mattroks101 for Bee Station. cig_snuff converted to mono"
   source: "https://github.com/BeeStation/BeeStation-Hornet/pull/29"
+
+- files: ["soft_thump.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Clipped by FairlySadPanda (Github) from a sound created by CheChoDj (Freesound)"
+  source: "https://freesound.org/people/CheChoDj/sounds/609353/"

diff --git a/Resources/Audio/Effects/soft_thump.ogg b/Resources/Audio/Effects/soft_thump.ogg
new file mode 100644 (file)
index 0000000..2284aad
Binary files /dev/null and b/Resources/Audio/Effects/soft_thump.ogg differ

diff --git a/Resources/Locale/en-US/chat/emotes.ftl b/Resources/Locale/en-US/chat/emotes.ftl
index 074ce2a5dcf80815753b4384265bf8959315ac4e..0944aa48dd8667fc78ab8686b888b1a59dbc6a3c 100644 (file)
--- a/Resources/Locale/en-US/chat/emotes.ftl
+++ b/Resources/Locale/en-US/chat/emotes.ftl
@@ -52,6 +52,7 @@ chat-emote-msg-salute = salutes.
 chat-emote-msg-gasp = gasps.
 chat-emote-msg-deathgasp = seizes up and falls limp, {POSS-ADJ($entity)} eyes dead and lifeless...
 chat-emote-msg-deathgasp-monkey = lets out a faint chimper as {SUBJECT($entity)} collapses and stops moving...
+chat-emote-msg-deathgasp-scurret = lets out a final 'wa' and falls still...
 chat-emote-msg-buzz = buzzes!
 chat-emote-msg-weh = wehs!
 chat-emote-msg-hew = hews!

diff --git a/Resources/Locale/en-US/scurret copy/role.ftl b/Resources/Locale/en-US/scurret/role.ftl
similarity index 100%
rename from Resources/Locale/en-US/scurret copy/role.ftl
rename to Resources/Locale/en-US/scurret/role.ftl

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
index 458b977827f0c8b2008770805182aaff3b54843b..19ba323a0ac9c92e14904dc42615d6c35b04c762 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml
@@ -56,7 +56,7 @@
   - type: Speech
     speechVerb: Wawa
     speechSounds: Wawa
-    allowedEmotes: ['Thump'] # They're 80% tail
+    allowedEmotes: ["Thump"] # They're 80% tail
   - type: TypingIndicator
     proto: moth
   - type: InteractionPopup
@@ -109,7 +109,9 @@
   - type: Hunger
     baseDecayRate: 0.05 # They get a lil' hungy
   - type: BodyEmotes # Grants them clapping and so on.
-    soundsId: GeneralBodyEmotes
+    soundsId: Scurret
+  - type: Deathgasp
+    prototype: ScurretDeathgasp # You monster
   - type: Tag
     tags:
     - DoorBumpOpener

diff --git a/Resources/Prototypes/SoundCollections/scurret.yml b/Resources/Prototypes/SoundCollections/scurret.yml
index 34c83ed41aae2e95a22377b1dc00bb01101b13e7..cb0411638bb8c9898c087ffca774d5d069f4571f 100644 (file)
--- a/Resources/Prototypes/SoundCollections/scurret.yml
+++ b/Resources/Prototypes/SoundCollections/scurret.yml
@@ -17,3 +17,18 @@
   id: WawaScream
   files:
   - /Audio/Animals/wawa_protest.ogg
+
+- type: soundCollection
+  id: WawaCry
+  files:
+  - /Audio/Animals/wawa_despair.ogg
+
+- type: soundCollection
+  id: WawaYawn
+  files:
+  - /Audio/Animals/wawa_yawn.ogg
+
+- type: soundCollection
+  id: WawaDeath
+  files:
+  - /Audio/Animals/wawa_the_end.ogg

diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index 8fb4230a5fed828369032390102722aeab6b4cd0..0edd18d3ff1913fe88ed05eac0318e9187faea38 100644 (file)
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -581,6 +581,20 @@
   params:
     variation: 0.125
   sounds:
+    Thump:
+      path: /Audio/Effects/soft_thump.ogg
+      params:
+        variation: 0.125
+    Clap:
+      collection: Claps
+    ClapSingle:
+      collection: ClapSingle
+    Snap:
+      collection: Snaps
+      params:
+        volume: -6
+    Salute:
+      collection: Salutes
     Laugh:
       collection: WawaLaugh
     Sneeze:
@@ -593,3 +607,19 @@
       collection: WawaSigh
     Scream:
       collection: WawaScream
+    Yawn:
+      collection: WawaYawn
+    Crying:
+      collection: WawaCry
+    Snore:
+      collection: Snores
+    Weh:
+      collection: Weh
+    Hew:
+      collection: Hew
+    Honk:
+      collection: BikeHorn
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: WawaDeath

diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index 8908752b7a2008449641584a0145b6cca6886f66..64f39fe8a338434544aa127c8255c4294678a7c7 100644 (file)
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -331,6 +331,12 @@
   icon: Interface/Emotes/deathgasp.png
   chatMessages: ["chat-emote-msg-deathgasp-monkey"]
 
+- type: emote
+  id: ScurretDeathgasp
+  name: chat-emote-name-deathgasp
+  icon: Interface/Emotes/deathgasp.png
+  chatMessages: ["chat-emote-msg-deathgasp-scurret"]
+
 - type: emote
   id: Buzz
   name: chat-emote-name-buzz