Merge pull request #5 from iNV3RT3D/felinid-branch

Fixed Felinid speech and slightly increased leap duration
Catdere · Oct 16, 2023 · c8a8ad1 · c8a8ad1
2 parents 890e752 + ce8b110
commit c8a8ad1
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 1 deletion.
diff --git a/Resources/Audio/Voice/Talk/felinid.ogg b/Resources/Audio/Voice/Talk/felinid.ogg
diff --git a/Resources/Audio/Voice/Talk/felinid_ask.ogg b/Resources/Audio/Voice/Talk/felinid_ask.ogg
diff --git a/Resources/Audio/Voice/Talk/felinid_exclaim.ogg b/Resources/Audio/Voice/Talk/felinid_exclaim.ogg
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -74,6 +74,8 @@ chat-speech-verb-slime-1 = sloshes
 chat-speech-verb-slime-2 = burbles
 chat-speech-verb-slime-3 = oozes
 
+chat-speech-verb-felinid = mews
+
 chat-speech-verb-plant-1 = rustles
 chat-speech-verb-plant-2 = sways
 chat-speech-verb-plant-3 = creaks

diff --git a/Resources/Locale/en-US/species/felinid.ftl b/Resources/Locale/en-US/species/felinid.ftl
@@ -0,0 +1 @@
+felinid-dislikes-water-popup = The water clings to you, chilling you
diff --git a/Resources/Prototypes/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Entities/Mobs/Species/felinid.yml
@@ -62,7 +62,7 @@
     speechSounds: Felinid
     speechVerb: Felinid
   - type: Leap
-    duration: 0.5
+    duration: 0.6
   - type: Butcherable
     butcheringType: Spike
     spawned:

diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml
@@ -96,3 +96,12 @@
     path: /Audio/Voice/Talk/arachnid_ask.ogg
   exclaimSound:
     path: /Audio/Voice/Talk/arachnid_exclaim.ogg
+
+- type: speechSounds
+  id: Felinid
+  saySound:
+    path: /Audio/Voice/Talk/felinid.ogg
+  askSound:
+    path: /Audio/Voice/Talk/felinid_ask.ogg
+  exclaimSound:
+    path: /Audio/Voice/Talk/felinid_exclaim.ogg
diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml
@@ -121,3 +121,8 @@
   - chat-speech-verb-ghost-3
   - chat-speech-verb-ghost-4
   - chat-speech-verb-mumble
+
+- type: speechVerb
+  id: Felinid
+  speechVerbStrings:
+  - chat-speech-verb-felinid
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		felinid-dislikes-water-popup = The water clings to you, chilling you