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

Rake

Browse Source
This commit is contained in:
Sam 2023-05-18 21:37:59 -04:00
parent ff15780c22
commit 38fb7b8cd5
2 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
assets/common/abilities/axe/rake.ron
View File

@ -3,20 +3,26 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 4, damage: 20,
poise: 5, poise: 10,
knockback: 0, knockback: 0,
energy_regen: 5, energy_regen: 0,
), ),
range: 3.0, range: 3.0,
angle: 45.0, angle: 45.0,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 8.0,
strength: DamageFraction(0.25),
chance: 1.0,
))),
), ),
buildup_duration: 0.15, buildup_duration: 0.3,
swing_duration: 0.05, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.1, recover_duration: 0.3,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 0, energy_cost_per_strike: 10,
) )

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

@ -1029,6 +1029,38 @@ impl Animation for ComboAnimation {
next.control.orientation.rotate_y(move2 * -0.8); next.control.orientation.rotate_y(move2 * -0.8);
next.control.orientation.rotate_z(move2 * -1.0); next.control.orientation.rotate_z(move2 * -1.0);
}, },
Some("common.abilities.axe.rake") => {
let (move1, move2_raw) = 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_raw * 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 + move1 * 8.0, s_a.ac.1, s_a.ac.2);
next.control.orientation = Quaternion::rotation_x(s_a.ac.3 - move1 * 2.5)
* Quaternion::rotation_y(s_a.ac.4)
* Quaternion::rotation_z(s_a.ac.5 + move1 * 0.7);
next.chest.orientation.rotate_z(move1 * -0.5);
next.head.orientation.rotate_z(move1 * 0.3);
next.belt.orientation.rotate_z(move1 * 0.2);
next.control.orientation.rotate_x(move2 * -1.2);
next.chest.orientation.rotate_z(move2 * 1.2);
next.head.orientation.rotate_z(move2 * -0.7);
next.belt.orientation.rotate_z(move2 * -0.6);
next.control.position += Vec3::new(move2 * -6.0, move2 * -20.0, move2 * -4.0);
},
_ => {}, _ => {},
} }
} }