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

Execute

Browse Source
This commit is contained in:
Sam 2023-05-16 21:30:21 -04:00
parent 6f31067b1a
commit 0e771c9082
3 changed files with 60 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
assets/common/abilities/axe/execute.ron
View File

@ -1,22 +1,17 @@
ComboMelee2(
strikes: [
(
melee_constructor: (
kind: Slash(
damage: 4,
poise: 5,
knockback: 0,
energy_regen: 5,
),
range: 3.0,
angle: 45.0,
),
buildup_duration: 0.15,
swing_duration: 0.05,
hit_timing: 0.5,
recover_duration: 0.1,
ori_modifier: 0.6,
FinisherMelee(
energy_cost: 0,
buildup_duration: 0.6,
swing_duration: 0.2,
recover_duration: 0.4,
melee_constructor: (
kind: Slash(
damage: 60,
poise: 100,
knockback: 0,
energy_regen: 0,
),
],
energy_cost_per_strike: 0,
range: 3.0,
angle: 15.0,
),
minimum_combo: 30,
)

38
voxygen/anim/src/character/finishermelee.rs
View File

@ -138,6 +138,44 @@ impl Animation for FinisherMeleeAnimation {
next.control.orientation.rotate_x(move2 * 0.5);
next.control.position += Vec3::new(move2 * 7.0, 0.0, move2 * 6.0);
},
Some("common.abilities.axe.execute") => {
let (move1, move2, move3) = match stage_section {
Some(StageSection::Buildup) => (anim_time, 0.0, 0.0),
Some(StageSection::Action) => (1.0, anim_time, 0.0),
Some(StageSection::Recover) => (1.0, 1.0, anim_time),
_ => (0.0, 0.0, 0.0),
};
let pullback = 1.0 - move3;
let move1 = move1 * pullback;
let move2 = move2 * pullback;
next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
next.hand_l.orientation =
Quaternion::rotation_x(s_a.ahl.3) * Quaternion::rotation_y(s_a.ahl.4);
next.hand_r.position = Vec3::new(s_a.ahr.0, s_a.ahr.1, s_a.ahr.2);
next.hand_r.orientation =
Quaternion::rotation_x(s_a.ahr.3) * Quaternion::rotation_z(s_a.ahr.5);
next.control.position = Vec3::new(s_a.ac.0, s_a.ac.1, s_a.ac.2);
next.control.orientation = Quaternion::rotation_x(s_a.ac.3)
* Quaternion::rotation_y(s_a.ac.4)
* Quaternion::rotation_z(s_a.ac.5);
next.control.orientation.rotate_x(move1 * 0.9);
next.chest.orientation.rotate_z(move1 * 1.2);
next.head.orientation.rotate_z(move1 * -0.5);
next.belt.orientation.rotate_z(move1 * -0.3);
next.shorts.orientation.rotate_z(move1 * -0.7);
next.control.position += Vec3::new(move1 * 4.0, move1 * -12.0, move1 * 11.0);
next.chest.orientation.rotate_z(move2 * -2.0);
next.head.orientation.rotate_z(move2 * 0.9);
next.belt.orientation.rotate_z(move2 * 0.4);
next.shorts.orientation.rotate_z(move2 * 1.1);
next.control.orientation.rotate_x(move2 * -5.0);
next.control.position += Vec3::new(move2 * -3.0, move2 * 12.0, move2 * -17.0);
next.control.orientation.rotate_z(move2 * 0.7);
},
_ => {},
}

14
voxygen/anim/src/character/selfbuff.rs
View File

@ -31,7 +31,7 @@ impl Animation for SelfBuffAnimation {
match ability_id {
Some("common.abilities.sword.heavy_fortitude") => {
let (move1, move2, move3) = match stage_section {
Some(StageSection::Movement) => (anim_time.powf(0.25), 0.0, 0.0),
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),
@ -65,7 +65,7 @@ impl Animation for SelfBuffAnimation {
},
Some("common.abilities.sword.defensive_stalwart_sword") => {
let (move1, move2, move3) = match stage_section {
Some(StageSection::Movement) => (anim_time.powf(0.25), 0.0, 0.0),
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),
@ -103,7 +103,7 @@ impl Animation for SelfBuffAnimation {
},
Some("common.abilities.sword.agile_dancing_edge") => {
let (move1, move2, move3) = match stage_section {
Some(StageSection::Movement) => (anim_time.powf(0.25), 0.0, 0.0),
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),
@ -132,7 +132,7 @@ impl Animation for SelfBuffAnimation {
},
Some("common.abilities.sword.cleaving_blade_fever") => {
let (move1, move2, move3) = match stage_section {
Some(StageSection::Movement) => (anim_time.powf(0.25), 0.0, 0.0),
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),
@ -166,7 +166,7 @@ impl Animation for SelfBuffAnimation {
},
Some("common.abilities.axe.berserk") => {
let (move1, move2, move3) = match stage_section {
Some(StageSection::Movement) => (anim_time, 0.0, 0.0),
Some(StageSection::Buildup) => (anim_time, 0.0, 0.0),
Some(StageSection::Action) => (1.0, anim_time, 0.0),
Some(StageSection::Recover) => (1.0, 1.0, anim_time),
_ => (0.0, 0.0, 0.0),
@ -196,7 +196,7 @@ impl Animation for SelfBuffAnimation {
},
Some("common.abilities.axe.savage_sense") => {
let (move1, move2, move3) = match stage_section {
Some(StageSection::Movement) => (anim_time, 0.0, 0.0),
Some(StageSection::Buildup) => (anim_time, 0.0, 0.0),
Some(StageSection::Action) => (1.0, anim_time, 0.0),
Some(StageSection::Recover) => (1.0, 1.0, anim_time),
_ => (0.0, 0.0, 0.0),
@ -229,7 +229,7 @@ impl Animation for SelfBuffAnimation {
},
Some("common.abilities.axe.adrenaline_rush") => {
let (move1, move2, move3) = match stage_section {
Some(StageSection::Movement) => (anim_time, 0.0, 0.0),
Some(StageSection::Buildup) => (anim_time, 0.0, 0.0),
Some(StageSection::Action) => (1.0, anim_time, 0.0),
Some(StageSection::Recover) => (1.0, 1.0, anim_time),
_ => (0.0, 0.0, 0.0),