diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index eae84a9d61..11574fae07 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1033,7 +1033,7 @@ (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Chest("Rugged")): VoxTrans( - "voxel.armor.rugged.pants", + "voxel.armor.rugged.chest", (0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.2, ), Armor(Chest("WorkerPurpBrown")): VoxTrans( diff --git a/assets/voxygen/voxel/figure/hair/dwarf/female-3.vox b/assets/voxygen/voxel/figure/hair/dwarf/female-3.vox index 434e3189e9..0387388ab2 100644 --- a/assets/voxygen/voxel/figure/hair/dwarf/female-3.vox +++ b/assets/voxygen/voxel/figure/hair/dwarf/female-3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e66db107ba7dcb1c73defdef7a23e9e2355e0a1f2b233c7e40611719dc484b5 -size 2924 +oid sha256:2d518d392b68ab51a2f479f389dbfc1d1d7702e8644bb6053fcef41690e066d2 +size 267 diff --git a/assets/voxygen/voxel/glider/glider_cultists.vox b/assets/voxygen/voxel/glider/glider_cultists.vox index ee3c25d6ec..f8d13a6080 100644 --- a/assets/voxygen/voxel/glider/glider_cultists.vox +++ b/assets/voxygen/voxel/glider/glider_cultists.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:547fbb34162015161411a78ae94c4b863e95ee25adfd4d085b6edb0d60a412b5 +oid sha256:88540f687e06db70e617d19e969e4fd8903aaec801752201f7abb4bce393cdd5 size 14960 diff --git a/assets/voxygen/voxel/glider/glider_woodraptor.vox b/assets/voxygen/voxel/glider/glider_woodraptor.vox index 13fc8bc45b..4c69efcd84 100644 --- a/assets/voxygen/voxel/glider/glider_woodraptor.vox +++ b/assets/voxygen/voxel/glider/glider_woodraptor.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8467fd6f32ae88b206145ee0ba3c668b433aa345e21d5d196ad9c75dff26e4fb +oid sha256:cf45c780f52d951aefc8c34cdab037868539e55c7589eb4c5ce557b6ea20d492 size 8912 diff --git a/assets/voxygen/voxel/npc/claygolem/male/head.vox b/assets/voxygen/voxel/npc/claygolem/male/head.vox index 4448e17a4b..ec8f2a249d 100644 --- a/assets/voxygen/voxel/npc/claygolem/male/head.vox +++ b/assets/voxygen/voxel/npc/claygolem/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0496ea5c90559b681246f5c641d2a2dfadaf7705eb79b7f2c9a38c3060c866c1 +oid sha256:c8166b6dbe2371218416ebe6ef69d31ee8e851ec6d09b4936ae4c9d3dc362bb4 size 6656 diff --git a/assets/voxygen/voxel/npc/cyclops/male/foot_l.vox b/assets/voxygen/voxel/npc/cyclops/male/foot_l.vox index 28e8831551..2f146c7c31 100644 --- a/assets/voxygen/voxel/npc/cyclops/male/foot_l.vox +++ b/assets/voxygen/voxel/npc/cyclops/male/foot_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68922b688dd4b6af52b7e32e84f614d7b6cffa7fe7765868b235055f130e95ca +oid sha256:81cff203047e32c79688437f1836cf1a6dc5885e68fe9accae81cca9054aa4ea size 2196 diff --git a/assets/voxygen/voxel/npc/cyclops/male/foot_r.vox b/assets/voxygen/voxel/npc/cyclops/male/foot_r.vox index 724deb18c0..60b9653790 100644 --- a/assets/voxygen/voxel/npc/cyclops/male/foot_r.vox +++ b/assets/voxygen/voxel/npc/cyclops/male/foot_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbec9af121656c67dcad42f86b508da2b675a310795a941bebbb7615e9bc0b10 +oid sha256:3d7a5a5bc8f2e594f59d79ad17476b9cbeec85e57d43a3532ad00ad8ede8729e size 2196 diff --git a/assets/voxygen/voxel/npc/cyclops/male/hand_l.vox b/assets/voxygen/voxel/npc/cyclops/male/hand_l.vox index 854c3ec7b7..b20ab78ca0 100644 --- a/assets/voxygen/voxel/npc/cyclops/male/hand_l.vox +++ b/assets/voxygen/voxel/npc/cyclops/male/hand_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a79fac3f12d2d75a863d0871fbf98319cf7a46e91ad43dcca2a016879884483f +oid sha256:1b5226d3ecaed0fb73234f9f3d3affcc59dcbd8706779200b63b28e87edb8f02 size 2112 diff --git a/assets/voxygen/voxel/npc/cyclops/male/hand_r.vox b/assets/voxygen/voxel/npc/cyclops/male/hand_r.vox index d17bda172b..ecea029887 100644 --- a/assets/voxygen/voxel/npc/cyclops/male/hand_r.vox +++ b/assets/voxygen/voxel/npc/cyclops/male/hand_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c78a6bce195ec1ae3146deb4027411f6ce4437d08c4e61fd011af67af737654 +oid sha256:00d0ac3627f8d6771015034f587c427c7a8aa4871f7e07acafdd784d7d40cbe5 size 2112 diff --git a/assets/voxygen/voxel/npc/cyclops/male/head.vox b/assets/voxygen/voxel/npc/cyclops/male/head.vox index f11c524547..1fc6a36741 100644 --- a/assets/voxygen/voxel/npc/cyclops/male/head.vox +++ b/assets/voxygen/voxel/npc/cyclops/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c26d1dee037c0b02b31ddc864699ca53533410162b30b58ee63e28f8e7c6f809 +oid sha256:62d3880cc06063cfe4e39916bc68242825d7af906b87c8c11d89eaec114cb8b9 size 4812 diff --git a/assets/voxygen/voxel/npc/cyclops/male/torso_lower.vox b/assets/voxygen/voxel/npc/cyclops/male/torso_lower.vox index e5c571a2a6..5d46d791e2 100644 --- a/assets/voxygen/voxel/npc/cyclops/male/torso_lower.vox +++ b/assets/voxygen/voxel/npc/cyclops/male/torso_lower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22487461be00f47fe33f97301879e58b0a54a78c5dd363264dea74666f84c5fd +oid sha256:2a8acb22930276c38f00e84b14a7f13e4e7e7d8321faba8f5a2970222923183c size 2996 diff --git a/assets/voxygen/voxel/npc/cyclops/male/torso_upper.vox b/assets/voxygen/voxel/npc/cyclops/male/torso_upper.vox index 594d12c405..c28355c0f4 100644 --- a/assets/voxygen/voxel/npc/cyclops/male/torso_upper.vox +++ b/assets/voxygen/voxel/npc/cyclops/male/torso_upper.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6213a11324dc9537913ef2ff6d6a7227d7ce1c8bb6b8c071acabeb10b1d1f63 +oid sha256:21918d8c3dc0978e96b3b213bc00e58a3421e29069670eb58f36975c4f07c575 size 6272 diff --git a/assets/voxygen/voxel/npc/dullahan/male/foot_l.vox b/assets/voxygen/voxel/npc/dullahan/male/foot_l.vox index e31d07f249..870582da09 100644 --- a/assets/voxygen/voxel/npc/dullahan/male/foot_l.vox +++ b/assets/voxygen/voxel/npc/dullahan/male/foot_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45ed57d20891b571e637f7733f1de5187c35590f1e6446349b5b5e0ed58188bd +oid sha256:e759ce9ad4ff54efc194d0da2d2fdc05b8bb680f26abf95c07103524b7efdf83 size 2104 diff --git a/assets/voxygen/voxel/npc/dullahan/male/foot_r.vox b/assets/voxygen/voxel/npc/dullahan/male/foot_r.vox index b774989bc3..870582da09 100644 --- a/assets/voxygen/voxel/npc/dullahan/male/foot_r.vox +++ b/assets/voxygen/voxel/npc/dullahan/male/foot_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f209474f4c97e8c89d087d89c7508d9cca64aa10e40498727e9db6cb7fa26448 +oid sha256:e759ce9ad4ff54efc194d0da2d2fdc05b8bb680f26abf95c07103524b7efdf83 size 2104 diff --git a/assets/voxygen/voxel/npc/dullahan/male/hand_l.vox b/assets/voxygen/voxel/npc/dullahan/male/hand_l.vox index b6fa334608..459cf19bcb 100644 --- a/assets/voxygen/voxel/npc/dullahan/male/hand_l.vox +++ b/assets/voxygen/voxel/npc/dullahan/male/hand_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef08b43313df6e0eb2d3c20553a1fef64e8bb5496a3fe80b86b4e6a980fa8129 -size 28870 +oid sha256:4ad8bb8a42abf20e11ef5bda34de9bbf20d33189400a63c4fd9133866d983286 +size 2736 diff --git a/assets/voxygen/voxel/npc/dullahan/male/hand_r.vox b/assets/voxygen/voxel/npc/dullahan/male/hand_r.vox index f3d1567d54..7ecefeabca 100644 --- a/assets/voxygen/voxel/npc/dullahan/male/hand_r.vox +++ b/assets/voxygen/voxel/npc/dullahan/male/hand_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7968ca6bb7f3ba3963e93e14164678d22c4bd70810df8088f1717b49e07fc01 +oid sha256:641b95b07c7a93243fa0e6608b69ec4eb7508f053448de25aa0722d21cc9a560 size 2736 diff --git a/assets/voxygen/voxel/npc/dullahan/male/leg_l.vox b/assets/voxygen/voxel/npc/dullahan/male/leg_l.vox index 6bb2545e17..12c7af8208 100644 --- a/assets/voxygen/voxel/npc/dullahan/male/leg_l.vox +++ b/assets/voxygen/voxel/npc/dullahan/male/leg_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7776c82525285f481e789bf7544f6647d8c90fc06d490ece5598e4d36c43492 +oid sha256:542ac6dc7c1ab4ae8b8311810aa58ba0d765286c47857febff75b491ddbeaa40 size 1616 diff --git a/assets/voxygen/voxel/npc/dullahan/male/leg_r.vox b/assets/voxygen/voxel/npc/dullahan/male/leg_r.vox index dd652eeb34..9488ebcfeb 100644 --- a/assets/voxygen/voxel/npc/dullahan/male/leg_r.vox +++ b/assets/voxygen/voxel/npc/dullahan/male/leg_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7366ce3eb27b267966b575c0dfcc108b127bbcc12d7d11f38ed38fe301490305 +oid sha256:a6df4f0f06943c0c90728d45fe3ac4a37e2b13e1353324b5d786a5af258a4483 size 1616 diff --git a/assets/voxygen/voxel/npc/dullahan/male/shoulder_l.vox b/assets/voxygen/voxel/npc/dullahan/male/shoulder_l.vox index dea14d4cc7..23511cd782 100644 --- a/assets/voxygen/voxel/npc/dullahan/male/shoulder_l.vox +++ b/assets/voxygen/voxel/npc/dullahan/male/shoulder_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5531f231f085a09641abdf48222b1921cbda67bcbb9af228a0523ce57c17b10 +oid sha256:4be52b27c504a8a23d552cf57210cfa5f09d938ba1eb0ef8cd81cdb56dbc292b size 2836 diff --git a/assets/voxygen/voxel/npc/dullahan/male/shoulder_r.vox b/assets/voxygen/voxel/npc/dullahan/male/shoulder_r.vox index 7742a4563a..d88126b522 100644 --- a/assets/voxygen/voxel/npc/dullahan/male/shoulder_r.vox +++ b/assets/voxygen/voxel/npc/dullahan/male/shoulder_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57690de57732dd9535e23872f4a78b1edb7525ee96fe0198434ec23706838d51 +oid sha256:a1dc97abcb62cd84998bb145fbe1b254c95e970eab00756a72ff5aac66bb5396 size 2836 diff --git a/assets/voxygen/voxel/npc/dullahan/male/torso_lower.vox b/assets/voxygen/voxel/npc/dullahan/male/torso_lower.vox index 97d2d75c16..3d6f18d159 100644 --- a/assets/voxygen/voxel/npc/dullahan/male/torso_lower.vox +++ b/assets/voxygen/voxel/npc/dullahan/male/torso_lower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:317c7c1f69a44001fec8e5470340b0f4845d6b2f6120d0cfe937cd7941ad649e +oid sha256:7b6e9df5128164f14dad5dce4dd7ecdee9fda5ea94a7cc5440e6e286e8cf94aa size 2752 diff --git a/assets/voxygen/voxel/npc/dullahan/male/torso_upper.vox b/assets/voxygen/voxel/npc/dullahan/male/torso_upper.vox index fc166bd88d..f768325a51 100644 --- a/assets/voxygen/voxel/npc/dullahan/male/torso_upper.vox +++ b/assets/voxygen/voxel/npc/dullahan/male/torso_upper.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3342b8e93bf6712c179c426621774eb8cd728ad434eeb02d010734fea8219d9e +oid sha256:43fee74a77309c32e831650ab7f6becabe652086a610679057b505df3e0ed9f2 size 6680 diff --git a/assets/voxygen/voxel/npc/harvester/male/head.vox b/assets/voxygen/voxel/npc/harvester/male/head.vox index 012839b8c0..8320336f3d 100644 --- a/assets/voxygen/voxel/npc/harvester/male/head.vox +++ b/assets/voxygen/voxel/npc/harvester/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f823d38356d788cfbc48e55149240ebe2ee701113439165b0ecf36e8d621ed14 -size 4456 +oid sha256:6ac1cdc8ef1329ffa7f7d8984483eddcc692eb54baf4a5d4d4d50bbd540d15df +size 30033 diff --git a/assets/voxygen/voxel/npc/harvester/male/jaw.vox b/assets/voxygen/voxel/npc/harvester/male/jaw.vox index 8e07bb596b..3b80421caf 100644 --- a/assets/voxygen/voxel/npc/harvester/male/jaw.vox +++ b/assets/voxygen/voxel/npc/harvester/male/jaw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44df94e3b9d45a47cc6070f29f768a0ec61b091e31770063b69543650da1d76f -size 1432 +oid sha256:9f58a8ae2eae6493c6e12a2cc6b446fe6f9988bdfbb3fc8c9503df71cacfb21c +size 27009 diff --git a/assets/voxygen/voxel/npc/hirdrasil/male/head.vox b/assets/voxygen/voxel/npc/hirdrasil/male/head.vox index 73e735ec91..5e25249dd2 100644 --- a/assets/voxygen/voxel/npc/hirdrasil/male/head.vox +++ b/assets/voxygen/voxel/npc/hirdrasil/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d73c268da0598b72676a8cd669a1b981d53c82d24c4c54fa038314526bbce18a +oid sha256:2eff83a692cfcbcdae3d882d3d67d9cdf6239b698d0b697ae41a23ff71148b25 size 3780 diff --git a/assets/voxygen/voxel/npc/hirdrasil/male/neck.vox b/assets/voxygen/voxel/npc/hirdrasil/male/neck.vox index b113108049..33eac9cbed 100644 --- a/assets/voxygen/voxel/npc/hirdrasil/male/neck.vox +++ b/assets/voxygen/voxel/npc/hirdrasil/male/neck.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8be1e7ee62a90e0afa0c74040faf999f3b8e0c894f28d99b51a21d8db6308192 +oid sha256:e1f12cebf7a68f1333b296584c5981569cc5fa40c6ea51ae8ca71f50081a03ac size 2800 diff --git a/assets/voxygen/voxel/npc/lavadrake/male/chest.vox b/assets/voxygen/voxel/npc/lavadrake/male/chest.vox index c1b7e3a0a6..47e3cb22ab 100644 --- a/assets/voxygen/voxel/npc/lavadrake/male/chest.vox +++ b/assets/voxygen/voxel/npc/lavadrake/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00605926f47844af38c8a749947fbc8b2dfb3d55416b9ade151bd19933ac76c0 +oid sha256:6f3029c9a647b47b13cddaec53f30c437441e6269036db44eaef987713a4d943 size 13236 diff --git a/assets/voxygen/voxel/npc/lavadrake/male/head_lower.vox b/assets/voxygen/voxel/npc/lavadrake/male/head_lower.vox index 256a558797..e323389b25 100644 --- a/assets/voxygen/voxel/npc/lavadrake/male/head_lower.vox +++ b/assets/voxygen/voxel/npc/lavadrake/male/head_lower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d55f987cf95bf4e086e80fa00f8ba752f16c5fa31ee98c49bd8396df3a6a90f0 +oid sha256:0efc717dc655bc9a269d18bb8f7f97d412d05cc9d004a288245d696d42c21d25 size 3704 diff --git a/assets/voxygen/voxel/npc/lavadrake/male/head_upper.vox b/assets/voxygen/voxel/npc/lavadrake/male/head_upper.vox index 7239b10afa..eed174a510 100644 --- a/assets/voxygen/voxel/npc/lavadrake/male/head_upper.vox +++ b/assets/voxygen/voxel/npc/lavadrake/male/head_upper.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33983793e6059e957a845c2ab7a77d16283e36b816dae7daf177581f392282ab +oid sha256:b91b537a022073269d475ecbd04b6050b702fda8a46d0bb7f3ee14f6cfd7de70 size 3676 diff --git a/assets/voxygen/voxel/npc/lavadrake/male/jaw.vox b/assets/voxygen/voxel/npc/lavadrake/male/jaw.vox index 422b9f2495..7bb1da4633 100644 --- a/assets/voxygen/voxel/npc/lavadrake/male/jaw.vox +++ b/assets/voxygen/voxel/npc/lavadrake/male/jaw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a2e15eb7c1c2078e83936edcb466a25f35a0c232bbe6c3a974306de16de92c7 +oid sha256:322165ecfa95ce5b66e576c9f30d84227b946a6d1779bfb7273b036828a122da size 1892 diff --git a/assets/voxygen/voxel/npc/lavadrake/male/tail_front.vox b/assets/voxygen/voxel/npc/lavadrake/male/tail_front.vox index d823b990b3..528c02f781 100644 --- a/assets/voxygen/voxel/npc/lavadrake/male/tail_front.vox +++ b/assets/voxygen/voxel/npc/lavadrake/male/tail_front.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b55691df732d3eda0f6b26e03cf2a9a542fac3f9609efbfc90a9996c7e967a41 +oid sha256:61606ad99db159a4842c64137cd7467360ce270af4f01e2cab29e754d53002bb size 3476 diff --git a/assets/voxygen/voxel/npc/lavadrake/male/tail_rear.vox b/assets/voxygen/voxel/npc/lavadrake/male/tail_rear.vox index 1e46fc058f..95f362bc41 100644 --- a/assets/voxygen/voxel/npc/lavadrake/male/tail_rear.vox +++ b/assets/voxygen/voxel/npc/lavadrake/male/tail_rear.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cd3fbf2b78169f8d58157267d17790ad2123d95affbf5fd3a72e1257fcbd217 +oid sha256:572d285f973d4bcd44a4e1a9bf118e8d0088b89e0f2ccee9a1fbefd3198510b3 size 2592 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/foot_l.vox b/assets/voxygen/voxel/npc/mindflayer/male/foot_l.vox index 831b33bc1a..c1156ebabe 100644 --- a/assets/voxygen/voxel/npc/mindflayer/male/foot_l.vox +++ b/assets/voxygen/voxel/npc/mindflayer/male/foot_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b2a50d8e9a0f0bc92da9ba85fd45a7216c57124ee8e4d31eb9617962a7320d7 +oid sha256:14ca57cf4aebf55f12bf27540b139cde2e3934b5008a5d93dea69a3a3b5fde75 size 1684 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/foot_r.vox b/assets/voxygen/voxel/npc/mindflayer/male/foot_r.vox index 50c164ca7f..419ecf87b3 100644 --- a/assets/voxygen/voxel/npc/mindflayer/male/foot_r.vox +++ b/assets/voxygen/voxel/npc/mindflayer/male/foot_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8042918bfe333f459be1337e2e2e0d157abf61cb646ae04164ecabc58d93670 +oid sha256:48f25751f250603030f7757848eed1fb88e309c9ab31a6549448b754c8080e3f size 1680 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/hand_l.vox b/assets/voxygen/voxel/npc/mindflayer/male/hand_l.vox index d3dcbf94a0..3fd7418718 100644 --- a/assets/voxygen/voxel/npc/mindflayer/male/hand_l.vox +++ b/assets/voxygen/voxel/npc/mindflayer/male/hand_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cde551f556937f12016e5ac756c5d1d01bb632129d82642ff08bcb5f7d57671 +oid sha256:97dabf8b02412cbe7bce49c1a96fceafdba242ad7c70c64f9ada3a7edb8c401f size 2244 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/hand_r.vox b/assets/voxygen/voxel/npc/mindflayer/male/hand_r.vox index ce706d3a0a..5470714378 100644 --- a/assets/voxygen/voxel/npc/mindflayer/male/hand_r.vox +++ b/assets/voxygen/voxel/npc/mindflayer/male/hand_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:105be4028ac36c67ab52174394826b437f309bf783748df46161635b5bb82e99 +oid sha256:7e6a5e66962021b51b2895e7158fe0577ed207bfcf0689060fc6988f046dea9a size 2244 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/head.vox b/assets/voxygen/voxel/npc/mindflayer/male/head.vox index 97081d8775..43b78eb797 100644 --- a/assets/voxygen/voxel/npc/mindflayer/male/head.vox +++ b/assets/voxygen/voxel/npc/mindflayer/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5042c160f49133a157d403a9d944d503e82dbe1f8ca1e9f87f663894a2c14425 +oid sha256:f6a7e6861c9471b4da15cec63f80ec2c154f9da6849da14a29122cc6d4b57a0e size 4844 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/torso_lower.vox b/assets/voxygen/voxel/npc/mindflayer/male/torso_lower.vox index 45cd9ea15e..af56c931a2 100644 --- a/assets/voxygen/voxel/npc/mindflayer/male/torso_lower.vox +++ b/assets/voxygen/voxel/npc/mindflayer/male/torso_lower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c9420360d1425d1487bceccd8a73c623c84523ba5609cf7f643451b05e3269e +oid sha256:b70ea7941c33a13bba027acdd4dc210a830ef3ae02f5c5a895787479204a3bd9 size 9004 diff --git a/assets/voxygen/voxel/npc/mindflayer/male/torso_upper.vox b/assets/voxygen/voxel/npc/mindflayer/male/torso_upper.vox index 439ad83e2d..5de161d9fb 100644 --- a/assets/voxygen/voxel/npc/mindflayer/male/torso_upper.vox +++ b/assets/voxygen/voxel/npc/mindflayer/male/torso_upper.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:270a4a3194f1c434dbdabc0a296a25eb6e44e220a72af0b5fdb3db1cf28f6f45 +oid sha256:a8a5e24f8723f2a8769c51fee32f6a958428b8ed9bc56329d4e81a690d6021af size 4572 diff --git a/assets/voxygen/voxel/npc/ogre/female/head.vox b/assets/voxygen/voxel/npc/ogre/female/head.vox index 3ccb3f74c5..5a1a00ee59 100644 --- a/assets/voxygen/voxel/npc/ogre/female/head.vox +++ b/assets/voxygen/voxel/npc/ogre/female/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1fda670f40f9d9086bc1be86270cae31302940d341cc5615e2f65abdc6249af +oid sha256:4fff7b9ed78d2e4819fd35e53d70738c0f7302e7dbb9b5da0a9eaa3fcbfe6536 size 4876 diff --git a/assets/voxygen/voxel/npc/ogre/male/hand_r.vox b/assets/voxygen/voxel/npc/ogre/male/hand_r.vox index 52d1de72ad..90d87ec33a 100644 --- a/assets/voxygen/voxel/npc/ogre/male/hand_r.vox +++ b/assets/voxygen/voxel/npc/ogre/male/hand_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00852e1a64801ede4bc3d605eddfda9231c3fd54e51d55b550863915d166e570 +oid sha256:b99a40b16de8da9133b6977ceae9aa9a760327de5e81c3656e1d5b3c8185d20b size 3252 diff --git a/assets/voxygen/voxel/npc/ogre/male/head.vox b/assets/voxygen/voxel/npc/ogre/male/head.vox index fac22a300e..98e7e9fc49 100644 --- a/assets/voxygen/voxel/npc/ogre/male/head.vox +++ b/assets/voxygen/voxel/npc/ogre/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfb027ac19b3f6116c5322ba1a274b659a6afe7b46d56eff2fd522b81dd99e3e +oid sha256:4fc171d38fbbf0223e219e0260c08b7283c3c5c3133d73746a75f2bc66100ad7 size 4992 diff --git a/assets/voxygen/voxel/npc/ogre/male/shoulder_r.vox b/assets/voxygen/voxel/npc/ogre/male/shoulder_r.vox index 60df0b0c7f..5bc037f627 100644 --- a/assets/voxygen/voxel/npc/ogre/male/shoulder_r.vox +++ b/assets/voxygen/voxel/npc/ogre/male/shoulder_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2360896735c592695eb3747ff0477e77d462f17aa5de334f1c472b824defe257 +oid sha256:4e72f908efd001f911354a79cc833100c006227ba95759c0d7976399f9163314 size 3260 diff --git a/assets/voxygen/voxel/npc/ogre/male/torso_lower.vox b/assets/voxygen/voxel/npc/ogre/male/torso_lower.vox index 428f2b6d39..7f27fb5665 100644 --- a/assets/voxygen/voxel/npc/ogre/male/torso_lower.vox +++ b/assets/voxygen/voxel/npc/ogre/male/torso_lower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b7af777775352add9648076f186133e29e2d4f969e350c272a01b1723369cb0 +oid sha256:3620a8c4a012a1005b92bc881e95f159b9e62af6dabec09cd33288fbcbc61698 size 2748 diff --git a/assets/voxygen/voxel/npc/salamander/male/chest.vox b/assets/voxygen/voxel/npc/salamander/male/chest.vox index 96bb97d238..d5a8d9f6be 100644 --- a/assets/voxygen/voxel/npc/salamander/male/chest.vox +++ b/assets/voxygen/voxel/npc/salamander/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33254fbc2bcdc81d478f52f84d0fb66717797221535d6b77e6b93e2e54805a1d +oid sha256:23b8658cf742f615f64fbd291d666ec882c95443db9cd8dc50cb084be796b519 size 4252 diff --git a/assets/voxygen/voxel/npc/salamander/male/head_lower.vox b/assets/voxygen/voxel/npc/salamander/male/head_lower.vox index 4f9efd4ead..9f6c2005f6 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:56fadbc373110ea8059853068d9402ab4e18e68dcc076ee7ac7b46535e6d07da +oid sha256:fc7245e00f65c294d3d7bac0e09de567672414c451b46c9d31fa87a37c9b7e54 size 1616 diff --git a/assets/voxygen/voxel/npc/salamander/male/head_upper.vox b/assets/voxygen/voxel/npc/salamander/male/head_upper.vox index 4bd35cb2ad..c3984a9a9a 100644 --- a/assets/voxygen/voxel/npc/salamander/male/head_upper.vox +++ b/assets/voxygen/voxel/npc/salamander/male/head_upper.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9738b74c4e98117bf9271ab26fda0b9d6ffdb5aafd89ccfe853da6c581139ab1 +oid sha256:a8d983160c51b563b82fcb90da92214132d471a0665f5f375229ad4bbccf45f9 size 2588 diff --git a/assets/voxygen/voxel/npc/salamander/male/jaw.vox b/assets/voxygen/voxel/npc/salamander/male/jaw.vox index e951cafd9f..3bbff427dc 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:e30afa5141cd439b03d9d5f7f402cf896e8930f44206d7db9024557fb4729732 +oid sha256:59160f0e1526941c90229593c9757d535b878bd9207caa0448f88623c2f1af05 size 2092 diff --git a/assets/voxygen/voxel/npc/salamander/male/tail_front.vox b/assets/voxygen/voxel/npc/salamander/male/tail_front.vox index 8180f724fd..500bddec40 100644 --- a/assets/voxygen/voxel/npc/salamander/male/tail_front.vox +++ b/assets/voxygen/voxel/npc/salamander/male/tail_front.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82df11c21cd0b3b5d8ab625574420c0e4639e3dd743d887e6ad8ee4e80aaf330 +oid sha256:66b863e935607b337eca083145ad3a9971ca625c3aec95166bc3c87e5c49f967 size 2244 diff --git a/assets/voxygen/voxel/npc/stonegolem/male/chest_upper.vox b/assets/voxygen/voxel/npc/stonegolem/male/chest_upper.vox index 52033d5b97..f5d52af11d 100644 --- a/assets/voxygen/voxel/npc/stonegolem/male/chest_upper.vox +++ b/assets/voxygen/voxel/npc/stonegolem/male/chest_upper.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf24e59d46be096a82934628d9e44784247d67a37bd07783b5a8908c26feb233 +oid sha256:60071f65ca302a73c0463144f43084a4a558e8fc2e8e694b67bf5b8415c58025 size 12816 diff --git a/assets/voxygen/voxel/npc/stonegolem/male/head.vox b/assets/voxygen/voxel/npc/stonegolem/male/head.vox index 8fc25a7217..6019b8ff75 100644 --- a/assets/voxygen/voxel/npc/stonegolem/male/head.vox +++ b/assets/voxygen/voxel/npc/stonegolem/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf455e79056b7ac04758c6a7ed396d227a0303dd623b38c06610cd8e1ab165f7 +oid sha256:a1728f8649dcabc2b27db2772b6a3ae01fd12e820f8046d98df15eb7130baabf size 2588 diff --git a/assets/voxygen/voxel/npc/treant/male/head.vox b/assets/voxygen/voxel/npc/treant/male/head.vox index bfd87062a1..fd3b18983d 100644 --- a/assets/voxygen/voxel/npc/treant/male/head.vox +++ b/assets/voxygen/voxel/npc/treant/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2db075cdd6ae9c580ffb047f724b601bcb06de160398edd65e43a7d9e4872a5d +oid sha256:e57d5b9a067e79fccf9cc0ec1dded36bc63a40cd3ea217d595c3953e8bda064e size 2488 diff --git a/assets/voxygen/voxel/npc/wendigo/male/head.vox b/assets/voxygen/voxel/npc/wendigo/male/head.vox index 64008fec9b..d1e6ee080d 100644 --- a/assets/voxygen/voxel/npc/wendigo/male/head.vox +++ b/assets/voxygen/voxel/npc/wendigo/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:171e6e77433183a96512add717026f32295b647a34c9b7162e4910116a2d5704 +oid sha256:ffbd2674d9af604247ffc707cb32f4b77061fd5c744ceb895a2f21f65252f865 size 3164 diff --git a/assets/voxygen/voxel/npc/wendigo/male/torso_upper.vox b/assets/voxygen/voxel/npc/wendigo/male/torso_upper.vox index 1adbb7f6b1..5eddc52720 100644 --- a/assets/voxygen/voxel/npc/wendigo/male/torso_upper.vox +++ b/assets/voxygen/voxel/npc/wendigo/male/torso_upper.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:112e29bd44b78dd20e32070f49e709b0a0add87c04a6b6b7107e4e99a7134856 +oid sha256:92554feb3b7dc4a7dc1ed5b98b33407a4cbc9841988332831b54bf535632ae1f size 4228 diff --git a/assets/voxygen/voxel/object/crossbow/bone0.vox b/assets/voxygen/voxel/object/crossbow/bone0.vox index 2dc5e608ae..631e60ab53 100644 --- a/assets/voxygen/voxel/object/crossbow/bone0.vox +++ b/assets/voxygen/voxel/object/crossbow/bone0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adec2cb3277fda6f213e7d2497157cfd00ef661bfb18ba28c0f2746c7dd9ac05 +oid sha256:a079798c35638c634c8668209cf08aab30a62529eeab30bd1a53a26c50f75e39 size 4680 diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_cyclops-0.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_cyclops-0.vox index 0b94730c5b..9fe5f1434d 100644 --- a/assets/voxygen/voxel/weapon/hammer/2hhammer_cyclops-0.vox +++ b/assets/voxygen/voxel/weapon/hammer/2hhammer_cyclops-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dee24b5cefaf4879cb275c07eb0e52c9300606d60ebaf8cddad072a110e5594 +oid sha256:b2de23d8745cfc5e94954dce2be87fa16b6920551e7320ee0332d2d6b55f2550 size 3112 diff --git a/assets/voxygen/voxel/weapon/tool/hoe_blue.vox b/assets/voxygen/voxel/weapon/tool/hoe_blue.vox index 6597fd2b03..82dc8a6b93 100644 --- a/assets/voxygen/voxel/weapon/tool/hoe_blue.vox +++ b/assets/voxygen/voxel/weapon/tool/hoe_blue.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a900f50b949558bd0c255bb1c7ed18304f25437d1abeaf8b786707dce293e4b0 +oid sha256:d6f7a473241bcedcdd6d524409d9c06b0ce58bbf1b2a0bf5f78ae38a88ff9dfb size 1332 diff --git a/assets/voxygen/voxel/weapon/tool/hoe_green.vox b/assets/voxygen/voxel/weapon/tool/hoe_green.vox index 4fc7e1e026..b055a98cae 100644 --- a/assets/voxygen/voxel/weapon/tool/hoe_green.vox +++ b/assets/voxygen/voxel/weapon/tool/hoe_green.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:112a5202018014bc7e428dc0dbea1666b9701ad278b7e49653ded46478bf8b66 +oid sha256:7cff8145cf1060f08c81bc62b0c4bad01e135f7367daa5ec748e8ab9bb2313a2 size 1416 diff --git a/assets/voxygen/voxel/weapon/tool/pickaxe_green-0.vox b/assets/voxygen/voxel/weapon/tool/pickaxe_green-0.vox index 881ce3dd2d..6398281bb9 100644 --- a/assets/voxygen/voxel/weapon/tool/pickaxe_green-0.vox +++ b/assets/voxygen/voxel/weapon/tool/pickaxe_green-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb14e6b65cf47a702dd5b29b9e36f34f580ca6cd4d379e6fb01ae4192128daff +oid sha256:9f73d82b4dca9ab3e82dba4cdc1c4d86f83c2ed711e43bf7488680bc1c76bd61 size 1332 diff --git a/assets/voxygen/voxel/weapon/tool/pitchfork-0.vox b/assets/voxygen/voxel/weapon/tool/pitchfork-0.vox index d6291321bd..ffa9f24fd5 100644 --- a/assets/voxygen/voxel/weapon/tool/pitchfork-0.vox +++ b/assets/voxygen/voxel/weapon/tool/pitchfork-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1dde68d35c0d3316e518420e0c9176ebbc7c4b7f75a1314ddbabb9a70fcc0c8b +oid sha256:a846c1c878c05c4183594fe8b5541637bf59f7a964f208521fa2abaf2bf3e6e9 size 1296 diff --git a/assets/voxygen/voxel/weapon/tool/rake-0.vox b/assets/voxygen/voxel/weapon/tool/rake-0.vox index 5b916a2599..7f4ee77016 100644 --- a/assets/voxygen/voxel/weapon/tool/rake-0.vox +++ b/assets/voxygen/voxel/weapon/tool/rake-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e346f6cd750ca9891c60950eecfba69139b2a912495bf876c0d9cc102e9c02a +oid sha256:4c5462fdb5d592491049ec2421ad7f1d7d49a66989f9d75f3d6186ad13de2ccd size 1344 diff --git a/assets/voxygen/voxel/weapon/tool/shovel_blue.vox b/assets/voxygen/voxel/weapon/tool/shovel_blue.vox index 4604ae7cfe..93b7d92f62 100644 --- a/assets/voxygen/voxel/weapon/tool/shovel_blue.vox +++ b/assets/voxygen/voxel/weapon/tool/shovel_blue.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98cc8cbe4ed9e5bb329edd1c23f4297dc6dd6e82c047a3c81081ecaf95a1cf09 +oid sha256:828a4727f33bd1ccf73e4342843cfb6d1f786da39e38e1b244fd2645699dcbc8 size 1300 diff --git a/assets/voxygen/voxel/weapon/tool/shovel_gold.vox b/assets/voxygen/voxel/weapon/tool/shovel_gold.vox index 34a2f0282f..c575996d6b 100644 --- a/assets/voxygen/voxel/weapon/tool/shovel_gold.vox +++ b/assets/voxygen/voxel/weapon/tool/shovel_gold.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f697e4d8dddd203461c99f42d1a480c1c04a01e2df6197ed39e84a6963b2490a +oid sha256:7435a232b94c027a0bc56030a0ff5666b4ef1066a7cfb6f7fbf80c346fae8a8f size 1376 diff --git a/assets/voxygen/voxel/weapon/tool/shovel_green.vox b/assets/voxygen/voxel/weapon/tool/shovel_green.vox index 45424b070f..c2847c6335 100644 --- a/assets/voxygen/voxel/weapon/tool/shovel_green.vox +++ b/assets/voxygen/voxel/weapon/tool/shovel_green.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6be13988461679f51cab13c53b6a8837ee9725c86a69a75d8d2529629eebeaa0 +oid sha256:4d882629376ce7458bd30d224b9c11f2e9575a93eefb10e6316390660a5e08e1 size 1300 diff --git a/assets/voxygen/voxel/weapon/tool/shovel_red.vox b/assets/voxygen/voxel/weapon/tool/shovel_red.vox index c45b6075c5..c479218dae 100644 --- a/assets/voxygen/voxel/weapon/tool/shovel_red.vox +++ b/assets/voxygen/voxel/weapon/tool/shovel_red.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a60b1f1c1001a2ccad3945fa9ee0a533d2610e6015bfaac74f9a08cb9349a40 +oid sha256:fc1ed8ec89433c669370e0a0c5f4840d41d9656093b05b498e9580f71bb39bc7 size 1300 diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index a56ea27528..068942a11e 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -416,7 +416,7 @@ impl Body { quadruped_low::Species::Rocksnapper => 1000, quadruped_low::Species::Pangolin => 80, quadruped_low::Species::Maneater => 400, - quadruped_low::Species::Sandshark => 600, + quadruped_low::Species::Sandshark => 800, quadruped_low::Species::Hakulaq => 400, quadruped_low::Species::Lavadrake => 900, quadruped_low::Species::Deadwood => 600, diff --git a/voxygen/anim/src/quadruped_medium/mod.rs b/voxygen/anim/src/quadruped_medium/mod.rs index 2a2c6ea2a2..abff18e3c9 100644 --- a/voxygen/anim/src/quadruped_medium/mod.rs +++ b/voxygen/anim/src/quadruped_medium/mod.rs @@ -523,13 +523,13 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Donkey, _) => (1.2), (Horse, _) => (1.42), (Zebra, _) => (1.3), - (Cattle, _) => (1.7), - (Highland, _) => (1.7), + (Cattle, _) => (1.5), + (Highland, _) => (1.6), (Bear, _) => (1.7), (Yak, _) => (1.7), (Camel, _) => (1.42), (Dreadhorn, _) => (2.0), - (Moose, _) => (1.1), + (Moose, _) => (1.2), (Snowleopard, _) => (1.2), _ => (1.0), }, diff --git a/voxygen/anim/src/quadruped_small/mod.rs b/voxygen/anim/src/quadruped_small/mod.rs index 31bbfbbb72..33d66cefc4 100644 --- a/voxygen/anim/src/quadruped_small/mod.rs +++ b/voxygen/anim/src/quadruped_small/mod.rs @@ -161,7 +161,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Beaver, _) => (2.0, 6.0), (Hare, Male) => (-2.0, 7.0), (Hare, Female) => (-2.0, 6.0), - (Dog, _) => (-2.0, 9.5), + (Dog, _) => (-2.0, 8.5), (Goat, _) => (2.0, 7.5), }, feet_f: match (body.species, body.body_type) { diff --git a/voxygen/anim/src/quadruped_small/run.rs b/voxygen/anim/src/quadruped_small/run.rs index 85ff64aef3..348146625b 100644 --- a/voxygen/anim/src/quadruped_small/run.rs +++ b/voxygen/anim/src/quadruped_small/run.rs @@ -17,25 +17,29 @@ impl Animation for RunAnimation { fn update_skeleton_inner( skeleton: &Self::Skeleton, (velocity, orientation, last_ori, _global_time, avg_vel, acc_vel): Self::Dependency, - _anim_time: f32, + anim_time: f32, _rate: &mut f32, s_a: &SkeletonAttr, ) -> Self::Skeleton { let mut next = (*skeleton).clone(); - let lab: f32 = 0.8; //6 + let lab: f32 = 0.42; let speed = (Vec2::::from(velocity).magnitude()).min(12.0); let speednorm = (speed / 12.0).powf(0.4); + // acc_vel and anim_time mix to make sure phase lenght isn't starting at + // +infinite + let mixed_vel = acc_vel + anim_time * 12.0; + let speedmult = s_a.tempo; - let short = (acc_vel * lab * speedmult + PI * 1.0).sin() * speednorm; - let shortalt = (acc_vel * lab * speedmult + PI * 0.5).sin() * speednorm; + let short = (mixed_vel * lab * speedmult + PI * 1.0).sin() * speednorm; + let shortalt = (mixed_vel * lab * speedmult + PI * 0.5).sin() * speednorm; - let footvert = (acc_vel * lab * speedmult + PI * 0.0).sin() * speednorm; - let footvertt = (acc_vel * lab * speedmult + PI * 0.4).sin() * speednorm; + let footvert = (mixed_vel * lab * speedmult + PI * 0.0).sin() * speednorm; + let footvertt = (mixed_vel * lab * speedmult + PI * 0.4).sin() * speednorm; - let footvertf = (acc_vel * lab * speedmult + PI * 0.3).sin() * speednorm; - let footverttf = (acc_vel * lab * speedmult + PI * 0.7).sin() * speednorm; + let footvertf = (mixed_vel * lab * speedmult + PI * 0.3).sin() * speednorm; + let footverttf = (mixed_vel * lab * speedmult + PI * 0.7).sin() * speednorm; let ori: Vec2 = Vec2::from(orientation); let last_ori = Vec2::from(last_ori); diff --git a/world/src/layer/wildlife.rs b/world/src/layer/wildlife.rs index 0516bfcbb6..923a84949b 100644 --- a/world/src/layer/wildlife.rs +++ b/world/src/layer/wildlife.rs @@ -91,7 +91,9 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( }, group_size: 1..2, is_underwater: false, - get_density: |c, _col| close(c.temp, CONFIG.snow_temp, 0.3) * BASE_DENSITY * 1.0, + get_density: |c, col| { + close(c.temp, CONFIG.snow_temp, 0.3) * col.tree_density * BASE_DENSITY * 1.4 + }, }, // Tundra rare solitary ennemies Entry { @@ -106,7 +108,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( is_underwater: false, get_density: |c, _col| close(c.temp, CONFIG.snow_temp, 0.15) * BASE_DENSITY * 0.5, }, - // Tundra rare solitary ennemies + // Tundra rarer solitary ennemies Entry { make_entity: |pos, rng| { EntityInfo::at(pos) @@ -139,7 +141,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( Entry { make_entity: |pos, rng| { EntityInfo::at(pos) - .with_body(match rng.gen_range(0..3) { + .with_body(match rng.gen_range(0..2) { 0 => biped_large::Body::random_with(rng, &biped_large::Species::Wendigo) .into(), _ => quadruped_medium::Body::random_with( @@ -153,7 +155,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( group_size: 1..2, is_underwater: false, get_density: |c, col| { - close(c.temp, CONFIG.snow_temp + 0.2, 0.2) * col.tree_density * BASE_DENSITY * 0.2 + close(c.temp, CONFIG.snow_temp + 0.2, 0.2) * col.tree_density * BASE_DENSITY * 0.4 }, }, // Taiga pack ennemies @@ -203,7 +205,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( Entry { make_entity: |pos, rng| { EntityInfo::at(pos) - .with_body(match rng.gen_range(0..5) { + .with_body(match rng.gen_range(0..6) { 0 => { bird_medium::Body::random_with(rng, &bird_medium::Species::Eagle).into() }, @@ -218,6 +220,13 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( &quadruped_medium::Species::Moose, ) .into(), + 4 => { + quadruped_small::Body { + species: quadruped_small::Species::Hare, + body_type: quadruped_small::BodyType::Female, + } + } + .into(), _ => quadruped_medium::Body::random_with( rng, &quadruped_medium::Species::Tuskram, @@ -273,7 +282,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( Entry { make_entity: |pos, rng| { EntityInfo::at(pos) - .with_body(match rng.gen_range(0..13) { + .with_body(match rng.gen_range(0..12) { 0 => quadruped_medium::Body::random_with( rng, &quadruped_medium::Species::Deer, @@ -311,21 +320,17 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( &quadruped_small::Species::Squirrel, ) .into(), - 8 => { - quadruped_small::Body::random_with(rng, &quadruped_small::Species::Hare) - .into() - }, - 9 => quadruped_medium::Body::random_with( + 8 => quadruped_medium::Body::random_with( rng, &quadruped_medium::Species::Horse, ) .into(), - 10 => quadruped_medium::Body::random_with( + 9 => quadruped_medium::Body::random_with( rng, &quadruped_medium::Species::Cattle, ) .into(), - 11 => { + 10 => { quadruped_small::Body::random_with(rng, &quadruped_small::Species::Goat) .into() }, @@ -339,7 +344,6 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( get_density: |c, _col| { close(c.temp, CONFIG.temperate_temp + 0.1, 0.6) * close(c.humidity, CONFIG.forest_hum, 0.6) - //* col.tree_density * BASE_DENSITY * 4.0 }, @@ -468,6 +472,30 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( } }, }, + // Temperate rare river ennemies + Entry { + make_entity: |pos, rng| { + EntityInfo::at(pos) + .with_body( + quadruped_medium::Body::random_with( + rng, + &quadruped_medium::Species::Kelpie, + ) + .into(), + ) + .with_alignment(Alignment::Wild) + }, + group_size: 1..2, + is_underwater: false, + get_density: |_c, col| { + close(col.temp, CONFIG.temperate_temp, 0.6) + * if col.water_dist.map(|d| d < 10.0).unwrap_or(false) { + 0.00005 + } else { + 0.0 + } + }, + }, // Temperate river ennemies Entry { make_entity: |pos, rng| { @@ -733,7 +761,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( close(c.temp, CONFIG.desert_temp + 0.2, 0.3) * close(c.humidity, CONFIG.desert_hum, 0.5) * BASE_DENSITY - * 1.5 + * 1.3 }, }, // Desert rare solitary enemies @@ -807,7 +835,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( Entry { make_entity: |pos, rng| { EntityInfo::at(pos) - .with_body(match rng.gen_range(0..6) { + .with_body(match rng.gen_range(0..7) { 0 => quadruped_small::Body::random_with( rng, &quadruped_small::Species::Holladon, @@ -832,6 +860,11 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( &quadruped_small::Species::Porcupine, ) .into(), + 5 => quadruped_small::Body { + species: quadruped_small::Species::Hare, + body_type: quadruped_small::BodyType::Male, + } + .into(), _ => quadruped_small::Body::random_with( rng, &quadruped_small::Species::Gecko,