Tiger offsets, lion new model

assets/voxygen/voxel/quadruped_medium_central_manifest.ron

@@ -236,7 +236,7 @@
             central: ("npc.lion.female.ears"),
         ),
         tail: (
-            offset: (-0.5, -1.0, -1.0),
+            offset: (-0.5, -12.0, -1.0),
             central: ("npc.lion.female.tail"),
         ),
     ),
@@ -302,61 +302,61 @@
     ),
     (Tiger, Male): (
         upper: (
-            offset: (-4.0, -5.5, -6.5),
+            offset: (-5.5, -5.0, -5.0),
             central: ("npc.tiger.male.head_upper"),
         ),
         lower: (
-            offset: (-4.0, -5.5, -4.0),
+            offset: (-4.5, -2.0, -5.0),
             central: ("npc.tiger.male.head_lower"),
         ),
         jaw: (
-            offset: (-2.0, -2.5, -1.0),
+            offset: (-2.5, -3.0, -1.0),
             central: ("npc.tiger.male.jaw"),
         ),
         torso_front: (
-            offset: (-6.0, -6.0, -5.5),
+            offset: (-5.5, -6.5, -6.5),
             central: ("npc.tiger.male.torso_front"),
         ),
         torso_back: (
-            offset: (-6.0, -6.0, -5.0),
+            offset: (-5.5, -6.5, -5.0),
             central: ("npc.tiger.male.torso_back"),
         ),
         ears: (
-            offset: (-5.0, -0.5, -1.5),
+            offset: (-4.5, -1.0, -1.0),
             central: ("npc.tiger.male.ears"),
         ),
         tail: (
-            offset: (-1.0, -3.0, -4.0),
+            offset: (-1.5, -12.0, -1.0),
             central: ("npc.tiger.male.tail"),
         ),
     ),
     (Tiger, Female): (
         upper: (
-            offset: (-4.0, -5.5, -6.5),
+            offset: (-5.5, -5.0, -5.0),
             central: ("npc.tiger.female.head_upper"),
         ),
         lower: (
-            offset: (-4.0, -5.5, -4.0),
+            offset: (-4.5, -2.0, -5.0),
             central: ("npc.tiger.female.head_lower"),
         ),
         jaw: (
-            offset: (-2.0, -2.5, -1.0),
+            offset: (-2.5, -3.0, -1.0),
             central: ("npc.tiger.female.jaw"),
         ),
         torso_front: (
-            offset: (-6.0, -6.0, -5.5),
+            offset: (-5.5, -6.5, -6.5),
             central: ("npc.tiger.female.torso_front"),
         ),
         torso_back: (
-            offset: (-6.0, -6.0, -5.0),
+            offset: (-5.5, -6.5, -5.0),
             central: ("npc.tiger.female.torso_back"),
         ),
         ears: (
-            offset: (-5.0, -0.5, -1.5),
+            offset: (-4.5, -1.0, -1.0),
             central: ("npc.tiger.female.ears"),
         ),
         tail: (
-            offset: (-1.0, -3.0, -4.0),
+            offset: (-1.5, -12.0, -1.0),
             central: ("npc.tiger.female.tail"),
         ),
     ),

assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron

@@ -341,35 +341,35 @@
     ),
     (Tiger, Male): (
         leg_fl: (
-            offset: (-1.5, -1.5, -2.5),
+            offset: (-2.0, -1.5, -2.5),
             lateral: ("npc.tiger.male.leg_fl"),
         ),
         leg_fr: (
-            offset: (-1.5, -1.5, -2.5),
+            offset: (-2.0, -1.5, -2.5),
             lateral: ("npc.tiger.male.leg_fr"),
         ),
         leg_bl: (
-            offset: (-1.5, -4.0, -3.5),
+            offset: (-2.0, -2.0, -3.5),
             lateral: ("npc.tiger.male.leg_bl"),
         ),
         leg_br: (
-            offset: (-1.5, -4.0, -3.5),
+            offset: (-2.0, -2.0, -3.5),
             lateral: ("npc.tiger.male.leg_br"),
         ),
         foot_fl: (
-            offset: (-1.5, -1.5, -2.5),
+            offset: (-2.5, -1.5, -2.5),
             lateral: ("npc.tiger.male.foot_fl"),
         ),
         foot_fr: (
-            offset: (-1.5, -1.5, -2.5),
+            offset: (-2.5, -1.5, -2.5),
             lateral: ("npc.tiger.male.foot_fr"),
         ),
         foot_bl: (
-            offset: (-1.5, -4.0, -3.5),
+            offset: (-2.5, -2.0, -3.5),
             lateral: ("npc.tiger.male.foot_bl"),
         ),
         foot_br: (
-            offset: (-1.5, -4.0, -3.5),
+            offset: (-2.5, -2.0, -3.5),
             lateral: ("npc.tiger.male.foot_br"),
         ),
     ),
