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

Solid smash

Browse Source
This commit is contained in:
Sam 2024-01-29 18:20:06 -05:00
parent fcfff367c9
commit bddced1ab7
9 changed files with 289 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/common/abilities/ability_set_manifest.ron
View File

@ -193,8 +193,7 @@
),
Tool(Hammer): (
guard: Some(Simple(None, "common.abilities.hammer.basic_guard")),
primary: Simple(None, "common.abilities.hammer.basic_guard"),
// primary: Simple(None, "common.abilities.hammer.solid_smash"),
primary: Simple(None, "common.abilities.hammer.solid_smash"),
secondary: Simple(None, "common.abilities.hammer.basic_guard"),
// secondary: Simple(None, "common.abilities.hammer.wide_wallop"),
abilities: [

18
assets/common/abilities/hammer/solid_smash.ron Normal file
View File

@ -0,0 +1,18 @@
BasicMelee(
energy_cost: 0,
buildup_duration: 0.2,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.2,
melee_constructor: (
kind: Bash(
damage: 10,
poise: 10,
knockback: 5,
energy_regen: 10,
),
range: 3.0,
angle: 15.0,
),
ori_modifier: 0.6,
)

BIN
assets/voxygen/element/skills/hammer/solid_smash.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

5
assets/voxygen/i18n/en/hud/ability.ftl
View File

@ -375,3 +375,8 @@ common-abilities-axe-capsize = Capsize
.desc =
Stagger everything nearby with a heavy spinning strike.
Automatically upgrades from bulkhead at 50 combo.
# Hammer abilities
common-abilities-hammer-solid_smash = Solid Smash
.desc =
A solid smash, that'll hurt

415
voxygen/anim/src/character/alpha.rs
View File

@ -1,6 +1,6 @@
use super::{
super::{vek::*, Animation},
CharacterSkeleton, SkeletonAttr,
hammer_start, twist_back, twist_forward, CharacterSkeleton, SkeletonAttr,
};
use common::{
comp::item::{Hands, ToolKind},
@ -11,6 +11,7 @@ use core::f32::consts::PI;
pub struct AlphaAnimation;
type AlphaAnimationDependency<'a> = (
Option<&'a str>,
(Option<Hands>, Option<Hands>),
Option<StageSection>,
Option<AbilityInfo>,
@ -25,7 +26,7 @@ impl Animation for AlphaAnimation {
#[cfg_attr(feature = "be-dyn-lib", export_name = "character_alpha")]
fn update_skeleton_inner(
skeleton: &Self::Skeleton,
(hands, stage_section, ability_info): Self::Dependency<'_>,
(ability_id, hands, stage_section, ability_info): Self::Dependency<'_>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,
@ -33,214 +34,250 @@ impl Animation for AlphaAnimation {
*rate = 1.0;
let mut next = (*skeleton).clone();
let (move1, move2, _move3, move2h) = match stage_section {
Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0, 0.0),
Some(StageSection::Action) => (1.0, anim_time.powi(2), 0.0, anim_time.powf(0.25)),
Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4), 1.0),
_ => (0.0, 0.0, 0.0, 0.0),
};
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_x(0.0);
next.second.position = Vec3::new(0.0, 0.0, 0.0);
next.second.orientation = Quaternion::rotation_z(0.0);
next.torso.position = Vec3::new(0.0, 0.0, 1.1);
next.torso.orientation = Quaternion::rotation_z(0.0);
if matches!(
stage_section,
Some(StageSection::Action | StageSection::Recover)
) {
if matches!(stage_section, Some(StageSection::Action)) {
next.main_weapon_trail = true;
next.off_weapon_trail = true;
}
match ability_info.and_then(|a| a.tool) {
Some(ToolKind::Dagger) => {
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_x(0.0);
next.chest.orientation = Quaternion::rotation_z(move1 * 1.1 + move2 * -2.0);
next.head.position = Vec3::new(0.0 + move2 * 2.0, s_a.head.0, s_a.head.1);
next.head.orientation = Quaternion::rotation_z(move1 * -0.9 + move2 * 1.8);
},
Some(ToolKind::Pick | ToolKind::Shovel) => {
match ability_id {
Some("common.abilities.hammer.solid_smash") => {
hammer_start(&mut next, s_a);
let (move1, move2, move3) = match stage_section {
Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
Some(StageSection::Action) => (1.0, anim_time.powf(0.25), 0.0),
Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
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 moveret1 = move1 * pullback;
let moveret2 = move2 * pullback;
let move1 = move1 * pullback;
let move2 = move2 * pullback;
next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
next.head.orientation = Quaternion::rotation_x(moveret1 * 0.1 + moveret2 * 0.3)
* Quaternion::rotation_z(move1 * -0.2 + moveret2 * 0.2);
next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + moveret2 * -2.0);
next.chest.orientation = Quaternion::rotation_x(moveret1 * 0.4 + moveret2 * -0.7)
* Quaternion::rotation_y(moveret1 * 0.3 + moveret2 * -0.4)
* Quaternion::rotation_z(moveret1 * 0.5 + moveret2 * -0.5);
next.control.orientation.rotate_x(move1 * 2.7);
next.control.orientation.rotate_z(move1 * 1.4);
next.control.position += Vec3::new(-12.0, 0.0, 0.0) * move1;
next.control.orientation.rotate_x(move1 * -1.2);
twist_back(&mut next, move1, 0.8, 0.3, 0.1, 0.5);
twist_forward(&mut next, move2, 1.4, 0.5, 0.3, 1.0);
next.control.orientation.rotate_x(move2 * -1.9);
next.control.orientation.rotate_z(move2 * 0.6);
},
Some(ToolKind::Debug) => {
next.hand_l.position = Vec3::new(-7.0, 4.0, 3.0);
next.hand_l.orientation = Quaternion::rotation_x(1.27);
next.main.position = Vec3::new(-5.0, 5.0, 23.0);
next.main.orientation = Quaternion::rotation_x(PI);
},
_ => {},
}
match hands {
(Some(Hands::Two), _) | (None, Some(Hands::Two)) => {
match ability_info.and_then(|a| a.tool) {
Some(ToolKind::Pick) => {
let (move1, move2, move3) = match stage_section {
Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
Some(StageSection::Action) => (1.0, anim_time, 0.0),
Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
_ => (0.0, 0.0, 0.0),
};
let pullback = 1.0 - move3;
let moveret1 = move1 * pullback;
let moveret2 = move2 * pullback;
next.hand_l.position =
Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2 + moveret2 * -7.0);
next.hand_l.orientation = Quaternion::rotation_x(s_a.hhl.3)
* Quaternion::rotation_y(s_a.hhl.4)
* Quaternion::rotation_z(s_a.hhl.5);
next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
next.hand_r.orientation = Quaternion::rotation_x(s_a.hhr.3)
* Quaternion::rotation_y(s_a.hhr.4)
* Quaternion::rotation_z(s_a.hhr.5);
next.control.position = Vec3::new(
s_a.hc.0 + moveret1 * -13.0 + moveret2 * 3.0,
s_a.hc.1 + (moveret2 * 5.0),
s_a.hc.2 + moveret1 * 8.0 + moveret2 * -6.0,
);
next.control.orientation =
Quaternion::rotation_x(s_a.hc.3 + (moveret1 * 1.5 + moveret2 * -2.55))
* Quaternion::rotation_y(
s_a.hc.4 + moveret1 * PI / 2.0 + moveret2 * 0.5,
)
* Quaternion::rotation_z(s_a.hc.5 + (moveret2 * -0.5));
_ => {
let (move1, move2, _move3, move2h) = match stage_section {
Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0, 0.0),
Some(StageSection::Action) => {
(1.0, anim_time.powi(2), 0.0, anim_time.powf(0.25))
},
Some(ToolKind::Shovel) => {
let (move1, move2, move3) = match stage_section {
Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
Some(StageSection::Action) => (1.0, anim_time, 0.0),
Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
_ => (0.0, 0.0, 0.0),
};
let pullback = 1.0 - move3;
let moveret1 = move1 * pullback;
let moveret2 = move2 * pullback;
Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4), 1.0),
_ => (0.0, 0.0, 0.0, 0.0),
};
next.hand_l.position = Vec3::new(8.0, 6.0, 3.0);
next.hand_l.orientation = Quaternion::rotation_x(PI / 2.0);
next.hand_r.position = Vec3::new(8.0, 6.0, 15.0);
next.hand_r.orientation = Quaternion::rotation_x(PI / 2.0);
next.main.position = Vec3::new(7.5, 7.5, 13.2);
next.main.orientation = Quaternion::rotation_y(PI);
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_x(0.0);
next.second.position = Vec3::new(0.0, 0.0, 0.0);
next.second.orientation = Quaternion::rotation_z(0.0);
next.torso.position = Vec3::new(0.0, 0.0, 1.1);
next.torso.orientation = Quaternion::rotation_z(0.0);
next.control.position = Vec3::new(-11.0 + moveret1 * 8.0, 1.8, 4.0);
next.control.orientation =
Quaternion::rotation_x(moveret1 * 0.3 + moveret2 * 0.2)
* Quaternion::rotation_y(0.8 - moveret1 * 0.7 + moveret2 * 0.7)
* Quaternion::rotation_z(moveret2 * 0.1 - moveret1 * 0.4);
},
_ => {},
}
},
(_, _) => {},
};
match hands {
(Some(Hands::One), _) => match ability_info.and_then(|a| a.tool) {
Some(ToolKind::Dagger) => {
next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
next.control_l.orientation = Quaternion::rotation_x(-0.3 + move2 * 2.0)
* Quaternion::rotation_y(move1 * -1.2 + move2 * -1.5)
* Quaternion::rotation_z(move2 * 1.5);
next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
next.hand_l.orientation = Quaternion::rotation_x(PI / 2.0)
},
Some(ToolKind::Pick | ToolKind::Shovel) => {
next.control_l.position = Vec3::new(
-7.0,
8.0 + move1 * -4.0 + move2 * 4.0,
2.0 + move1 * 16.0 + move2 * -19.0,
);
next.control_l.orientation =
Quaternion::rotation_x(-0.3 + move1 * 1.9 + move2 * -3.0)
* Quaternion::rotation_y(0.0)
* Quaternion::rotation_z(0.0);
next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
next.hand_l.orientation = Quaternion::rotation_x(PI / 2.0)
},
_ => {},
},
(_, _) => {},
};
match hands {
(None | Some(Hands::One), Some(Hands::One)) => {
match ability_info.and_then(|a| a.tool) {
Some(ToolKind::Dagger) => {
next.control_r.position = Vec3::new(7.0 + move2 * 8.0, 8.0, 2.0);
next.control_r.orientation = Quaternion::rotation_x(-0.3 + move2 * 2.0)
* Quaternion::rotation_y(move1 * -1.8 + move2 * -1.5)
* Quaternion::rotation_z(move2 * 1.5);
next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
next.hand_r.orientation = Quaternion::rotation_x(PI / 2.0)
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_x(0.0);
next.chest.orientation = Quaternion::rotation_z(move1 * 1.1 + move2 * -2.0);
next.head.position = Vec3::new(0.0 + move2 * 2.0, s_a.head.0, s_a.head.1);
next.head.orientation = Quaternion::rotation_z(move1 * -0.9 + move2 * 1.8);
},
Some(ToolKind::Pick | ToolKind::Shovel) => {
next.control_r.position = Vec3::new(
7.0,
8.0 + move1 * -4.0 + move2h * 4.0,
2.0 + move1 * 12.0 + move2h * -16.0,
);
next.control_r.orientation =
Quaternion::rotation_x(-0.3 + move1 * 2.3 + move2h * -3.5)
* Quaternion::rotation_y(0.0)
* Quaternion::rotation_z(0.0);
next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
next.hand_r.orientation = Quaternion::rotation_x(PI / 2.0)
let (move1, move2, move3) = match stage_section {
Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
Some(StageSection::Action) => (1.0, anim_time.powf(0.25), 0.0),
Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
_ => (0.0, 0.0, 0.0),
};
let pullback = 1.0 - move3;
let moveret1 = move1 * pullback;
let moveret2 = move2 * pullback;
next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
next.head.orientation =
Quaternion::rotation_x(moveret1 * 0.1 + moveret2 * 0.3)
* Quaternion::rotation_z(move1 * -0.2 + moveret2 * 0.2);
next.chest.position =
Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + moveret2 * -2.0);
next.chest.orientation =
Quaternion::rotation_x(moveret1 * 0.4 + moveret2 * -0.7)
* Quaternion::rotation_y(moveret1 * 0.3 + moveret2 * -0.4)
* Quaternion::rotation_z(moveret1 * 0.5 + moveret2 * -0.5);
},
Some(ToolKind::Debug) => {
next.hand_l.position = Vec3::new(-7.0, 4.0, 3.0);
next.hand_l.orientation = Quaternion::rotation_x(1.27);
next.main.position = Vec3::new(-5.0, 5.0, 23.0);
next.main.orientation = Quaternion::rotation_x(PI);
},
_ => {},
}
match hands {
(Some(Hands::Two), _) | (None, Some(Hands::Two)) => {
match ability_info.and_then(|a| a.tool) {
Some(ToolKind::Pick) => {
let (move1, move2, move3) = match stage_section {
Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
Some(StageSection::Action) => (1.0, anim_time, 0.0),
Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
_ => (0.0, 0.0, 0.0),
};
let pullback = 1.0 - move3;
let moveret1 = move1 * pullback;
let moveret2 = move2 * pullback;
next.hand_l.position =
Vec3::new(s_a.hhl.0, s_a.hhl.1, s_a.hhl.2 + moveret2 * -7.0);
next.hand_l.orientation = Quaternion::rotation_x(s_a.hhl.3)
* Quaternion::rotation_y(s_a.hhl.4)
* Quaternion::rotation_z(s_a.hhl.5);
next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
next.hand_r.orientation = Quaternion::rotation_x(s_a.hhr.3)
* Quaternion::rotation_y(s_a.hhr.4)
* Quaternion::rotation_z(s_a.hhr.5);
next.control.position = Vec3::new(
s_a.hc.0 + moveret1 * -13.0 + moveret2 * 3.0,
s_a.hc.1 + (moveret2 * 5.0),
s_a.hc.2 + moveret1 * 8.0 + moveret2 * -6.0,
);
next.control.orientation =
Quaternion::rotation_x(
s_a.hc.3 + (moveret1 * 1.5 + moveret2 * -2.55),
) * Quaternion::rotation_y(
s_a.hc.4 + moveret1 * PI / 2.0 + moveret2 * 0.5,
) * Quaternion::rotation_z(s_a.hc.5 + (moveret2 * -0.5));
},
Some(ToolKind::Shovel) => {
let (move1, move2, move3) = match stage_section {
Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0),
Some(StageSection::Action) => (1.0, anim_time, 0.0),
Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)),
_ => (0.0, 0.0, 0.0),
};
let pullback = 1.0 - move3;
let moveret1 = move1 * pullback;
let moveret2 = move2 * pullback;
next.hand_l.position = Vec3::new(8.0, 6.0, 3.0);
next.hand_l.orientation = Quaternion::rotation_x(PI / 2.0);
next.hand_r.position = Vec3::new(8.0, 6.0, 15.0);
next.hand_r.orientation = Quaternion::rotation_x(PI / 2.0);
next.main.position = Vec3::new(7.5, 7.5, 13.2);
next.main.orientation = Quaternion::rotation_y(PI);
next.control.position = Vec3::new(-11.0 + moveret1 * 8.0, 1.8, 4.0);
next.control.orientation =
Quaternion::rotation_x(moveret1 * 0.3 + moveret2 * 0.2)
* Quaternion::rotation_y(
0.8 - moveret1 * 0.7 + moveret2 * 0.7,
)
* Quaternion::rotation_z(moveret2 * 0.1 - moveret1 * 0.4);
},
_ => {},
}
},
(_, _) => {},
};
match hands {
(Some(Hands::One), _) => match ability_info.and_then(|a| a.tool) {
Some(ToolKind::Dagger) => {
next.control_l.position = Vec3::new(-7.0, 8.0, 2.0);
next.control_l.orientation = Quaternion::rotation_x(-0.3 + move2 * 2.0)
* Quaternion::rotation_y(move1 * -1.2 + move2 * -1.5)
* Quaternion::rotation_z(move2 * 1.5);
next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
next.hand_l.orientation = Quaternion::rotation_x(PI / 2.0)
},
Some(ToolKind::Pick | ToolKind::Shovel) => {
next.control_l.position = Vec3::new(
-7.0,
8.0 + move1 * -4.0 + move2 * 4.0,
2.0 + move1 * 16.0 + move2 * -19.0,
);
next.control_l.orientation =
Quaternion::rotation_x(-0.3 + move1 * 1.9 + move2 * -3.0)
* Quaternion::rotation_y(0.0)
* Quaternion::rotation_z(0.0);
next.hand_l.position = Vec3::new(0.0, -0.5, 0.0);
next.hand_l.orientation = Quaternion::rotation_x(PI / 2.0)
},
_ => {},
},
(_, _) => {},
};
match hands {
(None | Some(Hands::One), Some(Hands::One)) => {
match ability_info.and_then(|a| a.tool) {
Some(ToolKind::Dagger) => {
next.control_r.position = Vec3::new(7.0 + move2 * 8.0, 8.0, 2.0);
next.control_r.orientation =
Quaternion::rotation_x(-0.3 + move2 * 2.0)
* Quaternion::rotation_y(move1 * -1.8 + move2 * -1.5)
* Quaternion::rotation_z(move2 * 1.5);
next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
next.hand_r.orientation = Quaternion::rotation_x(PI / 2.0)
},
Some(ToolKind::Pick | ToolKind::Shovel) => {
next.control_r.position = Vec3::new(
7.0,
8.0 + move1 * -4.0 + move2h * 4.0,
2.0 + move1 * 12.0 + move2h * -16.0,
);
next.control_r.orientation =
Quaternion::rotation_x(-0.3 + move1 * 2.3 + move2h * -3.5)
* Quaternion::rotation_y(0.0)
* Quaternion::rotation_z(0.0);
next.hand_r.position = Vec3::new(0.0, -0.5, 0.0);
next.hand_r.orientation = Quaternion::rotation_x(PI / 2.0)
},
_ => {},
}
},
(_, _) => {},
};
match hands {
(None, None) | (None, Some(Hands::One)) => {
next.hand_l.position = Vec3::new(-4.5, 8.0, 5.0);
next.hand_l.orientation =
Quaternion::rotation_x(1.9) * Quaternion::rotation_y(-0.5)
},
(_, _) => {},
};
match hands {
(None, None) | (Some(Hands::One), None) => {
next.hand_r.position = Vec3::new(4.5, 8.0, 5.0);
next.hand_r.orientation =
Quaternion::rotation_x(1.9) * Quaternion::rotation_y(0.5)
},
(_, _) => {},
};
if let (None, Some(Hands::Two)) = hands {
next.second = next.main;
}
if skeleton.holding_lantern {
next.hand_r.position =
Vec3::new(s_a.hand.0, s_a.hand.1 + 5.0, s_a.hand.2 + 12.0);
next.hand_r.orientation =
Quaternion::rotation_x(2.25) * Quaternion::rotation_z(0.9);
next.lantern.position = Vec3::new(-0.5, -0.5, -1.5);
next.lantern.orientation = next.hand_r.orientation.inverse();
}
},
(_, _) => {},
};
match hands {
(None, None) | (None, Some(Hands::One)) => {
next.hand_l.position = Vec3::new(-4.5, 8.0, 5.0);
next.hand_l.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(-0.5)
},
(_, _) => {},
};
match hands {
(None, None) | (Some(Hands::One), None) => {
next.hand_r.position = Vec3::new(4.5, 8.0, 5.0);
next.hand_r.orientation = Quaternion::rotation_x(1.9) * Quaternion::rotation_y(0.5)
},
(_, _) => {},
};
if let (None, Some(Hands::Two)) = hands {
next.second = next.main;
}
if skeleton.holding_lantern {
next.hand_r.position = Vec3::new(s_a.hand.0, s_a.hand.1 + 5.0, s_a.hand.2 + 12.0);
next.hand_r.orientation = Quaternion::rotation_x(2.25) * Quaternion::rotation_z(0.9);
next.lantern.position = Vec3::new(-0.5, -0.5, -1.5);
next.lantern.orientation = next.hand_r.orientation.inverse();
}
next

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

