diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json index 93894b2f20..4107643372 100644 --- a/assets/common/npc_names.json +++ b/assets/common/npc_names.json @@ -625,6 +625,18 @@ "odonto": { "keyword": "odonto", "generic": "Odonto" + }, + "raptor_sand": { + "keyword": "raptor_sand", + "generic": "Sand Raptor" + }, + "raptor_snow": { + "keyword": "raptor_snow", + "generic": "Snow Raptor" + }, + "raptor_wood": { + "keyword": "raptor_wood", + "generic": "Wood Raptor" } } }, diff --git a/assets/voxygen/voxel/npc/raptor_sand/male/chest_back.vox b/assets/voxygen/voxel/npc/raptor_sand/male/chest_back.vox new file mode 100644 index 0000000000..1f20b26f30 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_sand/male/chest_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb67f2b0f4b993f72cd1847e08365f4c74c6c89d04f62479d9507efa2584e6d3 +size 2432 diff --git a/assets/voxygen/voxel/npc/raptor_sand/male/chest_front.vox b/assets/voxygen/voxel/npc/raptor_sand/male/chest_front.vox new file mode 100644 index 0000000000..8d18bf6e5e --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_sand/male/chest_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:804dbba48b1337158e349600a28b3d2474fd1cd8e6b724dee83626691d2e7fd1 +size 2352 diff --git a/assets/voxygen/voxel/npc/raptor_sand/male/foot_l.vox b/assets/voxygen/voxel/npc/raptor_sand/male/foot_l.vox new file mode 100644 index 0000000000..9793ed6f7f --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_sand/male/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:401b25db996711a53e317de4b4c826161b039891c4537567f73eb6344826a0b3 +size 1384 diff --git a/assets/voxygen/voxel/npc/raptor_sand/male/foot_r.vox b/assets/voxygen/voxel/npc/raptor_sand/male/foot_r.vox new file mode 100644 index 0000000000..7b69218cf1 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_sand/male/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b4f294cebc8174c8e45f667b962e2fda745d796e7c973c4ebe792a697cc5070 +size 1384 diff --git a/assets/voxygen/voxel/npc/raptor_sand/male/hand_l.vox b/assets/voxygen/voxel/npc/raptor_sand/male/hand_l.vox new file mode 100644 index 0000000000..00dabd0391 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_sand/male/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c9d723da56499441bbd1ffc34aacbbb098eb64f0c30d7726bb5585cdb7d8fb2 +size 1672 diff --git a/assets/voxygen/voxel/npc/raptor_sand/male/hand_r.vox b/assets/voxygen/voxel/npc/raptor_sand/male/hand_r.vox new file mode 100644 index 0000000000..ad7f684157 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_sand/male/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bc6d14ee7fb2970aaaeb190abd98dddcb902b6b0f2c1850c3a6d4cb60969312 +size 1672 diff --git a/assets/voxygen/voxel/npc/raptor_sand/male/head.vox b/assets/voxygen/voxel/npc/raptor_sand/male/head.vox new file mode 100644 index 0000000000..59da0db6fb --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_sand/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08dec47f5d6ea92508ecb6b1169f484ee7bda31e2209ae19eb605ba5ddcec9eb +size 1684 diff --git a/assets/voxygen/voxel/npc/raptor_sand/male/jaw.vox b/assets/voxygen/voxel/npc/raptor_sand/male/jaw.vox new file mode 100644 index 0000000000..4e4d573266 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_sand/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af576ec2358bddb114bc75230372d1877b6d20b12c490a4a0523a595c4d5d88f +size 1256 diff --git a/assets/voxygen/voxel/npc/raptor_sand/male/leg_l.vox b/assets/voxygen/voxel/npc/raptor_sand/male/leg_l.vox new file mode 100644 index 0000000000..304654e5a1 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_sand/male/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5f71ae7fa186a44d29b1f4124e275c3129038dc2331a359b6b8358c5f6d302d +size 1628 diff --git a/assets/voxygen/voxel/npc/raptor_sand/male/leg_r.vox b/assets/voxygen/voxel/npc/raptor_sand/male/leg_r.vox new file mode 100644 index 0000000000..52ad61f7e1 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_sand/male/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2612ac5f9fdb36c058f08c0121b6f857d53ec690bc9d0e6057afb48376b326d +size 1628 diff --git a/assets/voxygen/voxel/npc/raptor_sand/male/neck.vox b/assets/voxygen/voxel/npc/raptor_sand/male/neck.vox new file mode 100644 index 0000000000..1b34cf255b --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_sand/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a507ed9e78afb42d72237f8730f9b6edf8477b329195efb6fb9cf16181261ce3 +size 1504 diff --git a/assets/voxygen/voxel/npc/raptor_sand/male/tail_back.vox b/assets/voxygen/voxel/npc/raptor_sand/male/tail_back.vox new file mode 100644 index 0000000000..21e8f7dd21 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_sand/male/tail_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fc3199d167735e3eb835d553d15d5937ff9883b03ac2d319fb29d3abae6d156 +size 2180 diff --git a/assets/voxygen/voxel/npc/raptor_sand/male/tail_front.vox b/assets/voxygen/voxel/npc/raptor_sand/male/tail_front.vox new file mode 100644 index 0000000000..39e24108a9 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_sand/male/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83cb038f1ecdf3e2b65cbe24c1a8e82fdc47cbfd9cf7204a0cbe5191b8ca202b +size 1904 diff --git a/assets/voxygen/voxel/npc/raptor_snow/male/chest_back.vox b/assets/voxygen/voxel/npc/raptor_snow/male/chest_back.vox new file mode 100644 index 0000000000..7ede642df4 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_snow/male/chest_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:570e88e1b7017767183f72370a4a837196d29f80a99acddf346bb08d69f5f070 +size 2432 diff --git a/assets/voxygen/voxel/npc/raptor_snow/male/chest_front.vox b/assets/voxygen/voxel/npc/raptor_snow/male/chest_front.vox new file mode 100644 index 0000000000..c969257419 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_snow/male/chest_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1be4e0a0cf25a4ec1adb5ace8684e2223dbf65f899534e0b0a9a3e23a5d756d5 +size 2352 diff --git a/assets/voxygen/voxel/npc/raptor_snow/male/foot_l.vox b/assets/voxygen/voxel/npc/raptor_snow/male/foot_l.vox new file mode 100644 index 0000000000..b682cfcd61 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_snow/male/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78ccec8653b8d2db97c4ec6e26b1604c56ca9026f78a8bbbb9d06f7121d46cc7 +size 1384 diff --git a/assets/voxygen/voxel/npc/raptor_snow/male/foot_r.vox b/assets/voxygen/voxel/npc/raptor_snow/male/foot_r.vox new file mode 100644 index 0000000000..1976fb25cd --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_snow/male/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfd98d772477953a53d5922688654bcab38cc1c95ecb1ea617e704f96330b52d +size 1384 diff --git a/assets/voxygen/voxel/npc/raptor_snow/male/hand_l.vox b/assets/voxygen/voxel/npc/raptor_snow/male/hand_l.vox new file mode 100644 index 0000000000..5db6026e79 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_snow/male/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:845b0571f3abec22bc6f889219d7bec4e8b387bfabaa90671a70b4446be7ed67 +size 1616 diff --git a/assets/voxygen/voxel/npc/raptor_snow/male/hand_r.vox b/assets/voxygen/voxel/npc/raptor_snow/male/hand_r.vox new file mode 100644 index 0000000000..7a3b584525 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_snow/male/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba25b3892320881325795e6df3119f00eef9eaedbc5cdee878c70ead3dcd81a0 +size 1616 diff --git a/assets/voxygen/voxel/npc/raptor_snow/male/head.vox b/assets/voxygen/voxel/npc/raptor_snow/male/head.vox new file mode 100644 index 0000000000..a85f87e4a2 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_snow/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9eda2bca82c7efe8499b68e22aae213f58b154c8150d8e9fd790f01ec24cb63d +size 1596 diff --git a/assets/voxygen/voxel/npc/raptor_snow/male/jaw.vox b/assets/voxygen/voxel/npc/raptor_snow/male/jaw.vox new file mode 100644 index 0000000000..2ca7547f86 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_snow/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca1cbacc66b30b50166f02088b11361072c33e21f86c9b680ceb821f2022eb98 +size 1256 diff --git a/assets/voxygen/voxel/npc/raptor_snow/male/leg_l.vox b/assets/voxygen/voxel/npc/raptor_snow/male/leg_l.vox new file mode 100644 index 0000000000..87ab3259b7 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_snow/male/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f55f9e47c979e117906eb20ba106e834741dbfc4abf53c2c7b2f7656db03d119 +size 1628 diff --git a/assets/voxygen/voxel/npc/raptor_snow/male/leg_r.vox b/assets/voxygen/voxel/npc/raptor_snow/male/leg_r.vox new file mode 100644 index 0000000000..b8b4fa4ec5 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_snow/male/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ea3f0559ec00d1fc10d1963f6a9ce037c96e0060d3dc9ba7735cffb15907217 +size 1628 diff --git a/assets/voxygen/voxel/npc/raptor_snow/male/neck.vox b/assets/voxygen/voxel/npc/raptor_snow/male/neck.vox new file mode 100644 index 0000000000..29105bb72d --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_snow/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8a12ac87ff263b7496530b89b8321d2c17acd4db55718f8f3de6934b5fe2d98 +size 1504 diff --git a/assets/voxygen/voxel/npc/raptor_snow/male/tail_back.vox b/assets/voxygen/voxel/npc/raptor_snow/male/tail_back.vox new file mode 100644 index 0000000000..033609da2a --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_snow/male/tail_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b07857ab562214a0dca6f6fa978f454a005a1112b070e3b8eea754ef4e90c0c7 +size 2012 diff --git a/assets/voxygen/voxel/npc/raptor_snow/male/tail_front.vox b/assets/voxygen/voxel/npc/raptor_snow/male/tail_front.vox new file mode 100644 index 0000000000..ade35c9e98 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_snow/male/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8adacefef8eede24b6c857da5977a215026841c2a6ece2de7246a743fded3e31 +size 1872 diff --git a/assets/voxygen/voxel/npc/raptor_wood/male/chest_back.vox b/assets/voxygen/voxel/npc/raptor_wood/male/chest_back.vox new file mode 100644 index 0000000000..30c1c022f9 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_wood/male/chest_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8499425c7e7fd5198923b162459d146de36a84a05cf3e52e0864231d3900e7bc +size 2432 diff --git a/assets/voxygen/voxel/npc/raptor_wood/male/chest_front.vox b/assets/voxygen/voxel/npc/raptor_wood/male/chest_front.vox new file mode 100644 index 0000000000..173af937e1 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_wood/male/chest_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e36ee01b37f694239e4c9e3be9ebf0d8e12f0f969f98e7c6157ed824c095f7bb +size 2352 diff --git a/assets/voxygen/voxel/npc/raptor_wood/male/foot_l.vox b/assets/voxygen/voxel/npc/raptor_wood/male/foot_l.vox new file mode 100644 index 0000000000..84f4aee9ca --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_wood/male/foot_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b0c11647abe410acca2b9c50ae7bf5d82517b4e52bec385f461fb3a9bb5f0ab +size 1384 diff --git a/assets/voxygen/voxel/npc/raptor_wood/male/foot_r.vox b/assets/voxygen/voxel/npc/raptor_wood/male/foot_r.vox new file mode 100644 index 0000000000..62b2155fbb --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_wood/male/foot_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0856b1a4d588f60d28d699b517495315c9cff94ec7c23ad3e6c958ff0dcbdda +size 1384 diff --git a/assets/voxygen/voxel/npc/raptor_wood/male/hand_l.vox b/assets/voxygen/voxel/npc/raptor_wood/male/hand_l.vox new file mode 100644 index 0000000000..ffbc71f066 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_wood/male/hand_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:076891fc33970341d6b6c3a7f2d12e2f9bc2a1d04c9e7ffd44d02d5a731b24c2 +size 1684 diff --git a/assets/voxygen/voxel/npc/raptor_wood/male/hand_r.vox b/assets/voxygen/voxel/npc/raptor_wood/male/hand_r.vox new file mode 100644 index 0000000000..4b7feeab94 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_wood/male/hand_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13a6d632f47f910ea2ad513ebd82bc60e708f436de646a398a98179bd4af9c93 +size 1684 diff --git a/assets/voxygen/voxel/npc/raptor_wood/male/head.vox b/assets/voxygen/voxel/npc/raptor_wood/male/head.vox new file mode 100644 index 0000000000..cfbf9b0490 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_wood/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9a49b4f1ea5711c408b1d72e893ec0973f93b8ee6f1465f3a0083b38d86428d +size 1996 diff --git a/assets/voxygen/voxel/npc/raptor_wood/male/jaw.vox b/assets/voxygen/voxel/npc/raptor_wood/male/jaw.vox new file mode 100644 index 0000000000..508486383f --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_wood/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a02a9f22ef7e55221d46c24ed9a6777135e4ed15f0194a15cc6f5496183c2bcc +size 1256 diff --git a/assets/voxygen/voxel/npc/raptor_wood/male/leg_l.vox b/assets/voxygen/voxel/npc/raptor_wood/male/leg_l.vox new file mode 100644 index 0000000000..b571b8c8a2 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_wood/male/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac1b149c2212a37b7640697ec764397adabd5bc6ed4c67a4611ee6550805b359 +size 1628 diff --git a/assets/voxygen/voxel/npc/raptor_wood/male/leg_r.vox b/assets/voxygen/voxel/npc/raptor_wood/male/leg_r.vox new file mode 100644 index 0000000000..46eb695a26 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_wood/male/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ef9a057b6773bc20cef0fe6f2037f7080bd03fea70ced47b7a39d02aa0d5f6c +size 1628 diff --git a/assets/voxygen/voxel/npc/raptor_wood/male/neck.vox b/assets/voxygen/voxel/npc/raptor_wood/male/neck.vox new file mode 100644 index 0000000000..4012e9fc68 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_wood/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14ff09807d27956f260e394f11b7a62248def3495fa85356beffec97a6f1aec4 +size 1504 diff --git a/assets/voxygen/voxel/npc/raptor_wood/male/tail_back.vox b/assets/voxygen/voxel/npc/raptor_wood/male/tail_back.vox new file mode 100644 index 0000000000..6631bac808 --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_wood/male/tail_back.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d1bbfe8597831883e6789feb6f3b9229ed950dd43fe46edfd33bd9644bfe9eb +size 2188 diff --git a/assets/voxygen/voxel/npc/raptor_wood/male/tail_front.vox b/assets/voxygen/voxel/npc/raptor_wood/male/tail_front.vox new file mode 100644 index 0000000000..3ebee4e9df --- /dev/null +++ b/assets/voxygen/voxel/npc/raptor_wood/male/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99fc195e270d1b22ad517c4ae07c0987b2403a1ee2becee780bbd8d7807e782d +size 2040 diff --git a/assets/voxygen/voxel/theropod_central_manifest.ron b/assets/voxygen/voxel/theropod_central_manifest.ron index 7228b47401..ec9e6b9c85 100644 --- a/assets/voxygen/voxel/theropod_central_manifest.ron +++ b/assets/voxygen/voxel/theropod_central_manifest.ron @@ -119,4 +119,184 @@ central: ("npc.odonto.male.tail_back"), ), ), + (Sandraptor, Male): ( + head: ( + offset: (-2.5, -6.0, -4.5), + central: ("npc.raptor_sand.male.head"), + ), + jaw: ( + offset: (-1.5, 0.0, -1.5), + central: ("npc.raptor_sand.male.jaw"), + ), + neck: ( + offset: (-1.5, 0.0, -4.5), + central: ("npc.raptor_sand.male.neck"), + ), + chest_front: ( + offset: (-3.5, -4.0, -4.0), + central: ("npc.raptor_sand.male.chest_front"), + ), + chest_back: ( + offset: (-3.5, -10.0, -4.5), + central: ("npc.raptor_sand.male.chest_back"), + ), + tail_front: ( + offset: (-7.5, -12.0, -2.5), + central: ("npc.raptor_sand.male.tail_front"), + ), + tail_back: ( + offset: (-6.5, -30.0, -2.0), + central: ("npc.raptor_sand.male.tail_back"), + ), + ), + (Sandraptor, Female): ( + head: ( + offset: (-2.5, -6.0, -4.5), + central: ("npc.raptor_sand.male.head"), + ), + jaw: ( + offset: (-1.5, 0.0, -1.5), + central: ("npc.raptor_sand.male.jaw"), + ), + neck: ( + offset: (-1.5, 0.0, -4.5), + central: ("npc.raptor_sand.male.neck"), + ), + chest_front: ( + offset: (-3.5, -4.0, -4.0), + central: ("npc.raptor_sand.male.chest_front"), + ), + chest_back: ( + offset: (-3.5, -10.0, -4.5), + central: ("npc.raptor_sand.male.chest_back"), + ), + tail_front: ( + offset: (-7.5, -12.0, -2.5), + central: ("npc.raptor_sand.male.tail_front"), + ), + tail_back: ( + offset: (-6.5, -30.0, -2.0), + central: ("npc.raptor_sand.male.tail_back"), + ), + ), + (Snowraptor, Male): ( + head: ( + offset: (-2.5, 0.0, -4.5), + central: ("npc.raptor_snow.male.head"), + ), + jaw: ( + offset: (-1.5, 0.0, -1.5), + central: ("npc.raptor_snow.male.jaw"), + ), + neck: ( + offset: (-1.5, 0.0, -4.5), + central: ("npc.raptor_snow.male.neck"), + ), + chest_front: ( + offset: (-3.5, -4.0, -4.0), + central: ("npc.raptor_snow.male.chest_front"), + ), + chest_back: ( + offset: (-3.5, -10.0, -4.5), + central: ("npc.raptor_snow.male.chest_back"), + ), + tail_front: ( + offset: (-7.5, -12.0, -2.5), + central: ("npc.raptor_snow.male.tail_front"), + ), + tail_back: ( + offset: (-6.5, -30.0, -2.5), + central: ("npc.raptor_snow.male.tail_back"), + ), + ), + (Snowraptor, Female): ( + head: ( + offset: (-2.5, 0.0, -4.5), + central: ("npc.raptor_snow.male.head"), + ), + jaw: ( + offset: (-1.5, 0.0, -1.5), + central: ("npc.raptor_snow.male.jaw"), + ), + neck: ( + offset: (-1.5, 0.0, -4.5), + central: ("npc.raptor_snow.male.neck"), + ), + chest_front: ( + offset: (-3.5, -4.0, -4.0), + central: ("npc.raptor_snow.male.chest_front"), + ), + chest_back: ( + offset: (-3.5, -10.0, -4.5), + central: ("npc.raptor_snow.male.chest_back"), + ), + tail_front: ( + offset: (-7.5, -12.0, -2.5), + central: ("npc.raptor_snow.male.tail_front"), + ), + tail_back: ( + offset: (-6.5, -30.0, -2.5), + central: ("npc.raptor_snow.male.tail_back"), + ), + ), + (Woodraptor, Male): ( + head: ( + offset: (-3.5, -6.0, -5.0), + central: ("npc.raptor_wood.male.head"), + ), + jaw: ( + offset: (-1.5, 0.0, -1.5), + central: ("npc.raptor_wood.male.jaw"), + ), + neck: ( + offset: (-1.5, 0.0, -4.5), + central: ("npc.raptor_wood.male.neck"), + ), + chest_front: ( + offset: (-3.5, -4.0, -4.0), + central: ("npc.raptor_wood.male.chest_front"), + ), + chest_back: ( + offset: (-3.5, -10.0, -4.5), + central: ("npc.raptor_wood.male.chest_back"), + ), + tail_front: ( + offset: (-7.5, -12.0, -2.5), + central: ("npc.raptor_wood.male.tail_front"), + ), + tail_back: ( + offset: (-6.5, -30.0, -2.0), + central: ("npc.raptor_wood.male.tail_back"), + ), + ), + (Woodraptor, Female): ( + head: ( + offset: (-3.5, -6.0, -5.0), + central: ("npc.raptor_wood.male.head"), + ), + jaw: ( + offset: (-1.5, 0.0, -1.5), + central: ("npc.raptor_wood.male.jaw"), + ), + neck: ( + offset: (-1.5, 0.0, -4.5), + central: ("npc.raptor_wood.male.neck"), + ), + chest_front: ( + offset: (-3.5, -4.0, -4.0), + central: ("npc.raptor_wood.male.chest_front"), + ), + chest_back: ( + offset: (-3.5, -10.0, -4.5), + central: ("npc.raptor_wood.male.chest_back"), + ), + tail_front: ( + offset: (-7.5, -12.0, -2.5), + central: ("npc.raptor_wood.male.tail_front"), + ), + tail_back: ( + offset: (-6.5, -30.0, -2.0), + central: ("npc.raptor_wood.male.tail_back"), + ), + ), }) diff --git a/assets/voxygen/voxel/theropod_lateral_manifest.ron b/assets/voxygen/voxel/theropod_lateral_manifest.ron index 39603e4a41..3f33e5b0b5 100644 --- a/assets/voxygen/voxel/theropod_lateral_manifest.ron +++ b/assets/voxygen/voxel/theropod_lateral_manifest.ron @@ -103,4 +103,160 @@ lateral: ("npc.odonto.male.foot_r"), ), ), + (Sandraptor, Male): ( + hand_l: ( + offset: (-15.0, -9.0, -8.0), + lateral: ("npc.raptor_sand.male.hand_l"), + ), + hand_r: ( + offset: (0.0, -9.0, -8.0), + lateral: ("npc.raptor_sand.male.hand_r"), + ), + leg_l: ( + offset: (-5.0, -3.5, -3.5), + lateral: ("npc.raptor_sand.male.leg_l"), + ), + leg_r: ( + offset: (0.0, -3.5, -3.5), + lateral: ("npc.raptor_sand.male.leg_r"), + ), + foot_l: ( + offset: (-2.5, -4.5, -10.0), + lateral: ("npc.raptor_sand.male.foot_l"), + ), + foot_r: ( + offset: (-2.5, -4.5, -10.0), + lateral: ("npc.raptor_sand.male.foot_r"), + ), + ), + (Sandraptor, Female): ( + hand_l: ( + offset: (-15.0, -9.0, -8.0), + lateral: ("npc.raptor_sand.male.hand_l"), + ), + hand_r: ( + offset: (0.0, -9.0, -8.0), + lateral: ("npc.raptor_sand.male.hand_r"), + ), + leg_l: ( + offset: (-5.0, -3.5, -3.5), + lateral: ("npc.raptor_sand.male.leg_l"), + ), + leg_r: ( + offset: (0.0, -3.5, -3.5), + lateral: ("npc.raptor_sand.male.leg_r"), + ), + foot_l: ( + offset: (-2.5, -4.5, -10.0), + lateral: ("npc.raptor_sand.male.foot_l"), + ), + foot_r: ( + offset: (-2.5, -4.5, -10.0), + lateral: ("npc.raptor_sand.male.foot_r"), + ), + ), + (Snowraptor, Male): ( + hand_l: ( + offset: (-15.0, -9.0, -8.0), + lateral: ("npc.raptor_snow.male.hand_l"), + ), + hand_r: ( + offset: (0.0, -9.0, -8.0), + lateral: ("npc.raptor_snow.male.hand_r"), + ), + leg_l: ( + offset: (-5.0, -3.5, -3.5), + lateral: ("npc.raptor_snow.male.leg_l"), + ), + leg_r: ( + offset: (0.0, -3.5, -3.5), + lateral: ("npc.raptor_snow.male.leg_r"), + ), + foot_l: ( + offset: (-2.5, -4.5, -10.0), + lateral: ("npc.raptor_snow.male.foot_l"), + ), + foot_r: ( + offset: (-2.5, -4.5, -10.0), + lateral: ("npc.raptor_snow.male.foot_r"), + ), + ), + (Snowraptor, Female): ( + hand_l: ( + offset: (-15.0, -9.0, -8.0), + lateral: ("npc.raptor_snow.male.hand_l"), + ), + hand_r: ( + offset: (0.0, -9.0, -8.0), + lateral: ("npc.raptor_snow.male.hand_r"), + ), + leg_l: ( + offset: (-5.0, -3.5, -3.5), + lateral: ("npc.raptor_snow.male.leg_l"), + ), + leg_r: ( + offset: (0.0, -3.5, -3.5), + lateral: ("npc.raptor_snow.male.leg_r"), + ), + foot_l: ( + offset: (-2.5, -4.5, -10.0), + lateral: ("npc.raptor_snow.male.foot_l"), + ), + foot_r: ( + offset: (-2.5, -4.5, -10.0), + lateral: ("npc.raptor_snow.male.foot_r"), + ), + ), + (Woodraptor, Male): ( + hand_l: ( + offset: (-15.0, -9.0, -8.0), + lateral: ("npc.raptor_wood.male.hand_l"), + ), + hand_r: ( + offset: (0.0, -9.0, -8.0), + lateral: ("npc.raptor_wood.male.hand_r"), + ), + leg_l: ( + offset: (-2.5, -3.5, -3.5), + lateral: ("npc.raptor_wood.male.leg_l"), + ), + leg_r: ( + offset: (0.0, -3.5, -3.5), + lateral: ("npc.raptor_wood.male.leg_r"), + ), + foot_l: ( + offset: (-2.5, -4.5, -10.0), + lateral: ("npc.raptor_wood.male.foot_l"), + ), + foot_r: ( + offset: (-2.5, -4.5, -10.0), + lateral: ("npc.raptor_wood.male.foot_r"), + ), + ), + (Woodraptor, Female): ( + hand_l: ( + offset: (-15.0, -9.0, -8.0), + lateral: ("npc.raptor_wood.male.hand_l"), + ), + hand_r: ( + offset: (0.0, -9.0, -8.0), + lateral: ("npc.raptor_wood.male.hand_r"), + ), + leg_l: ( + offset: (-2.5, -3.5, -3.5), + lateral: ("npc.raptor_wood.male.leg_l"), + ), + leg_r: ( + offset: (0.0, -3.5, -3.5), + lateral: ("npc.raptor_wood.male.leg_r"), + ), + foot_l: ( + offset: (-2.5, -4.5, -10.0), + lateral: ("npc.raptor_wood.male.foot_l"), + ), + foot_r: ( + offset: (-2.5, -4.5, -10.0), + lateral: ("npc.raptor_wood.male.foot_r"), + ), + ), }) diff --git a/common/src/comp/body/theropod.rs b/common/src/comp/body/theropod.rs index e7d2ac75f6..c3d1c63e36 100644 --- a/common/src/comp/body/theropod.rs +++ b/common/src/comp/body/theropod.rs @@ -30,6 +30,9 @@ impl From for super::Body { pub enum Species { Archaeos = 0, Odonto = 1, + Sandraptor = 2, + Snowraptor = 3, + Woodraptor = 4, } /// Data representing per-species generic data. @@ -37,6 +40,9 @@ pub enum Species { pub struct AllSpecies { pub archaeos: SpeciesMeta, pub odonto: SpeciesMeta, + pub raptor_sand: SpeciesMeta, + pub raptor_snow: SpeciesMeta, + pub raptor_wood: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -47,11 +53,20 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies match index { Species::Archaeos => &self.archaeos, Species::Odonto => &self.odonto, + Species::Sandraptor => &self.raptor_sand, + Species::Snowraptor => &self.raptor_snow, + Species::Woodraptor => &self.raptor_wood, } } } -pub const ALL_SPECIES: [Species; 2] = [Species::Archaeos, Species::Odonto]; +pub const ALL_SPECIES: [Species; 5] = [ + Species::Archaeos, + Species::Odonto, + Species::Sandraptor, + Species::Snowraptor, + Species::Woodraptor, +]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { type IntoIter = std::iter::Copied>; diff --git a/voxygen/src/anim/src/theropod/idle.rs b/voxygen/src/anim/src/theropod/idle.rs index cce7b1bbf4..bc4ff3dc6e 100644 --- a/voxygen/src/anim/src/theropod/idle.rs +++ b/voxygen/src/anim/src/theropod/idle.rs @@ -61,9 +61,9 @@ impl Animation for IdleAnimation { 0.0, skeleton_attr.chest_front.0, skeleton_attr.chest_front.1 + breathe * 0.3, - ) / 3.0; + ) / skeleton_attr.scaler; next.chest_front.orientation = Quaternion::rotation_x(breathe * 0.04); - next.chest_front.scale = Vec3::one() / 3.0; + next.chest_front.scale = Vec3::one() / skeleton_attr.scaler; next.chest_back.position = Vec3::new(0.0, skeleton_attr.chest_back.0, skeleton_attr.chest_back.1); @@ -76,7 +76,7 @@ impl Animation for IdleAnimation { next.tail_front.scale = Vec3::one(); next.tail_back.position = - Vec3::new(0.0, skeleton_attr.tail_back.0, skeleton_attr.tail_back.1); + Vec3::new(0.0, skeleton_attr.tail_back.0, skeleton_attr.tail_back.1 - 0.5); next.tail_back.orientation = Quaternion::rotation_x(0.1); next.tail_back.scale = Vec3::one(); diff --git a/voxygen/src/anim/src/theropod/jump.rs b/voxygen/src/anim/src/theropod/jump.rs index 2fbb22287f..32eaad7c2c 100644 --- a/voxygen/src/anim/src/theropod/jump.rs +++ b/voxygen/src/anim/src/theropod/jump.rs @@ -47,9 +47,9 @@ impl Animation for JumpAnimation { 0.0, skeleton_attr.chest_front.0, skeleton_attr.chest_front.1 + breathe * 0.3, - ) / 3.0; + ) / skeleton_attr.scaler; next.chest_front.orientation = Quaternion::rotation_x(breathe * 0.04); - next.chest_front.scale = Vec3::one() / 3.0; + next.chest_front.scale = Vec3::one() / skeleton_attr.scaler; next.chest_back.position = Vec3::new(0.0, skeleton_attr.chest_back.0, skeleton_attr.chest_back.1); diff --git a/voxygen/src/anim/src/theropod/mod.rs b/voxygen/src/anim/src/theropod/mod.rs index d86d8b73cb..aff0a75fd0 100644 --- a/voxygen/src/anim/src/theropod/mod.rs +++ b/voxygen/src/anim/src/theropod/mod.rs @@ -80,6 +80,7 @@ pub struct SkeletonAttr { hand: (f32, f32, f32), leg: (f32, f32, f32), foot: (f32, f32, f32), + scaler: f32, } impl<'a> std::convert::TryFrom<&'a comp::Body> for SkeletonAttr { @@ -106,6 +107,7 @@ impl Default for SkeletonAttr { hand: (0.0, 0.0, 0.0), leg: (0.0, 0.0, 0.0), foot: (0.0, 0.0, 0.0), + scaler: 0.0, } } } @@ -117,42 +119,79 @@ impl<'a> From<&'a Body> for SkeletonAttr { head: match (body.species, body.body_type) { (Archaeos, _) => (8.0, 4.0), (Odonto, _) => (2.0, 2.0), + (Sandraptor, _) => (8.0, 5.0), + (Snowraptor, _) => (8.0, 5.0), + (Woodraptor, _) => (8.0, 5.0), }, jaw: match (body.species, body.body_type) { (Archaeos, _) => (1.0, -7.0), (Odonto, _) => (2.0, -7.0), + (Sandraptor, _) => (0.0, -4.0), + (Snowraptor, _) => (0.0, -4.0), + (Woodraptor, _) => (0.0, -4.0), }, neck: match (body.species, body.body_type) { (Archaeos, _) => (4.5, -2.0), (Odonto, _) => (4.0, 0.0), + (Sandraptor, _) => (4.0, 2.5), + (Snowraptor, _) => (4.0, 2.5), + (Woodraptor, _) => (4.0, 2.5), }, chest_front: match (body.species, body.body_type) { (Archaeos, _) => (0.0, 20.0), (Odonto, _) => (0.0, 13.0), + (Sandraptor, _) => (0.0, 15.5), + (Snowraptor, _) => (0.0, 15.5), + (Woodraptor, _) => (0.0, 15.5), }, chest_back: match (body.species, body.body_type) { (Archaeos, _) => (-5.5, -1.0), (Odonto, _) => (-5.0, 2.0), + (Sandraptor, _) => (-3.0, 0.5), + (Snowraptor, _) => (-3.0, 0.5), + (Woodraptor, _) => (-3.0, 0.5), }, tail_front: match (body.species, body.body_type) { (Archaeos, _) => (-9.0, -1.5), (Odonto, _) => (-7.0, -1.0), + (Sandraptor, _) => (-9.5, -1.0), + (Snowraptor, _) => (-9.5, -1.0), + (Woodraptor, _) => (-9.5, -1.0), }, tail_back: match (body.species, body.body_type) { (Archaeos, _) => (-8.0, -0.5), (Odonto, _) => (-8.0, 0.5), + (Sandraptor, _) => (-10.5, 0.5), + (Snowraptor, _) => (-10.5, 1.0), + (Woodraptor, _) => (-10.5, 0.5), }, hand: match (body.species, body.body_type) { (Archaeos, _) => (3.0, 0.0, -4.0), (Odonto, _) => (3.5, 3.0, -4.0), + (Sandraptor, _) => (2.5, 3.0, 1.0), + (Snowraptor, _) => (2.5, 3.0, 1.0), + (Woodraptor, _) => (2.5, 3.0, 1.0), }, leg: match (body.species, body.body_type) { (Archaeos, _) => (4.5, -3.0, -4.0), (Odonto, _) => (5.5, -2.5, -4.0), + (Sandraptor, _) => (1.5, -2.5, -3.0), + (Snowraptor, _) => (1.5, -2.5, -3.0), + (Woodraptor, _) => (1.5, -2.5, -3.0), }, foot: match (body.species, body.body_type) { (Archaeos, _) => (1.0, -0.5, -7.0), (Odonto, _) => (2.0, -6.5, -3.0), + (Sandraptor, _) => (2.0, 0.0, -3.0), + (Snowraptor, _) => (2.0, 0.0, -3.0), + (Woodraptor, _) => (2.0, 0.0, -3.0), + }, + scaler: match (body.species, body.body_type) { + (Archaeos, _) => (3.0), + (Odonto, _) => (3.0), + (Sandraptor, _) => (7.0), + (Snowraptor, _) => (7.0), + (Woodraptor, _) => (7.0), }, } } diff --git a/voxygen/src/anim/src/theropod/run.rs b/voxygen/src/anim/src/theropod/run.rs index 76b4e36395..21ea40351d 100644 --- a/voxygen/src/anim/src/theropod/run.rs +++ b/voxygen/src/anim/src/theropod/run.rs @@ -84,10 +84,10 @@ impl Animation for RunAnimation { 0.0, skeleton_attr.chest_front.0, skeleton_attr.chest_front.1 + short * 0.5, - ) / 3.0; + ) / skeleton_attr.scaler; next.chest_front.orientation = Quaternion::rotation_x(short * 0.07) * Quaternion::rotation_z(shortalt * 0.15); - next.chest_front.scale = Vec3::one() / 3.0; + next.chest_front.scale = Vec3::one() / skeleton_attr.scaler; next.chest_back.position = Vec3::new(0.0, skeleton_attr.chest_back.0, skeleton_attr.chest_back.1);