diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json index 511bbb0627..9fbc2e649f 100644 --- a/assets/common/npc_names.json +++ b/assets/common/npc_names.json @@ -561,6 +561,18 @@ "crocodile": { "keyword": "crocodile", "generic": "Crocodile" + }, + "alligator": { + "keyword": "alligator", + "generic": "Alligator" + }, + "salamander": { + "keyword": "salamander", + "generic": "Salamander" + }, + "monitor": { + "keyword": "monitor", + "generic": "Monitor" } } } diff --git a/assets/voxygen/voxel/npc/alligator/female/chest.vox b/assets/voxygen/voxel/npc/alligator/female/chest.vox new file mode 100644 index 0000000000..2994a860aa --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/female/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a974864bdf5f961527cbcc3e2460e67ce3d92131ca9a7f54216c65039e3dd256 +size 4448 diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_bl.vox b/assets/voxygen/voxel/npc/alligator/female/foot_bl.vox new file mode 100644 index 0000000000..a673df88b3 --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/female/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95c9ab892899acebcad8b556c1e11da6d869faaac582e464bf41473341f2b34a +size 1340 diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_br.vox b/assets/voxygen/voxel/npc/alligator/female/foot_br.vox new file mode 100644 index 0000000000..f6df517dee --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/female/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c74fd06f4e173d6f4d85634cb0dd017f6068a00f73702919c03fc3b70806bc4b +size 1340 diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_fl.vox b/assets/voxygen/voxel/npc/alligator/female/foot_fl.vox new file mode 100644 index 0000000000..5ecb3871c8 --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/female/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8b654d8bfc43da2b0a5391ebbe2bc3ab076098f75401bb0baaeafcc1aed5dc9 +size 1300 diff --git a/assets/voxygen/voxel/npc/alligator/female/foot_fr.vox b/assets/voxygen/voxel/npc/alligator/female/foot_fr.vox new file mode 100644 index 0000000000..b56645760f --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/female/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d605a925ac46bfc9848210ab6fe416531f5a2376fa99c5cd5917dd6b064ae8db +size 1304 diff --git a/assets/voxygen/voxel/npc/alligator/female/head_lower.vox b/assets/voxygen/voxel/npc/alligator/female/head_lower.vox new file mode 100644 index 0000000000..590edf5f11 --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/female/head_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf6a69598ff4335da876c7b3123aac4d2eb34ba9e4dcb6abe8d40aeae01a8318 +size 2136 diff --git a/assets/voxygen/voxel/npc/alligator/female/head_upper.vox b/assets/voxygen/voxel/npc/alligator/female/head_upper.vox new file mode 100644 index 0000000000..4156e13d38 --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/female/head_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06b1d445ec3d3df12fccd3f3b664bb70efce73ebcd488ad3e7e9fbeee53657b1 +size 2376 diff --git a/assets/voxygen/voxel/npc/alligator/female/jaw.vox b/assets/voxygen/voxel/npc/alligator/female/jaw.vox new file mode 100644 index 0000000000..870762ea2e --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/female/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:645d51df4f4b090d689dbff4ad14435cf235d2c050cac57cacc91e430b774ce8 +size 1744 diff --git a/assets/voxygen/voxel/npc/alligator/female/tail_front.vox b/assets/voxygen/voxel/npc/alligator/female/tail_front.vox new file mode 100644 index 0000000000..e4d37f8bc2 --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/female/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4d6d223c065990a9582951f5c6b0d65f49384aa0d10286a4add0313c5604fe8 +size 2288 diff --git a/assets/voxygen/voxel/npc/alligator/female/tail_rear.vox b/assets/voxygen/voxel/npc/alligator/female/tail_rear.vox new file mode 100644 index 0000000000..b55d8b8365 --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/female/tail_rear.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:489d6c8af365e17cf9cb20d4999528ef11888facf34c2b473bd01b30a8969e7a +size 1320 diff --git a/assets/voxygen/voxel/npc/alligator/male/chest.vox b/assets/voxygen/voxel/npc/alligator/male/chest.vox new file mode 100644 index 0000000000..2994a860aa --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/male/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a974864bdf5f961527cbcc3e2460e67ce3d92131ca9a7f54216c65039e3dd256 +size 4448 diff --git a/assets/voxygen/voxel/npc/alligator/male/foot_bl.vox b/assets/voxygen/voxel/npc/alligator/male/foot_bl.vox new file mode 100644 index 0000000000..a673df88b3 --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95c9ab892899acebcad8b556c1e11da6d869faaac582e464bf41473341f2b34a +size 1340 diff --git a/assets/voxygen/voxel/npc/alligator/male/foot_br.vox b/assets/voxygen/voxel/npc/alligator/male/foot_br.vox new file mode 100644 index 0000000000..f6df517dee --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c74fd06f4e173d6f4d85634cb0dd017f6068a00f73702919c03fc3b70806bc4b +size 1340 diff --git a/assets/voxygen/voxel/npc/alligator/male/foot_fl.vox b/assets/voxygen/voxel/npc/alligator/male/foot_fl.vox new file mode 100644 index 0000000000..5ecb3871c8 --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8b654d8bfc43da2b0a5391ebbe2bc3ab076098f75401bb0baaeafcc1aed5dc9 +size 1300 diff --git a/assets/voxygen/voxel/npc/alligator/male/foot_fr.vox b/assets/voxygen/voxel/npc/alligator/male/foot_fr.vox new file mode 100644 index 0000000000..b56645760f --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d605a925ac46bfc9848210ab6fe416531f5a2376fa99c5cd5917dd6b064ae8db +size 1304 diff --git a/assets/voxygen/voxel/npc/alligator/male/head_lower.vox b/assets/voxygen/voxel/npc/alligator/male/head_lower.vox new file mode 100644 index 0000000000..590edf5f11 --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/male/head_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf6a69598ff4335da876c7b3123aac4d2eb34ba9e4dcb6abe8d40aeae01a8318 +size 2136 diff --git a/assets/voxygen/voxel/npc/alligator/male/head_upper.vox b/assets/voxygen/voxel/npc/alligator/male/head_upper.vox new file mode 100644 index 0000000000..4156e13d38 --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/male/head_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06b1d445ec3d3df12fccd3f3b664bb70efce73ebcd488ad3e7e9fbeee53657b1 +size 2376 diff --git a/assets/voxygen/voxel/npc/alligator/male/jaw.vox b/assets/voxygen/voxel/npc/alligator/male/jaw.vox new file mode 100644 index 0000000000..870762ea2e --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:645d51df4f4b090d689dbff4ad14435cf235d2c050cac57cacc91e430b774ce8 +size 1744 diff --git a/assets/voxygen/voxel/npc/alligator/male/tail_front.vox b/assets/voxygen/voxel/npc/alligator/male/tail_front.vox new file mode 100644 index 0000000000..e4d37f8bc2 --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/male/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4d6d223c065990a9582951f5c6b0d65f49384aa0d10286a4add0313c5604fe8 +size 2288 diff --git a/assets/voxygen/voxel/npc/alligator/male/tail_rear.vox b/assets/voxygen/voxel/npc/alligator/male/tail_rear.vox new file mode 100644 index 0000000000..b55d8b8365 --- /dev/null +++ b/assets/voxygen/voxel/npc/alligator/male/tail_rear.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:489d6c8af365e17cf9cb20d4999528ef11888facf34c2b473bd01b30a8969e7a +size 1320 diff --git a/assets/voxygen/voxel/npc/crocodile/female/chest.vox b/assets/voxygen/voxel/npc/crocodile/female/chest.vox new file mode 100644 index 0000000000..cc180afa3b --- /dev/null +++ b/assets/voxygen/voxel/npc/crocodile/female/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80ce2de577afd3046b2f40ab5ec859032bec5393480d8f3905f9dadf503d0783 +size 4168 diff --git a/assets/voxygen/voxel/npc/crocodile/female/chest_front.vox b/assets/voxygen/voxel/npc/crocodile/female/chest_front.vox deleted file mode 100644 index 3d4f73f7f4..0000000000 --- a/assets/voxygen/voxel/npc/crocodile/female/chest_front.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:706cbae9992d0101f36c1d20504df81cc6a67c0f2f94e5c144cee03dfb0eb544 -size 3704 diff --git a/assets/voxygen/voxel/npc/crocodile/female/chest_rear.vox b/assets/voxygen/voxel/npc/crocodile/female/chest_rear.vox deleted file mode 100644 index 0b2f0aae9f..0000000000 --- a/assets/voxygen/voxel/npc/crocodile/female/chest_rear.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:701c9fdd7c46132a1d4d26d74d2246fe4e234ff852e5d6620573937255003c25 -size 2092 diff --git a/assets/voxygen/voxel/npc/crocodile/female/tail_front.vox b/assets/voxygen/voxel/npc/crocodile/female/tail_front.vox new file mode 100644 index 0000000000..945d192050 --- /dev/null +++ b/assets/voxygen/voxel/npc/crocodile/female/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8174e9a8509985f2c3e033f8da55b0758274daffe6e4905582986a53005be110 +size 2096 diff --git a/assets/voxygen/voxel/npc/crocodile/female/tail.vox b/assets/voxygen/voxel/npc/crocodile/female/tail_rear.vox similarity index 100% rename from assets/voxygen/voxel/npc/crocodile/female/tail.vox rename to assets/voxygen/voxel/npc/crocodile/female/tail_rear.vox diff --git a/assets/voxygen/voxel/npc/crocodile/male/chest.vox b/assets/voxygen/voxel/npc/crocodile/male/chest.vox new file mode 100644 index 0000000000..cc180afa3b --- /dev/null +++ b/assets/voxygen/voxel/npc/crocodile/male/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80ce2de577afd3046b2f40ab5ec859032bec5393480d8f3905f9dadf503d0783 +size 4168 diff --git a/assets/voxygen/voxel/npc/crocodile/male/chest_front.vox b/assets/voxygen/voxel/npc/crocodile/male/chest_front.vox deleted file mode 100644 index 3d4f73f7f4..0000000000 --- a/assets/voxygen/voxel/npc/crocodile/male/chest_front.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:706cbae9992d0101f36c1d20504df81cc6a67c0f2f94e5c144cee03dfb0eb544 -size 3704 diff --git a/assets/voxygen/voxel/npc/crocodile/male/chest_rear.vox b/assets/voxygen/voxel/npc/crocodile/male/chest_rear.vox deleted file mode 100644 index 0b2f0aae9f..0000000000 --- a/assets/voxygen/voxel/npc/crocodile/male/chest_rear.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:701c9fdd7c46132a1d4d26d74d2246fe4e234ff852e5d6620573937255003c25 -size 2092 diff --git a/assets/voxygen/voxel/npc/crocodile/male/tail_front.vox b/assets/voxygen/voxel/npc/crocodile/male/tail_front.vox new file mode 100644 index 0000000000..945d192050 --- /dev/null +++ b/assets/voxygen/voxel/npc/crocodile/male/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8174e9a8509985f2c3e033f8da55b0758274daffe6e4905582986a53005be110 +size 2096 diff --git a/assets/voxygen/voxel/npc/crocodile/male/tail.vox b/assets/voxygen/voxel/npc/crocodile/male/tail_rear.vox similarity index 100% rename from assets/voxygen/voxel/npc/crocodile/male/tail.vox rename to assets/voxygen/voxel/npc/crocodile/male/tail_rear.vox diff --git a/assets/voxygen/voxel/npc/monitor/female/chest.vox b/assets/voxygen/voxel/npc/monitor/female/chest.vox new file mode 100644 index 0000000000..8d018372d7 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/female/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1f35212645fddff778054e99dfabe2b5f5e21db7388c58aafb72df7eaf28171 +size 3144 diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_bl.vox b/assets/voxygen/voxel/npc/monitor/female/foot_bl.vox new file mode 100644 index 0000000000..f93aa116dc --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/female/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a97413b517c0c63072006ca80525ac5a3108b83afe9cf415f4eaa9c7c3705a6 +size 1260 diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_br.vox b/assets/voxygen/voxel/npc/monitor/female/foot_br.vox new file mode 100644 index 0000000000..4c232a08e7 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/female/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08aa48b32acf1a53df30bba3c91ae3e15b918f6e7819a4978c4dd89a4c56f2af +size 1260 diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_fl.vox b/assets/voxygen/voxel/npc/monitor/female/foot_fl.vox new file mode 100644 index 0000000000..63fd4936f5 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/female/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20eb9495a96fde3dffade4a43375ab42ac6fcfd107fb10b4173f07e4dc773d7b +size 1292 diff --git a/assets/voxygen/voxel/npc/monitor/female/foot_fr.vox b/assets/voxygen/voxel/npc/monitor/female/foot_fr.vox new file mode 100644 index 0000000000..444bc87dd5 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/female/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b24fe7ac351d6e6550f30f7e539f302d3192703bcbc1d40bd10d29842db520a +size 1292 diff --git a/assets/voxygen/voxel/npc/monitor/female/head_lower.vox b/assets/voxygen/voxel/npc/monitor/female/head_lower.vox new file mode 100644 index 0000000000..6d398c4f13 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/female/head_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26884c11dc7f13243a4f4d26f209f55f3640feec5bf1958c180c10f37f9c50f8 +size 1656 diff --git a/assets/voxygen/voxel/npc/monitor/female/head_upper.vox b/assets/voxygen/voxel/npc/monitor/female/head_upper.vox new file mode 100644 index 0000000000..2a8ff8ac54 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/female/head_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec15affe1d7fb1596b58cb6e1caf860d737cad175938261289d5cbf0c3db7309 +size 1896 diff --git a/assets/voxygen/voxel/npc/monitor/female/jaw.vox b/assets/voxygen/voxel/npc/monitor/female/jaw.vox new file mode 100644 index 0000000000..8e59c855e5 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/female/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:468d00d0c4c7e802ec9222bc448a10c7f8adced53266a0ed23e2f9d5da7428d5 +size 1280 diff --git a/assets/voxygen/voxel/npc/monitor/female/tail_front.vox b/assets/voxygen/voxel/npc/monitor/female/tail_front.vox new file mode 100644 index 0000000000..a6cd8b7c20 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/female/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18c076456b400511d05dcfed238427a9545e7c73f18df622d7fbdd33977e7cd2 +size 1592 diff --git a/assets/voxygen/voxel/npc/monitor/female/tail_rear.vox b/assets/voxygen/voxel/npc/monitor/female/tail_rear.vox new file mode 100644 index 0000000000..e3ed433d7a --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/female/tail_rear.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6410af6a1317fb052cd8dee620614e2cc8b7125c77db9f5d7c3ed50a024b8c4 +size 1224 diff --git a/assets/voxygen/voxel/npc/monitor/male/chest.vox b/assets/voxygen/voxel/npc/monitor/male/chest.vox new file mode 100644 index 0000000000..8d018372d7 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/male/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1f35212645fddff778054e99dfabe2b5f5e21db7388c58aafb72df7eaf28171 +size 3144 diff --git a/assets/voxygen/voxel/npc/monitor/male/foot_bl.vox b/assets/voxygen/voxel/npc/monitor/male/foot_bl.vox new file mode 100644 index 0000000000..f93aa116dc --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a97413b517c0c63072006ca80525ac5a3108b83afe9cf415f4eaa9c7c3705a6 +size 1260 diff --git a/assets/voxygen/voxel/npc/monitor/male/foot_br.vox b/assets/voxygen/voxel/npc/monitor/male/foot_br.vox new file mode 100644 index 0000000000..4c232a08e7 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08aa48b32acf1a53df30bba3c91ae3e15b918f6e7819a4978c4dd89a4c56f2af +size 1260 diff --git a/assets/voxygen/voxel/npc/monitor/male/foot_fl.vox b/assets/voxygen/voxel/npc/monitor/male/foot_fl.vox new file mode 100644 index 0000000000..63fd4936f5 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20eb9495a96fde3dffade4a43375ab42ac6fcfd107fb10b4173f07e4dc773d7b +size 1292 diff --git a/assets/voxygen/voxel/npc/monitor/male/foot_fr.vox b/assets/voxygen/voxel/npc/monitor/male/foot_fr.vox new file mode 100644 index 0000000000..444bc87dd5 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b24fe7ac351d6e6550f30f7e539f302d3192703bcbc1d40bd10d29842db520a +size 1292 diff --git a/assets/voxygen/voxel/npc/monitor/male/head_lower.vox b/assets/voxygen/voxel/npc/monitor/male/head_lower.vox new file mode 100644 index 0000000000..6d398c4f13 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/male/head_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26884c11dc7f13243a4f4d26f209f55f3640feec5bf1958c180c10f37f9c50f8 +size 1656 diff --git a/assets/voxygen/voxel/npc/monitor/male/head_upper.vox b/assets/voxygen/voxel/npc/monitor/male/head_upper.vox new file mode 100644 index 0000000000..2a8ff8ac54 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/male/head_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec15affe1d7fb1596b58cb6e1caf860d737cad175938261289d5cbf0c3db7309 +size 1896 diff --git a/assets/voxygen/voxel/npc/monitor/male/jaw.vox b/assets/voxygen/voxel/npc/monitor/male/jaw.vox new file mode 100644 index 0000000000..8e59c855e5 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:468d00d0c4c7e802ec9222bc448a10c7f8adced53266a0ed23e2f9d5da7428d5 +size 1280 diff --git a/assets/voxygen/voxel/npc/monitor/male/tail_front.vox b/assets/voxygen/voxel/npc/monitor/male/tail_front.vox new file mode 100644 index 0000000000..a6cd8b7c20 --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/male/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18c076456b400511d05dcfed238427a9545e7c73f18df622d7fbdd33977e7cd2 +size 1592 diff --git a/assets/voxygen/voxel/npc/monitor/male/tail_rear.vox b/assets/voxygen/voxel/npc/monitor/male/tail_rear.vox new file mode 100644 index 0000000000..e3ed433d7a --- /dev/null +++ b/assets/voxygen/voxel/npc/monitor/male/tail_rear.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6410af6a1317fb052cd8dee620614e2cc8b7125c77db9f5d7c3ed50a024b8c4 +size 1224 diff --git a/assets/voxygen/voxel/npc/salamander/female/chest.vox b/assets/voxygen/voxel/npc/salamander/female/chest.vox new file mode 100644 index 0000000000..96bb97d238 --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/female/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33254fbc2bcdc81d478f52f84d0fb66717797221535d6b77e6b93e2e54805a1d +size 4252 diff --git a/assets/voxygen/voxel/npc/salamander/female/foot_bl.vox b/assets/voxygen/voxel/npc/salamander/female/foot_bl.vox new file mode 100644 index 0000000000..5100dd6fd3 --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/female/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b18dea4f5f7c05b6d66b35e51d0fd1696e86b8d81ba800b82faa3531bbf1994d +size 1244 diff --git a/assets/voxygen/voxel/npc/salamander/female/foot_br.vox b/assets/voxygen/voxel/npc/salamander/female/foot_br.vox new file mode 100644 index 0000000000..c87f59f497 --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/female/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0aab9501144fad79f225a664be47ee17e11ce5c91b08e5fc9c7a3559462a281d +size 1244 diff --git a/assets/voxygen/voxel/npc/salamander/female/foot_fl.vox b/assets/voxygen/voxel/npc/salamander/female/foot_fl.vox new file mode 100644 index 0000000000..b747f98131 --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/female/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2108ecaae55bd50e08892ad54311d4931d660024f9492aa919af5e0419dd8d6 +size 1268 diff --git a/assets/voxygen/voxel/npc/salamander/female/foot_fr.vox b/assets/voxygen/voxel/npc/salamander/female/foot_fr.vox new file mode 100644 index 0000000000..5b3420a77e --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/female/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:527de48f9ef2aece82a06ed8c2c1c5c8367371794514275ed53ec73ec51a6c1a +size 1268 diff --git a/assets/voxygen/voxel/npc/salamander/female/head_lower.vox b/assets/voxygen/voxel/npc/salamander/female/head_lower.vox new file mode 100644 index 0000000000..5f00648283 --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/female/head_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b4329562520638b1e8c6d14829b97b81698ed04c0d02831d861530a61f89c55 +size 1700 diff --git a/assets/voxygen/voxel/npc/salamander/female/head_upper.vox b/assets/voxygen/voxel/npc/salamander/female/head_upper.vox new file mode 100644 index 0000000000..4bd35cb2ad --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/female/head_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9738b74c4e98117bf9271ab26fda0b9d6ffdb5aafd89ccfe853da6c581139ab1 +size 2588 diff --git a/assets/voxygen/voxel/npc/salamander/female/jaw.vox b/assets/voxygen/voxel/npc/salamander/female/jaw.vox new file mode 100644 index 0000000000..1ee152e421 --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/female/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:756171758d49a5463830fdb23a255534f546048295a4ca7dd08ee6b20a9aeb8e +size 1612 diff --git a/assets/voxygen/voxel/npc/salamander/female/tail_front.vox b/assets/voxygen/voxel/npc/salamander/female/tail_front.vox new file mode 100644 index 0000000000..8180f724fd --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/female/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82df11c21cd0b3b5d8ab625574420c0e4639e3dd743d887e6ad8ee4e80aaf330 +size 2244 diff --git a/assets/voxygen/voxel/npc/salamander/female/tail_rear.vox b/assets/voxygen/voxel/npc/salamander/female/tail_rear.vox new file mode 100644 index 0000000000..46b153167e --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/female/tail_rear.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8201aefb1fc1253583b19f4dc4a41be89b39b85ec8323fd0a8eba1e2bf83db90 +size 1872 diff --git a/assets/voxygen/voxel/npc/salamander/male/chest.vox b/assets/voxygen/voxel/npc/salamander/male/chest.vox new file mode 100644 index 0000000000..96bb97d238 --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/male/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33254fbc2bcdc81d478f52f84d0fb66717797221535d6b77e6b93e2e54805a1d +size 4252 diff --git a/assets/voxygen/voxel/npc/salamander/male/foot_bl.vox b/assets/voxygen/voxel/npc/salamander/male/foot_bl.vox new file mode 100644 index 0000000000..5100dd6fd3 --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b18dea4f5f7c05b6d66b35e51d0fd1696e86b8d81ba800b82faa3531bbf1994d +size 1244 diff --git a/assets/voxygen/voxel/npc/salamander/male/foot_br.vox b/assets/voxygen/voxel/npc/salamander/male/foot_br.vox new file mode 100644 index 0000000000..c87f59f497 --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0aab9501144fad79f225a664be47ee17e11ce5c91b08e5fc9c7a3559462a281d +size 1244 diff --git a/assets/voxygen/voxel/npc/salamander/male/foot_fl.vox b/assets/voxygen/voxel/npc/salamander/male/foot_fl.vox new file mode 100644 index 0000000000..b747f98131 --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2108ecaae55bd50e08892ad54311d4931d660024f9492aa919af5e0419dd8d6 +size 1268 diff --git a/assets/voxygen/voxel/npc/salamander/male/foot_fr.vox b/assets/voxygen/voxel/npc/salamander/male/foot_fr.vox new file mode 100644 index 0000000000..5b3420a77e --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:527de48f9ef2aece82a06ed8c2c1c5c8367371794514275ed53ec73ec51a6c1a +size 1268 diff --git a/assets/voxygen/voxel/npc/salamander/male/head_lower.vox b/assets/voxygen/voxel/npc/salamander/male/head_lower.vox new file mode 100644 index 0000000000..5f00648283 --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/male/head_lower.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b4329562520638b1e8c6d14829b97b81698ed04c0d02831d861530a61f89c55 +size 1700 diff --git a/assets/voxygen/voxel/npc/salamander/male/head_upper.vox b/assets/voxygen/voxel/npc/salamander/male/head_upper.vox new file mode 100644 index 0000000000..4bd35cb2ad --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/male/head_upper.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9738b74c4e98117bf9271ab26fda0b9d6ffdb5aafd89ccfe853da6c581139ab1 +size 2588 diff --git a/assets/voxygen/voxel/npc/salamander/male/jaw.vox b/assets/voxygen/voxel/npc/salamander/male/jaw.vox new file mode 100644 index 0000000000..1ee152e421 --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/male/jaw.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:756171758d49a5463830fdb23a255534f546048295a4ca7dd08ee6b20a9aeb8e +size 1612 diff --git a/assets/voxygen/voxel/npc/salamander/male/tail_front.vox b/assets/voxygen/voxel/npc/salamander/male/tail_front.vox new file mode 100644 index 0000000000..8180f724fd --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/male/tail_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82df11c21cd0b3b5d8ab625574420c0e4639e3dd743d887e6ad8ee4e80aaf330 +size 2244 diff --git a/assets/voxygen/voxel/npc/salamander/male/tail_rear.vox b/assets/voxygen/voxel/npc/salamander/male/tail_rear.vox new file mode 100644 index 0000000000..46b153167e --- /dev/null +++ b/assets/voxygen/voxel/npc/salamander/male/tail_rear.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8201aefb1fc1253583b19f4dc4a41be89b39b85ec8323fd0a8eba1e2bf83db90 +size 1872 diff --git a/assets/voxygen/voxel/quadruped_low_central_manifest.ron b/assets/voxygen/voxel/quadruped_low_central_manifest.ron index f883018fd8..8860a70dca 100644 --- a/assets/voxygen/voxel/quadruped_low_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_low_central_manifest.ron @@ -12,21 +12,17 @@ offset: (-3.0, -3.0, -2.5), central: ("npc.crocodile.male.jaw"), ), - chest_rear: ( + chest: ( offset: (-8.0, -5.5, -6.0), - central: ("npc.crocodile.male.chest_front"), - ), - chest_front: ( - offset: (-8.0, -5.5, -6.0), - central: ("npc.crocodile.male.chest_front"), + central: ("npc.crocodile.male.chest"), ), tail_rear: ( offset: (-2.0, -9.5, -5.0), - central: ("npc.crocodile.male.tail"), + central: ("npc.crocodile.male.tail_rear"), ), tail_front: ( offset: (-2.0, -9.5, -5.0), - central: ("npc.crocodile.male.tail"), + central: ("npc.crocodile.male.tail_front"), ), ), (Crocodile, Female): ( @@ -42,21 +38,173 @@ offset: (-3.0, -3.0, -2.5), central: ("npc.crocodile.female.jaw"), ), - chest_rear: ( + chest: ( offset: (-8.0, -5.5, -6.0), - central: ("npc.crocodile.female.chest_rear"), - ), - chest_front: ( - offset: (-8.0, -5.5, -6.0), - central: ("npc.crocodile.female.chest_front"), + central: ("npc.crocodile.female.chest"), ), tail_rear: ( offset: (-2.0, -9.5, -5.0), - central: ("npc.crocodile.female.tail"), + central: ("npc.crocodile.female.tail_rear"), ), tail_front: ( offset: (-2.0, -9.5, -5.0), - central: ("npc.crocodile.female.tail"), + central: ("npc.crocodile.female.tail_front"), + ), + ), + (Alligator, Male): ( + upper: ( + offset: (-7.0, -9.0, -5.5), + central: ("npc.alligator.male.head_upper"), + ), + lower: ( + offset: (-7.0, -4.5, -5.0), + central: ("npc.alligator.male.head_lower"), + ), + jaw: ( + offset: (-3.0, -3.0, -2.5), + central: ("npc.alligator.male.jaw"), + ), + chest: ( + offset: (-8.0, -5.5, -6.0), + central: ("npc.alligator.male.chest"), + ), + tail_rear: ( + offset: (-2.0, -9.5, -5.0), + central: ("npc.alligator.male.tail_rear"), + ), + tail_front: ( + offset: (-2.0, -9.5, -5.0), + central: ("npc.alligator.male.tail_front"), + ), + ), + (Alligator, Female): ( + upper: ( + offset: (-7.0, -9.0, -5.5), + central: ("npc.alligator.female.head_upper"), + ), + lower: ( + offset: (-7.0, -4.5, -5.0), + central: ("npc.alligator.female.head_lower"), + ), + jaw: ( + offset: (-3.0, -3.0, -2.5), + central: ("npc.alligator.female.jaw"), + ), + chest: ( + offset: (-8.0, -5.5, -6.0), + central: ("npc.alligator.female.chest"), + ), + tail_rear: ( + offset: (-2.0, -9.5, -5.0), + central: ("npc.alligator.female.tail_rear"), + ), + tail_front: ( + offset: (-2.0, -9.5, -5.0), + central: ("npc.alligator.female.tail_front"), + ), + ), + (Salamander, Male): ( + upper: ( + offset: (-7.0, -9.0, -5.5), + central: ("npc.salamander.male.head_upper"), + ), + lower: ( + offset: (-7.0, -4.5, -5.0), + central: ("npc.salamander.male.head_lower"), + ), + jaw: ( + offset: (-3.0, -3.0, -2.5), + central: ("npc.salamander.male.jaw"), + ), + chest: ( + offset: (-8.0, -5.5, -6.0), + central: ("npc.salamander.male.chest"), + ), + tail_rear: ( + offset: (-2.0, -9.5, -5.0), + central: ("npc.salamander.male.tail_rear"), + ), + tail_front: ( + offset: (-2.0, -9.5, -5.0), + central: ("npc.salamander.male.tail_front"), + ), + ), + (Salamander, Female): ( + upper: ( + offset: (-7.0, -9.0, -5.5), + central: ("npc.salamander.female.head_upper"), + ), + lower: ( + offset: (-7.0, -4.5, -5.0), + central: ("npc.salamander.female.head_lower"), + ), + jaw: ( + offset: (-3.0, -3.0, -2.5), + central: ("npc.salamander.female.jaw"), + ), + chest: ( + offset: (-8.0, -5.5, -6.0), + central: ("npc.salamander.female.chest"), + ), + tail_rear: ( + offset: (-2.0, -9.5, -5.0), + central: ("npc.salamander.female.tail_rear"), + ), + tail_front: ( + offset: (-2.0, -9.5, -5.0), + central: ("npc.salamander.female.tail_front"), + ), + ), + (Monitor, Male): ( + upper: ( + offset: (-7.0, -9.0, -5.5), + central: ("npc.monitor.male.head_upper"), + ), + lower: ( + offset: (-7.0, -4.5, -5.0), + central: ("npc.monitor.male.head_lower"), + ), + jaw: ( + offset: (-3.0, -3.0, -2.5), + central: ("npc.monitor.male.jaw"), + ), + chest: ( + offset: (-8.0, -5.5, -6.0), + central: ("npc.monitor.male.chest"), + ), + tail_rear: ( + offset: (-2.0, -9.5, -5.0), + central: ("npc.monitor.male.tail_rear"), + ), + tail_front: ( + offset: (-2.0, -9.5, -5.0), + central: ("npc.monitor.male.tail_front"), + ), + ), + (Monitor, Female): ( + upper: ( + offset: (-7.0, -9.0, -5.5), + central: ("npc.monitor.female.head_upper"), + ), + lower: ( + offset: (-7.0, -4.5, -5.0), + central: ("npc.monitor.female.head_lower"), + ), + jaw: ( + offset: (-3.0, -3.0, -2.5), + central: ("npc.monitor.female.jaw"), + ), + chest: ( + offset: (-8.0, -5.5, -6.0), + central: ("npc.monitor.female.chest"), + ), + tail_rear: ( + offset: (-2.0, -9.5, -5.0), + central: ("npc.monitor.female.tail_rear"), + ), + tail_front: ( + offset: (-2.0, -9.5, -5.0), + central: ("npc.monitor.female.tail_front"), ), ), }) diff --git a/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron index 99a67b071a..6cc5a0cb0f 100644 --- a/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron @@ -35,4 +35,112 @@ lateral: ("npc.crocodile.female.foot_br"), ), ), + (Alligator, Male): ( + front_left: ( + offset: (-2.5, -4.0, -1.5), + lateral: ("npc.alligator.male.foot_fl"), + ), + front_right: ( + offset: (-2.5, -4.0, -1.5), + lateral: ("npc.alligator.male.foot_fr"), + ), + back_left: ( + offset: (-2.5, -4.0, -3.0), + lateral: ("npc.alligator.male.foot_bl"), + ), + back_right: ( + offset: (-2.5, -4.0, -3.0), + lateral: ("npc.alligator.male.foot_br"), + ), + ), + (Alligator, Female): ( + front_left: ( + offset: (-2.5, -4.0, -1.5), + lateral: ("npc.alligator.female.foot_fl"), + ), + front_right: ( + offset: (-2.5, -4.0, -1.5), + lateral: ("npc.alligator.female.foot_fr"), + ), + back_left: ( + offset: (-2.5, -4.0, -3.0), + lateral: ("npc.alligator.female.foot_bl"), + ), + back_right: ( + offset: (-2.5, -4.0, -3.0), + lateral: ("npc.alligator.female.foot_br"), + ), + ), + (Salamander, Male): ( + front_left: ( + offset: (-2.5, -4.0, -1.5), + lateral: ("npc.salamander.male.foot_fl"), + ), + front_right: ( + offset: (-2.5, -4.0, -1.5), + lateral: ("npc.salamander.male.foot_fr"), + ), + back_left: ( + offset: (-2.5, -4.0, -3.0), + lateral: ("npc.salamander.male.foot_bl"), + ), + back_right: ( + offset: (-2.5, -4.0, -3.0), + lateral: ("npc.salamander.male.foot_br"), + ), + ), + (Salamander, Female): ( + front_left: ( + offset: (-2.5, -4.0, -1.5), + lateral: ("npc.salamander.female.foot_fl"), + ), + front_right: ( + offset: (-2.5, -4.0, -1.5), + lateral: ("npc.salamander.female.foot_fr"), + ), + back_left: ( + offset: (-2.5, -4.0, -3.0), + lateral: ("npc.salamander.female.foot_bl"), + ), + back_right: ( + offset: (-2.5, -4.0, -3.0), + lateral: ("npc.salamander.female.foot_br"), + ), + ), + (Monitor, Male): ( + front_left: ( + offset: (-2.5, -4.0, -1.5), + lateral: ("npc.monitor.male.foot_fl"), + ), + front_right: ( + offset: (-2.5, -4.0, -1.5), + lateral: ("npc.monitor.male.foot_fr"), + ), + back_left: ( + offset: (-2.5, -4.0, -3.0), + lateral: ("npc.monitor.male.foot_bl"), + ), + back_right: ( + offset: (-2.5, -4.0, -3.0), + lateral: ("npc.monitor.male.foot_br"), + ), + ), + (Monitor, Female): ( + front_left: ( + offset: (-2.5, -4.0, -1.5), + lateral: ("npc.monitor.female.foot_fl"), + ), + front_right: ( + offset: (-2.5, -4.0, -1.5), + lateral: ("npc.monitor.female.foot_fr"), + ), + back_left: ( + offset: (-2.5, -4.0, -3.0), + lateral: ("npc.monitor.female.foot_bl"), + ), + back_right: ( + offset: (-2.5, -4.0, -3.0), + lateral: ("npc.monitor.female.foot_br"), + ), + ), }) diff --git a/common/src/comp/body/quadruped_low.rs b/common/src/comp/body/quadruped_low.rs index 7296016344..0f25697dcd 100644 --- a/common/src/comp/body/quadruped_low.rs +++ b/common/src/comp/body/quadruped_low.rs @@ -28,6 +28,9 @@ impl From for super::Body { #[repr(u32)] pub enum Species { Crocodile = 0, + Alligator = 1, + Salamander = 2, + Monitor = 3, } /// Data representing per-species generic data. @@ -36,6 +39,9 @@ pub enum Species { #[derive(Clone, Debug, Deserialize)] pub struct AllSpecies { pub crocodile: SpeciesMeta, + pub alligator: SpeciesMeta, + pub salamander: SpeciesMeta, + pub monitor: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -45,12 +51,18 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies fn index(&self, &index: &'a Species) -> &Self::Output { match index { Species::Crocodile => &self.crocodile, + Species::Alligator => &self.alligator, + Species::Salamander => &self.salamander, + Species::Monitor => &self.monitor, } } } -pub const ALL_SPECIES: [Species; 1] = [ +pub const ALL_SPECIES: [Species; 4] = [ Species::Crocodile, + Species::Alligator, + Species::Salamander, + Species::Monitor, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/voxygen/src/anim/quadruped_low/idle.rs b/voxygen/src/anim/quadruped_low/idle.rs index 1c84216cda..380eb268b1 100644 --- a/voxygen/src/anim/quadruped_low/idle.rs +++ b/voxygen/src/anim/quadruped_low/idle.rs @@ -56,18 +56,13 @@ impl Animation for IdleAnimation { next.jaw.ori = Quaternion::rotation_x(slow * 0.04); next.jaw.scale = Vec3::one() * 1.05; - next.chest_front.offset = Vec3::new( + next.chest.offset = Vec3::new( 0.0, - skeleton_attr.chest_front.0, - skeleton_attr.chest_front.1, + skeleton_attr.chest.0, + skeleton_attr.chest.1, ); - next.chest_front.ori = Quaternion::rotation_y(slow * 0.01); - next.chest_front.scale = Vec3::one() * 1.05; - - next.chest_rear.offset = - Vec3::new(0.0, skeleton_attr.chest_rear.0, skeleton_attr.chest_rear.1); - next.chest_rear.ori = Quaternion::rotation_y(slow * 0.01); - next.chest_rear.scale = Vec3::one() * 1.05; + next.chest.ori = Quaternion::rotation_y(slow * 0.01); + next.chest.scale = Vec3::one() * 1.05; next.tail_front.offset = Vec3::new(0.0, skeleton_attr.tail_front.0, skeleton_attr.tail_front.1); diff --git a/voxygen/src/anim/quadruped_low/jump.rs b/voxygen/src/anim/quadruped_low/jump.rs index b311951396..c02adef7f6 100644 --- a/voxygen/src/anim/quadruped_low/jump.rs +++ b/voxygen/src/anim/quadruped_low/jump.rs @@ -71,18 +71,13 @@ impl Animation for JumpAnimation { next.tail_rear.ori = Quaternion::rotation_x(center * 0.03); next.tail_rear.scale = Vec3::one() * 0.98; - next.chest_front.offset = Vec3::new( + next.chest.offset = Vec3::new( 0.0, - skeleton_attr.chest_front.0, - skeleton_attr.chest_front.1, + skeleton_attr.chest.0, + skeleton_attr.chest.1, ); - next.chest_front.ori = Quaternion::rotation_y(center * 0.05); - next.chest_front.scale = Vec3::one(); - - next.chest_rear.offset = - Vec3::new(0.0, skeleton_attr.chest_rear.0, skeleton_attr.chest_rear.1); - next.chest_rear.ori = Quaternion::rotation_y(center * 0.05); - next.chest_rear.scale = Vec3::one(); + next.chest.ori = Quaternion::rotation_y(center * 0.05); + next.chest.scale = Vec3::one(); next.foot_fl.offset = Vec3::new( -skeleton_attr.feet_f.0, diff --git a/voxygen/src/anim/quadruped_low/mod.rs b/voxygen/src/anim/quadruped_low/mod.rs index 20adaf21bf..30305eb20e 100644 --- a/voxygen/src/anim/quadruped_low/mod.rs +++ b/voxygen/src/anim/quadruped_low/mod.rs @@ -17,8 +17,7 @@ pub struct QuadrupedLowSkeleton { jaw: Bone, tail_front: Bone, tail_rear: Bone, - chest_front: Bone, - chest_rear: Bone, + chest: Bone, foot_fl: Bone, foot_fr: Bone, foot_bl: Bone, @@ -32,29 +31,28 @@ impl QuadrupedLowSkeleton { impl Skeleton for QuadrupedLowSkeleton { type Attr = SkeletonAttr; - fn bone_count(&self) -> usize { 11 } + fn bone_count(&self) -> usize { 10 } fn compute_matrices(&self) -> ([FigureBoneData; 16], Vec3) { let head_upper_mat = self.head_upper.compute_base_matrix(); let head_lower_mat = self.head_lower.compute_base_matrix(); - let chest_front_mat = self.chest_front.compute_base_matrix(); - let chest_rear_mat = self.chest_rear.compute_base_matrix(); + let chest_mat = self.chest.compute_base_matrix(); + let chest_mat = self.chest.compute_base_matrix(); ( [ - FigureBoneData::new(chest_front_mat * head_lower_mat * head_upper_mat), - FigureBoneData::new(chest_front_mat * head_lower_mat), + FigureBoneData::new(chest_mat * head_lower_mat * head_upper_mat), + FigureBoneData::new(chest_mat * head_lower_mat), FigureBoneData::new( - chest_front_mat + chest_mat * head_lower_mat * head_upper_mat * self.jaw.compute_base_matrix(), ), - FigureBoneData::new(chest_front_mat), - FigureBoneData::new(chest_front_mat * self.chest_rear.compute_base_matrix()), - FigureBoneData::new(chest_front_mat * chest_rear_mat * self.tail_front.compute_base_matrix()), + FigureBoneData::new(chest_mat), + FigureBoneData::new(chest_mat * self.tail_front.compute_base_matrix()), FigureBoneData::new( - chest_front_mat - * chest_rear_mat + chest_mat + * chest_mat * self.tail_front.compute_base_matrix() * self.tail_rear.compute_base_matrix(), ), @@ -67,6 +65,7 @@ impl Skeleton for QuadrupedLowSkeleton { FigureBoneData::default(), FigureBoneData::default(), FigureBoneData::default(), + FigureBoneData::default(), ], Vec3::default(), ) @@ -78,8 +77,7 @@ impl Skeleton for QuadrupedLowSkeleton { self.jaw.interpolate(&target.jaw, dt); self.tail_front.interpolate(&target.tail_front, dt); self.tail_rear.interpolate(&target.tail_rear, dt); - self.chest_front.interpolate(&target.chest_front, dt); - self.chest_rear.interpolate(&target.chest_rear, dt); + self.chest.interpolate(&target.chest, dt); self.foot_fl.interpolate(&target.foot_fl, dt); self.foot_fr.interpolate(&target.foot_fr, dt); self.foot_bl.interpolate(&target.foot_bl, dt); @@ -93,8 +91,7 @@ pub struct SkeletonAttr { jaw: (f32, f32), tail_front: (f32, f32), tail_rear: (f32, f32), - chest_front: (f32, f32), - chest_rear: (f32, f32), + chest: (f32, f32), feet_f: (f32, f32, f32), feet_b: (f32, f32, f32), height: f32, @@ -119,8 +116,7 @@ impl Default for SkeletonAttr { jaw: (0.0, 0.0), tail_front: (0.0, 0.0), tail_rear: (0.0, 0.0), - chest_front: (0.0, 0.0), - chest_rear: (0.0, 0.0), + chest: (0.0, 0.0), feet_f: (0.0, 0.0, 0.0), feet_b: (0.0, 0.0, 0.0), height: (0.0), @@ -134,33 +130,57 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { Self { head_upper: match (body.species, body.body_type) { (Crocodile, _) => (12.0, 16.0), + (Alligator, _) => (12.0, 16.0), + (Salamander, _) => (12.0, 16.0), + (Monitor, _) => (12.0, 16.0), }, head_lower: match (body.species, body.body_type) { (Crocodile, _) => (-4.0, -7.0), + (Alligator, _) => (-4.0, -7.0), + (Salamander, _) => (-4.0, -7.0), + (Monitor, _) => (-4.0, -7.0), }, jaw: match (body.species, body.body_type) { (Crocodile, _) => (3.0, -5.0), + (Alligator, _) => (3.0, -5.0), + (Salamander, _) => (3.0, -5.0), + (Monitor, _) => (3.0, -5.0), }, tail_rear: match (body.species, body.body_type) { (Crocodile, _) => (-6.0, -2.0), + (Alligator, _) => (-6.0, -2.0), + (Salamander, _) => (-6.0, -2.0), + (Monitor, _) => (-6.0, -2.0), }, tail_front: match (body.species, body.body_type) { (Crocodile, _) => (-6.0, -2.0), + (Alligator, _) => (-6.0, -2.0), + (Salamander, _) => (-6.0, -2.0), + (Monitor, _) => (-6.0, -2.0), }, - chest_front: match (body.species, body.body_type) { - (Crocodile, _) => (4.0, 11.0), - }, - chest_rear: match (body.species, body.body_type) { + chest: match (body.species, body.body_type) { (Crocodile, _) => (4.0, 11.0), + (Alligator, _) => (4.0, 11.0), + (Salamander, _) => (4.0, 11.0), + (Monitor, _) => (4.0, 11.0), }, feet_f: match (body.species, body.body_type) { (Crocodile, _) => (5.0, 6.0, 2.0), + (Alligator, _) => (5.0, 6.0, 2.0), + (Salamander, _) => (5.0, 6.0, 2.0), + (Monitor, _) => (5.0, 6.0, 2.0), }, feet_b: match (body.species, body.body_type) { (Crocodile, _) => (5.0, -4.0, 3.0), + (Alligator, _) => (5.0, -4.0, 3.0), + (Salamander, _) => (5.0, -4.0, 3.0), + (Monitor, _) => (5.0, -4.0, 3.0), }, height: match (body.species, body.body_type) { (Crocodile, _) => (1.2), + (Alligator, _) => (1.2), + (Salamander, _) => (1.2), + (Monitor, _) => (1.2), }, } } diff --git a/voxygen/src/anim/quadruped_low/run.rs b/voxygen/src/anim/quadruped_low/run.rs index 2e08762f32..bc842b3edf 100644 --- a/voxygen/src/anim/quadruped_low/run.rs +++ b/voxygen/src/anim/quadruped_low/run.rs @@ -86,18 +86,10 @@ impl Animation for RunAnimation { next.tail_rear.ori = Quaternion::rotation_x(center * 0.03); next.tail_rear.scale = Vec3::one() * 0.98; - next.chest_front.offset = Vec3::new( - 0.0, - skeleton_attr.chest_front.0 + horichest * 1.25, - skeleton_attr.chest_front.1 + vertchest * -1.6 + 1.0, - ); - next.chest_front.ori = Quaternion::rotation_y(horichest * -0.09); - next.chest_front.scale = Vec3::one(); - - next.chest_rear.offset = - Vec3::new(0.0, skeleton_attr.chest_rear.0, skeleton_attr.chest_rear.1); - next.chest_rear.ori = Quaternion::rotation_y(horichest * -0.09); - next.chest_rear.scale = Vec3::one(); + next.chest.offset = + Vec3::new(0.0, skeleton_attr.chest.0, skeleton_attr.chest.1); + next.chest.ori = Quaternion::rotation_y(horichest * -0.09); + next.chest.scale = Vec3::one(); next.foot_fl.offset = Vec3::new( -skeleton_attr.feet_f.0, diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs index 7a1193a1c1..9288b80625 100644 --- a/voxygen/src/anim/src/quadruped_medium/mod.rs +++ b/voxygen/src/anim/src/quadruped_medium/mod.rs @@ -56,10 +56,10 @@ impl Skeleton for QuadrupedMediumSkeleton { FigureBoneData::new(self.leg_rf.compute_base_matrix()), FigureBoneData::new(self.leg_lb.compute_base_matrix()), FigureBoneData::new(self.leg_rb.compute_base_matrix()), - FigureBoneData::new(self.foot_lf.compute_base_matrix()), - FigureBoneData::new(self.foot_rf.compute_base_matrix()), - FigureBoneData::new(self.foot_lb.compute_base_matrix()), - FigureBoneData::new(self.foot_rb.compute_base_matrix()), + FigureBoneData::new(self.leg_lf.compute_base_matrix() * self.foot_lf.compute_base_matrix()), + FigureBoneData::new(self.leg_rf.compute_base_matrix() * self.foot_rf.compute_base_matrix()), + FigureBoneData::new(self.leg_lb.compute_base_matrix() * self.foot_lb.compute_base_matrix()), + FigureBoneData::new(self.leg_rb.compute_base_matrix() * self.foot_rb.compute_base_matrix()), FigureBoneData::default(), ], Vec3::default(), diff --git a/voxygen/src/scene/figure/cache.rs b/voxygen/src/scene/figure/cache.rs index 9bab8b701a..cf5c55278c 100644 --- a/voxygen/src/scene/figure/cache.rs +++ b/voxygen/src/scene/figure/cache.rs @@ -726,12 +726,7 @@ impl FigureModelCache { body.body_type, generate_mesh, )), - Some(quadruped_low_central_spec.mesh_chest_front( - body.species, - body.body_type, - generate_mesh, - )), - Some(quadruped_low_central_spec.mesh_chest_rear( + Some(quadruped_low_central_spec.mesh_chest( body.species, body.body_type, generate_mesh, @@ -761,6 +756,7 @@ impl FigureModelCache { None, None, None, + None, ] }, Body::Object(object) => [ diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs index 5913b31cd0..d0f38faeb9 100644 --- a/voxygen/src/scene/figure/load.rs +++ b/voxygen/src/scene/figure/load.rs @@ -1579,7 +1579,7 @@ impl QuadrupedMediumLateralSpec { Some(spec) => spec, None => { error!( - "No foot specification exists for the combination of {:?} and {:?}", + "No leg specification exists for the combination of {:?} and {:?}", species, body_type ); return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5), generate_mesh); @@ -3051,8 +3051,7 @@ struct SidedQLCentralVoxSpec { upper: QuadrupedLowCentralSubSpec, lower: QuadrupedLowCentralSubSpec, jaw: QuadrupedLowCentralSubSpec, - chest_front: QuadrupedLowCentralSubSpec, - chest_rear: QuadrupedLowCentralSubSpec, + chest: QuadrupedLowCentralSubSpec, tail_front: QuadrupedLowCentralSubSpec, tail_rear: QuadrupedLowCentralSubSpec, } @@ -3162,7 +3161,7 @@ impl QuadrupedLowCentralSpec { generate_mesh(¢ral, Vec3::from(spec.jaw.offset)) } - pub fn mesh_chest_front( + pub fn mesh_chest( &self, species: QLSpecies, body_type: QLBodyType, @@ -3172,36 +3171,15 @@ impl QuadrupedLowCentralSpec { Some(spec) => spec, None => { error!( - "No chest_front specification exists for the combination of {:?} and {:?}", + "No chest specification exists for the combination of {:?} and {:?}", species, body_type ); return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5), generate_mesh); }, }; - let central = graceful_load_segment(&spec.chest_front.central.0); + let central = graceful_load_segment(&spec.chest.central.0); - generate_mesh(¢ral, Vec3::from(spec.chest_front.offset)) - } - - pub fn mesh_chest_rear( - &self, - species: QLSpecies, - body_type: QLBodyType, - generate_mesh: impl FnOnce(&Segment, Vec3) -> Mesh, - ) -> Mesh { - let spec = match self.0.get(&(species, body_type)) { - Some(spec) => spec, - None => { - error!( - "No chest_rear specification exists for the combination of {:?} and {:?}", - species, body_type - ); - return load_mesh("not_found", Vec3::new(-5.0, -5.0, -2.5), generate_mesh); - }, - }; - let central = graceful_load_segment(&spec.chest_rear.central.0); - - generate_mesh(¢ral, Vec3::from(spec.chest_rear.offset)) + generate_mesh(¢ral, Vec3::from(spec.chest.offset)) } pub fn mesh_tail_rear(