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

Fixed pipeline errors.

Browse Source
This commit is contained in:
Sam 2020-09-20 12:44:57 -05:00
parent b4018e7d42
commit 1fbcf2be80
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
voxygen/src/audio/sfx/event_mapper/combat/tests.rs
View File

@ -114,7 +114,10 @@ fn matches_ability_stage() {
let result = CombatEventMapper::map_event(
&CharacterState::ComboMelee(states::combo_melee::Data {
stage_data: vec![combo_melee::Stage {
stage: 1,
num_stages: 1,
combo: 0,
stage_data: vec![states::combo_melee::Stage {
stage: 1,
base_damage: 100,
max_damage: 120,
@ -130,6 +133,9 @@ fn matches_ability_stage() {
initial_energy_gain: 0,
max_energy_gain: 100,
energy_increase: 20,
timer: Duration::default(),
stage_section: states::utils::StageSection::Swing,
next_stage: false,
speed_increase: 0.05,
max_speed_increase: 1.8,
is_interruptible: true,
@ -166,7 +172,10 @@ fn ignores_different_ability_stage() {
let result = CombatEventMapper::map_event(
&CharacterState::ComboMelee(states::combo_melee::Data {
stage_data: vec![combo_melee::Stage {
stage: 1,
num_stages: 1,
combo: 0,
stage_data: vec![states::combo_melee::Stage {
stage: 1,
base_damage: 100,
max_damage: 120,
@ -182,6 +191,9 @@ fn ignores_different_ability_stage() {
initial_energy_gain: 0,
max_energy_gain: 100,
energy_increase: 20,
timer: Duration::default(),
stage_section: states::utils::StageSection::Swing,
next_stage: false,
speed_increase: 0.05,
max_speed_increase: 1.8,
is_interruptible: true,
@ -197,7 +209,7 @@ fn ignores_different_ability_stage() {
assert_ne!(
result,
SfxEvent::Attack(
CharacterAbilityType::ComboMelee(states::utils::StageSection::Swing, 1),
CharacterAbilityType::ComboMelee(states::utils::StageSection::Swing, 2),
ToolCategory::Sword
)
);

4
voxygen/src/hud/hotbar.rs
View File

@ -81,7 +81,9 @@ impl State {
kind != "Sceptre" && kind != "SceptreVelorite"
} else if let ToolKind::Debug(kind) = &kind.kind {
kind == "Boost"
} else {matches!(&kind.kind, ToolKind::Sword(_))}
} else {
matches!(&kind.kind, ToolKind::Sword(_))
}
} else {
false
}