Gasp update (#625)

* Gasp update. * "Death gasp" for a moth (#28409) * No mob gasping. * Better chat triggers. --------- Co-authored-by: RenQ <164364533+ImRenQ@users.noreply.github.com>
2024-08-15 16:00:07 +00:00
parent ee1a2daa92
commit 888acee21c
12 changed files with 195 additions and 25 deletions
--- a/Resources/Audio/Effects/Gasp/attributions.yml
+++ b/Resources/Audio/Effects/Gasp/attributions.yml
@@ -24,3 +24,9 @@
  license: "CC-BY-SA-3.0"
  copyright: "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f7a49c4068f1277e6857baf0892d355f1c055974"
  source: "https://github.com/tgstation/tgstation/tree/f7a49c4068f1277e6857baf0892d355f1c055974/sound/voice/human"
+
+- files:
+  - moth_DeathGasp.ogg
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from tgstation at https://github.com/tgstation/tgstation/commit/948ad3dd5b22803a01cd74c27f37e509dc61395b"
+  source: "https://github.com/tgstation/tgstation/blob/948ad3dd5b22803a01cd74c27f37e509dc61395b/sound/voice/moth/moth_death.ogg"
--- a/Resources/Audio/Effects/Gasp/moth_DeathGasp.ogg
+++ b/Resources/Audio/Effects/Gasp/moth_DeathGasp.ogg
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -504,9 +504,9 @@
    accent: zombieMoth
  - type: Vocal
    sounds:
-      Male: UnisexMoth
-      Female: UnisexMoth
-      Unsexed: UnisexMoth
+      Male: AnimalMoth
+      Female: AnimalMoth
+      Unsexed: AnimalMoth
    wilhelmProbability: 0.001
  - type: MobPrice
    price: 150
@@ -1357,9 +1357,9 @@
    speechVerb: Reptilian
  - type: Vocal
    sounds:
-      Male: UnisexReptilian
-      Female: UnisexReptilian
-      Unsexed: UnisexReptilian
+      Male: AnimalReptilian
+      Female: AnimalReptilian
+      Unsexed: AnimalReptilian
  - type: TypingIndicator
    proto: lizard
  - type: InteractionPopup
@@ -2175,9 +2175,9 @@
    speechSounds: Arachnid
  - type: Vocal
    sounds:
-      Male: UnisexArachnid
-      Female: UnisexArachnid
-      Unsexed: UnisexArachnid
+      Male: AnimalArachnid
+      Female: AnimalArachnid
+      Unsexed: AnimalArachnid
  - type: TypingIndicator
    proto: spider
  - type: Tag
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -266,9 +266,9 @@
    speechSounds: Arachnid
  - type: Vocal
    sounds:
-      Male: UnisexArachnid
-      Female: UnisexArachnid
-      Unsexed: UnisexArachnid
+      Male: AnimalArachnid
+      Female: AnimalArachnid
+      Unsexed: AnimalArachnid
  - type: TypingIndicator
    proto: spider

--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -66,7 +66,7 @@
  - type: Vocal
    sounds:
      Male: UnisexArachnid
-      Female: UnisexArachnid
+      Female: FemaleArachnid
      Unsexed: UnisexArachnid
  - type: TypingIndicator
    proto: spider
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -90,7 +90,7 @@
  - type: Vocal
    sounds:
      Male: UnisexDiona
-      Female: UnisexDiona
+      Female: FemaleDiona
      Unsexed: UnisexDiona
  - type: BodyEmotes
    soundsId: DionaBodyEmotes
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -41,7 +41,7 @@
  - type: Vocal
    sounds:
      Male: UnisexMoth
-      Female: UnisexMoth
+      Female: FemaleMoth
      Unsexed: UnisexMoth
  - type: MovementSpeedModifier
    weightlessAcceleration: 1.5 # Move around more easily in space.
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -34,7 +34,7 @@
  - type: Vocal
    sounds:
      Male: UnisexReptilian
-      Female: UnisexReptilian
+      Female: FemaleReptilian
      Unsexed: UnisexReptilian
  - type: Damageable
    damageContainer: Biological
--- a/Resources/Prototypes/SoundCollections/deathgasp.yml
+++ b/Resources/Prototypes/SoundCollections/deathgasp.yml
@@ -21,3 +21,22 @@
  files:
  - /Audio/Effects/Gasp/deathgasp_1.ogg
  - /Audio/Effects/Gasp/deathgasp_2.ogg
+
+- type: soundCollection
+  id: MothDeathGasp
+  files:
+  - /Audio/Effects/Gasp/moth_DeathGasp.ogg
+
+- type: soundCollection
+  id: HarpyDeathGasp
+  files:
+  - /Audio/Effects/Gasp/male_deathgasp_1.ogg
+  - /Audio/Effects/Gasp/male_deathgasp_2.ogg
+  - /Audio/Effects/Gasp/male_deathgasp_3.ogg
+  - /Audio/Effects/Gasp/male_deathgasp_4.ogg
+  - /Audio/Effects/Gasp/male_deathgasp_5.ogg
+  - /Audio/Effects/Gasp/female_deathgasp_1.ogg
+  - /Audio/Effects/Gasp/female_deathgasp_2.ogg
+  - /Audio/Effects/Gasp/female_deathgasp_3.ogg
+  - /Audio/Effects/Gasp/female_deathgasp_4.ogg
+  - /Audio/Effects/Gasp/female_deathgasp_5.ogg
--- a/Resources/Prototypes/SoundCollections/gasp.yml
+++ b/Resources/Prototypes/SoundCollections/gasp.yml
@@ -10,3 +10,12 @@
  - /Audio/Effects/Gasp/gasp_female1.ogg
  - /Audio/Effects/Gasp/gasp_female2.ogg
  - /Audio/Effects/Gasp/gasp_female3.ogg
+
+- type: soundCollection
+  id: HarpyGasp
+  files:
+  - /Audio/Effects/Gasp/gasp_male1.ogg
+  - /Audio/Effects/Gasp/gasp_male2.ogg
+  - /Audio/Effects/Gasp/gasp_female1.ogg
+  - /Audio/Effects/Gasp/gasp_female2.ogg
+  - /Audio/Effects/Gasp/gasp_female3.ogg
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -119,7 +119,7 @@
    Gasp:
      collection: MaleGasp
    DefaultDeathgasp:
-      collection: DeathGasp
+      collection: MaleDeathGasp

 - type: emoteSounds
  id: FemaleFelinid
@@ -159,7 +159,7 @@
    Gasp:
      collection: FemaleGasp
    DefaultDeathgasp:
-      collection: DeathGasp
+      collection: FemaleDeathGasp

 - type: emoteSounds
  id: SoundsHarpy
@@ -217,9 +217,9 @@
    Chirp:
      collection: HarpyChirps
    Gasp:
-      collection: MaleGasp
+      collection: HarpyGasp
    DefaultDeathgasp:
-      collection: DeathGasp
+      collection: HarpyDeathGasp

 - type: emoteSounds
  id: UnisexReptilian
@@ -238,6 +238,44 @@
      collection: MaleCrying
    Weh:
      collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: MaleDeathGasp
+
+- type: emoteSounds
+  id: FemaleReptilian
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      path: /Audio/Voice/Reptilian/reptilian_scream.ogg
+    Laugh:
+      path: /Audio/Animals/lizard_happy.ogg
+    Honk:
+      collection: BikeHorn
+    Whistle:
+      collection: Whistles
+    Crying:
+      collection: MaleCrying
+    Weh:
+      collection: Weh
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
+
+- type: emoteSounds
+  id: AnimalReptilian
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      path: /Audio/Voice/Reptilian/reptilian_scream.ogg
+    Laugh:
+      path: /Audio/Animals/lizard_happy.ogg
+    Weh:
+      collection: Weh

 - type: emoteSounds
  id: MaleSlime
@@ -350,7 +388,27 @@
    Gasp:
      collection: MaleGasp
    DefaultDeathgasp:
-      collection: DeathGasp
+      collection: MaleDeathGasp
+  params:
+    variation: 0.125
+
+- type: emoteSounds
+  id: FemaleDiona
+  sounds:
+    Scream:
+      path: /Audio/Voice/Diona/diona_scream.ogg
+    Laugh:
+      collection: DionaLaugh
+    Whistle:
+      collection: Whistles
+    Honk:
+      collection: BikeHorn
+    Weh:
+      collection: Weh
+    Gasp:
+      collection: MaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp
  params:
    variation: 0.125

@@ -372,7 +430,41 @@
    Gasp:
      collection: MaleGasp
    DefaultDeathgasp:
-      collection: DeathGasp
+      collection: MaleDeathGasp
+
+- type: emoteSounds
+  id: AnimalArachnid
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      path: /Audio/Voice/Arachnid/arachnid_scream.ogg
+    Laugh:
+      path: /Audio/Voice/Arachnid/arachnid_laugh.ogg
+    Chitter:
+      path: /Audio/Voice/Arachnid/arachnid_chitter.ogg
+    Click:
+      path: /Audio/Voice/Arachnid/arachnid_click.ogg
+
+- type: emoteSounds
+  id: FemaleArachnid
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      path: /Audio/Voice/Arachnid/arachnid_scream.ogg
+    Laugh:
+      path: /Audio/Voice/Arachnid/arachnid_laugh.ogg
+    Chitter:
+      path: /Audio/Voice/Arachnid/arachnid_chitter.ogg
+    Click:
+      path: /Audio/Voice/Arachnid/arachnid_click.ogg
+    Weh:
+      collection: Weh
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: FemaleDeathGasp

 - type: emoteSounds
  id: UnisexDwarf
@@ -476,7 +568,47 @@
    Gasp:
      collection: MaleGasp
    DefaultDeathgasp:
-      collection: DeathGasp
+      collection: MothDeathGasp
+
+- type: emoteSounds
+  id: FemaleMoth
+  params:
+    variation: 0.125
+  sounds:
+    Buzz:
+      path: /Audio/Voice/Moth/moth_scream.ogg
+    Scream:
+      path: /Audio/Voice/Moth/moth_scream.ogg
+    Laugh:
+      path: /Audio/Voice/Moth/moth_laugh.ogg
+    Chitter:
+      path: /Audio/Voice/Moth/moth_chitter.ogg
+    Squeak:
+      path: /Audio/Voice/Moth/moth_squeak.ogg
+    Weh:
+      collection: Weh
+    Gasp:
+      collection: FemaleGasp
+    DefaultDeathgasp:
+      collection: MothDeathGasp
+
+- type: emoteSounds
+  id: AnimalMoth
+  params:
+    variation: 0.125
+  sounds:
+    Buzz:
+      path: /Audio/Voice/Moth/moth_scream.ogg
+    Scream:
+      path: /Audio/Voice/Moth/moth_scream.ogg
+    Laugh:
+      path: /Audio/Voice/Moth/moth_laugh.ogg
+    Chitter:
+      path: /Audio/Voice/Moth/moth_chitter.ogg
+    Squeak:
+      path: /Audio/Voice/Moth/moth_squeak.ogg
+    DefaultDeathgasp:
+      collection: MothDeathGasp

 - type: emoteSounds
  id: UnisexSilicon
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -1,4 +1,4 @@
-# vocal emotes
+# vocal emotes
 - type: emote
  id: Scream
  category: Vocal
@@ -224,12 +224,16 @@
    components:
    - Respirator
  chatMessages: ["chat-emote-msg-gasp"]
+  chatTriggers:
+  - задыхается

 - type: emote
  id: DefaultDeathgasp
  chatMessages: [ "emote-deathgasp" ]
  chatTriggers:
-  - задыхается
+  - отключается и бессильно падает, его глаза становятся пустыми и безжизненными...
+  - отключается и бессильно падает, её глаза становятся пустыми и безжизненными...
+  - отключается и бессильно падает, их глаза становятся пустыми и безжизненными...

 - type: emote
  id: Buzz