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

Brutal swing

Browse Source
This commit is contained in:
Sam 2023-05-14 18:34:49 -04:00
parent 8ff7ee2819
commit 3bdde16881
2 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
assets/common/abilities/axe/brutal_swing.ron
View File

@ -3,20 +3,21 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 4,
poise: 5,
damage: 18,
poise: 10,
knockback: 0,
energy_regen: 5,
energy_regen: 0,
),
range: 3.0,
angle: 45.0,
angle: 360.0,
multi_target: Some(Normal),
),
buildup_duration: 0.15,
swing_duration: 0.05,
buildup_duration: 0.2,
swing_duration: 0.2,
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

@ -3,7 +3,7 @@ use super::{
CharacterSkeleton, SkeletonAttr,
};
use common::states::utils::{AbilityInfo, StageSection};
use core::f32::consts::PI;
use core::f32::consts::{PI, TAU};
pub struct ComboAnimation;
impl Animation for ComboAnimation {
@ -970,6 +970,41 @@ impl Animation for ComboAnimation {
_ => {},
}
},
Some("common.abilities.axe.brutal_swing") => {
let (move1, move2_raw) = match stage_section {
Some(StageSection::Buildup) => {
next.main_weapon_trail = false;
next.off_weapon_trail = false;
(anim_time, 0.0)
},
Some(StageSection::Action) => (1.0, anim_time),
Some(StageSection::Recover) => {
next.main_weapon_trail = false;
next.off_weapon_trail = false;
(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 * -1.0, s_a.ac.1 + move1 * -4.0, s_a.ac.2);
next.control.orientation = Quaternion::rotation_x(s_a.ac.3 + move1 * -0.4)
* Quaternion::rotation_y(s_a.ac.4 + move1 * -0.5)
* Quaternion::rotation_z(s_a.ac.5 + move1 * 1.5);
next.control.orientation.rotate_z(move2 * -3.5);
next.control.position += Vec3::new(move2 * 12.0, move2 * 4.0, 0.0);
next.torso.orientation.rotate_z(move2_raw * -TAU);
},
_ => {},
}
}