Better quadmed legs/feet ratio

assets/common/npc_names.json

@@ -291,9 +291,9 @@
                 "keyword": "deer",
                 "generic": "Deer"
             },
-            "hirdrassil": {
-                "keyword": "hirdrassil",
-                "generic": "Hirdrassil"
+            "hirdrasil": {
+                "keyword": "hirdrasil",
+                "generic": "Hirdrasil"
             }
         }
     },

assets/voxygen/voxel/quadruped_medium_central_manifest.ron

@@ -125,7 +125,7 @@
             central: ("npc.tuskram.male.head"),
         ),
         neck: (
-            offset: (-4.0, -4.0, -3.5),
+            offset: (-4.0, -5.0, -3.5),
             central: ("npc.tuskram.male.neck"),
         ),
         jaw: (
@@ -155,7 +155,7 @@
             central: ("npc.tuskram.male.head"),
         ),
         neck: (
-            offset: (-4.0, -4.0, -3.5),
+            offset: (-4.0, -5.0, -3.5),
             central: ("npc.tuskram.male.neck"),
         ),
         jaw: (
@@ -301,7 +301,7 @@
     ),
     (Tiger, Male): (
         head: (
-            offset: (-5.5, 0.0, -5.0),
+            offset: (-5.5, -1.0, -5.0),
             central: ("npc.tiger.male.head"),
         ),
         neck: (
@@ -331,7 +331,7 @@
     ),
     (Tiger, Female): (
         head: (
-            offset: (-5.5, 0.0, -5.0),
+            offset: (-5.5, -1.0, -5.0),
             central: ("npc.tiger.male.head"),
         ),
         neck: (
@@ -719,26 +719,26 @@
             central: ("npc.deer.male.tail"),
         ),
     ),
-    (Hirdrassil, Male): (
+    (Hirdrasil, Male): (
         head: (
             offset: (-9.0, -12.0, 0.0),
-            central: ("npc.hirdrassil.male.head"),
+            central: ("npc.hirdrasil.male.head"),
         ),
         neck: (
             offset: (-4.0, -4.0, -6.0),
-            central: ("npc.hirdrassil.male.neck"),
+            central: ("npc.hirdrasil.male.neck"),
         ),
         jaw: (
             offset: (-1.0, 0.0, -7.0),
-            central: ("npc.hirdrassil.male.jaw"),
+            central: ("npc.hirdrasil.male.jaw"),
         ),
         torso_front: (
             offset: (-4.0, -10.0, -5.5),
-            central: ("npc.hirdrassil.male.torso_front"),
+            central: ("npc.hirdrasil.male.torso_front"),
         ),
         torso_back: (
             offset: (-4.0, -11.0, -4.0),
-            central: ("npc.hirdrassil.male.torso_back"),
+            central: ("npc.hirdrasil.male.torso_back"),
         ),
         ears: (
             offset: (0.0, 0.0, 0.0),
@@ -746,29 +746,29 @@
         ),
         tail: (
             offset: (-2.0, -2.0, 0.0),
-            central: ("npc.hirdrassil.male.tail"),
+            central: ("npc.hirdrasil.male.tail"),
         ),
     ),
-    (Hirdrassil, Female): (
+    (Hirdrasil, Female): (
         head: (
             offset: (-9.0, -12.0, 0.0),
-            central: ("npc.hirdrassil.male.head"),
+            central: ("npc.hirdrasil.male.head"),
         ),
         neck: (
             offset: (-4.0, -4.0, -6.0),
-            central: ("npc.hirdrassil.male.neck"),
+            central: ("npc.hirdrasil.male.neck"),
         ),
         jaw: (
             offset: (-1.0, 0.0, -7.0),
-            central: ("npc.hirdrassil.male.jaw"),
+            central: ("npc.hirdrasil.male.jaw"),
         ),
         torso_front: (
             offset: (-4.0, -10.0, -5.5),
-            central: ("npc.hirdrassil.male.torso_front"),
+            central: ("npc.hirdrasil.male.torso_front"),
         ),
         torso_back: (
             offset: (-4.0, -11.0, -4.0),
-            central: ("npc.hirdrassil.male.torso_back"),
+            central: ("npc.hirdrasil.male.torso_back"),
         ),
         ears: (
             offset: (0.0, 0.0, 0.0),
@@ -776,7 +776,7 @@
         ),
         tail: (
             offset: (-2.0, -2.0, 0.0),
-            central: ("npc.hirdrassil.male.tail"),
+            central: ("npc.hirdrasil.male.tail"),
         ),
     ),
 })

assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron

@@ -1,69 +1,69 @@
 ({
     (Grolgar, Male): (
         leg_fl: (
-            offset: (-2.5, -5.0, -10.0),//these are done very case by case
+            offset: (-2.5, -4.5, -4.0),//these are done very case by case
             lateral: ("npc.grolgar.male.leg_fl"),
         ),
         leg_fr: (
-            offset: (-2.5, -5.0, -10.0),
+            offset: (-2.5, -4.5, -4.0),
             lateral: ("npc.grolgar.male.leg_fr"),
         ),
         leg_bl: (
-            offset: (-2.0, -3.5, -5.0),
+            offset: (-2.5, -3.5, -3.5),
             lateral: ("npc.grolgar.male.leg_bl"),
         ),
         leg_br: (
-            offset: (-2.0, -3.5, -5.0),
+            offset: (-2.0, -3.5, -3.5),
             lateral: ("npc.grolgar.male.leg_br"),
         ),
         foot_fl: (
-            offset: (-2.5, -2.0, -6.0),//y pivot should be -1/4 of the y dimension of the model
+            offset: (-2.5, -4.5, -8.0),//y pivot should be -1/4 of the y dimension of the model
             lateral: ("npc.grolgar.male.foot_fl"),
         ),
         foot_fr: (
-            offset: (-2.5, -2.0, -6.0),//y pivot should be -1/4 of the y dimension of the model
+            offset: (-2.5, -4.5, -8.0),//y pivot should be -1/4 of the y dimension of the model
             lateral: ("npc.grolgar.male.foot_fr"),
         ),
         foot_bl: (
-            offset: (-2.5, -2.0, -4.0),//y pivot should be -1/4 of the y dimension of the model
+            offset: (-2.5, -2.0, -8.0),//y pivot should be -1/4 of the y dimension of the model
             lateral: ("npc.grolgar.male.foot_bl"),
         ),
         foot_br: (
-            offset: (-2.5, -2.0, -4.0),//y pivot should be -1/4 of the y dimension of the model
+            offset: (-2.5, -2.0, -8.0),//y pivot should be -1/4 of the y dimension of the model
             lateral: ("npc.grolgar.male.foot_br"),
         ),
     ),
     (Grolgar, Female): (
         leg_fl: (
-            offset: (-2.5, -5.0, -10.0),
+            offset: (-2.5, -4.5, -4.0),//these are done very case by case
             lateral: ("npc.grolgar.male.leg_fl"),
         ),
         leg_fr: (
-            offset: (-2.5, -5.0, -10.0),
+            offset: (-2.5, -4.5, -4.0),
             lateral: ("npc.grolgar.male.leg_fr"),
         ),
         leg_bl: (
-            offset: (-2.0, -3.5, -5.0),
+            offset: (-2.5, -3.5, -3.5),
             lateral: ("npc.grolgar.male.leg_bl"),
         ),
         leg_br: (
-            offset: (-2.0, -3.5, -5.0),
+            offset: (-2.0, -3.5, -3.5),
             lateral: ("npc.grolgar.male.leg_br"),
         ),
         foot_fl: (
-            offset: (-2.5, -2.0, -6.0),
+            offset: (-2.5, -4.5, -8.0),//y pivot should be -1/4 of the y dimension of the model
             lateral: ("npc.grolgar.male.foot_fl"),
         ),
         foot_fr: (
-            offset: (-2.5, -2.0, -6.0),
+            offset: (-2.5, -4.5, -8.0),//y pivot should be -1/4 of the y dimension of the model
             lateral: ("npc.grolgar.male.foot_fr"),
         ),
         foot_bl: (
-            offset: (-2.5, -2.0, -4.0),
+            offset: (-2.5, -2.0, -8.0),//y pivot should be -1/4 of the y dimension of the model
             lateral: ("npc.grolgar.male.foot_bl"),
         ),
         foot_br: (
-            offset: (-2.5, -2.0, -4.0),
+            offset: (-2.5, -2.0, -8.0),//y pivot should be -1/4 of the y dimension of the model
             lateral: ("npc.grolgar.male.foot_br"),
         ),
     ),
@@ -137,137 +137,137 @@
     ),
     (Tuskram, Male): (
         leg_fl: (
-            offset: (-2.0, -2.5, -10.0),
+            offset: (-2.0, -2.5, -3.0),
             lateral: ("npc.tuskram.male.leg_fl"),
         ),
         leg_fr: (
-            offset: (-2.0, -2.5, -10.0),
+            offset: (-2.0, -2.5, -3.0),
             lateral: ("npc.tuskram.male.leg_fr"),
         ),
         leg_bl: (
-            offset: (-2.0, -2.5, -4.0),
+            offset: (-2.0, -2.5, -3.0),
             lateral: ("npc.tuskram.male.leg_bl"),
         ),
         leg_br: (
-            offset: (-2.0, -2.5, -4.0),
+            offset: (-2.0, -2.5, -3.0),
             lateral: ("npc.tuskram.male.leg_br"),
         ),
         foot_fl: (
-            offset: (-2.5, -2.0, -5.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.tuskram.male.foot_fl"),
         ),
         foot_fr: (
-            offset: (-2.5, -2.0, -5.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.tuskram.male.foot_fr"),
         ),
         foot_bl: (
-            offset: (-1.5, -1.5, -6.0),
+            offset: (-1.5, -1.5, -8.0),
             lateral: ("npc.tuskram.male.foot_bl"),
         ),
         foot_br: (
-            offset: (-1.5, -1.5, -6.0),
+            offset: (-1.5, -1.5, -8.0),
             lateral: ("npc.tuskram.male.foot_br"),
         ),
     ),
     (Tuskram, Female): (
         leg_fl: (
-            offset: (-2.0, -2.5, -10.0),
+            offset: (-2.0, -2.5, -3.0),
             lateral: ("npc.tuskram.male.leg_fl"),
         ),
         leg_fr: (
-            offset: (-2.0, -2.5, -10.0),
+            offset: (-2.0, -2.5, -3.0),
             lateral: ("npc.tuskram.male.leg_fr"),
         ),
         leg_bl: (
-            offset: (-2.0, -2.5, -4.0),
+            offset: (-2.0, -2.5, -3.0),
             lateral: ("npc.tuskram.male.leg_bl"),
         ),
         leg_br: (
-            offset: (-2.0, -2.5, -4.0),
+            offset: (-2.0, -2.5, -3.0),
             lateral: ("npc.tuskram.male.leg_br"),
         ),
         foot_fl: (
-            offset: (-2.5, -2.0, -5.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.tuskram.male.foot_fl"),
         ),
         foot_fr: (
-            offset: (-2.5, -2.0, -5.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.tuskram.male.foot_fr"),
         ),
         foot_bl: (
-            offset: (-1.5, -1.5, -6.0),
+            offset: (-1.5, -1.5, -8.0),
             lateral: ("npc.tuskram.male.foot_bl"),
         ),
         foot_br: (
-            offset: (-1.5, -1.5, -6.0),
+            offset: (-1.5, -1.5, -8.0),
             lateral: ("npc.tuskram.male.foot_br"),
         ),
     ),
     (Lion, Male): (
         leg_fl: (
-            offset: (-2.0, -2.5, -7.5),
+            offset: (-2.0, -2.5, -3.5),
             lateral: ("npc.lion.male.leg_fl"),
         ),
         leg_fr: (
-            offset: (-2.0, -2.5, -7.5),
+            offset: (-2.0, -2.5, -3.5),
             lateral: ("npc.lion.male.leg_fr"),
         ),
         leg_bl: (
-            offset: (-2.0, -3.0, -6.0),
+            offset: (-2.0, -3.0, -3.5),
             lateral: ("npc.lion.male.leg_bl"),
         ),
         leg_br: (
-            offset: (-2.0, -3.0, -6.0),
+            offset: (-2.0, -3.0, -3.5),
             lateral: ("npc.lion.male.leg_br"),
         ),
         foot_fl: (
-            offset: (-2.5, -2.0, -5.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.lion.male.foot_fl"),
         ),
         foot_fr: (
-            offset: (-2.5, -2.0, -5.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.lion.male.foot_fr"),
         ),
         foot_bl: (
-            offset: (-2.5, -2.0, -6.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.lion.male.foot_bl"),
         ),
         foot_br: (
-            offset: (-2.5, -2.0, -6.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.lion.male.foot_br"),
         ),
     ),
     (Lion, Female): (
         leg_fl: (
-            offset: (-2.0, -2.5, -7.5),
+            offset: (-2.0, -2.5, -3.5),
             lateral: ("npc.lion.male.leg_fl"),
         ),
         leg_fr: (
-            offset: (-2.0, -2.5, -7.5),
+            offset: (-2.0, -2.5, -3.5),
             lateral: ("npc.lion.male.leg_fr"),
         ),
         leg_bl: (
-            offset: (-2.0, -3.0, -6.0),
+            offset: (-2.0, -3.0, -3.5),
             lateral: ("npc.lion.male.leg_bl"),
         ),
         leg_br: (
-            offset: (-2.0, -3.0, -6.0),
+            offset: (-2.0, -3.0, -3.5),
             lateral: ("npc.lion.male.leg_br"),
         ),
         foot_fl: (
-            offset: (-2.5, -2.0, -5.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.lion.male.foot_fl"),
         ),
         foot_fr: (
-            offset: (-2.5, -2.0, -5.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.lion.male.foot_fr"),
         ),
         foot_bl: (
-            offset: (-2.5, -2.0, -6.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.lion.male.foot_bl"),
         ),
         foot_br: (
-            offset: (-2.5, -2.0, -6.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.lion.male.foot_br"),
         ),
     ),
@@ -341,69 +341,69 @@
     ),
     (Tiger, Male): (
         leg_fl: (
-            offset: (-2.0, -3.0, -10.0),
+            offset: (-2.0, -3.0, -4.0),
             lateral: ("npc.tiger.male.leg_fl"),
         ),
         leg_fr: (
-            offset: (-2.0, -3.0, -10.0),
+            offset: (-2.0, -3.0, -4.0),
             lateral: ("npc.tiger.male.leg_fr"),
         ),
         leg_bl: (
-            offset: (-2.0, -3.0, -10.0),
+            offset: (-2.0, -3.0, -3.0),
             lateral: ("npc.tiger.male.leg_bl"),
         ),
         leg_br: (
-            offset: (-2.0, -3.0, -10.0),
+            offset: (-2.0, -3.0, -3.0),
             lateral: ("npc.tiger.male.leg_br"),
         ),
         foot_fl: (
-            offset: (-2.5, -2.0, -6.0),
+            offset: (-2.5, -2.0, -7.0),
             lateral: ("npc.tiger.male.foot_fl"),
         ),
         foot_fr: (
-            offset: (-2.5, -2.0, -6.0),
+            offset: (-2.5, -2.0, -7.0),
             lateral: ("npc.tiger.male.foot_fr"),
         ),
         foot_bl: (
-            offset: (-2.5, -2.0, -6.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.tiger.male.foot_bl"),
         ),
         foot_br: (
-            offset: (-2.5, -2.0, -6.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.tiger.male.foot_br"),
         ),
     ),
     (Tiger, Female): (
         leg_fl: (
-            offset: (-2.0, -3.0, -10.0),
+            offset: (-2.0, -3.0, -4.0),
             lateral: ("npc.tiger.male.leg_fl"),
         ),
         leg_fr: (
-            offset: (-2.0, -3.0, -10.0),
+            offset: (-2.0, -3.0, -4.0),
             lateral: ("npc.tiger.male.leg_fr"),
         ),
         leg_bl: (
-            offset: (-2.0, -3.0, -10.0),
+            offset: (-2.0, -3.0, -3.0),
             lateral: ("npc.tiger.male.leg_bl"),
         ),
         leg_br: (
-            offset: (-2.0, -3.0, -10.0),
+            offset: (-2.0, -3.0, -3.0),
             lateral: ("npc.tiger.male.leg_br"),
         ),
         foot_fl: (
-            offset: (-2.5, -2.0, -6.0),
+            offset: (-2.5, -2.0, -7.0),
             lateral: ("npc.tiger.male.foot_fl"),
         ),
         foot_fr: (
-            offset: (-2.5, -2.0, -6.0),
+            offset: (-2.5, -2.0, -7.0),
             lateral: ("npc.tiger.male.foot_fr"),
         ),
         foot_bl: (
-            offset: (-2.5, -2.0, -6.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.tiger.male.foot_bl"),
         ),
         foot_br: (
-            offset: (-2.5, -2.0, -6.0),
+            offset: (-2.5, -2.0, -8.0),
             lateral: ("npc.tiger.male.foot_br"),
         ),
     ),
@@ -613,11 +613,11 @@
     ),
     (Catoblepas, Male): (
         leg_fl: (
-            offset: (-2.5, -4.0, -4.5),
+            offset: (-2.5, -4.0, -5.0),
             lateral: ("npc.catoblepas.male.leg_fl"),
         ),
         leg_fr: (
-            offset: (-2.5, -4.0, -4.5),
+            offset: (-2.5, -4.0, -5.0),
             lateral: ("npc.catoblepas.male.leg_fr"),
         ),
         leg_bl: (
@@ -629,11 +629,11 @@
             lateral: ("npc.catoblepas.male.leg_br"),
         ),
         foot_fl: (
-            offset: (-3.0, -7.0, -11.0), 
+            offset: (-3.0, -3.0, -9.0), 
             lateral: ("npc.catoblepas.male.foot_fl"),
         ),
         foot_fr: (
-            offset: (-3.0, -7.0, -11.0), 
+            offset: (-3.0, -3.0, -9.0), 
             lateral: ("npc.catoblepas.male.foot_fr"),
         ),
         foot_bl: (
@@ -647,11 +647,11 @@
     ),
     (Catoblepas, Female): (
         leg_fl: (
-            offset: (-2.5, -4.0, -4.5),
+            offset: (-2.5, -4.0, -5.0),
             lateral: ("npc.catoblepas.male.leg_fl"),
         ),
         leg_fr: (
-            offset: (-2.5, -4.0, -4.5),
+            offset: (-2.5, -4.0, -5.0),
             lateral: ("npc.catoblepas.male.leg_fr"),
         ),
         leg_bl: (
@@ -663,11 +663,11 @@
             lateral: ("npc.catoblepas.male.leg_br"),
         ),
         foot_fl: (
-            offset: (-3.0, -7.0, -11.0), 
+            offset: (-3.0, -3.0, -9.0), 
             lateral: ("npc.catoblepas.male.foot_fl"),
         ),
         foot_fr: (
-            offset: (-3.0, -7.0, -11.0), 
+            offset: (-3.0, -3.0, -9.0), 
             lateral: ("npc.catoblepas.male.foot_fr"),
         ),
         foot_bl: (
@@ -815,72 +815,72 @@
             lateral: ("npc.deer.female.foot_br"),
         ),
     ),
-    (Hirdrassil, Male): (
+    (Hirdrasil, Male): (
         leg_fl: (
             offset: (-1.5, -3.0, -4.0),
-            lateral: ("npc.hirdrassil.male.leg_fl"),
+            lateral: ("npc.hirdrasil.male.leg_fl"),
         ),
         leg_fr: (
             offset: (-1.5, -3.0, -4.0),
-            lateral: ("npc.hirdrassil.male.leg_fr"),
+            lateral: ("npc.hirdrasil.male.leg_fr"),
         ),
         leg_bl: (
             offset: (-2.0, -2.5, -5.0),
-            lateral: ("npc.hirdrassil.male.leg_bl"),
+            lateral: ("npc.hirdrasil.male.leg_bl"),
         ),
         leg_br: (
             offset: (-2.0, -2.5, -5.0),
-            lateral: ("npc.hirdrassil.male.leg_br"),
+            lateral: ("npc.hirdrasil.male.leg_br"),
         ),
         foot_fl: (
             offset: (-2.0, -1.0, -9.0),
-            lateral: ("npc.hirdrassil.male.foot_fl"),
+            lateral: ("npc.hirdrasil.male.foot_fl"),
         ),
         foot_fr: (
             offset: (-2.0, -1.0, -9.0),
-            lateral: ("npc.hirdrassil.male.foot_fr"),
+            lateral: ("npc.hirdrasil.male.foot_fr"),
         ),
         foot_bl: (
             offset: (-2.0, -2.5, -7.0),
-            lateral: ("npc.hirdrassil.male.foot_bl"),
+            lateral: ("npc.hirdrasil.male.foot_bl"),
         ),
         foot_br: (
             offset: (-2.0, -2.5, -7.0),
-            lateral: ("npc.hirdrassil.male.foot_br"),
+            lateral: ("npc.hirdrasil.male.foot_br"),
         ),
     ),
-    (Hirdrassil, Female): (
+    (Hirdrasil, Female): (
         leg_fl: (
             offset: (-1.5, -3.0, -4.0),
-            lateral: ("npc.hirdrassil.male.leg_fl"),
+            lateral: ("npc.hirdrasil.male.leg_fl"),
         ),
         leg_fr: (
             offset: (-1.5, -3.0, -4.0),
-            lateral: ("npc.hirdrassil.male.leg_fr"),
+            lateral: ("npc.hirdrasil.male.leg_fr"),
         ),
         leg_bl: (
             offset: (-2.0, -2.5, -5.0),
-            lateral: ("npc.hirdrassil.male.leg_bl"),
+            lateral: ("npc.hirdrasil.male.leg_bl"),
         ),
         leg_br: (
             offset: (-2.0, -2.5, -5.0),
-            lateral: ("npc.hirdrassil.male.leg_br"),
+            lateral: ("npc.hirdrasil.male.leg_br"),
         ),
         foot_fl: (
             offset: (-2.0, -1.0, -9.0),
-            lateral: ("npc.hirdrassil.male.foot_fl"),
+            lateral: ("npc.hirdrasil.male.foot_fl"),
         ),
         foot_fr: (
             offset: (-2.0, -1.0, -9.0),
-            lateral: ("npc.hirdrassil.male.foot_fr"),
+            lateral: ("npc.hirdrasil.male.foot_fr"),
         ),
         foot_bl: (
             offset: (-2.0, -2.5, -7.0),
-            lateral: ("npc.hirdrassil.male.foot_bl"),
+            lateral: ("npc.hirdrasil.male.foot_bl"),
         ),
         foot_br: (
             offset: (-2.0, -2.5, -7.0),
-            lateral: ("npc.hirdrassil.male.foot_br"),
+            lateral: ("npc.hirdrasil.male.foot_br"),
         ),
     ),
 })

common/src/comp/body/quadruped_medium.rs

@@ -44,7 +44,7 @@ pub enum Species {
     Catoblepas = 11,
     Bonerattler = 12,
     Deer = 13,
-    Hirdrassil = 14,
+    Hirdrasil = 14,
 }
 
 /// Data representing per-species generic data.
@@ -64,7 +64,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub catoblepas: SpeciesMeta,
     pub bonerattler: SpeciesMeta,
     pub deer: SpeciesMeta,
-    pub hirdrassil: SpeciesMeta,
+    pub hirdrasil: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -85,7 +85,7 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Catoblepas => &self.catoblepas,
             Species::Bonerattler => &self.bonerattler,
             Species::Deer => &self.deer,
-            Species::Hirdrassil => &self.hirdrassil,
+            Species::Hirdrasil => &self.hirdrasil,
         }
     }
 }
@@ -103,7 +103,7 @@ pub const ALL_SPECIES: [Species; 13] = [
     Species::Catoblepas,
     Species::Bonerattler,
     Species::Deer,
-    Species::Hirdrassil,
+    Species::Hirdrasil,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

voxygen/src/anim/src/quadruped_medium/mod.rs

@@ -148,7 +148,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (-1.0, 2.5),
                 (Deer, Male) => (0.5, 3.5),
                 (Deer, Female) => (0.5, 3.5),
-                (Hirdrassil, _) => (0.0, 5.0),
+                (Hirdrasil, _) => (0.0, 5.0),
             },
             neck: match (body.species, body.body_type) {
                 (Grolgar, _) => (1.0, -1.0),
@@ -163,7 +163,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Catoblepas, _) => (19.5, -2.0),
                 (Bonerattler, _) => (7.0, -1.5),
                 (Deer, _) => (-0.5, 1.0),
-                (Hirdrassil, _) => (-1.0, 0.5),
+                (Hirdrasil, _) => (-1.0, 0.5),
             },
             jaw: match (body.species, body.body_type) {
                 (Grolgar, _) => (7.0, 1.5),
@@ -178,7 +178,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Catoblepas, _) => (1.0, -4.0),
                 (Bonerattler, _) => (3.0, -3.0),
                 (Deer, _) => (3.5, 2.0),
-                (Hirdrassil, _) => (2.5, 2.5),
+                (Hirdrasil, _) => (2.5, 2.5),
             },
             tail: match (body.species, body.body_type) {
                 (Grolgar, _) => (-11.5, -0.5),
@@ -193,22 +193,22 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Catoblepas, _) => (-8.5, -2.0),
                 (Bonerattler, _) => (-10.0, 1.5),
                 (Deer, _) => (-8.5, 0.5),
-                (Hirdrassil, _) => (-11.0, 2.0),
+                (Hirdrasil, _) => (-11.0, 2.0),
             },
             torso_front: match (body.species, body.body_type) {
                 (Grolgar, _) => (10.0, 13.0),
                 (Saber, _) => (14.0, 14.0),
                 (Tuskram, _) => (10.0, 14.5),
-                (Lion, _) => (10.0, 14.0),
+                (Lion, _) => (10.0, 12.5),
                 (Tarasque, _) => (11.5, 18.5),
-                (Tiger, _) => (10.0, 14.0),
+                (Tiger, _) => (10.0, 13.0),
                 (Wolf, _) => (12.0, 13.0),
                 (Frostfang, _) => (9.0, 11.5),
                 (Mouflon, _) => (11.0, 13.5),
                 (Catoblepas, _) => (7.5, 19.5),
                 (Bonerattler, _) => (6.0, 12.5),
                 (Deer, _) => (11.0, 13.5),
-                (Hirdrassil, _) => (11.0, 14.5),
+                (Hirdrasil, _) => (11.0, 14.5),
             },
             torso_back: match (body.species, body.body_type) {
                 (Grolgar, _) => (-10.0, 1.5),
@@ -216,14 +216,14 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Tuskram, _) => (-12.5, -2.0),
                 (Lion, _) => (-12.0, -0.5),
                 (Tarasque, _) => (-14.0, -1.0),
-                (Tiger, _) => (-13.0, 0.0),
+                (Tiger, _) => (-13.0, -0.5),
                 (Wolf, _) => (-12.5, 1.0),
                 (Frostfang, _) => (-10.5, 0.0),
                 (Mouflon, _) => (-8.5, -0.5),
                 (Catoblepas, _) => (-8.5, -4.5),
                 (Bonerattler, _) => (-5.0, 0.0),
                 (Deer, _) => (-9.0, 0.5),
-                (Hirdrassil, _) => (-9.0, -0.5),
+                (Hirdrasil, _) => (-9.0, -0.5),
             },
             ears: match (body.species, body.body_type) {
                 (Grolgar, _) => (5.0, 8.0),
@@ -238,67 +238,67 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Catoblepas, _) => (11.0, -3.0),
                 (Bonerattler, _) => (2.0, 3.5),
                 (Deer, _) => (2.5, 5.0),
-                (Hirdrassil, _) => (2.5, 5.0),
+                (Hirdrasil, _) => (2.5, 5.0),
             },
             leg_f: match (body.species, body.body_type) {
-                (Grolgar, _) => (7.0, -2.0, 2.0),
+                (Grolgar, _) => (7.5, -5.5, -1.0),
                 (Saber, _) => (7.0, -4.0, -3.5),
-                (Tuskram, _) => (6.0, -6.5, -0.5),
-                (Lion, _) => (6.5, -6.5, -2.0),
+                (Tuskram, _) => (6.0, -6.5, -4.0),
+                (Lion, _) => (6.5, -6.5, -1.5),
                 (Tarasque, _) => (7.0, -8.0, -6.0),
-                (Tiger, _) => (6.0, -5.0, 1.0),
+                (Tiger, _) => (6.0, -6.0, -1.5),
                 (Wolf, _) => (4.5, -6.5, -1.5),
                 (Frostfang, _) => (5.5, -5.5, -2.0),
                 (Mouflon, _) => (4.0, -5.0, -4.0),
-                (Catoblepas, _) => (7.0, 2.0, -6.0),
+                (Catoblepas, _) => (7.0, 2.0, -5.0),
                 (Bonerattler, _) => (5.5, 5.0, -4.0),
                 (Deer, _) => (3.5, -4.5, -3.5),
-                (Hirdrassil, _) => (4.5, -5.0, -2.5),
+                (Hirdrasil, _) => (4.5, -5.0, -2.5),
             },
             leg_b: match (body.species, body.body_type) {
-                (Grolgar, _) => (6.0, -6.5, -5.5),
+                (Grolgar, _) => (6.0, -6.5, -4.0),
                 (Saber, _) => (6.0, -7.0, -3.5),
-                (Tuskram, _) => (5.0, -5.5, -3.5),
-                (Lion, _) => (6.0, -6.0, -2.0),
+                (Tuskram, _) => (5.0, -4.5, -2.5),
+                (Lion, _) => (6.0, -5.0, -1.5),
                 (Tarasque, _) => (6.0, -6.5, -6.5),
-                (Tiger, _) => (6.0, -7.5, 1.0),
+                (Tiger, _) => (6.0, -7.0, -1.0),
                 (Wolf, _) => (5.0, -6.5, -3.0),
                 (Frostfang, _) => (3.5, -4.5, -2.0),
                 (Mouflon, _) => (3.5, -8.0, -3.5),
                 (Catoblepas, _) => (6.0, -2.5, -2.5),
                 (Bonerattler, _) => (6.0, -8.0, -4.0),
                 (Deer, _) => (3.0, -6.5, -3.5),
-                (Hirdrassil, _) => (4.0, -6.5, -3.0),
+                (Hirdrasil, _) => (4.0, -6.5, -3.0),
             },
             feet_f: match (body.species, body.body_type) {
-                (Grolgar, _) => (0.0, -3.0, -9.0),
+                (Grolgar, _) => (0.0, 0.0, -4.0),
                 (Saber, _) => (1.0, -3.5, -2.5),
-                (Tuskram, _) => (0.5, 0.5, -9.0),
-                (Lion, _) => (0.0, 0.0, -7.0),
+                (Tuskram, _) => (0.5, 0.5, -3.0),
+                (Lion, _) => (0.5, 0.5, -3.5),
                 (Tarasque, _) => (1.0, 0.0, -3.0),
-                (Tiger, _) => (0.5, 0.0, -9.0),
+                (Tiger, _) => (0.5, 0.0, -4.5),
                 (Wolf, _) => (0.5, 0.0, -2.0),
                 (Frostfang, _) => (0.5, 1.5, -3.5),
                 (Mouflon, _) => (-0.5, -0.5, -3.0),
-                (Catoblepas, _) => (1.0, 4.0, -3.0),
+                (Catoblepas, _) => (1.0, 0.0, -6.0),
                 (Bonerattler, _) => (-0.5, -3.0, -2.5),
                 (Deer, _) => (-0.5, -0.5, -2.5),
-                (Hirdrassil, _) => (-0.5, -3.0, -3.5),
+                (Hirdrasil, _) => (-0.5, -3.0, -3.5),
             },
             feet_b: match (body.species, body.body_type) {
-                (Grolgar, _) => (0.0, -1.0, -5.0),
+                (Grolgar, _) => (0.5, -1.5, -3.0),
                 (Saber, _) => (1.0, -1.0, -1.0),
-                (Tuskram, _) => (0.5, 0.0, -3.5),
-                (Lion, _) => (0.5, 0.5, -5.5),
+                (Tuskram, _) => (0.5,-1.0, -2.5),
+                (Lion, _) => (0.5, -1.0, -3.0),
                 (Tarasque, _) => (1.5, -1.0, -2.5),
-                (Tiger, _) => (1.0, 0.5, -8.0),
+                (Tiger, _) => (0.5, -1.0, -4.0),
                 (Wolf, _) => (0.0, -1.0, -1.5),
                 (Frostfang, _) => (0.0, -1.5, -3.5),
                 (Mouflon, _) => (-1.0, 0.0, -0.5),
                 (Catoblepas, _) => (0.5, 0.5, -4.0),
                 (Bonerattler, _) => (0.0, 3.0, -2.5),
                 (Deer, _) => (-1.0, -0.5, -2.0),
-                (Hirdrassil, _) => (-1.0, -2.0, -4.5),
+                (Hirdrasil, _) => (-1.0, -2.0, -4.5),
             },
             scaler: match (body.species, body.body_type) {
                 (Grolgar, _) => (1.3),
@@ -313,7 +313,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Catoblepas, _) => (1.3),
                 (Bonerattler, _) => (1.0),
                 (Deer, _) => (1.0),
-                (Hirdrassil, _) => (1.0),
+                (Hirdrasil, _) => (1.0),
             },
             startangle: match (body.species, body.body_type) {
                 //changes the default angle of front feet
@@ -326,10 +326,10 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Wolf, _) => (0.0),
                 (Frostfang, _) => (0.0),
                 (Mouflon, _) => (0.0),
-                (Catoblepas, _) => (0.2),
+                (Catoblepas, _) => (-0.5),
                 (Bonerattler, _) => (-0.7),
                 (Deer, _) => (0.0),
-                (Hirdrassil, _) => (0.0),
+                (Hirdrasil, _) => (0.0),
             },
             tempo: match (body.species, body.body_type) {
                 (Grolgar, _) => (0.95),
@@ -344,7 +344,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Catoblepas, _) => (0.8),
                 (Bonerattler, _) => (1.0),
                 (Deer, _) => (0.85),
-                (Hirdrassil, _) => (0.85),
+                (Hirdrasil, _) => (0.85),
             },
             spring: match (body.species, body.body_type) {
                 (Grolgar, _) => (1.0),
@@ -355,17 +355,17 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Tiger, _) => (1.0),
                 (Wolf, _) => (1.2),
                 (Frostfang, _) => (1.0),
-                (Mouflon, _) => (0.6),
+                (Mouflon, _) => (0.9),
                 (Catoblepas, _) => (0.7),
                 (Bonerattler, _) => (1.1),
                 (Deer, _) => (0.9),
-                (Hirdrassil, _) => (1.1),
+                (Hirdrasil, _) => (1.1),
             },
             feed: match (body.species, body.body_type) {
                 (Tuskram, _) => (true, 0.5),
                 (Mouflon, _) => (true, 1.0),
                 (Deer, _) => (true, 1.0),
-                (Hirdrassil, _) => (true, 0.9),
+                (Hirdrasil, _) => (true, 0.9),
                 (_, _) => (false, 0.0),
             },
         }