akhlut

assets/common/npc_names.ron

@@ -563,6 +563,10 @@
                 keyword: "alpaca",
                 generic: "Alpaca"
             ),
+            akhlut: (
+                keyword: "akhlut",
+                generic: "Akhlut"
+            ),
         )
     ),
     quadruped_small: (

assets/voxygen/voxel/quadruped_medium_central_manifest.ron

@@ -2039,4 +2039,64 @@
             central: ("npc.alpaca.male.tail"),
         ),
     ),
+    (Akhlut, Male): (
+        head: (
+            offset: (-5.0, 0.0, -4.5),
+            central: ("npc.akhlut.male.head"),
+        ),
+        neck: (
+            offset: (-6.0, -3.5, -10.5),
+            central: ("npc.akhlut.male.neck"),
+        ),
+        jaw: (
+            offset: (-5.0, 0.0, -8.0),
+            central: ("npc.akhlut.male.jaw"),
+        ),
+        torso_front: (
+            offset: (-7.0, -7.0, -10.0),
+            central: ("npc.akhlut.male.torso_front"),
+        ),
+        torso_back: (
+            offset: (-6.0, -17.0, -7.5),
+            central: ("npc.akhlut.male.torso_back"),
+        ),
+        ears: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (-8.0, -27.0, -8.0),
+            central: ("npc.akhlut.male.tail"),
+        ),
+    ),
+    (Akhlut, Female): (
+        head: (
+            offset: (-5.0, 0.0, -4.5),
+            central: ("npc.akhlut.male.head"),
+        ),
+        neck: (
+            offset: (-6.0, -3.5, -10.5),
+            central: ("npc.akhlut.male.neck"),
+        ),
+        jaw: (
+            offset: (-5.0, 0.0, -8.0),
+            central: ("npc.akhlut.male.jaw"),
+        ),
+        torso_front: (
+            offset: (-7.0, -7.0, -10.0),
+            central: ("npc.akhlut.male.torso_front"),
+        ),
+        torso_back: (
+            offset: (-6.0, -17.0, -7.5),
+            central: ("npc.akhlut.male.torso_back"),
+        ),
+        ears: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (-8.0, -27.0, -8.0),
+            central: ("npc.akhlut.male.tail"),
+        ),
+    ),
 })

assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron

@@ -2311,4 +2311,72 @@
             lateral: ("npc.alpaca.male.foot_br"),
         ),
     ),
+    (Akhlut, Male): (
+        leg_fl: (
+            offset: (-3.5, -4.5, -8.0),
+            lateral: ("npc.akhlut.male.leg_fr"),
+        ),
+        leg_fr: (
+            offset: (-3.5, -4.5, -8.0),
+            lateral: ("npc.akhlut.male.leg_fr"),
+        ),
+        leg_bl: (
+            offset: (-3.0, -6.0, -7.0),
+            lateral: ("npc.akhlut.male.leg_br"),
+        ),
+        leg_br: (
+            offset: (-3.0, -6.0, -7.0),
+            lateral: ("npc.akhlut.male.leg_br"),
+        ),
+        foot_fl: (
+            offset: (-4.0, -4.0, -10.0),
+            lateral: ("npc.akhlut.male.foot_fr"),
+        ),
+        foot_fr: (
+            offset: (-4.0, -4.0, -10.0),
+            lateral: ("npc.akhlut.male.foot_fr"),
+        ),
+        foot_bl: (
+            offset: (-3.5, -5.0, -9.0),
+            lateral: ("npc.akhlut.male.foot_br"),
+        ),
+        foot_br: (
+            offset: (-3.5, -5.0, -9.0),
+            lateral: ("npc.akhlut.male.foot_br"),
+        ),
+    ),
+    (Akhlut, Female): (
+        leg_fl: (
+            offset: (-3.5, -4.5, -8.0),
+            lateral: ("npc.akhlut.male.leg_fr"),
+        ),
+        leg_fr: (
+            offset: (-3.5, -4.5, -8.0),
+            lateral: ("npc.akhlut.male.leg_fr"),
+        ),
+        leg_bl: (
+            offset: (-3.0, -6.0, -7.0),
+            lateral: ("npc.akhlut.male.leg_br"),
+        ),
+        leg_br: (
+            offset: (-3.0, -6.0, -7.0),
+            lateral: ("npc.akhlut.male.leg_br"),
+        ),
+        foot_fl: (
+            offset: (-4.0, -4.0, -10.0),
+            lateral: ("npc.akhlut.male.foot_fr"),
+        ),
+        foot_fr: (
+            offset: (-4.0, -4.0, -10.0),
+            lateral: ("npc.akhlut.male.foot_fr"),
+        ),
+        foot_bl: (
+            offset: (-3.5, -5.0, -9.0),
+            lateral: ("npc.akhlut.male.foot_br"),
+        ),
+        foot_br: (
+            offset: (-3.5, -5.0, -9.0),
+            lateral: ("npc.akhlut.male.foot_br"),
+        ),
+    ),
 })

