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

Parries now correctly return to their stance.

Browse Source
This commit is contained in:
Sam 2022-09-11 19:08:54 -04:00
parent 21dedb54b9
commit 21aabb5663
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1288,7 +1288,7 @@ pub struct AbilityInfo {
pub input_attr: Option<InputAttr>,
pub ability_meta: AbilityMeta,
pub ability: Option<Ability>,
return_ability: Option<InputKind>,
pub return_ability: Option<InputKind>,
}
impl AbilityInfo {

17
server/src/events/entity_manipulation.rs
View File

@ -1232,22 +1232,27 @@ pub fn handle_parry_hook(server: &Server, defender: EcsEntity, attacker: Option<
.write_storage::<comp::CharacterState>()
.get_mut(defender)
{
let should_return = char_state
.ability_info()
.and_then(|info| info.return_ability)
.is_some();
match &mut *char_state {
CharacterState::RiposteMelee(c) => {
c.stage_section = StageSection::Action;
c.timer = Duration::default();
},
char_state => {
CharacterState::BasicBlock(c) if should_return => {
c.timer = c.static_data.recover_duration;
c.stage_section = StageSection::Recover;
},
char_state @ CharacterState::BasicBlock(_) => {
*char_state =
CharacterState::Wielding(common::states::wielding::Data { is_sneaking: false });
},
_char_state => {},
}
};
// Reward some energy to defender for successful parry
if let Some(mut energy) = ecs.write_storage::<Energy>().get_mut(defender) {
const PARRY_REWARD: f32 = 5.0;
energy.change_by(PARRY_REWARD);
}
if let Some(attacker) = attacker {
if let Some(char_state) = ecs.read_storage::<comp::CharacterState>().get(attacker) {