Add roshwalr npc

assets/common/npc_names.json

@@ -294,6 +294,10 @@
             "hirdrasil": {
                 "keyword": "hirdrasil",
                 "generic": "Hirdrasil"
+            },
+            "roshwalr": {
+                "keyword": "roshwalr",
+                "generic": "Roshwalr"
             }
         }
     },

assets/voxygen/voxel/quadruped_medium_central_manifest.ron

@@ -779,4 +779,64 @@
             central: ("npc.hirdrasil.male.tail"),
         ),
     ),
+    (Roshwalr, Male): (
+        head: (
+            offset: (-13.0, 0.0, -12.0),
+            central: ("npc.roshwalr.male.head"),
+        ),
+        neck: (
+            offset: (-7.0, -3.0, -11.5),
+            central: ("npc.roshwalr.male.neck"),
+        ),
+        jaw: (
+            offset: (-5.0, 0.0, -3.0),
+            central: ("npc.roshwalr.male.jaw"),
+        ),
+        torso_front: (
+            offset: (-8.0, -12.0, -10.5),
+            central: ("npc.roshwalr.male.torso_front"),
+        ),
+        torso_back: (
+            offset: (-6.0, -12.0, -7.0),
+            central: ("npc.roshwalr.male.torso_back"),
+        ),
+        ears: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (-4.0, -13.0, -8.0),
+            central: ("npc.roshwalr.male.tail"),
+        ),
+    ),
+    (Roshwalr, Female): (
+        head: (
+            offset: (-13.0, 0.0, -12.0),
+            central: ("npc.roshwalr.male.head"),
+        ),
+        neck: (
+            offset: (-7.0, -3.0, -11.5),
+            central: ("npc.roshwalr.male.neck"),
+        ),
+        jaw: (
+            offset: (-5.0, 0.0, -3.0),
+            central: ("npc.roshwalr.male.jaw"),
+        ),
+        torso_front: (
+            offset: (-8.0, -12.0, -10.5),
+            central: ("npc.roshwalr.male.torso_front"),
+        ),
+        torso_back: (
+            offset: (-6.0, -12.0, -7.0),
+            central: ("npc.roshwalr.male.torso_back"),
+        ),
+        ears: (
+            offset: (0.0, 0.0, 0.0),
+            central: ("armor.empty"),
+        ),
+        tail: (
+            offset: (-4.0, -13.0, -8.0),
+            central: ("npc.roshwalr.male.tail"),
+        ),
+    ),
 })

assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron

@@ -629,11 +629,11 @@
             lateral: ("npc.catoblepas.male.leg_br"),
         ),
         foot_fl: (
-            offset: (-3.0, -3.0, -9.0), 
+            offset: (-3.0, -3.0, -9.0),
             lateral: ("npc.catoblepas.male.foot_fl"),
         ),
         foot_fr: (
-            offset: (-3.0, -3.0, -9.0), 
+            offset: (-3.0, -3.0, -9.0),
             lateral: ("npc.catoblepas.male.foot_fr"),
         ),
         foot_bl: (
@@ -663,11 +663,11 @@
             lateral: ("npc.catoblepas.male.leg_br"),
         ),
         foot_fl: (
-            offset: (-3.0, -3.0, -9.0), 
+            offset: (-3.0, -3.0, -9.0),
             lateral: ("npc.catoblepas.male.foot_fl"),
         ),
         foot_fr: (
-            offset: (-3.0, -3.0, -9.0), 
+            offset: (-3.0, -3.0, -9.0),
             lateral: ("npc.catoblepas.male.foot_fr"),
         ),
         foot_bl: (
@@ -883,4 +883,72 @@
             lateral: ("npc.hirdrasil.male.foot_br"),
         ),
     ),
