diff --git a/assets/voxygen/voxel/npc/lion/female/Lion (3)-10.vox b/assets/voxygen/voxel/npc/lion/female/Lion (3)-10.vox deleted file mode 100644 index 73a005122e..0000000000 --- a/assets/voxygen/voxel/npc/lion/female/Lion (3)-10.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7dc0a3231f764f8be21497e4b13279c3426cee2f54d6c24307f14a55ccb6c611 -size 1836 diff --git a/assets/voxygen/voxel/npc/lion/female/Lion (3)-6.vox b/assets/voxygen/voxel/npc/lion/female/Lion (3)-6.vox deleted file mode 100644 index 636af65879..0000000000 --- a/assets/voxygen/voxel/npc/lion/female/Lion (3)-6.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62593a17ce565b0c80d5f54ff1e156278b32e4f64b54bde5e342326cbbebe8ab -size 1740 diff --git a/assets/voxygen/voxel/npc/lion/female/Lion (3)-7.vox b/assets/voxygen/voxel/npc/lion/female/Lion (3)-7.vox deleted file mode 100644 index 8df56d05de..0000000000 --- a/assets/voxygen/voxel/npc/lion/female/Lion (3)-7.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d3c5bd6c1bfb1228381bdea22502654367a304d9683ca6c4068d24119db2ae1 -size 1836 diff --git a/assets/voxygen/voxel/npc/lion/female/Lion (3)-8.vox b/assets/voxygen/voxel/npc/lion/female/Lion (3)-8.vox deleted file mode 100644 index ca37d4a19a..0000000000 --- a/assets/voxygen/voxel/npc/lion/female/Lion (3)-8.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be48d4f9039c3f7556a685aa22a86770f8c971dc22659c7d8e85789220cc6bb7 -size 1144 diff --git a/assets/voxygen/voxel/npc/lion/female/Lion (3)-9.vox b/assets/voxygen/voxel/npc/lion/female/Lion (3)-9.vox deleted file mode 100644 index d553bda28f..0000000000 --- a/assets/voxygen/voxel/npc/lion/female/Lion (3)-9.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53ff2cb213eee6ea540e19aff94b753843cd574b3489769436eefe0d362a6398 -size 1740 diff --git a/assets/voxygen/voxel/npc/lion/female/foot_bl.vox b/assets/voxygen/voxel/npc/lion/female/foot_bl.vox index 8df56d05de..caa6986012 100644 --- a/assets/voxygen/voxel/npc/lion/female/foot_bl.vox +++ b/assets/voxygen/voxel/npc/lion/female/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d3c5bd6c1bfb1228381bdea22502654367a304d9683ca6c4068d24119db2ae1 -size 1836 +oid sha256:f52555a03158b801e0b748398de1afaae702d1f50e8680459410c8e87ad451a4 +size 1344 diff --git a/assets/voxygen/voxel/npc/lion/female/foot_br.vox b/assets/voxygen/voxel/npc/lion/female/foot_br.vox index 73a005122e..c3bfbe707d 100644 --- a/assets/voxygen/voxel/npc/lion/female/foot_br.vox +++ b/assets/voxygen/voxel/npc/lion/female/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dc0a3231f764f8be21497e4b13279c3426cee2f54d6c24307f14a55ccb6c611 -size 1836 +oid sha256:42e43edc23b822031654060439d4582f4768ecd8036000dbf229399db360ebec +size 1344 diff --git a/assets/voxygen/voxel/npc/lion/female/foot_fl.vox b/assets/voxygen/voxel/npc/lion/female/foot_fl.vox index 636af65879..e5fdd31ddb 100644 --- a/assets/voxygen/voxel/npc/lion/female/foot_fl.vox +++ b/assets/voxygen/voxel/npc/lion/female/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62593a17ce565b0c80d5f54ff1e156278b32e4f64b54bde5e342326cbbebe8ab -size 1740 +oid sha256:e1232a6c70aa203f517ff5c1e84272f99ec8a691d1a01fac4963cf5290396e46 +size 1308 diff --git a/assets/voxygen/voxel/npc/lion/female/foot_fr.vox b/assets/voxygen/voxel/npc/lion/female/foot_fr.vox index d553bda28f..b7f9879be0 100644 --- a/assets/voxygen/voxel/npc/lion/female/foot_fr.vox +++ b/assets/voxygen/voxel/npc/lion/female/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53ff2cb213eee6ea540e19aff94b753843cd574b3489769436eefe0d362a6398 -size 1740 +oid sha256:ec50f96e3354eec09efdf86796cc756b58565c46abd37883dacbb075e56efd9e +size 1308 diff --git a/assets/voxygen/voxel/npc/lion/female/head_lower.vox b/assets/voxygen/voxel/npc/lion/female/head_lower.vox index e2efb18a1a..e06f9cb1ca 100644 --- a/assets/voxygen/voxel/npc/lion/female/head_lower.vox +++ b/assets/voxygen/voxel/npc/lion/female/head_lower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83ea9b5263d98f68996cb817a17f7ce417c400d3a2ea3a40e63d77b80ecf2fc7 -size 254 +oid sha256:718dee3e909f6eb684cb735a92f7cf65937aa953d62e78ea9625851cb7aa4687 +size 7732 diff --git a/assets/voxygen/voxel/npc/lion/female/head_upper.vox b/assets/voxygen/voxel/npc/lion/female/head_upper.vox index 197370786c..f7e195272e 100644 --- a/assets/voxygen/voxel/npc/lion/female/head_upper.vox +++ b/assets/voxygen/voxel/npc/lion/female/head_upper.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b70da9d9ee7c4a828cc346e925e88365133f05428fcd5b87279a359147ecb1b9 -size 254 +oid sha256:bf7c62cfb2f28674ca13bb539b191b373c0a04f615a0248dd5e3ef445f143238 +size 2644 diff --git a/assets/voxygen/voxel/npc/lion/female/jaw.vox b/assets/voxygen/voxel/npc/lion/female/jaw.vox index e7b7750cd9..56d6853053 100644 --- a/assets/voxygen/voxel/npc/lion/female/jaw.vox +++ b/assets/voxygen/voxel/npc/lion/female/jaw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6e416e14a58557b6c54ff884577355450b39f5573fa064fb3b5135826ed9eec -size 254 +oid sha256:89c3aac859a997658b37e44304506bfde162e9dcacf9030ce847cc87113c821e +size 1208 diff --git a/assets/voxygen/voxel/npc/lion/female/leg_bl.vox b/assets/voxygen/voxel/npc/lion/female/leg_bl.vox new file mode 100644 index 0000000000..aa5bf3eede --- /dev/null +++ b/assets/voxygen/voxel/npc/lion/female/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9bf6beb766138ad541acebef1a4c0b6a3ba3c5eb80a1ef08f0cbdf608b57b25 +size 1588 diff --git a/assets/voxygen/voxel/npc/lion/female/leg_br.vox b/assets/voxygen/voxel/npc/lion/female/leg_br.vox new file mode 100644 index 0000000000..c2bed8e54f --- /dev/null +++ b/assets/voxygen/voxel/npc/lion/female/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cb413ad7494959c9b26bd5069bdf7975fce3246f8a361b173b81d4ffaed46a4 +size 1588 diff --git a/assets/voxygen/voxel/npc/lion/female/leg_fl.vox b/assets/voxygen/voxel/npc/lion/female/leg_fl.vox new file mode 100644 index 0000000000..aba893c97e --- /dev/null +++ b/assets/voxygen/voxel/npc/lion/female/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e85ef52e3cced1d3a191c96f3525728f59cb22c5199a54d8c40e7b466727fb9e +size 1528 diff --git a/assets/voxygen/voxel/npc/lion/female/leg_fr.vox b/assets/voxygen/voxel/npc/lion/female/leg_fr.vox new file mode 100644 index 0000000000..9333fa1870 --- /dev/null +++ b/assets/voxygen/voxel/npc/lion/female/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eeb93638d1fe87c1d351abe20a97705ced445eaf2446014c98a496086cf43816 +size 1528 diff --git a/assets/voxygen/voxel/npc/lion/female/tail.vox b/assets/voxygen/voxel/npc/lion/female/tail.vox index 9a2194fcc2..b6781cdf5f 100644 --- a/assets/voxygen/voxel/npc/lion/female/tail.vox +++ b/assets/voxygen/voxel/npc/lion/female/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfb9dba7a51709fdbe1aa145640d47d72b4dc989b2f5470d4ffc82f70d5e44da -size 254 +oid sha256:9727f7486a14ec0cfe0d5f0bff28e12bce5c2ea6a5c6cabab071d1c8ba48bdda +size 1364 diff --git a/assets/voxygen/voxel/npc/lion/female/torso_back.vox b/assets/voxygen/voxel/npc/lion/female/torso_back.vox index 0794fae664..02aa126731 100644 --- a/assets/voxygen/voxel/npc/lion/female/torso_back.vox +++ b/assets/voxygen/voxel/npc/lion/female/torso_back.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56c763901ca4115ad11c462d5e87140d15caacaa8108022b3c31d13e7f072bd4 -size 254 +oid sha256:92d43d9a5199a8cc2573bb90853fcff4b2d99f58e25db19bf0fd51c290a1b20e +size 4484 diff --git a/assets/voxygen/voxel/npc/lion/female/torso_front.vox b/assets/voxygen/voxel/npc/lion/female/torso_front.vox index 28f1022e62..ca0f001ca7 100644 --- a/assets/voxygen/voxel/npc/lion/female/torso_front.vox +++ b/assets/voxygen/voxel/npc/lion/female/torso_front.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3a4fb5d2dceddf155058a5ae53226e2b05af49ffa1cd344511cdbbe355d80ed -size 254 +oid sha256:0e95a7cae59fccbbce287e560cbe6d270438bd58f062476afae2b1c0c673c50a +size 5896 diff --git a/assets/voxygen/voxel/npc/lion/male/Lion (3)-10.vox b/assets/voxygen/voxel/npc/lion/male/Lion (3)-10.vox deleted file mode 100644 index 73a005122e..0000000000 --- a/assets/voxygen/voxel/npc/lion/male/Lion (3)-10.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7dc0a3231f764f8be21497e4b13279c3426cee2f54d6c24307f14a55ccb6c611 -size 1836 diff --git a/assets/voxygen/voxel/npc/lion/male/Lion (3)-6.vox b/assets/voxygen/voxel/npc/lion/male/Lion (3)-6.vox deleted file mode 100644 index 636af65879..0000000000 --- a/assets/voxygen/voxel/npc/lion/male/Lion (3)-6.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62593a17ce565b0c80d5f54ff1e156278b32e4f64b54bde5e342326cbbebe8ab -size 1740 diff --git a/assets/voxygen/voxel/npc/lion/male/Lion (3)-7.vox b/assets/voxygen/voxel/npc/lion/male/Lion (3)-7.vox deleted file mode 100644 index 8df56d05de..0000000000 --- a/assets/voxygen/voxel/npc/lion/male/Lion (3)-7.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d3c5bd6c1bfb1228381bdea22502654367a304d9683ca6c4068d24119db2ae1 -size 1836 diff --git a/assets/voxygen/voxel/npc/lion/male/Lion (3)-8.vox b/assets/voxygen/voxel/npc/lion/male/Lion (3)-8.vox deleted file mode 100644 index ca37d4a19a..0000000000 --- a/assets/voxygen/voxel/npc/lion/male/Lion (3)-8.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be48d4f9039c3f7556a685aa22a86770f8c971dc22659c7d8e85789220cc6bb7 -size 1144 diff --git a/assets/voxygen/voxel/npc/lion/male/Lion (3)-9.vox b/assets/voxygen/voxel/npc/lion/male/Lion (3)-9.vox deleted file mode 100644 index d553bda28f..0000000000 --- a/assets/voxygen/voxel/npc/lion/male/Lion (3)-9.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53ff2cb213eee6ea540e19aff94b753843cd574b3489769436eefe0d362a6398 -size 1740 diff --git a/assets/voxygen/voxel/npc/lion/male/foot_bl.vox b/assets/voxygen/voxel/npc/lion/male/foot_bl.vox index 8df56d05de..caa6986012 100644 --- a/assets/voxygen/voxel/npc/lion/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/lion/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d3c5bd6c1bfb1228381bdea22502654367a304d9683ca6c4068d24119db2ae1 -size 1836 +oid sha256:f52555a03158b801e0b748398de1afaae702d1f50e8680459410c8e87ad451a4 +size 1344 diff --git a/assets/voxygen/voxel/npc/lion/male/foot_br.vox b/assets/voxygen/voxel/npc/lion/male/foot_br.vox index 73a005122e..6465903cc9 100644 --- a/assets/voxygen/voxel/npc/lion/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/lion/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dc0a3231f764f8be21497e4b13279c3426cee2f54d6c24307f14a55ccb6c611 -size 1836 +oid sha256:1db636f3c7c21455618ebf9f409750f884d99f9279f8ae66e2ea84f4c08062f0 +size 55827 diff --git a/assets/voxygen/voxel/npc/lion/male/foot_fl.vox b/assets/voxygen/voxel/npc/lion/male/foot_fl.vox index 636af65879..e5fdd31ddb 100644 --- a/assets/voxygen/voxel/npc/lion/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/lion/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62593a17ce565b0c80d5f54ff1e156278b32e4f64b54bde5e342326cbbebe8ab -size 1740 +oid sha256:e1232a6c70aa203f517ff5c1e84272f99ec8a691d1a01fac4963cf5290396e46 +size 1308 diff --git a/assets/voxygen/voxel/npc/lion/male/foot_fr.vox b/assets/voxygen/voxel/npc/lion/male/foot_fr.vox index d553bda28f..f47853ec76 100644 --- a/assets/voxygen/voxel/npc/lion/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/lion/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53ff2cb213eee6ea540e19aff94b753843cd574b3489769436eefe0d362a6398 -size 1740 +oid sha256:83ac0de790cb459a2ac6771ab507674ba52dbde6e2da7042b2e9fdace0707281 +size 55791 diff --git a/assets/voxygen/voxel/npc/lion/male/head_lower.vox b/assets/voxygen/voxel/npc/lion/male/head_lower.vox index e2efb18a1a..e06f9cb1ca 100644 --- a/assets/voxygen/voxel/npc/lion/male/head_lower.vox +++ b/assets/voxygen/voxel/npc/lion/male/head_lower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83ea9b5263d98f68996cb817a17f7ce417c400d3a2ea3a40e63d77b80ecf2fc7 -size 254 +oid sha256:718dee3e909f6eb684cb735a92f7cf65937aa953d62e78ea9625851cb7aa4687 +size 7732 diff --git a/assets/voxygen/voxel/npc/lion/male/head_upper.vox b/assets/voxygen/voxel/npc/lion/male/head_upper.vox index 197370786c..f7e195272e 100644 --- a/assets/voxygen/voxel/npc/lion/male/head_upper.vox +++ b/assets/voxygen/voxel/npc/lion/male/head_upper.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b70da9d9ee7c4a828cc346e925e88365133f05428fcd5b87279a359147ecb1b9 -size 254 +oid sha256:bf7c62cfb2f28674ca13bb539b191b373c0a04f615a0248dd5e3ef445f143238 +size 2644 diff --git a/assets/voxygen/voxel/npc/lion/male/jaw.vox b/assets/voxygen/voxel/npc/lion/male/jaw.vox index e7b7750cd9..56d6853053 100644 --- a/assets/voxygen/voxel/npc/lion/male/jaw.vox +++ b/assets/voxygen/voxel/npc/lion/male/jaw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6e416e14a58557b6c54ff884577355450b39f5573fa064fb3b5135826ed9eec -size 254 +oid sha256:89c3aac859a997658b37e44304506bfde162e9dcacf9030ce847cc87113c821e +size 1208 diff --git a/assets/voxygen/voxel/npc/lion/male/leg_bl.vox b/assets/voxygen/voxel/npc/lion/male/leg_bl.vox new file mode 100644 index 0000000000..aa5bf3eede --- /dev/null +++ b/assets/voxygen/voxel/npc/lion/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9bf6beb766138ad541acebef1a4c0b6a3ba3c5eb80a1ef08f0cbdf608b57b25 +size 1588 diff --git a/assets/voxygen/voxel/npc/lion/male/leg_br.vox b/assets/voxygen/voxel/npc/lion/male/leg_br.vox new file mode 100644 index 0000000000..1cb6048e39 --- /dev/null +++ b/assets/voxygen/voxel/npc/lion/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9c2abccbaecd0b1ed89cd02dabb2b8346fd16b1078384c5d314e768509ba8bf +size 56071 diff --git a/assets/voxygen/voxel/npc/lion/male/leg_fl.vox b/assets/voxygen/voxel/npc/lion/male/leg_fl.vox new file mode 100644 index 0000000000..aba893c97e --- /dev/null +++ b/assets/voxygen/voxel/npc/lion/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e85ef52e3cced1d3a191c96f3525728f59cb22c5199a54d8c40e7b466727fb9e +size 1528 diff --git a/assets/voxygen/voxel/npc/lion/male/leg_fr.vox b/assets/voxygen/voxel/npc/lion/male/leg_fr.vox new file mode 100644 index 0000000000..eed9d14b4a --- /dev/null +++ b/assets/voxygen/voxel/npc/lion/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:438061de8138a936d8428edd19c531f761b6c95e3aeb15a52b578e5c6925807c +size 56011 diff --git a/assets/voxygen/voxel/npc/lion/male/tail.vox b/assets/voxygen/voxel/npc/lion/male/tail.vox index 9a2194fcc2..b6781cdf5f 100644 --- a/assets/voxygen/voxel/npc/lion/male/tail.vox +++ b/assets/voxygen/voxel/npc/lion/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfb9dba7a51709fdbe1aa145640d47d72b4dc989b2f5470d4ffc82f70d5e44da -size 254 +oid sha256:9727f7486a14ec0cfe0d5f0bff28e12bce5c2ea6a5c6cabab071d1c8ba48bdda +size 1364 diff --git a/assets/voxygen/voxel/npc/lion/male/torso_back.vox b/assets/voxygen/voxel/npc/lion/male/torso_back.vox index 0794fae664..02aa126731 100644 --- a/assets/voxygen/voxel/npc/lion/male/torso_back.vox +++ b/assets/voxygen/voxel/npc/lion/male/torso_back.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56c763901ca4115ad11c462d5e87140d15caacaa8108022b3c31d13e7f072bd4 -size 254 +oid sha256:92d43d9a5199a8cc2573bb90853fcff4b2d99f58e25db19bf0fd51c290a1b20e +size 4484 diff --git a/assets/voxygen/voxel/npc/lion/male/torso_front.vox b/assets/voxygen/voxel/npc/lion/male/torso_front.vox index 28f1022e62..ca0f001ca7 100644 --- a/assets/voxygen/voxel/npc/lion/male/torso_front.vox +++ b/assets/voxygen/voxel/npc/lion/male/torso_front.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3a4fb5d2dceddf155058a5ae53226e2b05af49ffa1cd344511cdbbe355d80ed -size 254 +oid sha256:0e95a7cae59fccbbce287e560cbe6d270438bd58f062476afae2b1c0c673c50a +size 5896 diff --git a/assets/voxygen/voxel/npc/saber/female/Saber-10.vox b/assets/voxygen/voxel/npc/saber/female/Saber-10.vox deleted file mode 100644 index f3eafe54b5..0000000000 --- a/assets/voxygen/voxel/npc/saber/female/Saber-10.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:958793f5f9e066836441694fbb153ef1c180ff40fd051badf239b7c740b9942c -size 1836 diff --git a/assets/voxygen/voxel/npc/saber/female/Saber-7.vox b/assets/voxygen/voxel/npc/saber/female/Saber-7.vox deleted file mode 100644 index 46b46d77ea..0000000000 --- a/assets/voxygen/voxel/npc/saber/female/Saber-7.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71b274a47de0194579d944facc39f453c1df201a861b02bdde6d1fed59cf5c5d -size 2048 diff --git a/assets/voxygen/voxel/npc/saber/female/Saber-8.vox b/assets/voxygen/voxel/npc/saber/female/Saber-8.vox deleted file mode 100644 index 57ead66282..0000000000 --- a/assets/voxygen/voxel/npc/saber/female/Saber-8.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:845e4c2841ddc4092dbc2b10e64f1907f00232b5542a786c3508057a8bd35633 -size 2048 diff --git a/assets/voxygen/voxel/npc/saber/female/Saber-9.vox b/assets/voxygen/voxel/npc/saber/female/Saber-9.vox deleted file mode 100644 index f3eafe54b5..0000000000 --- a/assets/voxygen/voxel/npc/saber/female/Saber-9.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:958793f5f9e066836441694fbb153ef1c180ff40fd051badf239b7c740b9942c -size 1836 diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron index 02a2d1cb35..d1aad8cfde 100644 --- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron @@ -82,7 +82,7 @@ central: ("npc.saber.male.torso_back"), ), ears: ( - offset: (-5.0, -1.0, 3.0), + offset: (-5.5, -1.0, -1.5), central: ("npc.saber.male.ears"), ), tail: ( @@ -112,7 +112,7 @@ central: ("npc.saber.female.torso_back"), ), ears: ( - offset: (-5.0, -0.5, -1.5), + offset: (-5.5, -1.0, -1.5), central: ("npc.saber.female.ears"), ), tail: ( @@ -182,61 +182,61 @@ ), (Lion, Male): ( upper: ( - offset: (-4.5, -5.0, -4.0), + offset: (-4.5, -10.0, -4.5), central: ("npc.lion.male.head_upper"), ), lower: ( - offset: (-6.5, -5.0, -7.0), + offset: (-7.5, -5.5, -8.5), central: ("npc.lion.male.head_lower"), ), jaw: ( - offset: (-2.5, -2.5, -0.5), + offset: (-2.5, -6.0, -1.0), central: ("npc.lion.male.jaw"), ), torso_front: ( - offset: (-5.5, -7.5, -5.5), + offset: (-5.5, -13.0, -6.0), central: ("npc.lion.male.torso_front"), ), torso_back: ( - offset: (-6.5, -6.0, -5.0), + offset: (-5.5, -6.0, -5.0), central: ("npc.lion.male.torso_back"), ), ears: ( - offset: (-3.5, -1.0, -1.0), + offset: (-4.5, -1.0, -1.0), central: ("npc.lion.male.ears"), ), tail: ( - offset: (-0.5, -1.0, -1.0), + offset: (-1.5, -15.0, -10.0), central: ("npc.lion.male.tail"), ), ), (Lion, Female): ( upper: ( - offset: (-4.5, -5.0, -4.0), + offset: (-4.5, -10.0, -4.5), central: ("npc.lion.female.head_upper"), ), lower: ( - offset: (-6.5, -5.0, -7.0), + offset: (-7.5, -5.5, -8.5), central: ("npc.lion.female.head_lower"), ), jaw: ( - offset: (-2.5, -2.5, -0.5), - central: ("npc.lion.male.jaw"), + offset: (-2.5, -6.0, -1.0), + central: ("npc.lion.female.jaw"), ), torso_front: ( - offset: (-5.5, -7.5, -5.5), + offset: (-5.5, -13.0, -6.0), central: ("npc.lion.female.torso_front"), ), torso_back: ( - offset: (-6.5, -6.0, -5.0), + offset: (-5.5, -6.0, -5.0), central: ("npc.lion.female.torso_back"), ), ears: ( - offset: (-3.5, -1.0, -1.0), + offset: (-4.5, -1.0, -1.0), central: ("npc.lion.female.ears"), ), tail: ( - offset: (-0.5, -12.0, -1.0), + offset: (-1.5, -15.0, -10.0), central: ("npc.lion.female.tail"), ), ), diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron index a6c378b8d9..11675deb7b 100644 --- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron @@ -205,69 +205,69 @@ ), (Lion, Male): ( leg_fl: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.0, -2.5, -2.5), lateral: ("npc.lion.male.leg_fl"), ), leg_fr: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.0, -2.5, -2.5), lateral: ("npc.lion.male.leg_fr"), ), leg_bl: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.0, -3.0, -4.0), lateral: ("npc.lion.male.leg_bl"), ), leg_br: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.0, -3.0, -4.0), lateral: ("npc.lion.male.leg_br"), ), foot_fl: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.5, -3.5, -2.5), lateral: ("npc.lion.male.foot_fl"), ), foot_fr: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.5, -3.5, -2.5), lateral: ("npc.lion.male.foot_fr"), ), foot_bl: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.5, -3.5, -6.0), lateral: ("npc.lion.male.foot_bl"), ), foot_br: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.5, -3.5, -6.0), lateral: ("npc.lion.male.foot_br"), ), ), (Lion, Female): ( leg_fl: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.0, -2.5, -2.5), lateral: ("npc.lion.female.leg_fl"), ), leg_fr: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.0, -2.5, -2.5), lateral: ("npc.lion.female.leg_fr"), ), leg_bl: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.0, -3.0, -4.0), lateral: ("npc.lion.female.leg_bl"), ), leg_br: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.0, -3.0, -4.0), lateral: ("npc.lion.female.leg_br"), ), foot_fl: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.5, -3.5, -2.5), lateral: ("npc.lion.female.foot_fl"), ), foot_fr: ( - offset: (-1.5, -1.5, -2.5), + offset: (-2.5, -3.5, -2.5), lateral: ("npc.lion.female.foot_fr"), ), foot_bl: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.5, -3.5, -6.0), lateral: ("npc.lion.female.foot_bl"), ), foot_br: ( - offset: (-1.5, -2.0, -3.5), + offset: (-2.5, -3.5, -6.0), lateral: ("npc.lion.female.foot_br"), ), ), diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs index f4187a1912..15a1c432c1 100644 --- a/voxygen/src/anim/src/quadruped_medium/mod.rs +++ b/voxygen/src/anim/src/quadruped_medium/mod.rs @@ -29,57 +29,57 @@ pub struct QuadrupedMediumSkeleton { } #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const HEAD_UPPER_Y: f32 = 0.0; +const HEAD_UPPER_Y: f32 = 7.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] const HEAD_UPPER_Z: f32 = 0.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const HEAD_LOWER_Y: f32 = 0.0; +const HEAD_LOWER_Y: f32 = 5.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const HEAD_LOWER_Z: f32 = 0.0; +const HEAD_LOWER_Z: f32 = 0.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const JAW_Y: f32 = 0.0; +const JAW_Y: f32 = 2.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const JAW_Z: f32 = -0.0; +const JAW_Z: f32 = -4.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const TAIL_Y: f32 = 0.0; +const TAIL_Y: f32 = -7.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const TAIL_Z: f32 = -0.0; +const TAIL_Z: f32 = -7.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const TORSO_BACK_Y: f32 = 0.0; +const TORSO_BACK_Y: f32 = -12.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] const TORSO_BACK_Z: f32 = 0.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] const TORSO_FRONT_Y: f32 = 0.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const TORSO_FRONT_Z: f32 = 0.0; +const TORSO_FRONT_Z: f32 = 12.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const EARS_Y: f32 = 0.0; +const EARS_Y: f32 = -2.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const EARS_Z: f32 = 0.0; +const EARS_Z: f32 = 5.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const LEG_FRONT_X: f32 = 0.0; +const LEG_FRONT_X: f32 = 6.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const LEG_FRONT_Y: f32 = -0.0; +const LEG_FRONT_Y: f32 = 1.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const LEG_FRONT_Z: f32 = 0.0; +const LEG_FRONT_Z: f32 = 7.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const LEG_BACK_X: f32 = 0.0; +const LEG_BACK_X: f32 = 5.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const LEG_BACK_Y: f32 = -0.0; +const LEG_BACK_Y: f32 = -14.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const LEG_BACK_Z: f32 = 0.0; +const LEG_BACK_Z: f32 = 8.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const FEET_FRONT_X: f32 = 0.0; +const FEET_FRONT_X: f32 = 0.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] const FEET_FRONT_Y: f32 = 0.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const FEET_FRONT_Z: f32 = 0.0; +const FEET_FRONT_Z: f32 = -4.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const FEET_BACK_X: f32 = 0.0; +const FEET_BACK_X: f32 = 0.5; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] const FEET_BACK_Y: f32 = 0.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const FEET_BACK_Z: f32 = 0.0; +const FEET_BACK_Z: f32 = -5.0; impl QuadrupedMediumSkeleton { @@ -196,90 +196,90 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { Self { head_upper: match (body.species, body.body_type) { (Grolgar, _) => (12.0, 16.0), - (Saber, _) => (14.0, 12.0), + (Saber, _) => (-11.0, -3.0), (Tuskram, _) => (9.0, 12.0), - (Lion, _) => (12.5, 14.0), + (Lion, _) => (12.0, 2.0), (Tarasque, _) => (14.0, 3.5), (Tiger, _) => (2.0, 1.0), }, head_lower: match (body.species, body.body_type) { (Grolgar, _) => (-4.0, -7.0), - (Saber, _) => (-6.0, 0.0), + (Saber, _) => (1.0, 0.0), (Tuskram, _) => (-3.0, -1.0), - (Lion, _) => (-5.0, -1.0), + (Lion, _) => (0.5, 1.0), (Tiger, _) => (0.0, 0.0), (Tarasque, _) => (0.5, -2.0), (Tiger, _) => (-5.0, -6.0), }, jaw: match (body.species, body.body_type) { (Grolgar, _) => (3.0, -5.0), - (Saber, _) => (2.0, -1.0), + (Saber, _) => (18.0, -1.0), (Tuskram, _) => (2.0, -2.0), - (Lion, _) => (2.0, -3.0), - (Tarasque, _) => (1.5, -10.0), - (Tiger, _) => (8.0, -4.0), + (Lion, _) => (0.0, -4.5), + (Tarasque, _) => (0.0, -10.0), + (Tiger, _) => (7.0, -4.0), }, tail: match (body.species, body.body_type) { (Grolgar, _) => (-6.0, -2.0), - (Saber, _) => (-4.0, -2.0), + (Saber, _) => (-6.0, 1.0), (Tuskram, _) => (-6.0, -2.0), - (Lion, _) => (-8.0, -6.0), + (Lion, _) => (-6.0, 1.0), (Tarasque, _) => (2.0, 0.0), (Tiger, _) => (-6.5, -7.0), }, torso_front: match (body.species, body.body_type) { (Grolgar, _) => (-7.0, 10.5), - (Saber, _) => (-7.0, 9.5), + (Saber, _) => (14.0, 13.0), (Tuskram, _) => (-7.0, 9.0), - (Lion, _) => (-9.0, 9.0), + (Lion, _) => (0.0, 13.0), (Tarasque, _) => (11.5, 18.5), (Tiger, _) => (10.0, 12.0), }, torso_back: match (body.species, body.body_type) { (Grolgar, _) => (4.0, 11.0), - (Saber, _) => (4.0, 9.0), + (Saber, _) => (-19.5, 0.0), (Tuskram, _) => (4.0, 9.0), - (Lion, _) => (4.0, 10.0), + (Lion, _) => (-19.0, -1.0), (Tarasque, _) => (-26.5, -1.0), (Tiger, _) => (-19.0, 0.0), }, ears: match (body.species, body.body_type) { (Grolgar, _) => (-1.0, 5.0), - (Saber, _) => (-1.0, 6.0), + (Saber, _) => (13.0, 7.0), (Tuskram, _) => (10.0, 2.0), - (Lion, _) => (-2.0, 4.0), + (Lion, _) => (-8.0, 4.5), (Tarasque, _) => (-5.0, 1.0), (Tiger, _) => (2.5, 5.0), }, leg_f: match (body.species, body.body_type) { (Grolgar, _) => (5.0, 6.0, 2.0), - (Saber, _) => (4.0, 6.0, 3.0), + (Saber, _) => (7.0, -7.5, -3.5), (Tuskram, _) => (4.0, 6.0, 4.5), - (Lion, _) => (5.0, 6.0, 3.0), + (Lion, _) => (7.5, -4.5, -6.0), (Tarasque, _) => (7.5, -2.0, -6.0), (Tiger, _) => (7.0, -2.0, -1.0), }, leg_b: match (body.species, body.body_type) { (Grolgar, _) => (5.0, -4.0, 3.0), - (Saber, _) => (4.0, -6.0, 3.5), + (Saber, _) => (6.0, -1.0, -4.0), (Tuskram, _) => (4.0, -8.0, 5.5), - (Lion, _) => (5.5, -8.0, 3.5), + (Lion, _) => (6.0, 0.0, -2.0), (Tarasque, _) => (6.0, 4.5, -6.0), (Tiger, _) => (7.0, -2.0, -1.0), }, feet_f: match (body.species, body.body_type) { (Grolgar, _) => (5.0, 6.0, 2.0), - (Saber, _) => (4.0, 6.0, 3.0), + (Saber, _) => (1.0, 3.0, -1.0), (Tuskram, _) => (4.0, 6.0, 4.5), - (Lion, _) => (5.0, 6.0, 3.0), + (Lion, _) => (0.0, 2.0, -4.5), (Tarasque, _) => (2.0, -0.5, -4.5), (Tiger, _) => (1.0, 0.0, -5.0), }, feet_b: match (body.species, body.body_type) { (Grolgar, _) => (5.0, -4.0, 3.0), - (Saber, _) => (4.0, -6.0, 3.5), + (Saber, _) => (1.0, 0.0, 0.0), (Tuskram, _) => (4.0, -8.0, 5.5), - (Lion, _) => (5.5, -8.0, 3.5), + (Lion, _) => (0.5, 0.5, -4.0), (Tarasque, _) => (1.5, -0.5, -3.5), (Tiger, _) => (1.0, 0.5, -4.0), },