From 86b2272176fedf5bcefe71ee7b795765e5b402db Mon Sep 17 00:00:00 2001 From: Snowram Date: Fri, 3 Jul 2020 01:47:45 +0200 Subject: [PATCH] Salamander model fixes --- assets/voxygen/voxel/npc/salamander/female/head_lower.vox | 4 ++-- assets/voxygen/voxel/npc/salamander/female/jaw.vox | 4 ++-- assets/voxygen/voxel/npc/salamander/male/head_lower.vox | 4 ++-- assets/voxygen/voxel/npc/salamander/male/jaw.vox | 4 ++-- assets/voxygen/voxel/quadruped_low_central_manifest.ron | 8 ++++---- voxygen/src/anim/src/quadruped_low/mod.rs | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/assets/voxygen/voxel/npc/salamander/female/head_lower.vox b/assets/voxygen/voxel/npc/salamander/female/head_lower.vox index 5f00648283..4f9efd4ead 100644 --- a/assets/voxygen/voxel/npc/salamander/female/head_lower.vox +++ b/assets/voxygen/voxel/npc/salamander/female/head_lower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b4329562520638b1e8c6d14829b97b81698ed04c0d02831d861530a61f89c55 -size 1700 +oid sha256:56fadbc373110ea8059853068d9402ab4e18e68dcc076ee7ac7b46535e6d07da +size 1616 diff --git a/assets/voxygen/voxel/npc/salamander/female/jaw.vox b/assets/voxygen/voxel/npc/salamander/female/jaw.vox index 1ee152e421..e951cafd9f 100644 --- a/assets/voxygen/voxel/npc/salamander/female/jaw.vox +++ b/assets/voxygen/voxel/npc/salamander/female/jaw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:756171758d49a5463830fdb23a255534f546048295a4ca7dd08ee6b20a9aeb8e -size 1612 +oid sha256:e30afa5141cd439b03d9d5f7f402cf896e8930f44206d7db9024557fb4729732 +size 2092 diff --git a/assets/voxygen/voxel/npc/salamander/male/head_lower.vox b/assets/voxygen/voxel/npc/salamander/male/head_lower.vox index 5f00648283..4f9efd4ead 100644 --- a/assets/voxygen/voxel/npc/salamander/male/head_lower.vox +++ b/assets/voxygen/voxel/npc/salamander/male/head_lower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b4329562520638b1e8c6d14829b97b81698ed04c0d02831d861530a61f89c55 -size 1700 +oid sha256:56fadbc373110ea8059853068d9402ab4e18e68dcc076ee7ac7b46535e6d07da +size 1616 diff --git a/assets/voxygen/voxel/npc/salamander/male/jaw.vox b/assets/voxygen/voxel/npc/salamander/male/jaw.vox index 1ee152e421..e951cafd9f 100644 --- a/assets/voxygen/voxel/npc/salamander/male/jaw.vox +++ b/assets/voxygen/voxel/npc/salamander/male/jaw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:756171758d49a5463830fdb23a255534f546048295a4ca7dd08ee6b20a9aeb8e -size 1612 +oid sha256:e30afa5141cd439b03d9d5f7f402cf896e8930f44206d7db9024557fb4729732 +size 2092 diff --git a/assets/voxygen/voxel/quadruped_low_central_manifest.ron b/assets/voxygen/voxel/quadruped_low_central_manifest.ron index 1799bc1456..ca025afedb 100644 --- a/assets/voxygen/voxel/quadruped_low_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_low_central_manifest.ron @@ -109,11 +109,11 @@ central: ("npc.salamander.male.head_upper"), ), lower: ( - offset: (-6.5, -3.5, -2.0), + offset: (-4.5, -1.5, -3.0), central: ("npc.salamander.male.head_lower"), ), jaw: ( - offset: (-5.5, -4.0, -2.0), + offset: (-6.5, -6.0, -3.0), central: ("npc.salamander.male.jaw"), ), chest: ( @@ -135,11 +135,11 @@ central: ("npc.salamander.female.head_upper"), ), lower: ( - offset: (-6.5, -3.5, -2.0), + offset: (-4.5, -1.5, -3.0), central: ("npc.salamander.female.head_lower"), ), jaw: ( - offset: (-5.5, -4.0, -2.0), + offset: (-6.5, -6.0, -3.0), central: ("npc.salamander.female.jaw"), ), chest: ( diff --git a/voxygen/src/anim/src/quadruped_low/mod.rs b/voxygen/src/anim/src/quadruped_low/mod.rs index dde2eb5903..9920f05c18 100644 --- a/voxygen/src/anim/src/quadruped_low/mod.rs +++ b/voxygen/src/anim/src/quadruped_low/mod.rs @@ -131,7 +131,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { head_upper: match (body.species, body.body_type) { (Crocodile, _) => (10.0, 2.0), (Alligator, _) => (0.5, 3.25), - (Salamander, _) => (3.0, 1.0), + (Salamander, _) => (6.5, 2.0), (Monitor, _) => (3.5, 2.0), (Asp, _) => (6.0, 5.5), (Tortoise, _) => (5.0, 1.0), @@ -141,7 +141,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { head_lower: match (body.species, body.body_type) { (Crocodile, _) => (8.0, 0.0), (Alligator, _) => (9.0, 0.25), - (Salamander, _) => (10.0, 2.0), + (Salamander, _) => (9.0, 0.0), (Monitor, _) => (10.0, 3.0), (Asp, _) => (9.0, 2.5), (Tortoise, _) => (12.0, -3.5), @@ -151,7 +151,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { jaw: match (body.species, body.body_type) { (Crocodile, _) => (0.0, -3.0), (Alligator, _) => (8.5, -2.0), - (Salamander, _) => (2.0, -3.0), + (Salamander, _) => (0.0, -2.0), (Monitor, _) => (0.0, -1.0), (Asp, _) => (1.0, -2.0), (Tortoise, _) => (0.5, -2.0),