Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove extraneous sfx code

Browse Source
This commit is contained in:
DaforLynx 2022-03-18 12:49:28 -07:00 committed by IsseW
parent ca815f25a1
commit 16ca1410be
4 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
assets/voxygen/audio/sfx.ron
View File

@ -239,27 +239,6 @@
],
threshold: 0.8,
),
//ExperienceGained: (
// files: [
// "voxygen.audio.sfx.character.experience_gained_1",
// "voxygen.audio.sfx.character.experience_gained_2",
// "voxygen.audio.sfx.character.experience_gained_3",
// ],
// threshold: 0.5,
//),
// unused for now
// Jump: (
// files: [
// "voxygen.audio.sfx.utterance.humanmale_hurt1"
// ],
// threshold: 0.25,
// ),
//Fall: (
// files: [
// // Event not implemented?
// ],
// threshold: 0.25,
//),
Roll: (
files: [
"voxygen.audio.sfx.character.dive_roll_1",
@ -269,7 +248,7 @@
),
Climb: (
files: [
// TODO: sync with animation
// TODO: sync with animation, make actual sfx
"voxygen.audio.sfx.footsteps.stepdirt_1",
"voxygen.audio.sfx.footsteps.stepdirt_2",
"voxygen.audio.sfx.footsteps.stepdirt_3",

6
common/src/outcome.rs
View File

@ -93,9 +93,6 @@ pub enum Outcome {
pos: Vec3<f32>,
wielded: bool,
},
Jump {
pos: Vec3<f32>,
}
}
impl Outcome {
@ -112,8 +109,7 @@ impl Outcome {
| Outcome::PoiseChange { pos, .. }
| Outcome::GroundSlam { pos }
| Outcome::Utterance { pos, .. }
| Outcome::Glider { pos, .. }
| Outcome::Jump { pos, .. } => Some(*pos),
| Outcome::Glider { pos, .. } => Some(*pos),
Outcome::BreakBlock { pos, .. } => Some(pos.map(|e| e as f32 + 0.5)),
Outcome::ExpChange { .. } | Outcome::ComboChange { .. } | Outcome::SkillPointGain { .. } => None,
}

5
voxygen/src/audio/sfx/mod.rs
View File

@ -590,11 +590,6 @@ impl SfxMgr {
audio.emit_sfx(sfx_trigger_item, *pos, Some(1.0), underwater);
}
},
// unused for now
Outcome::Jump { pos } => {
let sfx_trigger_item = triggers.get_key_value(&SfxEvent::Jump);
audio.emit_sfx(sfx_trigger_item, *pos, Some(1.0), underwater)
},
Outcome::ExpChange { .. }
| Outcome::ComboChange { .. }
| Outcome::SummonedCreature { .. } => {},

3
voxygen/src/scene/particle.rs
View File

@ -287,8 +287,7 @@ impl ParticleMgr {
| Outcome::HealthChange { .. }
| Outcome::PoiseChange { .. }
| Outcome::Utterance { .. }
| Outcome::Glider { .. }
| Outcome::Jump { .. } => {},
| Outcome::Glider { .. } => {},
}
}