diff --git a/Resources/Audio/_CE/Voice/Carrin/attributions.yml b/Resources/Audio/_CE/Voice/Carrin/attributions.yml new file mode 100644 index 00000000000..0fb821c9c17 --- /dev/null +++ b/Resources/Audio/_CE/Voice/Carrin/attributions.yml @@ -0,0 +1,24 @@ +- files: ["crow-exclaim-caw.ogg"] + license: "CC-BY-4.0" + copyright: "Created by antu jara from https://samplefocus.com" + source: "https://samplefocus.com/samples/plague-perc-crow?" + +- files: [ "carrin-say-chirping.ogg" ] + license: "CC-BY-4.0" + copyright: "Created by Luhv from https://samplefocus.com" + source: "https://samplefocus.com/samples/birds-chirping-5bfe83ba-e4be-4558-8f04-f9939d2d5bd0?" + +- files: [ "carrin-ask.ogg" ] + license: "CC-BY-4.0" + copyright: "Created by swiftoid (Freesound) from https://pixabay.com" + source: "https://pixabay.com/sound-effects/nature-bird-chirp-88706/" + +- files: [ "carrin-scream.ogg" ] + license: "CC-BY-4.0" + copyright: "Created by DRAGON-STUDIO from https://pixabay.com" + source: "https://pixabay.com/sound-effects/nature-hawk-call-sound-effect-hawk-cry-364472/" + +- files: [ "carrin-laugh.ogg" ] + license: "CC-BY-4.0" + copyright: "Created by u_a4gfvwagf1 from https://pixabay.com" + source: "https://pixabay.com/sound-effects/nature-crow-sound-effect-hd-336784/" diff --git a/Resources/Audio/_CE/Voice/Carrin/carrin-ask.ogg b/Resources/Audio/_CE/Voice/Carrin/carrin-ask.ogg new file mode 100644 index 00000000000..a1cfcfb95db Binary files /dev/null and b/Resources/Audio/_CE/Voice/Carrin/carrin-ask.ogg differ diff --git a/Resources/Audio/_CE/Voice/Carrin/carrin-exclaim-caw.ogg b/Resources/Audio/_CE/Voice/Carrin/carrin-exclaim-caw.ogg new file mode 100644 index 00000000000..6cbc0de8841 Binary files /dev/null and b/Resources/Audio/_CE/Voice/Carrin/carrin-exclaim-caw.ogg differ diff --git a/Resources/Audio/_CE/Voice/Carrin/carrin-laugh.ogg b/Resources/Audio/_CE/Voice/Carrin/carrin-laugh.ogg new file mode 100644 index 00000000000..7e7c601525d Binary files /dev/null and b/Resources/Audio/_CE/Voice/Carrin/carrin-laugh.ogg differ diff --git a/Resources/Audio/_CE/Voice/Carrin/carrin-say-chirping.ogg b/Resources/Audio/_CE/Voice/Carrin/carrin-say-chirping.ogg new file mode 100644 index 00000000000..1ffcdbf2f84 Binary files /dev/null and b/Resources/Audio/_CE/Voice/Carrin/carrin-say-chirping.ogg differ diff --git a/Resources/Audio/_CE/Voice/Carrin/carrin-scream.ogg b/Resources/Audio/_CE/Voice/Carrin/carrin-scream.ogg new file mode 100644 index 00000000000..928dc42a33b Binary files /dev/null and b/Resources/Audio/_CE/Voice/Carrin/carrin-scream.ogg differ diff --git a/Resources/Locale/en-US/_CE/chat/emotes.ftl b/Resources/Locale/en-US/_CE/chat/emotes.ftl new file mode 100644 index 00000000000..5aec111bc98 --- /dev/null +++ b/Resources/Locale/en-US/_CE/chat/emotes.ftl @@ -0,0 +1,5 @@ +# Names +ce-chat-emote-name-caw = Caw + +# Messages +ce-chat-emote-msg-caw = caws. diff --git a/Resources/Locale/ru-RU/_CE/Chat/emotes.ftl b/Resources/Locale/ru-RU/_CE/Chat/emotes.ftl new file mode 100644 index 00000000000..995a75979a0 --- /dev/null +++ b/Resources/Locale/ru-RU/_CE/Chat/emotes.ftl @@ -0,0 +1,5 @@ +# Имена +ce-chat-emote-name-caw = Кар + +# Сообщения +ce-chat-emote-msg-caw = карканье diff --git a/Resources/Prototypes/_CE/Entities/Mobs/Species/carrin.yml b/Resources/Prototypes/_CE/Entities/Mobs/Species/carrin.yml index 76b794267b3..5399893a884 100644 --- a/Resources/Prototypes/_CE/Entities/Mobs/Species/carrin.yml +++ b/Resources/Prototypes/_CE/Entities/Mobs/Species/carrin.yml @@ -63,11 +63,12 @@ state: full - type: Vocal sounds: - Male: CEUnisexCarcat #TODO: change to carrin sound - Female: CEUnisexCarcat - Unsexed: CEUnisexCarcat + Male: CEUnisexCarrin + Female: CEUnisexCarrin + Unsexed: CEUnisexCarrin - type: Speech - speechSounds: CECarcat #TODO: change to carrin sound + speechSounds: CECarrin + allowedEmotes: ['CECaw'] - type: FootstepModifier footstepSoundCollection: collection: CEStepCarrin diff --git a/Resources/Prototypes/_CE/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_CE/Voice/speech_emote_sounds.yml index 4771ca56e6a..c837b43ce8f 100644 --- a/Resources/Prototypes/_CE/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_CE/Voice/speech_emote_sounds.yml @@ -38,3 +38,21 @@ sounds: Scream: path: /Audio/_CE/Voice/Animal/bear_scream.ogg + +- type: emoteSounds + id: CEUnisexCarrin + params: + variation: 0.125 + sounds: + Scream: + path: /Audio/_CE/Voice/Carrin/carrin-scream.ogg + Laugh: + path: /Audio/_CE/Voice/Carrin/carrin-laugh.ogg + CECaw: + path: /Audio/_CE/Voice/Carrin/carrin-exclaim-caw.ogg + Gasp: + path: /Audio/_CE/Voice/Carcat/carcat_gasp.ogg + DefaultDeathgasp: + path: /Audio/_CE/Voice/Carcat/carcat_gasp.ogg + Whistle: + collection: Whistles diff --git a/Resources/Prototypes/_CE/Voice/speech_emotes.yml b/Resources/Prototypes/_CE/Voice/speech_emotes.yml new file mode 100644 index 00000000000..a46e46ed1fe --- /dev/null +++ b/Resources/Prototypes/_CE/Voice/speech_emotes.yml @@ -0,0 +1,21 @@ + + +- type: emote + id: CECaw + name: ce-chat-emote-name-caw + category: Vocal + icon: _CE/Interface/Emotes/jojocrow.png + whitelist: + requireAll: true + components: + - Vocal + chatMessages: ["ce-chat-emote-name-caw"] + chatTriggers: + # English translation/английский перевод + - caw + - caws + # Russian translation/русский перевод + - кар + - каркает + + diff --git a/Resources/Prototypes/_CE/Voice/speech_sounds.yml b/Resources/Prototypes/_CE/Voice/speech_sounds.yml index 13fbc60d8cc..09c147ca495 100644 --- a/Resources/Prototypes/_CE/Voice/speech_sounds.yml +++ b/Resources/Prototypes/_CE/Voice/speech_sounds.yml @@ -15,3 +15,12 @@ path: /Audio/_CE/Voice/Goblin/goblin_talk2.ogg exclaimSound: path: /Audio/_CE/Voice/Goblin/goblin_talk1.ogg + +- type: speechSounds + id: CECarrin + saySound: + path: /Audio/_CE/Voice/Carrin/carrin-say-chirping.ogg + askSound: + path: /Audio/_CE/Voice/Carrin/carrin-ask.ogg + exclaimSound: + path: /Audio/_CE/Voice/Carrin/carrin-exclaim-caw.ogg diff --git a/Resources/Textures/_CE/Interface/Emotes/attributions.yml b/Resources/Textures/_CE/Interface/Emotes/attributions.yml new file mode 100644 index 00000000000..0edd9765a29 --- /dev/null +++ b/Resources/Textures/_CE/Interface/Emotes/attributions.yml @@ -0,0 +1,4 @@ +- files: ["jojocrow.png"] + license: "CC-BY-4.0" + copyright: "BrightNibbleston@gmail.com" + source: "Made by Bright" diff --git a/Resources/Textures/_CE/Interface/Emotes/jojocrow.png b/Resources/Textures/_CE/Interface/Emotes/jojocrow.png new file mode 100644 index 00000000000..fd3eda9ede3 Binary files /dev/null and b/Resources/Textures/_CE/Interface/Emotes/jojocrow.png differ