diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json index 4cef11f55b..e58400d576 100644 --- a/assets/common/npc_names.json +++ b/assets/common/npc_names.json @@ -298,6 +298,30 @@ "roshwalr": { "keyword": "roshwalr", "generic": "Roshwalr" + }, + "donkey": { + "keyword": "donkey", + "generic": "Donkey" + }, + "camel": { + "keyword": "camel", + "generic": "Camel" + }, + "zebra": { + "keyword": "zebra", + "generic": "Zebra" + }, + "antelope": { + "keyword": "antelope", + "generic": "Antelope" + }, + "kelpie": { + "keyword": "kelpie", + "generic": "Kelpie" + }, + "horse": { + "keyword": "horse", + "generic": "Horse" } } }, diff --git a/assets/voxygen/voxel/npc/antelope/male/foot_bl.vox b/assets/voxygen/voxel/npc/antelope/male/foot_bl.vox new file mode 100644 index 0000000000..9afedc25e9 --- /dev/null +++ b/assets/voxygen/voxel/npc/antelope/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38b152453d10f295128470bb061555bfec310ad2c9e9d5c81fc3ff730fa54d13 +size 1224 diff --git a/assets/voxygen/voxel/npc/antelope/male/foot_br.vox b/assets/voxygen/voxel/npc/antelope/male/foot_br.vox new file mode 100644 index 0000000000..86a6ac2de5 --- /dev/null +++ b/assets/voxygen/voxel/npc/antelope/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eda7dbcd798737163c1d6fe9c5f1bbf7979fee35d60c3053fdde43959002a696 +size 1224 diff --git a/assets/voxygen/voxel/npc/antelope/male/foot_fl.vox b/assets/voxygen/voxel/npc/antelope/male/foot_fl.vox new file mode 100644 index 0000000000..b1095c4307 --- /dev/null +++ b/assets/voxygen/voxel/npc/antelope/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3eb8fa5ac6ce816784a0eed66ac5487a561d60460af3deeeb998824864d01bb1 +size 1240 diff --git a/assets/voxygen/voxel/npc/antelope/male/foot_fr.vox b/assets/voxygen/voxel/npc/antelope/male/foot_fr.vox new file mode 100644 index 0000000000..987124e33e --- /dev/null +++ b/assets/voxygen/voxel/npc/antelope/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c7f53b37e378736beb5fa290929093c94aeabd579e3dc21f968b8005f129900 +size 1240 diff --git a/assets/voxygen/voxel/npc/antelope/male/head.vox b/assets/voxygen/voxel/npc/antelope/male/head.vox new file mode 100644 index 0000000000..4eac9d2242 --- /dev/null +++ b/assets/voxygen/voxel/npc/antelope/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b19fa5bf60f479f5bb803fae01d718d1f006a7cd0fa7e8d27666beacf7f62796 +size 2128 diff --git a/assets/voxygen/voxel/npc/antelope/male/jaw.vox b/assets/voxygen/voxel/npc/antelope/male/jaw.vox new file mode 100644 index 0000000000..ec34fd15d7 --- /dev/null +++ b/assets/voxygen/voxel/npc/antelope/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e37d54607242084157eca1b24a87948b3f7a93b85cfa96423b2f1b9898635cf +size 1120 diff --git a/assets/voxygen/voxel/npc/antelope/male/leg_bl.vox b/assets/voxygen/voxel/npc/antelope/male/leg_bl.vox new file mode 100644 index 0000000000..7c2a01e18b --- /dev/null +++ b/assets/voxygen/voxel/npc/antelope/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce303274bbef4d8017def9f4523892610f0c0bfb551dc49e0bebba263c1a0ae9 +size 1564 diff --git a/assets/voxygen/voxel/npc/antelope/male/leg_br.vox b/assets/voxygen/voxel/npc/antelope/male/leg_br.vox new file mode 100644 index 0000000000..874ee252ea --- /dev/null +++ b/assets/voxygen/voxel/npc/antelope/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9f5e4df23010464488f51aa2e05505e3526379bab6aec6670f1fce25025ab82 +size 1564 diff --git a/assets/voxygen/voxel/npc/antelope/male/leg_fl.vox b/assets/voxygen/voxel/npc/antelope/male/leg_fl.vox new file mode 100644 index 0000000000..3ea98d3cd9 --- /dev/null +++ b/assets/voxygen/voxel/npc/antelope/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f15803ca7d9c7e1d7498c248f8aa5b6a47bf8e6250ff2e439d37126eb45bba09 +size 1444 diff --git a/assets/voxygen/voxel/npc/antelope/male/leg_fr.vox b/assets/voxygen/voxel/npc/antelope/male/leg_fr.vox new file mode 100644 index 0000000000..018065ba04 --- /dev/null +++ b/assets/voxygen/voxel/npc/antelope/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4af273b3b1e5ad49198e83c6d0a9de9a427a850997d06f0d199659a4954c439 +size 1444 diff --git a/assets/voxygen/voxel/npc/antelope/male/neck.vox b/assets/voxygen/voxel/npc/antelope/male/neck.vox new file mode 100644 index 0000000000..f93cf57f4a --- /dev/null +++ b/assets/voxygen/voxel/npc/antelope/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ea605664bbfac9ad9a5ffa570c8c280a4496c5090f1888b6ca76a94d463802a +size 1800 diff --git a/assets/voxygen/voxel/npc/antelope/male/tail.vox b/assets/voxygen/voxel/npc/antelope/male/tail.vox new file mode 100644 index 0000000000..6fc5544e46 --- /dev/null +++ b/assets/voxygen/voxel/npc/antelope/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:762e638c6a9197af56cc574b8a7953dfe74a978efe9ff906e95531bd777ff76c +size 1160 diff --git a/assets/voxygen/voxel/npc/antelope/male/torso_back.vox b/assets/voxygen/voxel/npc/antelope/male/torso_back.vox new file mode 100644 index 0000000000..27a05cf208 --- /dev/null +++ b/assets/voxygen/voxel/npc/antelope/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c595dcd4148fdc750f200dddbc43657cd4e3c3a76ea191950cca59083ef4591a +size 2664 diff --git a/assets/voxygen/voxel/npc/antelope/male/torso_front.vox b/assets/voxygen/voxel/npc/antelope/male/torso_front.vox new file mode 100644 index 0000000000..c6db304a9b --- /dev/null +++ b/assets/voxygen/voxel/npc/antelope/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:913df52e7ed772faa8524de34e9ba64bc3d37ebaf8d50943a48e2649f2549370 +size 2512 diff --git a/assets/voxygen/voxel/npc/camel/male/foot_bl.vox b/assets/voxygen/voxel/npc/camel/male/foot_bl.vox new file mode 100644 index 0000000000..9e0fff1c65 --- /dev/null +++ b/assets/voxygen/voxel/npc/camel/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d5f018aa6b6b95d51890900074696b9232c7d0cc75363242d1678498fa9eb80 +size 1332 diff --git a/assets/voxygen/voxel/npc/camel/male/foot_br.vox b/assets/voxygen/voxel/npc/camel/male/foot_br.vox new file mode 100644 index 0000000000..e2103861f1 --- /dev/null +++ b/assets/voxygen/voxel/npc/camel/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0b0b85cd5477162a30c30eb60b85918dcfe104b579ae4c3c764654de29898d5 +size 1332 diff --git a/assets/voxygen/voxel/npc/camel/male/foot_fl.vox b/assets/voxygen/voxel/npc/camel/male/foot_fl.vox new file mode 100644 index 0000000000..8472cab5df --- /dev/null +++ b/assets/voxygen/voxel/npc/camel/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb7fa0b9d5cad68dab0afbc8f6372bac88ada4cae24d40e5fc007d87637155b5 +size 1376 diff --git a/assets/voxygen/voxel/npc/camel/male/foot_fr.vox b/assets/voxygen/voxel/npc/camel/male/foot_fr.vox new file mode 100644 index 0000000000..323d35a824 --- /dev/null +++ b/assets/voxygen/voxel/npc/camel/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:073115fbb887c32ffb1f8b4236ba634f34e694140da0d1253f97663054d650b2 +size 1376 diff --git a/assets/voxygen/voxel/npc/camel/male/head.vox b/assets/voxygen/voxel/npc/camel/male/head.vox new file mode 100644 index 0000000000..0353563e63 --- /dev/null +++ b/assets/voxygen/voxel/npc/camel/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8972541497f059f234ba90aafc87f4382c0e0640c68c72a0c12f86fabb3bfdc7 +size 2156 diff --git a/assets/voxygen/voxel/npc/camel/male/jaw.vox b/assets/voxygen/voxel/npc/camel/male/jaw.vox new file mode 100644 index 0000000000..51ce875955 --- /dev/null +++ b/assets/voxygen/voxel/npc/camel/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af7a0a8d79e09fb69fb927781e8ba8dc459995a1d239e5dbd0700a43a000df49 +size 1220 diff --git a/assets/voxygen/voxel/npc/camel/male/leg_bl.vox b/assets/voxygen/voxel/npc/camel/male/leg_bl.vox new file mode 100644 index 0000000000..5af3ab1f3e --- /dev/null +++ b/assets/voxygen/voxel/npc/camel/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94d6d3cec317950575effc92caf16617448702b702bda82c0ae9e000b7d2f20e +size 2084 diff --git a/assets/voxygen/voxel/npc/camel/male/leg_br.vox b/assets/voxygen/voxel/npc/camel/male/leg_br.vox new file mode 100644 index 0000000000..fafd29c891 --- /dev/null +++ b/assets/voxygen/voxel/npc/camel/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b07da01eab1da0a95775fb319782c3b7519747b7ec4ac738d0ef2a661e52bfba +size 2084 diff --git a/assets/voxygen/voxel/npc/camel/male/leg_fl.vox b/assets/voxygen/voxel/npc/camel/male/leg_fl.vox new file mode 100644 index 0000000000..652c869349 --- /dev/null +++ b/assets/voxygen/voxel/npc/camel/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f251d1a4b4fb3013ffc4c397c96b13d4dbc8eb76a2b5dc7e2897b076b46d605a +size 2096 diff --git a/assets/voxygen/voxel/npc/camel/male/leg_fr.vox b/assets/voxygen/voxel/npc/camel/male/leg_fr.vox new file mode 100644 index 0000000000..06736810bf --- /dev/null +++ b/assets/voxygen/voxel/npc/camel/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c8f97f2a7a2cda841b41b417539f04c56a980ee7b326b0410a79404f9a826af +size 2096 diff --git a/assets/voxygen/voxel/npc/camel/male/neck.vox b/assets/voxygen/voxel/npc/camel/male/neck.vox new file mode 100644 index 0000000000..3125902fc8 --- /dev/null +++ b/assets/voxygen/voxel/npc/camel/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c61ef820366a417e6d7bf7359f1ff908b3fda1916079bb5175cfff98b9978b42 +size 3136 diff --git a/assets/voxygen/voxel/npc/camel/male/tail.vox b/assets/voxygen/voxel/npc/camel/male/tail.vox new file mode 100644 index 0000000000..ce0583f248 --- /dev/null +++ b/assets/voxygen/voxel/npc/camel/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d76b36952927774a70954d2c6d2f28bf8c181f0de2f2907d182d1452877bec56 +size 1328 diff --git a/assets/voxygen/voxel/npc/camel/male/torso_back.vox b/assets/voxygen/voxel/npc/camel/male/torso_back.vox new file mode 100644 index 0000000000..2682024b5d --- /dev/null +++ b/assets/voxygen/voxel/npc/camel/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea312c679e533437baee93e17a64389c5f6c4c3249d65eea3761e9f26bbec3d4 +size 7504 diff --git a/assets/voxygen/voxel/npc/camel/male/torso_front.vox b/assets/voxygen/voxel/npc/camel/male/torso_front.vox new file mode 100644 index 0000000000..f2b3786639 --- /dev/null +++ b/assets/voxygen/voxel/npc/camel/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a921f95d88aa469e530aa24a093f47ee04c6d7c5c9cde9a8dc1b655158479d28 +size 8236 diff --git a/assets/voxygen/voxel/npc/donkey/male/ears.vox b/assets/voxygen/voxel/npc/donkey/male/ears.vox new file mode 100644 index 0000000000..6cb0ca260c --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/ears.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fff4001a1667d7007aaa15f034a3618a1b81df444aee11fb751228f3615fe0fa +size 1248 diff --git a/assets/voxygen/voxel/npc/donkey/male/foot_bl.vox b/assets/voxygen/voxel/npc/donkey/male/foot_bl.vox new file mode 100644 index 0000000000..1a977abc38 --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebf252ce3239ebeb744aea3c2c62c198b3ed156df5ecc96df2789a569fd3c716 +size 1420 diff --git a/assets/voxygen/voxel/npc/donkey/male/foot_br.vox b/assets/voxygen/voxel/npc/donkey/male/foot_br.vox new file mode 100644 index 0000000000..fdade542c0 --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d168ec6dcb9c70343b90458b8cd2a19f2749cb3a6401c1664a5ba991436c8835 +size 1420 diff --git a/assets/voxygen/voxel/npc/donkey/male/foot_fl.vox b/assets/voxygen/voxel/npc/donkey/male/foot_fl.vox new file mode 100644 index 0000000000..66a34d2e78 --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72f43edb3e048503490fa63080cd0e59d287ad450c08487579d29f19838bfa3e +size 1440 diff --git a/assets/voxygen/voxel/npc/donkey/male/foot_fr.vox b/assets/voxygen/voxel/npc/donkey/male/foot_fr.vox new file mode 100644 index 0000000000..311861e7d6 --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4aabd33398ccf6367d2953139a48be045b79213e488e1fece98c558bb1966c21 +size 1440 diff --git a/assets/voxygen/voxel/npc/donkey/male/head.vox b/assets/voxygen/voxel/npc/donkey/male/head.vox new file mode 100644 index 0000000000..f824160b46 --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbdc3bafe97e01e474a49cdc9058e44d0647c0b5e68b49a978a98076fd4cfe63 +size 2656 diff --git a/assets/voxygen/voxel/npc/donkey/male/jaw.vox b/assets/voxygen/voxel/npc/donkey/male/jaw.vox new file mode 100644 index 0000000000..2548c5a1bd --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26799f0a27139cbbeaca3b1796e7efe5fe7701bd0f926212d4705fa328b63f12 +size 1224 diff --git a/assets/voxygen/voxel/npc/donkey/male/leg_bl.vox b/assets/voxygen/voxel/npc/donkey/male/leg_bl.vox new file mode 100644 index 0000000000..46c2e1ff45 --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16a08031aeb88d01dac15f60a2a35e71ecd248c478c6959f768f89fdc62510bc +size 1880 diff --git a/assets/voxygen/voxel/npc/donkey/male/leg_br.vox b/assets/voxygen/voxel/npc/donkey/male/leg_br.vox new file mode 100644 index 0000000000..a1dffed320 --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc879fab8782930786adba6b984f9b409516d172aeb9f03406bd3b8f8499c274 +size 1880 diff --git a/assets/voxygen/voxel/npc/donkey/male/leg_fl.vox b/assets/voxygen/voxel/npc/donkey/male/leg_fl.vox new file mode 100644 index 0000000000..68e72aab66 --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8020cfa04c114f343e72036ba17cfd301cd0900e006216032c1b0bac82a973a0 +size 1828 diff --git a/assets/voxygen/voxel/npc/donkey/male/leg_fr.vox b/assets/voxygen/voxel/npc/donkey/male/leg_fr.vox new file mode 100644 index 0000000000..4410f4c27c --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:184b355ce7c7edc6c842132287d8f0b84d7175764f58337a4cf85a5ed870f7c2 +size 1828 diff --git a/assets/voxygen/voxel/npc/donkey/male/neck.vox b/assets/voxygen/voxel/npc/donkey/male/neck.vox new file mode 100644 index 0000000000..d9de717608 --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f60c14e996ba0085fc7426f1d01a45a2029299a5569a7c9b11b1f0bc8e43360 +size 2680 diff --git a/assets/voxygen/voxel/npc/donkey/male/tail.vox b/assets/voxygen/voxel/npc/donkey/male/tail.vox new file mode 100644 index 0000000000..4632c9ca0a --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb96d22c1f8ba054de8ce68807feeb42536837dd85ea0fe167eec7b830c8b56e +size 1288 diff --git a/assets/voxygen/voxel/npc/donkey/male/torso_back.vox b/assets/voxygen/voxel/npc/donkey/male/torso_back.vox new file mode 100644 index 0000000000..1947dd7e59 --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:636cd1444ebe3ec11eca045298d16074303543ea0b1d09397d44687d5c27ff31 +size 4840 diff --git a/assets/voxygen/voxel/npc/donkey/male/torso_front.vox b/assets/voxygen/voxel/npc/donkey/male/torso_front.vox new file mode 100644 index 0000000000..c202ecb8b7 --- /dev/null +++ b/assets/voxygen/voxel/npc/donkey/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6eddd495358787aba0978b1871b66652d747fef7e320428a3042e8fa335174e +size 3344 diff --git a/assets/voxygen/voxel/npc/horse/male/ears.vox b/assets/voxygen/voxel/npc/horse/male/ears.vox new file mode 100644 index 0000000000..ffa68fc553 --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/ears.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e6fb7820cb1991f3df1cb81d46605f573cb16692d947ad8ff25352fa7a9e5e3 +size 1160 diff --git a/assets/voxygen/voxel/npc/horse/male/foot_bl.vox b/assets/voxygen/voxel/npc/horse/male/foot_bl.vox new file mode 100644 index 0000000000..d78daf00ab --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:588888523fdba982bda734dd6b1c3120e2810b501cd47a27f668c4347c0a5e27 +size 1360 diff --git a/assets/voxygen/voxel/npc/horse/male/foot_br.vox b/assets/voxygen/voxel/npc/horse/male/foot_br.vox new file mode 100644 index 0000000000..eb9fe6950a --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9d6798b4611d2e45740617bd613a89e0a691fdcae94e7d1e4c9cabf6b20a826 +size 1360 diff --git a/assets/voxygen/voxel/npc/horse/male/foot_fl.vox b/assets/voxygen/voxel/npc/horse/male/foot_fl.vox new file mode 100644 index 0000000000..f6a9153724 --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74078c7d5b039e2f7a856908ddd295af35bf643a676df236d789028986326c2d +size 1376 diff --git a/assets/voxygen/voxel/npc/horse/male/foot_fr.vox b/assets/voxygen/voxel/npc/horse/male/foot_fr.vox new file mode 100644 index 0000000000..b904151019 --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92ccbf656e96b9a759eadbb0d517c5edbae76f46a09a57a493fa84fbe34f5ac1 +size 1376 diff --git a/assets/voxygen/voxel/npc/horse/male/head.vox b/assets/voxygen/voxel/npc/horse/male/head.vox new file mode 100644 index 0000000000..3ea6b850c5 --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7831710e00de070088ddeca6674ba10c6c17f87a658241ebf34aa88d0e78a1ef +size 2444 diff --git a/assets/voxygen/voxel/npc/horse/male/jaw.vox b/assets/voxygen/voxel/npc/horse/male/jaw.vox new file mode 100644 index 0000000000..0f0b645cf5 --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a4b583f03a4d10b1dfe574b3301f488564f8e48dcc1f3f216d1d32da6c18f51 +size 1184 diff --git a/assets/voxygen/voxel/npc/horse/male/leg_bl.vox b/assets/voxygen/voxel/npc/horse/male/leg_bl.vox new file mode 100644 index 0000000000..4ec3cedf89 --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a3ee17c50e19a94beb194cfdf3bcbcc551edc5640e47787804160fb34d7b895 +size 1684 diff --git a/assets/voxygen/voxel/npc/horse/male/leg_br.vox b/assets/voxygen/voxel/npc/horse/male/leg_br.vox new file mode 100644 index 0000000000..6ba7360df7 --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ad949c04a8fcedf66f36adae3df14a407ef272c5414c827fab682de68a704a9 +size 1684 diff --git a/assets/voxygen/voxel/npc/horse/male/leg_fl.vox b/assets/voxygen/voxel/npc/horse/male/leg_fl.vox new file mode 100644 index 0000000000..e4706cd7d5 --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c9b017b800204dcac085a4dd53984c01fa15f03a2573c14b0aa5319651bf15f +size 1568 diff --git a/assets/voxygen/voxel/npc/horse/male/leg_fr.vox b/assets/voxygen/voxel/npc/horse/male/leg_fr.vox new file mode 100644 index 0000000000..69606f62ca --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e3e7787f3bb432bc21d56139cadb02cd2be6265ecf563d86a4081f65df30603 +size 1568 diff --git a/assets/voxygen/voxel/npc/horse/male/neck.vox b/assets/voxygen/voxel/npc/horse/male/neck.vox new file mode 100644 index 0000000000..16b7d7b630 --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f3e20cdc62aed1c7836dfefc683940954de44a784fe7057a3cc5b9447008195 +size 2724 diff --git a/assets/voxygen/voxel/npc/horse/male/tail.vox b/assets/voxygen/voxel/npc/horse/male/tail.vox new file mode 100644 index 0000000000..5b2e3706b4 --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:084023f5cc15c4e66e2121d94ed5d0f014b2f99f40a663ff5ea2fa7031383212 +size 1608 diff --git a/assets/voxygen/voxel/npc/horse/male/torso_back.vox b/assets/voxygen/voxel/npc/horse/male/torso_back.vox new file mode 100644 index 0000000000..ff6803b738 --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdb53488f036cdf8ac2ac0b8a74529e8c8cf4a642f783477cedb9cd87ce8fe4d +size 3392 diff --git a/assets/voxygen/voxel/npc/horse/male/torso_front.vox b/assets/voxygen/voxel/npc/horse/male/torso_front.vox new file mode 100644 index 0000000000..ccd171047e --- /dev/null +++ b/assets/voxygen/voxel/npc/horse/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:edd7135e2d79bccb49e5bcab4ba2ad2cf2a12f0d38740002b4437cd5a7fe4361 +size 3808 diff --git a/assets/voxygen/voxel/npc/kelpie/male/ears.vox b/assets/voxygen/voxel/npc/kelpie/male/ears.vox new file mode 100644 index 0000000000..d13bf04665 --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/ears.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0875c208892d37c47db4284f05f6d2d061d9ebd173a06c3f3f74f8746cdaeee5 +size 1160 diff --git a/assets/voxygen/voxel/npc/kelpie/male/foot_bl.vox b/assets/voxygen/voxel/npc/kelpie/male/foot_bl.vox new file mode 100644 index 0000000000..fe2584dff0 --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2aca1289dc3d297add93a799a800cc408b7833eb9ded253ca3a9387d10c35dbf +size 1360 diff --git a/assets/voxygen/voxel/npc/kelpie/male/foot_br.vox b/assets/voxygen/voxel/npc/kelpie/male/foot_br.vox new file mode 100644 index 0000000000..0e26d75651 --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fc50e729078665150402697bd95b0f8a0c32f3bc4da7ba2ca93bd330ee2f422 +size 1360 diff --git a/assets/voxygen/voxel/npc/kelpie/male/foot_fl.vox b/assets/voxygen/voxel/npc/kelpie/male/foot_fl.vox new file mode 100644 index 0000000000..33c38fa578 --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b103652193a178446b6dc37c0d400b13d9df8f85dda232ea652fce1de75dcc9c +size 1376 diff --git a/assets/voxygen/voxel/npc/kelpie/male/foot_fr.vox b/assets/voxygen/voxel/npc/kelpie/male/foot_fr.vox new file mode 100644 index 0000000000..13503c6247 --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2596c73ff1b96c0fb7ecd7e7c76923501b87e7d3ccdb8e119f2b1ec9683235b8 +size 1376 diff --git a/assets/voxygen/voxel/npc/kelpie/male/head.vox b/assets/voxygen/voxel/npc/kelpie/male/head.vox new file mode 100644 index 0000000000..ab9123cf69 --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0b32236b333b2844eaadb164a26ac62f156eb6963cc767ae0e60e3e9bb7a26c +size 2636 diff --git a/assets/voxygen/voxel/npc/kelpie/male/jaw.vox b/assets/voxygen/voxel/npc/kelpie/male/jaw.vox new file mode 100644 index 0000000000..2cebc7207a --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4df9d81d5848a51cc55932d7dd0016711ea991cda783b8950579bae81a7f8a9 +size 1240 diff --git a/assets/voxygen/voxel/npc/kelpie/male/leg_bl.vox b/assets/voxygen/voxel/npc/kelpie/male/leg_bl.vox new file mode 100644 index 0000000000..7260807b5e --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72d3c27a89e29929b21153067bfc3975dd75ce187ff3246d18c6b34fa48d0e9d +size 1684 diff --git a/assets/voxygen/voxel/npc/kelpie/male/leg_br.vox b/assets/voxygen/voxel/npc/kelpie/male/leg_br.vox new file mode 100644 index 0000000000..ec55407e34 --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:313fbb3497ad1d794e29b484bbb998471c4ee13d5705afb10e72c316a00c8593 +size 1684 diff --git a/assets/voxygen/voxel/npc/kelpie/male/leg_fl.vox b/assets/voxygen/voxel/npc/kelpie/male/leg_fl.vox new file mode 100644 index 0000000000..fe1da55649 --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26d41b1fd0a2756b0a9c935f7bda38d6f20d7aebfc56294191e66628abfa6488 +size 1564 diff --git a/assets/voxygen/voxel/npc/kelpie/male/leg_fr.vox b/assets/voxygen/voxel/npc/kelpie/male/leg_fr.vox new file mode 100644 index 0000000000..6ad0892e91 --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e0d139ac86e45895d7138863871cb7311c485d49eeab36a845729cfa271ab7c +size 1564 diff --git a/assets/voxygen/voxel/npc/kelpie/male/neck.vox b/assets/voxygen/voxel/npc/kelpie/male/neck.vox new file mode 100644 index 0000000000..76185049dc --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bbabcfc98c97e8db79e10db685526c86f17e96e90a942e215d2c9122f7950b9 +size 2608 diff --git a/assets/voxygen/voxel/npc/kelpie/male/tail.vox b/assets/voxygen/voxel/npc/kelpie/male/tail.vox new file mode 100644 index 0000000000..251838d3f6 --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a22d0d0f4c399e0040acce63aa27d2cdc10a73fcc46c6feec8297d6684d430a +size 1472 diff --git a/assets/voxygen/voxel/npc/kelpie/male/torso_back.vox b/assets/voxygen/voxel/npc/kelpie/male/torso_back.vox new file mode 100644 index 0000000000..028bb67b09 --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e168b3e704a30b0660bbb5f92a95eb5e33a44580cc2c3922164954fb385d00e0 +size 3136 diff --git a/assets/voxygen/voxel/npc/kelpie/male/torso_front.vox b/assets/voxygen/voxel/npc/kelpie/male/torso_front.vox new file mode 100644 index 0000000000..352f1b637a --- /dev/null +++ b/assets/voxygen/voxel/npc/kelpie/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a8130bdf9cd5b06b2dcc7b542ebc4da9a7f0a4002ae4d5c607feec1e5a0adbb +size 3864 diff --git a/assets/voxygen/voxel/npc/zebra/male/ears.vox b/assets/voxygen/voxel/npc/zebra/male/ears.vox new file mode 100644 index 0000000000..faf3a6f041 --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/ears.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7cc4e032bbc90334cfca14558ab50d8d219cd35c3a2442ce8b90b8907e54c83 +size 1192 diff --git a/assets/voxygen/voxel/npc/zebra/male/foot_bl.vox b/assets/voxygen/voxel/npc/zebra/male/foot_bl.vox new file mode 100644 index 0000000000..f67bbc88b9 --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35e487340fcb1b83f855a0a81969a7de1153b91551f8bc964b947965bfc500ef +size 1360 diff --git a/assets/voxygen/voxel/npc/zebra/male/foot_br.vox b/assets/voxygen/voxel/npc/zebra/male/foot_br.vox new file mode 100644 index 0000000000..3626adc43e --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:697b4cf8a1eca38568f403348a6ae559cf609442ed524fe7c71d024f80ebb790 +size 1360 diff --git a/assets/voxygen/voxel/npc/zebra/male/foot_fl.vox b/assets/voxygen/voxel/npc/zebra/male/foot_fl.vox new file mode 100644 index 0000000000..7a463da532 --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5fd062d2c48464bf1a048258257fac372ee35a977c582c57d14c04005632082 +size 1376 diff --git a/assets/voxygen/voxel/npc/zebra/male/foot_fr.vox b/assets/voxygen/voxel/npc/zebra/male/foot_fr.vox new file mode 100644 index 0000000000..c47b1148a1 --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9f7e86ff35b3f616e96465ef50f2cb51ee40f4a652be2e9a18f22ad0b061f7b +size 1376 diff --git a/assets/voxygen/voxel/npc/zebra/male/head.vox b/assets/voxygen/voxel/npc/zebra/male/head.vox new file mode 100644 index 0000000000..f14bfd35d4 --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d214825bfbc702f6a7ba277755a274b9c57ac7428ef93321d053a3e9a4ec6b0 +size 2352 diff --git a/assets/voxygen/voxel/npc/zebra/male/jaw.vox b/assets/voxygen/voxel/npc/zebra/male/jaw.vox new file mode 100644 index 0000000000..ae83616856 --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7d5c04564ab8aae553802dd9e9a705599c44d7f54f7aa7d4e0ccce9c299b4d8 +size 1208 diff --git a/assets/voxygen/voxel/npc/zebra/male/leg_bl.vox b/assets/voxygen/voxel/npc/zebra/male/leg_bl.vox new file mode 100644 index 0000000000..e7114cc032 --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f76fd38cf5a7916b8cd2afe76c3bd9d4f9341476b7eadd9a99f40aaa56af3d38 +size 1648 diff --git a/assets/voxygen/voxel/npc/zebra/male/leg_br.vox b/assets/voxygen/voxel/npc/zebra/male/leg_br.vox new file mode 100644 index 0000000000..2dc12e4c63 --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b8cf10972431ff7716f5dfabe27f1ac817e078283d797705fcc196f6cc9d246 +size 1648 diff --git a/assets/voxygen/voxel/npc/zebra/male/leg_fl.vox b/assets/voxygen/voxel/npc/zebra/male/leg_fl.vox new file mode 100644 index 0000000000..13f1503013 --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ada3be5b68ae1629fc27c732714be52460af82c09141488b7ad6adefcd002ab4 +size 1528 diff --git a/assets/voxygen/voxel/npc/zebra/male/leg_fr.vox b/assets/voxygen/voxel/npc/zebra/male/leg_fr.vox new file mode 100644 index 0000000000..f7ca9dfcd6 --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57fa155b681acec04b19a8d1631a67bc2bcbb6b1cc3e9842ea1e6f1a11577b55 +size 1528 diff --git a/assets/voxygen/voxel/npc/zebra/male/neck.vox b/assets/voxygen/voxel/npc/zebra/male/neck.vox new file mode 100644 index 0000000000..e9ffcf4b58 --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc77660ca189b2d64a0cc75450e31ffb1537beea2b67197b943776513e06b5ef +size 2280 diff --git a/assets/voxygen/voxel/npc/zebra/male/tail.vox b/assets/voxygen/voxel/npc/zebra/male/tail.vox new file mode 100644 index 0000000000..a064c12a31 --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b3773e480ccf686d2b887748e7a24c90cdae8997e87141c78ea2a6d14052491 +size 1288 diff --git a/assets/voxygen/voxel/npc/zebra/male/torso_back.vox b/assets/voxygen/voxel/npc/zebra/male/torso_back.vox new file mode 100644 index 0000000000..6310e04602 --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/torso_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:940bfe6bc454141253655a3029da72dd154172a1978aff496dbcee0e28f8c1de +size 3176 diff --git a/assets/voxygen/voxel/npc/zebra/male/torso_front.vox b/assets/voxygen/voxel/npc/zebra/male/torso_front.vox new file mode 100644 index 0000000000..629b5fd3a4 --- /dev/null +++ b/assets/voxygen/voxel/npc/zebra/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80f3c95c25cdad3b8492529a570a7d9f845bd7a00fad85a64215b402988bfc21 +size 3904 diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron index 8fd8e66213..41348f735f 100644 --- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron @@ -839,4 +839,364 @@ central: ("npc.roshwalr.male.tail"), ), ), + (Donkey, Male): ( + head: ( + offset: (-4.0, -3.0, 0.0), + central: ("npc.donkey.male.head"), + ), + neck: ( + offset: (-3.0, -4.0, -7.0), + central: ("npc.donkey.male.neck"), + ), + jaw: ( + offset: (-2.0, 0.0, -1.0), + central: ("npc.donkey.male.jaw"), + ), + torso_front: ( + offset: (-5.0, -8.0, -6.5), + central: ("npc.donkey.male.torso_front"), + ), + torso_back: ( + offset: (-5.0, -13.0, -5.5), + central: ("npc.donkey.male.torso_back"), + ), + ears: ( + offset: (-5.0, -1.0, 0.0), + central: ("npc.donkey.male.ears"), + ), + tail: ( + offset: (-1.0, -5.0, -12.0), + central: ("npc.donkey.male.tail"), + ), + ), + (Donkey, Female): ( + head: ( + offset: (-4.0, -3.0, 0.0), + central: ("npc.donkey.male.head"), + ), + neck: ( + offset: (-3.0, -4.0, -7.0), + central: ("npc.donkey.male.neck"), + ), + jaw: ( + offset: (-2.0, 0.0, -1.0), + central: ("npc.donkey.male.jaw"), + ), + torso_front: ( + offset: (-5.0, -8.0, -6.5), + central: ("npc.donkey.male.torso_front"), + ), + torso_back: ( + offset: (-5.0, -13.0, -5.5), + central: ("npc.donkey.male.torso_back"), + ), + ears: ( + offset: (-5.0, -1.0, 0.0), + central: ("npc.donkey.male.ears"), + ), + tail: ( + offset: (-1.0, -5.0, -12.0), + central: ("npc.donkey.male.tail"), + ), + ), + (Camel, Male): ( + head: ( + offset: (-3.5, -4.0, 0.0), + central: ("npc.camel.male.head"), + ), + neck: ( + offset: (-3.5, -5.5, -8.0), + central: ("npc.camel.male.neck"), + ), + jaw: ( + offset: (-1.5, 0.0, -1.5), + central: ("npc.camel.male.jaw"), + ), + torso_front: ( + offset: (-5.5, -14.0, -9.5), + central: ("npc.camel.male.torso_front"), + ), + torso_back: ( + offset: (-5.5, -15.0, -9.0), + central: ("npc.camel.male.torso_back"), + ), + ears: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + tail: ( + offset: (-1.5, -3.0, -14.0), + central: ("npc.camel.male.tail"), + ), + ), + (Camel, Female): ( + head: ( + offset: (-3.5, -4.0, 0.0), + central: ("npc.camel.male.head"), + ), + neck: ( + offset: (-3.5, -5.5, -8.0), + central: ("npc.camel.male.neck"), + ), + jaw: ( + offset: (-1.5, 0.0, -1.5), + central: ("npc.camel.male.jaw"), + ), + torso_front: ( + offset: (-5.5, -14.0, -9.5), + central: ("npc.camel.male.torso_front"), + ), + torso_back: ( + offset: (-5.5, -15.0, -9.0), + central: ("npc.camel.male.torso_back"), + ), + ears: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + tail: ( + offset: (-1.5, -3.0, -14.0), + central: ("npc.camel.male.tail"), + ), + ), + (Zebra, Male): ( + head: ( + offset: (-3.0, -3.0, 0.0), + central: ("npc.zebra.male.head"), + ), + neck: ( + offset: (-3.0, -4.0, -7.0), + central: ("npc.zebra.male.neck"), + ), + jaw: ( + offset: (-2.0, 0.0, -1.5), + central: ("npc.zebra.male.jaw"), + ), + torso_front: ( + offset: (-5.0, -9.0, -6.5), + central: ("npc.zebra.male.torso_front"), + ), + torso_back: ( + offset: (-4.0, -11.0, -4.5), + central: ("npc.zebra.male.torso_back"), + ), + ears: ( + offset: (-4.0, -1.0, 0.0), + central: ("npc.zebra.male.ears"), + ), + tail: ( + offset: (-1.0, -4.0, -12.0), + central: ("npc.zebra.male.tail"), + ), + ), + (Zebra, Female): ( + head: ( + offset: (-3.0, -3.0, 0.0), + central: ("npc.zebra.male.head"), + ), + neck: ( + offset: (-3.0, -4.0, -7.0), + central: ("npc.zebra.male.neck"), + ), + jaw: ( + offset: (-2.0, 0.0, -1.5), + central: ("npc.zebra.male.jaw"), + ), + torso_front: ( + offset: (-5.0, -9.0, -6.5), + central: ("npc.zebra.male.torso_front"), + ), + torso_back: ( + offset: (-4.0, -11.0, -4.5), + central: ("npc.zebra.male.torso_back"), + ), + ears: ( + offset: (-4.0, -1.0, 0.0), + central: ("npc.zebra.male.ears"), + ), + tail: ( + offset: (-1.0, -4.0, -12.0), + central: ("npc.zebra.male.tail"), + ), + ), + (Antelope, Male): ( + head: ( + offset: (-6.0, -7.0, 0.0), + central: ("npc.antelope.male.head"), + ), + neck: ( + offset: (-3.0, -3.5, -5.0), + central: ("npc.antelope.male.neck"), + ), + jaw: ( + offset: (-1.0, 0.0, -0.5), + central: ("npc.antelope.male.jaw"), + ), + torso_front: ( + offset: (-4.0, -8.0, -3.5), + central: ("npc.antelope.male.torso_front"), + ), + torso_back: ( + offset: (-4.0, -10.0, -3.5), + central: ("npc.antelope.male.torso_back"), + ), + ears: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + tail: ( + offset: (-1.0, -3.0, -6.0), + central: ("npc.antelope.male.tail"), + ), + ), + (Antelope, Female): ( + head: ( + offset: (-6.0, -7.0, 0.0), + central: ("npc.antelope.male.head"), + ), + neck: ( + offset: (-3.0, -3.5, -5.0), + central: ("npc.antelope.male.neck"), + ), + jaw: ( + offset: (-1.0, 0.0, -0.5), + central: ("npc.antelope.male.jaw"), + ), + torso_front: ( + offset: (-4.0, -8.0, -3.5), + central: ("npc.antelope.male.torso_front"), + ), + torso_back: ( + offset: (-4.0, -10.0, -3.5), + central: ("npc.antelope.male.torso_back"), + ), + ears: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + tail: ( + offset: (-1.0, -3.0, -6.0), + central: ("npc.antelope.male.tail"), + ), + ), + (Kelpie, Male): ( + head: ( + offset: (-4.0, -4.0, -8.5), + central: ("npc.kelpie.male.head"), + ), + neck: ( + offset: (-4.0, -4.0, -7.5), + central: ("npc.kelpie.male.neck"), + ), + jaw: ( + offset: (-2.0, 0.0, -1.5), + central: ("npc.kelpie.male.jaw"), + ), + torso_front: ( + offset: (-5.0, -9.0, -6.5), + central: ("npc.kelpie.male.torso_front"), + ), + torso_back: ( + offset: (-4.0, -12.0, -4.0), + central: ("npc.kelpie.male.torso_back"), + ), + ears: ( + offset: (-3.0, -1.0, 0.0), + central: ("npc.kelpie.male.ears"), + ), + tail: ( + offset: (-1.0, -6.0, -18.0), + central: ("npc.kelpie.male.tail"), + ), + ), + (Kelpie, Female): ( + head: ( + offset: (-4.0, -4.0, -8.5), + central: ("npc.kelpie.male.head"), + ), + neck: ( + offset: (-4.0, -4.0, -7.5), + central: ("npc.kelpie.male.neck"), + ), + jaw: ( + offset: (-2.0, -2.0, -1.5), + central: ("npc.kelpie.male.jaw"), + ), + torso_front: ( + offset: (-5.0, -9.0, -6.5), + central: ("npc.kelpie.male.torso_front"), + ), + torso_back: ( + offset: (-4.0, -12.0, -4.0), + central: ("npc.kelpie.male.torso_back"), + ), + ears: ( + offset: (-3.0, -1.0, 0.0), + central: ("npc.kelpie.male.ears"), + ), + tail: ( + offset: (-1.0, -6.0, -18.0), + central: ("npc.kelpie.male.tail"), + ), + ), + (Horse, Male): ( + head: ( + offset: (-3.0, -6.0, 0.0), + central: ("npc.horse.male.head"), + ), + neck: ( + offset: (-3.0, -6.5, -6.5), + central: ("npc.horse.male.neck"), + ), + jaw: ( + offset: (-2.0, 0.0, -2.0), + central: ("npc.horse.male.jaw"), + ), + torso_front: ( + offset: (-5.0, -9.0, -7.0), + central: ("npc.horse.male.torso_front"), + ), + torso_back: ( + offset: (-4.0, -6.0, -4.5), + central: ("npc.horse.male.torso_back"), + ), + ears: ( + offset: (-3.0, -1.0, 0.0), + central: ("npc.horse.male.ears"), + ), + tail: ( + offset: (-2.0, -10.0, -13.0), + central: ("npc.horse.male.tail"), + ), + ), + (Horse, Female): ( + head: ( + offset: (-3.0, -6.0, 0.0), + central: ("npc.horse.male.head"), + ), + neck: ( + offset: (-3.0, -6.5, -6.5), + central: ("npc.horse.male.neck"), + ), + jaw: ( + offset: (-2.0, 0.0, -2.0), + central: ("npc.horse.male.jaw"), + ), + torso_front: ( + offset: (-5.0, -9.0, -7.0), + central: ("npc.horse.male.torso_front"), + ), + torso_back: ( + offset: (-4.0, -6.0, -4.5), + central: ("npc.horse.male.torso_back"), + ), + ears: ( + offset: (-3.0, -1.0, 0.0), + central: ("npc.horse.male.ears"), + ), + tail: ( + offset: (-2.0, -10.0, -13.0), + central: ("npc.horse.male.tail"), + ), + ), }) diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron index 429aa3fbd5..a999b509f4 100644 --- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron @@ -951,4 +951,412 @@ lateral: ("npc.roshwalr.male.foot_br"), ), ), + (Donkey, Male): ( + leg_fl: ( + offset: (-2.5, -2.5, -4.5), + lateral: ("npc.donkey.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.5, -2.5, -4.5), + lateral: ("npc.donkey.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.5, -3.0, -4.5), + lateral: ("npc.donkey.male.leg_bl"), + ), + leg_br: ( + offset: (-2.5, -3.0, -4.5), + lateral: ("npc.donkey.male.leg_br"), + ), + foot_fl: ( + offset: (-2.0, -2.5, -8.0), + lateral: ("npc.donkey.male.foot_fl"), + ), + foot_fr: ( + offset: (-2.0, -2.5, -8.0), + lateral: ("npc.donkey.male.foot_fr"), + ), + foot_bl: ( + offset: (-2.0, -3.0, -8.0), + lateral: ("npc.donkey.male.foot_bl"), + ), + foot_br: ( + offset: (-2.0, -3.0, -8.0), + lateral: ("npc.donkey.male.foot_br"), + ), + ), + (Donkey, Female): ( + leg_fl: ( + offset: (-2.5, -2.5, -4.5), + lateral: ("npc.donkey.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.5, -2.5, -4.5), + lateral: ("npc.donkey.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.5, -3.0, -4.5), + lateral: ("npc.donkey.male.leg_bl"), + ), + leg_br: ( + offset: (-2.5, -3.0, -4.5), + lateral: ("npc.donkey.male.leg_br"), + ), + foot_fl: ( + offset: (-2.0, -2.5, -8.0), + lateral: ("npc.donkey.male.foot_fl"), + ), + foot_fr: ( + offset: (-2.0, -2.5, -8.0), + lateral: ("npc.donkey.male.foot_fr"), + ), + foot_bl: ( + offset: (-2.0, -3.0, -8.0), + lateral: ("npc.donkey.male.foot_bl"), + ), + foot_br: ( + offset: (-2.0, -3.0, -8.0), + lateral: ("npc.donkey.male.foot_br"), + ), + ), + (Camel, Male): ( + leg_fl: ( + offset: (-2.5, -3.5, -7.0), + lateral: ("npc.camel.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.5, -3.5, -7.0), + lateral: ("npc.camel.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.5, -3.5, -8.0), + lateral: ("npc.camel.male.leg_bl"), + ), + leg_br: ( + offset: (-2.5, -3.5, -8.0), + lateral: ("npc.camel.male.leg_br"), + ), + foot_fl: ( + offset: (-2.5, -2.5, -9.0), + lateral: ("npc.camel.male.foot_fl"), + ), + foot_fr: ( + offset: (-2.5, -2.5, -9.0), + lateral: ("npc.camel.male.foot_fr"), + ), + foot_bl: ( + offset: (-2.5, -3.0, -8.0), + lateral: ("npc.camel.male.foot_bl"), + ), + foot_br: ( + offset: (-2.5, -3.0, -8.0), + lateral: ("npc.camel.male.foot_br"), + ), + ), + (Camel, Female): ( + leg_fl: ( + offset: (-2.5, -3.5, -7.0), + lateral: ("npc.camel.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.5, -3.5, -7.0), + lateral: ("npc.camel.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.5, -3.5, -8.0), + lateral: ("npc.camel.male.leg_bl"), + ), + leg_br: ( + offset: (-2.5, -3.5, -8.0), + lateral: ("npc.camel.male.leg_br"), + ), + foot_fl: ( + offset: (-2.5, -2.5, -9.0), + lateral: ("npc.camel.male.foot_fl"), + ), + foot_fr: ( + offset: (-2.5, -2.5, -9.0), + lateral: ("npc.camel.male.foot_fr"), + ), + foot_bl: ( + offset: (-2.5, -3.0, -8.0), + lateral: ("npc.camel.male.foot_bl"), + ), + foot_br: ( + offset: (-2.5, -3.0, -8.0), + lateral: ("npc.camel.male.foot_br"), + ), + ), + (Zebra, Male): ( + leg_fl: ( + offset: (-2.0, -2.5, -4.0), + lateral: ("npc.zebra.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -2.5, -4.0), + lateral: ("npc.zebra.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.0, -4.0), + lateral: ("npc.zebra.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.0, -4.0), + lateral: ("npc.zebra.male.leg_br"), + ), + foot_fl: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.zebra.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.zebra.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.zebra.male.foot_bl"), + ), + foot_br: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.zebra.male.foot_br"), + ), + ), + (Zebra, Female): ( + leg_fl: ( + offset: (-2.0, -2.5, -4.0), + lateral: ("npc.zebra.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -2.5, -4.0), + lateral: ("npc.zebra.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.0, -4.0), + lateral: ("npc.zebra.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.0, -4.0), + lateral: ("npc.zebra.male.leg_br"), + ), + foot_fl: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.zebra.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.zebra.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.zebra.male.foot_bl"), + ), + foot_br: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.zebra.male.foot_br"), + ), + ), + (Antelope, Male): ( + leg_fl: ( + offset: (-1.5, -2.5, -4.0), + lateral: ("npc.antelope.male.leg_fl"), + ), + leg_fr: ( + offset: (-1.5, -2.5, -4.0), + lateral: ("npc.antelope.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -2.5, -5.0), + lateral: ("npc.antelope.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -2.5, -5.0), + lateral: ("npc.antelope.male.leg_br"), + ), + foot_fl: ( + offset: (-1.0, -1.5, -8.0), + lateral: ("npc.antelope.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.0, -1.5, -8.0), + lateral: ("npc.antelope.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.0, -1.0, -7.0), + lateral: ("npc.antelope.male.foot_bl"), + ), + foot_br: ( + offset: (-1.0, -1.0, -7.0), + lateral: ("npc.antelope.male.foot_br"), + ), + ), + (Antelope, Female): ( + leg_fl: ( + offset: (-1.5, -2.5, -4.0), + lateral: ("npc.antelope.male.leg_fl"), + ), + leg_fr: ( + offset: (-1.5, -2.5, -4.0), + lateral: ("npc.antelope.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -2.5, -5.0), + lateral: ("npc.antelope.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -2.5, -5.0), + lateral: ("npc.antelope.male.leg_br"), + ), + foot_fl: ( + offset: (-1.0, -1.5, -8.0), + lateral: ("npc.antelope.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.0, -1.5, -8.0), + lateral: ("npc.antelope.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.0, -1.0, -7.0), + lateral: ("npc.antelope.male.foot_bl"), + ), + foot_br: ( + offset: (-1.0, -1.0, -7.0), + lateral: ("npc.antelope.male.foot_br"), + ), + ), + (Kelpie, Male): ( + leg_fl: ( + offset: (-2.0, -2.5, -5.0), + lateral: ("npc.kelpie.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -2.5, -5.0), + lateral: ("npc.kelpie.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.0, -4.5), + lateral: ("npc.kelpie.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.0, -4.5), + lateral: ("npc.kelpie.male.leg_br"), + ), + foot_fl: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.kelpie.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.kelpie.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.kelpie.male.foot_bl"), + ), + foot_br: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.kelpie.male.foot_br"), + ), + ), + (Kelpie, Female): ( + leg_fl: ( + offset: (-2.0, -2.5, -5.0), + lateral: ("npc.kelpie.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -2.5, -5.0), + lateral: ("npc.kelpie.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.0, -4.5), + lateral: ("npc.kelpie.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.0, -4.5), + lateral: ("npc.kelpie.male.leg_br"), + ), + foot_fl: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.kelpie.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.kelpie.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.kelpie.male.foot_bl"), + ), + foot_br: ( + offset: (-1.5, -2.5, -9.0), + lateral: ("npc.kelpie.male.foot_br"), + ), + ), + (Horse, Male): ( + leg_fl: ( + offset: (-2.0, -2.5, -6.0), + lateral: ("npc.horse.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -2.5, -6.0), + lateral: ("npc.horse.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.0, -4.5), + lateral: ("npc.horse.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.0, -4.5), + lateral: ("npc.horse.male.leg_br"), + ), + foot_fl: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.horse.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.horse.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.5, -1.5, -9.0), + lateral: ("npc.horse.male.foot_bl"), + ), + foot_br: ( + offset: (-1.5, -1.5, -9.0), + lateral: ("npc.horse.male.foot_br"), + ), + ), + (Horse, Female): ( + leg_fl: ( + offset: (-2.0, -2.5, -6.0), + lateral: ("npc.horse.male.leg_fl"), + ), + leg_fr: ( + offset: (-2.0, -2.5, -6.0), + lateral: ("npc.horse.male.leg_fr"), + ), + leg_bl: ( + offset: (-2.0, -3.0, -4.5), + lateral: ("npc.horse.male.leg_bl"), + ), + leg_br: ( + offset: (-2.0, -3.0, -4.5), + lateral: ("npc.horse.male.leg_br"), + ), + foot_fl: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.horse.male.foot_fl"), + ), + foot_fr: ( + offset: (-1.5, -2.0, -8.0), + lateral: ("npc.horse.male.foot_fr"), + ), + foot_bl: ( + offset: (-1.5, -1.5, -9.0), + lateral: ("npc.horse.male.foot_bl"), + ), + foot_br: ( + offset: (-1.5, -1.5, -9.0), + lateral: ("npc.horse.male.foot_br"), + ), + ), }) diff --git a/common/src/comp/body/quadruped_medium.rs b/common/src/comp/body/quadruped_medium.rs index 707f2c53da..c657d289ce 100644 --- a/common/src/comp/body/quadruped_medium.rs +++ b/common/src/comp/body/quadruped_medium.rs @@ -46,6 +46,12 @@ pub enum Species { Deer = 13, Hirdrasil = 14, Roshwalr = 15, + Donkey = 16, + Camel = 17, + Zebra = 18, + Antelope = 19, + Kelpie = 20, + Horse = 21, } /// Data representing per-species generic data. @@ -67,6 +73,12 @@ pub struct AllSpecies { pub deer: SpeciesMeta, pub hirdrasil: SpeciesMeta, pub roshwalr: SpeciesMeta, + pub donkey: SpeciesMeta, + pub camel: SpeciesMeta, + pub zebra: SpeciesMeta, + pub antelope: SpeciesMeta, + pub kelpie: SpeciesMeta, + pub horse: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -89,11 +101,17 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Deer => &self.deer, Species::Hirdrasil => &self.hirdrasil, Species::Roshwalr => &self.roshwalr, + Species::Donkey => &self.donkey, + Species::Camel => &self.camel, + Species::Zebra => &self.zebra, + Species::Antelope => &self.antelope, + Species::Kelpie => &self.kelpie, + Species::Horse => &self.horse, } } } -pub const ALL_SPECIES: [Species; 14] = [ +pub const ALL_SPECIES: [Species; 20] = [ Species::Grolgar, Species::Saber, Species::Tiger, @@ -108,6 +126,12 @@ pub const ALL_SPECIES: [Species; 14] = [ Species::Deer, Species::Hirdrasil, Species::Roshwalr, + Species::Donkey, + Species::Camel, + Species::Zebra, + Species::Antelope, + Species::Kelpie, + Species::Horse, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/voxygen/src/anim/src/quadruped_medium/idle.rs b/voxygen/src/anim/src/quadruped_medium/idle.rs index 6e306bdb3a..d2a168bec4 100644 --- a/voxygen/src/anim/src/quadruped_medium/idle.rs +++ b/voxygen/src/anim/src/quadruped_medium/idle.rs @@ -62,6 +62,7 @@ impl Animation for IdleAnimation { next.foot_fr.scale = Vec3::one() * 0.96; next.foot_bl.scale = Vec3::one() * 0.96; next.foot_br.scale = Vec3::one() * 0.96; + next.ears.scale = Vec3::one() * 1.02; next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1 + slower * 0.2); next.head.orientation = diff --git a/voxygen/src/anim/src/quadruped_medium/jump.rs b/voxygen/src/anim/src/quadruped_medium/jump.rs index e7646b268b..87029d0c8b 100644 --- a/voxygen/src/anim/src/quadruped_medium/jump.rs +++ b/voxygen/src/anim/src/quadruped_medium/jump.rs @@ -33,6 +33,7 @@ impl Animation for JumpAnimation { next.foot_fr.scale = Vec3::one() * 0.96; next.foot_bl.scale = Vec3::one() * 0.96; next.foot_br.scale = Vec3::one() * 0.96; + next.ears.scale = Vec3::one() * 1.02; next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1); next.head.orientation = Quaternion::rotation_z(0.4) * Quaternion::rotation_x(0.3); diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs index 5c3175a2db..6e190e224c 100644 --- a/voxygen/src/anim/src/quadruped_medium/mod.rs +++ b/voxygen/src/anim/src/quadruped_medium/mod.rs @@ -151,6 +151,12 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, Female) => (0.5, 3.5), (Hirdrasil, _) => (0.0, 5.0), (Roshwalr, _) => (1.0, 0.5), + (Donkey, _) => (4.5, -3.0), + (Camel, _) => (-0.5, 5.0), + (Zebra, _) => (3.0, -2.0), + (Antelope, _) => (1.5, 2.5), + (Kelpie, _) => (4.0, -1.0), + (Horse, _) => (0.5, 1.5), }, neck: match (body.species, body.body_type) { (Grolgar, _) => (1.0, -1.0), @@ -167,6 +173,12 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, _) => (-0.5, 1.0), (Hirdrasil, _) => (-1.0, 0.5), (Roshwalr, _) => (0.0, 1.0), + (Donkey, _) => (1.0, 3.5), + (Camel, _) => (3.5, -1.5), + (Zebra, _) => (1.0, 3.5), + (Antelope, _) => (0.5, 2.5), + (Kelpie, _) => (2.0, 1.0), + (Horse, _) => (1.5, 1.5), }, jaw: match (body.species, body.body_type) { (Grolgar, _) => (7.0, 2.0), @@ -183,6 +195,12 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, _) => (3.5, 2.5), (Hirdrasil, _) => (2.5, 3.0), (Roshwalr, _) => (4.0, -1.0), + (Donkey, _) => (1.0, 1.0), + (Camel, _) => (2.0, 2.5), + (Zebra, _) => (2.0, 0.5), + (Antelope, _) => (3.0, 0.5), + (Kelpie, _) => (1.0, 1.0), + (Horse, _) => (4.0, 1.0), }, tail: match (body.species, body.body_type) { (Grolgar, _) => (-11.5, -0.5), @@ -199,6 +217,12 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, _) => (-8.5, 0.5), (Hirdrasil, _) => (-11.0, 2.0), (Roshwalr, _) => (-8.5, -1.0), + (Donkey, _) => (-11.0, 1.5), + (Camel, _) => (-14.0, -1.0), + (Zebra, _) => (-10.0, 1.5), + (Antelope, _) => (-9.0, 2.0), + (Kelpie, _) => (-11.0, 3.0), + (Horse, _) => (-5.0, 1.5), }, torso_front: match (body.species, body.body_type) { (Grolgar, _) => (10.0, 13.0), @@ -215,6 +239,12 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, _) => (11.0, 13.5), (Hirdrasil, _) => (11.0, 14.5), (Roshwalr, _) => (6.0, 12.5), + (Donkey, _) => (10.0, 15.5), + (Camel, _) => (11.0, 22.5), + (Zebra, _) => (10.0, 16.5), + (Antelope, _) => (10.0, 14.0), + (Kelpie, _) => (10.0, 16.0), + (Horse, _) => (7.0, 16.0), }, torso_back: match (body.species, body.body_type) { (Grolgar, _) => (-10.0, 1.5), @@ -231,6 +261,12 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, _) => (-9.0, 0.5), (Hirdrasil, _) => (-9.0, -0.5), (Roshwalr, _) => (-9.0, -3.5), + (Donkey, _) => (-6.0, -1.0), + (Camel, _) => (-12.0, -0.5), + (Zebra, _) => (-6.0, -1.0), + (Antelope, _) => (-8.0, 0.0), + (Kelpie, _) => (-6.0, -1.0), + (Horse, _) => (-11.0, -1.5), }, ears: match (body.species, body.body_type) { (Grolgar, _) => (5.0, 8.0), @@ -247,6 +283,12 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, _) => (2.5, 5.0), (Hirdrasil, _) => (2.5, 5.0), (Roshwalr, _) => (5.0, 8.0), + (Donkey, _) => (-1.0, 8.0), + (Camel, _) => (2.5, 5.0), + (Zebra, _) => (0.0, 7.0), + (Antelope, _) => (2.5, 5.0), + (Kelpie, _) => (1.0, 7.5), + (Horse, _) => (1.0, 7.0), }, leg_f: match (body.species, body.body_type) { (Grolgar, _) => (7.5, -5.5, -1.0), @@ -263,6 +305,12 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, _) => (3.5, -4.5, -3.5), (Hirdrasil, _) => (4.5, -5.0, -2.5), (Roshwalr, _) => (8.0, -2.5, -2.5), + (Donkey, _) => (4.0, -3.5, -4.0), + (Camel, _) => (4.5, -3.5, -5.5), + (Zebra, _) => (4.0, -2.5, -4.5), + (Antelope, _) => (4.0, -4.5, -2.5), + (Kelpie, _) => (4.5, -3.5, -3.5), + (Horse, _) => (4.5, -2.5, -3.0), }, leg_b: match (body.species, body.body_type) { (Grolgar, _) => (6.0, -6.5, -4.0), @@ -279,6 +327,12 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, _) => (3.0, -6.5, -3.5), (Hirdrasil, _) => (4.0, -6.5, -3.0), (Roshwalr, _) => (7.0, -7.0, -2.5), + (Donkey, _) => (4.0, -9.0, -3.0), + (Camel, _) => (4.5, -10.5, -5.0), + (Zebra, _) => (3.5, -8.0, -3.5), + (Antelope, _) => (3.5, -6.5, -3.5), + (Kelpie, _) => (3.5, -9.0, -2.5), + (Horse, _) => (3.5, -4.0, -2.0), }, feet_f: match (body.species, body.body_type) { (Grolgar, _) => (0.0, 0.0, -4.0), @@ -295,6 +349,12 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, _) => (-0.5, -0.5, -2.5), (Hirdrasil, _) => (-0.5, -3.0, -3.5), (Roshwalr, _) => (0.5, 0.0, -3.0), + (Donkey, _) => (0.5, 1.0, -3.5), + (Camel, _) => (0.0, 0.0, -8.0), + (Zebra, _) => (-0.5, 0.5, -4.0), + (Antelope, _) => (-0.5, 0.0, -3.5), + (Kelpie, _) => (-0.5, 0.5, -4.5), + (Horse, _) => (-0.5, 0.5, -5.0), }, feet_b: match (body.species, body.body_type) { (Grolgar, _) => (0.5, -1.5, -3.0), @@ -311,6 +371,12 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, _) => (-1.0, -0.5, -2.0), (Hirdrasil, _) => (-1.0, -2.0, -4.5), (Roshwalr, _) => (0.5, -1.0, -3.5), + (Donkey, _) => (0.5, -1.0, -3.5), + (Camel, _) => (0.0, 0.5, -9.0), + (Zebra, _) => (0.5, -1.0, -3.0), + (Antelope, _) => (-0.5, -1.5, -3.5), + (Kelpie, _) => (0.5, -0.5, -3.5), + (Horse, _) => (0.5, -1.5, -3.5), }, scaler: match (body.species, body.body_type) { (Grolgar, _) => (1.3), @@ -327,6 +393,12 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, _) => (1.0), (Hirdrasil, _) => (1.0), (Roshwalr, _) => (1.2), + (Donkey, _) => (1.0), + (Camel, _) => (1.0), + (Zebra, _) => (1.0), + (Antelope, _) => (1.0), + (Kelpie, _) => (1.0), + (Horse, _) => (1.0), }, startangle: match (body.species, body.body_type) { //changes the default angle of front feet @@ -344,6 +416,12 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, _) => (0.0), (Hirdrasil, _) => (0.0), (Roshwalr, _) => (-0.3), + (Donkey, _) => (0.0), + (Camel, _) => (0.0), + (Zebra, _) => (0.0), + (Antelope, _) => (0.0), + (Kelpie, _) => (0.0), + (Horse, _) => (0.0), }, tempo: match (body.species, body.body_type) { (Grolgar, _) => (0.95), @@ -360,6 +438,12 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, _) => (0.85), (Hirdrasil, _) => (0.85), (Roshwalr, _) => (0.95), + (Donkey, _) => (0.85), + (Camel, _) => (0.85), + (Zebra, _) => (0.85), + (Antelope, _) => (1.0), + (Kelpie, _) => (0.85), + (Horse, _) => (0.85), }, spring: match (body.species, body.body_type) { (Grolgar, _) => (1.0), @@ -376,12 +460,23 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Deer, _) => (0.9), (Hirdrasil, _) => (1.1), (Roshwalr, _) => (1.0), + (Donkey, _) => (0.85), + (Camel, _) => (0.85), + (Zebra, _) => (0.85), + (Antelope, _) => (1.2), + (Kelpie, _) => (0.95), + (Horse, _) => (0.85), }, feed: match (body.species, body.body_type) { (Tuskram, _) => (true, 0.5), (Mouflon, _) => (true, 1.0), (Deer, _) => (true, 1.0), (Hirdrasil, _) => (true, 0.9), + (Donkey, _) => (false, 1.0), + (Zebra, _) => (false, 1.0), + (Antelope, _) => (false, 0.9), + (Kelpie, _) => (false, 1.0), + (Horse, _) => (true, 0.85), (_, _) => (false, 0.0), }, } diff --git a/voxygen/src/anim/src/quadruped_medium/run.rs b/voxygen/src/anim/src/quadruped_medium/run.rs index b7b09c5e59..2db9aeacb9 100644 --- a/voxygen/src/anim/src/quadruped_medium/run.rs +++ b/voxygen/src/anim/src/quadruped_medium/run.rs @@ -109,7 +109,6 @@ impl Animation for RunAnimation { next.foot_fr.scale = Vec3::one() * 0.96; next.foot_bl.scale = Vec3::one() * 0.96; next.foot_br.scale = Vec3::one() * 0.96; - next.ears.scale = Vec3::one() * 1.02; //Gallop diff --git a/world/src/lib.rs b/world/src/lib.rs index d1672a4677..d945414f22 100644 --- a/world/src/lib.rs +++ b/world/src/lib.rs @@ -269,6 +269,12 @@ impl World { quadruped_medium::Species::Tuskram => is_hostile = false, quadruped_medium::Species::Deer => is_hostile = false, quadruped_medium::Species::Hirdrasil => is_hostile = false, + quadruped_medium::Species::Donkey => is_hostile = false, + quadruped_medium::Species::Camel => is_hostile = false, + quadruped_medium::Species::Zebra => is_hostile = false, + quadruped_medium::Species::Antelope => is_hostile = false, + quadruped_medium::Species::Kelpie => is_hostile = false, + quadruped_medium::Species::Horse => is_hostile = false, _ => is_hostile = true, } },