+    (Roshwalr, Male): (
+        leg_fl: (
+            offset: (-4.0, -2.5, -4.0),
+            lateral: ("npc.roshwalr.male.leg_fl"),
+        ),
+        leg_fr: (
+            offset: (-4.0, -2.5, -4.0),
+            lateral: ("npc.roshwalr.male.leg_fr"),
+        ),
+        leg_bl: (
+            offset: (-2.0, -1.0, -2.5),
+            lateral: ("npc.roshwalr.male.leg_bl"),
+        ),
+        leg_br: (
+            offset: (-2.0, -1.0, -2.5),
+            lateral: ("npc.roshwalr.male.leg_br"),
+        ),
+        foot_fl: (
+            offset: (-4.5, -1.0, -7.0),
+            lateral: ("npc.roshwalr.male.foot_fl"),
+        ),
+        foot_fr: (
+            offset: (-4.5, -1.0, -7.0),
+            lateral: ("npc.roshwalr.male.foot_fr"),
+        ),
+        foot_bl: (
+            offset: (-2.5, -2.0, -3.0),
+            lateral: ("npc.roshwalr.male.foot_bl"),
+        ),
+        foot_br: (
+            offset: (-2.5, -2.0, -3.0),
+            lateral: ("npc.roshwalr.male.foot_br"),
+        ),
+    ),
+    (Roshwalr, Female): (
+        leg_fl: (
+            offset: (-4.0, -2.5, -4.0),
+            lateral: ("npc.roshwalr.male.leg_fl"),
+        ),
+        leg_fr: (
+            offset: (-4.0, -2.5, -4.0),
+            lateral: ("npc.roshwalr.male.leg_fr"),
+        ),
+        leg_bl: (
+            offset: (-2.0, -1.0, -2.5),
+            lateral: ("npc.roshwalr.male.leg_bl"),
+        ),
+        leg_br: (
+            offset: (-2.0, -1.0, -2.5),
+            lateral: ("npc.roshwalr.male.leg_br"),
+        ),
+        foot_fl: (
+            offset: (-4.5, -1.0, -7.0),
+            lateral: ("npc.roshwalr.male.foot_fl"),
+        ),
+        foot_fr: (
+            offset: (-4.5, -1.0, -7.0),
+            lateral: ("npc.roshwalr.male.foot_fr"),
+        ),
+        foot_bl: (
+            offset: (-2.5, -2.0, -3.0),
+            lateral: ("npc.roshwalr.male.foot_bl"),
+        ),
+        foot_br: (
+            offset: (-2.5, -2.0, -3.0),
+            lateral: ("npc.roshwalr.male.foot_br"),
+        ),
+    ),
 })

common/src/comp/body.rs

