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

Handle TripleStrike stages individually.

Browse Source
This commit is contained in:
Shane Handley 2020-05-04 21:12:32 +10:00
parent faf04bb4f3
commit fc8bb427fb
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,13 +32,30 @@
],
threshold: 1.2,
),
Attack(TripleStrike, Sword): (
Attack(TripleStrike(First), Sword): (
files: [
"voxygen.audio.sfx.weapon.sword_triple_strike_01",
"voxygen.audio.sfx.weapon.sword_triple_strike_02",
"voxygen.audio.sfx.weapon.sword_triple_strike_03",
"voxygen.audio.sfx.weapon.whoosh_normal_01",
"voxygen.audio.sfx.weapon.whoosh_normal_02",
"voxygen.audio.sfx.weapon.whoosh_normal_03",
"voxygen.audio.sfx.weapon.whoosh_normal_04",
],
threshold: 0.8,
threshold: 0.5,
),
Attack(TripleStrike(Second), Sword): (
files: [
"voxygen.audio.sfx.weapon.whoosh_low_01",
"voxygen.audio.sfx.weapon.whoosh_low_02",
"voxygen.audio.sfx.weapon.whoosh_low_03",
],
threshold: 0.5,
),
Attack(TripleStrike(Third), Sword): (
files: [
"voxygen.audio.sfx.weapon.whoosh_low_01",
"voxygen.audio.sfx.weapon.whoosh_low_02",
"voxygen.audio.sfx.weapon.whoosh_low_03",
],
threshold: 0.5,
),
Attack(BasicRanged, Bow): (
files: [
@ -76,7 +93,6 @@
],
threshold: 0.5,
),
Inventory(Collected): (
files: [
"voxygen.audio.sfx.inventory.add_item",

8
common/src/comp/ability.rs
View File

@ -1,7 +1,7 @@
use crate::{
comp::{
item::Item, Body, CharacterState, EnergySource, Gravity, LightEmitter, Projectile,
StateUpdate,
ability::Stage, item::Item, Body, CharacterState, EnergySource, Gravity, LightEmitter,
Projectile, StateUpdate,
},
states::{triple_strike::*, *},
sys::character_behavior::JoinData,
@ -17,7 +17,7 @@ pub enum CharacterAbilityType {
Boost,
DashMelee,
BasicBlock,
TripleStrike,
TripleStrike(Stage),
}
impl From<&CharacterState> for CharacterAbilityType {
@ -28,7 +28,7 @@ impl From<&CharacterState> for CharacterAbilityType {
CharacterState::Boost(_) => Self::Boost,
CharacterState::DashMelee(_) => Self::DashMelee,
CharacterState::BasicBlock => Self::BasicBlock,
CharacterState::TripleStrike(_) => Self::TripleStrike,
CharacterState::TripleStrike(data) => Self::TripleStrike(data.stage),
_ => Self::BasicMelee,
}
}