Add cockatrice

assets/common/npc_names.json

@@ -475,6 +475,10 @@
             "parrot": {
                 "keyword": "parrot",
                 "generic": "Parrot"
+            },
+            "cockatrice": {
+                "keyword": "cockatrice",
+                "generic": "Cockatrice"
             }
         }
     },

assets/voxygen/voxel/bird_medium_center_manifest.ron

@@ -195,4 +195,32 @@
             center: ("npc.parrot.female.tail"),
         )
     ),
+    (Cockatrice, Male): (
+        head: (
+            offset: (-2.5, -3.5, -8.0),
+            center: ("npc.cockatrice.male.head"),
+        ),
+        torso: (
+            offset: (-3.5, -6.5, -7.5),
+            center: ("npc.cockatrice.male.torso"),
+        ),
+        tail: (
+            offset: (-1.5, -3.5, -4.0),
+            center: ("npc.cockatrice.male.tail"),
+        )
+    ),
+    (Cockatrice, Female): (
+        head: (
+            offset: (-2.5, -3.5, -8.0),
+            center: ("npc.cockatrice.female.head"),
+        ),
+        torso: (
+            offset: (-3.5, -6.5, -7.5),
+            center: ("npc.cockatrice.female.torso"),
+        ),
+        tail: (
+            offset: (-1.5, -3.5, -4.0),
+            center: ("npc.cockatrice.female.tail"),
+        )
+    ),
 })

assets/voxygen/voxel/bird_medium_lateral_manifest.ron

@@ -251,4 +251,40 @@
             lateral: ("npc.parrot.female.leg_r"),
         )
     ),
+    (Cockatrice, Male): (
+        wing_l: (
+            offset: (-2.0, -3.0, -9.0),
+            lateral: ("npc.cockatrice.male.wing_l"),
+        ),
+        wing_r: (
+            offset: (-2.0, -3.0, -9.0),
+            lateral: ("npc.cockatrice.male.wing_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, 0.0, -12.0),
+            lateral: ("npc.cockatrice.male.leg_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, 0.0, -12.0),
+            lateral: ("npc.cockatrice.male.leg_r"),
+        )
+    ),
+    (Cockatrice, Female): (
+        wing_l: (
+            offset: (-2.0, -3.0, -9.0),
+            lateral: ("npc.cockatrice.female.wing_l"),
+        ),
+        wing_r: (
+            offset: (-2.0, -3.0, -9.0),
+            lateral: ("npc.cockatrice.female.wing_r"),
+        ),
+        foot_l: (
+            offset: (-2.5, 0.0, -12.0),
+            lateral: ("npc.cockatrice.female.leg_l"),
+        ),
+        foot_r: (
+            offset: (-2.5, 0.0, -12.0),
+            lateral: ("npc.cockatrice.female.leg_r"),
+        )
+    ),
 })

common/src/comp/body/bird_medium.rs

@@ -34,6 +34,7 @@ pub enum Species {
     Eagle = 4,
     Snowyowl = 5,
     Parrot = 6,
+    Cockatrice = 7,
 }
 
 /// Data representing per-species generic data.
@@ -48,6 +49,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub eagle: SpeciesMeta,
     pub snowyowl: SpeciesMeta,
     pub parrot: SpeciesMeta,
+    pub cockatrice: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -63,11 +65,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Eagle => &self.eagle,
             Species::Snowyowl => &self.snowyowl,
             Species::Parrot => &self.parrot,
+            Species::Cockatrice => &self.cockatrice,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 7] = [
+pub const ALL_SPECIES: [Species; 8] = [
     Species::Duck,
     Species::Chicken,
     Species::Goose,
@@ -75,6 +78,7 @@ pub const ALL_SPECIES: [Species; 7] = [
     Species::Eagle,
     Species::Snowyowl,
     Species::Parrot,
+    Species::Cockatrice,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

voxygen/src/anim/bird_medium/mod.rs

@@ -110,6 +110,7 @@ impl<'a> From<&'a comp::bird_medium::Body> for SkeletonAttr {
                 (Eagle, _) => (2.5, 5.0),
                 (Snowyowl, _) => (2.5, 5.0),
                 (Parrot, _) => (0.5, 4.5),
+                (Cockatrice, _) => (3.0, 4.0),
             },
             chest: match (body.species, body.body_type) {
                 (Duck, _) => (0.0, 5.0),
@@ -119,6 +120,7 @@ impl<'a> From<&'a comp::bird_medium::Body> for SkeletonAttr {
                 (Eagle, _) => (0.0, 8.0),
                 (Snowyowl, _) => (0.0, 4.5),
                 (Parrot, _) => (0.0, 5.0),
+                (Cockatrice, _) => (0.0, 12.5),
             },
             tail: match (body.species, body.body_type) {
                 (Duck, _) => (-3.0, 1.5),
@@ -128,6 +130,7 @@ impl<'a> From<&'a comp::bird_medium::Body> for SkeletonAttr {
                 (Eagle, _) => (-8.0, -4.0),
                 (Snowyowl, _) => (-6.0, -2.0),
                 (Parrot, _) => (-8.0, -2.0),
+                (Cockatrice, _) => (-10.0, -2.5),
             },
             wing: match (body.species, body.body_type) {
                 (Duck, _) => (2.75, 0.0, 1.0),
@@ -137,6 +140,7 @@ impl<'a> From<&'a comp::bird_medium::Body> for SkeletonAttr {
                 (Eagle, _) => (3.0, -8.0, 4.0),
                 (Snowyowl, _) => (3.5, -5.5, 4.0),
                 (Parrot, _) => (2.0, -4.5, 3.0),
+                (Cockatrice, _) => (4.5, -2.5, 1.5),
             },
             foot: match (body.species, body.body_type) {
                 (Duck, _) => (2.0, -1.5, 4.0),
@@ -146,6 +150,7 @@ impl<'a> From<&'a comp::bird_medium::Body> for SkeletonAttr {
                 (Eagle, _) => (2.0, -2.0, 8.0),
                 (Snowyowl, _) => (1.5, -2.5, 7.0),
                 (Parrot, _) => (1.5, -3.0, 3.0),
+                (Cockatrice, _) => (4.0, -3.5, 12.0),
             },
         }
     }