From 8433f37e9064b3f9242c6331cd97fe109379a70e Mon Sep 17 00:00:00 2001 From: jshipsey Date: Thu, 17 Sep 2020 22:18:29 -0400 Subject: [PATCH] finish odonto --- assets/voxygen/voxel/npc/odonto/male/neck.vox | Bin 0 -> 5624 bytes .../voxygen/voxel/theropod_central_manifest.ron | 8 ++++---- voxygen/src/anim/src/quadruped_medium/run.rs | 4 ++-- voxygen/src/anim/src/theropod/mod.rs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 assets/voxygen/voxel/npc/odonto/male/neck.vox diff --git a/assets/voxygen/voxel/npc/odonto/male/neck.vox b/assets/voxygen/voxel/npc/odonto/male/neck.vox new file mode 100644 index 0000000000000000000000000000000000000000..e102ce64ed1900249af6892edddad122dc0968da GIT binary patch literal 5624 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 QuM;Lr&~f9&X`BE54_+g(w*UYD literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/theropod_central_manifest.ron b/assets/voxygen/voxel/theropod_central_manifest.ron index 01d2f7a1d5..07f30ec257 100644 --- a/assets/voxygen/voxel/theropod_central_manifest.ron +++ b/assets/voxygen/voxel/theropod_central_manifest.ron @@ -69,8 +69,8 @@ central: ("npc.odonto.male.jaw"), ), neck: ( - offset: (0.0, 0.0, 0.0), - central: ("armor.empty"), + offset: (-5.5, 0.0, -6.5), + central: ("npc.odonto.male.neck"), ), chest_front: ( offset: (-5.5, -5.0, -6.0), @@ -99,8 +99,8 @@ central: ("npc.odonto.male.jaw"), ), neck: ( - offset: (0.0, 0.0, 0.0), - central: ("armor.empty"), + offset: (-5.5, 0.0, -6.5), + central: ("npc.odonto.male.neck"), ), chest_front: ( offset: (-5.5, -5.0, -6.0), diff --git a/voxygen/src/anim/src/quadruped_medium/run.rs b/voxygen/src/anim/src/quadruped_medium/run.rs index b6e9473754..e4e4d2ca4a 100644 --- a/voxygen/src/anim/src/quadruped_medium/run.rs +++ b/voxygen/src/anim/src/quadruped_medium/run.rs @@ -67,14 +67,14 @@ impl Animation for RunAnimation { (anim_time as f32 * (16.0) * lab as f32 * speedmult + 0.0 + canceler * 0.05 + shift1) .sin(); //1.5 let foot1b = - (anim_time as f32 * (16.0) * lab as f32 * speedmult + 1.57 + canceler * 0.05 + shift1) + (anim_time as f32 * (16.0) * lab as f32 * speedmult + 1.1 + canceler * 0.05 + shift1) .sin(); //1.9 //FR let foot2a = (anim_time as f32 * (16.0) * lab as f32 * speedmult + shift2).sin(); //1.2 let foot2b = (anim_time as f32 * (16.0) * lab as f32 * speedmult + 1.1 + shift2).sin(); //1.6 //BL let foot3a = (anim_time as f32 * (16.0) * lab as f32 * speedmult + shift3).sin(); //0.0 - let foot3b = (anim_time as f32 * (16.0) * lab as f32 * speedmult + 1.1 + shift3).sin(); //0.4 + let foot3b = (anim_time as f32 * (16.0) * lab as f32 * speedmult + 1.57 + shift3).sin(); //0.4 //BR let foot4a = (anim_time as f32 * (16.0) * lab as f32 * speedmult + 0.0 + canceler * 0.05 + shift4) diff --git a/voxygen/src/anim/src/theropod/mod.rs b/voxygen/src/anim/src/theropod/mod.rs index 24c1796f3b..459661de77 100644 --- a/voxygen/src/anim/src/theropod/mod.rs +++ b/voxygen/src/anim/src/theropod/mod.rs @@ -116,7 +116,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { Self { head: match (body.species, body.body_type) { (Archaeos, _) => (8.0, 4.0), - (Odonto, _) => (-1.0, 5.0), + (Odonto, _) => (6.0, 5.0), }, jaw: match (body.species, body.body_type) { (Archaeos, _) => (1.0, -7.0), @@ -124,7 +124,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { }, neck: match (body.species, body.body_type) { (Archaeos, _) => (4.5, -2.0), - (Odonto, _) => (4.5, -2.0), + (Odonto, _) => (3.0, -3.0), }, chest_front: match (body.species, body.body_type) { (Archaeos, _) => (0.0, 20.0),