From 1d7167b95bbdf32a7811455ad54899df3763d1c5 Mon Sep 17 00:00:00 2001
From: LankLTE <135308300+LankLTE@users.noreply.github.com>
Date: Mon, 19 Feb 2024 09:11:20 -0800
Subject: [PATCH] Small Nymph Changes (#25363)

* Emote sounds, accent & doorbump

* Oops

* Only non-brains can't talk
---
 Resources/Locale/en-US/accent/accents.ftl      |  6 ++++++
 .../Prototypes/Accents/full_replacements.yml   |  8 ++++++++
 Resources/Prototypes/Body/Organs/diona.yml     |  4 ++--
 .../Prototypes/Entities/Mobs/NPCs/animals.yml  | 14 ++++++++++++++
 .../Prototypes/Voice/speech_emote_sounds.yml   |  6 ++++++
 Resources/Prototypes/Voice/speech_emotes.yml   | 18 ++++++++++++++++++
 6 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/Resources/Locale/en-US/accent/accents.ftl b/Resources/Locale/en-US/accent/accents.ftl
index 7b72e5705b..301c589449 100644
--- a/Resources/Locale/en-US/accent/accents.ftl
+++ b/Resources/Locale/en-US/accent/accents.ftl
@@ -118,3 +118,9 @@ accent-words-kobold-6 = Gronk!
 accent-words-kobold-7 = Hiss!
 accent-words-kobold-8 = Eeee!
 accent-words-kobold-9 = Yip.
+
+# Nymph
+accent-words-nymph-1 = Chirp!
+accent-words-nymph-2 = Churr...
+accent-words-nymph-3 = Cheep?
+accent-words-nymph-4 = Chrrup!
diff --git a/Resources/Prototypes/Accents/full_replacements.yml b/Resources/Prototypes/Accents/full_replacements.yml
index 560757c8f3..1d1efdcad0 100644
--- a/Resources/Prototypes/Accents/full_replacements.yml
+++ b/Resources/Prototypes/Accents/full_replacements.yml
@@ -166,3 +166,11 @@
   - accent-words-kobold-7
   - accent-words-kobold-8
   - accent-words-kobold-9
+
+- type: accent
+  id: nymph
+  fullReplacements:
+  - accent-words-nymph-1
+  - accent-words-nymph-2
+  - accent-words-nymph-3
+  - accent-words-nymph-4
diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
index 23df396dd1..8b4b78cac0 100644
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -170,7 +170,7 @@
 
 - type: entity
   id: OrganDionaNymphStomach
-  parent: MobDionaNymph
+  parent: MobDionaNymphAccent 
   noSpawn: true
   name: diona nymph
   suffix: Stomach
@@ -182,7 +182,7 @@
 
 - type: entity
   id: OrganDionaNymphLungs
-  parent: MobDionaNymph
+  parent: MobDionaNymphAccent
   noSpawn: true
   name: diona nymph
   suffix: Lungs
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 855a2d89c6..1fe2ccb86f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -3165,11 +3165,25 @@
     attributes:
       gender: epicene
   - type: Speech
+    speechVerb: Plant
   - type: Tag
     tags:
+    - DoorBumpOpener
     - VimPilot
+  - type: Emoting
+  - type: BodyEmotes
+    soundsId: Nymph
   - type: Reform
     actionPrototype: DionaReformAction
     reformTime: 10
     popupText: diona-reform-attempt
     reformPrototype: MobDionaReformed
+
+- type: entity
+  parent: MobDionaNymph
+  id: MobDionaNymphAccent # No talky. For non-brain & wild nymphs
+  suffix: Accent
+  components:
+  - type: ReplacementAccent
+    accent: nymph
+    
\ No newline at end of file
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index 8df129f786..3740b99521 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -355,3 +355,9 @@
     path: /Audio/Animals/kangaroo_grunt.ogg
     params:
       variation: 0.125
+
+- type: emoteSounds
+  id: Nymph
+  sounds:
+    Chirp:
+      path: /Audio/Animals/nymph_chirp.ogg
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index 86d273dd1c..0ee67d17c7 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -241,3 +241,21 @@
     - buzzes
     - buzzes.
     - buzzes!
+
+- type: emote
+  id: Chirp
+  category: Vocal
+  chatMessages: [chirps!]
+  chatTriggers:
+    - chirp
+    - chirp!
+    - chirp.
+    - chirps
+    - churps.
+    - chirps!
+    - chirped
+    - chirped.
+    - chirped!
+    - chirping
+    - chirping.
+    - chirping!
\ No newline at end of file
-- 
2.52.0