diff --git a/assets/voxygen/voxel/npc/lion/female/Lion (3)-10.vox b/assets/voxygen/voxel/npc/lion/female/Lion (3)-10.vox deleted file mode 100644 index 5e4892342e..0000000000 Binary files a/assets/voxygen/voxel/npc/lion/female/Lion (3)-10.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/lion/female/Lion (3)-7.vox b/assets/voxygen/voxel/npc/lion/female/Lion (3)-7.vox deleted file mode 100644 index 9f3fada22b..0000000000 Binary files a/assets/voxygen/voxel/npc/lion/female/Lion (3)-7.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/lion/female/Lion (3)-9.vox b/assets/voxygen/voxel/npc/lion/female/Lion (3)-9.vox deleted file mode 100644 index ea3978b0a0..0000000000 Binary files a/assets/voxygen/voxel/npc/lion/female/Lion (3)-9.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/lion/female/foot_bl.vox b/assets/voxygen/voxel/npc/lion/female/foot_bl.vox index 9f3fada22b..111c15fea5 100644 Binary files a/assets/voxygen/voxel/npc/lion/female/foot_bl.vox and b/assets/voxygen/voxel/npc/lion/female/foot_bl.vox differ diff --git a/assets/voxygen/voxel/npc/lion/female/foot_br.vox b/assets/voxygen/voxel/npc/lion/female/foot_br.vox index 5e4892342e..e99e5c03b3 100644 Binary files a/assets/voxygen/voxel/npc/lion/female/foot_br.vox and b/assets/voxygen/voxel/npc/lion/female/foot_br.vox differ diff --git a/assets/voxygen/voxel/npc/lion/female/foot_fl.vox b/assets/voxygen/voxel/npc/lion/female/foot_fl.vox index 72ecaf16e4..bbb281ac94 100644 Binary files a/assets/voxygen/voxel/npc/lion/female/foot_fl.vox and b/assets/voxygen/voxel/npc/lion/female/foot_fl.vox differ diff --git a/assets/voxygen/voxel/npc/lion/female/foot_fr.vox b/assets/voxygen/voxel/npc/lion/female/foot_fr.vox index ea3978b0a0..b03607ebdc 100644 Binary files a/assets/voxygen/voxel/npc/lion/female/foot_fr.vox and b/assets/voxygen/voxel/npc/lion/female/foot_fr.vox differ diff --git a/assets/voxygen/voxel/npc/lion/female/head_lower.vox b/assets/voxygen/voxel/npc/lion/female/head_lower.vox index 07762236fb..c8e412dc96 100644 Binary files a/assets/voxygen/voxel/npc/lion/female/head_lower.vox and b/assets/voxygen/voxel/npc/lion/female/head_lower.vox differ diff --git a/assets/voxygen/voxel/npc/lion/female/head_upper.vox b/assets/voxygen/voxel/npc/lion/female/head_upper.vox index b55867674d..d845411a27 100644 Binary files a/assets/voxygen/voxel/npc/lion/female/head_upper.vox and b/assets/voxygen/voxel/npc/lion/female/head_upper.vox differ diff --git a/assets/voxygen/voxel/npc/lion/female/jaw.vox b/assets/voxygen/voxel/npc/lion/female/jaw.vox index cbae9b7974..8c4041c52c 100644 Binary files a/assets/voxygen/voxel/npc/lion/female/jaw.vox and b/assets/voxygen/voxel/npc/lion/female/jaw.vox differ diff --git a/assets/voxygen/voxel/npc/lion/female/Lion (3)-6.vox b/assets/voxygen/voxel/npc/lion/female/leg_bl.vox similarity index 51% rename from assets/voxygen/voxel/npc/lion/female/Lion (3)-6.vox rename to assets/voxygen/voxel/npc/lion/female/leg_bl.vox index 72ecaf16e4..1f02772c67 100644 Binary files a/assets/voxygen/voxel/npc/lion/female/Lion (3)-6.vox and b/assets/voxygen/voxel/npc/lion/female/leg_bl.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/Lion (3)-6.vox b/assets/voxygen/voxel/npc/lion/female/leg_br.vox similarity index 51% rename from assets/voxygen/voxel/npc/lion/male/Lion (3)-6.vox rename to assets/voxygen/voxel/npc/lion/female/leg_br.vox index 72ecaf16e4..01383480d2 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/Lion (3)-6.vox and b/assets/voxygen/voxel/npc/lion/female/leg_br.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/Lion (3)-8.vox b/assets/voxygen/voxel/npc/lion/female/leg_fl.vox similarity index 58% rename from assets/voxygen/voxel/npc/lion/male/Lion (3)-8.vox rename to assets/voxygen/voxel/npc/lion/female/leg_fl.vox index ef0bbc750b..1a5d8d51e3 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/Lion (3)-8.vox and b/assets/voxygen/voxel/npc/lion/female/leg_fl.vox differ diff --git a/assets/voxygen/voxel/npc/lion/female/Lion (3)-8.vox b/assets/voxygen/voxel/npc/lion/female/leg_fr.vox similarity index 58% rename from assets/voxygen/voxel/npc/lion/female/Lion (3)-8.vox rename to assets/voxygen/voxel/npc/lion/female/leg_fr.vox index ef0bbc750b..428e3119ca 100644 Binary files a/assets/voxygen/voxel/npc/lion/female/Lion (3)-8.vox and b/assets/voxygen/voxel/npc/lion/female/leg_fr.vox differ diff --git a/assets/voxygen/voxel/npc/lion/female/tail.vox b/assets/voxygen/voxel/npc/lion/female/tail.vox index a96e2c9c34..3f2fd02839 100644 Binary files a/assets/voxygen/voxel/npc/lion/female/tail.vox and b/assets/voxygen/voxel/npc/lion/female/tail.vox differ diff --git a/assets/voxygen/voxel/npc/lion/female/torso_back.vox b/assets/voxygen/voxel/npc/lion/female/torso_back.vox index 4733b78e79..647960513c 100644 Binary files a/assets/voxygen/voxel/npc/lion/female/torso_back.vox and b/assets/voxygen/voxel/npc/lion/female/torso_back.vox differ diff --git a/assets/voxygen/voxel/npc/lion/female/torso_front.vox b/assets/voxygen/voxel/npc/lion/female/torso_front.vox index 18b1cd57ac..3a8021c753 100644 Binary files a/assets/voxygen/voxel/npc/lion/female/torso_front.vox and b/assets/voxygen/voxel/npc/lion/female/torso_front.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/Lion (3)-10.vox b/assets/voxygen/voxel/npc/lion/male/Lion (3)-10.vox deleted file mode 100644 index 5e4892342e..0000000000 Binary files a/assets/voxygen/voxel/npc/lion/male/Lion (3)-10.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/lion/male/Lion (3)-7.vox b/assets/voxygen/voxel/npc/lion/male/Lion (3)-7.vox deleted file mode 100644 index 9f3fada22b..0000000000 Binary files a/assets/voxygen/voxel/npc/lion/male/Lion (3)-7.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/lion/male/Lion (3)-9.vox b/assets/voxygen/voxel/npc/lion/male/Lion (3)-9.vox deleted file mode 100644 index ea3978b0a0..0000000000 Binary files a/assets/voxygen/voxel/npc/lion/male/Lion (3)-9.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/lion/male/foot_bl.vox b/assets/voxygen/voxel/npc/lion/male/foot_bl.vox index 9f3fada22b..111c15fea5 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/foot_bl.vox and b/assets/voxygen/voxel/npc/lion/male/foot_bl.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/foot_br.vox b/assets/voxygen/voxel/npc/lion/male/foot_br.vox index 5e4892342e..4b880818c5 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/foot_br.vox and b/assets/voxygen/voxel/npc/lion/male/foot_br.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/foot_fl.vox b/assets/voxygen/voxel/npc/lion/male/foot_fl.vox index 72ecaf16e4..bbb281ac94 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/foot_fl.vox and b/assets/voxygen/voxel/npc/lion/male/foot_fl.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/foot_fr.vox b/assets/voxygen/voxel/npc/lion/male/foot_fr.vox index ea3978b0a0..321d845bfd 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/foot_fr.vox and b/assets/voxygen/voxel/npc/lion/male/foot_fr.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/head_lower.vox b/assets/voxygen/voxel/npc/lion/male/head_lower.vox index 07762236fb..c8e412dc96 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/head_lower.vox and b/assets/voxygen/voxel/npc/lion/male/head_lower.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/head_upper.vox b/assets/voxygen/voxel/npc/lion/male/head_upper.vox index b55867674d..d845411a27 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/head_upper.vox and b/assets/voxygen/voxel/npc/lion/male/head_upper.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/jaw.vox b/assets/voxygen/voxel/npc/lion/male/jaw.vox index cbae9b7974..8c4041c52c 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/jaw.vox and b/assets/voxygen/voxel/npc/lion/male/jaw.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/leg_bl.vox b/assets/voxygen/voxel/npc/lion/male/leg_bl.vox new file mode 100644 index 0000000000..1f02772c67 Binary files /dev/null and b/assets/voxygen/voxel/npc/lion/male/leg_bl.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/leg_br.vox b/assets/voxygen/voxel/npc/lion/male/leg_br.vox new file mode 100644 index 0000000000..8e2540f921 Binary files /dev/null and b/assets/voxygen/voxel/npc/lion/male/leg_br.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/leg_fl.vox b/assets/voxygen/voxel/npc/lion/male/leg_fl.vox new file mode 100644 index 0000000000..1a5d8d51e3 Binary files /dev/null and b/assets/voxygen/voxel/npc/lion/male/leg_fl.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/leg_fr.vox b/assets/voxygen/voxel/npc/lion/male/leg_fr.vox new file mode 100644 index 0000000000..e394a58ca4 Binary files /dev/null and b/assets/voxygen/voxel/npc/lion/male/leg_fr.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/tail.vox b/assets/voxygen/voxel/npc/lion/male/tail.vox index a96e2c9c34..3f2fd02839 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/tail.vox and b/assets/voxygen/voxel/npc/lion/male/tail.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/torso_back.vox b/assets/voxygen/voxel/npc/lion/male/torso_back.vox index 4733b78e79..647960513c 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/torso_back.vox and b/assets/voxygen/voxel/npc/lion/male/torso_back.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/torso_front.vox b/assets/voxygen/voxel/npc/lion/male/torso_front.vox index 18b1cd57ac..3a8021c753 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/torso_front.vox and b/assets/voxygen/voxel/npc/lion/male/torso_front.vox differ diff --git a/assets/voxygen/voxel/npc/saber/female/Saber-10.vox b/assets/voxygen/voxel/npc/saber/female/Saber-10.vox deleted file mode 100644 index f8f2e5a1a4..0000000000 Binary files a/assets/voxygen/voxel/npc/saber/female/Saber-10.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/saber/female/Saber-7.vox b/assets/voxygen/voxel/npc/saber/female/Saber-7.vox deleted file mode 100644 index a03f070137..0000000000 Binary files a/assets/voxygen/voxel/npc/saber/female/Saber-7.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/saber/female/Saber-8.vox b/assets/voxygen/voxel/npc/saber/female/Saber-8.vox deleted file mode 100644 index ab7db834c1..0000000000 Binary files a/assets/voxygen/voxel/npc/saber/female/Saber-8.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/saber/female/Saber-9.vox b/assets/voxygen/voxel/npc/saber/female/Saber-9.vox deleted file mode 100644 index f8f2e5a1a4..0000000000 Binary files a/assets/voxygen/voxel/npc/saber/female/Saber-9.vox and /dev/null differ diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron index 02a2d1cb35..d1aad8cfde 100644 --- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron @@ -82,7 +82,7 @@ central: ("npc.saber.male.torso_back"), ), ears: ( - offset: (-5.0, -1.0, 3.0), + offset: (-5.5, -1.0, -1.5), central: ("npc.saber.male.ears"), ), tail: ( @@ -112,7 +112,7 @@ central: ("npc.saber.female.torso_back"), ), ears: ( - offset: (-5.0, -0.5, -1.5), + offset: (-5.5, -1.0, -1.5), central: ("npc.saber.female.ears"), ), tail: ( @@ -182,61 +182,61 @@ ), (Lion, Male): ( upper: ( - offset: (-4.5, -5.0, -4.0), + offset: (-4.5, -10.0, -4.5), central: ("npc.lion.male.head_upper"), ), lower: ( - offset: (-6.5, -5.0, -7.0), + offset: (-7.5, -5.5, -8.5), central: ("npc.lion.male.head_lower"), ), jaw: ( - offset: (-2.5, -2.5, -0.5), + offset: (-2.5, -6.0, -1.0), central: ("npc.lion.male.jaw"), ), torso_front: ( - offset: (-5.5, -7.5, -5.5), + offset: (-5.5, -13.0, -6.0), central: ("npc.lion.male.torso_front"), ), torso_back: ( - offset: (-6.5, -6.0, -5.0), + offset: (-5.5, -6.0, -5.0), central: ("npc.lion.male.torso_back"), ), ears: ( - offset: (-3.5, -1.0, -1.0), + offset: (-4.5, -1.0, -1.0), central: ("npc.lion.male.ears"), ), tail: ( - offset: (-0.5, -1.0, -1.0), + offset: (-1.5, -15.0, -10.0), central: ("npc.lion.male.tail"), ), ), (Lion, Female): ( upper: ( - offset: (-4.5, -5.0, -4.0), + offset: (-4.5, -10.0, -4.5), central: ("npc.lion.female.head_upper"), ), lower: ( - offset: (-6.5, -5.0, -7.0), + offset: (-7.5, -5.5, -8.5), central: ("npc.lion.female.head_lower"), ), jaw: ( - offset: (-2.5, -2.5, -0.5), - central: ("npc.lion.male.jaw"), + offset: (-2.5, -6.0, -1.0), + central: ("npc.lion.female.jaw"), ), torso_front: ( - offset: (-5.5, -7.5, -5.5), + offset: (-5.5, -13.0, -6.0), central: ("npc.lion.female.torso_front"), ), torso_back: ( - offset: (-6.5, -6.0, -5.0), + offset: (-5.5, -6.0, -5.0), central: ("npc.lion.female.torso_back"), ), ears: ( - offset: (-3.5, -1.0, -1.0), + offset: (-4.5, -1.0, -1.0), central: ("npc.lion.female.ears"), ), tail: ( - offset: (-0.5, -12.0, -1.0), + offset: (-1.5, -15.0, -10.0), central: ("npc.lion.female.tail"), ), ), diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron index a6c378b8d9..11675deb7b 100644 --- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron @@ -205,69 +205,69 @@ ), (Lion, Male): ( leg_fl: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.0, -2.5, -2.5), lateral: ("npc.lion.male.leg_fl"), ), leg_fr: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.0, -2.5, -2.5), lateral: ("npc.lion.male.leg_fr"), ), leg_bl: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.0, -3.0, -4.0), lateral: ("npc.lion.male.leg_bl"), ), leg_br: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.0, -3.0, -4.0), lateral: ("npc.lion.male.leg_br"), ), foot_fl: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.5, -3.5, -2.5), lateral: ("npc.lion.male.foot_fl"), ), foot_fr: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.5, -3.5, -2.5), lateral: ("npc.lion.male.foot_fr"), ), foot_bl: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.5, -3.5, -6.0), lateral: ("npc.lion.male.foot_bl"), ), foot_br: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.5, -3.5, -6.0), lateral: ("npc.lion.male.foot_br"), ), ), (Lion, Female): ( leg_fl: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.0, -2.5, -2.5), lateral: ("npc.lion.female.leg_fl"), ), leg_fr: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.0, -2.5, -2.5), lateral: ("npc.lion.female.leg_fr"), ), leg_bl: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.0, -3.0, -4.0), lateral: ("npc.lion.female.leg_bl"), ), leg_br: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.0, -3.0, -4.0), lateral: ("npc.lion.female.leg_br"), ), foot_fl: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.5, -3.5, -2.5), lateral: ("npc.lion.female.foot_fl"), ), foot_fr: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.5, -3.5, -2.5), lateral: ("npc.lion.female.foot_fr"), ), foot_bl: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.5, -3.5, -6.0), lateral: ("npc.lion.female.foot_bl"), ), foot_br: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.5, -3.5, -6.0), lateral: ("npc.lion.female.foot_br"), ), ), diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs index f4187a1912..15a1c432c1 100644 --- a/voxygen/src/anim/src/quadruped_medium/mod.rs +++ b/voxygen/src/anim/src/quadruped_medium/mod.rs @@ -29,57 +29,57 @@ pub struct QuadrupedMediumSkeleton { } #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const HEAD_UPPER_Y: f32 = 0.0; +const HEAD_UPPER_Y: f32 = 7.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] const HEAD_UPPER_Z: f32 = 0.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const HEAD_LOWER_Y: f32 = 0.0; +const HEAD_LOWER_Y: f32 = 5.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const HEAD_LOWER_Z: f32 = 0.0; +const HEAD_LOWER_Z: f32 = 0.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const JAW_Y: f32 = 0.0; +const JAW_Y: f32 = 2.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const JAW_Z: f32 = -0.0; +const JAW_Z: f32 = -4.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const TAIL_Y: f32 = 0.0; +const TAIL_Y: f32 = -7.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const TAIL_Z: f32 = -0.0; +const TAIL_Z: f32 = -7.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const TORSO_BACK_Y: f32 = 0.0; +const TORSO_BACK_Y: f32 = -12.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] const TORSO_BACK_Z: f32 = 0.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] const TORSO_FRONT_Y: f32 = 0.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const TORSO_FRONT_Z: f32 = 0.0; +const TORSO_FRONT_Z: f32 = 12.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const EARS_Y: f32 = 0.0; +const EARS_Y: f32 = -2.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const EARS_Z: f32 = 0.0; +const EARS_Z: f32 = 5.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const LEG_FRONT_X: f32 = 0.0; +const LEG_FRONT_X: f32 = 6.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const LEG_FRONT_Y: f32 = -0.0; +const LEG_FRONT_Y: f32 = 1.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const LEG_FRONT_Z: f32 = 0.0; +const LEG_FRONT_Z: f32 = 7.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const LEG_BACK_X: f32 = 0.0; +const LEG_BACK_X: f32 = 5.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const LEG_BACK_Y: f32 = -0.0; +const LEG_BACK_Y: f32 = -14.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const LEG_BACK_Z: f32 = 0.0; +const LEG_BACK_Z: f32 = 8.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const FEET_FRONT_X: f32 = 0.0; +const FEET_FRONT_X: f32 = 0.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] const FEET_FRONT_Y: f32 = 0.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const FEET_FRONT_Z: f32 = 0.0; +const FEET_FRONT_Z: f32 = -4.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const FEET_BACK_X: f32 = 0.0; +const FEET_BACK_X: f32 = 0.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] const FEET_BACK_Y: f32 = 0.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const FEET_BACK_Z: f32 = 0.0; +const FEET_BACK_Z: f32 = -5.0; impl QuadrupedMediumSkeleton { @@ -196,90 +196,90 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { Self { head_upper: match (body.species, body.body_type) { (Grolgar, _) => (12.0, 16.0), - (Saber, _) => (14.0, 12.0), + (Saber, _) => (-11.0, -3.0), (Tuskram, _) => (9.0, 12.0), - (Lion, _) => (12.5, 14.0), + (Lion, _) => (12.0, 2.0), (Tarasque, _) => (14.0, 3.5), (Tiger, _) => (2.0, 1.0), }, head_lower: match (body.species, body.body_type) { (Grolgar, _) => (-4.0, -7.0), - (Saber, _) => (-6.0, 0.0), + (Saber, _) => (1.0, 0.0), (Tuskram, _) => (-3.0, -1.0), - (Lion, _) => (-5.0, -1.0), + (Lion, _) => (0.5, 1.0), (Tiger, _) => (0.0, 0.0), (Tarasque, _) => (0.5, -2.0), (Tiger, _) => (-5.0, -6.0), }, jaw: match (body.species, body.body_type) { (Grolgar, _) => (3.0, -5.0), - (Saber, _) => (2.0, -1.0), + (Saber, _) => (18.0, -1.0), (Tuskram, _) => (2.0, -2.0), - (Lion, _) => (2.0, -3.0), - (Tarasque, _) => (1.5, -10.0), - (Tiger, _) => (8.0, -4.0), + (Lion, _) => (0.0, -4.5), + (Tarasque, _) => (0.0, -10.0), + (Tiger, _) => (7.0, -4.0), }, tail: match (body.species, body.body_type) { (Grolgar, _) => (-6.0, -2.0), - (Saber, _) => (-4.0, -2.0), + (Saber, _) => (-6.0, 1.0), (Tuskram, _) => (-6.0, -2.0), - (Lion, _) => (-8.0, -6.0), + (Lion, _) => (-6.0, 1.0), (Tarasque, _) => (2.0, 0.0), (Tiger, _) => (-6.5, -7.0), }, torso_front: match (body.species, body.body_type) { (Grolgar, _) => (-7.0, 10.5), - (Saber, _) => (-7.0, 9.5), + (Saber, _) => (14.0, 13.0), (Tuskram, _) => (-7.0, 9.0), - (Lion, _) => (-9.0, 9.0), + (Lion, _) => (0.0, 13.0), (Tarasque, _) => (11.5, 18.5), (Tiger, _) => (10.0, 12.0), }, torso_back: match (body.species, body.body_type) { (Grolgar, _) => (4.0, 11.0), - (Saber, _) => (4.0, 9.0), + (Saber, _) => (-19.5, 0.0), (Tuskram, _) => (4.0, 9.0), - (Lion, _) => (4.0, 10.0), + (Lion, _) => (-19.0, -1.0), (Tarasque, _) => (-26.5, -1.0), (Tiger, _) => (-19.0, 0.0), }, ears: match (body.species, body.body_type) { (Grolgar, _) => (-1.0, 5.0), - (Saber, _) => (-1.0, 6.0), + (Saber, _) => (13.0, 7.0), (Tuskram, _) => (10.0, 2.0), - (Lion, _) => (-2.0, 4.0), + (Lion, _) => (-8.0, 4.5), (Tarasque, _) => (-5.0, 1.0), (Tiger, _) => (2.5, 5.0), }, leg_f: match (body.species, body.body_type) { (Grolgar, _) => (5.0, 6.0, 2.0), - (Saber, _) => (4.0, 6.0, 3.0), + (Saber, _) => (7.0, -7.5, -3.5), (Tuskram, _) => (4.0, 6.0, 4.5), - (Lion, _) => (5.0, 6.0, 3.0), + (Lion, _) => (7.5, -4.5, -6.0), (Tarasque, _) => (7.5, -2.0, -6.0), (Tiger, _) => (7.0, -2.0, -1.0), }, leg_b: match (body.species, body.body_type) { (Grolgar, _) => (5.0, -4.0, 3.0), - (Saber, _) => (4.0, -6.0, 3.5), + (Saber, _) => (6.0, -1.0, -4.0), (Tuskram, _) => (4.0, -8.0, 5.5), - (Lion, _) => (5.5, -8.0, 3.5), + (Lion, _) => (6.0, 0.0, -2.0), (Tarasque, _) => (6.0, 4.5, -6.0), (Tiger, _) => (7.0, -2.0, -1.0), }, feet_f: match (body.species, body.body_type) { (Grolgar, _) => (5.0, 6.0, 2.0), - (Saber, _) => (4.0, 6.0, 3.0), + (Saber, _) => (1.0, 3.0, -1.0), (Tuskram, _) => (4.0, 6.0, 4.5), - (Lion, _) => (5.0, 6.0, 3.0), + (Lion, _) => (0.0, 2.0, -4.5), (Tarasque, _) => (2.0, -0.5, -4.5), (Tiger, _) => (1.0, 0.0, -5.0), }, feet_b: match (body.species, body.body_type) { (Grolgar, _) => (5.0, -4.0, 3.0), - (Saber, _) => (4.0, -6.0, 3.5), + (Saber, _) => (1.0, 0.0, 0.0), (Tuskram, _) => (4.0, -8.0, 5.5), - (Lion, _) => (5.5, -8.0, 3.5), + (Lion, _) => (0.5, 0.5, -4.0), (Tarasque, _) => (1.5, -0.5, -3.5), (Tiger, _) => (1.0, 0.5, -4.0), },