From b1f4e4b9c1eacfc39acfa0c77e0d60559675869a Mon Sep 17 00:00:00 2001 From: Snowram Date: Fri, 19 Jun 2020 00:51:40 +0200 Subject: [PATCH] Add new tusk ram model --- .../voxel/npc/tortoise/male/tail_rear.vox | 3 -- .../npc/tortoise/{female => }/tail_rear.vox | 0 .../voxel/npc/tuskram/female/foot_bl.vox | 4 +- .../voxel/npc/tuskram/female/foot_br.vox | 4 +- .../voxel/npc/tuskram/female/foot_fl.vox | 4 +- .../voxel/npc/tuskram/female/foot_fr.vox | 4 +- .../voxel/npc/tuskram/female/head_lower.vox | 4 +- .../voxel/npc/tuskram/female/head_upper.vox | 4 +- .../voxygen/voxel/npc/tuskram/female/jaw.vox | 4 +- .../voxel/npc/tuskram/female/leg_bl.vox | 3 ++ .../voxel/npc/tuskram/female/leg_br.vox | 3 ++ .../voxel/npc/tuskram/female/leg_fl.vox | 3 ++ .../voxel/npc/tuskram/female/leg_fr.vox | 3 ++ .../voxygen/voxel/npc/tuskram/female/tail.vox | 4 +- .../voxel/npc/tuskram/female/torso_back.vox | 4 +- .../voxel/npc/tuskram/female/torso_front.vox | 4 +- .../voxel/npc/tuskram/male/foot_bl.vox | 4 +- .../voxel/npc/tuskram/male/foot_br.vox | 4 +- .../voxel/npc/tuskram/male/foot_fl.vox | 4 +- .../voxel/npc/tuskram/male/foot_fr.vox | 4 +- .../voxel/npc/tuskram/male/head_lower.vox | 4 +- .../voxel/npc/tuskram/male/head_upper.vox | 4 +- assets/voxygen/voxel/npc/tuskram/male/jaw.vox | 4 +- .../voxygen/voxel/npc/tuskram/male/leg_bl.vox | 3 ++ .../voxygen/voxel/npc/tuskram/male/leg_br.vox | 3 ++ .../voxygen/voxel/npc/tuskram/male/leg_fl.vox | 3 ++ .../voxygen/voxel/npc/tuskram/male/leg_fr.vox | 3 ++ .../voxygen/voxel/npc/tuskram/male/tail.vox | 4 +- .../voxel/npc/tuskram/male/torso_back.vox | 4 +- .../voxel/npc/tuskram/male/torso_front.vox | 4 +- .../voxel/quadruped_low_central_manifest.ron | 8 +-- .../quadruped_medium_central_manifest.ron | 36 ++++++------- .../quadruped_medium_lateral_manifest.ron | 32 ++++++------ voxygen/src/anim/quadruped_low/mod.rs | 2 +- voxygen/src/anim/src/quadruped_medium/mod.rs | 52 +++++++++---------- 35 files changed, 129 insertions(+), 108 deletions(-) delete mode 100644 assets/voxygen/voxel/npc/tortoise/male/tail_rear.vox rename assets/voxygen/voxel/npc/tortoise/{female => }/tail_rear.vox (100%) create mode 100644 assets/voxygen/voxel/npc/tuskram/female/leg_bl.vox create mode 100644 assets/voxygen/voxel/npc/tuskram/female/leg_br.vox create mode 100644 assets/voxygen/voxel/npc/tuskram/female/leg_fl.vox create mode 100644 assets/voxygen/voxel/npc/tuskram/female/leg_fr.vox create mode 100644 assets/voxygen/voxel/npc/tuskram/male/leg_bl.vox create mode 100644 assets/voxygen/voxel/npc/tuskram/male/leg_br.vox create mode 100644 assets/voxygen/voxel/npc/tuskram/male/leg_fl.vox create mode 100644 assets/voxygen/voxel/npc/tuskram/male/leg_fr.vox diff --git a/assets/voxygen/voxel/npc/tortoise/male/tail_rear.vox b/assets/voxygen/voxel/npc/tortoise/male/tail_rear.vox deleted file mode 100644 index 79ad6f7e89..0000000000 --- a/assets/voxygen/voxel/npc/tortoise/male/tail_rear.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5482626dd095456f9718eeec71e6a5e724115a0bb05e8bf68c56f890ae043608 -size 1096 diff --git a/assets/voxygen/voxel/npc/tortoise/female/tail_rear.vox b/assets/voxygen/voxel/npc/tortoise/tail_rear.vox similarity index 100% rename from assets/voxygen/voxel/npc/tortoise/female/tail_rear.vox rename to assets/voxygen/voxel/npc/tortoise/tail_rear.vox diff --git a/assets/voxygen/voxel/npc/tuskram/female/foot_bl.vox b/assets/voxygen/voxel/npc/tuskram/female/foot_bl.vox index 5c2c0051e8..2dee7b8a8c 100644 --- a/assets/voxygen/voxel/npc/tuskram/female/foot_bl.vox +++ b/assets/voxygen/voxel/npc/tuskram/female/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1439e4406921cacdc68ba1d073674ab74cfe6a102b15f37398a2f93b4f41f64 -size 1344 +oid sha256:bacb74898e1424f8da52e2ed13e1b0851ef59cf7b41a300ba541538f51009136 +size 1288 diff --git a/assets/voxygen/voxel/npc/tuskram/female/foot_br.vox b/assets/voxygen/voxel/npc/tuskram/female/foot_br.vox index 2cf4dc24cd..deec278db7 100644 --- a/assets/voxygen/voxel/npc/tuskram/female/foot_br.vox +++ b/assets/voxygen/voxel/npc/tuskram/female/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9471b4710e331ed1b45cd1792b22c04797a737454f33b0225d4a4cb86ee5703 -size 1344 +oid sha256:a04ae98a07ab025c19b26a0e26096593e88dabcda9ba71728ba1bc76eb90e2c5 +size 1288 diff --git a/assets/voxygen/voxel/npc/tuskram/female/foot_fl.vox b/assets/voxygen/voxel/npc/tuskram/female/foot_fl.vox index 4d0938032e..33575ac5c7 100644 --- a/assets/voxygen/voxel/npc/tuskram/female/foot_fl.vox +++ b/assets/voxygen/voxel/npc/tuskram/female/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:468e16decc1c5bfa8e2104834dca0b8dc4e365c36105d2d3a8586b7ec2a6a4ee -size 1196 +oid sha256:60f41f842b6d5a340b586fac511e3ddc441a48aca50a7b147ea9a986bfd6845b +size 1348 diff --git a/assets/voxygen/voxel/npc/tuskram/female/foot_fr.vox b/assets/voxygen/voxel/npc/tuskram/female/foot_fr.vox index 8bc1adc785..78c08d2584 100644 --- a/assets/voxygen/voxel/npc/tuskram/female/foot_fr.vox +++ b/assets/voxygen/voxel/npc/tuskram/female/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5440f4007e17ff3d9b529f24b7a8dce329937a67833b66d207647f9532806159 -size 1196 +oid sha256:6b06f357f56c9e0567ed7474e4ddb4f8adfbc1bcd3d6968ae3cbd09eb3c83536 +size 1348 diff --git a/assets/voxygen/voxel/npc/tuskram/female/head_lower.vox b/assets/voxygen/voxel/npc/tuskram/female/head_lower.vox index 0f80d31ea8..a1efbe5bd4 100644 --- a/assets/voxygen/voxel/npc/tuskram/female/head_lower.vox +++ b/assets/voxygen/voxel/npc/tuskram/female/head_lower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d614bcd235285c3b537f40c9028455d29b6b61b7bd8a5db956fd9a7c168fadca -size 1600 +oid sha256:232081227b38b2b480e6433a587dd75952ac043b901536b7d4fa502f22f6c05c +size 1904 diff --git a/assets/voxygen/voxel/npc/tuskram/female/head_upper.vox b/assets/voxygen/voxel/npc/tuskram/female/head_upper.vox index 575c2c9955..abb51582e5 100644 --- a/assets/voxygen/voxel/npc/tuskram/female/head_upper.vox +++ b/assets/voxygen/voxel/npc/tuskram/female/head_upper.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c501cc831e4ddf54be7cd0a31c0dbb350c6799d7ae6f7d8010111a1460973d7e -size 2808 +oid sha256:698bfe87d0c9f6c07a486e0b6b5496f75b748cbd7e0c6f0039b6adb785b6f48c +size 4360 diff --git a/assets/voxygen/voxel/npc/tuskram/female/jaw.vox b/assets/voxygen/voxel/npc/tuskram/female/jaw.vox index d9dd2ad2b5..f2d35078a7 100644 --- a/assets/voxygen/voxel/npc/tuskram/female/jaw.vox +++ b/assets/voxygen/voxel/npc/tuskram/female/jaw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fa3163f3a5f70ba05eac3622a666a4ff2cdd690b3c17c25799687f72d1e09ce -size 1208 +oid sha256:647ef383113a4dc8aa0fddd99ddd0f9881068ac8e2701eb9cc1d190af07ca861 +size 1248 diff --git a/assets/voxygen/voxel/npc/tuskram/female/leg_bl.vox b/assets/voxygen/voxel/npc/tuskram/female/leg_bl.vox new file mode 100644 index 0000000000..5887cef4c9 --- /dev/null +++ b/assets/voxygen/voxel/npc/tuskram/female/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82bacb5173c205bdefacc3125b1626cbb91dbd205901511c4e085096a63f88f6 +size 1512 diff --git a/assets/voxygen/voxel/npc/tuskram/female/leg_br.vox b/assets/voxygen/voxel/npc/tuskram/female/leg_br.vox new file mode 100644 index 0000000000..59a3a974b3 --- /dev/null +++ b/assets/voxygen/voxel/npc/tuskram/female/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e86ebe755bd518b20900d09ebd8385b0b70cbce604a9c4cbf58385ebd03a655 +size 1512 diff --git a/assets/voxygen/voxel/npc/tuskram/female/leg_fl.vox b/assets/voxygen/voxel/npc/tuskram/female/leg_fl.vox new file mode 100644 index 0000000000..aa39e44650 --- /dev/null +++ b/assets/voxygen/voxel/npc/tuskram/female/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f15a0b8d971d88ca2f718f01148c79a93765a2a3a3c77993fe22858786fc2c8c +size 1528 diff --git a/assets/voxygen/voxel/npc/tuskram/female/leg_fr.vox b/assets/voxygen/voxel/npc/tuskram/female/leg_fr.vox new file mode 100644 index 0000000000..f213db33e3 --- /dev/null +++ b/assets/voxygen/voxel/npc/tuskram/female/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45dc4382a63c33326f45b68895de3a5f8275413bf3105f5b961e538e9cae9f7e +size 1528 diff --git a/assets/voxygen/voxel/npc/tuskram/female/tail.vox b/assets/voxygen/voxel/npc/tuskram/female/tail.vox index ed8b56a34a..bfa7174326 100644 --- a/assets/voxygen/voxel/npc/tuskram/female/tail.vox +++ b/assets/voxygen/voxel/npc/tuskram/female/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04e39292688961ef8ab75f1552f6153f4c6445341b43b5dd1ae4f5982885b444 -size 1208 +oid sha256:d592fa6c1a379566811b417cb6962d5cca18367fb9e52d0ae93408c58cd56e52 +size 1904 diff --git a/assets/voxygen/voxel/npc/tuskram/female/torso_back.vox b/assets/voxygen/voxel/npc/tuskram/female/torso_back.vox index 0afcb16150..9e70367339 100644 --- a/assets/voxygen/voxel/npc/tuskram/female/torso_back.vox +++ b/assets/voxygen/voxel/npc/tuskram/female/torso_back.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8f04f847b5727edf1ed7da6d431c7d3a2936b40a3b33748331b108367ec2f77 -size 3392 +oid sha256:c0bce2157ba7b3792b80777dbd36a1b207d062153f79518a62865a138736a3ce +size 2956 diff --git a/assets/voxygen/voxel/npc/tuskram/female/torso_front.vox b/assets/voxygen/voxel/npc/tuskram/female/torso_front.vox index ce3ef5497b..7688bab3d2 100644 --- a/assets/voxygen/voxel/npc/tuskram/female/torso_front.vox +++ b/assets/voxygen/voxel/npc/tuskram/female/torso_front.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:866c9e2b40c7674c07324740c2f04b686d681a02b1de7a100cd4aa495fb411b5 -size 3272 +oid sha256:b04dd83d748675fbaee2afdca25c872c4df0b9c915b3aa7350b92d702dc44f48 +size 5452 diff --git a/assets/voxygen/voxel/npc/tuskram/male/foot_bl.vox b/assets/voxygen/voxel/npc/tuskram/male/foot_bl.vox index 5c2c0051e8..2dee7b8a8c 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1439e4406921cacdc68ba1d073674ab74cfe6a102b15f37398a2f93b4f41f64 -size 1344 +oid sha256:bacb74898e1424f8da52e2ed13e1b0851ef59cf7b41a300ba541538f51009136 +size 1288 diff --git a/assets/voxygen/voxel/npc/tuskram/male/foot_br.vox b/assets/voxygen/voxel/npc/tuskram/male/foot_br.vox index 2cf4dc24cd..deec278db7 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9471b4710e331ed1b45cd1792b22c04797a737454f33b0225d4a4cb86ee5703 -size 1344 +oid sha256:a04ae98a07ab025c19b26a0e26096593e88dabcda9ba71728ba1bc76eb90e2c5 +size 1288 diff --git a/assets/voxygen/voxel/npc/tuskram/male/foot_fl.vox b/assets/voxygen/voxel/npc/tuskram/male/foot_fl.vox index 4d0938032e..33575ac5c7 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:468e16decc1c5bfa8e2104834dca0b8dc4e365c36105d2d3a8586b7ec2a6a4ee -size 1196 +oid sha256:60f41f842b6d5a340b586fac511e3ddc441a48aca50a7b147ea9a986bfd6845b +size 1348 diff --git a/assets/voxygen/voxel/npc/tuskram/male/foot_fr.vox b/assets/voxygen/voxel/npc/tuskram/male/foot_fr.vox index 8bc1adc785..78c08d2584 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5440f4007e17ff3d9b529f24b7a8dce329937a67833b66d207647f9532806159 -size 1196 +oid sha256:6b06f357f56c9e0567ed7474e4ddb4f8adfbc1bcd3d6968ae3cbd09eb3c83536 +size 1348 diff --git a/assets/voxygen/voxel/npc/tuskram/male/head_lower.vox b/assets/voxygen/voxel/npc/tuskram/male/head_lower.vox index 0f80d31ea8..a1efbe5bd4 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/head_lower.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/head_lower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d614bcd235285c3b537f40c9028455d29b6b61b7bd8a5db956fd9a7c168fadca -size 1600 +oid sha256:232081227b38b2b480e6433a587dd75952ac043b901536b7d4fa502f22f6c05c +size 1904 diff --git a/assets/voxygen/voxel/npc/tuskram/male/head_upper.vox b/assets/voxygen/voxel/npc/tuskram/male/head_upper.vox index 575c2c9955..abb51582e5 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/head_upper.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/head_upper.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c501cc831e4ddf54be7cd0a31c0dbb350c6799d7ae6f7d8010111a1460973d7e -size 2808 +oid sha256:698bfe87d0c9f6c07a486e0b6b5496f75b748cbd7e0c6f0039b6adb785b6f48c +size 4360 diff --git a/assets/voxygen/voxel/npc/tuskram/male/jaw.vox b/assets/voxygen/voxel/npc/tuskram/male/jaw.vox index d9dd2ad2b5..f2d35078a7 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/jaw.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/jaw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fa3163f3a5f70ba05eac3622a666a4ff2cdd690b3c17c25799687f72d1e09ce -size 1208 +oid sha256:647ef383113a4dc8aa0fddd99ddd0f9881068ac8e2701eb9cc1d190af07ca861 +size 1248 diff --git a/assets/voxygen/voxel/npc/tuskram/male/leg_bl.vox b/assets/voxygen/voxel/npc/tuskram/male/leg_bl.vox new file mode 100644 index 0000000000..5887cef4c9 --- /dev/null +++ b/assets/voxygen/voxel/npc/tuskram/male/leg_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82bacb5173c205bdefacc3125b1626cbb91dbd205901511c4e085096a63f88f6 +size 1512 diff --git a/assets/voxygen/voxel/npc/tuskram/male/leg_br.vox b/assets/voxygen/voxel/npc/tuskram/male/leg_br.vox new file mode 100644 index 0000000000..59a3a974b3 --- /dev/null +++ b/assets/voxygen/voxel/npc/tuskram/male/leg_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e86ebe755bd518b20900d09ebd8385b0b70cbce604a9c4cbf58385ebd03a655 +size 1512 diff --git a/assets/voxygen/voxel/npc/tuskram/male/leg_fl.vox b/assets/voxygen/voxel/npc/tuskram/male/leg_fl.vox new file mode 100644 index 0000000000..aa39e44650 --- /dev/null +++ b/assets/voxygen/voxel/npc/tuskram/male/leg_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f15a0b8d971d88ca2f718f01148c79a93765a2a3a3c77993fe22858786fc2c8c +size 1528 diff --git a/assets/voxygen/voxel/npc/tuskram/male/leg_fr.vox b/assets/voxygen/voxel/npc/tuskram/male/leg_fr.vox new file mode 100644 index 0000000000..f213db33e3 --- /dev/null +++ b/assets/voxygen/voxel/npc/tuskram/male/leg_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45dc4382a63c33326f45b68895de3a5f8275413bf3105f5b961e538e9cae9f7e +size 1528 diff --git a/assets/voxygen/voxel/npc/tuskram/male/tail.vox b/assets/voxygen/voxel/npc/tuskram/male/tail.vox index ed8b56a34a..bfa7174326 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/tail.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04e39292688961ef8ab75f1552f6153f4c6445341b43b5dd1ae4f5982885b444 -size 1208 +oid sha256:d592fa6c1a379566811b417cb6962d5cca18367fb9e52d0ae93408c58cd56e52 +size 1904 diff --git a/assets/voxygen/voxel/npc/tuskram/male/torso_back.vox b/assets/voxygen/voxel/npc/tuskram/male/torso_back.vox index 0afcb16150..9e70367339 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/torso_back.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/torso_back.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8f04f847b5727edf1ed7da6d431c7d3a2936b40a3b33748331b108367ec2f77 -size 3392 +oid sha256:c0bce2157ba7b3792b80777dbd36a1b207d062153f79518a62865a138736a3ce +size 2956 diff --git a/assets/voxygen/voxel/npc/tuskram/male/torso_front.vox b/assets/voxygen/voxel/npc/tuskram/male/torso_front.vox index ce3ef5497b..7688bab3d2 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/torso_front.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/torso_front.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:866c9e2b40c7674c07324740c2f04b686d681a02b1de7a100cd4aa495fb411b5 -size 3272 +oid sha256:b04dd83d748675fbaee2afdca25c872c4df0b9c915b3aa7350b92d702dc44f48 +size 5452 diff --git a/assets/voxygen/voxel/quadruped_low_central_manifest.ron b/assets/voxygen/voxel/quadruped_low_central_manifest.ron index fe0b5bae4b..bb74fa8f02 100644 --- a/assets/voxygen/voxel/quadruped_low_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_low_central_manifest.ron @@ -278,8 +278,8 @@ central: ("npc.tortoise.male.chest"), ), tail_rear: ( - offset: (-0.5, -0.5, -0.5), - central: ("npc.tortoise.male.tail_rear"), + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), ), tail_front: ( offset: (-1.5, -3.5, -1.5), @@ -304,8 +304,8 @@ central: ("npc.tortoise.female.chest"), ), tail_rear: ( - offset: (-0.5, -0.5, -0.5), - central: ("npc.tortoise.female.tail_rear"), + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), ), tail_front: ( offset: (-1.5, -7.0, -1.5), diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron index ad717751ab..33e977b3a2 100644 --- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron @@ -121,62 +121,62 @@ ), (Tuskram, Male): ( upper: ( - offset: (-4.0, -2.5, -7.0), - central: ("npc.tuskram.female.head_upper"), + offset: (-10.0, -11.0, -6.5), + central: ("npc.tuskram.male.head_upper"), ), lower: ( - offset: (-3.0, -4.5, -2.0), - central: ("npc.tuskram.female.head_lower"), + offset: (-4.0, -4.0, -3.5), + central: ("npc.tuskram.male.head_lower"), ), jaw: ( - offset: (-2.0, -1.0, -1.0), + offset: (-2.0, -3.0, -1.5), central: ("npc.tuskram.male.jaw"), ), torso_front: ( - offset: (-5.0, -6.0, -4.0), + offset: (-6.0, -15.0, -6.5), central: ("npc.tuskram.male.torso_front"), ), torso_back: ( - offset: (-5.0, -6.0, -4.0), + offset: (-4.0, -5.0, -4.5), central: ("npc.tuskram.male.torso_back"), ), ears: ( - offset: (-2.0, -1.0, -1.0), + offset: (-0.5, -0.5, -0.5), central: ("armor.empty"), ), tail: ( - offset: (-1.0, -2.5, -4.0), + offset: (-3.0, -7.0, -8.0), central: ("npc.tuskram.male.tail"), ), ), (Tuskram, Female): ( upper: ( - offset: (-4.0, -2.5, -7.0), + offset: (-10.0, -11.0, -6.5), central: ("npc.tuskram.female.head_upper"), ), lower: ( - offset: (-3.0, -4.5, -2.0), + offset: (-4.0, -4.0, -3.5), central: ("npc.tuskram.female.head_lower"), ), jaw: ( - offset: (-2.0, -1.0, -1.0), - central: ("npc.tuskram.male.jaw"), + offset: (-2.0, -3.0, -1.5), + central: ("npc.tuskram.female.jaw"), ), torso_front: ( - offset: (-5.0, -6.0, -4.0), + offset: (-6.0, -15.0, -6.5), central: ("npc.tuskram.female.torso_front"), ), torso_back: ( - offset: (-5.0, -6.0, -4.0), + offset: (-4.0, -5.0, -4.5), central: ("npc.tuskram.female.torso_back"), ), ears: ( - offset: (-2.0, -1.0, -1.0), + offset: (-0.5, -0.5, -0.5), central: ("armor.empty"), ), tail: ( - offset: (-1.0, -2.5, -4.0), - central: ("npc.tuskram.male.tail"), + offset: (-3.0, -7.0, -8.0), + central: ("npc.tuskram.female.tail"), ), ), (Lion, Male): ( diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron index 47ba21d156..206e9519d0 100644 --- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron @@ -137,69 +137,69 @@ ), (Tuskram, Male): ( leg_fl: ( - offset: (-1.5, -1.5, -4.5), + offset: (-2.0, -2.5, -5.0), lateral: ("npc.tuskram.male.leg_fl"), ), leg_fr: ( - offset: (-1.5, -1.5, -4.5), + offset: (-2.0, -2.5, -5.0), lateral: ("npc.tuskram.male.leg_fr"), ), leg_bl: ( - offset: (-1.5, -4.0, -5.5), + offset: (-2.0, -2.5, -4.0), lateral: ("npc.tuskram.male.leg_bl"), ), leg_br: ( - offset: (-1.5, -4.0, -5.5), + offset: (-2.0, -2.5, -4.0), lateral: ("npc.tuskram.male.leg_br"), ), foot_fl: ( - offset: (-1.5, -1.5, -4.5), + offset: (-2.5, -3.5, -5.0), lateral: ("npc.tuskram.male.foot_fl"), ), foot_fr: ( - offset: (-1.5, -1.5, -4.5), + offset: (-2.5, -3.5, -5.0), lateral: ("npc.tuskram.male.foot_fr"), ), foot_bl: ( - offset: (-1.5, -4.0, -5.5), + offset: (-1.5, -2.5, -6.0), lateral: ("npc.tuskram.male.foot_bl"), ), foot_br: ( - offset: (-1.5, -4.0, -5.5), + offset: (-1.5, -2.5, -6.0), lateral: ("npc.tuskram.male.foot_br"), ), ), (Tuskram, Female): ( leg_fl: ( - offset: (-1.5, -1.5, -4.5), + offset: (-2.0, -2.5, -5.0), lateral: ("npc.tuskram.female.leg_fl"), ), leg_fr: ( - offset: (-1.5, -1.5, -4.5), + offset: (-2.0, -2.5, -5.0), lateral: ("npc.tuskram.female.leg_fr"), ), leg_bl: ( - offset: (-1.5, -4.0, -5.5), + offset: (-2.0, -2.5, -4.0), lateral: ("npc.tuskram.female.leg_bl"), ), leg_br: ( - offset: (-1.5, -4.0, -5.5), + offset: (-2.0, -2.5, -4.0), lateral: ("npc.tuskram.female.leg_br"), ), foot_fl: ( - offset: (-1.5, -1.5, -4.5), + offset: (-2.5, -3.5, -5.0), lateral: ("npc.tuskram.female.foot_fl"), ), foot_fr: ( - offset: (-1.5, -1.5, -4.5), + offset: (-2.5, -3.5, -5.0), lateral: ("npc.tuskram.female.foot_fr"), ), foot_bl: ( - offset: (-1.5, -4.0, -5.5), + offset: (-1.5, -2.5, -6.0), lateral: ("npc.tuskram.female.foot_bl"), ), foot_br: ( - offset: (-1.5, -4.0, -5.5), + offset: (-1.5, -2.5, -6.0), lateral: ("npc.tuskram.female.foot_br"), ), ), diff --git a/voxygen/src/anim/quadruped_low/mod.rs b/voxygen/src/anim/quadruped_low/mod.rs index d9cf518665..670f904f17 100644 --- a/voxygen/src/anim/quadruped_low/mod.rs +++ b/voxygen/src/anim/quadruped_low/mod.rs @@ -177,7 +177,7 @@ impl<'a> From<&'a comp::quadruped_low::Body> for SkeletonAttr { (Salamander, _) => (-7.5, 0.0), (Monitor, _) => (-6.5, 0.0), (Asp, _) => (-6.0, -2.0), - (Tortoise, _) => (-13.5, -3.0), + (Tortoise, _) => (-10.0, -3.5), (Rocksnapper, _) => (-13.5, -6.5), }, feet_f: match (body.species, body.body_type) { diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs index 2cb0b706f6..287c94a634 100644 --- a/voxygen/src/anim/src/quadruped_medium/mod.rs +++ b/voxygen/src/anim/src/quadruped_medium/mod.rs @@ -29,11 +29,11 @@ pub struct QuadrupedMediumSkeleton { } #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const HEAD_UPPER_Y: f32 = -8.0; +const HEAD_UPPER_Y: f32 = 6.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const HEAD_UPPER_Z: f32 = 1.5; +const HEAD_UPPER_Z: f32 = 1.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] -const HEAD_LOWER_Y: f32 = 3.5; +const HEAD_LOWER_Y: f32 = 1.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] const HEAD_LOWER_Z: f32 = -3.0; #[const_tweaker::tweak(min = -20.0, max = 20.0, step = 0.5)] @@ -195,90 +195,90 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { use comp::quadruped_medium::Species::*; Self { head_upper: match (body.species, body.body_type) { - (Grolgar, _) => (*HEAD_UPPER_Y, *HEAD_UPPER_Z), + (Grolgar, _) => (-8.0, 1.5), (Saber, _) => (-11.0, -3.0), - (Tuskram, _) => (9.0, 12.0), + (Tuskram, _) => (6.0, 1.0), (Lion, _) => (12.0, 2.0), (Tarasque, _) => (14.0, 3.5), (Tiger, _) => (2.0, 1.0), }, head_lower: match (body.species, body.body_type) { - (Grolgar, _) => (*HEAD_LOWER_Y, *HEAD_LOWER_Z), + (Grolgar, _) => (3.5, -3.0), (Saber, _) => (1.0, 0.0), - (Tuskram, _) => (-3.0, -1.0), + (Tuskram, _) => (1.0, 1.0), (Lion, _) => (0.5, 1.0), (Tiger, _) => (0.0, 0.0), (Tarasque, _) => (0.5, -2.0), (Tiger, _) => (-5.0, -6.0), }, jaw: match (body.species, body.body_type) { - (Grolgar, _) => (*JAW_Y, *JAW_Z), + (Grolgar, _) => (-2.5, 0.5), (Saber, _) => (18.0, -1.0), - (Tuskram, _) => (2.0, -2.0), + (Tuskram, _) => (4.0, -4.0), (Lion, _) => (0.0, -4.5), (Tarasque, _) => (0.0, -10.0), (Tiger, _) => (7.0, -4.0), }, tail: match (body.species, body.body_type) { - (Grolgar, _) => (*TAIL_Y, *TAIL_Z), + (Grolgar, _) => (-5.5, -0.5), (Saber, _) => (-6.0, 1.0), - (Tuskram, _) => (-6.0, -2.0), + (Tuskram, _) => (-4.0, 2.0), (Lion, _) => (-6.0, 1.0), (Tarasque, _) => (2.0, 0.0), (Tiger, _) => (-6.5, -7.0), }, torso_front: match (body.species, body.body_type) { - (Grolgar, _) => (*TORSO_FRONT_Y, *TORSO_FRONT_Z), + (Grolgar, _) => (10.0, 11.0), (Saber, _) => (14.0, 13.0), - (Tuskram, _) => (-7.0, 9.0), - (Lion, _) => (0.0, 13.0), + (Tuskram, _) => (10.0, 15.5), + (Lion, _) => (10.0, 13.0), (Tarasque, _) => (11.5, 18.5), (Tiger, _) => (10.0, 12.0), }, torso_back: match (body.species, body.body_type) { - (Grolgar, _) => (*TORSO_BACK_Y, *TORSO_BACK_Z), + (Grolgar, _) => (-20.0, 1.5), (Saber, _) => (-19.5, 0.0), - (Tuskram, _) => (4.0, 9.0), + (Tuskram, _) => (-18.0, -2.0), (Lion, _) => (-19.0, -1.0), (Tarasque, _) => (-26.5, -1.0), (Tiger, _) => (-19.0, 0.0), }, ears: match (body.species, body.body_type) { - (Grolgar, _) => (*EARS_Y, *EARS_Z), + (Grolgar, _) => (5.0, 9.5), (Saber, _) => (13.0, 7.0), - (Tuskram, _) => (10.0, 2.0), + (Tuskram, _) => (1.5, 9.5), (Lion, _) => (-8.0, 4.5), (Tarasque, _) => (-5.0, 1.0), (Tiger, _) => (2.5, 5.0), }, leg_f: match (body.species, body.body_type) { - (Grolgar, _) => (*LEG_FRONT_X, *LEG_FRONT_Y, *LEG_FRONT_Z), + (Grolgar, _) => (-7.0, -5.0, -2.0), (Saber, _) => (7.0, -7.5, -3.5), - (Tuskram, _) => (4.0, 6.0, 4.5), + (Tuskram, _) => (6.0, -6.5, -5.5), (Lion, _) => (7.5, -4.5, -6.0), (Tarasque, _) => (7.5, -2.0, -6.0), (Tiger, _) => (7.0, -2.0, -1.0), }, leg_b: match (body.species, body.body_type) { - (Grolgar, _) => (*LEG_BACK_X, *LEG_BACK_Y, *LEG_BACK_Z), + (Grolgar, _) => (6.0, -0.5, -5.5), (Saber, _) => (6.0, -1.0, -4.0), - (Tuskram, _) => (4.0, -8.0, 5.5), + (Tuskram, _) => (5.0, 0.5, -3.5), (Lion, _) => (6.0, 0.0, -2.0), (Tarasque, _) => (6.0, 4.5, -6.0), (Tiger, _) => (7.0, -2.0, -1.0), }, feet_f: match (body.species, body.body_type) { - (Grolgar, _) => (*FEET_FRONT_X, *FEET_FRONT_Y, *FEET_FRONT_Z), + (Grolgar, _) => (0.0, 1.0, -6.0), (Saber, _) => (1.0, 3.0, -1.0), - (Tuskram, _) => (4.0, 6.0, 4.5), + (Tuskram, _) => (0.5, 2.0, -5.0), (Lion, _) => (0.0, 2.0, -4.5), (Tarasque, _) => (2.0, -0.5, -4.5), (Tiger, _) => (1.0, 0.0, -5.0), }, feet_b: match (body.species, body.body_type) { - (Grolgar, _) => (*FEET_BACK_X, *FEET_BACK_Y, *FEET_BACK_Z), + (Grolgar, _) => (0.0, 0.0, -5.0), (Saber, _) => (1.0, 0.0, 0.0), - (Tuskram, _) => (4.0, -8.0, 5.5), + (Tuskram, _) => (0.5, 0.0, -4.0), (Lion, _) => (0.5, 0.5, -4.0), (Tarasque, _) => (1.5, -0.5, -3.5), (Tiger, _) => (1.0, 0.5, -4.0),