From 7d96ad318dc5ef3599253375164c095f4d08dbc2 Mon Sep 17 00:00:00 2001
From: Snowram <robin.gilh@gmail.com>
Date: Sun, 20 Sep 2020 17:58:54 +0200
Subject: [PATCH 1/2] Fixed various issues from better-things branch

---
 common/src/comp/agent.rs                      |  2 ++
 common/src/comp/body.rs                       |  9 +++++
 voxygen/src/anim/src/quadruped_medium/feed.rs |  2 +-
 voxygen/src/anim/src/quadruped_medium/idle.rs |  2 +-
 voxygen/src/anim/src/quadruped_medium/mod.rs  | 36 +++++++++----------
 voxygen/src/anim/src/quadruped_medium/run.rs  |  6 ++--
 voxygen/src/anim/src/quadruped_small/mod.rs   |  2 +-
 world/src/lib.rs                              |  2 ++
 8 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/common/src/comp/agent.rs b/common/src/comp/agent.rs
index 8deb64be8a..d0cd1563f9 100644
--- a/common/src/comp/agent.rs
+++ b/common/src/comp/agent.rs
@@ -104,6 +104,8 @@ impl<'a> From<&'a Body> for Psyche {
                     quadruped_medium::Species::Frostfang => 0.9,
                     quadruped_medium::Species::Mouflon => 0.8,
                     quadruped_medium::Species::Catoblepas => 0.8,
+                    quadruped_medium::Species::Deer => 0.6,
+                    quadruped_medium::Species::Hirdrasil => 0.7,
                     _ => 1.0,
                 },
                 Body::QuadrupedLow(quadruped_low) => match quadruped_low.species {
diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index 16435dc608..735470cdb9 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -238,6 +238,8 @@ impl Body {
                 quadruped_medium::Species::Mouflon => 500,
                 quadruped_medium::Species::Catoblepas => 1000,
                 quadruped_medium::Species::Bonerattler => 400,
+                quadruped_medium::Species::Deer => 300,
+                quadruped_medium::Species::Hirdrasil => 500,
                 _ => 400,
             },
             Body::BirdMedium(bird_medium) => match bird_medium.species {
@@ -305,6 +307,8 @@ impl Body {
                 quadruped_medium::Species::Mouflon => 30,
                 quadruped_medium::Species::Catoblepas => 50,
                 quadruped_medium::Species::Bonerattler => 30,
+                quadruped_medium::Species::Deer => 30,
+                quadruped_medium::Species::Hirdrasil => 30,
                 _ => 20,
             },
             Body::BirdMedium(bird_medium) => match bird_medium.species {
@@ -372,6 +376,8 @@ impl Body {
                 quadruped_medium::Species::Mouflon => 7,
                 quadruped_medium::Species::Catoblepas => 10,
                 quadruped_medium::Species::Bonerattler => 10,
+                quadruped_medium::Species::Deer => 7,
+                quadruped_medium::Species::Hirdrasil => 10,
                 _ => 6,
             },
             Body::BirdMedium(bird_medium) => match bird_medium.species {
@@ -438,6 +444,7 @@ impl Body {
             Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species {
                 quadruped_small::Species::Dodarock => 30,
                 quadruped_small::Species::Hyena => 40,
+                quadruped_small::Species::Porcupine => 30,
                 _ => 20,
             },
             Body::QuadrupedMedium(quadruped_medium) => match quadruped_medium.species {
@@ -447,6 +454,8 @@ impl Body {
                 quadruped_medium::Species::Mouflon => 30,
                 quadruped_medium::Species::Catoblepas => 20,
                 quadruped_medium::Species::Bonerattler => 50,
+                quadruped_medium::Species::Deer => 30,
+                quadruped_medium::Species::Hirdrasil => 50,
                 _ => 40,
             },
             Body::BirdMedium(bird_medium) => match bird_medium.species {
diff --git a/voxygen/src/anim/src/quadruped_medium/feed.rs b/voxygen/src/anim/src/quadruped_medium/feed.rs
index 4788b37b62..1fe7624adf 100644
--- a/voxygen/src/anim/src/quadruped_medium/feed.rs
+++ b/voxygen/src/anim/src/quadruped_medium/feed.rs
@@ -79,7 +79,7 @@ impl Animation for FeedAnimation {
             next.jaw.position = Vec3::new(
                 0.0,
                 skeleton_attr.jaw.0 - slower * 0.12,
-                skeleton_attr.jaw.1 + slow * 0.2 + 0.5,
+                skeleton_attr.jaw.1 + slow * 0.2,
             );
             next.jaw.orientation = Quaternion::rotation_x((fast * 0.18 + faster * 0.26).min(0.0));
             next.jaw.scale = Vec3::one() * 1.02;
diff --git a/voxygen/src/anim/src/quadruped_medium/idle.rs b/voxygen/src/anim/src/quadruped_medium/idle.rs
index 3285ba2bcb..15c56e8993 100644
--- a/voxygen/src/anim/src/quadruped_medium/idle.rs
+++ b/voxygen/src/anim/src/quadruped_medium/idle.rs
@@ -71,7 +71,7 @@ impl Animation for IdleAnimation {
         next.jaw.position = Vec3::new(
             0.0,
             skeleton_attr.jaw.0 - slower * 0.12,
-            skeleton_attr.jaw.1 + slow * 0.2 + 0.5,
+            skeleton_attr.jaw.1 + slow * 0.2,
         );
         next.jaw.orientation = Quaternion::rotation_x(slow * 0.05 - 0.08);
         next.jaw.scale = Vec3::one() * 1.02;
diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs
index 5212b1377a..f4a9162d64 100644
--- a/voxygen/src/anim/src/quadruped_medium/mod.rs
+++ b/voxygen/src/anim/src/quadruped_medium/mod.rs
@@ -167,23 +167,23 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Hirdrasil, _) => (-1.0, 0.5),
             },
             jaw: match (body.species, body.body_type) {
-                (Grolgar, _) => (7.0, 1.5),
+                (Grolgar, _) => (7.0, 2.0),
                 (Saber, _) => (2.5, -2.0),
-                (Tuskram, _) => (5.5, -4.0),
-                (Lion, _) => (3.5, -4.5),
-                (Tarasque, _) => (9.0, -10.0),
-                (Tiger, _) => (3.5, -4.0),
-                (Wolf, _) => (5.0, -3.0),
-                (Frostfang, _) => (4.0, -3.0),
-                (Mouflon, _) => (6.0, 0.5),
-                (Catoblepas, _) => (1.0, -4.0),
-                (Bonerattler, _) => (3.0, -3.0),
-                (Deer, _) => (3.5, 2.0),
-                (Hirdrasil, _) => (2.5, 2.5),
+                (Tuskram, _) => (5.5, -3.5),
+                (Lion, _) => (3.5, -4.0),
+                (Tarasque, _) => (9.0, -9.5),
+                (Tiger, _) => (3.0, -3.5),
+                (Wolf, _) => (5.0, -2.5),
+                (Frostfang, _) => (4.0, -2.5),
+                (Mouflon, _) => (6.0, 1.0),
+                (Catoblepas, _) => (1.0, -3.5),
+                (Bonerattler, _) => (3.0, -2.5),
+                (Deer, _) => (3.5, 2.5),
+                (Hirdrasil, _) => (2.5, 3.0),
             },
             tail: match (body.species, body.body_type) {
                 (Grolgar, _) => (-11.5, -0.5),
-                (Saber, _) => (-11.0, 1.0),
+                (Saber, _) => (-11.0, 0.0),
                 (Tuskram, _) => (-9.0, 2.0),
                 (Lion, _) => (-11.0, 1.0),
                 (Tarasque, _) => (-11.0, 0.0),
@@ -191,21 +191,21 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Wolf, _) => (-11.0, 0.0),
                 (Frostfang, _) => (-7.0, -3.5),
                 (Mouflon, _) => (-10.5, 3.0),
-                (Catoblepas, _) => (-8.5, -2.0),
+                (Catoblepas, _) => (-8.0, -2.0),
                 (Bonerattler, _) => (-10.0, 1.5),
                 (Deer, _) => (-8.5, 0.5),
                 (Hirdrasil, _) => (-11.0, 2.0),
             },
             torso_front: match (body.species, body.body_type) {
                 (Grolgar, _) => (10.0, 13.0),
-                (Saber, _) => (14.0, 14.0),
+                (Saber, _) => (14.0, 13.0),
                 (Tuskram, _) => (10.0, 14.5),
                 (Lion, _) => (10.0, 12.5),
-                (Tarasque, _) => (11.5, 18.5),
+                (Tarasque, _) => (11.5, 17.5),
                 (Tiger, _) => (10.0, 13.0),
                 (Wolf, _) => (12.0, 13.0),
                 (Frostfang, _) => (9.0, 11.5),
-                (Mouflon, _) => (11.0, 13.5),
+                (Mouflon, _) => (11.0, 14.0),
                 (Catoblepas, _) => (7.5, 19.5),
                 (Bonerattler, _) => (6.0, 12.5),
                 (Deer, _) => (11.0, 13.5),
@@ -243,7 +243,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
             },
             leg_f: match (body.species, body.body_type) {
                 (Grolgar, _) => (7.5, -5.5, -1.0),
-                (Saber, _) => (7.0, -4.0, -3.5),
+                (Saber, _) => (7.0, -4.0, -2.5),
                 (Tuskram, _) => (6.0, -6.5, -4.0),
                 (Lion, _) => (6.5, -6.5, -1.5),
                 (Tarasque, _) => (7.0, -8.0, -6.0),
diff --git a/voxygen/src/anim/src/quadruped_medium/run.rs b/voxygen/src/anim/src/quadruped_medium/run.rs
index e4e4d2ca4a..da9b089bc0 100644
--- a/voxygen/src/anim/src/quadruped_medium/run.rs
+++ b/voxygen/src/anim/src/quadruped_medium/run.rs
@@ -27,10 +27,10 @@ impl Animation for RunAnimation {
         //let increasefreqtest = (((1.0/speed)*3.0).round()).min(5.0);
         let lab = 0.72; //0.72
         let amplitude = (speed / 24.0).max(0.25);
-        let amplitude2 = (speed * 1.4 / 24.0).max(0.6);
-        let amplitude3 = (speed / 24.0).max(0.35);
+        let amplitude2 = (speed * 1.4 / 24.0).powf(0.5).max(0.6);
+        let amplitude3 = (speed / 24.0).powf(0.5).max(0.35);
         let speedmult = skeleton_attr.tempo;
-        let canceler = speed / 24.0;
+        let canceler = (speed / 24.0).powf(0.5);
         let short = (((1.0)
             / (0.72
                 + 0.28
diff --git a/voxygen/src/anim/src/quadruped_small/mod.rs b/voxygen/src/anim/src/quadruped_small/mod.rs
index ed9e73cef4..b0523a5756 100644
--- a/voxygen/src/anim/src/quadruped_small/mod.rs
+++ b/voxygen/src/anim/src/quadruped_small/mod.rs
@@ -250,7 +250,7 @@ impl<'a> From<&'a Body> for SkeletonAttr {
                 (Turtle, _) => (0.9),
                 (Squirrel, _) => (0.7),
                 (Fungome, _) => (0.9),
-                (Porcupine, _) => (1.0),
+                (Porcupine, _) => (0.8),
                 (Beaver, _) => (1.0),
             },
             tempo: match (body.species, body.body_type) {
diff --git a/world/src/lib.rs b/world/src/lib.rs
index 30b2d720a2..823dcdf1d6 100644
--- a/world/src/lib.rs
+++ b/world/src/lib.rs
@@ -244,6 +244,8 @@ impl World {
                                         quadruped_medium::Species::Catoblepas => is_hostile = false,
                                         quadruped_medium::Species::Mouflon => is_hostile = false,
                                         quadruped_medium::Species::Tuskram => is_hostile = false,
+                                        quadruped_medium::Species::Deer => is_hostile = false,
+                                        quadruped_medium::Species::Hirdrasil => is_hostile = false,
                                         _ => is_hostile = true,
                                     }
                                 },

From 9401c305e1ee6e65e8ec881f273e977defb6ba28 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Mon, 21 Sep 2020 23:56:03 -0400
Subject: [PATCH 2/2] small corrections

---
 CHANGELOG.md                                  |   3 +++
 .../voxygen/voxel/npc/gecko/male/foot_bl.vox  | Bin 1172 -> 1172 bytes
 .../voxygen/voxel/npc/gecko/male/foot_br.vox  | Bin 1172 -> 1172 bytes
 assets/voxygen/voxel/npc/odonto/male/neck.vox | Bin 5624 -> 2024 bytes
 .../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, 14 insertions(+), 11 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 a9f5fa8c8ba60a5824da4a607dd977cc35fa64c2..a91981e58b294b46e8b2e3db48619bf495f6a833 100644
GIT binary patch
delta 84
zcmW-YyAgmu5JF+$f=lek0&L9K;2N<g@6&~=0rPk>&}ysKeuxi<C38qIT+}H}mF)gJ
W(lHU4B$EV|ojYR2|BW8L&&@AxI}}d<

delta 84
zcmW-YyAgmu5JG`ngG;U>3$QU`gKNa1yiXUR0rPk>&`K-UeuxheE65SjNJOVN1Md7>
Wc1(n0(&UDf^e!>=f7QkNtoZ_JI21ep

diff --git a/assets/voxygen/voxel/npc/gecko/male/foot_br.vox b/assets/voxygen/voxel/npc/gecko/male/foot_br.vox
index c5059e06c57173fb98f5f516422b975371f6fee3..a601074c80b4bfa3f3644dfaad40dcc8b10d581e 100644
GIT binary patch
delta 84
zcmW-YyAgmu5JF+$f=lek0&L9K;2N<g@6&~=0rPk>&}ysKeu$5WMRQOwP}C((mhApK
W(lH&Gq>=&_oI7I1|BW8L&&@Awe-ups

delta 84
zcmW-YyAgmu5JG`ngG;U>3$QU`gKNa1yiXUR0rPk>&`K-Ueuz&d7Rf<r0MSF7ggZZ%
W9W%o*!;B3J^e!>=f7QkNtoZ_Id=xqW

diff --git a/assets/voxygen/voxel/npc/odonto/male/neck.vox b/assets/voxygen/voxel/npc/odonto/male/neck.vox
index e102ce64ed1900249af6892edddad122dc0968da..b97b094448e944a65a3220ecbb02656e0c875d45 100644
GIT binary patch
delta 1005
zcmW-gyOA9^3`GH4fb98fsg!|yMIl4R7`tnzN;NyKBIst*epx7inHPalQ4nKn0Bi2y
z>narZ0m=J8|M&U*!{z(m&!2vp*`HsY{vz4$Zuafz<?G{`@G-R{{ve+Jd3kyh1HN}c
z_Hgys4w-gS?ee=<+1-@xuW1|k?wa0)+y=*XnKSk?gFTNCstX&zBxhPXEjpLwY#w{~
zcBI-c&(qassI%Xuxv1C7$my=r-3~Y3T{X+&klLA6r@W>|8ySqXy{7lWojSnAZGF9U
zxqlT04OGoUVFyUxn`@YX5cEzqui=bS9Ewi;0<u8XP}EG-8Mg5NwbpoqeTby9ep9Fp
zQ=1N<SaGZA!!O~;(m{KF^~D$^ENT>t<b5jcucBCiw7yZdREphUC)-B)HpBV|&ZOmO
zFn8lI*ao>Q4v#>EMI?s<K7#jRL%BXL?g`6&rt3&UR#-WVDv&bT88W1IGM6kxq&?kP
z%cB8AGS;1Qw$mqgj=#d|RWC;ck=LDKU59JEmw-#`&C3kO4_g~ZM`5EMDjd&!w_Da3
z$m(Hut7*4LtV);wj+%gB7<L4AVPyp1$O>cKk8tYDn6Kso+)WWj-3uPU!XnuKMC34#
zDg=n_D12^2Spuxl7yT@2qwu{Ub>XS}@vYHxW&8oQ#;7MOMBYN~Lg9w=WgSq-8En<V
zTf>I>f#;1TDLT6minYOELjG_q<Z8;ZNvzo@<Zt0*KWjBDij@MN#aw$qph2cVqWJ9!
LMSlJJ@iG4gV(fy)

literal 5624
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
QuM;Lr&~f9&X`BE54_+g(w*UYD

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),