From 77d5820a89c42eddf381400e253aef3758025462 Mon Sep 17 00:00:00 2001
From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com>
Date: Wed, 20 Mar 2024 00:08:50 +0000
Subject: [PATCH] Voice: Delta --> EE

---
 .../DeltaV/Voice/speech_emote_sounds.yml      | 120 ---------------
 .../Prototypes/DeltaV/Voice/speech_emotes.yml | 138 -----------------
 .../Prototypes/DeltaV/Voice/speech_sounds.yml |  17 ---
 .../Prototypes/DeltaV/Voice/speech_verbs.yml  |  23 ---
 .../Prototypes/Voice/speech_emote_sounds.yml  | 122 +++++++++++++++
 Resources/Prototypes/Voice/speech_emotes.yml  | 140 ++++++++++++++++++
 Resources/Prototypes/Voice/speech_sounds.yml  |  19 +++
 Resources/Prototypes/Voice/speech_verbs.yml   |  25 ++++
 8 files changed, 306 insertions(+), 298 deletions(-)
 delete mode 100644 Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
 delete mode 100644 Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
 delete mode 100644 Resources/Prototypes/DeltaV/Voice/speech_sounds.yml
 delete mode 100644 Resources/Prototypes/DeltaV/Voice/speech_verbs.yml

diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
deleted file mode 100644
index ed462c4f7bb..00000000000
--- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
+++ /dev/null
@@ -1,120 +0,0 @@
-# species
-- type: emoteSounds
-  id: SoundsHarpy
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: HarpyScreams
-    Laugh:
-      collection: HarpyLaugh
-    Sneeze:
-      collection: MaleSneezes
-    Cough:
-      collection: MaleCoughs
-    Sigh:
-      collection: MaleSigh
-    Crying:
-      collection: HarpyCry
-    Whistle:
-      collection: Whistles
-    Hiss:
-      collection: HarpyHisses
-    Meow:
-      collection: HarpyMeows
-    Mew:
-      collection: HarpyMews
-    Growl:
-      collection: HarpyGrowls
-    Purr:
-      collection: HarpyPurrs
-    Ring:
-      collection: HarpyRings
-    HonkHarpy:
-      collection: HarpyHonks
-    Pew:
-      collection: HarpyPews
-    Bang:
-      collection: HarpyBangs
-    Beep:
-      collection: HarpyBeeps
-    Rev:
-      collection: HarpyRevs
-#    Click:
-#      collection: HarpyClicks
-    Chitter:
-      collection: HarpyChitter
-    Squeak:
-      collection: HarpySqueak
-    Caw:
-      collection: HarpyCaws
-    Chirp:
-      collection: HarpyChirps
-    Snarl:
-      collection: VulpkaninSnarls
-    Bark:
-      collection: VulpkaninBarks
-    Whine:
-      collection: VulpkaninWhines
-    Howl:
-      collection: VulpkaninHowls
-
-- type: emoteSounds
-  id: MaleVulpkanin
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: MaleScreams
-    Laugh:
-      collection: MaleLaugh
-    Sneeze:
-      collection: MaleSneezes
-    Cough:
-      collection: MaleCoughs
-    Crying:
-      collection: MaleCry
-    Whistle:
-      collection: Whistles
-    Sigh:
-      collection: MaleSigh
-    Growl:
-      collection: VulpkaninGrowls
-    Snarl:
-      collection: VulpkaninSnarls
-    Bark:
-      collection: VulpkaninBarks
-    Whine:
-      collection: VulpkaninWhines
-    Howl:
-      collection: VulpkaninHowls
-
-- type: emoteSounds
-  id: FemaleVulpkanin
-  params:
-    variation: 0.125
-  sounds:
-    Scream:
-      collection: FemaleScreams
-    Laugh:
-      collection: FemaleLaugh
-    Sneeze:
-      collection: FemaleSneezes
-    Cough:
-      collection: FemaleCoughs
-    Crying:
-      collection: FemaleCry
-    Whistle:
-      collection: Whistles
-    Sigh:
-      collection: FemaleSigh
-    Growl:
-      collection: VulpkaninGrowls
-    Snarl:
-      collection: VulpkaninSnarls
-    Bark:
-      collection: VulpkaninBarks
-    Whine:
-      collection: VulpkaninWhines
-    Howl:
-      collection: VulpkaninHowls
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
deleted file mode 100644
index 45eec7cb411..00000000000
--- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
+++ /dev/null
@@ -1,138 +0,0 @@
-# Harpy
-- type: emote
-  id: HonkHarpy
-  category: Vocal
-  chatMessages: [honks.]
-  chatTriggers:
-    - honk.
-    - honks.
-    - honks!
-    - honking.
-    - honked.
-
-- type: emote
-  id: Ring
-  category: Vocal
-  chatMessages: [rings.]
-  chatTriggers:
-    - ring.
-    - rings.
-    - rings!
-    - ringing.
-    - ringed.
-
-- type: emote
-  id: Pew
-  category: Vocal
-  chatMessages: [pews.]
-  chatTriggers:
-    - pew.
-    - pews.
-    - pew!
-
-- type: emote
-  id: Bang
-  category: Vocal
-  chatMessages: [bangs.]
-  chatTriggers:
-    - bangs.
-    - bang.
-    - bang!
-    - banging.
-    - banged.
-
-- type: emote
-  id: Beep
-  category: Vocal
-  chatMessages: [beeps.]
-  chatTriggers:
-    - beeps.
-    - beep.
-    - beep!
-    - beeping.
-    - beeped.
-
-- type: emote
-  id: Rev
-  category: Vocal
-  chatMessages: [revs.]
-  chatTriggers:
-    - revs.
-    - rev.
-    - rev!
-    - revving
-    - revved
-
-#- type: emote
-#  id: Click
-#  category: Vocal
-#  chatMessages: [clicks.]
-#  chatTriggers:
-#    - clicks.
-#    - click.
-#    - click!
-#    - clicking.
-#    - clicked.
-
-- type: emote
-  id: Caw
-  category: Vocal
-  chatMessages: [caws.]
-  chatTriggers:
-    - caws.
-    - caw.
-    - caw!
-    - cawing
-    - cawed
-
-#Vulpkanin
-- type: emote
-  id: Bark
-  category: Vocal
-  chatMessages: [barks.]
-  chatTriggers:
-    - bark.
-    - bark!
-    - barks.
-    - barks!
-    - barked.
-    - barked!
-    - barking.
-
-- type: emote
-  id: Snarl
-  category: Vocal
-  chatMessages: [snarls.]
-  chatTriggers:
-    - snarl.
-    - snarl!
-    - snarls.
-    - snarls!
-    - snarled.
-    - snarled!
-    - snarling.
-
-- type: emote
-  id: Whine
-  category: Vocal
-  chatMessages: [whines.]
-  chatTriggers:
-    - whine.
-    - whine!
-    - whines.
-    - whines!
-    - whined.
-    - whined!
-    - whining.
-
-- type: emote
-  id: Howl
-  category: Vocal
-  chatMessages: [howls.]
-  chatTriggers:
-    - howl.
-    - howl!
-    - howls.
-    - howls!
-    - howling.
-    - howled.
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml
deleted file mode 100644
index 89db03d2fcc..00000000000
--- a/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- type: speechSounds
-  id: Vulpkanin
-  saySound:
-    path: /Audio/DeltaV/Voice/Talk/vulp.ogg
-  askSound:
-    path: /Audio/DeltaV/Voice/Talk/vulp_ask.ogg
-  exclaimSound:
-    path: /Audio/DeltaV/Voice/Talk/vulp_exclaim.ogg
-
-- type: speechSounds
-  id: Harpy
-  saySound:
-    path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg
-  askSound:
-    path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg
-  exclaimSound:
-    path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml b/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml
deleted file mode 100644
index 9ffa21b8c8e..00000000000
--- a/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-- type: speechVerb
-  id: Vulpkanin
-  speechVerbStrings:
-  - chat-speech-verb-vulpkanin-1
-  - chat-speech-verb-vulpkanin-2
-  - chat-speech-verb-vulpkanin-3
-  - chat-speech-verb-vulpkanin-4
-
-- type: speechVerb
-  id: Felinid
-  speechVerbStrings:
-  - chat-speech-verb-felinid-1
-  - chat-speech-verb-felinid-2
-  - chat-speech-verb-felinid-3
-  - chat-speech-verb-felinid-4
-
-- type: speechVerb
-  id: Harpy
-  speechVerbStrings:
-  - chat-speech-verb-harpy-1
-  - chat-speech-verb-harpy-2
-  - chat-speech-verb-harpy-3
-  - chat-speech-verb-harpy-4
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index ee76fa33d2c..2a1a6696f4f 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -380,3 +380,125 @@
   sounds:
     Chirp:
       path: /Audio/Animals/nymph_chirp.ogg
