From df70381a7c5c886cc54973edc2c486d308152ee7 Mon Sep 17 00:00:00 2001
From: flo <sunflowerstarfishmail@gmail.com>
Date: Sat, 12 Nov 2022 10:18:10 +0000
Subject: [PATCH] tweak bat wing animation

---
 assets/voxygen/voxel/bird_medium_lateral_manifest.ron  | 8 ++++----
 assets/world/wildlife/spawn/desert/hot.ron             | 2 +-
 assets/world/wildlife/spawn/jungle/rainforest_area.ron | 2 +-
 assets/world/wildlife/spawn/temperate/rainforest.ron   | 2 +-
 voxygen/anim/src/bird_medium/mod.rs                    | 2 +-
 world/src/layer/cave.rs                                | 6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/assets/voxygen/voxel/bird_medium_lateral_manifest.ron b/assets/voxygen/voxel/bird_medium_lateral_manifest.ron
index 364e8c440b..ea15b4b275 100644
--- a/assets/voxygen/voxel/bird_medium_lateral_manifest.ron
+++ b/assets/voxygen/voxel/bird_medium_lateral_manifest.ron
@@ -289,11 +289,11 @@
     ),
     (Bat, Male): (
         wing_l: (
-            offset: (-13.0, 2.5, -3.5),
+            offset: (-15.0, 2.5, -2.5),
             lateral: ("npc.bat.male.wing_r"),
         ),
         wing_r: (
-            offset: (-1.0, 2.5, -3.5),
+            offset: (1.0, 2.5, -2.5),
             lateral: ("npc.bat.male.wing_r"),
         ),
         foot_l: (
@@ -307,11 +307,11 @@
     ),
     (Bat, Female): (
         wing_l: (
-            offset: (-13.0, 2.5, -3.5),
+            offset: (-15.0, 2.5, -2.5),
             lateral: ("npc.bat.male.wing_r"),
         ),
         wing_r: (
-            offset: (-1.0, 2.5, -3.5),
+            offset: (1.0, 2.5, -2.5),
             lateral: ("npc.bat.male.wing_r"),
         ),
         foot_l: (
diff --git a/assets/world/wildlife/spawn/desert/hot.ron b/assets/world/wildlife/spawn/desert/hot.ron
index ecdea277ce..410f17d700 100644
--- a/assets/world/wildlife/spawn/desert/hot.ron
+++ b/assets/world/wildlife/spawn/desert/hot.ron
@@ -20,7 +20,7 @@ SpawnEntry (
                 (1, (1, 1, "common.entity.wild.peaceful.holladon")),
                 (1, (1, 1, "common.entity.wild.peaceful.porcupine")),
                 (1, (1, 1, "common.entity.wild.peaceful.pangolin")),
-                (1, (2, 4, "common.entity.wild.aggressive.bat")),
+                (1, (1, 3, "common.entity.wild.aggressive.bat")),
             ],
             spawn_mode: Land,
             day_period: [Night],
diff --git a/assets/world/wildlife/spawn/jungle/rainforest_area.ron b/assets/world/wildlife/spawn/jungle/rainforest_area.ron
index d4da9f0c2c..68790bb809 100644
--- a/assets/world/wildlife/spawn/jungle/rainforest_area.ron
+++ b/assets/world/wildlife/spawn/jungle/rainforest_area.ron
@@ -22,7 +22,7 @@ SpawnEntry (
             groups: [
                 (5, (1, 1, "common.entity.wild.peaceful.quokka")),
                 (1, (1, 1, "common.entity.wild.peaceful.tortoise")),
-                (5, (2, 4, "common.entity.wild.aggressive.bat")),
+                (2, (1, 3, "common.entity.wild.aggressive.bat")),
             ],
             spawn_mode: Land,
             day_period: [Night],
diff --git a/assets/world/wildlife/spawn/temperate/rainforest.ron b/assets/world/wildlife/spawn/temperate/rainforest.ron
index 0ba2ae64c2..a2b02e709d 100644
--- a/assets/world/wildlife/spawn/temperate/rainforest.ron
+++ b/assets/world/wildlife/spawn/temperate/rainforest.ron
@@ -45,7 +45,7 @@ SpawnEntry (
                 // Pack
                 (5, (1, 3, "common.entity.wild.peaceful.rat")),
                 (5, (1, 3, "common.entity.wild.peaceful.squirrel")),
-                (5, (2, 4, "common.entity.wild.aggressive.bat")),
+                (3, (1, 3, "common.entity.wild.aggressive.bat")),
             ],
             spawn_mode: Land,
             day_period: [Night],
diff --git a/voxygen/anim/src/bird_medium/mod.rs b/voxygen/anim/src/bird_medium/mod.rs
index e5f9694efa..ae40a59de2 100644
--- a/voxygen/anim/src/bird_medium/mod.rs
+++ b/voxygen/anim/src/bird_medium/mod.rs
@@ -153,7 +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, -1.0),
+                (Bat, _) => (1.0, -8.0, -2.0),
             },
             foot: match (body.species, body.body_type) {
                 (Duck, _) => (2.5, -2.0, 4.0),
diff --git a/world/src/layer/cave.rs b/world/src/layer/cave.rs
index 932c1b22e9..4126d47057 100644
--- a/world/src/layer/cave.rs
+++ b/world/src/layer/cave.rs
@@ -830,7 +830,7 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
             ),
             (
                 Some("common.entity.wild.aggressive.bat"),
-                (biome.mushroom + 0.1) * 0.5,
+                (biome.mushroom + 0.1) * 0.25,
             ),
             // Leafy biome
             (
@@ -875,7 +875,7 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
             ),
             (
                 Some("common.entity.wild.aggressive.bat"),
-                (biome.leafy + 0.1) * 0.5,
+                (biome.leafy + 0.1) * 0.25,
             ),
             // Dusty biome
             (
@@ -900,7 +900,7 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
             ),
             (
                 Some("common.entity.wild.aggressive.bat"),
-                (biome.dusty + 0.1) * 0.5,
+                (biome.dusty + 0.1) * 0.25,
             ),
             // Icy biome
             (