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

Skull bash

Browse Source
This commit is contained in:
Sam 2023-05-20 16:41:56 -04:00
parent 9a6cb01da3
commit daea14f8e5
2 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
assets/common/abilities/axe/skull_bash.ron
View File

@ -2,21 +2,21 @@ ComboMelee2(
strikes: [
(
melee_constructor: (
kind: Slash(
damage: 4,
poise: 5,
kind: Bash(
damage: 15,
poise: 50,
knockback: 0,
energy_regen: 5,
energy_regen: 0,
),
range: 3.0,
angle: 45.0,
),
buildup_duration: 0.15,
swing_duration: 0.05,
buildup_duration: 0.3,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.1,
recover_duration: 0.3,
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 0,
energy_cost_per_strike: 10,
)

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

@ -1098,6 +1098,43 @@ impl Animation for ComboAnimation {
next.control.orientation.rotate_z(move2 * -3.5);
next.control.position += Vec3::new(move2 * 14.0, move2 * 6.0, 0.0);
},
Some("common.abilities.axe.skull_bash") => {
let (move1, move2) = match stage_section {
Some(StageSection::Buildup) => (anim_time, 0.0),
Some(StageSection::Action) => (1.0, anim_time),
Some(StageSection::Recover) => (1.0, 1.0),
_ => (0.0, 0.0),
};
let move1 = move1 * multi_strike_pullback;
let move2 = move2 * multi_strike_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 - move1 * PI * 0.75);
next.control.orientation.rotate_x(move1 * -2.0);
next.chest.orientation.rotate_z(move1 * 0.8);
next.head.orientation.rotate_z(move1 * -0.3);
next.shorts.orientation.rotate_z(move1 * -0.5);
next.belt.orientation.rotate_z(move1 * -0.1);
next.control.orientation.rotate_y(move1 * -0.6);
next.control.position += Vec3::new(move1 * 6.0, move1 * -2.0, 0.0);
next.chest.orientation.rotate_z(move2 * -1.7);
next.head.orientation.rotate_z(move2 * 0.9);
next.shorts.orientation.rotate_z(move2 * 1.1);
next.belt.orientation.rotate_z(move2 * 0.5);
next.control.orientation.rotate_x(move2 * -1.8);
next.control.position += Vec3::new(move2 * 9.0, move2 * 2.0, move2 * -5.0);
},
_ => {},
}
}