common/src/comp/body.rs

@@ -876,6 +876,7 @@ impl Body {
                     (quadruped_medium::Species::Ngoubou, _) => [0.0, 0.3, 2.0],
                     (quadruped_medium::Species::Llama, _) => [0.0, 0.1, 1.5],
                     (quadruped_medium::Species::Alpaca, _) => [0.0, -0.1, 1.0],
+                    (quadruped_medium::Species::Akhlut, _) => [0.6, 0.6, 2.0],
                 }
             },
             Body::Ship(ship) => match ship {

common/src/comp/body/quadruped_medium.rs

@@ -69,6 +69,7 @@ pub enum Species {
     Ngoubou = 33,
     Llama = 34,
     Alpaca = 35,
+    Akhlut = 36,
 }
 
 /// Data representing per-species generic data.
@@ -110,6 +111,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub ngoubou: SpeciesMeta,
     pub llama: SpeciesMeta,
     pub alpaca: SpeciesMeta,
+    pub akhlut: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -152,11 +154,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Ngoubou => &self.ngoubou,
             Species::Llama => &self.llama,
             Species::Alpaca => &self.alpaca,
+            Species::Akhlut => &self.akhlut,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 34] = [
+pub const ALL_SPECIES: [Species; 35] = [
     Species::Grolgar,
     Species::Saber,
     Species::Tiger,
@@ -191,6 +194,7 @@ pub const ALL_SPECIES: [Species; 34] = [
     Species::Ngoubou,
     Species::Llama,
     Species::Alpaca,
+    Species::Akhlut,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

common/src/states/utils.rs

@@ -86,6 +86,7 @@ impl Body {
                 quadruped_medium::Species::Ngoubou => 170.0,
                 quadruped_medium::Species::Llama => 120.0,
                 quadruped_medium::Species::Alpaca => 110.0,
+                quadruped_medium::Species::Akhlut => 90.0,
             },
             Body::BipedLarge(body) => match body.species {
                 biped_large::Species::Slysaurok => 100.0,

voxygen/anim/src/quadruped_medium/mod.rs

@@ -208,6 +208,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Ngoubou, _) => (0.5, -2.5),
                 (Llama, _) => (0.5, 10.0),
                 (Alpaca, _) => (0.5, 7.5),
+                (Akhlut, _) => (1.0, 3.5),
             },
             neck: match (body.species, body.body_type) {
                 (Grolgar, _) => (1.0, -1.0),
@@ -245,6 +246,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Ngoubou, _) => (2.0, 1.0),
                 (Llama, _) => (2.5, 4.5),
                 (Alpaca, _) => (-1.5, 3.0),
+                (Akhlut, _) => (8.5, -1.0),
             },
             jaw: match (body.species, body.body_type) {
                 (Grolgar, _) => (7.0, 2.0),
@@ -283,6 +285,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Ngoubou, _) => (8.5, -4.0),
                 (Llama, _) => (4.0, -1.0),
                 (Alpaca, _) => (3.0, -2.5),
+                (Akhlut, _) => (0.0, -4.5),
             },
             tail: match (body.species, body.body_type) {
                 (Grolgar, _) => (-11.5, -0.5),
@@ -320,6 +323,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Ngoubou, _) => (-12.0, 5.5),
                 (Llama, _) => (-9.0, 6.0),
                 (Alpaca, _) => (-8.5, 3.5),
