Add tortoise mob

assets/common/npc_names.json

@@ -581,6 +581,10 @@
             "asp": {
                 "keyword": "asp",
                 "generic": "Asp"
+            },
+            "tortoise": {
+                "keyword": "tortoise",
+                "generic": "Tortoise"
             }
         }
     }

assets/voxygen/voxel/quadruped_low_central_manifest.ron

@@ -260,4 +260,56 @@
             central: ("npc.asp.female.tail_front"),
         ),
     ),
+    (Tortoise, Male): (
+        upper: (
+            offset: (-2.5, -4.0, -3.0),
+            central: ("npc.tortoise.male.head_upper"),
+        ),
+        lower: (
+            offset: (-2.5, -3.5, -2.0),
+            central: ("npc.tortoise.male.head_lower"),
+        ),
+        jaw: (
+            offset: (-1.5, -3.5, -1.0),
+            central: ("npc.tortoise.male.jaw"),
+        ),
+        chest: (
+            offset: (-10.5, -12.5, -7.0),
+            central: ("npc.tortoise.male.chest"),
+        ),
+        tail_rear: (
+            offset: (-0.5, -0.5, -0.5),
+            central: ("npc.tortoise.male.tail_rear"),
+        ),
+		tail_front: (
+            offset: (-1.5, -3.5, -1.5),
+            central: ("npc.tortoise.male.tail_front"),
+        ),
+    ),
+    (Tortoise, Female): (
+        upper: (
+            offset: (-2.5, -4.0, -3.0),
+            central: ("npc.tortoise.female.head_upper"),
+        ),
+        lower: (
+            offset: (-2.5, -3.5, -2.0),
+            central: ("npc.tortoise.female.head_lower"),
+        ),
+        jaw: (
+            offset: (-1.5, -3.5, -1.0),
+            central: ("npc.tortoise.female.jaw"),
+        ),
+        chest: (
+            offset: (-10.5, -12.5, -7.0),
+            central: ("npc.tortoise.female.chest"),
+        ),
+        tail_rear: (
+            offset: (-0.5, -0.5, -0.5),
+            central: ("npc.tortoise.female.tail_rear"),
+        ),
+		tail_front: (
+            offset: (-1.5, -7.0, -1.5),
+            central: ("npc.tortoise.female.tail_front"),
+        ),
+    ),
 })

assets/voxygen/voxel/quadruped_low_lateral_manifest.ron

@@ -179,4 +179,40 @@
             lateral: ("npc.asp.female.foot_br"),
         ),
     ),
+    (Tortoise, Male): (
+        front_left: (
+            offset: (-3.5, -4.0, -8.0),
+            lateral: ("npc.tortoise.male.foot_fl"),
+        ),
+        front_right: (
+            offset: (-3.5, -4.0, -8.0),
+            lateral: ("npc.tortoise.male.foot_fr"),
+        ),
+        back_left: (
+            offset: (-3.5, -3.0, -8.0),
+            lateral: ("npc.tortoise.male.foot_bl"),
+        ),
+        back_right: (
+            offset: (-3.5, -3.0, -8.0),
+            lateral: ("npc.tortoise.male.foot_br"),
+        ),
+    ),
+    (Tortoise, Female): (
+        front_left: (
+            offset: (-3.5, -4.0, -8.0),
+            lateral: ("npc.tortoise.female.foot_fl"),
+        ),
+        front_right: (
+            offset: (-3.5, -4.0, -8.0),
+            lateral: ("npc.tortoise.female.foot_fr"),
+        ),
+        back_left: (
+            offset: (-3.5, -3.0, -8.0),
+            lateral: ("npc.tortoise.female.foot_bl"),
+        ),
+        back_right: (
+            offset: (-3.5, -3.0, -8.0),
+            lateral: ("npc.tortoise.female.foot_br"),
+        ),
+    ),
 })

common/src/comp/body/quadruped_low.rs

@@ -32,6 +32,7 @@ pub enum Species {
     Salamander = 2,
     Monitor = 3,
     Asp = 4,
+    Tortoise = 5,
 }
 
 /// Data representing per-species generic data.
