From 4f0faf4c5644ecbc88d57f05f2a0816fdd060aa1 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Mon, 21 Sep 2020 23:56:03 -0400 Subject: [PATCH] small corrections --- CHANGELOG.md | 3 +++ assets/voxygen/voxel/npc/gecko/male/foot_bl.vox | 2 +- assets/voxygen/voxel/npc/gecko/male/foot_br.vox | 2 +- assets/voxygen/voxel/npc/odonto/male/neck.vox | 4 ++-- assets/voxygen/voxel/theropod_central_manifest.ron | 8 ++++---- voxygen/src/anim/src/quadruped_small/mod.rs | 10 +++++----- voxygen/src/anim/src/theropod/mod.rs | 4 ++-- 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e9eb6f9a8..ac65bf0246 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fullscreen modes now show two options (exclusive and borderless) - Added banlist and `/ban`, `/unban`, and `/kick` commands for admins - A new dungeon boss (venture there and discover it yourself) +- Adaptive stride setup for more dynamic run behavior +- Theropod body +- Several new animals ### Changed diff --git a/assets/voxygen/voxel/npc/gecko/male/foot_bl.vox b/assets/voxygen/voxel/npc/gecko/male/foot_bl.vox index 7c33087036..52091c6ae9 100644 --- a/assets/voxygen/voxel/npc/gecko/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/gecko/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f3cba80c04f52cd2d80480ccf54fc8b337c9708f27829f507786c8dc38a5b85 +oid sha256:f74d8f8c4c1d72a25001d915886250bf2a3b09d62c77f100c175c2fcb2586390 size 1172 diff --git a/assets/voxygen/voxel/npc/gecko/male/foot_br.vox b/assets/voxygen/voxel/npc/gecko/male/foot_br.vox index a69038267d..273c32fae0 100644 --- a/assets/voxygen/voxel/npc/gecko/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/gecko/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:557b86d32a5c7be5430ca05b2361ab4b9019e1fd299df6f77e608ca19af30306 +oid sha256:29ef6ae688b07adbc87654fa0659947ca8d4833f4152b47eb2f4b8193467cecf size 1172 diff --git a/assets/voxygen/voxel/npc/odonto/male/neck.vox b/assets/voxygen/voxel/npc/odonto/male/neck.vox index 8d6aa069c1..b721f15bec 100644 --- a/assets/voxygen/voxel/npc/odonto/male/neck.vox +++ b/assets/voxygen/voxel/npc/odonto/male/neck.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac66309a7940e44e4dd9c47cf982fd2b10ac0dcfad2d20a8602d2ff3b6d3cbfe -size 5624 +oid sha256:002997074d14c75867d5444d25a607cd4d2e5efb6cfff54ce579209c6ff9e08a +size 2024 diff --git a/assets/voxygen/voxel/theropod_central_manifest.ron b/assets/voxygen/voxel/theropod_central_manifest.ron index 07f30ec257..7228b47401 100644 --- a/assets/voxygen/voxel/theropod_central_manifest.ron +++ b/assets/voxygen/voxel/theropod_central_manifest.ron @@ -5,7 +5,7 @@ central: ("npc.archaeos.male.head"), ), jaw: ( - offset: (-5.5, 0.0, -3.0), + offset: (-5.5, -2.0, -3.0), central: ("npc.archaeos.male.jaw"), ), neck: ( @@ -35,7 +35,7 @@ central: ("npc.archaeos.male.head"), ), jaw: ( - offset: (-5.5, 0.0, -3.0), + offset: (-5.5, -2.0, -3.0), central: ("npc.archaeos.male.jaw"), ), neck: ( @@ -69,7 +69,7 @@ central: ("npc.odonto.male.jaw"), ), neck: ( - offset: (-5.5, 0.0, -6.5), + offset: (-3.5, 0.0, -6.5), central: ("npc.odonto.male.neck"), ), chest_front: ( @@ -99,7 +99,7 @@ central: ("npc.odonto.male.jaw"), ), neck: ( - offset: (-5.5, 0.0, -6.5), + offset: (-3.5, 0.0, -6.5), central: ("npc.odonto.male.neck"), ), chest_front: ( diff --git a/voxygen/src/anim/src/quadruped_small/mod.rs b/voxygen/src/anim/src/quadruped_small/mod.rs index b0523a5756..2d7167db56 100644 --- a/voxygen/src/anim/src/quadruped_small/mod.rs +++ b/voxygen/src/anim/src/quadruped_small/mod.rs @@ -142,7 +142,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Frog, _) => (-2.0, 4.5), (Rat, _) => (6.0, 5.0), (Axolotl, _) => (3.0, 5.0), - (Gecko, _) => (7.5, 3.0), + (Gecko, _) => (7.5, 4.0), (Turtle, _) => (1.0, 6.0), (Squirrel, _) => (4.0, 5.0), (Fungome, _) => (4.0, 4.0), @@ -168,7 +168,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Frog, _) => (4.5, 6.5, 0.0), (Rat, _) => (5.0, 2.5, -1.0), (Axolotl, _) => (2.0, 2.0, -2.0), - (Gecko, _) => (2.0, 4.0, 0.0), + (Gecko, _) => (2.0, 4.0, -0.5), (Turtle, _) => (5.0, 4.0, -2.0), (Squirrel, _) => (3.5, 3.0, -1.0), (Fungome, _) => (3.0, 2.0, -1.0), @@ -194,7 +194,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Frog, _) => (5.0, -3.5, 0.0), (Rat, _) => (5.0, -2.0, 1.0), (Axolotl, _) => (2.0, -3.0, -2.0), - (Gecko, _) => (1.5, -1.0, 0.0), + (Gecko, _) => (1.5, -2.0, -0.5), (Turtle, _) => (5.5, -2.5, -2.0), (Squirrel, _) => (3.5, -3.0, 0.0), (Fungome, _) => (3.0, -3.5, -1.0), @@ -350,7 +350,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Frog, _) => (2.5), (Rat, _) => (1.0), (Axolotl, _) => (0.8), - (Gecko, _) => (1.0), + (Gecko, _) => (0.6), (Turtle, _) => (0.7), (Squirrel, _) => (1.0), (Fungome, _) => (0.8), @@ -376,7 +376,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Frog, _) => (0.7), (Rat, _) => (1.0), (Axolotl, _) => (0.8), - (Gecko, _) => (1.0), + (Gecko, _) => (0.8), (Turtle, _) => (0.7), (Squirrel, _) => (1.0), (Fungome, _) => (0.7), diff --git a/voxygen/src/anim/src/theropod/mod.rs b/voxygen/src/anim/src/theropod/mod.rs index 459661de77..d86d8b73cb 100644 --- a/voxygen/src/anim/src/theropod/mod.rs +++ b/voxygen/src/anim/src/theropod/mod.rs @@ -116,7 +116,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { Self { head: match (body.species, body.body_type) { (Archaeos, _) => (8.0, 4.0), - (Odonto, _) => (6.0, 5.0), + (Odonto, _) => (2.0, 2.0), }, jaw: match (body.species, body.body_type) { (Archaeos, _) => (1.0, -7.0), @@ -124,7 +124,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { }, neck: match (body.species, body.body_type) { (Archaeos, _) => (4.5, -2.0), - (Odonto, _) => (3.0, -3.0), + (Odonto, _) => (4.0, 0.0), }, chest_front: match (body.species, body.body_type) { (Archaeos, _) => (0.0, 20.0),