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..4fea9f70fc Binary files /dev/null and b/assets/voxygen/voxel/npc/antelope/male/foot_bl.vox differ 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..97339329a4 Binary files /dev/null and b/assets/voxygen/voxel/npc/antelope/male/foot_br.vox differ 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..707e7b0ed7 Binary files /dev/null and b/assets/voxygen/voxel/npc/antelope/male/foot_fl.vox differ 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..56142c15e4 Binary files /dev/null and b/assets/voxygen/voxel/npc/antelope/male/foot_fr.vox differ 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..c6bfaf22ab Binary files /dev/null and b/assets/voxygen/voxel/npc/antelope/male/head.vox differ 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..bf0b1eb6bf Binary files /dev/null and b/assets/voxygen/voxel/npc/antelope/male/jaw.vox differ 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..0dcbe79d49 Binary files /dev/null and b/assets/voxygen/voxel/npc/antelope/male/leg_bl.vox differ 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..95d1f326c8 Binary files /dev/null and b/assets/voxygen/voxel/npc/antelope/male/leg_br.vox differ 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..8326f63c16 Binary files /dev/null and b/assets/voxygen/voxel/npc/antelope/male/leg_fl.vox differ 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..f0e96139ad Binary files /dev/null and b/assets/voxygen/voxel/npc/antelope/male/leg_fr.vox differ 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..3571f0ce0b Binary files /dev/null and b/assets/voxygen/voxel/npc/antelope/male/neck.vox differ 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..9d6221d034 Binary files /dev/null and b/assets/voxygen/voxel/npc/antelope/male/tail.vox differ 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..df9437c8e1 Binary files /dev/null and b/assets/voxygen/voxel/npc/antelope/male/torso_back.vox differ 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..b4d369d76d Binary files /dev/null and b/assets/voxygen/voxel/npc/antelope/male/torso_front.vox differ 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..e8e218f717 Binary files /dev/null and b/assets/voxygen/voxel/npc/camel/male/foot_bl.vox differ 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..1d39186625 Binary files /dev/null and b/assets/voxygen/voxel/npc/camel/male/foot_br.vox differ 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..de9389b500 Binary files /dev/null and b/assets/voxygen/voxel/npc/camel/male/foot_fl.vox differ 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..426aedca7f Binary files /dev/null and b/assets/voxygen/voxel/npc/camel/male/foot_fr.vox differ 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..9942e25d99 Binary files /dev/null and b/assets/voxygen/voxel/npc/camel/male/head.vox differ 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..e7d8b084c5 Binary files /dev/null and b/assets/voxygen/voxel/npc/camel/male/jaw.vox differ 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..ea2ff12ccc Binary files /dev/null and b/assets/voxygen/voxel/npc/camel/male/leg_bl.vox differ 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..3ff4485bc1 Binary files /dev/null and b/assets/voxygen/voxel/npc/camel/male/leg_br.vox differ 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..79b1e6359e Binary files /dev/null and b/assets/voxygen/voxel/npc/camel/male/leg_fl.vox differ 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..5020f654a8 Binary files /dev/null and b/assets/voxygen/voxel/npc/camel/male/leg_fr.vox differ 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..6eab9c8d20 Binary files /dev/null and b/assets/voxygen/voxel/npc/camel/male/neck.vox differ 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..de31017356 Binary files /dev/null and b/assets/voxygen/voxel/npc/camel/male/tail.vox differ 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..7fc832107d Binary files /dev/null and b/assets/voxygen/voxel/npc/camel/male/torso_back.vox differ 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..f8dffa608e Binary files /dev/null and b/assets/voxygen/voxel/npc/camel/male/torso_front.vox differ 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..cd6e1dff52 Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/ears.vox differ 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..4840f9be8b Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/foot_bl.vox differ 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..cd927fbb70 Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/foot_br.vox differ 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..ae110baefe Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/foot_fl.vox differ 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..980c63c068 Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/foot_fr.vox differ 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..60d79f89a6 Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/head.vox differ 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..17798d9c13 Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/jaw.vox differ 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..756b05fc04 Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/leg_bl.vox differ 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..1e9b00fbc6 Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/leg_br.vox differ 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..8ef0747f87 Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/leg_fl.vox differ 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..7a1d8a42ef Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/leg_fr.vox differ 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..aa7c02b125 Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/neck.vox differ 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..a20b1e310f Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/tail.vox differ 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..dc478c6b93 Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/torso_back.vox differ 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..beead6bbb8 Binary files /dev/null and b/assets/voxygen/voxel/npc/donkey/male/torso_front.vox differ 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..3d5a3315f2 Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/ears.vox differ 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..e40fcff4f0 Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/foot_bl.vox differ 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..8c3a0f3478 Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/foot_br.vox differ 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..ffddf7ed5c Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/foot_fl.vox differ 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..1174b1acff Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/foot_fr.vox differ 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..0104a56066 Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/head.vox differ 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..ebc3b5376a Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/jaw.vox differ 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..380462d9a5 Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/leg_bl.vox differ 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..3396d16c9a Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/leg_br.vox differ 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..9cebf14ebc Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/leg_fl.vox differ 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..ed9f6a622d Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/leg_fr.vox differ 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..9d5fa1807e Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/neck.vox differ 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..4fbdd5fe6d Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/tail.vox differ 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..667beb7c65 Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/torso_back.vox differ 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..60c60fae5a Binary files /dev/null and b/assets/voxygen/voxel/npc/horse/male/torso_front.vox differ 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..86199fa17a Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/ears.vox differ 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..27f3b965a6 Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/foot_bl.vox differ 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..cbcfffb040 Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/foot_br.vox differ 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..64a8983971 Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/foot_fl.vox differ 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..60546d00e1 Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/foot_fr.vox differ 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..ddd8cdcce5 Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/head.vox differ 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..c9fd39e208 Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/jaw.vox differ 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..40bf201806 Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/leg_bl.vox differ 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..8b08bafe37 Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/leg_br.vox differ 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..394757e072 Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/leg_fl.vox differ 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..56a62483de Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/leg_fr.vox differ 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..cdd268d09c Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/neck.vox differ 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..db17322194 Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/tail.vox differ 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..43a2f24e8f Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/torso_back.vox differ 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..12cbad1603 Binary files /dev/null and b/assets/voxygen/voxel/npc/kelpie/male/torso_front.vox differ 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..da674c1607 Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/ears.vox differ 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..2c5cd47947 Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/foot_bl.vox differ 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..b9cbbf1f8a Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/foot_br.vox differ 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..07b6dce75a Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/foot_fl.vox differ 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..418c9fa9c7 Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/foot_fr.vox differ 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..db87d36c6a Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/head.vox differ 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..b47b4fea00 Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/jaw.vox differ 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..9f7eda8ee8 Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/leg_bl.vox differ 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..94da9d22ea Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/leg_br.vox differ 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..2a7b07b320 Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/leg_fl.vox differ 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..cf13cd308a Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/leg_fr.vox differ 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..d495fa95bb Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/neck.vox differ 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..9647bee577 Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/tail.vox differ 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..48444c5921 Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/torso_back.vox differ 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..ab93246ce4 Binary files /dev/null and b/assets/voxygen/voxel/npc/zebra/male/torso_front.vox differ 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, } },