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

rebase

Browse Source
This commit is contained in:
jshipsey 2020-11-08 19:02:48 -05:00
parent 20efc692fd
commit 0618de138e
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/comp/inventory/item/tool.rs
View File

@ -174,7 +174,7 @@ impl Tool {
num_spins: 3,
},
],
Axe(_) => vec![
Axe => vec![
ComboMelee {
stage_data: vec![
combo_melee::Stage {
@ -239,7 +239,7 @@ impl Tool {
vertical_leap_strength: 8.0,
},
],
Hammer(_) => vec![
Hammer => vec![
ComboMelee {
stage_data: vec![combo_melee::Stage {
stage: 1,

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

@ -102,7 +102,7 @@ impl Animation for AlphaAnimation {
* Quaternion::rotation_y(slow * -1.3)
* Quaternion::rotation_z(1.4 + slow * -0.5);
},
Some(ToolKind::Axe(_)) => {
Some(ToolKind::Axe) => {
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_x(0.0);
next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
@ -149,7 +149,7 @@ impl Animation for AlphaAnimation {
0.0 + movement1 * -1.5 + movement2 * 2.5 + movement3 * -1.0,
);
},
Some(ToolKind::Hammer(_)) => {
Some(ToolKind::Hammer) => {
let (movement1, movement2, movement3) = match stage_section {
Some(StageSection::Buildup) => ((anim_time as f32).powf(0.25), 0.0, 0.0),
Some(StageSection::Swing) => (1.0, anim_time as f32, 0.0),

4
voxygen/src/anim/src/character/shoot.rs
View File

@ -57,7 +57,7 @@ impl Animation for ShootAnimation {
let exp = ((anim_time as f32).powf(0.3 as f32)).min(1.2);
match active_tool_kind {
Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => {
Some(ToolKind::Staff) | Some(ToolKind::Sceptre) => {
let (movement1, movement2, movement3) = match stage_section {
Some(StageSection::Buildup) => (anim_time as f32, 0.0, 0.0),
Some(StageSection::Swing) => (1.0, (anim_time as f32).powf(0.25), 0.0),
@ -111,7 +111,7 @@ impl Animation for ShootAnimation {
} else {
};
},
Some(ToolKind::Bow(_)) => {
Some(ToolKind::Bow) => {
let (movement1, movement2, _movement3) = match stage_section {
Some(StageSection::Buildup) => ((anim_time as f32).powf(0.25), 0.0, 0.0),
Some(StageSection::Swing) => (1.0, anim_time as f32, 0.0),

6
voxygen/src/anim/src/character/spin.rs
View File

@ -52,7 +52,7 @@ impl Animation for SpinAnimation {
next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
match active_tool_kind {
Some(ToolKind::Sword(_)) => {
Some(ToolKind::Sword) => {
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_x(0.0);
@ -97,7 +97,7 @@ impl Animation for SpinAnimation {
next.torso.orientation = Quaternion::rotation_z(movement2 * 6.28);
},
Some(ToolKind::Axe(_)) => {
Some(ToolKind::Axe) => {
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_x(0.0);
next.hand_l.position = Vec3::new(s_a.ahl.0, s_a.ahl.1, s_a.ahl.2);
@ -178,7 +178,7 @@ impl Animation for SpinAnimation {
);
},
Some(ToolKind::Hammer(_)) => {
Some(ToolKind::Hammer) => {
next.hand_l.position = Vec3::new(-0.75, -1.0, -2.5);
next.hand_l.orientation = Quaternion::rotation_x(1.27);
next.hand_r.position = Vec3::new(0.75, -1.5, -5.5);

2
voxygen/src/anim/src/character/spinmelee.rs
View File

@ -90,7 +90,7 @@ impl Animation for SpinMeleeAnimation {
next.belt.orientation = Quaternion::rotation_x(0.1);
next.shorts.orientation = Quaternion::rotation_x(0.2);
},
Some(ToolKind::Axe(_)) => {
Some(ToolKind::Axe) => {
next.head.position = Vec3::new(0.0, s_a.head.0 + 1.0, s_a.head.1 + 1.0);
next.hand_l.position = Vec3::new(-0.5, 0.0, 4.0);

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

@ -1136,7 +1136,7 @@ impl FigureMgr {
let stage_index = (s.stage - 1) as usize;
let stage_progress = match active_tool_kind {
Some(ToolKind::Sword(_)) => {
Some(ToolKind::Sword) => {
let stage_time = s.timer.as_secs_f64();
//let stage_progress = match s.stage_section {
match s.stage_section {
@ -1161,7 +1161,7 @@ impl FigureMgr {
_ => 0.0,
}
},
Some(ToolKind::Axe(_)) => {
Some(ToolKind::Axe) => {
let stage_time = s.timer.as_secs_f64();
//let stage_progress = match s.stage_section {
match s.stage_section {