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

Spear magic

Browse Source
This commit is contained in:
Sam 2023-03-25 13:59:23 -04:00
parent c8bb0050ad
commit 95347e8a60
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/voxel/object_manifest.ron
View File

@ -921,7 +921,7 @@
),
AdletSpear: (
bone0: (
offset: (-12.5, -12.5, 0.0),
offset: (5.0, -22.0, -2.0),
central: ("weapon.projectile.adlet-spear"),
),
bone1: (

BIN
assets/voxygen/voxel/weapon/projectile/adlet-spear.vox (Stored with Git LFS)
View File

Binary file not shown.

10
voxygen/anim/src/biped_small/shoot.rs
View File

@ -247,7 +247,6 @@ impl Animation for ShootAnimation {
let pullback = 1.0 - move3;
let move1abs = move1base * pullback;
let move2abs = move2base * pullback;
next.control_l.position = Vec3::new(
0.0,
0.0 + move1abs * 4.0 + move2abs * -4.0,
@ -273,6 +272,15 @@ impl Animation for ShootAnimation {
next.control.orientation =
Quaternion::rotation_x(-0.3 + move1abs * 0.5 + move2abs * -0.5 + move3 * 0.5)
* Quaternion::rotation_y(0.5 * speednorm);
if matches!(stage_section, Some(StageSection::Recover)) {
if move3 < 0.05 {
next.main.position += Vec3::new(0.0, 100000.0, -10000000.0);
}
if move3 < 0.3 {
next.main.scale = Vec3::zero();
}
}
},
_ => {},
}