Skip to content

Commit

Permalink
Add an exhale sound effect to some normals
Browse files Browse the repository at this point in the history
  • Loading branch information
haihala committed Aug 25, 2024
1 parent 6e5d851 commit 7059902
Show file tree
Hide file tree
Showing 22 changed files with 21 additions and 4 deletions.
8 changes: 6 additions & 2 deletions client/characters/src/actions/action.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use bevy::prelude::*;
use wag_core::Animation;
use wag_core::{Animation, SoundEffect};

use crate::{
ActionBlock, ActionEvent, ActionRequirement, AnimationRequest, Attack, CancelRule,
Expand Down Expand Up @@ -191,7 +191,11 @@ impl Action {
category.clone(),
vec![
ActionBlock {
events: vec![animation.into().into()],
events: vec![
animation.into().into(),
// TODO: Make this character-dependent
SoundEffect::FemaleExhale.into(),
],
exit_requirement: ContinuationRequirement::Time(startup),
..default()
},
Expand Down
5 changes: 5 additions & 0 deletions client/characters/src/actions/action_event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ impl From<AnimationRequest> for ActionEvent {
ActionEvent::Animation(value)
}
}
impl From<SoundEffect> for ActionEvent {
fn from(value: SoundEffect) -> Self {
ActionEvent::Sound(value)
}
}
// This isn't a great way to do this, but it's the best I can think of for now
impl From<DummyAnimation> for ActionEvent {
fn from(value: DummyAnimation) -> Self {
Expand Down
5 changes: 3 additions & 2 deletions client/characters/src/characters/mizku.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use bevy::{prelude::*, utils::HashMap};

use wag_core::{
ActionId, Animation, AnimationType, Area, GameButton, Icon, ItemId, Joint, MizkuActionId,
MizkuAnimation, Model, Stats, StatusCondition, StatusFlag, MIZUKI_ALT_HELMET_COLOR,
MIZUKI_ALT_JEANS_COLOR, MIZUKI_ALT_SHIRT_COLOR,
MizkuAnimation, Model, SoundEffect, Stats, StatusCondition, StatusFlag,
MIZUKI_ALT_HELMET_COLOR, MIZUKI_ALT_JEANS_COLOR, MIZUKI_ALT_SHIRT_COLOR,
};

use crate::{
Expand Down Expand Up @@ -168,6 +168,7 @@ fn normals() -> impl Iterator<Item = (MizkuActionId, Action)> {
duration: 20,
}
.into(),
SoundEffect::FemaleExhale.into(),
],
exit_requirement: ContinuationRequirement::Time(9),
..default()
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions client/wag_core/src/effects.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ pub enum SoundEffect {
PlasticCupFlick,
PlasticCupTap,
CheekSlap,
FemaleExhale,
}

impl SoundEffect {
Expand All @@ -34,6 +35,7 @@ impl SoundEffect {
SoundEffect::PlasticCupFlick => Self::clips("plastic-cup-flick", 23),
SoundEffect::PlasticCupTap => Self::clips("plastic-cup-tap", 20),
SoundEffect::CheekSlap => Self::clips("cheek-slap", 20),
SoundEffect::FemaleExhale => Self::clips("female-exhale", 16),
}
}

Expand Down
5 changes: 5 additions & 0 deletions docs/How did I do that thing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
This is for storing things I may want to know how to redo.

# Female voice acting
- Try to not sound too manly
- PItch shift up by 10% in audacity
Binary file added intermediate_assets/audacity/female-exhale.aup3
Binary file not shown.

0 comments on commit 7059902

Please sign in to comment.