+
+# species
+- type: emoteSounds
+  id: SoundsHarpy
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: HarpyScreams
+    Laugh:
+      collection: HarpyLaugh
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    Sigh:
+      collection: MaleSigh
+    Crying:
+      collection: HarpyCry
+    Whistle:
+      collection: Whistles
+    Hiss:
+      collection: HarpyHisses
+    Meow:
+      collection: HarpyMeows
+    Mew:
+      collection: HarpyMews
+    Growl:
+      collection: HarpyGrowls
+    Purr:
+      collection: HarpyPurrs
+    Ring:
+      collection: HarpyRings
+    HonkHarpy:
+      collection: HarpyHonks
+    Pew:
+      collection: HarpyPews
+    Bang:
+      collection: HarpyBangs
+    Beep:
+      collection: HarpyBeeps
+    Rev:
+      collection: HarpyRevs
+#    Click:
+#      collection: HarpyClicks
+    Chitter:
+      collection: HarpyChitter
+    Squeak:
+      collection: HarpySqueak
+    Caw:
+      collection: HarpyCaws
+    Chirp:
+      collection: HarpyChirps # TODO: TEST THIS. BUG-REPORTS ON DELTA SAID THIS IS BROKEN.
+    Snarl:
+      collection: VulpkaninSnarls
+    Bark:
+      collection: VulpkaninBarks
+    Whine:
+      collection: VulpkaninWhines
+    Howl:
+      collection: VulpkaninHowls
+
+- type: emoteSounds
+  id: MaleVulpkanin
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: MaleScreams
+    Laugh:
+      collection: MaleLaugh
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    Crying:
+      collection: MaleCry
+    Whistle:
+      collection: Whistles
+    Sigh:
+      collection: MaleSigh
+    Growl:
+      collection: VulpkaninGrowls
+    Snarl:
+      collection: VulpkaninSnarls
+    Bark:
+      collection: VulpkaninBarks
+    Whine:
+      collection: VulpkaninWhines
+    Howl:
+      collection: VulpkaninHowls
+
+- type: emoteSounds
+  id: FemaleVulpkanin
+  params:
+    variation: 0.125
+  sounds:
+    Scream:
+      collection: FemaleScreams
+    Laugh:
+      collection: FemaleLaugh
+    Sneeze:
+      collection: FemaleSneezes
+    Cough:
+      collection: FemaleCoughs
+    Crying:
+      collection: FemaleCry
+    Whistle:
+      collection: Whistles
+    Sigh:
+      collection: FemaleSigh
+    Growl:
+      collection: VulpkaninGrowls
+    Snarl:
+      collection: VulpkaninSnarls
+    Bark:
+      collection: VulpkaninBarks
+    Whine:
+      collection: VulpkaninWhines
+    Howl:
+      collection: VulpkaninHowls
+
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index 8e33f483aa3..e8cece36a59 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -264,3 +264,143 @@
     - chirping
     - chirping.
     - chirping!
