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

Fracture

Browse Source
This commit is contained in:
Sam 2023-05-20 13:41:18 -04:00
parent a2deac19ee
commit 35a05329fc
2 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,20 +3,26 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 4, damage: 16,
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: Crippled,
dur_secs: 10.0,
strength: Value(1.0),
chance: 1.0,
))),
), ),
buildup_duration: 0.15, buildup_duration: 0.2,
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: 15,
) )

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

@ -1061,6 +1061,43 @@ impl Animation for ComboAnimation {
next.belt.orientation.rotate_z(move2 * -0.6); next.belt.orientation.rotate_z(move2 * -0.6);
next.control.position += Vec3::new(move2 * -6.0, move2 * -20.0, move2 * -4.0); next.control.position += Vec3::new(move2 * -6.0, move2 * -20.0, move2 * -4.0);
}, },
Some("common.abilities.axe.fracture") => {
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, 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 / 2.0 + move2 * -0.5);
next.control.orientation.rotate_x(move1 * 0.0);
next.chest.orientation.rotate_x(move1 * -0.5);
next.chest.orientation.rotate_z(move1 * 0.7);
next.head.orientation.rotate_z(move1 * -0.3);
next.belt.orientation.rotate_z(move1 * -0.1);
next.shorts.orientation.rotate_z(move1 * -0.4);
next.chest.orientation.rotate_z(move2 * -1.8);
next.head.orientation.rotate_z(move2 * 0.9);
next.shorts.orientation.rotate_z(move2 * 1.3);
next.belt.orientation.rotate_z(move2 * 0.6);
next.control.orientation.rotate_x(move2 * -0.9);
next.control.orientation.rotate_z(move2 * -3.5);
next.control.position += Vec3::new(move2 * 14.0, move2 * 6.0, 0.0);
},
_ => {}, _ => {},
} }
} }