From 42d2108c398db64183770ef05ea774ffed4efcef Mon Sep 17 00:00:00 2001 From: Snowram Date: Thu, 12 Nov 2020 00:17:12 +0100 Subject: [PATCH] Adds mindflayer npc --- .../npc_weapons/staff/mindflayer_staff.ron | 14 ++++ assets/common/npc_names.json | 4 ++ .../voxel/biped_large_central_manifest.ron | 60 ++++++++++++++++ .../voxel/biped_large_lateral_manifest.ron | 68 +++++++++++++++++++ .../voxel/npc/mindflayer/male/foot_l.vox | 3 + .../voxel/npc/mindflayer/male/foot_r.vox | 3 + .../voxel/npc/mindflayer/male/hand_l.vox | 3 + .../voxel/npc/mindflayer/male/hand_r.vox | 3 + .../voxel/npc/mindflayer/male/head.vox | 3 + .../voxel/npc/mindflayer/male/leg_l.vox | 3 + .../voxel/npc/mindflayer/male/leg_r.vox | 3 + .../voxel/npc/mindflayer/male/shoulder_l.vox | 3 + .../voxel/npc/mindflayer/male/shoulder_r.vox | 3 + .../voxel/npc/mindflayer/male/torso_lower.vox | 3 + .../voxel/npc/mindflayer/male/torso_upper.vox | 3 + .../weapon/staff/firestaff_mindflayer.vox | 3 + assets/voxygen/voxel/weapon/staff/orc-0.vox | 3 - common/src/comp/body/biped_large.rs | 6 +- common/src/loadout_builder.rs | 5 ++ voxygen/src/anim/src/biped_large/mod.rs | 17 +++-- voxygen/src/anim/src/biped_large/wield.rs | 6 +- 21 files changed, 207 insertions(+), 12 deletions(-) create mode 100644 assets/common/items/npc_weapons/staff/mindflayer_staff.ron create mode 100644 assets/voxygen/voxel/npc/mindflayer/male/foot_l.vox create mode 100644 assets/voxygen/voxel/npc/mindflayer/male/foot_r.vox create mode 100644 assets/voxygen/voxel/npc/mindflayer/male/hand_l.vox create mode 100644 assets/voxygen/voxel/npc/mindflayer/male/hand_r.vox create mode 100644 assets/voxygen/voxel/npc/mindflayer/male/head.vox create mode 100644 assets/voxygen/voxel/npc/mindflayer/male/leg_l.vox create mode 100644 assets/voxygen/voxel/npc/mindflayer/male/leg_r.vox create mode 100644 assets/voxygen/voxel/npc/mindflayer/male/shoulder_l.vox create mode 100644 assets/voxygen/voxel/npc/mindflayer/male/shoulder_r.vox create mode 100644 assets/voxygen/voxel/npc/mindflayer/male/torso_lower.vox create mode 100644 assets/voxygen/voxel/npc/mindflayer/male/torso_upper.vox create mode 100644 assets/voxygen/voxel/weapon/staff/firestaff_mindflayer.vox delete mode 100644 assets/voxygen/voxel/weapon/staff/orc-0.vox diff --git a/assets/common/items/npc_weapons/staff/mindflayer_staff.ron b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron new file mode 100644 index 0000000000..de92e5a518 --- /dev/null +++ b/assets/common/items/npc_weapons/staff/mindflayer_staff.ron @@ -0,0 +1,14 @@ +ItemDef( + name: "Mindflayer Staff", + description: "Placeholder", + kind: Tool( + ( + kind: Staff, + stats: ( + equip_time_millis: 500, + power: 1.00, + ), + ) + ), + quality: Low, +) diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json index e58400d576..acb401b7ee 100644 --- a/assets/common/npc_names.json +++ b/assets/common/npc_names.json @@ -617,6 +617,10 @@ "saurok_sly": { "keyword": "saurok_sly", "generic": "Sly Saurok" + }, + "mindflayer": { + "keyword": "mindflayer", + "generic": "Mindflayer" } } }, diff --git a/assets/voxygen/voxel/biped_large_central_manifest.ron b/assets/voxygen/voxel/biped_large_central_manifest.ron index 49cdbf1642..c3e3c66bb4 100644 --- a/assets/voxygen/voxel/biped_large_central_manifest.ron +++ b/assets/voxygen/voxel/biped_large_central_manifest.ron @@ -539,4 +539,64 @@ central: ("weapon.bow.longbow_saurok"), ) ), + (Mindflayer, Male): ( + head: ( + offset: (-8.5, -8.0, -10.5), + central: ("npc.mindflayer.male.head"), + ), + torso_upper: ( + offset: (-10.5, -8.5, -11.0), + central: ("npc.mindflayer.male.torso_upper"), + ), + torso_lower: ( + offset: (-4.5, -6.0, -7.5), + central: ("npc.mindflayer.male.torso_lower"), + ), + jaw: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + tail: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + second: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + main: ( + offset: (-5.5, -3.5, -4.0), + central: ("weapon.staff.firestaff_mindflayer"), + ) + ), + (Mindflayer, Female): ( + head: ( + offset: (-8.5, -8.0, -10.5), + central: ("npc.mindflayer.male.head"), + ), + torso_upper: ( + offset: (-10.5, -8.5, -11.0), + central: ("npc.mindflayer.male.torso_upper"), + ), + torso_lower: ( + offset: (-4.5, -6.0, -7.5), + central: ("npc.mindflayer.male.torso_lower"), + ), + jaw: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + tail: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + second: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + main: ( + offset: (-5.5, -3.5, -4.0), + central: ("weapon.staff.firestaff_mindflayer"), + ) + ), }) \ No newline at end of file diff --git a/assets/voxygen/voxel/biped_large_lateral_manifest.ron b/assets/voxygen/voxel/biped_large_lateral_manifest.ron index 784fb1d729..7a219f56a8 100644 --- a/assets/voxygen/voxel/biped_large_lateral_manifest.ron +++ b/assets/voxygen/voxel/biped_large_lateral_manifest.ron @@ -611,4 +611,72 @@ lateral: ("npc.saurok_sly.female.foot_r"), ), ), + (Mindflayer, Male): ( + shoulder_l: ( + offset: (-4.5, -3.0, -4.0), + lateral: ("npc.mindflayer.male.shoulder_l"), + ), + shoulder_r: ( + offset: (-4.5, -3.0, -4.0), + lateral: ("npc.mindflayer.male.shoulder_r"), + ), + hand_l: ( + offset: (-4.5, -4.0, -12.0), + lateral: ("npc.mindflayer.male.hand_l"), + ), + hand_r: ( + offset: (-4.5, -4.0, -12.0), + lateral: ("npc.mindflayer.male.hand_r"), + ), + leg_l: ( + offset: (-6.5, -10.0, -16.0), + lateral: ("npc.mindflayer.male.leg_l"), + ), + leg_r: ( + offset: (-6.5, -10.0, -16.0), + lateral: ("npc.mindflayer.male.leg_r"), + ), + foot_l: ( + offset: (-2.0, -4.5, -4.0), + lateral: ("npc.mindflayer.male.foot_l"), + ), + foot_r: ( + offset: (-2.0, -4.5, -4.0), + lateral: ("npc.mindflayer.male.foot_r"), + ) + ), + (Mindflayer, Female): ( + shoulder_l: ( + offset: (-4.5, -3.0, -4.0), + lateral: ("npc.mindflayer.male.shoulder_l"), + ), + shoulder_r: ( + offset: (-4.5, -3.0, -4.0), + lateral: ("npc.mindflayer.male.shoulder_r"), + ), + hand_l: ( + offset: (-4.5, -4.0, -12.0), + lateral: ("npc.mindflayer.male.hand_l"), + ), + hand_r: ( + offset: (-4.5, -4.0, -12.0), + lateral: ("npc.mindflayer.male.hand_r"), + ), + leg_l: ( + offset: (-6.5, -10.0, -16.0), + lateral: ("npc.mindflayer.male.leg_l"), + ), + leg_r: ( + offset: (-6.5, -10.0, -16.0), + lateral: ("npc.mindflayer.male.leg_r"), + ), + foot_l: ( + offset: (-2.0, -4.5, -4.0), + lateral: ("npc.mindflayer.male.foot_l"), + ), + foot_r: ( + offset: (-2.0, -4.5, -4.0), + lateral: ("npc.mindflayer.male.foot_r"), + ) + ), }) \ No newline at end of file diff --git a/assets/voxygen/voxel/npc/mindflayer/male/foot_l.vox b/assets/voxygen/voxel/npc/mindflayer/male/foot_l.vox new file mode 100644 index 0000000000..831b33bc1a --- /dev/null +++ b/assets/voxygen/voxel/npc/mindflayer/male/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b2a50d8e9a0f0bc92da9ba85fd45a7216c57124ee8e4d31eb9617962a7320d7 +size 1684 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/foot_r.vox b/assets/voxygen/voxel/npc/mindflayer/male/foot_r.vox new file mode 100644 index 0000000000..50c164ca7f --- /dev/null +++ b/assets/voxygen/voxel/npc/mindflayer/male/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8042918bfe333f459be1337e2e2e0d157abf61cb646ae04164ecabc58d93670 +size 1680 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/hand_l.vox b/assets/voxygen/voxel/npc/mindflayer/male/hand_l.vox new file mode 100644 index 0000000000..d3dcbf94a0 --- /dev/null +++ b/assets/voxygen/voxel/npc/mindflayer/male/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7cde551f556937f12016e5ac756c5d1d01bb632129d82642ff08bcb5f7d57671 +size 2244 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/hand_r.vox b/assets/voxygen/voxel/npc/mindflayer/male/hand_r.vox new file mode 100644 index 0000000000..ce706d3a0a --- /dev/null +++ b/assets/voxygen/voxel/npc/mindflayer/male/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:105be4028ac36c67ab52174394826b437f309bf783748df46161635b5bb82e99 +size 2244 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/head.vox b/assets/voxygen/voxel/npc/mindflayer/male/head.vox new file mode 100644 index 0000000000..97081d8775 --- /dev/null +++ b/assets/voxygen/voxel/npc/mindflayer/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5042c160f49133a157d403a9d944d503e82dbe1f8ca1e9f87f663894a2c14425 +size 4844 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/leg_l.vox b/assets/voxygen/voxel/npc/mindflayer/male/leg_l.vox new file mode 100644 index 0000000000..90aba41f0d --- /dev/null +++ b/assets/voxygen/voxel/npc/mindflayer/male/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b68f2846d392c090b550c14ef335db326683d72d09f701de917ba6b7aad6f21 +size 4940 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/leg_r.vox b/assets/voxygen/voxel/npc/mindflayer/male/leg_r.vox new file mode 100644 index 0000000000..353b007258 --- /dev/null +++ b/assets/voxygen/voxel/npc/mindflayer/male/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34c4aa529fa76c169aa1fcd668efe11cd6105b80a0ded0bac4180e58272680a7 +size 4940 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/shoulder_l.vox b/assets/voxygen/voxel/npc/mindflayer/male/shoulder_l.vox new file mode 100644 index 0000000000..abd3bbed38 --- /dev/null +++ b/assets/voxygen/voxel/npc/mindflayer/male/shoulder_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:adefe02026bc09cd8fa3075b67c06102311ed95f6b7dd9db71610dc4722e7274 +size 1816 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/shoulder_r.vox b/assets/voxygen/voxel/npc/mindflayer/male/shoulder_r.vox new file mode 100644 index 0000000000..ee56499ebd --- /dev/null +++ b/assets/voxygen/voxel/npc/mindflayer/male/shoulder_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84ce8a93e98ceef3a3b7885bc03a4bd9dffc3487fad409e8872ff30d6101f2b9 +size 1816 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/torso_lower.vox b/assets/voxygen/voxel/npc/mindflayer/male/torso_lower.vox new file mode 100644 index 0000000000..57b073e2fb --- /dev/null +++ b/assets/voxygen/voxel/npc/mindflayer/male/torso_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d754404c12663dd01f8775cf016411c7130abc99384598629c4f23380a51f92f +size 1996 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/torso_upper.vox b/assets/voxygen/voxel/npc/mindflayer/male/torso_upper.vox new file mode 100644 index 0000000000..439ad83e2d --- /dev/null +++ b/assets/voxygen/voxel/npc/mindflayer/male/torso_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:270a4a3194f1c434dbdabc0a296a25eb6e44e220a72af0b5fdb3db1cf28f6f45 +size 4572 diff --git a/assets/voxygen/voxel/weapon/staff/firestaff_mindflayer.vox b/assets/voxygen/voxel/weapon/staff/firestaff_mindflayer.vox new file mode 100644 index 0000000000..7b11549a64 --- /dev/null +++ b/assets/voxygen/voxel/weapon/staff/firestaff_mindflayer.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f187d2140aeb5d20aafb96d1353d4d28d7ddc42b80a4f3346ef68b2a6163059 +size 3252 diff --git a/assets/voxygen/voxel/weapon/staff/orc-0.vox b/assets/voxygen/voxel/weapon/staff/orc-0.vox deleted file mode 100644 index de9cf2b8d2..0000000000 --- a/assets/voxygen/voxel/weapon/staff/orc-0.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:456a8307ff50d0759da57068a3624eac64a30ba6637b9c18823fceade401d973 -size 1392 diff --git a/common/src/comp/body/biped_large.rs b/common/src/comp/body/biped_large.rs index 1dab709ab6..ab751e8cf9 100644 --- a/common/src/comp/body/biped_large.rs +++ b/common/src/comp/body/biped_large.rs @@ -43,6 +43,7 @@ make_case_elim!( Occultsaurok = 6, Mightysaurok = 7, Slysaurok = 8, + Mindflayer = 9, } ); @@ -60,6 +61,7 @@ pub struct AllSpecies { pub saurok_occult: SpeciesMeta, pub saurok_mighty: SpeciesMeta, pub saurok_sly: SpeciesMeta, + pub mindflayer: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -77,11 +79,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Occultsaurok => &self.saurok_occult, Species::Mightysaurok => &self.saurok_mighty, Species::Slysaurok => &self.saurok_sly, + Species::Mindflayer => &self.mindflayer, } } } -pub const ALL_SPECIES: [Species; 9] = [ +pub const ALL_SPECIES: [Species; 10] = [ Species::Ogre, Species::Cyclops, Species::Wendigo, @@ -91,6 +94,7 @@ pub const ALL_SPECIES: [Species; 9] = [ Species::Occultsaurok, Species::Mightysaurok, Species::Slysaurok, + Species::Mindflayer, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/common/src/loadout_builder.rs b/common/src/loadout_builder.rs index f0be91a52d..0ef9f7ca36 100644 --- a/common/src/loadout_builder.rs +++ b/common/src/loadout_builder.rs @@ -139,6 +139,11 @@ impl LoadoutBuilder { "common.items.npc_weapons.sword.dullahan_sword", )); }, + (biped_large::Species::Mindflayer, _) => { + main_tool = Some(Item::new_from_asset_expect( + "common.items.npc_weapons.staff.mindflayer_staff", + )); + }, }, Body::Humanoid(_) => { if is_giant { diff --git a/voxygen/src/anim/src/biped_large/mod.rs b/voxygen/src/anim/src/biped_large/mod.rs index b99da516b6..b01f413bd6 100644 --- a/voxygen/src/anim/src/biped_large/mod.rs +++ b/voxygen/src/anim/src/biped_large/mod.rs @@ -191,6 +191,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Occultsaurok, _) => (6.0, 3.5), (Mightysaurok, _) => (6.0, 3.5), (Slysaurok, _) => (6.0, 3.5), + (Mindflayer, _) => (5.0, 5.5), }, jaw: match (body.species, body.body_type) { (Ogre, _) => (0.0, 0.0), @@ -202,6 +203,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Occultsaurok, _) => (1.0, -2.5), (Mightysaurok, _) => (1.0, -2.5), (Slysaurok, _) => (1.0, -2.5), + (Mindflayer, _) => (0.0, 0.0), }, upper_torso: match (body.species, body.body_type) { (Ogre, Male) => (0.0, 28.0), @@ -214,6 +216,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Occultsaurok, _) => (3.0, 23.0), (Mightysaurok, _) => (3.0, 23.0), (Slysaurok, _) => (3.0, 23.0), + (Mindflayer, _) => (0.0, 31.0), }, lower_torso: match (body.species, body.body_type) { (Ogre, Male) => (1.0, -7.0), @@ -226,17 +229,14 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Occultsaurok, _) => (0.0, -6.0), (Mightysaurok, _) => (0.0, -6.0), (Slysaurok, _) => (0.0, -6.0), + (Mindflayer, _) => (5.5, -18.0), }, tail: match (body.species, body.body_type) { - (Ogre, _) => (0.0, 0.0), - (Cyclops, _) => (0.0, 0.0), - (Wendigo, _) => (0.0, 0.0), - (Troll, _) => (0.0, 0.0), - (Dullahan, _) => (0.0, 0.0), (Werewolf, _) => (-5.5, -2.0), (Occultsaurok, _) => (-4.5, -6.0), (Mightysaurok, _) => (-4.5, -6.0), (Slysaurok, _) => (-4.5, -6.0), + (_, _) => (0.0, 0.0), }, shoulder: match (body.species, body.body_type) { (Ogre, Male) => (12.0, 0.5, 0.0), @@ -249,6 +249,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Occultsaurok, _) => (7.5, 1.0, -1.5), (Mightysaurok, _) => (7.5, 1.0, -1.5), (Slysaurok, _) => (7.5, 1.0, -1.5), + (Mindflayer, _) => (8.0, 0.5, -1.0), }, hand: match (body.species, body.body_type) { (Ogre, Male) => (14.5, 0.0, -2.0), @@ -261,6 +262,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Occultsaurok, _) => (8.0, 1.5, -5.5), (Mightysaurok, _) => (8.0, 1.5, -5.5), (Slysaurok, _) => (8.0, 1.5, -5.5), + (Mindflayer, _) => (9.0, 0.5, -4.5), }, leg: match (body.species, body.body_type) { (Ogre, Male) => (0.0, 0.0, -4.0), @@ -273,6 +275,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Occultsaurok, _) => (3.0, 0.5, -6.0), (Mightysaurok, _) => (3.0, 0.5, -6.0), (Slysaurok, _) => (3.0, 0.5, -6.0), + (Mindflayer, _) => (6.0, -2.0, 6.5), }, foot: match (body.species, body.body_type) { (Ogre, Male) => (4.0, 1.0, -13.5), @@ -285,6 +288,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Occultsaurok, _) => (3.5, 2.0, -12.0), (Mightysaurok, _) => (3.5, 2.0, -12.0), (Slysaurok, _) => (3.5, 2.0, -12.0), + (Mindflayer, _) => (4.5, -0.5, -12.5), }, shl: match (body.species, body.body_type) { (Dullahan, _) => (-4.75, -11.0, 8.5, 1.47, -0.2, 0.0), @@ -322,16 +326,19 @@ impl<'a> From<&'a Body> for SkeletonAttr { sthl: match (body.species, body.body_type) { (Ogre, Female) => (-1.0, -5.0, 12.0, 1.27, 0.0, 0.0), (Occultsaurok, _) => (-1.0, -7.0, 12.0, 1.27, 0.0, 0.0), + (Mindflayer, _) => (-1.0, -5.0, 12.0, 1.27, 0.0, 0.0), (_, _) => (11.0, 5.0, -4.0, 1.27, 0.0, 0.0), }, sthr: match (body.species, body.body_type) { (Ogre, Female) => (5.0, -3.5, 18.0, 1.57, 0.8, 0.0), (Occultsaurok, _) => (7.0, -3.5, 18.0, 1.57, 0.8, 0.0), + (Mindflayer, _) => (7.0, -3.5, 18.0, 1.57, 0.8, 0.0), (_, _) => (17.0, 7.5, 2.0, 1.57, 0.8, 0.0), }, stc: match (body.species, body.body_type) { (Ogre, Female) => (-10.0, 7.0, -23.0, -0.3, 0.15, 0.0), (Occultsaurok, _) => (-10.0, 7.0, -22.0, -0.3, 0.15, 0.0), + (Mindflayer, _) => (-10.0, 7.0, -22.0, -0.3, 0.15, 0.0), (_, _) => (-18.0, 1.0, -2.0, -0.3, 0.15, 0.0), }, bhl: match (body.species, body.body_type) { diff --git a/voxygen/src/anim/src/biped_large/wield.rs b/voxygen/src/anim/src/biped_large/wield.rs index bd77702bb5..12d70ad99f 100644 --- a/voxygen/src/anim/src/biped_large/wield.rs +++ b/voxygen/src/anim/src/biped_large/wield.rs @@ -263,10 +263,10 @@ impl Animation for WieldAnimation { next.main.orientation = Quaternion::rotation_y(0.0); }, Some(ToolKind::Staff) => { - next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2); + next.hand_l.position = Vec3::new(s_a.sthl.0 + 2.0, s_a.sthl.1 - 5.5, s_a.sthl.2 - 5.0); next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3) * Quaternion::rotation_y(s_a.sthl.4); - next.hand_r.position = Vec3::new(s_a.sthr.0, s_a.sthr.1, s_a.sthr.2); + next.hand_r.position = Vec3::new(s_a.sthr.0, s_a.sthr.1 - 5.5, s_a.sthr.2 - 5.0); next.hand_r.orientation = Quaternion::rotation_x(s_a.sthr.3) * Quaternion::rotation_y(s_a.sthr.4); @@ -278,7 +278,7 @@ impl Animation for WieldAnimation { next.main.position = Vec3::new(0.0, 0.0, 0.0); next.main.orientation = Quaternion::rotation_y(0.0); - next.control.position = Vec3::new(s_a.stc.0, s_a.stc.1, s_a.stc.2); + next.control.position = Vec3::new(s_a.stc.0, s_a.stc.1 + 5.5, s_a.stc.2); next.control.orientation = Quaternion::rotation_x(-0.3 + u_slow * 0.1) * Quaternion::rotation_y(0.15) * Quaternion::rotation_z(u_slowalt * 0.08);