diff --git a/assets/voxygen/voxel/npc/monitor/male/jaw.vox b/assets/voxygen/voxel/npc/monitor/male/jaw.vox index 3188b076db..fb51485424 100644 Binary files a/assets/voxygen/voxel/npc/monitor/male/jaw.vox and b/assets/voxygen/voxel/npc/monitor/male/jaw.vox differ diff --git a/assets/voxygen/voxel/npc/mouflon/male/foot_bl.vox b/assets/voxygen/voxel/npc/mouflon/male/foot_bl.vox index d587cc76bf..210c891e64 100644 Binary files a/assets/voxygen/voxel/npc/mouflon/male/foot_bl.vox and b/assets/voxygen/voxel/npc/mouflon/male/foot_bl.vox differ diff --git a/assets/voxygen/voxel/npc/mouflon/male/foot_br.vox b/assets/voxygen/voxel/npc/mouflon/male/foot_br.vox index d587cc76bf..d45bdddda3 100644 Binary files a/assets/voxygen/voxel/npc/mouflon/male/foot_br.vox and b/assets/voxygen/voxel/npc/mouflon/male/foot_br.vox differ diff --git a/assets/voxygen/voxel/npc/mouflon/male/head_upper.vox b/assets/voxygen/voxel/npc/mouflon/male/head_upper.vox index ab4d003b34..5387f5decb 100644 Binary files a/assets/voxygen/voxel/npc/mouflon/male/head_upper.vox and b/assets/voxygen/voxel/npc/mouflon/male/head_upper.vox differ diff --git a/assets/voxygen/voxel/npc/mouflon/male/jaw.vox b/assets/voxygen/voxel/npc/mouflon/male/jaw.vox index 396c2b9949..3b31ca5613 100644 Binary files a/assets/voxygen/voxel/npc/mouflon/male/jaw.vox and b/assets/voxygen/voxel/npc/mouflon/male/jaw.vox differ diff --git a/assets/voxygen/voxel/npc/mouflon/male/leg_bl.vox b/assets/voxygen/voxel/npc/mouflon/male/leg_bl.vox index c966f94287..f20b21ea8f 100644 Binary files a/assets/voxygen/voxel/npc/mouflon/male/leg_bl.vox and b/assets/voxygen/voxel/npc/mouflon/male/leg_bl.vox differ diff --git a/assets/voxygen/voxel/npc/mouflon/male/leg_br.vox b/assets/voxygen/voxel/npc/mouflon/male/leg_br.vox index e90a7268b4..510abe3436 100644 Binary files a/assets/voxygen/voxel/npc/mouflon/male/leg_br.vox and b/assets/voxygen/voxel/npc/mouflon/male/leg_br.vox differ diff --git a/assets/voxygen/voxel/npc/mouflon/male/leg_fl.vox b/assets/voxygen/voxel/npc/mouflon/male/leg_fl.vox index 70b227efce..3540b6f613 100644 Binary files a/assets/voxygen/voxel/npc/mouflon/male/leg_fl.vox and b/assets/voxygen/voxel/npc/mouflon/male/leg_fl.vox differ diff --git a/assets/voxygen/voxel/npc/mouflon/male/leg_fr.vox b/assets/voxygen/voxel/npc/mouflon/male/leg_fr.vox index 6643bd1745..e4998e2e46 100644 Binary files a/assets/voxygen/voxel/npc/mouflon/male/leg_fr.vox and b/assets/voxygen/voxel/npc/mouflon/male/leg_fr.vox differ diff --git a/assets/voxygen/voxel/npc/saber/male/Saber-10.vox b/assets/voxygen/voxel/npc/saber/male/Saber-10.vox deleted file mode 100644 index f8f2e5a1a4..0000000000 Binary files a/assets/voxygen/voxel/npc/saber/male/Saber-10.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/saber/male/Saber-7.vox b/assets/voxygen/voxel/npc/saber/male/Saber-7.vox deleted file mode 100644 index a03f070137..0000000000 Binary files a/assets/voxygen/voxel/npc/saber/male/Saber-7.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/saber/male/Saber-8.vox b/assets/voxygen/voxel/npc/saber/male/Saber-8.vox deleted file mode 100644 index ab7db834c1..0000000000 Binary files a/assets/voxygen/voxel/npc/saber/male/Saber-8.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/saber/male/Saber-9.vox b/assets/voxygen/voxel/npc/saber/male/Saber-9.vox deleted file mode 100644 index f8f2e5a1a4..0000000000 Binary files a/assets/voxygen/voxel/npc/saber/male/Saber-9.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/saber/male/head_upper.vox b/assets/voxygen/voxel/npc/saber/male/head_upper.vox index 963af2426a..8a7ccbbe70 100644 Binary files a/assets/voxygen/voxel/npc/saber/male/head_upper.vox and b/assets/voxygen/voxel/npc/saber/male/head_upper.vox differ diff --git a/assets/voxygen/voxel/npc/saber/male/jaw.vox b/assets/voxygen/voxel/npc/saber/male/jaw.vox index 496e99bbfa..69de037645 100644 Binary files a/assets/voxygen/voxel/npc/saber/male/jaw.vox and b/assets/voxygen/voxel/npc/saber/male/jaw.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/foot_br.vox b/assets/voxygen/voxel/npc/tiger/male/foot_br.vox index e2626c1040..b160dbb328 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/foot_br.vox and b/assets/voxygen/voxel/npc/tiger/male/foot_br.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/foot_fr.vox b/assets/voxygen/voxel/npc/tiger/male/foot_fr.vox index bc8d9e45bd..f5d54a1eef 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/foot_fr.vox and b/assets/voxygen/voxel/npc/tiger/male/foot_fr.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/head_upper.vox b/assets/voxygen/voxel/npc/tiger/male/head_upper.vox index f9f24b8458..fee927047c 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/head_upper.vox and b/assets/voxygen/voxel/npc/tiger/male/head_upper.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/jaw.vox b/assets/voxygen/voxel/npc/tiger/male/jaw.vox index 7caa4357b0..3e148fabc9 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/jaw.vox and b/assets/voxygen/voxel/npc/tiger/male/jaw.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/leg_br.vox b/assets/voxygen/voxel/npc/tiger/male/leg_br.vox index 94e6867f16..5ce0a2aedc 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/leg_br.vox and b/assets/voxygen/voxel/npc/tiger/male/leg_br.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/leg_fr.vox b/assets/voxygen/voxel/npc/tiger/male/leg_fr.vox index b3fdd48e3c..8dd4f55da6 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/leg_fr.vox and b/assets/voxygen/voxel/npc/tiger/male/leg_fr.vox differ diff --git a/assets/voxygen/voxel/quadruped_low_central_manifest.ron b/assets/voxygen/voxel/quadruped_low_central_manifest.ron index b088cbda03..819d184239 100644 --- a/assets/voxygen/voxel/quadruped_low_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_low_central_manifest.ron @@ -308,7 +308,7 @@ central: ("armor.empty"), ), tail_front: ( - offset: (-1.5, -7.0, -1.5), + offset: (-1.5, -3.5, -1.5), central: ("npc.tortoise.male.tail_front"), ), ), diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron index 8184cef7c4..ceb6ab940c 100644 --- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron @@ -553,11 +553,11 @@ lateral: ("npc.mouflon.male.leg_fr"), ), leg_bl: ( - offset: (-2.0, -2.5, -3.5), + offset: (-2.0, -1.0, -2.5), lateral: ("npc.mouflon.male.leg_bl"), ), leg_br: ( - offset: (-2.0, -2.5, -3.5), + offset: (-2.0, -1.0, -2.5), lateral: ("npc.mouflon.male.leg_br"), ), foot_fl: ( @@ -569,11 +569,11 @@ lateral: ("npc.mouflon.male.foot_fr"), ), foot_bl: ( - offset: (-1.0, -0.5, -6.0), + offset: (-1.0, -2.0, -6.0), lateral: ("npc.mouflon.male.foot_bl"), ), foot_br: ( - offset: (-1.0, -0.5, -6.0), + offset: (-1.0, -2.0, -6.0), lateral: ("npc.mouflon.male.foot_br"), ), ), @@ -587,11 +587,11 @@ lateral: ("npc.mouflon.male.leg_fr"), ), leg_bl: ( - offset: (-2.0, -2.5, -3.5), + offset: (-2.0, -1.0, -2.5), lateral: ("npc.mouflon.male.leg_bl"), ), leg_br: ( - offset: (-2.0, -2.5, -3.5), + offset: (-2.0, -1.0, -2.5), lateral: ("npc.mouflon.male.leg_br"), ), foot_fl: ( @@ -603,11 +603,11 @@ lateral: ("npc.mouflon.male.foot_fr"), ), foot_bl: ( - offset: (-1.0, -0.5, -6.0), + offset: (-1.0, -2.0, -6.0), lateral: ("npc.mouflon.male.foot_bl"), ), foot_br: ( - offset: (-1.0, -0.5, -6.0), + offset: (-1.0, -2.0, -6.0), lateral: ("npc.mouflon.male.foot_br"), ), ), diff --git a/voxygen/src/anim/src/quadruped_low/mod.rs b/voxygen/src/anim/src/quadruped_low/mod.rs index c450fad5eb..2de141c40e 100644 --- a/voxygen/src/anim/src/quadruped_low/mod.rs +++ b/voxygen/src/anim/src/quadruped_low/mod.rs @@ -209,7 +209,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Salamander, _) => (4.0, -6.0, -2.0), (Monitor, _) => (2.5, -6.5, 0.0), (Asp, _) => (2.5, -5.5, -1.0), - (Tortoise, _) => (6.0, -11.5, -3.0), + (Tortoise, _) => (5.5, -11.5, -3.0), (Rocksnapper, _) => (8.0, -12.0, -9.5), (Pangolin, _) => (6.0, -4.0, -1.0), }, diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs index 7b861605d8..d004f580b6 100644 --- a/voxygen/src/anim/src/quadruped_medium/mod.rs +++ b/voxygen/src/anim/src/quadruped_medium/mod.rs @@ -259,7 +259,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Tiger, _) => (6.0, -5.0, -3.0), (Wolf, _) => (4.5, -6.5, -1.0), (Frostfang, _) => (5.5, -5.5, -2.0), - (Mouflon, _) => (5.0, -5.0, -5.0), + (Mouflon, _) => (4.0, -5.0, -5.0), }, leg_b: match (body.species, body.body_type) { (Grolgar, _) => (6.0, -6.5, -5.5), @@ -270,7 +270,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Tiger, _) => (6.0, -7.5, -3.0), (Wolf, _) => (5.0, -6.5, -2.5), (Frostfang, _) => (3.5, -4.5, -2.0), - (Mouflon, _) => (3.5, -6.0, -4.5), + (Mouflon, _) => (3.5, -8.0, -4.5), }, feet_f: match (body.species, body.body_type) { (Grolgar, _) => (0.0, -9.0, -7.0), @@ -292,7 +292,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Tiger, _) => (1.0, 0.5, -4.0), (Wolf, _) => (0.0, -1.0, -1.5), (Frostfang, _) => (0.0, -1.5, -3.5), - (Mouflon, _) => (-1.0, -1.5, -2.5), + (Mouflon, _) => (-1.0, 0.0, -2.5), }, scaler: match (body.species, body.body_type) { (Grolgar, _) => (1.3), diff --git a/voxygen/src/anim/src/quadruped_medium/run.rs b/voxygen/src/anim/src/quadruped_medium/run.rs index 1312b4a088..82c3e42b1d 100644 --- a/voxygen/src/anim/src/quadruped_medium/run.rs +++ b/voxygen/src/anim/src/quadruped_medium/run.rs @@ -265,7 +265,7 @@ impl Animation for RunAnimation { skeleton_attr.leg_b.1 + footvert * -1.7, skeleton_attr.leg_b.2 + 1.0 + footvertt * -1.5, ); - next.leg_bl.ori = Quaternion::rotation_x(footvertt * -0.4 - 0.2) + next.leg_bl.ori = Quaternion::rotation_x(footvertt * -0.45 - 0.2) * Quaternion::rotation_y(tilt * 1.5) * Quaternion::rotation_z(tilt * -1.5); next.leg_bl.scale = Vec3::one() * 1.02; @@ -275,7 +275,7 @@ impl Animation for RunAnimation { skeleton_attr.leg_b.1 + footvertf * -1.7, skeleton_attr.leg_b.2 + 1.0 + footverttf * -1.5, ); - next.leg_br.ori = Quaternion::rotation_x(footverttf * -0.4 - 0.2) + next.leg_br.ori = Quaternion::rotation_x(footverttf * -0.45 - 0.2) * Quaternion::rotation_y(tilt * 1.5) * Quaternion::rotation_z(tilt * -1.5); next.leg_br.scale = Vec3::one() * 1.02; @@ -303,7 +303,7 @@ impl Animation for RunAnimation { next.foot_bl.offset = Vec3::new( -skeleton_attr.feet_b.0, skeleton_attr.feet_b.1, - skeleton_attr.feet_b.2 + ((footvert * 2.4).max(0.0)), + skeleton_attr.feet_b.2 + ((footvert * 1.3).max(0.0)), ); next.foot_bl.ori = Quaternion::rotation_x(footvertt * -0.9 - 0.2) * Quaternion::rotation_y(tilt * -1.0); @@ -312,7 +312,7 @@ impl Animation for RunAnimation { next.foot_br.offset = Vec3::new( skeleton_attr.feet_b.0, skeleton_attr.feet_b.1, - skeleton_attr.feet_b.2 + ((footvertf * 2.4).max(-0.0)), + skeleton_attr.feet_b.2 + ((footvertf * 1.3).max(-0.0)), ); next.foot_br.ori = Quaternion::rotation_x(footverttf * -0.9 - 0.2) * Quaternion::rotation_y(tilt * -1.0);