add bat (created by Gemu)

assets/common/npc_names.ron

@@ -824,6 +824,10 @@
                 keyword: "penguin",
                 generic: "Penguin"
             ),
+            bat: (
+                keyword: "bat",
+                generic: "Bat"
+            ),
         )
     ),
     biped_large: (

assets/voxygen/voxel/bird_medium_central_manifest.ron

@@ -223,4 +223,32 @@
             central: ("npc.penguin.male.tail"),
         )
     ),
+    (Bat, Male): (
+        head: (
+            offset: (-4.5, 2.0, -9.0),
+            central: ("npc.bat.male.head"),
+        ),
+        torso: (
+            offset: (-3.5, -5.0, -4.5),
+            central: ("npc.bat.male.torso"),
+        ),
+        tail: (
+            offset: (-2.5, -0.5, 1.5),
+            central: ("npc.bat.male.tail"),
+        )
+    ),
+    (Bat, Female): (
+        head: (
+            offset: (-4.5, 2.0, -9.0),
+            central: ("npc.bat.male.head"),
+        ),
+        torso: (
+            offset: (-3.5, -5.0, -4.5),
+            central: ("npc.bat.male.torso"),
+        ),
+        tail: (
+            offset: (-2.5, -0.5, 1.5),
+            central: ("npc.bat.male.tail"),
+        )
+    ),
 })

assets/voxygen/voxel/bird_medium_lateral_manifest.ron

@@ -287,4 +287,40 @@
             lateral: ("npc.penguin.male.leg_r"),
         )
     ),
+    (Bat, Male): (
+        wing_l: (
+            offset: (-1.0, 2.5, -18.0),
+            lateral: ("npc.bat.male.wing_r"),
+        ),
+        wing_r: (
+            offset: (-1.0, 2.5, -18.0),
+            lateral: ("npc.bat.male.wing_r"),
+        ),
+        foot_l: (
+            offset: (-2.0, -2.0, -7.0),
+            lateral: ("npc.bat.male.leg_r"),
+        ),
+        foot_r: (
+            offset: (-2.0, -2.0, -7.0),
+            lateral: ("npc.bat.male.leg_r"),
+        )
+    ),
+    (Bat, Female): (
+        wing_l: (
+            offset: (-1.0, 2.5, -18.0),
+            lateral: ("npc.bat.male.wing_r"),
+        ),
+        wing_r: (
+            offset: (-1.0, 2.5, -18.0),
+            lateral: ("npc.bat.male.wing_r"),
+        ),
+        foot_l: (
+            offset: (-2.0, -2.0, -7.0),
+            lateral: ("npc.bat.male.leg_r"),
+        ),
+        foot_r: (
+            offset: (-2.0, -2.0, -7.0),
+            lateral: ("npc.bat.male.leg_r"),
+        )
+    ),
 })

common/src/comp/body.rs

@@ -280,6 +280,7 @@ impl Body {
                 bird_medium::Species::Parrot => 2.0,
                 bird_medium::Species::Penguin => 8.0,
                 bird_medium::Species::Peacock => 5.0,
+                bird_medium::Species::Bat => 2.0,
             },
             Body::BirdLarge(_) => 100.0,
 
@@ -702,6 +703,7 @@ impl Body {
                 bird_medium::Species::Eagle => 45,
                 bird_medium::Species::Owl => 45,
                 bird_medium::Species::Duck => 10,
+                bird_medium::Species::Bat => 20,
                 _ => 15,
             },
             Body::FishMedium(_) => 15,

common/src/comp/body/bird_medium.rs

@@ -45,6 +45,7 @@ make_case_elim!(
         Owl = 5,
         Parrot = 6,
         Penguin = 7,
+        Bat = 8,
     }
 );
 
@@ -61,6 +62,7 @@ pub struct AllSpecies<SpeciesMeta> {
     pub owl: SpeciesMeta,
     pub parrot: SpeciesMeta,
     pub penguin: SpeciesMeta,
+    pub bat: SpeciesMeta,
 }
 
 impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
@@ -77,11 +79,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta>
             Species::Owl => &self.owl,
             Species::Parrot => &self.parrot,
             Species::Penguin => &self.penguin,
+            Species::Bat => &self.bat,
         }
     }
 }
 
-pub const ALL_SPECIES: [Species; 8] = [
+pub const ALL_SPECIES: [Species; 9] = [
     Species::Duck,
     Species::Chicken,
     Species::Goose,
@@ -90,6 +93,7 @@ pub const ALL_SPECIES: [Species; 8] = [
     Species::Owl,
     Species::Parrot,
     Species::Penguin,
+    Species::Bat,
 ];
 
 impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {

voxygen/anim/src/bird_medium/mod.rs

@@ -114,6 +114,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Owl, Female) => (2.5, 7.0),
                 (Parrot, _) => (0.5, 4.5),
                 (Penguin, _) => (1.5, 6.0),
+                (Bat, _) => (2.5, 5.0),
             },
             chest: match (body.species, body.body_type) {
                 (Duck, _) => (0.0, 6.0),
@@ -126,6 +127,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Owl, Female) => (0.0, 4.5),
                 (Parrot, _) => (0.0, 5.0),
                 (Penguin, _) => (0.0, 8.0),
+                (Bat, _) => (0.0, 8.0),
             },
             tail: match (body.species, body.body_type) {
                 (Duck, _) => (-5.0, 1.0),
@@ -138,6 +140,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Owl, Female) => (-6.0, -2.5),
                 (Parrot, _) => (-8.0, -2.0),
                 (Penguin, _) => (-3.0, -4.0),
+                (Bat, _) => (-8.0, -4.0),
             },
             wing: match (body.species, body.body_type) {
                 (Duck, _) => (3.5, -0.5, 2.0),
@@ -150,6 +153,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Owl, Female) => (3.5, -6.0, 3.5),
                 (Parrot, _) => (2.0, -4.5, 3.0),
                 (Penguin, _) => (4.0, 0.5, 1.0),
+                (Bat, _) => (3.0, -8.0, 4.0),
             },
             foot: match (body.species, body.body_type) {
                 (Duck, _) => (2.5, -2.0, 4.0),
@@ -162,6 +166,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Owl, Female) => (1.5, -3.0, 6.5),
                 (Parrot, _) => (1.5, -3.0, 3.0),
                 (Penguin, _) => (2.5, -2.0, 6.0),
+                (Bat, _) => (2.0, -2.0, 8.0),
             },
             feed: match (body.species, body.body_type) {
                 (Chicken, _) => 1.2,

world/src/block/mod.rs

@@ -273,7 +273,7 @@ pub fn block_from_structure(
                         1 | 2 => (Rgb::new(218.0, 53.0, 3.0), Rgb::new(226.0, 62.0, 5.0)),
                         _ => (Rgb::new(230.0, 120.0, 20.0), Rgb::new(242.0, 130.0, 25.0)),
                     };
-                    
+
                     Block::new(
                         BlockKind::Leaves,
                         Rgb::<f32>::lerp(c0, c1, lerp).map(|e| e as u8),