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

Animation for cleaving spin

Browse Source
This commit is contained in:
Sam 2022-08-13 23:49:00 -04:00
parent 8d252b7168
commit 83829d1e1b
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,8 +12,8 @@ ComboMelee2(
angle: 360.0,
multi_target: true,
),
buildup_duration: 0.3,
swing_duration: 0.1,
buildup_duration: 0.2,
swing_duration: 0.4,
hit_timing: 0.6,
recover_duration: 0.3,
ori_modifier: 0.6,

44
voxygen/anim/src/character/combomelee.rs
View File

@ -479,6 +479,50 @@ impl Animation for ComboAnimation {
_ => {},
}
},
Some("common.abilities.sword.cleaving_spin") => {
let (move1, move2, move3) = if strike == current_strike {
match stage_section {
Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
Some(StageSection::Action) => (1.0, anim_time.powi(2), 0.0),
Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
_ => (0.0, 0.0, 0.0),
}
} else {
(1.0, 1.0, 0.0)
};
let move2_pre = move2.min(0.3) * 10.0 / 3.0;
next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
next.hand_l.orientation =
Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
next.hand_r.position =
Vec3::new(-s_a.sc.0 + 6.0 + move1 * -12.0, -4.0 + move1 * 3.0, -2.0);
next.hand_r.orientation = Quaternion::rotation_x(0.9 + move1 * 0.5);
next.control.position = Vec3::new(s_a.sc.0, s_a.sc.1, s_a.sc.2);
next.control.orientation = Quaternion::rotation_x(s_a.sc.3);
next.chest.orientation = Quaternion::rotation_z(move1 * 1.2);
next.head.orientation = Quaternion::rotation_z(move1 * -0.7);
next.belt.orientation = Quaternion::rotation_z(move1 * -0.3);
next.shorts.orientation = Quaternion::rotation_z(move1 * -0.8);
next.control.orientation.rotate_x(move1 * 0.2);
next.foot_r
.orientation
.rotate_x(move1 * -0.4 + move2_pre * 0.4);
next.foot_r.orientation.rotate_z(move1 * 1.4);
next.control.orientation.rotate_y(move2_pre * -1.6);
next.control.position += Vec3::new(0.0, 0.0, move2_pre * 4.0);
next.torso.orientation.rotate_z(move2 * -6.0);
next.chest.orientation.rotate_z(move2 * -2.0);
next.head.orientation.rotate_z(move2 * 1.3);
next.belt.orientation.rotate_z(move2 * 0.6);
next.shorts.orientation.rotate_z(move2 * 1.5);
next.foot_r.orientation.rotate_z(move2_pre * -1.7);
next.control.orientation.rotate_z(move2 * -1.8);
next.control.position += Vec3::new(move2 * 14.0, 0.0, 0.0);
},
_ => {},
}
}