+
+# Harpy
+- type: emote
+  id: HonkHarpy
+  category: Vocal
+  chatMessages: [honks.]
+  chatTriggers:
+    - honk.
+    - honks.
+    - honks!
+    - honking.
+    - honked.
+
+- type: emote
+  id: Ring
+  category: Vocal
+  chatMessages: [rings.]
+  chatTriggers:
+    - ring.
+    - rings.
+    - rings!
+    - ringing.
+    - ringed.
+
+- type: emote
+  id: Pew
+  category: Vocal
+  chatMessages: [pews.]
+  chatTriggers:
+    - pew.
+    - pews.
+    - pew!
+
+- type: emote
+  id: Bang
+  category: Vocal
+  chatMessages: [bangs.]
+  chatTriggers:
+    - bangs.
+    - bang.
+    - bang!
+    - banging.
+    - banged.
+
+- type: emote
+  id: Beep
+  category: Vocal
+  chatMessages: [beeps.]
+  chatTriggers:
+    - beeps.
+    - beep.
+    - beep!
+    - beeping.
+    - beeped.
+
+- type: emote
+  id: Rev
+  category: Vocal
+  chatMessages: [revs.]
+  chatTriggers:
+    - revs.
+    - rev.
+    - rev!
+    - revving
+    - revved
+
+#- type: emote
+#  id: Click
+#  category: Vocal
+#  chatMessages: [clicks.]
+#  chatTriggers:
+#    - clicks.
+#    - click.
+#    - click!
+#    - clicking.
+#    - clicked.
+
+- type: emote
+  id: Caw
+  category: Vocal
+  chatMessages: [caws.]
+  chatTriggers:
+    - caws.
+    - caw.
+    - caw!
+    - cawing
+    - cawed
+
+#Vulpkanin
+- type: emote
+  id: Bark
+  category: Vocal
+  chatMessages: [barks.]
+  chatTriggers:
+    - bark.
+    - bark!
+    - barks.
+    - barks!
+    - barked.
+    - barked!
+    - barking.
+
+- type: emote
+  id: Snarl
+  category: Vocal
+  chatMessages: [snarls.]
+  chatTriggers:
+    - snarl.
+    - snarl!
+    - snarls.
+    - snarls!
+    - snarled.
+    - snarled!
+    - snarling.
+
+- type: emote
+  id: Whine
+  category: Vocal
+  chatMessages: [whines.]
+  chatTriggers:
+    - whine.
+    - whine!
+    - whines.
+    - whines!
+    - whined.
+    - whined!
+    - whining.
+
+- type: emote
+  id: Howl
+  category: Vocal
+  chatMessages: [howls.]
+  chatTriggers:
+    - howl.
+    - howl!
+    - howls.
+    - howls!
+    - howling.
+    - howled.
+
diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml
index eb47b5363b6..5f385814be9 100644
--- a/Resources/Prototypes/Voice/speech_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_sounds.yml
@@ -123,3 +123,22 @@
     path: /Audio/Animals/dog_bark3.ogg
   exclaimSound:
     path: /Audio/Animals/dog_bark2.ogg