@@ -383,7 +383,7 @@
             lateral: ("npc.tiger.female.leg_fr"),
         ),
         leg_bl: (
-            offset: (-1.5, -4.0, -3.5),
+            offset: (-1.5, -2.0, -3.5),
             lateral: ("npc.tiger.female.leg_bl"),
         ),
         leg_br: (
@@ -399,7 +399,7 @@
             lateral: ("npc.tiger.female.foot_fr"),
         ),
         foot_bl: (
-            offset: (-1.5, -4.0, -3.5),
+            offset: (-1.5, -2.0, -3.5),
             lateral: ("npc.tiger.female.foot_bl"),
         ),
         foot_br: (

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_X: f32 = 0.0;
+const HEAD_UPPER_X: 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_X: f32 = 0.0;
+const HEAD_LOWER_X: 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_X: f32 = 0.0;
+const JAW_X: 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_X: f32 = 0.0;
+const TAIL_X: 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_X: f32 = 0.0;
+const TORSO_BACK_X: 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_MID_X: f32 = 0.0;
 #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)]
-const TORSO_MID_Z: f32 = 0.0;
+const TORSO_MID_Z: f32 = 12.5;
 #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)]
-const EARS_X: f32 = 0.0;
+const EARS_X: 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 {
@@ -195,92 +195,92 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr {
         use comp::quadruped_medium::Species::*;
         Self {
             head_upper: match (body.species, body.body_type) {
-                (Grolgar, _) => (25.0, 16.0),
-                (Saber, _) => (-11.0, -3.0),
+                (Grolgar, _) => (12.0, 16.0),
+                (Saber, _) => (14.0, 12.0),
                 (Tuskram, _) => (9.0, 12.0),
                 (Lion, _) => (12.5, 14.0),
                 (Tarasque, _) => (12.0, 19.0),
-                (Tiger, _) => (12.0, 19.0),
+                (Tiger, _) => (*HEAD_UPPER_X, *HEAD_UPPER_Z),
             },
             head_lower: match (body.species, body.body_type) {
                 (Grolgar, _) => (-4.0, -7.0),
-                (Saber, _) => (1.0, 0.0),
+                (Saber, _) => (-6.0, 0.0),
                 (Tuskram, _) => (-3.0, -1.0),
                 (Lion, _) => (-5.0, -1.0),
                 (Tarasque, _) => (-5.0, -6.0),
-                (Tiger, _) => (-5.0, -6.0),
+                (Tiger, _) => (*HEAD_LOWER_X, *HEAD_LOWER_Z),
             },
             jaw: match (body.species, body.body_type) {
                 (Grolgar, _) => (3.0, -5.0),
-                (Saber, _) => (18.0, -1.0),
+                (Saber, _) => (2.0, -1.0),
                 (Tuskram, _) => (2.0, -2.0),
                 (Lion, _) => (2.0, -3.0),
                 (Tarasque, _) => (4.0, -9.0),
-                (Tiger, _) => (4.0, -9.0),
+                (Tiger, _) => (*JAW_X, *JAW_Z),
             },
             tail: match (body.species, body.body_type) {
                 (Grolgar, _) => (-6.0, -2.0),
-                (Saber, _) => (-6.0, 1.0),
+                (Saber, _) => (-4.0, -2.0),
                 (Tuskram, _) => (-6.0, -2.0),
                 (Lion, _) => (-8.0, -6.0),
                 (Tarasque, _) => (-7.0, -2.0),
-                (Tiger, _) => (-7.0, -2.0),
+                (Tiger, _) => (*TAIL_X, *TAIL_Z),
             },
             torso_front: match (body.species, body.body_type) {
                 (Grolgar, _) => (-7.0, 10.5),
-                (Saber, _) => (14.0, 12.0),
+                (Saber, _) => (-7.0, 9.5),
                 (Tuskram, _) => (-7.0, 9.0),
                 (Lion, _) => (-9.0, 9.0),
                 (Tarasque, _) => (-7.0, 8.0),
-                (Tiger, _) => (-7.0, 8.0),
+                (Tiger, _) => (*TORSO_MID_X, *TORSO_MID_Z),
             },
             torso_back: match (body.species, body.body_type) {
                 (Grolgar, _) => (4.0, 11.0),
-                (Saber, _) => (-19.5, 0.5),
+                (Saber, _) => (4.0, 9.0),
                 (Tuskram, _) => (4.0, 9.0),
                 (Lion, _) => (4.0, 10.0),
                 (Tarasque, _) => (4.0, 9.0),
-                (Tiger, _) => (4.0, 9.0),
+                (Tiger, _) => (*TORSO_BACK_X, *TORSO_BACK_Z),
             },
             ears: match (body.species, body.body_type) {
                 (Grolgar, _) => (-1.0, 5.0),
-                (Saber, _) => (13.0, 7.0),
+                (Saber, _) => (-1.0, 6.0),
                 (Tuskram, _) => (10.0, 2.0),
                 (Lion, _) => (-2.0, 4.0),
                 (Tarasque, _) => (1.5, -2.0),
-                (Tiger, _) => (1.5, -2.0),
+                (Tiger, _) => (*EARS_X, *EARS_Z),
             },
             leg_f: match (body.species, body.body_type) {
-                (Grolgar, _) => (20.0, 6.0, 2.0),
-                (Saber, _) => (6.5, 8.0, 9.0),
+                (Grolgar, _) => (5.0, 6.0, 2.0),
+                (Saber, _) => (4.0, 6.0, 3.0),
                 (Tuskram, _) => (4.0, 6.0, 4.5),
                 (Lion, _) => (5.0, 6.0, 3.0),
                 (Tarasque, _) => (4.0, 6.0, 3.0),
-                (Tiger, _) => (4.0, 6.0, 3.0),
+                (Tiger, _) => (*LEG_FRONT_X, *LEG_FRONT_Y, *LEG_FRONT_Z),
             },
             leg_b: match (body.species, body.body_type) {
-                (Grolgar, _) => (20.0, -4.0, 3.0),
-                (Saber, _) => (7.0, -7.5, 9.5),
+                (Grolgar, _) => (5.0, -4.0, 3.0),
+                (Saber, _) => (4.0, -6.0, 3.5),
                 (Tuskram, _) => (4.0, -8.0, 5.5),
                 (Lion, _) => (5.5, -8.0, 3.5),
                 (Tarasque, _) => (4.0, -8.0, 3.5),
-                (Tiger, _) => (4.0, -8.0, 3.5),
+                (Tiger, _) => (*LEG_BACK_X, *LEG_BACK_Y, *LEG_BACK_Z),
             },
             feet_f: match (body.species, body.body_type) {
                 (Grolgar, _) => (5.0, 6.0, 2.0),
-                (Saber, _) => (1.0, 3.0, -1.0),
+                (Saber, _) => (4.0, 6.0, 3.0),
                 (Tuskram, _) => (4.0, 6.0, 4.5),
                 (Lion, _) => (5.0, 6.0, 3.0),
                 (Tarasque, _) => (4.0, 6.0, 3.0),
-                (Tiger, _) => (4.0, 6.0, 3.0),
+                (Tiger, _) => (*FEET_FRONT_X, *FEET_FRONT_Y, *FEET_FRONT_Z),
             },
             feet_b: match (body.species, body.body_type) {
                 (Grolgar, _) => (5.0, -4.0, 3.0),
-                (Saber, _) => (1.0, 0.0, 0.0),
+                (Saber, _) => (4.0, -6.0, 3.5),
                 (Tuskram, _) => (4.0, -8.0, 5.5),
                 (Lion, _) => (5.5, -8.0, 3.5),
                 (Tarasque, _) => (4.0, -8.0, 3.5),
-                (Tiger, _) => (4.0, -8.0, 3.5),
+                (Tiger, _) => (*FEET_BACK_X, *FEET_BACK_Y, *FEET_BACK_Z),
             },
             height: match (body.species, body.body_type) {
                 (Grolgar, _) => (1.2),