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

Re-allowed for what stage you were on to persist through a roll

Browse Source
This commit is contained in:
Sam 2021-02-27 19:09:51 -05:00
parent 404c7f0905
commit b25a376995
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1191,6 +1191,7 @@ impl From<(&CharacterAbility, AbilityInfo)> for CharacterState {
stage_section: StageSection::Buildup,
was_wielded: false, // false by default. utils might set it to true
was_sneak: false,
was_combo: None,
}),
CharacterAbility::ComboMelee {
stage_data,

10
common/src/states/roll.rs
View File

@ -36,6 +36,8 @@ pub struct Data {
pub was_wielded: bool,
/// Was sneaking
pub was_sneak: bool,
/// Was in state with combo
pub was_combo: Option<(AbilityKey, u32)>,
}
impl CharacterBehavior for Data {
@ -112,7 +114,9 @@ impl CharacterBehavior for Data {
});
} else {
// Done
if self.was_wielded {
if let Some((key, stage)) = self.was_combo {
resume_combo(data, &mut update, key, stage);
} else if self.was_wielded {
update.character = CharacterState::Wielding;
} else if self.was_sneak {
update.character = CharacterState::Sneak;
@ -123,7 +127,9 @@ impl CharacterBehavior for Data {
},
_ => {
// If it somehow ends up in an incorrect stage section
if self.was_wielded {
if let Some((key, stage)) = self.was_combo {
resume_combo(data, &mut update, key, stage);
} else if self.was_wielded {
update.character = CharacterState::Wielding;
} else if self.was_sneak {
update.character = CharacterState::Sneak;

22
common/src/states/utils.rs
View File

@ -529,7 +529,17 @@ pub fn handle_dodge_input(data: &JoinData, update: &mut StateUpdate) {
})
.filter(|ability| ability.requirements_paid(data, update))
{
if data.character.is_wield() {
if let CharacterState::ComboMelee(c) = data.character {
update.character = (
&ability,
AbilityInfo::from_key(data, AbilityKey::Dodge, false),
)
.into();
if let CharacterState::Roll(roll) = &mut update.character {
roll.was_combo = Some((c.static_data.ability_info.key, c.stage));
roll.was_wielded = true;
}
} else if data.character.is_wield() {
update.character = (
&ability,
AbilityInfo::from_key(data, AbilityKey::Dodge, false),
@ -576,6 +586,16 @@ pub fn handle_interrupt(data: &JoinData, update: &mut StateUpdate, attacks_inter
handle_dodge_input(data, update);
}
pub fn resume_combo(data: &JoinData, update: &mut StateUpdate, key: AbilityKey, stage: u32) {
if ability_key_is_pressed(data, key) {
handle_interrupt(data, update, true);
}
// If other states are introduced that progress through stages, add them here
if let CharacterState::ComboMelee(c) = &mut update.character {
c.stage = stage;
}
}
pub fn ability_key_is_pressed(data: &JoinData, ability_key: AbilityKey) -> bool {
match ability_key {
AbilityKey::Mouse1 => data.inputs.primary.is_pressed(),

1
voxygen/src/audio/sfx/event_mapper/movement/tests.rs
View File

@ -189,6 +189,7 @@ fn maps_roll() {
stage_section: states::utils::StageSection::Buildup,
was_wielded: true,
was_sneak: false,
was_combo: None,
}),
&PhysicsState {
on_ground: true,