@ -467,3 +467,35 @@ impl CharacterSkeleton {
}
}
}
pub fn hammer_start(next: &mut CharacterSkeleton, s_a: &SkeletonAttr) {
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_z(0.0);
next.hand_l.position = Vec3::new(s_a.hhl.0, s_a.hhl.1 + 3.0, s_a.hhl.2 - 1.0);
next.hand_l.orientation = Quaternion::rotation_x(s_a.hhl.3)
* Quaternion::rotation_y(s_a.hhl.4)
* Quaternion::rotation_z(s_a.hhl.5);
next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1 + 3.0, s_a.hhr.2 + 1.0);
next.hand_r.orientation = Quaternion::rotation_x(s_a.hhr.3)
* Quaternion::rotation_y(s_a.hhr.4)
* Quaternion::rotation_z(s_a.hhr.5);
next.control.position = Vec3::new(s_a.hc.0 - 1.0, s_a.hc.1, s_a.hc.2 - 3.0);
next.control.orientation = Quaternion::rotation_x(s_a.hc.3)
* Quaternion::rotation_y(s_a.hc.4)
* Quaternion::rotation_z(s_a.hc.5);
}
pub fn twist_back(next: &mut CharacterSkeleton, move1: f32, c: f32, h: f32, b: f32, s: f32) {
next.chest.orientation.rotate_z(move1 * c);
next.head.orientation.rotate_z(move1 * -h);
next.belt.orientation.rotate_z(move1 * -b);
next.shorts.orientation.rotate_z(move1 * -s);
}
pub fn twist_forward(next: &mut CharacterSkeleton, move2: f32, c: f32, h: f32, b: f32, s: f32) {
next.chest.orientation.rotate_z(move2 * -c);
next.head.orientation.rotate_z(move2 * h);
next.belt.orientation.rotate_z(move2 * b);
next.shorts.orientation.rotate_z(move2 * s);
}