@@ -250,6 +250,7 @@ impl Body {
                 quadruped_medium::Species::Bonerattler => 400,
                 quadruped_medium::Species::Deer => 300,
                 quadruped_medium::Species::Hirdrasil => 500,
+                quadruped_medium::Species::Roshwalr => 600,
                 _ => 400,
             },
             Body::BirdMedium(bird_medium) => match bird_medium.species {
@@ -319,6 +320,7 @@ impl Body {
                 quadruped_medium::Species::Bonerattler => 30,
                 quadruped_medium::Species::Deer => 30,
                 quadruped_medium::Species::Hirdrasil => 30,
+                quadruped_medium::Species::Roshwalr => 30,
                 _ => 20,
             },
             Body::BirdMedium(bird_medium) => match bird_medium.species {
@@ -388,6 +390,7 @@ impl Body {
                 quadruped_medium::Species::Bonerattler => 10,
                 quadruped_medium::Species::Deer => 7,
                 quadruped_medium::Species::Hirdrasil => 10,
+                quadruped_medium::Species::Roshwalr => 10,
                 _ => 6,
             },
             Body::BirdMedium(bird_medium) => match bird_medium.species {
@@ -466,6 +469,7 @@ impl Body {
                 quadruped_medium::Species::Bonerattler => 50,
                 quadruped_medium::Species::Deer => 30,
                 quadruped_medium::Species::Hirdrasil => 50,
+                quadruped_medium::Species::Roshwalr => 60,
                 _ => 40,
             },
             Body::BirdMedium(bird_medium) => match bird_medium.species {

common/src/comp/body/quadruped_medium.rs

@@ -45,6 +45,7 @@ pub enum Species {
     Bonerattler = 12,
     Deer = 13,
     Hirdrasil = 14,
+    Roshwalr = 15,
 }
 
 /// Data representing per-species generic data.
@@ -65,6 +66,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub bonerattler: SpeciesMeta,
     pub deer: SpeciesMeta,
     pub hirdrasil: SpeciesMeta,
+    pub roshwalr: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -86,11 +88,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Bonerattler => &self.bonerattler,
             Species::Deer => &self.deer,
             Species::Hirdrasil => &self.hirdrasil,
+            Species::Roshwalr => &self.roshwalr,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 13] = [
+pub const ALL_SPECIES: [Species; 14] = [
     Species::Grolgar,
     Species::Saber,
     Species::Tiger,
@@ -104,6 +107,7 @@ pub const ALL_SPECIES: [Species; 13] = [
     Species::Bonerattler,
     Species::Deer,
     Species::Hirdrasil,
+    Species::Roshwalr,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

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

@@ -150,6 +150,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Deer, Male) => (0.5, 3.5),
                 (Deer, Female) => (0.5, 3.5),
                 (Hirdrasil, _) => (0.0, 5.0),
+                (Roshwalr, _) => (1.0, 0.5),
             },
             neck: match (body.species, body.body_type) {
                 (Grolgar, _) => (1.0, -1.0),
@@ -165,6 +166,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (7.0, -1.5),
                 (Deer, _) => (-0.5, 1.0),
                 (Hirdrasil, _) => (-1.0, 0.5),
+                (Roshwalr, _) => (0.0, 1.0),
             },
             jaw: match (body.species, body.body_type) {
                 (Grolgar, _) => (7.0, 2.0),
@@ -180,6 +182,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (3.0, -2.5),
                 (Deer, _) => (3.5, 2.5),
                 (Hirdrasil, _) => (2.5, 3.0),
+                (Roshwalr, _) => (4.0, -1.0),
             },
             tail: match (body.species, body.body_type) {
                 (Grolgar, _) => (-11.5, -0.5),
@@ -195,6 +198,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (-10.0, 1.5),
                 (Deer, _) => (-8.5, 0.5),
                 (Hirdrasil, _) => (-11.0, 2.0),
+                (Roshwalr, _) => (-8.5, -1.0),
             },
             torso_front: match (body.species, body.body_type) {
                 (Grolgar, _) => (10.0, 13.0),
@@ -210,6 +214,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (6.0, 12.5),
                 (Deer, _) => (11.0, 13.5),
                 (Hirdrasil, _) => (11.0, 14.5),
+                (Roshwalr, _) => (6.0, 12.5),
             },
             torso_back: match (body.species, body.body_type) {
                 (Grolgar, _) => (-10.0, 1.5),
@@ -225,6 +230,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (-5.0, 0.0),
                 (Deer, _) => (-9.0, 0.5),
                 (Hirdrasil, _) => (-9.0, -0.5),
+                (Roshwalr, _) => (-9.0, -3.5),
             },
             ears: match (body.species, body.body_type) {
                 (Grolgar, _) => (5.0, 8.0),
@@ -240,6 +246,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (2.0, 3.5),
                 (Deer, _) => (2.5, 5.0),
                 (Hirdrasil, _) => (2.5, 5.0),
+                (Roshwalr, _) => (5.0, 8.0),
             },
             leg_f: match (body.species, body.body_type) {
                 (Grolgar, _) => (7.5, -5.5, -1.0),
@@ -255,6 +262,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (5.5, 5.0, -4.0),
                 (Deer, _) => (3.5, -4.5, -3.5),
                 (Hirdrasil, _) => (4.5, -5.0, -2.5),
+                (Roshwalr, _) => (8.0, -2.5, -2.5),
             },
             leg_b: match (body.species, body.body_type) {
                 (Grolgar, _) => (6.0, -6.5, -4.0),
@@ -270,6 +278,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (6.0, -8.0, -4.0),
                 (Deer, _) => (3.0, -6.5, -3.5),
                 (Hirdrasil, _) => (4.0, -6.5, -3.0),
+                (Roshwalr, _) => (7.0, -7.0, -2.5),
             },
             feet_f: match (body.species, body.body_type) {
                 (Grolgar, _) => (0.0, 0.0, -4.0),
@@ -285,6 +294,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (-0.5, -3.0, -2.5),
                 (Deer, _) => (-0.5, -0.5, -2.5),
                 (Hirdrasil, _) => (-0.5, -3.0, -3.5),
+                (Roshwalr, _) => (0.5, -0.5, -3.0),
             },
             feet_b: match (body.species, body.body_type) {
                 (Grolgar, _) => (0.5, -1.5, -3.0),
@@ -300,6 +310,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (0.0, 3.0, -2.5),
                 (Deer, _) => (-1.0, -0.5, -2.0),
                 (Hirdrasil, _) => (-1.0, -2.0, -4.5),
+                (Roshwalr, _) => (0.5, 1.0, -3.5),
             },
             scaler: match (body.species, body.body_type) {
                 (Grolgar, _) => (1.3),
@@ -315,6 +326,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (1.0),
                 (Deer, _) => (1.0),
                 (Hirdrasil, _) => (1.0),
+                (Roshwalr, _) => (1.2),
             },
             startangle: match (body.species, body.body_type) {
                 //changes the default angle of front feet
@@ -331,6 +343,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (-0.7),
                 (Deer, _) => (0.0),
                 (Hirdrasil, _) => (0.0),
+                (Roshwalr, _) => (-0.3),
             },
             tempo: match (body.species, body.body_type) {
                 (Grolgar, _) => (0.95),
@@ -346,6 +359,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (1.0),
                 (Deer, _) => (0.85),
                 (Hirdrasil, _) => (0.85),
+                (Roshwalr, _) => (0.95),
             },
             spring: match (body.species, body.body_type) {
                 (Grolgar, _) => (1.0),
@@ -361,6 +375,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Bonerattler, _) => (1.1),
                 (Deer, _) => (0.9),
                 (Hirdrasil, _) => (1.1),
+                (Roshwalr, _) => (1.0),
             },
             feed: match (body.species, body.body_type) {
                 (Tuskram, _) => (true, 0.5),