@@ -44,6 +45,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub salamander: SpeciesMeta,
     pub monitor: SpeciesMeta,
     pub asp: SpeciesMeta,
+    pub tortoise: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -57,16 +59,18 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Salamander => &self.salamander,
             Species::Monitor => &self.monitor,
             Species::Asp => &self.asp,
+            Species::Tortoise => &self.tortoise,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 5] = [
+pub const ALL_SPECIES: [Species; 6] = [
     Species::Crocodile,
     Species::Alligator,
     Species::Salamander,
     Species::Monitor,
     Species::Asp,
+    Species::Tortoise,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

voxygen/src/anim/quadruped_low/mod.rs

@@ -132,6 +132,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
                 (Salamander, _) => (3.0, 1.0),
                 (Monitor, _) => (3.5, 2.0),
                 (Asp, _) => (6.0, 5.5),
+                (Tortoise, _) => (5.0, 1.0),
             },
             head_lower: match (body.species, body.body_type) {
                 (Crocodile, _) => (8.0, 0.0),
@@ -139,6 +140,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
                 (Salamander, _) => (10.0, 2.0),
                 (Monitor, _) => (10.0, 3.0),
                 (Asp, _) => (9.0, 2.5),
+                (Tortoise, _) => (12.0, -3.5),
             },
             jaw: match (body.species, body.body_type) {
                 (Crocodile, _) => (0.0, -3.0),
@@ -146,6 +148,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
                 (Salamander, _) => (2.0, -3.0),
                 (Monitor, _) => (0.0, -1.0),
                 (Asp, _) => (1.0, -2.0),
+                (Tortoise, _) => (0.5, -2.0),
             },
             chest: match (body.species, body.body_type) {
                 (Crocodile, _) => (0.0, 5.0),
@@ -153,6 +156,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
                 (Salamander, _) => (0.0, 5.0),
                 (Monitor, _) => (0.0, 5.0),
                 (Asp, _) => (0.0, 8.0),
+                (Tortoise, _) => (0.0, 11.0),
             },
             tail_rear: match (body.species, body.body_type) {
                 (Crocodile, _) => (-12.5, -1.0),
@@ -160,6 +164,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
                 (Salamander, _) => (-9.0, 0.0),
                 (Monitor, _) => (-12.0, 0.0),
                 (Asp, _) => (-14.0, -2.0),
+                (Tortoise, _) => (-7.0, -1.5),
             },
             tail_front: match (body.species, body.body_type) {
                 (Crocodile, _) => (-6.0, 0.0),
@@ -167,6 +172,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
                 (Salamander, _) => (-7.5, 0.0),
                 (Monitor, _) => (-6.5, 0.0),
                 (Asp, _) => (-6.0, -2.0),
+                (Tortoise, _) => (-13.5, -3.0),
             },
             feet_f: match (body.species, body.body_type) {
                 (Crocodile, _) => (6.0, 6.0, -1.0),
@@ -174,6 +180,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
                 (Salamander, _) => (6.0, 6.0, -2.0),
                 (Monitor, _) => (6.0, 6.0, 0.0),
                 (Asp, _) => (6.5, 6.0, -1.0),
+                (Tortoise, _) => (8.5, 9.5, -3.0),
             },
             feet_b: match (body.species, body.body_type) {
                 (Crocodile, _) => (6.0, -6.0, -1.0),
@@ -181,6 +188,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
                 (Salamander, _) => (6.0, -6.0, -2.0),
                 (Monitor, _) => (6.0, -6.0, 0.0),
                 (Asp, _) => (6.5, -3.5, -1.0),
+                (Tortoise, _) => (8.0, -8.5, -3.0),
             },
             height: match (body.species, body.body_type) {
                 (Crocodile, _) => (1.0),
@@ -188,6 +196,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr {
                 (Salamander, _) => (1.0),
                 (Monitor, _) => (1.0),
                 (Asp, _) => (1.0),
+                (Tortoise, _) => (1.0),
             },
         }
     }