+                (Akhlut, _) => (-14.0, -2.0),
             },
             torso_front: match (body.species, body.body_type) {
                 (Grolgar, _) => (10.0, 13.0),
@@ -357,6 +361,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Ngoubou, _) => (9.5, 16.5),
                 (Llama, _) => (7.0, 15.0),
                 (Alpaca, _) => (7.0, 11.5),
+                (Akhlut, _) => (5.5, 14.5),
             },
             torso_back: match (body.species, body.body_type) {
                 (Grolgar, _) => (-10.0, 1.5),
@@ -394,6 +399,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Ngoubou, _) => (-8.0, -2.0),
                 (Llama, _) => (-8.0, 0.0),
                 (Alpaca, _) => (-6.0, 0.0),
+                (Akhlut, _) => (-7.0, 1.0),
             },
             ears: match (body.species, body.body_type) {
                 (Grolgar, _) => (5.0, 8.0),
@@ -432,6 +438,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Ngoubou, _) => (12.0, -3.0),
                 (Llama, _) => (1.0, 3.5),
                 (Alpaca, _) => (1.0, 2.0),
+                (Akhlut, _) => (12.0, -3.0),
             },
             leg_f: match (body.species, body.body_type) {
                 (Grolgar, _) => (7.5, -5.5, -1.0),
@@ -469,6 +476,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Ngoubou, _) => (7.5, -4.0, -1.5),
                 (Llama, _) => (5.0, -1.5, -1.0),
                 (Alpaca, _) => (3.5, -2.5, -0.5),
+                (Akhlut, _) => (8.0, -2.0, 0.5),
             },
             leg_b: match (body.species, body.body_type) {
                 (Grolgar, _) => (6.0, -6.5, -4.0),
@@ -506,6 +514,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Ngoubou, _) => (4.5, -9.5, 0.0),
                 (Llama, _) => (5.0, -7.0, -2.0),
                 (Alpaca, _) => (3.5, -7.0, 0.0),
+                (Akhlut, _) => (6.0, -7.5, -2.0),
             },
             feet_f: match (body.species, body.body_type) {
                 (Grolgar, _) => (0.0, 0.0, -4.0),
@@ -543,6 +552,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Ngoubou, _) => (-1.0, 0.5, -6.0),
                 (Llama, _) => (-0.5, 0.5, -6.0),
                 (Alpaca, _) => (0.0, -0.5, -5.0),
+                (Akhlut, _) => (0.0, 0.0, -5.0),
             },
             feet_b: match (body.species, body.body_type) {
                 (Grolgar, _) => (0.5, -1.5, -3.0),
@@ -580,6 +590,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Ngoubou, _) => (0.5, 1.0, -5.5),
                 (Llama, _) => (0.5, -1.5, -3.5),
                 (Alpaca, _) => (-0.5, -0.5, -5.5),
+                (Akhlut, _) => (1.5, -1.0, -4.5),
             },
             scaler: match (body.species, body.body_type) {
                 (Grolgar, _) => (1.05),
@@ -606,6 +617,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Snowleopard, _) => (0.95),
                 (Mammoth, _) => (3.0),
                 (Ngoubou, _) => (1.0),
+                (Akhlut, _) => (1.4),
                 _ => (0.9),
             },
             startangle: match (body.species, body.body_type) {
@@ -644,6 +656,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bear, _) => (0.8),
                 (Yak, _) => (0.8),
                 (Camel, _) => (1.8),
+                (Akhlut, _) => (0.95),
                 _ => (1.0),
             },
             spring: match (body.species, body.body_type) {
@@ -723,6 +736,7 @@ fn mount_point(body: &Body) -> Vec3<f32> {
         (Ngoubou, _) => (0.0, -7.0, 6.0),
         (Llama, _) => (0.0, -6.0, 5.0),
         (Alpaca, _) => (0.0, -9.0, 3.0),
+        (Akhlut, _) => (0.0, -6.0, 4.0),
     }
     .into()
 }