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 issue where you could cancel combo melee 2 mid strike

Browse Source
This commit is contained in:
Sam 2022-09-11 03:49:25 -04:00
parent 5757b0bdf0
commit b3a15f61aa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/common/abilities/sword/mobility_agility.ron
View File

@ -3,8 +3,8 @@ SelfBuff(
cast_duration: 0.4,
recover_duration: 0.25,
buff_kind: Hastened,
buff_strength: 0.5,
buff_duration: Some(20.0),
buff_strength: 0.3,
buff_duration: Some(15.0),
energy_cost: 40,
meta: (
kind: Some(Sword(Mobility)),

2
common/src/states/combo_melee2.rs
View File

@ -255,7 +255,7 @@ impl CharacterBehavior for Data {
) -> StateUpdate {
let mut update = StateUpdate::from(data);
if matches!(data.character, CharacterState::ComboMelee2(data) if data.static_data.ability_info.input == input && input != InputKind::Primary) {
if matches!(data.character, CharacterState::ComboMelee2(data) if data.static_data.ability_info.input == input && input != InputKind::Primary && data.stage_section.is_none()) {
end_ability(data, &mut update);
} else {
update.queued_inputs.insert(input, InputAttr {