From c22d543dd25094bb52037af49183aad8ad59dc07 Mon Sep 17 00:00:00 2001 From: Snowram Date: Thu, 18 Jun 2020 01:13:33 +0200 Subject: [PATCH] Add rock snapper mob --- assets/common/npc_names.json | 4 ++ .../voxel/npc/rocksnapper/female/chest.vox | 3 ++ .../voxel/npc/rocksnapper/female/foot_bl.vox | 3 ++ .../voxel/npc/rocksnapper/female/foot_br.vox | 3 ++ .../voxel/npc/rocksnapper/female/foot_fl.vox | 3 ++ .../voxel/npc/rocksnapper/female/foot_fr.vox | 3 ++ .../npc/rocksnapper/female/head_lower.vox | 3 ++ .../npc/rocksnapper/female/head_upper.vox | 3 ++ .../voxel/npc/rocksnapper/female/jaw.vox | 3 ++ .../npc/rocksnapper/female/tail_front.vox | 3 ++ .../npc/rocksnapper/female/tail_rear.vox | 3 ++ .../voxel/npc/rocksnapper/male/chest.vox | 3 ++ .../voxel/npc/rocksnapper/male/foot_bl.vox | 3 ++ .../voxel/npc/rocksnapper/male/foot_br.vox | 3 ++ .../voxel/npc/rocksnapper/male/foot_fl.vox | 3 ++ .../voxel/npc/rocksnapper/male/foot_fr.vox | 3 ++ .../voxel/npc/rocksnapper/male/head_lower.vox | 3 ++ .../voxel/npc/rocksnapper/male/head_upper.vox | 3 ++ .../voxel/npc/rocksnapper/male/jaw.vox | 3 ++ .../voxel/npc/rocksnapper/male/tail_front.vox | 3 ++ .../voxel/npc/rocksnapper/male/tail_rear.vox | 3 ++ .../voxel/npc/tortoise/female/chest.vox | 4 +- .../voxel/npc/tortoise/female/foot_br.vox | 4 +- .../voxel/npc/tortoise/female/foot_fr.vox | 4 +- .../voxel/npc/tortoise/female/tail_front.vox | 4 +- .../voxel/npc/tortoise/female/tail_rear.vox | 4 +- .../voxygen/voxel/npc/tortoise/male/chest.vox | 4 +- .../voxel/npc/tortoise/male/foot_br.vox | 4 +- .../voxel/npc/tortoise/male/foot_fr.vox | 4 +- .../voxel/npc/tortoise/male/tail_front.vox | 4 +- .../voxel/npc/tortoise/male/tail_rear.vox | 4 +- .../voxel/quadruped_low_central_manifest.ron | 52 +++++++++++++++++++ .../voxel/quadruped_low_lateral_manifest.ron | 36 +++++++++++++ common/src/comp/body/quadruped_low.rs | 6 ++- voxygen/src/anim/quadruped_low/mod.rs | 9 ++++ 35 files changed, 186 insertions(+), 21 deletions(-) create mode 100644 assets/voxygen/voxel/npc/rocksnapper/female/chest.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/female/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/female/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/female/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/female/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/female/head_lower.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/female/head_upper.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/female/jaw.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/female/tail_front.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/female/tail_rear.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/male/chest.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/male/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/male/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/male/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/male/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/male/head_lower.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/male/head_upper.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/male/jaw.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/male/tail_front.vox create mode 100644 assets/voxygen/voxel/npc/rocksnapper/male/tail_rear.vox diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json index 1cddc0f846..270d5179ac 100644 --- a/assets/common/npc_names.json +++ b/assets/common/npc_names.json @@ -585,6 +585,10 @@ "tortoise": { "keyword": "tortoise", "generic": "Tortoise" + }, + "rocksnapper": { + "keyword": "rocksnapper", + "generic": "Rock Snapper" } } } diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/chest.vox b/assets/voxygen/voxel/npc/rocksnapper/female/chest.vox new file mode 100644 index 0000000000..484648ae45 --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/female/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3bc75970f0411878e7dcc53281e64bfbe521acb907c5ab39466357012688845 +size 39944 diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/foot_bl.vox b/assets/voxygen/voxel/npc/rocksnapper/female/foot_bl.vox new file mode 100644 index 0000000000..fbc3ffa8ac --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/female/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b76da17922521b88b4e6463483e1185deb638b0080ea826fc732f70663abccb +size 2124 diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/foot_br.vox b/assets/voxygen/voxel/npc/rocksnapper/female/foot_br.vox new file mode 100644 index 0000000000..662576a682 --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/female/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9de398f6db88146fbebceec2450795a2c3d69b91bfdab589d1174eddbe5851e0 +size 2124 diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/foot_fl.vox b/assets/voxygen/voxel/npc/rocksnapper/female/foot_fl.vox new file mode 100644 index 0000000000..dd9d49fd72 --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/female/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab0993f5cf7c4e41eb8a65555f31b3a9f7c37ac6c13877f37ff150c8f6939049 +size 2188 diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/foot_fr.vox b/assets/voxygen/voxel/npc/rocksnapper/female/foot_fr.vox new file mode 100644 index 0000000000..578b80bd51 --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/female/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b848a7e0a2f690f3dac421bfa056b176ded8ca5e44150ecf65520d20884c7b7 +size 2188 diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/head_lower.vox b/assets/voxygen/voxel/npc/rocksnapper/female/head_lower.vox new file mode 100644 index 0000000000..a3769c7475 --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/female/head_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4af8fc52d7d755f47b283251101e334cb11d17af150645e566e267c295efc79f +size 2360 diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/head_upper.vox b/assets/voxygen/voxel/npc/rocksnapper/female/head_upper.vox new file mode 100644 index 0000000000..c1c5d71489 --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/female/head_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3e687b80e115371954ecc1cbf65adc8e4782b2ad48dc16c6045085ceca3b1b7 +size 1708 diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/jaw.vox b/assets/voxygen/voxel/npc/rocksnapper/female/jaw.vox new file mode 100644 index 0000000000..2b499468e9 --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/female/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc3a147fd5fc4870156992f0b0341610a065700ddd87913ac8266fe23b3361a8 +size 2016 diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/tail_front.vox b/assets/voxygen/voxel/npc/rocksnapper/female/tail_front.vox new file mode 100644 index 0000000000..6c341247dc --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/female/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8680589cf540f54f8dcd0f937b10a4ac59df1d66d8e2205f3d6caa81c5fdc73c +size 2052 diff --git a/assets/voxygen/voxel/npc/rocksnapper/female/tail_rear.vox b/assets/voxygen/voxel/npc/rocksnapper/female/tail_rear.vox new file mode 100644 index 0000000000..c70140531b --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/female/tail_rear.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4adf30bed3dfc65d25938e7f938acbff0f19aaf134034109095bb3659f983aad +size 1272 diff --git a/assets/voxygen/voxel/npc/rocksnapper/male/chest.vox b/assets/voxygen/voxel/npc/rocksnapper/male/chest.vox new file mode 100644 index 0000000000..484648ae45 --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/male/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3bc75970f0411878e7dcc53281e64bfbe521acb907c5ab39466357012688845 +size 39944 diff --git a/assets/voxygen/voxel/npc/rocksnapper/male/foot_bl.vox b/assets/voxygen/voxel/npc/rocksnapper/male/foot_bl.vox new file mode 100644 index 0000000000..fbc3ffa8ac --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b76da17922521b88b4e6463483e1185deb638b0080ea826fc732f70663abccb +size 2124 diff --git a/assets/voxygen/voxel/npc/rocksnapper/male/foot_br.vox b/assets/voxygen/voxel/npc/rocksnapper/male/foot_br.vox new file mode 100644 index 0000000000..662576a682 --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9de398f6db88146fbebceec2450795a2c3d69b91bfdab589d1174eddbe5851e0 +size 2124 diff --git a/assets/voxygen/voxel/npc/rocksnapper/male/foot_fl.vox b/assets/voxygen/voxel/npc/rocksnapper/male/foot_fl.vox new file mode 100644 index 0000000000..dd9d49fd72 --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab0993f5cf7c4e41eb8a65555f31b3a9f7c37ac6c13877f37ff150c8f6939049 +size 2188 diff --git a/assets/voxygen/voxel/npc/rocksnapper/male/foot_fr.vox b/assets/voxygen/voxel/npc/rocksnapper/male/foot_fr.vox new file mode 100644 index 0000000000..578b80bd51 --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b848a7e0a2f690f3dac421bfa056b176ded8ca5e44150ecf65520d20884c7b7 +size 2188 diff --git a/assets/voxygen/voxel/npc/rocksnapper/male/head_lower.vox b/assets/voxygen/voxel/npc/rocksnapper/male/head_lower.vox new file mode 100644 index 0000000000..a3769c7475 --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/male/head_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4af8fc52d7d755f47b283251101e334cb11d17af150645e566e267c295efc79f +size 2360 diff --git a/assets/voxygen/voxel/npc/rocksnapper/male/head_upper.vox b/assets/voxygen/voxel/npc/rocksnapper/male/head_upper.vox new file mode 100644 index 0000000000..c1c5d71489 --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/male/head_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3e687b80e115371954ecc1cbf65adc8e4782b2ad48dc16c6045085ceca3b1b7 +size 1708 diff --git a/assets/voxygen/voxel/npc/rocksnapper/male/jaw.vox b/assets/voxygen/voxel/npc/rocksnapper/male/jaw.vox new file mode 100644 index 0000000000..2b499468e9 --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc3a147fd5fc4870156992f0b0341610a065700ddd87913ac8266fe23b3361a8 +size 2016 diff --git a/assets/voxygen/voxel/npc/rocksnapper/male/tail_front.vox b/assets/voxygen/voxel/npc/rocksnapper/male/tail_front.vox new file mode 100644 index 0000000000..6c341247dc --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/male/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8680589cf540f54f8dcd0f937b10a4ac59df1d66d8e2205f3d6caa81c5fdc73c +size 2052 diff --git a/assets/voxygen/voxel/npc/rocksnapper/male/tail_rear.vox b/assets/voxygen/voxel/npc/rocksnapper/male/tail_rear.vox new file mode 100644 index 0000000000..c70140531b --- /dev/null +++ b/assets/voxygen/voxel/npc/rocksnapper/male/tail_rear.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4adf30bed3dfc65d25938e7f938acbff0f19aaf134034109095bb3659f983aad +size 1272 diff --git a/assets/voxygen/voxel/npc/tortoise/female/chest.vox b/assets/voxygen/voxel/npc/tortoise/female/chest.vox index 2d5f3d03bc..e18b5f626b 100644 --- a/assets/voxygen/voxel/npc/tortoise/female/chest.vox +++ b/assets/voxygen/voxel/npc/tortoise/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2d2f02cf3a3ca443ba5503b77cf2c7d5c9b97d83050e947ac251f0340d6e7b7 -size 68715 +oid sha256:a2782f04e5e6d5e771e49edf11bcacee4f9c578f4205477da9f29c0fe80bd107 +size 14232 diff --git a/assets/voxygen/voxel/npc/tortoise/female/foot_br.vox b/assets/voxygen/voxel/npc/tortoise/female/foot_br.vox index fda74f8a68..40f56fca05 100644 --- a/assets/voxygen/voxel/npc/tortoise/female/foot_br.vox +++ b/assets/voxygen/voxel/npc/tortoise/female/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afbe7b898e1ef84576fc92acbcde378b1d445feb5f4478eb86915f40a8fd6dd0 -size 56063 +oid sha256:31b0776004a01cb2d8280a411be4489dec0912e7f2dded0f4054b0f6c622b2d0 +size 1580 diff --git a/assets/voxygen/voxel/npc/tortoise/female/foot_fr.vox b/assets/voxygen/voxel/npc/tortoise/female/foot_fr.vox index 87e2b2a79d..b33af0ae24 100644 --- a/assets/voxygen/voxel/npc/tortoise/female/foot_fr.vox +++ b/assets/voxygen/voxel/npc/tortoise/female/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ead09c8d21896baaf6c6597681a2fd0191d58eedbd7a5f62c88803586f3a697 -size 56107 +oid sha256:3fa1822a66258249b7cbdb806af75e1e5455e2a70058e11f0575a23b9308d320 +size 1624 diff --git a/assets/voxygen/voxel/npc/tortoise/female/tail_front.vox b/assets/voxygen/voxel/npc/tortoise/female/tail_front.vox index c671bf1f13..e47ff4971b 100644 --- a/assets/voxygen/voxel/npc/tortoise/female/tail_front.vox +++ b/assets/voxygen/voxel/npc/tortoise/female/tail_front.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f07cd129987a476a5fcc8197d2fae96686cf7b30357950fc6090b42686d4d872 -size 55719 +oid sha256:8d7ec311123bd529903a9982d97cfaaa373818f5dd8c43ce646ecee1decd6e95 +size 1236 diff --git a/assets/voxygen/voxel/npc/tortoise/female/tail_rear.vox b/assets/voxygen/voxel/npc/tortoise/female/tail_rear.vox index 5b941ddb0c..79ad6f7e89 100644 --- a/assets/voxygen/voxel/npc/tortoise/female/tail_rear.vox +++ b/assets/voxygen/voxel/npc/tortoise/female/tail_rear.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbd61c1a6b0d6ba1840b3b0bbc32a81a753e0045886e7b7c1acc32a4c4db18b6 -size 1100 +oid sha256:5482626dd095456f9718eeec71e6a5e724115a0bb05e8bf68c56f890ae043608 +size 1096 diff --git a/assets/voxygen/voxel/npc/tortoise/male/chest.vox b/assets/voxygen/voxel/npc/tortoise/male/chest.vox index 2d5f3d03bc..e18b5f626b 100644 --- a/assets/voxygen/voxel/npc/tortoise/male/chest.vox +++ b/assets/voxygen/voxel/npc/tortoise/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2d2f02cf3a3ca443ba5503b77cf2c7d5c9b97d83050e947ac251f0340d6e7b7 -size 68715 +oid sha256:a2782f04e5e6d5e771e49edf11bcacee4f9c578f4205477da9f29c0fe80bd107 +size 14232 diff --git a/assets/voxygen/voxel/npc/tortoise/male/foot_br.vox b/assets/voxygen/voxel/npc/tortoise/male/foot_br.vox index fda74f8a68..40f56fca05 100644 --- a/assets/voxygen/voxel/npc/tortoise/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/tortoise/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afbe7b898e1ef84576fc92acbcde378b1d445feb5f4478eb86915f40a8fd6dd0 -size 56063 +oid sha256:31b0776004a01cb2d8280a411be4489dec0912e7f2dded0f4054b0f6c622b2d0 +size 1580 diff --git a/assets/voxygen/voxel/npc/tortoise/male/foot_fr.vox b/assets/voxygen/voxel/npc/tortoise/male/foot_fr.vox index 87e2b2a79d..b33af0ae24 100644 --- a/assets/voxygen/voxel/npc/tortoise/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/tortoise/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ead09c8d21896baaf6c6597681a2fd0191d58eedbd7a5f62c88803586f3a697 -size 56107 +oid sha256:3fa1822a66258249b7cbdb806af75e1e5455e2a70058e11f0575a23b9308d320 +size 1624 diff --git a/assets/voxygen/voxel/npc/tortoise/male/tail_front.vox b/assets/voxygen/voxel/npc/tortoise/male/tail_front.vox index c671bf1f13..e47ff4971b 100644 --- a/assets/voxygen/voxel/npc/tortoise/male/tail_front.vox +++ b/assets/voxygen/voxel/npc/tortoise/male/tail_front.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f07cd129987a476a5fcc8197d2fae96686cf7b30357950fc6090b42686d4d872 -size 55719 +oid sha256:8d7ec311123bd529903a9982d97cfaaa373818f5dd8c43ce646ecee1decd6e95 +size 1236 diff --git a/assets/voxygen/voxel/npc/tortoise/male/tail_rear.vox b/assets/voxygen/voxel/npc/tortoise/male/tail_rear.vox index 5b941ddb0c..79ad6f7e89 100644 --- a/assets/voxygen/voxel/npc/tortoise/male/tail_rear.vox +++ b/assets/voxygen/voxel/npc/tortoise/male/tail_rear.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbd61c1a6b0d6ba1840b3b0bbc32a81a753e0045886e7b7c1acc32a4c4db18b6 -size 1100 +oid sha256:5482626dd095456f9718eeec71e6a5e724115a0bb05e8bf68c56f890ae043608 +size 1096 diff --git a/assets/voxygen/voxel/quadruped_low_central_manifest.ron b/assets/voxygen/voxel/quadruped_low_central_manifest.ron index d615fe1487..fe0b5bae4b 100644 --- a/assets/voxygen/voxel/quadruped_low_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_low_central_manifest.ron @@ -312,4 +312,56 @@ central: ("npc.tortoise.female.tail_front"), ), ), + (Rocksnapper, Male): ( + upper: ( + offset: (-3.5, -4.5, -3.0), + central: ("npc.rocksnapper.male.head_upper"), + ), + lower: ( + offset: (-3.5, -5.0, -3.5), + central: ("npc.rocksnapper.male.head_lower"), + ), + jaw: ( + offset: (-6.5, -6.0, -2.5), + central: ("npc.rocksnapper.male.jaw"), + ), + chest: ( + offset: (-15.5, -18.5, -13.5), + central: ("npc.rocksnapper.male.chest"), + ), + tail_rear: ( + offset: (-1.5, -11.0, -2.5), + central: ("npc.rocksnapper.male.tail_rear"), + ), + tail_front: ( + offset: (-2.5, -15.0, -4.5), + central: ("npc.rocksnapper.male.tail_front"), + ), + ), + (Rocksnapper, Female): ( + upper: ( + offset: (-3.5, -4.5, -3.0), + central: ("npc.rocksnapper.female.head_upper"), + ), + lower: ( + offset: (-3.5, -5.0, -3.5), + central: ("npc.rocksnapper.female.head_lower"), + ), + jaw: ( + offset: (-6.5, -6.0, -2.5), + central: ("npc.rocksnapper.female.jaw"), + ), + chest: ( + offset: (-15.5, -18.5, -13.5), + central: ("npc.rocksnapper.female.chest"), + ), + tail_rear: ( + offset: (-1.5, -11.0, -2.5), + central: ("npc.rocksnapper.female.tail_rear"), + ), + tail_front: ( + offset: (-2.5, -15.0, -4.5), + central: ("npc.rocksnapper.female.tail_front"), + ), + ), }) diff --git a/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron index 69b7736283..136af6d1d3 100644 --- a/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron @@ -215,4 +215,40 @@ lateral: ("npc.tortoise.female.foot_br"), ), ), + (Rocksnapper, Male): ( + front_left: ( + offset: (-6.0, -6.5, -10.0), + lateral: ("npc.rocksnapper.male.foot_fl"), + ), + front_right: ( + offset: (-6.0, -6.5, -10.0), + lateral: ("npc.rocksnapper.male.foot_fr"), + ), + back_left: ( + offset: (-5.5, -4.5, -9.0), + lateral: ("npc.rocksnapper.male.foot_bl"), + ), + back_right: ( + offset: (-5.5, -4.5, -9.0), + lateral: ("npc.rocksnapper.male.foot_br"), + ), + ), + (Rocksnapper, Female): ( + front_left: ( + offset: (-6.0, -6.5, -10.0), + lateral: ("npc.rocksnapper.female.foot_fl"), + ), + front_right: ( + offset: (-6.0, -6.5, -10.0), + lateral: ("npc.rocksnapper.female.foot_fr"), + ), + back_left: ( + offset: (-5.5, -4.5, -9.0), + lateral: ("npc.rocksnapper.female.foot_bl"), + ), + back_right: ( + offset: (-5.5, -4.5, -9.0), + lateral: ("npc.rocksnapper.female.foot_br"), + ), + ), }) diff --git a/common/src/comp/body/quadruped_low.rs b/common/src/comp/body/quadruped_low.rs index 48e8d62d13..04f5ced441 100644 --- a/common/src/comp/body/quadruped_low.rs +++ b/common/src/comp/body/quadruped_low.rs @@ -33,6 +33,7 @@ pub enum Species { Monitor = 3, Asp = 4, Tortoise = 5, + Rocksnapper = 6, } /// Data representing per-species generic data. @@ -46,6 +47,7 @@ pub struct AllSpecies { pub monitor: SpeciesMeta, pub asp: SpeciesMeta, pub tortoise: SpeciesMeta, + pub rocksnapper: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -60,17 +62,19 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Monitor => &self.monitor, Species::Asp => &self.asp, Species::Tortoise => &self.tortoise, + Species::Rocksnapper => &self.rocksnapper, } } } -pub const ALL_SPECIES: [Species; 6] = [ +pub const ALL_SPECIES: [Species; 7] = [ Species::Crocodile, Species::Alligator, Species::Salamander, Species::Monitor, Species::Asp, Species::Tortoise, + Species::Rocksnapper, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/voxygen/src/anim/quadruped_low/mod.rs b/voxygen/src/anim/quadruped_low/mod.rs index b66d1cea62..d9cf518665 100644 --- a/voxygen/src/anim/quadruped_low/mod.rs +++ b/voxygen/src/anim/quadruped_low/mod.rs @@ -133,6 +133,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Monitor, _) => (3.5, 2.0), (Asp, _) => (6.0, 5.5), (Tortoise, _) => (5.0, 1.0), + (Rocksnapper, _) => (6.0, 0.5), }, head_lower: match (body.species, body.body_type) { (Crocodile, _) => (8.0, 0.0), @@ -141,6 +142,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Monitor, _) => (10.0, 3.0), (Asp, _) => (9.0, 2.5), (Tortoise, _) => (12.0, -3.5), + (Rocksnapper, _) => (12.0, -9.0), }, jaw: match (body.species, body.body_type) { (Crocodile, _) => (0.0, -3.0), @@ -149,6 +151,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Monitor, _) => (0.0, -1.0), (Asp, _) => (1.0, -2.0), (Tortoise, _) => (0.5, -2.0), + (Rocksnapper, _) => (0.5, -1.5), }, chest: match (body.species, body.body_type) { (Crocodile, _) => (0.0, 5.0), @@ -157,6 +160,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Monitor, _) => (0.0, 5.0), (Asp, _) => (0.0, 8.0), (Tortoise, _) => (0.0, 11.0), + (Rocksnapper, _) => (0.0, 16.5), }, tail_rear: match (body.species, body.body_type) { (Crocodile, _) => (-12.5, -1.0), @@ -165,6 +169,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Monitor, _) => (-12.0, 0.0), (Asp, _) => (-14.0, -2.0), (Tortoise, _) => (-7.0, -1.5), + (Rocksnapper, _) => (-14.5, -2.0), }, tail_front: match (body.species, body.body_type) { (Crocodile, _) => (-6.0, 0.0), @@ -173,6 +178,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Monitor, _) => (-6.5, 0.0), (Asp, _) => (-6.0, -2.0), (Tortoise, _) => (-13.5, -3.0), + (Rocksnapper, _) => (-13.5, -6.5), }, feet_f: match (body.species, body.body_type) { (Crocodile, _) => (6.0, 6.0, -1.0), @@ -181,6 +187,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Monitor, _) => (6.0, 6.0, 0.0), (Asp, _) => (6.5, 6.0, -1.0), (Tortoise, _) => (8.5, 9.5, -3.0), + (Rocksnapper, _) => (12.5, 10.0, -6.5), }, feet_b: match (body.species, body.body_type) { (Crocodile, _) => (6.0, -6.0, -1.0), @@ -189,6 +196,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Monitor, _) => (6.0, -6.0, 0.0), (Asp, _) => (6.5, -3.5, -1.0), (Tortoise, _) => (8.0, -8.5, -3.0), + (Rocksnapper, _) => (12.0, -12.0, -7.5), }, height: match (body.species, body.body_type) { (Crocodile, _) => (1.0), @@ -197,6 +205,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Monitor, _) => (1.0), (Asp, _) => (1.0), (Tortoise, _) => (1.0), + (Rocksnapper, _) => (1.0), }, } }