+
+- type: speechSounds
+  id: Vulpkanin
+  saySound:
+    path: /Audio/DeltaV/Voice/Talk/vulp.ogg
+  askSound:
+    path: /Audio/DeltaV/Voice/Talk/vulp_ask.ogg
+  exclaimSound:
+    path: /Audio/DeltaV/Voice/Talk/vulp_exclaim.ogg
+
+- type: speechSounds
+  id: Harpy
+  saySound:
+    path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg
+  askSound:
+    path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg
+  exclaimSound:
+    path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg
+
diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml
index 1cdda32ece1..310af52ab24 100644
--- a/Resources/Prototypes/Voice/speech_verbs.yml
+++ b/Resources/Prototypes/Voice/speech_verbs.yml
@@ -135,3 +135,28 @@
   - chat-speech-verb-electricity-1
   - chat-speech-verb-electricity-2
   - chat-speech-verb-electricity-3
+
+- type: speechVerb
+  id: Vulpkanin
+  speechVerbStrings:
+  - chat-speech-verb-vulpkanin-1
+  - chat-speech-verb-vulpkanin-2
+  - chat-speech-verb-vulpkanin-3
+  - chat-speech-verb-vulpkanin-4
+
+- type: speechVerb
+  id: Felinid
+  speechVerbStrings:
+  - chat-speech-verb-felinid-1
+  - chat-speech-verb-felinid-2
+  - chat-speech-verb-felinid-3
+  - chat-speech-verb-felinid-4
+
+- type: speechVerb
+  id: Harpy
+  speechVerbStrings:
+  - chat-speech-verb-harpy-1
+  - chat-speech-verb-harpy-2
+  - chat-speech-verb-harpy-3
+  - chat-speech-verb-harpy-4
+