3
voxygen/src/hud/img_ids.rs
View File

@ -314,7 +314,8 @@ image_ids! {
axe_keelhaul: "voxygen.element.skills.axe.keelhaul",
axe_bulkhead: "voxygen.element.skills.axe.bulkhead",
axe_capsize: "voxygen.element.skills.axe.capsize",
// Hammer
hammer_solid_smash: "voxygen.element.skills.hammer.solid_smash",
// Skilltree Icons
health_plus_skill: "voxygen.element.skills.skilltree.health_plus",
energy_plus_skill: "voxygen.element.skills.skilltree.energy_plus",

1
voxygen/src/hud/util.rs
View File

@ -619,6 +619,7 @@ pub fn ability_image(imgs: &img_ids::Imgs, ability_id: &str) -> image::Id {
"common.abilities.axe.bulkhead" => imgs.axe_bulkhead,
"common.abilities.axe.capsize" => imgs.axe_capsize,
// Hammer
"common.abilities.hammer.solid_smash" => imgs.hammer_solid_smash,
// Bow
"common.abilities.bow.charged" => imgs.bow_m1,
"common.abilities.bow.repeater" => imgs.bow_m2,

1
voxygen/src/scene/figure/mod.rs
View File

@ -1329,6 +1329,7 @@ impl FigureMgr {
anim::character::AlphaAnimation::update_skeleton(
&target_base,
(
ability_id,
hands,
Some(s.stage_section),
Some(s.static_data.ability_info),