mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'aylana/asp-sfx' into 'master'
Princess-Lana - Add asp sound effects for the game See merge request veloren/veloren!2611
This commit is contained in:
commit
54eb2a3ff7
@ -1045,5 +1045,24 @@
|
|||||||
],
|
],
|
||||||
threshold: 1.0,
|
threshold: 1.0,
|
||||||
),
|
),
|
||||||
|
Utterance(Angry, Asp): (
|
||||||
|
files: [
|
||||||
|
"voxygen.audio.sfx.utterance.asp_angry1",
|
||||||
|
"voxygen.audio.sfx.utterance.asp_angry2",
|
||||||
|
],
|
||||||
|
threshold: 1.0,
|
||||||
|
),
|
||||||
|
Utterance(Calm, Asp): (
|
||||||
|
files: [
|
||||||
|
"voxygen.audio.sfx.utterance.asp_calm1",
|
||||||
|
],
|
||||||
|
threshold: 1.0,
|
||||||
|
),
|
||||||
|
Utterance(Hurt, Asp): (
|
||||||
|
files: [
|
||||||
|
"voxygen.audio.sfx.utterance.asp_hurt1",
|
||||||
|
],
|
||||||
|
threshold: 1.0,
|
||||||
|
),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
BIN
assets/voxygen/audio/sfx/utterance/asp_angry1.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/utterance/asp_angry1.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/utterance/asp_angry2.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/utterance/asp_angry2.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/utterance/asp_calm1.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/utterance/asp_calm1.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/voxygen/audio/sfx/utterance/asp_hurt1.ogg
(Stored with Git LFS)
Normal file
BIN
assets/voxygen/audio/sfx/utterance/asp_hurt1.ogg
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -211,6 +211,7 @@ pub enum VoiceKind {
|
|||||||
Cat,
|
Cat,
|
||||||
Goat,
|
Goat,
|
||||||
Mandragora,
|
Mandragora,
|
||||||
|
Asp,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn body_to_voice(body: &Body) -> Option<VoiceKind> {
|
fn body_to_voice(body: &Body) -> Option<VoiceKind> {
|
||||||
@ -222,6 +223,7 @@ fn body_to_voice(body: &Body) -> Option<VoiceKind> {
|
|||||||
Body::QuadrupedLow(body) => match body.species {
|
Body::QuadrupedLow(body) => match body.species {
|
||||||
quadruped_low::Species::Maneater => VoiceKind::Maneater,
|
quadruped_low::Species::Maneater => VoiceKind::Maneater,
|
||||||
quadruped_low::Species::Alligator => VoiceKind::Alligator,
|
quadruped_low::Species::Alligator => VoiceKind::Alligator,
|
||||||
|
quadruped_low::Species::Asp => VoiceKind::Asp,
|
||||||
_ => return None,
|
_ => return None,
|
||||||
},
|
},
|
||||||
Body::QuadrupedSmall(body) => match body.species {
|
Body::QuadrupedSmall(body) => match body.species {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user