diff --git a/assets/voxygen/voxel/npc/parrot/female/leg_r.vox b/assets/voxygen/voxel/npc/parrot/female/leg_r.vox index 070b49ca81..535199675f 100644 --- a/assets/voxygen/voxel/npc/parrot/female/leg_r.vox +++ b/assets/voxygen/voxel/npc/parrot/female/leg_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07441e80d0c2294996353f619865d9731539f5d823180463af5901d7f9855c5a +oid sha256:720e106dbb73e8eaa7689a31b32d36e5ab8a82cd17c6534f2b184708fee65e81 size 1212 diff --git a/assets/voxygen/voxel/npc/parrot/male/leg_r.vox b/assets/voxygen/voxel/npc/parrot/male/leg_r.vox index 4af09149e8..4650bc6494 100644 --- a/assets/voxygen/voxel/npc/parrot/male/leg_r.vox +++ b/assets/voxygen/voxel/npc/parrot/male/leg_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b20d9c974ee3ddbec72235fad636c6276ee6e5add4af318a4009d032baa9823 +oid sha256:e377af297c9782c93a9eb675b680829f54740a82da07e47be6d1260582b8c84c size 1208 diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 5da518fbc0..edd12a0d86 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -536,22 +536,22 @@ impl Body { arthropod::Species::Sandcrawler => Vec3::new(3.2, 4.0, 1.4), }, Body::BirdMedium(body) => match body.species { - bird_medium::Species::SnowyOwl => Vec3::new(1.8, 1.8, 1.8), - bird_medium::Species::HornedOwl => Vec3::new(1.8, 1.8, 1.8), - bird_medium::Species::Duck => Vec3::new(1.0, 1.5, 1.5), - bird_medium::Species::Cockatiel => Vec3::new(1.2, 1.0, 1.6), - bird_medium::Species::Chicken => Vec3::new(1.2, 1.5, 2.0), - bird_medium::Species::Bat => Vec3::new(2.0, 2.0, 1.5), - bird_medium::Species::Penguin => Vec3::new(1.5, 1.1, 2.5), - bird_medium::Species::Goose => Vec3::new(1.8, 1.8, 2.3), - bird_medium::Species::Peacock => Vec3::new(2.2, 2.5, 2.8), - bird_medium::Species::Eagle => Vec3::new(3.3, 2.5, 2.0), - bird_medium::Species::Parrot => Vec3::new(1.5, 1.5, 1.6), - bird_medium::Species::Crow => Vec3::new(2.0, 2.5, 1.5), - bird_medium::Species::Dodo => Vec3::new(2.5, 2.0, 2.0), - bird_medium::Species::Parakeet => Vec3::new(1.2, 1.0, 1.6), - bird_medium::Species::Puffin => Vec3::new(2.0, 2.0, 2.0), - bird_medium::Species::Toucan => Vec3::new(2.5, 2.0, 1.5), + bird_medium::Species::SnowyOwl => Vec3::new(1.2, 1.2, 0.9), + bird_medium::Species::HornedOwl => Vec3::new(1.2, 1.2, 0.9), + bird_medium::Species::Duck => Vec3::new(0.8, 1.3, 0.8), + bird_medium::Species::Cockatiel => Vec3::new(0.8, 1.0, 0.7), + bird_medium::Species::Chicken => Vec3::new(1.2, 1.5, 0.9), + bird_medium::Species::Bat => Vec3::new(2.0, 1.8, 1.3), + bird_medium::Species::Penguin => Vec3::new(1.0, 1.0, 1.2), + bird_medium::Species::Goose => Vec3::new(1.5, 1.5, 1.1), + bird_medium::Species::Peacock => Vec3::new(1.6, 1.8, 1.4), + bird_medium::Species::Eagle => Vec3::new(1.5, 2.2, 1.0), + bird_medium::Species::Parrot => Vec3::new(1.2, 1.5, 1.1), + bird_medium::Species::Crow => Vec3::new(1.0, 1.2, 0.8), + bird_medium::Species::Dodo => Vec3::new(1.2, 1.8, 1.1), + bird_medium::Species::Parakeet => Vec3::new(0.8, 0.9, 0.7), + bird_medium::Species::Puffin => Vec3::new(1.0, 1.0, 1.0), + bird_medium::Species::Toucan => Vec3::new(2.1, 1.1, 1.2), }, } } diff --git a/voxygen/anim/src/bird_medium/fly.rs b/voxygen/anim/src/bird_medium/fly.rs index 42473525ab..c6535e1dc3 100644 --- a/voxygen/anim/src/bird_medium/fly.rs +++ b/voxygen/anim/src/bird_medium/fly.rs @@ -59,8 +59,8 @@ impl Animation for FlyAnimation { } * 1.3; next.head.scale = Vec3::one() * 0.99; - next.leg_l.scale = Vec3::one(); - next.leg_r.scale = Vec3::one(); + next.leg_l.scale = Vec3::one() * s_a.scaler * 0.99; + next.leg_r.scale = Vec3::one() * s_a.scaler * 0.99; next.chest.scale = Vec3::one() * s_a.scaler * 0.99; next.tail.scale = Vec3::one() * 1.01; @@ -129,10 +129,10 @@ impl Animation for FlyAnimation { next.tail.orientation = Quaternion::rotation_x(0.04 - slow * 0.04) * Quaternion::rotation_z(tilt * 1.0); - next.leg_l.position = Vec3::new(-s_a.leg.0, s_a.leg.1, s_a.leg.2 + slow * 0.05); + next.leg_l.position = Vec3::new(-s_a.leg.0, s_a.leg.1, s_a.leg.2 + 1.0 + slow * 0.05); next.leg_l.orientation = Quaternion::rotation_x(-1.2 + slow * -0.05) * Quaternion::rotation_y(tilt * 1.6 + fast * 0.01); - next.leg_r.position = Vec3::new(s_a.leg.0, s_a.leg.1, s_a.leg.2 + slow * 0.05); + next.leg_r.position = Vec3::new(s_a.leg.0, s_a.leg.1, s_a.leg.2 + 1.0 + slow * 0.05); next.leg_r.orientation = Quaternion::rotation_x(-1.2 + slow * -0.05) * Quaternion::rotation_y(tilt * 1.6 + fast * 0.01); } diff --git a/voxygen/anim/src/bird_medium/idle.rs b/voxygen/anim/src/bird_medium/idle.rs index 01d75b6be1..6dfe4b88f2 100644 --- a/voxygen/anim/src/bird_medium/idle.rs +++ b/voxygen/anim/src/bird_medium/idle.rs @@ -37,8 +37,8 @@ impl Animation for IdleAnimation { let wave_slow_cos = (anim_time * 4.5).cos(); next.head.scale = Vec3::one() * 0.99; - next.leg_l.scale = Vec3::one(); - next.leg_r.scale = Vec3::one(); + next.leg_l.scale = Vec3::one() * s_a.scaler * 0.99; + next.leg_r.scale = Vec3::one() * s_a.scaler * 0.99; next.chest.scale = Vec3::one() * s_a.scaler * 0.99; next.tail.scale = Vec3::one() * 1.01; diff --git a/voxygen/anim/src/bird_medium/mod.rs b/voxygen/anim/src/bird_medium/mod.rs index 83ba9f5b13..fd8f6526af 100644 --- a/voxygen/anim/src/bird_medium/mod.rs +++ b/voxygen/anim/src/bird_medium/mod.rs @@ -142,18 +142,18 @@ impl<'a> From<&'a Body> for SkeletonAttr { (HornedOwl, _) => (0.0, 4.5), (Duck, _) => (0.0, 4.0), (Cockatiel, _) => (0.0, 4.0), - (Chicken, Male) => (0.0, 6.5), - (Chicken, Female) => (0.0, 6.5), - (Bat, _) => (0.0, 8.0), - (Penguin, _) => (0.0, 8.0), - (Goose, _) => (0.0, 7.0), - (Peacock, _) => (0.0, 9.5), + (Chicken, Male) => (0.0, 5.5), + (Chicken, Female) => (0.0, 5.5), + (Bat, _) => (0.0, 7.0), + (Penguin, _) => (0.0, 7.0), + (Goose, _) => (0.0, 6.5), + (Peacock, _) => (0.0, 7.5), (Eagle, _) => (0.0, 6.0), (Parrot, _) => (0.0, 5.0), (Crow, _) => (0.0, 4.0), (Dodo, _) => (0.0, 6.0), - (Parakeet, _) => (0.0, 4.0), - (Puffin, _) => (0.0, 7.0), + (Parakeet, _) => (0.0, 3.5), + (Puffin, _) => (0.0, 6.0), (Toucan, _) => (0.0, 5.0), }, head: match (body.species, body.body_type) { @@ -233,41 +233,41 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Toucan, _) => (5.0, 3.0, 0.5), }, leg: match (body.species, body.body_type) { - (SnowyOwl, _) => (1.5, -2.5, 7.0), - (HornedOwl, _) => (1.5, -2.5, 7.0), - (Duck, _) => (2.5, -2.0, 4.0), - (Cockatiel, _) => (1.5, -1.0, 4.0), - (Chicken, Male) => (2.0, 0.0, 6.0), - (Chicken, Female) => (2.0, 0.0, 6.0), - (Bat, _) => (5.0, -1.0, 8.0), - (Penguin, _) => (2.5, -2.0, 6.0), - (Goose, _) => (2.0, -3.5, 6.0), - (Peacock, _) => (1.0, -2.5, 9.5), - (Eagle, _) => (2.0, -4.0, 6.0), - (Parrot, _) => (1.5, -3.0, 3.0), - (Crow, _) => (2.0, -2.5, 3.0), - (Dodo, _) => (1.5, -3.0, 4.0), - (Parakeet, _) => (1.5, -2.0, 2.0), - (Puffin, _) => (2.0, -3.0, 3.5), - (Toucan, _) => (1.5, -3.0, 3.0), + (SnowyOwl, _) => (1.5, -2.5, 4.8), + (HornedOwl, _) => (1.5, -2.5, 4.8), + (Duck, _) => (1.5, 0.0, 3.0), + (Cockatiel, _) => (1.0, -1.0, 3.0), + (Chicken, Male) => (1.0, 0.0, 4.4), + (Chicken, Female) => (1.0, 0.0, 4.4), + (Bat, _) => (2.5, -1.0, 6.0), + (Penguin, _) => (1.5, -1.5, 4.5), + (Goose, _) => (2.0, -2.5, 4.4), + (Peacock, _) => (2.0, -2.0, 7.0), + (Eagle, _) => (1.5, -4.0, 4.4), + (Parrot, _) => (1.5, -1.0, 2.2), + (Crow, _) => (1.5, -2.5, 2.1), + (Dodo, _) => (1.5, -3.0, 3.0), + (Parakeet, _) => (1.0, -2.0, 1.3), + (Puffin, _) => (1.5, -2.2, 2.5), + (Toucan, _) => (1.5, -3.0, 2.3), }, scaler: match (body.species, body.body_type) { - (SnowyOwl, _) => 1.0, - (HornedOwl, _) => 1.0, - (Duck, _) => 1.0, - (Cockatiel, _) => 1.0, - (Chicken, _) => 1.0, - (Bat, _) => 1.0, - (Penguin, _) => 1.0, - (Goose, _) => 1.0, - (Peacock, _) => 1.0, - (Eagle, _) => 1.0, - (Parrot, _) => 1.0, - (Crow, _) => 1.0, - (Dodo, _) => 1.0, - (Parakeet, _) => 1.0, - (Puffin, _) => 1.0, - (Toucan, _) => 1.0, + (SnowyOwl, _) => 0.75, + (HornedOwl, _) => 0.75, + (Duck, _) => 0.75, + (Cockatiel, _) => 0.75, + (Chicken, _) => 0.75, + (Bat, _) => 0.75, + (Penguin, _) => 0.75, + (Goose, _) => 0.75, + (Peacock, _) => 0.75, + (Eagle, _) => 0.75, + (Parrot, _) => 0.75, + (Crow, _) => 0.75, + (Dodo, _) => 0.75, + (Parakeet, _) => 0.75, + (Puffin, _) => 0.75, + (Toucan, _) => 0.75, }, feed: match (body.species, body.body_type) { (SnowyOwl, _) => -0.65, diff --git a/voxygen/anim/src/bird_medium/run.rs b/voxygen/anim/src/bird_medium/run.rs index 159ec7fef8..1588514364 100644 --- a/voxygen/anim/src/bird_medium/run.rs +++ b/voxygen/anim/src/bird_medium/run.rs @@ -67,8 +67,8 @@ impl Animation for RunAnimation { let x_tilt = avg_vel.z.atan2(avg_vel.xy().magnitude()) * speednorm; next.head.scale = Vec3::one() * 0.99; - next.leg_l.scale = Vec3::one(); - next.leg_r.scale = Vec3::one(); + next.leg_l.scale = Vec3::one() * s_a.scaler * 0.99; + next.leg_r.scale = Vec3::one() * s_a.scaler * 0.99; next.chest.scale = Vec3::one() * s_a.scaler * 0.99; next.tail.scale = Vec3::one() * 1.01; @@ -106,11 +106,11 @@ impl Animation for RunAnimation { next.wing_out_r.orientation = Quaternion::rotation_y(0.2 + short * -0.05) * Quaternion::rotation_z(-0.2); - next.leg_l.position = Vec3::new(-s_a.leg.0, s_a.leg.1 + foot1b * -2.3, s_a.leg.2); + next.leg_l.position = Vec3::new(-s_a.leg.0, s_a.leg.1 + foot1b * -0.8, s_a.leg.2); next.leg_l.orientation = Quaternion::rotation_x(-0.2 * speednorm + foot1a * 0.15) * Quaternion::rotation_y(tilt * 0.5); - next.leg_r.position = Vec3::new(s_a.leg.0, s_a.leg.1 + foot2b * -2.3, s_a.leg.2); + next.leg_r.position = Vec3::new(s_a.leg.0, s_a.leg.1 + foot2b * -0.8, s_a.leg.2); next.leg_r.orientation = Quaternion::rotation_x(-0.2 * speednorm + foot2a * 0.15) * Quaternion::rotation_y(tilt * 0.5); next diff --git a/voxygen/anim/src/bird_medium/swim.rs b/voxygen/anim/src/bird_medium/swim.rs index 7e5d64db8f..f2f71a1f42 100644 --- a/voxygen/anim/src/bird_medium/swim.rs +++ b/voxygen/anim/src/bird_medium/swim.rs @@ -41,8 +41,8 @@ impl Animation for SwimAnimation { let wave_fast_cos = (anim_time * 6.0).cos(); next.head.scale = Vec3::one() * 0.99; - next.leg_l.scale = Vec3::one(); - next.leg_r.scale = Vec3::one(); + next.leg_l.scale = Vec3::one() * s_a.scaler * 0.99; + next.leg_r.scale = Vec3::one() * s_a.scaler * 0.99; next.chest.scale = Vec3::one() * s_a.scaler * 0.99; next.tail.scale = Vec3::one() * 1.01;