diff --git a/assets/voxygen/voxel/npc/batfox/male/chest.vox b/assets/voxygen/voxel/npc/batfox/male/chest.vox index d881ed37e7..d411e5e2d7 100644 --- a/assets/voxygen/voxel/npc/batfox/male/chest.vox +++ b/assets/voxygen/voxel/npc/batfox/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8d287c59cea5854e8df4508a933013252f82297bf4cefde89c2eab3f71b1be1 -size 1620 +oid sha256:c7efdbd4516ab0d6cb0593513af7b3e00544c25439403db2d1f9af30bc923c11 +size 1988 diff --git a/assets/voxygen/voxel/npc/batfox/male/foot_bl.vox b/assets/voxygen/voxel/npc/batfox/male/foot_bl.vox index 5971164c37..8616e9ea18 100644 --- a/assets/voxygen/voxel/npc/batfox/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/batfox/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db72317bcb09fd25c24b7979b75b9bc178413bc2f22e56b2c0ad3152725e50a2 -size 1196 +oid sha256:40e3801e2ed880743b36dc9d4d5ff3ed74a3473cbfa7fc3b9064aa09d9f690eb +size 1216 diff --git a/assets/voxygen/voxel/npc/batfox/male/foot_br.vox b/assets/voxygen/voxel/npc/batfox/male/foot_br.vox index fbd0fac997..58bda39f48 100644 --- a/assets/voxygen/voxel/npc/batfox/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/batfox/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:025a4dcf7972217b6a0d2fd76700d495d3ad34d60a2317362031f0ceaa8144c5 -size 1196 +oid sha256:f6199d579d0aeacf09bb787d26aed52aaa15b8d36818ca4dc9e105374d7e6002 +size 1216 diff --git a/assets/voxygen/voxel/npc/batfox/male/foot_fl.vox b/assets/voxygen/voxel/npc/batfox/male/foot_fl.vox index f3c6e19eaa..af85963dab 100644 --- a/assets/voxygen/voxel/npc/batfox/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/batfox/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4caf7814802ca78f55f5a6322ce142327dfe807b96d14251a65fa562047f284e -size 1164 +oid sha256:7e40fc893b8588a905ac7b57702fa93a34ca13895395ce5810c3a697f90eb46f +size 1204 diff --git a/assets/voxygen/voxel/npc/batfox/male/foot_fr.vox b/assets/voxygen/voxel/npc/batfox/male/foot_fr.vox index f67f646001..24458f8143 100644 --- a/assets/voxygen/voxel/npc/batfox/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/batfox/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f343e07bdb993c08d4d04ead02e966e6ca842be761d0828819c60eeebb6f8b9 -size 1164 +oid sha256:ba604e2785401b09aa4b403853e25677ab33c1134474cb59f905d91c5ed7395e +size 1204 diff --git a/assets/voxygen/voxel/npc/batfox/male/head.vox b/assets/voxygen/voxel/npc/batfox/male/head.vox index 0413f0fc58..35d724544c 100644 --- a/assets/voxygen/voxel/npc/batfox/male/head.vox +++ b/assets/voxygen/voxel/npc/batfox/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ee85abf7381b659cdf8eb149ac8c8d9e52a75b3588d6b67206548143503f91d -size 2024 +oid sha256:3d2d9a6735632bdcb7413a38fec726818b9a9f387ef03842a3fef397eaa8d772 +size 2204 diff --git a/assets/voxygen/voxel/npc/boar/female/chest.vox b/assets/voxygen/voxel/npc/boar/female/chest.vox index 660ecc950e..9a7db6ecbb 100644 --- a/assets/voxygen/voxel/npc/boar/female/chest.vox +++ b/assets/voxygen/voxel/npc/boar/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0060a57e3e3f2a08811f4aaea754cd9f336ee0e36fc10d20ed5b34d5ddd648a5 -size 2836 +oid sha256:31984779941f7e23b705908be96b37d559f470b4b6b277f58aef92099352676a +size 3544 diff --git a/assets/voxygen/voxel/npc/boar/female/foot_bl.vox b/assets/voxygen/voxel/npc/boar/female/foot_bl.vox index a3c237ae89..17e883e386 100644 --- a/assets/voxygen/voxel/npc/boar/female/foot_bl.vox +++ b/assets/voxygen/voxel/npc/boar/female/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:966a70b915d1fdbd1307d43071942cb07cd7494b6e8c484a6cd9f1b7ab21a22f -size 1256 +oid sha256:0ec159e28721d8a809abb35ecf9e951475014c92a5db7ccb8709f430dd4aef04 +size 1296 diff --git a/assets/voxygen/voxel/npc/boar/female/foot_br.vox b/assets/voxygen/voxel/npc/boar/female/foot_br.vox index aeac19e52f..c2eba36ad7 100644 --- a/assets/voxygen/voxel/npc/boar/female/foot_br.vox +++ b/assets/voxygen/voxel/npc/boar/female/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:778eb369e58f108ab4e4be7547a84622d3b52d4677360e2a1214c5068cec3c71 -size 1256 +oid sha256:2ad1f182485cec3f98cad49a70286a5c8d2a8dfa2638b0ab52d19dc3c76aff4f +size 1296 diff --git a/assets/voxygen/voxel/npc/boar/female/foot_fl.vox b/assets/voxygen/voxel/npc/boar/female/foot_fl.vox index 6a7eb90734..6fd4869d46 100644 --- a/assets/voxygen/voxel/npc/boar/female/foot_fl.vox +++ b/assets/voxygen/voxel/npc/boar/female/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:381858b085cb93df0f13c26c77bc0d21ed81b6b8fcbd28752b6e430c50c908b9 -size 1272 +oid sha256:e74af40426a02e80f4d30e64619a20aaef3da687f6f14febb65c8be19928dace +size 1316 diff --git a/assets/voxygen/voxel/npc/boar/female/foot_fr.vox b/assets/voxygen/voxel/npc/boar/female/foot_fr.vox index e1cdd727c1..8036a2b758 100644 --- a/assets/voxygen/voxel/npc/boar/female/foot_fr.vox +++ b/assets/voxygen/voxel/npc/boar/female/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4e703d5b4ea0cec57690e58d05fd2761814a43d18084383ae22744bb544d552 -size 1272 +oid sha256:a3a0cec1dcd7af4fccb75bfe4b467458f5ed0f67abe63b7d633e0726cdf77e31 +size 1316 diff --git a/assets/voxygen/voxel/npc/boar/female/head.vox b/assets/voxygen/voxel/npc/boar/female/head.vox index 055972a439..cd122221d0 100644 --- a/assets/voxygen/voxel/npc/boar/female/head.vox +++ b/assets/voxygen/voxel/npc/boar/female/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aae059e0e5796dc063df58edf4338b7a20fcd2b29109630adbb65dbc07ff7960 -size 2152 +oid sha256:2ab6b12a08a71f3c6e93e0aa18f489fb8d10b6eaca4bc3187f4913a7a2772c3c +size 2280 diff --git a/assets/voxygen/voxel/npc/boar/female/tail.vox b/assets/voxygen/voxel/npc/boar/female/tail.vox index d264ccae47..4e88dbc097 100644 --- a/assets/voxygen/voxel/npc/boar/female/tail.vox +++ b/assets/voxygen/voxel/npc/boar/female/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfa0bb01aedde2ede23f359e77e03212a3c850e2939487c2417693fc65b2665f -size 1144 +oid sha256:2fc204bea99f4ce72e9fdca64bf4c247cd8c9d92b350bd05b4e006eb844db695 +size 1148 diff --git a/assets/voxygen/voxel/npc/boar/male/chest.vox b/assets/voxygen/voxel/npc/boar/male/chest.vox index 92252a14c1..538626fc20 100644 --- a/assets/voxygen/voxel/npc/boar/male/chest.vox +++ b/assets/voxygen/voxel/npc/boar/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81e6d0dc56e79ef24e608615d7294174c024d94a5744560fb2fc3a03ad1ed022 -size 2876 +oid sha256:5f1b2ffbcb79b159a5133fa95f469f25f8d48de7691df23b19fc94c9931b5114 +size 3620 diff --git a/assets/voxygen/voxel/npc/boar/male/foot_bl.vox b/assets/voxygen/voxel/npc/boar/male/foot_bl.vox index a3c237ae89..4bcb1c9453 100644 --- a/assets/voxygen/voxel/npc/boar/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/boar/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:966a70b915d1fdbd1307d43071942cb07cd7494b6e8c484a6cd9f1b7ab21a22f -size 1256 +oid sha256:ec7c85de24d042fe7985f0fe4946f3c076aa82ebcc47b597950811341c125391 +size 1296 diff --git a/assets/voxygen/voxel/npc/boar/male/foot_br.vox b/assets/voxygen/voxel/npc/boar/male/foot_br.vox index aeac19e52f..0b67161cab 100644 --- a/assets/voxygen/voxel/npc/boar/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/boar/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:778eb369e58f108ab4e4be7547a84622d3b52d4677360e2a1214c5068cec3c71 -size 1256 +oid sha256:d20c6aa533c285b38c2b5fa29b93be8117196b0c8d280d2503dd8526059fba6b +size 1296 diff --git a/assets/voxygen/voxel/npc/boar/male/foot_fl.vox b/assets/voxygen/voxel/npc/boar/male/foot_fl.vox index 6a7eb90734..9469a8ebf1 100644 --- a/assets/voxygen/voxel/npc/boar/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/boar/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:381858b085cb93df0f13c26c77bc0d21ed81b6b8fcbd28752b6e430c50c908b9 -size 1272 +oid sha256:ff819f1f4863b460c58025f781f32dfb76188350c3453450054d9ba8b6adf267 +size 1316 diff --git a/assets/voxygen/voxel/npc/boar/male/foot_fr.vox b/assets/voxygen/voxel/npc/boar/male/foot_fr.vox index e1cdd727c1..12731d1d81 100644 --- a/assets/voxygen/voxel/npc/boar/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/boar/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4e703d5b4ea0cec57690e58d05fd2761814a43d18084383ae22744bb544d552 -size 1272 +oid sha256:46cb8c8f81eae371961bc3536ee6c4e3ea610f40a9d361c314d203b01bb4511a +size 1316 diff --git a/assets/voxygen/voxel/npc/boar/male/head.vox b/assets/voxygen/voxel/npc/boar/male/head.vox index dbd27eae9a..9bc3a3e7b5 100644 --- a/assets/voxygen/voxel/npc/boar/male/head.vox +++ b/assets/voxygen/voxel/npc/boar/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:96488b885a3f5af3e54939144254dec1885c076878199417adb85e5455263bab -size 2220 +oid sha256:fb2e1ac83e47303da81f153f0d426be23cfdd281b6b40a7d1932913b01f90e95 +size 2392 diff --git a/assets/voxygen/voxel/npc/boar/male/tail.vox b/assets/voxygen/voxel/npc/boar/male/tail.vox index a5d9fb159d..bcc3204bc6 100644 --- a/assets/voxygen/voxel/npc/boar/male/tail.vox +++ b/assets/voxygen/voxel/npc/boar/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef70b16cbf8bf6800456afeeddb4315345018903172ffd0b58afb67d0e2004d9 -size 1144 +oid sha256:c977a9bc905c827dafebbb80675f6593cffd2b606c10e57cc6496b7a1964686b +size 1148 diff --git a/assets/voxygen/voxel/npc/cat/female/chest.vox b/assets/voxygen/voxel/npc/cat/female/chest.vox index 83ab2066d7..e932b99d17 100644 --- a/assets/voxygen/voxel/npc/cat/female/chest.vox +++ b/assets/voxygen/voxel/npc/cat/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e630fde2861dbc46916398a6478931c16bac43bda1e3119e40e321b7423c9b4 -size 1480 +oid sha256:12b91aa9d166ba79ec548156befdb284b1d7d8d71756045556c78bddc1467731 +size 1640 diff --git a/assets/voxygen/voxel/npc/cat/female/foot_bl.vox b/assets/voxygen/voxel/npc/cat/female/foot_bl.vox index 7ce51f8ef4..44e50cc23e 100644 --- a/assets/voxygen/voxel/npc/cat/female/foot_bl.vox +++ b/assets/voxygen/voxel/npc/cat/female/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f8a2992d2046e9ce7282411e698d4a517047935f300bc506ad7aea5a874940e -size 1208 +oid sha256:f83dd059cdc963ecb6f6407132e94c2646a7bdd288bd389c5b4e224f726c8a43 +size 1184 diff --git a/assets/voxygen/voxel/npc/cat/female/foot_br.vox b/assets/voxygen/voxel/npc/cat/female/foot_br.vox index 4a9d9180f0..4920e71948 100644 --- a/assets/voxygen/voxel/npc/cat/female/foot_br.vox +++ b/assets/voxygen/voxel/npc/cat/female/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95ab9658db4afd6eef0ce23d1daf67ab6d07fff35aea641164e57f6963505ef2 -size 1208 +oid sha256:46e291eeb7e7fd9ba428d448bd516e277c00437e790f28f411f761c30e8c5551 +size 1184 diff --git a/assets/voxygen/voxel/npc/cat/female/foot_fl.vox b/assets/voxygen/voxel/npc/cat/female/foot_fl.vox index 1187956984..78423aab90 100644 --- a/assets/voxygen/voxel/npc/cat/female/foot_fl.vox +++ b/assets/voxygen/voxel/npc/cat/female/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bfd8c0a663563adb544a6a260bcb11442003fef1ee6ec41e1856aef54ab5ea0 -size 1168 +oid sha256:0ee9dc8c6473c45da834a8e0ff47adc4f7d6da16f015b0f41c04042e9ab642f2 +size 1172 diff --git a/assets/voxygen/voxel/npc/cat/female/foot_fr.vox b/assets/voxygen/voxel/npc/cat/female/foot_fr.vox index 69426e6eca..902b33d228 100644 --- a/assets/voxygen/voxel/npc/cat/female/foot_fr.vox +++ b/assets/voxygen/voxel/npc/cat/female/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cb8500173296a3319987ccf7683a45d6e745151e23a551c1deac0b72908894b -size 1168 +oid sha256:fbd1f030f20e96d75095d84b4c1add0926b6f5cc0eaf2df9061f77d1e6c011ea +size 1172 diff --git a/assets/voxygen/voxel/npc/cat/female/head.vox b/assets/voxygen/voxel/npc/cat/female/head.vox index d209a50e34..5d407d1c1f 100644 --- a/assets/voxygen/voxel/npc/cat/female/head.vox +++ b/assets/voxygen/voxel/npc/cat/female/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc31311dece576f3b17776baee1ff6de05bf3247490b084cd801ff008d52fde8 -size 1592 +oid sha256:0fba3733fd4e156fdaf7ff26dd6b1dff253b90cbb3d390bd1c83ab0445704cb2 +size 1620 diff --git a/assets/voxygen/voxel/npc/cat/female/tail.vox b/assets/voxygen/voxel/npc/cat/female/tail.vox index a1c44ae308..2aedc13346 100644 --- a/assets/voxygen/voxel/npc/cat/female/tail.vox +++ b/assets/voxygen/voxel/npc/cat/female/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58a6a70e62fd1b88f32f780bb33f1ca565e71bca32dfbc7eca3de19b3bdedfa1 -size 1120 +oid sha256:988e2cd5fe47a4ec86d92040fd395021e3f34ffbef999b1d3331d3f825c591ea +size 1140 diff --git a/assets/voxygen/voxel/npc/cat/male/chest.vox b/assets/voxygen/voxel/npc/cat/male/chest.vox index eeefa51f4d..147c10dc5a 100644 --- a/assets/voxygen/voxel/npc/cat/male/chest.vox +++ b/assets/voxygen/voxel/npc/cat/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bc8779d489cf33ca7fa47cb8068aa51c5da7a07f5aa1d76df848a2a4cc88215 -size 1480 +oid sha256:cc23288c94c411eba2956d17ea16f9689d7d3990489d2ce502e214db2e55437e +size 1640 diff --git a/assets/voxygen/voxel/npc/cat/male/foot_bl.vox b/assets/voxygen/voxel/npc/cat/male/foot_bl.vox index 8c47b3ef56..782b6f7783 100644 --- a/assets/voxygen/voxel/npc/cat/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/cat/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da74ca43f9ddf35b387ac7d7521b9bcebb2f7305b59adc0a3d583400ccd3cdd5 -size 1208 +oid sha256:59b28e2f43072929871ab8117dbb6a215bafd10925fc7326180aac9c8d54264f +size 1184 diff --git a/assets/voxygen/voxel/npc/cat/male/foot_br.vox b/assets/voxygen/voxel/npc/cat/male/foot_br.vox index 039940b998..5831158106 100644 --- a/assets/voxygen/voxel/npc/cat/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/cat/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95157bdf1ebcdbae5e808abda74d5e6cc64456807c1e5ff4e3ce967bda6b904f -size 1208 +oid sha256:4e1443f73fe5837393f608bc29f172ef6dceae54a96a03b4d2693287f83479ff +size 1184 diff --git a/assets/voxygen/voxel/npc/cat/male/foot_fl.vox b/assets/voxygen/voxel/npc/cat/male/foot_fl.vox index b53dc867e9..9661ebb608 100644 --- a/assets/voxygen/voxel/npc/cat/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/cat/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c583a50a87ed31f5b5d6110fe5790b9d322165cb437425709b7f755c9946686c -size 1168 +oid sha256:de06e552c49af6f98e69ddab1a602cffe3e9d7fc324fd6d402462f8c834e5b2b +size 1172 diff --git a/assets/voxygen/voxel/npc/cat/male/foot_fr.vox b/assets/voxygen/voxel/npc/cat/male/foot_fr.vox index 77fbb446e9..a41c50316b 100644 --- a/assets/voxygen/voxel/npc/cat/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/cat/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63eee23d23176b12908fd5a472c049d13fc9a3b6cfcdfe0291f6e52887b0e33f -size 1168 +oid sha256:5a2a361634fcdebf6e69959cb3f183a59ea1f3afc31b863b86cc5ee904dad385 +size 1172 diff --git a/assets/voxygen/voxel/npc/cat/male/head.vox b/assets/voxygen/voxel/npc/cat/male/head.vox index c6b038fe5c..302f0e2eec 100644 --- a/assets/voxygen/voxel/npc/cat/male/head.vox +++ b/assets/voxygen/voxel/npc/cat/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c9cc7605a79f308302fdb21177c3a2ae6d0f632995cdcc5e1bdb8816e3b726f -size 1592 +oid sha256:84cfd68362da86c2bba0d53238ec3239f3ceb9360e37e0846e7e82ef04961cf7 +size 1620 diff --git a/assets/voxygen/voxel/npc/cat/male/tail.vox b/assets/voxygen/voxel/npc/cat/male/tail.vox index 82a86cbcd3..5c9bee918d 100644 --- a/assets/voxygen/voxel/npc/cat/male/tail.vox +++ b/assets/voxygen/voxel/npc/cat/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d97c77e754998ac3e3bf8afdf0533a76f19d801655fcb65114a02dd3cc8582b -size 1120 +oid sha256:98a5a483ee308d459819aa61dd670d64f0e52bb0ab7fa35344849c495ce078bd +size 1140 diff --git a/assets/voxygen/voxel/npc/dodarock/male/chest.vox b/assets/voxygen/voxel/npc/dodarock/male/chest.vox index 9ed2e87887..59dc7b843a 100644 --- a/assets/voxygen/voxel/npc/dodarock/male/chest.vox +++ b/assets/voxygen/voxel/npc/dodarock/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fa581ce169d998d8ad26289b46418cf88bc5c397b84e0ea36abb12cd53c7483 -size 3868 +oid sha256:a5b99efdd84befab454aaaece9ff2685da8316bfff3c7b02e8b57be75f5db943 +size 3608 diff --git a/assets/voxygen/voxel/npc/dodarock/male/foot_bl.vox b/assets/voxygen/voxel/npc/dodarock/male/foot_bl.vox index bfbdd68728..ec14d2c0bd 100644 --- a/assets/voxygen/voxel/npc/dodarock/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/dodarock/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8e4b030554994fded35de771cdc04f699b0d5dfab7ced47b9ea684652b2c63e -size 1232 +oid sha256:d07af60b66655a4cb072e4e3d6b5ee06b527e69ccac0378e15d4fb1ada5cf119 +size 1252 diff --git a/assets/voxygen/voxel/npc/dodarock/male/foot_br.vox b/assets/voxygen/voxel/npc/dodarock/male/foot_br.vox index 0c7ad50b24..689ab86790 100644 --- a/assets/voxygen/voxel/npc/dodarock/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/dodarock/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c1569a875d6218b1a51796a93ac7b9985350ad6fa71fe6b5622415d7bbca424 -size 1232 +oid sha256:6b6dad625318c31c13ca8c6a035877109e08a7e2c72ea1eff2d6155b47d4ec7b +size 1252 diff --git a/assets/voxygen/voxel/npc/dodarock/male/foot_fl.vox b/assets/voxygen/voxel/npc/dodarock/male/foot_fl.vox index 3cf115fee0..4373de546c 100644 --- a/assets/voxygen/voxel/npc/dodarock/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/dodarock/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65f05a9b69715cb5fffb6c82166e59fa2054619783aa9cbec44849bdbb593607 -size 1548 +oid sha256:f53eb4d341d318dbfd903e37cff5b6893eb3b79619665b8447f7120b8c98170f +size 1552 diff --git a/assets/voxygen/voxel/npc/dodarock/male/foot_fr.vox b/assets/voxygen/voxel/npc/dodarock/male/foot_fr.vox index be2a1b29ed..0129e65c20 100644 --- a/assets/voxygen/voxel/npc/dodarock/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/dodarock/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1306dc7261b141997acdebb492c9ac766245618963c8bc18355e4b705e8b2d36 -size 1548 +oid sha256:843dead8905b5b753843a55775a89b6f8b07a4fb94376ccfc6a032d7fdc448a7 +size 1552 diff --git a/assets/voxygen/voxel/npc/dodarock/male/head.vox b/assets/voxygen/voxel/npc/dodarock/male/head.vox index b61653abea..04237a7cb1 100644 --- a/assets/voxygen/voxel/npc/dodarock/male/head.vox +++ b/assets/voxygen/voxel/npc/dodarock/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf5051514e840a46cf38c6b44e6b1f3cf10a1c7f0ef1945e334315d313e6b414 -size 3236 +oid sha256:d773d52265a88f9ff32f98506796235832f8fa5342ff19867aebf6e6e228791a +size 3476 diff --git a/assets/voxygen/voxel/npc/fox/female/chest.vox b/assets/voxygen/voxel/npc/fox/female/chest.vox index f422564504..1e55043472 100644 --- a/assets/voxygen/voxel/npc/fox/female/chest.vox +++ b/assets/voxygen/voxel/npc/fox/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bb520b57096709fcb3ae1006ae80d49805544292e7a4dae22965d010db7f8c0 -size 1464 +oid sha256:903770699331d7368a3f8b56cef97e8eff2490b56c45df3aca39b8db4e328250 +size 2048 diff --git a/assets/voxygen/voxel/npc/fox/female/foot_bl.vox b/assets/voxygen/voxel/npc/fox/female/foot_bl.vox index 4d19cdbbba..46ddc26f3f 100644 --- a/assets/voxygen/voxel/npc/fox/female/foot_bl.vox +++ b/assets/voxygen/voxel/npc/fox/female/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb3fb3ffee0736247c7187d14a2f7efae7f6ce517fec4c0ab49137605494efa4 -size 1200 +oid sha256:faececdab6b18288de2aa1107bc49d63be715f89c5c8392b8155e7a3a44d4dae +size 1216 diff --git a/assets/voxygen/voxel/npc/fox/female/foot_br.vox b/assets/voxygen/voxel/npc/fox/female/foot_br.vox index 4fa88e72a1..6a8d38fa9b 100644 --- a/assets/voxygen/voxel/npc/fox/female/foot_br.vox +++ b/assets/voxygen/voxel/npc/fox/female/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95e5f826066196bc85bb226e756768f3df8cbc91c5f7e48a3fb7af671683b7b2 -size 1200 +oid sha256:cc9c5a5b92c09a6e2eb47407cdfad5870087c73b84d38f57cb806566a09c5abf +size 1216 diff --git a/assets/voxygen/voxel/npc/fox/female/foot_fl.vox b/assets/voxygen/voxel/npc/fox/female/foot_fl.vox index 858d72a1a9..31a87141f4 100644 --- a/assets/voxygen/voxel/npc/fox/female/foot_fl.vox +++ b/assets/voxygen/voxel/npc/fox/female/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c337dd67a451dbd4e0f4eb005f19fc1948186c8212604d3debf8bd60dbb933c -size 1156 +oid sha256:f303cff97d0131704eb2d009df7d0fdeed1c72a96475d86048546b7350510164 +size 1208 diff --git a/assets/voxygen/voxel/npc/fox/female/foot_fr.vox b/assets/voxygen/voxel/npc/fox/female/foot_fr.vox index 793ff41f2a..2cf7269f93 100644 --- a/assets/voxygen/voxel/npc/fox/female/foot_fr.vox +++ b/assets/voxygen/voxel/npc/fox/female/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97c17c8090213ac8bdd0b76190ddc5ab65ea2ef34ee50cdde95549446a370431 -size 1156 +oid sha256:04fa1d2be597e2dd54171bdf99be59d0c9b8a7c5d1d381b9646dc6304c77428f +size 1208 diff --git a/assets/voxygen/voxel/npc/fox/female/head.vox b/assets/voxygen/voxel/npc/fox/female/head.vox index f109ad02ac..4f0db6cd60 100644 --- a/assets/voxygen/voxel/npc/fox/female/head.vox +++ b/assets/voxygen/voxel/npc/fox/female/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3bae3afdb8853e7a104d47e408c9c76538ad9fc938ad382363fc9fbaa9bb12c -size 1460 +oid sha256:a5079b98ca1914817c055eb7025ced99ab7fda5bfe286a5eb6e71e21d9253856 +size 1760 diff --git a/assets/voxygen/voxel/npc/fox/female/tail.vox b/assets/voxygen/voxel/npc/fox/female/tail.vox index 6d6422540e..a565028505 100644 --- a/assets/voxygen/voxel/npc/fox/female/tail.vox +++ b/assets/voxygen/voxel/npc/fox/female/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c651753367d96ac3ec2f921923697fffd69b7ba357d22509d1241f378853ae37 -size 1264 +oid sha256:48533bd1be1dec4bb1f8d46bf6e877c5bd3e719caec6a27dbdf65c46a60ed805 +size 1464 diff --git a/assets/voxygen/voxel/npc/fox/male/chest.vox b/assets/voxygen/voxel/npc/fox/male/chest.vox index 592aac3dc9..5679cc5123 100644 --- a/assets/voxygen/voxel/npc/fox/male/chest.vox +++ b/assets/voxygen/voxel/npc/fox/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbccd9c68b9ef04717d15e2ba98f74a74b1ab578664df0ab28ae114c66c2a90a -size 1464 +oid sha256:bda9e08c532df7fbd9340c92b64c41435857ddf80773276764e917f335ed243e +size 1904 diff --git a/assets/voxygen/voxel/npc/fox/male/foot_bl.vox b/assets/voxygen/voxel/npc/fox/male/foot_bl.vox index e444e3e6d0..4808f939d6 100644 --- a/assets/voxygen/voxel/npc/fox/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/fox/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9dac3eb3e69f7c82a3f070a8c61868469a1562ada1b5f4266e15ff769d86622e -size 1200 +oid sha256:7811991f5addd3fb91d2d75cc644510a8e73e692c86edf1d245527a710b15ba6 +size 1216 diff --git a/assets/voxygen/voxel/npc/fox/male/foot_br.vox b/assets/voxygen/voxel/npc/fox/male/foot_br.vox index 05635c403e..e881400891 100644 --- a/assets/voxygen/voxel/npc/fox/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/fox/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81dadb018ee78ca56bb4bf6a34ed42ee82ff76f693250b6dff2781a4099ece84 -size 1200 +oid sha256:5c9b793a15ea73300b5902e8a6c1bd755699ae2a24f0dbfe0916dfd26b619a2e +size 1216 diff --git a/assets/voxygen/voxel/npc/fox/male/foot_fl.vox b/assets/voxygen/voxel/npc/fox/male/foot_fl.vox index e241d4fbdd..7e2971bb93 100644 --- a/assets/voxygen/voxel/npc/fox/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/fox/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cd0197f2e6d0434101866f1d9587f521145649ae4b5073587c854948d2bab8e -size 1156 +oid sha256:bc8993716402a56f5dda9eedb6506ac3c878c835e6004738cf6580f6046d4115 +size 1208 diff --git a/assets/voxygen/voxel/npc/fox/male/foot_fr.vox b/assets/voxygen/voxel/npc/fox/male/foot_fr.vox index 17b9098872..b4b48a0c9c 100644 --- a/assets/voxygen/voxel/npc/fox/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/fox/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14ebd8bce42b7eb5981eb6386aa9465d3a281dc016a23491d34d91607ba91794 -size 1156 +oid sha256:6c42a1c241699df6b8efa501ec8cf9ab71e63ed2c85f3892af63e53ceefc240b +size 1208 diff --git a/assets/voxygen/voxel/npc/fox/male/head.vox b/assets/voxygen/voxel/npc/fox/male/head.vox index d4d9c8a322..e05c2b2c9b 100644 --- a/assets/voxygen/voxel/npc/fox/male/head.vox +++ b/assets/voxygen/voxel/npc/fox/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:667ac08f1728516487e4b5d2f29527354a2c549211386a1070580a3ec2ce315c -size 1460 +oid sha256:5e7c9c826323f89b8455b602674e092764087beccf0405b517bbbb3f7dfffae2 +size 1712 diff --git a/assets/voxygen/voxel/npc/fox/male/tail.vox b/assets/voxygen/voxel/npc/fox/male/tail.vox index f70316f75a..aef37bdcd0 100644 --- a/assets/voxygen/voxel/npc/fox/male/tail.vox +++ b/assets/voxygen/voxel/npc/fox/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a51ba48f622afb0447e6e16893b79dac5d34fc85076373f3e41b5b07d30b17ac -size 1264 +oid sha256:102bf4fa91b0e707387587f57f38d381cd5be8a77be02d7330aeb4f687645968 +size 1464 diff --git a/assets/voxygen/voxel/npc/holladon/male/chest.vox b/assets/voxygen/voxel/npc/holladon/male/chest.vox index 99bd964c2d..f8f5e969c1 100644 --- a/assets/voxygen/voxel/npc/holladon/male/chest.vox +++ b/assets/voxygen/voxel/npc/holladon/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01d2624d38eff5729e36c02ecf5f55c200dc5f3cd54bc0ef4406bdfba25bb5b7 -size 2320 +oid sha256:e32eb52109eb7a867c97ad0abf4ebbd3424b63e8c84fa9d222f7680dbaa51799 +size 3048 diff --git a/assets/voxygen/voxel/npc/holladon/male/foot_bl.vox b/assets/voxygen/voxel/npc/holladon/male/foot_bl.vox index a8bf362869..7874d827e4 100644 --- a/assets/voxygen/voxel/npc/holladon/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/holladon/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dcce6b18422e3e3b642e62e689cab55e2070b5256bc223b52d72d7c518d4b0ed -size 1196 +oid sha256:e4f0879993c621a3ca92436f9e996386cdf6a3124c3a543179a91f70f07c7441 +size 1200 diff --git a/assets/voxygen/voxel/npc/holladon/male/foot_br.vox b/assets/voxygen/voxel/npc/holladon/male/foot_br.vox index e4184c7690..cbe85510a3 100644 --- a/assets/voxygen/voxel/npc/holladon/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/holladon/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e7dee876086a5856742a805f8ab80c321ebb64c21b0a7f857e5d2aec7453306 -size 1196 +oid sha256:33048ece0e3630d27ca1f5b6faa9043402f692397f853588f408f8129c22198d +size 1200 diff --git a/assets/voxygen/voxel/npc/holladon/male/foot_fl.vox b/assets/voxygen/voxel/npc/holladon/male/foot_fl.vox index 20436cd81a..ad790ca7a8 100644 --- a/assets/voxygen/voxel/npc/holladon/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/holladon/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdd7fe6dafd0b74416463a988418d9ae4e0b5ea3c014c6fdf8200f4b0b8973a0 -size 1184 +oid sha256:afd75ceb7ef757f1ba0886a9227090a987a1c01a049e9293a204c7fa733833b7 +size 1248 diff --git a/assets/voxygen/voxel/npc/holladon/male/foot_fr.vox b/assets/voxygen/voxel/npc/holladon/male/foot_fr.vox index 05167204d8..5dcd26b1f9 100644 --- a/assets/voxygen/voxel/npc/holladon/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/holladon/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd8d4ba6094dc6c83b25d57f16fdcf036e4c157dac7470743411fc77592e8ef7 -size 1184 +oid sha256:ded3693f264d8abb2c0039814fb0c936b40539c16416b9fa6eb7d996c45ec621 +size 1248 diff --git a/assets/voxygen/voxel/npc/holladon/male/head.vox b/assets/voxygen/voxel/npc/holladon/male/head.vox index 6b319d7fcc..5816ee49af 100644 --- a/assets/voxygen/voxel/npc/holladon/male/head.vox +++ b/assets/voxygen/voxel/npc/holladon/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfba8f3bd8a34f05963c3644634495c1567a13d0cc42e1881bb3f8522af4d4f9 -size 1676 +oid sha256:9f29147d3d1e50418dfa0f9b009a8303a13c4256c8410813f41e86e3e6bd8b0c +size 1796 diff --git a/assets/voxygen/voxel/npc/hyena/male/Jackalope-0.vox b/assets/voxygen/voxel/npc/hyena/male/Jackalope-0.vox new file mode 100644 index 0000000000..8c6c0a6426 --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/male/Jackalope-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72714adeab7b54e8c6446939df83f9aa62592d1b295d05de86c5a7f89960df61 +size 2168 diff --git a/assets/voxygen/voxel/npc/hyena/male/Jackalope-1.vox b/assets/voxygen/voxel/npc/hyena/male/Jackalope-1.vox new file mode 100644 index 0000000000..098144e1b1 --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/male/Jackalope-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed02747e6f5e6766faf9da9ab473255dac8f99fb6045bf37a3ff49a42b679908 +size 1932 diff --git a/assets/voxygen/voxel/npc/hyena/male/Jackalope-2.vox b/assets/voxygen/voxel/npc/hyena/male/Jackalope-2.vox new file mode 100644 index 0000000000..be0782d49c --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/male/Jackalope-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:694cab8420dffb23fed549394de72ba8ef16bb7cbc903f11cbe95f5518eb32bf +size 1272 diff --git a/assets/voxygen/voxel/npc/hyena/male/Jackalope-3.vox b/assets/voxygen/voxel/npc/hyena/male/Jackalope-3.vox new file mode 100644 index 0000000000..952c180d2e --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/male/Jackalope-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89b051e86f59eccfc98d3808d89ec01d00c0a05f99e03879a6a9237bae72711d +size 1192 diff --git a/assets/voxygen/voxel/npc/hyena/male/Jackalope-4.vox b/assets/voxygen/voxel/npc/hyena/male/Jackalope-4.vox new file mode 100644 index 0000000000..09c845f49f --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/male/Jackalope-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36b6b7beaa900028e40e02e623651cccfbef1b0a48cb0572b5674d9f5dc30cd5 +size 1272 diff --git a/assets/voxygen/voxel/npc/hyena/male/chest.vox b/assets/voxygen/voxel/npc/hyena/male/chest.vox index 4f1b98929f..e09c55d1d2 100644 --- a/assets/voxygen/voxel/npc/hyena/male/chest.vox +++ b/assets/voxygen/voxel/npc/hyena/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f69811441014a42ce4fb5f70e2d86db8081038f191baa982d8c3ee6edd56153 -size 2704 +oid sha256:597c7bfe6c5144e0b0978095375f649cec614bb6a19a34e2de7c464f15b46574 +size 2936 diff --git a/assets/voxygen/voxel/npc/hyena/male/foot_bl.vox b/assets/voxygen/voxel/npc/hyena/male/foot_bl.vox index 6042e19d34..17acb920a7 100644 --- a/assets/voxygen/voxel/npc/hyena/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/hyena/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:275c8b8d5a083f64fbde416df87547d0d9606cf602816d478e0af55aeac0bb7c -size 1244 +oid sha256:ccaa64d65281b1781cb8aa16620c8196b9841d4cb3574b04403fb23c807b2509 +size 1272 diff --git a/assets/voxygen/voxel/npc/hyena/male/foot_br.vox b/assets/voxygen/voxel/npc/hyena/male/foot_br.vox index 097ab61953..17acb920a7 100644 --- a/assets/voxygen/voxel/npc/hyena/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/hyena/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb678cfb93421a60a6f8858a7c79a4cfdfcdd279d24b044b01b9dcd4cb899ea8 -size 1244 +oid sha256:ccaa64d65281b1781cb8aa16620c8196b9841d4cb3574b04403fb23c807b2509 +size 1272 diff --git a/assets/voxygen/voxel/npc/hyena/male/foot_fl.vox b/assets/voxygen/voxel/npc/hyena/male/foot_fl.vox index 06237aeedd..6c90343ea2 100644 --- a/assets/voxygen/voxel/npc/hyena/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/hyena/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e51c5791f3322f02b62b1acf269a4d9338255cf2d74a6476fa8b4ea3eef48d94 -size 1272 +oid sha256:435225bdb49373f5e45bddc13396b7f477b25599f2caac75886e3f9f00297eab +size 1284 diff --git a/assets/voxygen/voxel/npc/hyena/male/foot_fr.vox b/assets/voxygen/voxel/npc/hyena/male/foot_fr.vox index 53e6a5754c..7c0bfdd7e9 100644 --- a/assets/voxygen/voxel/npc/hyena/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/hyena/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a668bc6325d38faf2ca0bd1a969ee3d255cafccf11c5f544a19ac72cfb83e19 -size 1272 +oid sha256:ee258d50b407aacc32a4f59b17d31395b201e64745523f2de34df3eb2fa02b5b +size 1284 diff --git a/assets/voxygen/voxel/npc/hyena/male/head.vox b/assets/voxygen/voxel/npc/hyena/male/head.vox index 8ea905996a..77e647204a 100644 --- a/assets/voxygen/voxel/npc/hyena/male/head.vox +++ b/assets/voxygen/voxel/npc/hyena/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3948a5ef12beff539ff08a6a202d70fb0bda075ffa5ec596b32b6497fa882017 -size 1528 +oid sha256:327464dc14180cb5e7bccac534f65553ad286a8c130f81774243aca89d4fa759 +size 1640 diff --git a/assets/voxygen/voxel/npc/hyena/male/tail.vox b/assets/voxygen/voxel/npc/hyena/male/tail.vox index 0758e9cf3b..6cf707b992 100644 --- a/assets/voxygen/voxel/npc/hyena/male/tail.vox +++ b/assets/voxygen/voxel/npc/hyena/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf057bd10925867cbc89706abfbeece5f677ed6c8f961e1910f32ddd3c3aa067 +oid sha256:6f205ec5a3c6816631d57b9e74656a7da4fd240cf26e03589940b6d6a7bde1e1 size 1176 diff --git a/assets/voxygen/voxel/npc/jackalope/male/chest.vox b/assets/voxygen/voxel/npc/jackalope/male/chest.vox index 7cb3b89cf1..4a49032577 100644 --- a/assets/voxygen/voxel/npc/jackalope/male/chest.vox +++ b/assets/voxygen/voxel/npc/jackalope/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bb982aa17793394e9972cd27259222bd9d87bd56801e9fb37cbeefb2f460767 -size 1748 +oid sha256:c02ef90b83e6facd9ca08809842db12cc6aacce8f27af9b0047166b68af39aec +size 2068 diff --git a/assets/voxygen/voxel/npc/jackalope/male/foot_bl.vox b/assets/voxygen/voxel/npc/jackalope/male/foot_bl.vox index efbc0f88ba..dae8b99501 100644 --- a/assets/voxygen/voxel/npc/jackalope/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/jackalope/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ff7aaaf7fb12c68f29e90121862efd7f4500df902b9d83e3828de3a628389df -size 1296 +oid sha256:20d8d1bb0baa44be27d956d2af8db5bba5c56b6e6a3c579b7f4283a310324015 +size 1272 diff --git a/assets/voxygen/voxel/npc/jackalope/male/foot_br.vox b/assets/voxygen/voxel/npc/jackalope/male/foot_br.vox index 55b9b9d21c..c81c5f7824 100644 --- a/assets/voxygen/voxel/npc/jackalope/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/jackalope/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04da13ca9c68dfdc58f32d385d482ae37544fabac4c92ac13820ae858d3a4be1 -size 1296 +oid sha256:69c4f63beb7b8bb8ac784b5d5520a64a1a3f85b37c4823d5b4f6deaca2186f10 +size 1272 diff --git a/assets/voxygen/voxel/npc/jackalope/male/foot_fl.vox b/assets/voxygen/voxel/npc/jackalope/male/foot_fl.vox index 7ebcb26e49..952c180d2e 100644 --- a/assets/voxygen/voxel/npc/jackalope/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/jackalope/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f05e59572f10d14316f5633e11dadbb64b74fe2fe92542c0c78630770b52827f -size 1164 +oid sha256:89b051e86f59eccfc98d3808d89ec01d00c0a05f99e03879a6a9237bae72711d +size 1192 diff --git a/assets/voxygen/voxel/npc/jackalope/male/foot_fr.vox b/assets/voxygen/voxel/npc/jackalope/male/foot_fr.vox index 1ca33a3960..ea9ebe3296 100644 --- a/assets/voxygen/voxel/npc/jackalope/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/jackalope/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61cb8ee173957ff56da0a5372d2d75091e00ad4384a766daffe53f5448e8b016 -size 1164 +oid sha256:40337a7aacb8ec092b71719d3332d578763cfbc7350227ea1da38a517f2a2691 +size 1192 diff --git a/assets/voxygen/voxel/npc/jackalope/male/head.vox b/assets/voxygen/voxel/npc/jackalope/male/head.vox index 6c1ff8243f..098144e1b1 100644 --- a/assets/voxygen/voxel/npc/jackalope/male/head.vox +++ b/assets/voxygen/voxel/npc/jackalope/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00f90c53bafe5cf31ddd6ddd847f8c99d2693835ac184a8ef0cc10503469595d -size 1628 +oid sha256:ed02747e6f5e6766faf9da9ab473255dac8f99fb6045bf37a3ff49a42b679908 +size 1932 diff --git a/assets/voxygen/voxel/npc/jackalope/male/tail.vox b/assets/voxygen/voxel/npc/jackalope/male/tail.vox new file mode 100644 index 0000000000..f328309214 --- /dev/null +++ b/assets/voxygen/voxel/npc/jackalope/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:debc2f9c8e0cd929a9ddc7deb5c02834b68752f8e19c20f8f38734d8296b1826 +size 1196 diff --git a/assets/voxygen/voxel/npc/pig/female/chest.vox b/assets/voxygen/voxel/npc/pig/female/chest.vox index da66786e5e..314fe26fde 100644 --- a/assets/voxygen/voxel/npc/pig/female/chest.vox +++ b/assets/voxygen/voxel/npc/pig/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:febe5a7a2959574cf9873db2fcd2dd61644cb1a1fac818b0d157fb8f8abf8e2e -size 2728 +oid sha256:170ab26eb390edb51611472158d2ec684544ae8554d5f68e2dce0ebba2c71885 +size 3176 diff --git a/assets/voxygen/voxel/npc/pig/female/foot_bl.vox b/assets/voxygen/voxel/npc/pig/female/foot_bl.vox new file mode 100644 index 0000000000..add136f9c3 --- /dev/null +++ b/assets/voxygen/voxel/npc/pig/female/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ae196dd350b829bdb748cdaecd2ee79c5b6a3dcadee18877bf4f580f3d3be7f +size 1240 diff --git a/assets/voxygen/voxel/npc/pig/female/foot_br.vox b/assets/voxygen/voxel/npc/pig/female/foot_br.vox new file mode 100644 index 0000000000..8aba943b41 --- /dev/null +++ b/assets/voxygen/voxel/npc/pig/female/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8538576cb07634d5b65d1770c964aedd44f308503b26c60e74f42a74e10d2a1 +size 1240 diff --git a/assets/voxygen/voxel/npc/pig/female/foot_fl.vox b/assets/voxygen/voxel/npc/pig/female/foot_fl.vox new file mode 100644 index 0000000000..d8ded34572 --- /dev/null +++ b/assets/voxygen/voxel/npc/pig/female/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b1de2be8786143fb817a65155065ecea65342c79e8ac627512b8b02873a3475 +size 1196 diff --git a/assets/voxygen/voxel/npc/pig/female/foot_fr.vox b/assets/voxygen/voxel/npc/pig/female/foot_fr.vox new file mode 100644 index 0000000000..3f798e3660 --- /dev/null +++ b/assets/voxygen/voxel/npc/pig/female/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36c019f483b17f8e35f3965f0408178b88b79d2ae953367ca2bf2986fda8aad8 +size 1196 diff --git a/assets/voxygen/voxel/npc/pig/female/foot_l.vox b/assets/voxygen/voxel/npc/pig/female/foot_l.vox deleted file mode 100644 index 518432bf67..0000000000 --- a/assets/voxygen/voxel/npc/pig/female/foot_l.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55a443d2826d552d8bf102c4914a8e8f320a9560c29a1dcf77c8c08212f7bc9e -size 1144 diff --git a/assets/voxygen/voxel/npc/pig/female/foot_r.vox b/assets/voxygen/voxel/npc/pig/female/foot_r.vox deleted file mode 100644 index 2506fc9a35..0000000000 --- a/assets/voxygen/voxel/npc/pig/female/foot_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0fcb492dc6627ad5a1e1519a18eef5e477ffc2b204f022ae77f477213e6da75d -size 1144 diff --git a/assets/voxygen/voxel/npc/pig/female/head.vox b/assets/voxygen/voxel/npc/pig/female/head.vox index 4559259d51..c9c3aef181 100644 --- a/assets/voxygen/voxel/npc/pig/female/head.vox +++ b/assets/voxygen/voxel/npc/pig/female/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a773dc802bff2d93a62a0c495c37c1de61002a5ad642441253d848c0b621e5e -size 2720 +oid sha256:958baa646d847ccb1be9a7ec1ae038cd0f0dd48b09c3f8ec1ba505f8dedb5e9f +size 2576 diff --git a/assets/voxygen/voxel/npc/pig/female/tail.vox b/assets/voxygen/voxel/npc/pig/female/tail.vox index 18bd5abd07..579cbbaf25 100644 --- a/assets/voxygen/voxel/npc/pig/female/tail.vox +++ b/assets/voxygen/voxel/npc/pig/female/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9cf49f35b190575852475f5b6105c387c9ce06a2e96ae822d930b7269945c1b -size 1120 +oid sha256:fa3e51a854df33330304bb9910874e9cf0e6628b2dc60b6bac5bd8084552bb7f +size 1140 diff --git a/assets/voxygen/voxel/npc/pig/male/chest.vox b/assets/voxygen/voxel/npc/pig/male/chest.vox index 5e73b2d591..314fe26fde 100644 --- a/assets/voxygen/voxel/npc/pig/male/chest.vox +++ b/assets/voxygen/voxel/npc/pig/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d66ecfd9935a08918afce0182d1ba683670b385a4eb83517987f01b43fe9dc9 -size 2728 +oid sha256:170ab26eb390edb51611472158d2ec684544ae8554d5f68e2dce0ebba2c71885 +size 3176 diff --git a/assets/voxygen/voxel/npc/pig/male/foot_bl.vox b/assets/voxygen/voxel/npc/pig/male/foot_bl.vox new file mode 100644 index 0000000000..add136f9c3 --- /dev/null +++ b/assets/voxygen/voxel/npc/pig/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ae196dd350b829bdb748cdaecd2ee79c5b6a3dcadee18877bf4f580f3d3be7f +size 1240 diff --git a/assets/voxygen/voxel/npc/pig/male/foot_br.vox b/assets/voxygen/voxel/npc/pig/male/foot_br.vox new file mode 100644 index 0000000000..8aba943b41 --- /dev/null +++ b/assets/voxygen/voxel/npc/pig/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8538576cb07634d5b65d1770c964aedd44f308503b26c60e74f42a74e10d2a1 +size 1240 diff --git a/assets/voxygen/voxel/npc/pig/male/foot_fl.vox b/assets/voxygen/voxel/npc/pig/male/foot_fl.vox new file mode 100644 index 0000000000..d8ded34572 --- /dev/null +++ b/assets/voxygen/voxel/npc/pig/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b1de2be8786143fb817a65155065ecea65342c79e8ac627512b8b02873a3475 +size 1196 diff --git a/assets/voxygen/voxel/npc/pig/male/foot_fr.vox b/assets/voxygen/voxel/npc/pig/male/foot_fr.vox new file mode 100644 index 0000000000..3f798e3660 --- /dev/null +++ b/assets/voxygen/voxel/npc/pig/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36c019f483b17f8e35f3965f0408178b88b79d2ae953367ca2bf2986fda8aad8 +size 1196 diff --git a/assets/voxygen/voxel/npc/pig/male/foot_l.vox b/assets/voxygen/voxel/npc/pig/male/foot_l.vox deleted file mode 100644 index d016d1b2b0..0000000000 --- a/assets/voxygen/voxel/npc/pig/male/foot_l.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1fd44f8c1bd1eb9cab7a4d0632b6db52e9aada97b01a7fca8ea4f2f98186685 -size 1144 diff --git a/assets/voxygen/voxel/npc/pig/male/foot_r.vox b/assets/voxygen/voxel/npc/pig/male/foot_r.vox deleted file mode 100644 index bf5a48a400..0000000000 --- a/assets/voxygen/voxel/npc/pig/male/foot_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79a83692fb7a5791cef6848ad14e27a79585f7a0cf872f20b2b556b9cd18838e -size 1144 diff --git a/assets/voxygen/voxel/npc/pig/male/head.vox b/assets/voxygen/voxel/npc/pig/male/head.vox index 39ac9d39b6..c9c3aef181 100644 --- a/assets/voxygen/voxel/npc/pig/male/head.vox +++ b/assets/voxygen/voxel/npc/pig/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a56643b54eb4d39ad58b3bcab88390ddea58cf41351b39ad32b83612900b71c1 -size 2720 +oid sha256:958baa646d847ccb1be9a7ec1ae038cd0f0dd48b09c3f8ec1ba505f8dedb5e9f +size 2576 diff --git a/assets/voxygen/voxel/npc/pig/male/tail.vox b/assets/voxygen/voxel/npc/pig/male/tail.vox index bd318d8f38..579cbbaf25 100644 --- a/assets/voxygen/voxel/npc/pig/male/tail.vox +++ b/assets/voxygen/voxel/npc/pig/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0585aaeca7f094336d38c62ff0d58dca4ff38c1787abd00fd11c600bc2d297f -size 1120 +oid sha256:fa3e51a854df33330304bb9910874e9cf0e6628b2dc60b6bac5bd8084552bb7f +size 1140 diff --git a/assets/voxygen/voxel/npc/quokka/male/chest.vox b/assets/voxygen/voxel/npc/quokka/male/chest.vox index af2069b4f1..0573a960fb 100644 --- a/assets/voxygen/voxel/npc/quokka/male/chest.vox +++ b/assets/voxygen/voxel/npc/quokka/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84140cc082752707b15a5f7e8342820ec5d8ae41c9dd61249352d35179fa4461 -size 3928 +oid sha256:946d3c0ba8b65edf010030cbe503b744469ffd8df56d0bcaa29979e60e16879c +size 2868 diff --git a/assets/voxygen/voxel/npc/quokka/male/foot_bl.vox b/assets/voxygen/voxel/npc/quokka/male/foot_bl.vox index 895fe053b8..a354da08aa 100644 --- a/assets/voxygen/voxel/npc/quokka/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/quokka/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:615cfbbbb395c89695963347f99103fa2f291f040898038ba3d05e66d4cfa927 -size 1188 +oid sha256:36b6413c289b05d9507645f4cbd1da124dbd41411d67ecb808e123944756c2fa +size 1260 diff --git a/assets/voxygen/voxel/npc/quokka/male/foot_br.vox b/assets/voxygen/voxel/npc/quokka/male/foot_br.vox index d72af08983..175f47168d 100644 --- a/assets/voxygen/voxel/npc/quokka/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/quokka/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f560e45d3d7cd70e913bb009a3eebb2390304cad1fec4611da8b2020a79dd904 -size 1188 +oid sha256:56a1d9c31d391686264b22320c5d97c3b8a364666ce84a14e4a2153fd646c777 +size 1260 diff --git a/assets/voxygen/voxel/npc/quokka/male/foot_fl.vox b/assets/voxygen/voxel/npc/quokka/male/foot_fl.vox index 1c213ffda6..1881d416c7 100644 --- a/assets/voxygen/voxel/npc/quokka/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/quokka/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77c5bf0656594dc80ff47f2fdf0afd0ffa7c96045a8e0f80e03eaeeae20dba87 -size 1164 +oid sha256:d122132ae892a25c2592460832272afe139f237774b1baeadf1fb62f96a33da6 +size 1204 diff --git a/assets/voxygen/voxel/npc/quokka/male/foot_fr.vox b/assets/voxygen/voxel/npc/quokka/male/foot_fr.vox index cba098f695..65e5bab6ca 100644 --- a/assets/voxygen/voxel/npc/quokka/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/quokka/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:789b7ce6793bcc9bdc2f1edfd627788ae0187ecfe2937c67d4f31a2d468c75c0 -size 1164 +oid sha256:8266a7b988e8c33ff6c4c4532138b20016155cb2483c79c043f926842c13c341 +size 1204 diff --git a/assets/voxygen/voxel/npc/quokka/male/head.vox b/assets/voxygen/voxel/npc/quokka/male/head.vox index 0cd442286b..cd7e324bc2 100644 --- a/assets/voxygen/voxel/npc/quokka/male/head.vox +++ b/assets/voxygen/voxel/npc/quokka/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bde80d9aada68898e93c03a1be4a39ac5116283990f61ce57e6daa4726281535 -size 1668 +oid sha256:fe015a51c3b18d8df86d8ad36de57159dce01ce233796c84e405e868bbf5569a +size 1808 diff --git a/assets/voxygen/voxel/npc/quokka/male/tail.vox b/assets/voxygen/voxel/npc/quokka/male/tail.vox new file mode 100644 index 0000000000..4533f5baa1 --- /dev/null +++ b/assets/voxygen/voxel/npc/quokka/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddb2978bb65c62fae398c15aa2882fbd5ff42b71a20e6913c1dcac6d28474322 +size 1200 diff --git a/assets/voxygen/voxel/npc/raccoon/male/chest.vox b/assets/voxygen/voxel/npc/raccoon/male/chest.vox index 660dd88009..27ba40a372 100644 --- a/assets/voxygen/voxel/npc/raccoon/male/chest.vox +++ b/assets/voxygen/voxel/npc/raccoon/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c23b2de4e28c1d7037bd7d2bc29dde4bebe0fb423afd05176432f25d73fe1d2 -size 2000 +oid sha256:56862e63c0e24946a8626a073b219b3ba76f5e9a0477296ef00ceed42ee0fe19 +size 2944 diff --git a/assets/voxygen/voxel/npc/raccoon/male/foot_bl.vox b/assets/voxygen/voxel/npc/raccoon/male/foot_bl.vox index 00f545a150..22258dac64 100644 --- a/assets/voxygen/voxel/npc/raccoon/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/raccoon/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6356277a1f8d2ba4fae22cb8bd591a9670857cfd4436293975bc6094775f9600 -size 1156 +oid sha256:96aaa0de2bc320f2f1208111e115bd88b52147d87daeb558eafd0b7b0e9fdcdf +size 1420 diff --git a/assets/voxygen/voxel/npc/raccoon/male/foot_br.vox b/assets/voxygen/voxel/npc/raccoon/male/foot_br.vox index 4c82095d3b..83417c2449 100644 --- a/assets/voxygen/voxel/npc/raccoon/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/raccoon/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4f0333e558b9d737de8b2710fe271b82b9c1d9c22539dfa6a78eb77230e1310 -size 1156 +oid sha256:606aab33e28451102d2c027d851bf79f9f847104a96713c39c683333e5a56dd0 +size 1420 diff --git a/assets/voxygen/voxel/npc/raccoon/male/foot_fl.vox b/assets/voxygen/voxel/npc/raccoon/male/foot_fl.vox index 8ce37308f4..81e6c8c86b 100644 --- a/assets/voxygen/voxel/npc/raccoon/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/raccoon/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0adf6fc53289f95c27f2460d62bf0a70e59559f2a1ef310e6e850c73ba6f79f4 -size 1128 +oid sha256:c6d0e52becc669f11c2e4287f6e770c89a7062698842f68e42a72b14f9d5a894 +size 1240 diff --git a/assets/voxygen/voxel/npc/raccoon/male/foot_fr.vox b/assets/voxygen/voxel/npc/raccoon/male/foot_fr.vox index 8ce37308f4..6fe5635dad 100644 --- a/assets/voxygen/voxel/npc/raccoon/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/raccoon/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0adf6fc53289f95c27f2460d62bf0a70e59559f2a1ef310e6e850c73ba6f79f4 -size 1128 +oid sha256:b863044a40dd813529b4ab83979df69da78926c6856512f8effe2ef70e61190a +size 1240 diff --git a/assets/voxygen/voxel/npc/raccoon/male/head.vox b/assets/voxygen/voxel/npc/raccoon/male/head.vox index 055cee1293..1b80d46b5a 100644 --- a/assets/voxygen/voxel/npc/raccoon/male/head.vox +++ b/assets/voxygen/voxel/npc/raccoon/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12770477f8bb15304a622926c43d52d9ef7ff38b45e8fa8e6983411fd3fd0232 -size 1584 +oid sha256:c81a8a31efdd6a81720d1807b884bc7c4644b0008c3a6e5d78d11ae28b95cb72 +size 2008 diff --git a/assets/voxygen/voxel/npc/raccoon/male/tail.vox b/assets/voxygen/voxel/npc/raccoon/male/tail.vox index 8efdc25588..ef4cd86185 100644 --- a/assets/voxygen/voxel/npc/raccoon/male/tail.vox +++ b/assets/voxygen/voxel/npc/raccoon/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a9ae036b292c7ca32aa8111fd512ebbd281f79f99009a5340ce2bd2800f32d0 -size 1176 +oid sha256:acaaaad14862338f1d40364c5aa8e9a9c7fd2c6d6536cb79390bf56fe1a5b6f9 +size 1664 diff --git a/assets/voxygen/voxel/npc/sheep/female/chest.vox b/assets/voxygen/voxel/npc/sheep/female/chest.vox index 58fdfc22c0..e207a4de88 100644 --- a/assets/voxygen/voxel/npc/sheep/female/chest.vox +++ b/assets/voxygen/voxel/npc/sheep/female/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d28768d19e54b8e396588e97cafab4f3ccf1e417c8f292380588062067798c92 -size 3336 +oid sha256:e1ea627aae8f3976f3efe00c05a61bc6ded7ea3234b5040f9c2ac186890f0831 +size 3352 diff --git a/assets/voxygen/voxel/npc/sheep/female/foot_bl.vox b/assets/voxygen/voxel/npc/sheep/female/foot_bl.vox new file mode 100644 index 0000000000..abc6a06dfc --- /dev/null +++ b/assets/voxygen/voxel/npc/sheep/female/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e88930cefb61d3624440c81fb610f112cdd0266978a7dc2ddb5c37bad3030924 +size 1232 diff --git a/assets/voxygen/voxel/npc/sheep/female/foot_br.vox b/assets/voxygen/voxel/npc/sheep/female/foot_br.vox new file mode 100644 index 0000000000..5fbef3849f --- /dev/null +++ b/assets/voxygen/voxel/npc/sheep/female/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:496f52b3adecc213ef14ab84c6fd42ec49605b0515e23ee6abf7d8ddb8aa8976 +size 1232 diff --git a/assets/voxygen/voxel/npc/sheep/female/foot_fl.vox b/assets/voxygen/voxel/npc/sheep/female/foot_fl.vox new file mode 100644 index 0000000000..9d5376fbea --- /dev/null +++ b/assets/voxygen/voxel/npc/sheep/female/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c20c088b32b90d5ec41f95f16b032665d0cdaf11e5f1df60d3dde90b81ff2a1c +size 1208 diff --git a/assets/voxygen/voxel/npc/sheep/female/foot_fr.vox b/assets/voxygen/voxel/npc/sheep/female/foot_fr.vox new file mode 100644 index 0000000000..b099eb9af4 --- /dev/null +++ b/assets/voxygen/voxel/npc/sheep/female/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c98e924793aebb7dbddcf621009903c6fc2cf875c840b187bfb6d62b4f8462c0 +size 1208 diff --git a/assets/voxygen/voxel/npc/sheep/female/foot_l.vox b/assets/voxygen/voxel/npc/sheep/female/foot_l.vox deleted file mode 100644 index 420983704f..0000000000 --- a/assets/voxygen/voxel/npc/sheep/female/foot_l.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ff2f232823f1aaeb218908d568678ad54c9955243a711e1e30b2f93efeacfa4 -size 1176 diff --git a/assets/voxygen/voxel/npc/sheep/female/foot_r.vox b/assets/voxygen/voxel/npc/sheep/female/foot_r.vox deleted file mode 100644 index fe9d7eaac8..0000000000 --- a/assets/voxygen/voxel/npc/sheep/female/foot_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a92a0148e46f2127b9d04b3bbfc874ed0ab670b4821f684b7ac83768c58f3a7 -size 1176 diff --git a/assets/voxygen/voxel/npc/sheep/female/head.vox b/assets/voxygen/voxel/npc/sheep/female/head.vox index b73deee331..118008209e 100644 --- a/assets/voxygen/voxel/npc/sheep/female/head.vox +++ b/assets/voxygen/voxel/npc/sheep/female/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9afd4b0377c1a29586d614cd40b1b8bafb9bbc0e6655386eb2a4c97e9ed645a6 -size 1568 +oid sha256:03aac8c8bfd942727da9470cc4ca7d2025811fe10f9ae1dadfe8b516bf22dc1b +size 1744 diff --git a/assets/voxygen/voxel/npc/sheep/male/chest.vox b/assets/voxygen/voxel/npc/sheep/male/chest.vox index 58fdfc22c0..e207a4de88 100644 --- a/assets/voxygen/voxel/npc/sheep/male/chest.vox +++ b/assets/voxygen/voxel/npc/sheep/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d28768d19e54b8e396588e97cafab4f3ccf1e417c8f292380588062067798c92 -size 3336 +oid sha256:e1ea627aae8f3976f3efe00c05a61bc6ded7ea3234b5040f9c2ac186890f0831 +size 3352 diff --git a/assets/voxygen/voxel/npc/sheep/male/foot_bl.vox b/assets/voxygen/voxel/npc/sheep/male/foot_bl.vox new file mode 100644 index 0000000000..abc6a06dfc --- /dev/null +++ b/assets/voxygen/voxel/npc/sheep/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e88930cefb61d3624440c81fb610f112cdd0266978a7dc2ddb5c37bad3030924 +size 1232 diff --git a/assets/voxygen/voxel/npc/sheep/male/foot_br.vox b/assets/voxygen/voxel/npc/sheep/male/foot_br.vox new file mode 100644 index 0000000000..5fbef3849f --- /dev/null +++ b/assets/voxygen/voxel/npc/sheep/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:496f52b3adecc213ef14ab84c6fd42ec49605b0515e23ee6abf7d8ddb8aa8976 +size 1232 diff --git a/assets/voxygen/voxel/npc/sheep/male/foot_fl.vox b/assets/voxygen/voxel/npc/sheep/male/foot_fl.vox new file mode 100644 index 0000000000..b099eb9af4 --- /dev/null +++ b/assets/voxygen/voxel/npc/sheep/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c98e924793aebb7dbddcf621009903c6fc2cf875c840b187bfb6d62b4f8462c0 +size 1208 diff --git a/assets/voxygen/voxel/npc/sheep/male/foot_fr.vox b/assets/voxygen/voxel/npc/sheep/male/foot_fr.vox new file mode 100644 index 0000000000..9d5376fbea --- /dev/null +++ b/assets/voxygen/voxel/npc/sheep/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c20c088b32b90d5ec41f95f16b032665d0cdaf11e5f1df60d3dde90b81ff2a1c +size 1208 diff --git a/assets/voxygen/voxel/npc/sheep/male/foot_l.vox b/assets/voxygen/voxel/npc/sheep/male/foot_l.vox deleted file mode 100644 index 420983704f..0000000000 --- a/assets/voxygen/voxel/npc/sheep/male/foot_l.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ff2f232823f1aaeb218908d568678ad54c9955243a711e1e30b2f93efeacfa4 -size 1176 diff --git a/assets/voxygen/voxel/npc/sheep/male/foot_r.vox b/assets/voxygen/voxel/npc/sheep/male/foot_r.vox deleted file mode 100644 index fe9d7eaac8..0000000000 --- a/assets/voxygen/voxel/npc/sheep/male/foot_r.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a92a0148e46f2127b9d04b3bbfc874ed0ab670b4821f684b7ac83768c58f3a7 -size 1176 diff --git a/assets/voxygen/voxel/npc/sheep/male/head.vox b/assets/voxygen/voxel/npc/sheep/male/head.vox index cb211c0131..1adf34dec7 100644 --- a/assets/voxygen/voxel/npc/sheep/male/head.vox +++ b/assets/voxygen/voxel/npc/sheep/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b75c4cb4644689cef72262e9e5ebf2e975c05ee349a8fa90320149ef314e851b -size 1920 +oid sha256:3fb5c82b8cd219fbc07197a315c9d12361fa5c283ae67f7fcc578d781cd552f0 +size 2072 diff --git a/assets/voxygen/voxel/npc/skunk/male/chest.vox b/assets/voxygen/voxel/npc/skunk/male/chest.vox index 3d24ecc8dc..ac2fa2f7db 100644 --- a/assets/voxygen/voxel/npc/skunk/male/chest.vox +++ b/assets/voxygen/voxel/npc/skunk/male/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:740dfac589c9bdf53e4c096dee5ed4d414e398881d2a05aeb7cd801f975d6633 -size 2280 +oid sha256:521dd65e1a541d1b66d25ae497c2eb8622cd3976bdbd3d7706ec4d4833bc2961 +size 2576 diff --git a/assets/voxygen/voxel/npc/skunk/male/foot_bl.vox b/assets/voxygen/voxel/npc/skunk/male/foot_bl.vox index c93c67d71d..bf6f2ae841 100644 --- a/assets/voxygen/voxel/npc/skunk/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/skunk/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19a023c1991305c934b2591bb0ee45bf49fb828c101009d48fffe30e105af8b2 -size 1152 +oid sha256:189a1dfccfe94573c1ac6d9e6948bc2b399f9d48fee2b4510f852f692cde5eb9 +size 1272 diff --git a/assets/voxygen/voxel/npc/skunk/male/foot_br.vox b/assets/voxygen/voxel/npc/skunk/male/foot_br.vox index c93c67d71d..f9b67dd801 100644 --- a/assets/voxygen/voxel/npc/skunk/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/skunk/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19a023c1991305c934b2591bb0ee45bf49fb828c101009d48fffe30e105af8b2 -size 1152 +oid sha256:36c50a2976124064b5fc0a05d9c528fe06fcb91a44792ae5922f675b58e93e5e +size 1272 diff --git a/assets/voxygen/voxel/npc/skunk/male/foot_fl.vox b/assets/voxygen/voxel/npc/skunk/male/foot_fl.vox index 710980ea33..84e7815f4b 100644 --- a/assets/voxygen/voxel/npc/skunk/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/skunk/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7318ab936d59e1a90d408a0caabda086bb15abe91d342f76d888e25ca7ed3ad -size 1140 +oid sha256:dfac9a2796b701c728ecf70500d524ebcc6c13e03b4e0057fa1c4c5eb3bd3e9b +size 1196 diff --git a/assets/voxygen/voxel/npc/skunk/male/foot_fr.vox b/assets/voxygen/voxel/npc/skunk/male/foot_fr.vox index 0bc8b5f991..f738c5f83f 100644 --- a/assets/voxygen/voxel/npc/skunk/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/skunk/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9604864b8c09add4efe7efc2ef467992cb224777acaf07c3996815024cd00c1b -size 1140 +oid sha256:9a9c42a5090173ee30c73afaf46040781be4d367e52b9c58594147b8d340d79c +size 1196 diff --git a/assets/voxygen/voxel/npc/skunk/male/head.vox b/assets/voxygen/voxel/npc/skunk/male/head.vox index 56b0427ea6..d7a412a5c7 100644 --- a/assets/voxygen/voxel/npc/skunk/male/head.vox +++ b/assets/voxygen/voxel/npc/skunk/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:052d951e90d925540d348168b974f62756d90dcc3cea0d062cc2d0d8a7017820 -size 1232 +oid sha256:08a7ce2866fcd0bbcb6fad76ed8f8d39e4d4ab29257eadb872f3f471f14735eb +size 1688 diff --git a/assets/voxygen/voxel/npc/skunk/male/tail.vox b/assets/voxygen/voxel/npc/skunk/male/tail.vox index 5bc867817c..e692b5b679 100644 --- a/assets/voxygen/voxel/npc/skunk/male/tail.vox +++ b/assets/voxygen/voxel/npc/skunk/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26a1388485abf8fda1a8c44628e7dc7d85c7ade4c95bccbdf4175579f07fe153 -size 1808 +oid sha256:3d18d2b517779ea30d05e792c23aae070e94f04e427b1c45fc138ff2601eebdb +size 2168 diff --git a/assets/voxygen/voxel/quadruped_small_central_manifest.ron b/assets/voxygen/voxel/quadruped_small_central_manifest.ron index dc0336da13..5d52cc8487 100644 --- a/assets/voxygen/voxel/quadruped_small_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_small_central_manifest.ron @@ -1,66 +1,66 @@ ({ (Pig, Male): ( head: ( - offset: (-6.0, -2.5, -4.5), + offset: (-5.0, 0.0, -4.0), central: ("npc.pig.male.head"), ), chest: ( - offset: (-5.0, -4.5, -4.5), + offset: (-5.0, -5.0, -3.5), central: ("npc.pig.male.chest"), ), tail: ( - offset: (-2.0, -1.0, -2.0), + offset: (-2.5, -3.0, -0.0), central: ("npc.pig.male.tail"), ), ), (Pig, Female):( head: ( - offset: (-6.0, -2.5, -4.5), + offset: (-5.0, 0.0, -4.0), central: ("npc.pig.female.head"), ), chest: ( - offset: (-5.0, -4.5, -4.5), + offset: (-5.0, -5.0, -3.5), central: ("npc.pig.female.chest"), ), tail: ( - offset: (-2.0, -1.0, -2.0), + offset: (-2.5, -3.0, -0.0), central: ("npc.pig.female.tail"), ), ), (Fox, Male):( head: ( - offset: (-3.5, -3.0, -3.5), + offset: (-4.5, 0.0, -3.5), central: ("npc.fox.male.head"), ), chest: ( - offset: (-1.5, -4.5, -2.5), + offset: (-2.5, -5.5, -2.5), central: ("npc.fox.male.chest"), ), tail: ( - offset: (-2.0, -7.0, -1.5), + offset: (-1.5, -11.0, -6.0), central: ("npc.fox.male.tail"), ), ), (Fox, Female):( head: ( - offset: (-3.5, -3.0, -3.5), + offset: (-4.5, 0.0, -3.5), central: ("npc.fox.female.head"), ), chest: ( - offset: (-1.5, -4.5, -2.5), + offset: (-2.5, -5.5, -3.0), central: ("npc.fox.female.chest"), ), tail: ( - offset: (-1.5, -7.0, -1.5), + offset: (-1.5, -11.0, -6.0), central: ("npc.fox.female.tail"), ), ), (Sheep, Male):( head: ( - offset: (-6.0, -5.5, -4.0), + offset: (-5.0, 0.0, -5.0), central: ("npc.sheep.male.head"), ), chest: ( @@ -75,7 +75,7 @@ (Sheep, Female):( head: ( - offset: (-5.0, -4.5, -3.5), + offset: (-5.0, 0.0, -3.5), central: ("npc.sheep.female.head"), ), chest: ( @@ -89,123 +89,123 @@ ), (Boar, Male):( head: ( - offset: (-5.5, -6.5, -4.0), + offset: (-4.5, 0.0, -5.0), central: ("npc.boar.male.head"), ), chest: ( - offset: (-3.5, -8.0, -4.0), + offset: (-4.5, -7.5, -5.5), central: ("npc.boar.male.chest"), ), tail: ( - offset: (-1.5, -2.0, -6.0), + offset: (-1.5, -5.0, -7.0), central: ("npc.boar.male.tail"), ), ), (Boar, Female):( head: ( - offset: (-5.5, -6.5, -4.0), + offset: (-4.5, 0.0, -4.5), central: ("npc.boar.female.head"), ), chest: ( - offset: (-3.5, -8.0, -4.0), + offset: (-4.5, -7.5, -5.0), central: ("npc.boar.female.chest"), ), tail: ( - offset: (-1.5, -2.0, -6.0), + offset: (-1.5, -5.0, -7.0), central: ("npc.boar.female.tail"), ), ), (Jackalope, Male):( head: ( - offset: (-3.5, -4.5, -4.5), + offset: (-3.5, 0.0, -4.0), central: ("npc.jackalope.male.head"), ), chest: ( - offset: (-1.5, -7.5, -2.5), + offset: (-2.5, -5.0, -3.5), central: ("npc.jackalope.male.chest"), ), tail: ( - offset: (-1.5, -7.5, -2.5), - central: ("armor.empty"), + offset: (-1.5, -2.0, -3.0), + central: ("npc.jackalope.male.tail"), ), ), (Jackalope, Female):( head: ( - offset: (-3.5, -4.5, -4.5), + offset: (-3.5, 0.0, -4.0), central: ("npc.jackalope.male.head"), ), chest: ( - offset: (-1.5, -7.5, -2.5), + offset: (-2.5, -5.0, -3.5), central: ("npc.jackalope.male.chest"), ), tail: ( - offset: (-1.5, -7.5, -2.5), - central: ("armor.empty"), + offset: (-1.5, -2.0, -3.0), + central: ("npc.jackalope.male.tail"), ), ), (Skunk, Male):( head: ( - offset: (-2.0, -1.0, -2.0), + offset: (-3.0,0.0, -2.5), central: ("npc.skunk.male.head"), ), chest: ( - offset: (-3.0, -4.5, -2.5), + offset: (-4.0, -5.5, -3.0), central: ("npc.skunk.male.chest"), ), tail: ( - offset: (-3.0, -10.0, -4.5), + offset: (-5.0, -11.0, -4.0), central: ("npc.skunk.male.tail"), ), ), (Skunk, Female):( head: ( - offset: (-2.0, -1.0, -2.0), + offset: (-3.0, 0.0, -2.5), central: ("npc.skunk.male.head"), ), chest: ( - offset: (-3.0, -4.5, -2.5), + offset: (-4.0, -5.5, -3.0), central: ("npc.skunk.male.chest"), ), tail: ( - offset: (-3.0, -10.0, -4.5), + offset: (-5.0, -11.0, -4.0), central: ("npc.skunk.male.tail"), ), ), (Cat, Male):( head: ( - offset: (-3.5, -3.0, -3.5), + offset: (-4.5, 0.0, -3.5), central: ("npc.cat.male.head"), ), chest: ( - offset: (-1.5, -3.0, -2.0), + offset: (-2.5, -4.5, -2.0), central: ("npc.cat.male.chest"), ), tail: ( - offset: (-0.5, -3.0, -4.0), + offset: (-0.5, -7.0, -5.0), central: ("npc.cat.male.tail"), ), ), (Cat, Female):( head: ( - offset: (-3.5, -3.0, -3.5), + offset: (-4.5, 0.0, -3.5), central: ("npc.cat.female.head"), ), chest: ( - offset: (-1.5, -3.0, -2.0), + offset: (-2.5, -4.5, -2.0), central: ("npc.cat.female.chest"), ), tail: ( - offset: (-0.5, -3.0, -4.0), + offset: (-0.5, -7.0, -5.0), central: ("npc.cat.female.tail"), ), ), (Batfox, Male):( head: ( - offset: (-9.5, -6.0, -4.0), + offset: (-7.5, 0.0, -3.0), central: ("npc.batfox.male.head"), ), chest: ( - offset: (-1.5, -7.5, -2.5), + offset: (-2.5, -7.0, -3.0), central: ("npc.batfox.male.chest"), ), tail: ( @@ -216,11 +216,11 @@ (Batfox, Female):( head: ( - offset: (-9.5, -6.0, -4.0), + offset: (-7.5, 0.0, -3.0), central: ("npc.batfox.male.head"), ), chest: ( - offset: (-1.5, -7.5, -2.5), + offset: (-2.5, -7.0, -3.0), central: ("npc.batfox.male.chest"), ), tail: ( @@ -231,71 +231,71 @@ (Raccoon, Male):( head: ( - offset: (-4.0, -4.0, -3.5), + offset: (-5.0, 0.0, -4.0), central: ("npc.raccoon.male.head"), ), chest: ( - offset: (-3.0, -5.5, -3.0), + offset: (-4.0, -6.0, -3.5), central: ("npc.raccoon.male.chest"), ), tail: ( - offset: (-1.0, -5.0, -1.5), + offset: (-2.0, -11.0, -2.5), central: ("npc.raccoon.male.tail"), ), ), (Raccoon, Female):( head: ( - offset: (-4.0, -4.0, -3.5), + offset: (-5.0, 0.0, -4.0), central: ("npc.raccoon.male.head"), ), chest: ( - offset: (-3.0, -5.5, -3.0), + offset: (-4.0, -6.0, -3.5), central: ("npc.raccoon.male.chest"), ), tail: ( - offset: (-1.0, -5.0, -1.5), + offset: (-2.0, -11.0, -2.5), central: ("npc.raccoon.male.tail"), ), ), (Quokka, Male):( head: ( - offset: (-4.5, -3.0, -4.0), + offset: (-4.5, 0.0, -3.5), central: ("npc.quokka.male.head"), ), chest: ( - offset: (-5.0, -7.5, -4.0), + offset: (-3.5, -6.5, -4.0), central: ("npc.quokka.male.chest"), ), tail: ( - offset: (-1.5, -7.5, -2.5), - central: ("armor.empty"), + offset: (-1.5, -8.0, -3.5), + central: ("npc.quokka.male.tail"), ), ), (Quokka, Female):( head: ( - offset: (-4.5, -3.0, -4.0), + offset: (-4.5, 0.0, -3.5), central: ("npc.quokka.male.head"), ), chest: ( - offset: (-5.0, -7.5, -4.0), + offset: (-3.5, -6.5, -4.0), central: ("npc.quokka.male.chest"), ), tail: ( - offset: (-1.5, -7.5, -2.5), - central: ("armor.empty"), + offset: (-1.5, -8.0, -3.5), + central: ("npc.quokka.male.tail"), ), ), (Dodarock, Male):( head: ( - offset: (-5.0, -3.5, -4.5), + offset: (-4.5, 0.0, -2.5), central: ("npc.dodarock.male.head"), ), chest: ( - offset: (-5.0, -7.5, -4.5), + offset: (-4.5, -8.0, -4.5), central: ("npc.dodarock.male.chest"), ), tail: ( @@ -306,11 +306,11 @@ (Dodarock, Female):( head: ( - offset: (-5.0, -3.5, -4.5), + offset: (-4.5, 0.0, -2.5), central: ("npc.dodarock.male.head"), ), chest: ( - offset: (-5.0, -7.5, -4.5), + offset: (-4.5, -8.0, -4.5), central: ("npc.dodarock.male.chest"), ), tail: ( @@ -321,11 +321,11 @@ ), (Holladon, Male):( head: ( - offset: (-3.5, -3.5, -4.0), + offset: (-3.5, 0.0, -4.0), central: ("npc.holladon.male.head"), ), chest: ( - offset: (-3.0, -7.5, -3.0), + offset: (-4.5, -8.0, -5.0), central: ("npc.holladon.male.chest"), ), tail: ( @@ -336,11 +336,11 @@ (Holladon, Female):( head: ( - offset: (-3.5, -3.5, -4.0), + offset: (-3.5, 0.0, -4.0), central: ("npc.holladon.male.head"), ), chest: ( - offset: (-3.0, -7.5, -3.0), + offset: (-4.5, -8.0, -5.0), central: ("npc.holladon.male.chest"), ), tail: ( @@ -351,30 +351,30 @@ (Hyena, Male):( head: ( - offset: (-3.0, -2.0, -4.0), + offset: (-4.0, 0.0, -4.0), central: ("npc.hyena.male.head"), ), chest: ( - offset: (-3.0, -8.0, -4.0), + offset: (-3.0, -8.0, -4.5), central: ("npc.hyena.male.chest"), ), tail: ( - offset: (-1.0, -3.0, -6.0), + offset: (-1.0, -4.0, -6.0), central: ("npc.hyena.male.tail"), ), ), (Hyena, Female):( head: ( - offset: (-3.0, -2.0, -4.0), + offset: (-4.0, 0.0, -4.0), central: ("npc.hyena.male.head"), ), chest: ( - offset: (-3.0, -8.0, -4.0), + offset: (-3.0, -8.0, -4.5), central: ("npc.hyena.male.chest"), ), tail: ( - offset: (-1.0, -3.0, -6.0), + offset: (-1.0, -4.0, -6.0), central: ("npc.hyena.male.tail"), ), ), diff --git a/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron index c84d2fe64c..20ab11c13e 100644 --- a/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron @@ -1,48 +1,48 @@ ({ (Pig, Male): ( left_front: ( - offset: (-1.0, -1.0, -1.5), - lateral: ("npc.pig.male.foot_l"), + offset: (-1.0, -1.5, -5.0), + lateral: ("npc.pig.male.foot_fl"), ), right_front: ( - offset: (-1.0, -1.0, -1.5), - lateral: ("npc.pig.male.foot_r"), + offset: (-1.0, -1.5, -5.0), + lateral: ("npc.pig.male.foot_fr"), ), left_back: ( - offset: (-1.0, -1.0, -1.5), - lateral: ("npc.pig.male.foot_l"), + offset: (-1.0, -2.0, -6.0), + lateral: ("npc.pig.male.foot_bl"), ), right_back: ( - offset: (-1.0, -1.0, -1.5), - lateral: ("npc.pig.male.foot_r"), + offset: (-1.0, -2.0, -6.0), + lateral: ("npc.pig.male.foot_br"), ), ), (Pig, Female): ( left_front: ( - offset: (-1.0, -1.0, -1.5), - lateral: ("npc.pig.female.foot_l"), + offset: (-1.0, -1.5, -5.0), + lateral: ("npc.pig.female.foot_fl"), ), right_front: ( - offset: (-1.0, -1.0, -1.5), - lateral: ("npc.pig.female.foot_r"), + offset: (-1.0, -1.5, -5.0), + lateral: ("npc.pig.female.foot_fr"), ), left_back: ( - offset: (-1.0, -1.0, -1.5), - lateral: ("npc.pig.female.foot_l"), + offset: (-1.0, -2.0, -6.0), + lateral: ("npc.pig.female.foot_bl"), ), right_back: ( - offset: (-1.0, -1.0, -1.5), - lateral: ("npc.pig.female.foot_r"), + offset: (-1.0, -2.0, -6.0), + lateral: ("npc.pig.female.foot_br"), ), ), (Fox, Male): ( left_front: ( - offset: (-1.0, -2.5, -2.5), + offset: (-1.0, -2.0, -2.5), lateral: ("npc.fox.male.foot_fl"), ), right_front: ( - offset: (-1.0, -2.5, -2.5), + offset: (-1.0, -2.0, -2.5), lateral: ("npc.fox.male.foot_fr"), ), left_back: ( @@ -56,7 +56,7 @@ ), (Fox, Female): ( left_front: ( - offset: (-1.0, -2.5, -2.5), + offset: (-1.0, -2.0, -2.5), lateral: ("npc.fox.female.foot_fl"), ), right_front: ( @@ -75,45 +75,45 @@ (Sheep, Male): ( left_front: ( - offset: (-1.0, -1.0, -3.5), - lateral: ("npc.sheep.male.foot_l"), + offset: (-1.0, -1.5, -5.0), + lateral: ("npc.sheep.male.foot_fl"), ), right_front: ( - offset: (-1.0, -1.0, -3.5), - lateral: ("npc.sheep.male.foot_r"), + offset: (-1.0, -1.5, -5.0), + lateral: ("npc.sheep.male.foot_fr"), ), left_back: ( - offset: (-1.0, -1.0, -3.5), - lateral: ("npc.sheep.male.foot_l"), + offset: (-1.0, -1.5, -5.5), + lateral: ("npc.sheep.male.foot_bl"), ), right_back: ( - offset: (-1.0, -1.0, -3.5), - lateral: ("npc.sheep.male.foot_r"), + offset: (-1.0, -1.5, -5.5), + lateral: ("npc.sheep.male.foot_br"), ), ), (Sheep, Female): ( left_front: ( - offset: (-1.0, -1.0, -3.5), - lateral: ("npc.sheep.female.foot_l"), + offset: (-1.0, -1.5, -5.0), + lateral: ("npc.sheep.female.foot_fl"), ), right_front: ( - offset: (-1.0, -1.0, -3.5), - lateral: ("npc.sheep.female.foot_r"), + offset: (-1.0, -1.5, -5.0), + lateral: ("npc.sheep.female.foot_fr"), ), left_back: ( - offset: (-1.0, -1.0, -3.5), - lateral: ("npc.sheep.female.foot_l"), + offset: (-1.0, -1.5, -5.5), + lateral: ("npc.sheep.female.foot_bl"), ), right_back: ( - offset: (-1.0, -1.0, -3.5), - lateral: ("npc.sheep.female.foot_r"), + offset: (-1.0, -1.5, -5.5), + lateral: ("npc.sheep.female.foot_br"), ), ), (Boar, Male): ( left_front: ( - offset: (-1.5, -3.5, -4.0), + offset: (-1.5, -2.5, -4.0), lateral: ("npc.boar.male.foot_fl"), ), right_front: ( @@ -121,11 +121,11 @@ lateral: ("npc.boar.male.foot_fr"), ), left_back: ( - offset: (-1.5, -2.5, -6.0), + offset: (-1.5, -2.0, -7.0), lateral: ("npc.boar.male.foot_bl"), ), right_back: ( - offset: (-1.5, -2.5, -6.0), + offset: (-1.5, -2.0, -7.0), lateral: ("npc.boar.male.foot_br"), ), ), @@ -140,21 +140,21 @@ lateral: ("npc.boar.female.foot_fr"), ), left_back: ( - offset: (-1.5, -2.5, -6.0), + offset: (-1.5, -2.0, -7.0), lateral: ("npc.boar.female.foot_bl"), ), right_back: ( - offset: (-1.5, -2.5, -6.0), + offset: (-1.5, -2.0, -7.0), lateral: ("npc.boar.female.foot_br"), ), ), (Jackalope, Male): ( left_front: ( - offset: (-1.5, -3.5, -4.0), + offset: (-1.0, -2.0, -4.0), lateral: ("npc.jackalope.male.foot_fl"), ), right_front: ( - offset: (-1.5, -3.5, -4.0), + offset: (-1.0, -2.0, -4.0), lateral: ("npc.jackalope.male.foot_fr"), ), left_back: ( @@ -169,11 +169,11 @@ (Jackalope, Female): ( left_front: ( - offset: (-1.5, -2.5, -4.0), + offset: (-1.0, -2.0, -4.0), lateral: ("npc.jackalope.male.foot_fl"), ), right_front: ( - offset: (-1.5, -2.5, -4.0), + offset: (-1.0, -2.0, -4.0), lateral: ("npc.jackalope.male.foot_fr"), ), left_back: ( @@ -187,11 +187,11 @@ ), (Skunk, Male): ( left_front: ( - offset: (-1.0, -1.0, -3.5), + offset: (-1.5, -2.0, -4.5), lateral: ("npc.skunk.male.foot_fl"), ), right_front: ( - offset: (-1.0, -1.0, -3.5), + offset: (-1.5, -2.0, -4.5), lateral: ("npc.skunk.male.foot_fr"), ), left_back: ( @@ -206,244 +206,244 @@ (Skunk, Female): ( left_front: ( - offset: (-1.0, -1.0, -3.5), + offset: (-1.5, -2.0, -4.5), lateral: ("npc.skunk.male.foot_fl"), ), right_front: ( - offset: (-1.0, -1.0, -3.5), + offset: (-1.5, -2.0, -4.5), lateral: ("npc.skunk.male.foot_fr"), ), left_back: ( - offset: (-1.0, -1.0, -3.5), + offset: (-1.5, -2.0, -4.5), lateral: ("npc.skunk.male.foot_bl"), ), right_back: ( - offset: (-1.0, -1.0, -3.5), + offset: (-1.5, -2.0, -4.5), lateral: ("npc.skunk.male.foot_br"), ), ), (Cat, Male): ( left_front: ( - offset: (-1.0, -1.5, -3.0), + offset: (-1.0, -1.5, -5.0), lateral: ("npc.cat.male.foot_fl"), ), right_front: ( - offset: (-1.0, -1.5, -3.0), + offset: (-1.0, -1.5, -5.0), lateral: ("npc.cat.male.foot_fr"), ), left_back: ( - offset: (-1.0, -2.0, -3.0), + offset: (-1.0, -1.5, -5.0), lateral: ("npc.cat.male.foot_bl"), ), right_back: ( - offset: (-1.0, -2.0, -3.0), + offset: (-1.0, -1.5, -5.0), lateral: ("npc.cat.male.foot_br"), ), ), (Cat, Female): ( left_front: ( - offset: (-1.0, -1.5, -3.0), + offset: (-1.0, -1.5, -5.0), lateral: ("npc.cat.female.foot_fl"), ), right_front: ( - offset: (-1.0, -1.5, -3.0), + offset: (-1.0, -1.5, -5.0), lateral: ("npc.cat.female.foot_fr"), ), left_back: ( - offset: (-1.0, -2.0, -3.0), + offset: (-1.0, -1.5, -5.0), lateral: ("npc.cat.female.foot_bl"), ), right_back: ( - offset: (-1.0, -2.0, -3.0), + offset: (-1.0, -1.5, -5.0), lateral: ("npc.cat.female.foot_br"), ), ), (Batfox, Male): ( left_front: ( - offset: (-1.0, -1.5, -3.0), + offset: (-2.0, -2.5, -5.0), lateral: ("npc.batfox.male.foot_fl"), ), right_front: ( - offset: (-1.0, -1.5, -3.0), + offset: (-2.0, -2.5, -5.0), lateral: ("npc.batfox.male.foot_fr"), ), left_back: ( - offset: (-1.0, -2.5, -3.5), + offset: (-1.5, -2.0, -5.0), lateral: ("npc.batfox.male.foot_bl"), ), right_back: ( - offset: (-1.0, -2.5, -3.5), + offset: (-1.5, -2.0, -5.0), lateral: ("npc.batfox.male.foot_br"), ), ), (Batfox, Female): ( left_front: ( - offset: (-1.0, -1.5, -2.5), + offset: (-2.0, -2.5, -5.0), lateral: ("npc.batfox.male.foot_fl"), ), right_front: ( - offset: (-1.0, -1.5, -2.5), + offset: (-2.0, -2.5, -5.0), lateral: ("npc.batfox.male.foot_fr"), ), left_back: ( - offset: (-1.0, -2.5, -3.5), + offset: (-1.5, -2.0, -5.0), lateral: ("npc.batfox.male.foot_bl"), ), right_back: ( - offset: (-1.0, -2.5, -3.5), + offset: (-1.5, -2.0, -5.0), lateral: ("npc.batfox.male.foot_br"), ), ), (Raccoon, Male): ( left_front: ( - offset: (-0.5, -0.5, -2.5), + offset: (-1.5, -2.0, -5.5), lateral: ("npc.raccoon.male.foot_fl"), ), right_front: ( - offset: (-0.5, -0.5, -2.5), + offset: (-1.5, -2.0, -5.5), lateral: ("npc.raccoon.male.foot_fr"), ), left_back: ( - offset: (-1.0, -1.5, -2.5), + offset: (-2.0, -2.5, -6.0), lateral: ("npc.raccoon.male.foot_bl"), ), right_back: ( - offset: (-1.0, -1.5, -2.5), + offset: (-2.0, -2.5, -6.0), lateral: ("npc.raccoon.male.foot_br"), ), ), (Raccoon, Female): ( left_front: ( - offset: (-0.5, -0.5, -2.5), + offset: (-1.5, -2.0, -5.5), lateral: ("npc.raccoon.male.foot_fl"), ), right_front: ( - offset: (-0.5, -0.5, -2.5), + offset: (-1.5, -2.0, -5.5), lateral: ("npc.raccoon.male.foot_fr"), ), left_back: ( - offset: (-1.0, -1.5, -2.5), + offset: (-2.0, -2.5, -6.0), lateral: ("npc.raccoon.male.foot_bl"), ), right_back: ( - offset: (-1.0, -1.5, -2.5), + offset: (-2.0, -2.5, -6.0), lateral: ("npc.raccoon.male.foot_br"), ), ), (Quokka, Male): ( left_front: ( - offset: (-1.0, -1.0, -2.5), + offset: (-1.0, -1.5, -5.5), lateral: ("npc.quokka.male.foot_fl"), ), right_front: ( - offset: (-1.0, -1.0, -2.5), + offset: (-1.0, -1.5, -5.5), lateral: ("npc.quokka.male.foot_fr"), ), left_back: ( - offset: (-1.0, -1.5, -2.5), + offset: (-1.0, -2.5, -5.5), lateral: ("npc.quokka.male.foot_bl"), ), right_back: ( - offset: (-1.0, -1.5, -2.5), + offset: (-1.0, -2.5, -5.5), lateral: ("npc.quokka.male.foot_br"), ), ), (Quokka, Female): ( left_front: ( - offset: (-1.0, -1.0, -2.5), + offset: (-1.0, -1.5, -5.5), lateral: ("npc.quokka.male.foot_fl"), ), right_front: ( - offset: (-1.0, -1.0, -2.5), + offset: (-1.0, -1.5, -5.5), lateral: ("npc.quokka.male.foot_fr"), ), left_back: ( - offset: (-1.0, -1.5, -2.5), + offset: (-1.0, -2.5, -5.5), lateral: ("npc.quokka.male.foot_bl"), ), right_back: ( - offset: (-1.0, -1.5, -2.5), + offset: (-1.0, -2.5, -5.5), lateral: ("npc.quokka.male.foot_br"), ), ), (Dodarock, Male): ( left_front: ( - offset: (-2.0, -3.0, -4.0), + offset: (-2.0, -3.0, -6.5), lateral: ("npc.dodarock.male.foot_fl"), ), right_front: ( - offset: (-2.0, -3.0, -4.0), + offset: (-2.0, -3.0, -6.5), lateral: ("npc.dodarock.male.foot_fr"), ), left_back: ( - offset: (-1.5, -2.0, -2.5), + offset: (-1.5, -2.0, -5.0), lateral: ("npc.dodarock.male.foot_bl"), ), right_back: ( - offset: (-1.5, -2.0, -2.5), + offset: (-1.5, -2.0, -5.0), lateral: ("npc.dodarock.male.foot_br"), ), ), (Dodarock, Female): ( left_front: ( - offset: (-2.0, -3.0, -4.0), + offset: (-2.0, -3.0, -6.5), lateral: ("npc.dodarock.male.foot_fl"), ), right_front: ( - offset: (-2.0, -3.0, -4.0), + offset: (-2.0, -3.0, -6.5), lateral: ("npc.dodarock.male.foot_fr"), ), left_back: ( - offset: (-1.5, -2.0, -2.5), + offset: (-1.5, -2.0, -5.0), lateral: ("npc.dodarock.male.foot_bl"), ), right_back: ( - offset: (-1.5, -2.0, -2.5), + offset: (-1.5, -2.0, -5.0), lateral: ("npc.dodarock.male.foot_br"), ), ), (Holladon, Male): ( left_front: ( - offset: (-1.0, -3.0, -4.0), + offset: (-1.0, -2.5, -6.0), lateral: ("npc.holladon.male.foot_fl"), ), right_front: ( - offset: (-1.0, -3.0, -4.0), + offset: (-1.0, -2.5, -6.0), lateral: ("npc.holladon.male.foot_fr"), ), left_back: ( - offset: (-1.0, -2.0, -2.5), + offset: (-1.0, -2.0, -5.5), lateral: ("npc.holladon.male.foot_bl"), ), right_back: ( - offset: (-1.0, -2.0, -2.5), + offset: (-1.0, -2.0, -5.5), lateral: ("npc.holladon.male.foot_br"), ), ), (Holladon, Female): ( left_front: ( - offset: (-1.0, -2.0, -2.5), + offset: (-1.0, -2.5, -6.0), lateral: ("npc.holladon.male.foot_fl"), ), right_front: ( - offset: (-1.0, -2.0, -2.5), + offset: (-1.0, -2.5, -6.0), lateral: ("npc.holladon.male.foot_fr"), ), left_back: ( - offset: (-1.0, -2.0, -2.5), + offset: (-1.0, -2.0, -5.5), lateral: ("npc.holladon.male.foot_bl"), ), right_back: ( - offset: (-1.0, -2.0, -2.5), + offset: (-1.0, -2.0, -5.5), lateral: ("npc.holladon.male.foot_br"), ), ), diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index ce01809f80..56579e72c3 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -31,7 +31,7 @@ impl Body { pub fn base_accel(&self) -> f32 { match self { Body::Humanoid(_) => 100.0, - Body::QuadrupedSmall(_) => 85.0, + Body::QuadrupedSmall(_) => 125.0, Body::QuadrupedMedium(_) => 180.0, Body::BirdMedium(_) => 80.0, Body::FishMedium(_) => 50.0, diff --git a/voxygen/src/anim/src/critter/idle.rs b/voxygen/src/anim/src/critter/idle.rs index 50a85945cc..22708a480d 100644 --- a/voxygen/src/anim/src/critter/idle.rs +++ b/voxygen/src/anim/src/critter/idle.rs @@ -58,8 +58,7 @@ impl Animation for IdleAnimation { next.feet_b.ori = Quaternion::rotation_x(0.0); next.feet_b.scale = Vec3::one(); - next.tail.offset = - Vec3::new(0.0, skeleton_attr.tail.0 + wave * 0.2, skeleton_attr.tail.1); + next.tail.offset = Vec3::new(0.0, skeleton_attr.tail.0 + wave * 0.2, skeleton_attr.tail.1); next.tail.ori = Quaternion::rotation_y(wave_slow * 0.05); next.tail.scale = Vec3::one(); diff --git a/voxygen/src/anim/src/critter/run.rs b/voxygen/src/anim/src/critter/run.rs index 9712445494..120277f76b 100644 --- a/voxygen/src/anim/src/critter/run.rs +++ b/voxygen/src/anim/src/critter/run.rs @@ -46,8 +46,7 @@ impl Animation for RunAnimation { next.feet_b.ori = Quaternion::rotation_x(wave_cos * 1.0); next.feet_b.scale = Vec3::one(); - next.tail.offset = - Vec3::new(0.0, skeleton_attr.tail.0 + wave * 1.0, skeleton_attr.tail.1); + next.tail.offset = Vec3::new(0.0, skeleton_attr.tail.0 + wave * 1.0, skeleton_attr.tail.1); next.tail.ori = Quaternion::rotation_y(wave_slow * 0.08); next.tail.scale = Vec3::one(); diff --git a/voxygen/src/anim/src/dragon/mod.rs b/voxygen/src/anim/src/dragon/mod.rs index a49446e606..5a4ec4bbf5 100644 --- a/voxygen/src/anim/src/dragon/mod.rs +++ b/voxygen/src/anim/src/dragon/mod.rs @@ -79,8 +79,16 @@ impl Skeleton for DragonSkeleton { ), FigureBoneData::new(chest_front_mat * self.foot_fl.compute_base_matrix()), FigureBoneData::new(chest_front_mat * self.foot_fr.compute_base_matrix()), - FigureBoneData::new(chest_front_mat * self.chest_rear.compute_base_matrix() * self.foot_bl.compute_base_matrix()), - FigureBoneData::new(chest_front_mat * self.chest_rear.compute_base_matrix() * self.foot_br.compute_base_matrix()), + FigureBoneData::new( + chest_front_mat + * self.chest_rear.compute_base_matrix() + * self.foot_bl.compute_base_matrix(), + ), + FigureBoneData::new( + chest_front_mat + * self.chest_rear.compute_base_matrix() + * self.foot_br.compute_base_matrix(), + ), FigureBoneData::default(), ], Vec3::default(), diff --git a/voxygen/src/anim/src/dragon/run.rs b/voxygen/src/anim/src/dragon/run.rs index 343578127e..255349dd7a 100644 --- a/voxygen/src/anim/src/dragon/run.rs +++ b/voxygen/src/anim/src/dragon/run.rs @@ -26,8 +26,7 @@ impl Animation for RunAnimation { let short = (((1.0) / (0.72 + 0.28 - * ((anim_time as f32 * 16.0 * lab as f32+ PI * 1.0).sin()) - .powf(2.0 as f32))) + * ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.0).sin()).powf(2.0 as f32))) .sqrt()) * ((anim_time as f32 * 16.0 * lab as f32 + PI * 1.0).sin()); @@ -36,7 +35,7 @@ impl Animation for RunAnimation { let shortalt = (anim_time as f32 * 16.0 * lab as f32 + PI * 0.5).sin(); let footvert = (anim_time as f32 * 16.0 * lab as f32 + PI * 0.0).sin(); - let footvertt = (anim_time as f32 * 16.0 * lab as f32 + PI * 0.4).sin(); + let footvertt = (anim_time as f32 * 16.0 * lab as f32 + PI * 0.4).sin(); let footvertalt = (anim_time as f32 * 16.0 * lab as f32 + PI * 1.2).sin(); let footverttalt = (anim_time as f32 * 16.0 * lab as f32 + PI * 1.6).sin(); @@ -87,18 +86,18 @@ impl Animation for RunAnimation { let centeroffset = (anim_time as f32 * lab as f32 + PI * 1.5).sin(); next.head_upper.offset = - Vec3::new(0.0, skeleton_attr.head_upper.0, skeleton_attr.head_upper.1); - next.head_upper.ori = Quaternion::rotation_x(short * -0.03 - 0.1) - * Quaternion::rotation_z(tilt * -1.2) - * Quaternion::rotation_y(tilt * 0.8); - next.head_upper.scale = Vec3::one(); + Vec3::new(0.0, skeleton_attr.head_upper.0, skeleton_attr.head_upper.1); + next.head_upper.ori = Quaternion::rotation_x(short * -0.03 - 0.1) + * Quaternion::rotation_z(tilt * -1.2) + * Quaternion::rotation_y(tilt * 0.8); + next.head_upper.scale = Vec3::one(); - next.head_lower.offset = - Vec3::new(0.0, skeleton_attr.head_lower.0, skeleton_attr.head_lower.1); - next.head_lower.ori = Quaternion::rotation_z(tilt * -0.8) - * Quaternion::rotation_x(short * -0.05) - * Quaternion::rotation_y(tilt * 0.3); - next.head_lower.scale = Vec3::one() * 1.02; + next.head_lower.offset = + Vec3::new(0.0, skeleton_attr.head_lower.0, skeleton_attr.head_lower.1); + next.head_lower.ori = Quaternion::rotation_z(tilt * -0.8) + * Quaternion::rotation_x(short * -0.05) + * Quaternion::rotation_y(tilt * 0.3); + next.head_lower.scale = Vec3::one() * 1.02; next.jaw.offset = Vec3::new( 0.0, @@ -129,7 +128,8 @@ impl Animation for RunAnimation { next.chest_front.offset = Vec3::new( 0.0, skeleton_attr.chest_front.0, - skeleton_attr.chest_front.1 + shortalt * 2.5 + x_tilt * 10.0,); + skeleton_attr.chest_front.1 + shortalt * 2.5 + x_tilt * 10.0, + ); next.chest_front.ori = Quaternion::rotation_x(short * 0.13 + x_tilt) * Quaternion::rotation_y(0.0) * Quaternion::rotation_z(tilt * -1.5); diff --git a/voxygen/src/anim/src/quadruped_small/idle.rs b/voxygen/src/anim/src/quadruped_small/idle.rs index 2e23f6b3c3..d32c14a128 100644 --- a/voxygen/src/anim/src/quadruped_small/idle.rs +++ b/voxygen/src/anim/src/quadruped_small/idle.rs @@ -22,7 +22,6 @@ impl Animation for IdleAnimation { let mut next = (*skeleton).clone(); let slow = (anim_time as f32 * 3.5).sin(); - let slowa = (anim_time as f32 * 3.5 + PI / 2.0).sin(); let slow_alt = (anim_time as f32 * 3.5 + PI).sin(); @@ -39,50 +38,51 @@ impl Animation for IdleAnimation { * 0.25, ); - next.head.offset = - Vec3::new(0.0, skeleton_attr.head.0, skeleton_attr.head.1 + slow * 0.2); + next.head.offset = Vec3::new(0.0, skeleton_attr.head.0, skeleton_attr.head.1 + slow * 0.2); next.head.ori = Quaternion::rotation_z(head_look.x) * Quaternion::rotation_x(head_look.y + slow_alt * 0.03); next.head.scale = Vec3::one(); - next.chest.offset = Vec3::new( - slow * 0.05, - skeleton_attr.chest.0, - skeleton_attr.chest.1 + slowa * 0.2, - ) / 11.0; + next.chest.offset = Vec3::new(slow * 0.05, skeleton_attr.chest.0, skeleton_attr.chest.1) + / 11.0 + * skeleton_attr.scaler; next.chest.ori = Quaternion::rotation_y(slow * 0.05); - next.chest.scale = Vec3::one() / 11.0; + next.chest.scale = Vec3::one() / 11.0 * skeleton_attr.scaler; next.leg_fl.offset = Vec3::new( -skeleton_attr.feet_f.0, skeleton_attr.feet_f.1, - skeleton_attr.feet_f.2, + skeleton_attr.feet_f.2 + slow * -0.2, ); - next.leg_fl.ori = Quaternion::rotation_x(slow * 0.08); + next.leg_fl.ori = + Quaternion::rotation_x(slow * 0.03) * Quaternion::rotation_y(slow * -0.05); next.leg_fl.scale = Vec3::one(); next.leg_fr.offset = Vec3::new( skeleton_attr.feet_f.0, skeleton_attr.feet_f.1, - skeleton_attr.feet_f.2, + skeleton_attr.feet_f.2 + slow * 0.2, ); - next.leg_fr.ori = Quaternion::rotation_x(slow_alt * 0.08); + next.leg_fr.ori = + Quaternion::rotation_x(slow_alt * 0.03) * Quaternion::rotation_y(slow * -0.05); next.leg_fr.scale = Vec3::one(); next.leg_bl.offset = Vec3::new( -skeleton_attr.feet_b.0, skeleton_attr.feet_b.1, - skeleton_attr.feet_b.2, + skeleton_attr.feet_b.2 + slow * -0.2, ); - next.leg_bl.ori = Quaternion::rotation_x(slow_alt * 0.08); + next.leg_bl.ori = + Quaternion::rotation_x(slow_alt * 0.03) * Quaternion::rotation_y(slow * -0.05); next.leg_bl.scale = Vec3::one(); next.leg_br.offset = Vec3::new( skeleton_attr.feet_b.0, skeleton_attr.feet_b.1, - skeleton_attr.feet_b.2, + skeleton_attr.feet_b.2 + slow * 0.2, ); - next.leg_br.ori = Quaternion::rotation_x(slow * 0.08); + next.leg_br.ori = + Quaternion::rotation_x(slow * 0.03) * Quaternion::rotation_y(slow * -0.05); next.leg_br.scale = Vec3::one(); next.tail.offset = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1); diff --git a/voxygen/src/anim/src/quadruped_small/mod.rs b/voxygen/src/anim/src/quadruped_small/mod.rs index f5bb4cb613..a9104211b1 100644 --- a/voxygen/src/anim/src/quadruped_small/mod.rs +++ b/voxygen/src/anim/src/quadruped_small/mod.rs @@ -75,6 +75,11 @@ pub struct SkeletonAttr { feet_f: (f32, f32, f32), feet_b: (f32, f32, f32), tail: (f32, f32), + scaler: f32, + tempo: f32, + maximize: f32, + minimize: f32, + spring: f32, } impl<'a> std::convert::TryFrom<&'a comp::Body> for SkeletonAttr { type Error = (); @@ -95,6 +100,11 @@ impl Default for SkeletonAttr { feet_f: (0.0, 0.0, 0.0), feet_b: (0.0, 0.0, 0.0), tail: (0.0, 0.0), + scaler: 0.0, + tempo: 0.0, + maximize: 0.0, + minimize: 0.0, + spring: 0.0, } } } @@ -105,78 +115,153 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { Self { head: match (body.species, body.body_type) { (Pig, _) => (5.0, 2.0), - (Fox, _) => (7.0, 3.0), - (Sheep, _) => (9.0, 3.0), - (Boar, _) => (12.0, 3.0), - (Jackalope, _) => (5.0, 4.0), - (Skunk, _) => (6.0, 4.0), - (Cat, _) => (6.0, 3.0), - (Batfox, _) => (7.0, 4.0), - (Raccoon, _) => (8.0, 2.0), - (Quokka, _) => (9.0, 5.0), - (Dodarock, _) => (7.0, 4.0), - (Holladon, _) => (7.0, 3.0), + (Fox, _) => (4.0, 3.0), + (Sheep, _) => (4.0, 4.0), + (Boar, _) => (7.0, 0.0), + (Jackalope, _) => (3.0, 2.0), + (Skunk, _) => (5.0, 1.5), + (Cat, _) => (4.0, 3.0), + (Batfox, _) => (5.0, 1.0), + (Raccoon, _) => (5.0, 2.0), + (Quokka, _) => (6.0, 2.0), + (Dodarock, _) => (6.0, -2.0), + (Holladon, _) => (7.0, 1.0), (Hyena, _) => (7.5, 2.0), }, chest: match (body.species, body.body_type) { (Pig, _) => (0.0, 7.0), - (Fox, _) => (0.0, 5.0), - (Sheep, _) => (-1.0, 6.0), - (Boar, _) => (0.0, 8.5), + (Fox, _) => (0.0, 8.0), + (Sheep, _) => (2.0, 7.0), + (Boar, _) => (0.0, 9.5), (Jackalope, _) => (-2.0, 6.0), (Skunk, _) => (0.0, 6.0), (Cat, _) => (0.0, 6.0), (Batfox, _) => (-2.0, 6.0), - (Raccoon, _) => (0.0, 6.0), - (Quokka, _) => (2.0, 8.0), - (Dodarock, _) => (-2.0, 8.0), - (Holladon, _) => (-2.0, 6.0), + (Raccoon, _) => (0.0, 5.5), + (Quokka, _) => (2.0, 6.5), + (Dodarock, _) => (-2.0, 9.0), + (Holladon, _) => (-2.0, 9.0), (Hyena, _) => (-2.0, 9.0), }, feet_f: match (body.species, body.body_type) { - (Pig, _) => (3.5, 3.0, -5.5), - (Fox, _) => (2.5, 3.0, -2.0), - (Sheep, _) => (3.5, 2.0, -2.5), - (Boar, _) => (3.5, 4.0, -4.5), - (Jackalope, _) => (2.0, 4.0, -2.0), - (Skunk, _) => (2.0, 2.0, -2.0), - (Cat, _) => (2.0, 4.0, -3.0), - (Batfox, _) => (1.5, 4.0, -3.0), - (Raccoon, _) => (2.0, 4.0, -3.0), - (Quokka, _) => (2.0, 4.0, -3.0), - (Dodarock, _) => (2.5, 4.0, -2.0), - (Holladon, _) => (2.0, 4.0, -2.0), - (Hyena, _) => (2.5, 4.0, -4.0), + (Pig, _) => (4.5, 3.0, -2.0), + (Fox, _) => (3.0, 5.0, -5.0), + (Sheep, _) => (3.5, 2.0, -2.0), + (Boar, _) => (3.5, 6.0, -5.5), + (Jackalope, _) => (3.0, 4.0, -2.0), + (Skunk, _) => (3.5, 4.0, -1.0), + (Cat, _) => (2.0, 4.0, -1.0), + (Batfox, _) => (3.0, 4.0, -0.5), + (Raccoon, _) => (4.0, 4.0, -0.0), + (Quokka, _) => (3.0, 4.0, -1.0), + (Dodarock, _) => (5.0, 5.0, -2.5), + (Holladon, _) => (5.0, 4.0, -2.5), + (Hyena, _) => (2.5, 5.0, -4.0), }, feet_b: match (body.species, body.body_type) { - (Pig, _) => (2.0, -2.0, -5.5), - (Fox, _) => (1.5, -2.0, -1.0), - (Sheep, _) => (3.5, -4.0, -2.5), - (Boar, _) => (2.0, -3.0, -2.5), - (Jackalope, _) => (2.0, -2.0, 0.0), - (Skunk, _) => (1.0, -4.0, -2.5), - (Cat, _) => (1.5, -2.0, -3.0), - (Batfox, _) => (2.0, -2.0, -2.5), - (Raccoon, _) => (2.5, -2.0, -3.5), - (Quokka, _) => (2.5, -4.0, -3.5), - (Dodarock, _) => (2.0, -3.0, -5.5), - (Holladon, _) => (3.5, -2.0, -3.5), + (Pig, _) => (3.5, -2.0, -1.5), + (Fox, _) => (3.0, -3.0, -5.0), + (Sheep, _) => (3.5, -3.5, -2.0), + (Boar, _) => (3.0, -3.0, -2.5), + (Jackalope, _) => (3.5, -2.0, 0.0), + (Skunk, _) => (3.5, -4.0, -1.5), + (Cat, _) => (2.0, -3.5, -1.0), + (Batfox, _) => (3.5, -2.0, -0.5), + (Raccoon, _) => (4.5, -3.0, 0.5), + (Quokka, _) => (4.0, -4.0, -1.0), + (Dodarock, _) => (3.5, -3.0, -4.0), + (Holladon, _) => (4.0, -2.0, -3.0), (Hyena, _) => (3.0, -5.0, -4.5), }, tail: match (body.species, body.body_type) { - (Pig, _) => (-4.0, 3.0), - (Fox, _) => (-3.5, 1.0), + (Pig, _) => (-4.5, 2.5), + (Fox, _) => (-4.5, 2.0), (Sheep, _) => (-5.0, 0.0), - (Boar, _) => (-8.5, 2.0), - (Jackalope, _) => (0.0, 5.0), + (Boar, _) => (-6.0, 0.0), + (Jackalope, _) => (-4.0, 2.0), (Skunk, _) => (-3.0, 1.5), - (Cat, _) => (-3.0, 2.0), + (Cat, _) => (-3.5, 2.0), (Batfox, _) => (0.0, 5.0), (Raccoon, _) => (-4.0, 1.0), - (Quokka, _) => (0.0, 6.0), + (Quokka, _) => (-6.0, 1.0), (Dodarock, _) => (0.0, 5.0), - (Holladon, _) => (0.0, 4.0), - (Hyena, _) => (-8.0, 1.0), + (Holladon, _) => (-1.0, 4.0), + (Hyena, _) => (-7.0, 0.0), + }, + scaler: match (body.species, body.body_type) { + (Pig, _) => (0.9), + (Fox, _) => (0.9), + (Sheep, _) => (1.0), + (Boar, _) => (1.1), + (Jackalope, _) => (0.8), + (Skunk, _) => (0.9), + (Cat, _) => (0.8), + (Batfox, _) => (1.1), + (Raccoon, _) => (1.0), + (Quokka, _) => (1.0), + (Dodarock, _) => (1.2), + (Holladon, _) => (1.4), + (Hyena, _) => (0.8), + }, + tempo: match (body.species, body.body_type) { + (Pig, _) => (1.0), + (Fox, _) => (1.0), + (Sheep, _) => (1.0), + (Boar, _) => (1.1), + (Jackalope, _) => (1.0), + (Skunk, _) => (1.0), + (Cat, _) => (1.1), + (Batfox, _) => (1.0), + (Raccoon, _) => (1.0), + (Quokka, _) => (1.2), + (Dodarock, _) => (1.0), + (Holladon, _) => (1.0), + (Hyena, _) => (1.1), + }, + maximize: match (body.species, body.body_type) { + (Pig, _) => (1.0), + (Fox, _) => (1.3), + (Sheep, _) => (1.1), + (Boar, _) => (1.4), + (Jackalope, _) => (1.0), + (Skunk, _) => (1.0), + (Cat, _) => (1.0), + (Batfox, _) => (1.0), + (Raccoon, _) => (1.0), + (Quokka, _) => (1.0), + (Dodarock, _) => (1.0), + (Holladon, _) => (1.0), + (Hyena, _) => (1.4), + }, + minimize: match (body.species, body.body_type) { + (Pig, _) => (0.6), + (Fox, _) => (1.3), + (Sheep, _) => (0.8), + (Boar, _) => (1.0), + (Jackalope, _) => (1.0), + (Skunk, _) => (0.9), + (Cat, _) => (0.8), + (Batfox, _) => (1.0), + (Raccoon, _) => (1.0), + (Quokka, _) => (0.9), + (Dodarock, _) => (0.9), + (Holladon, _) => (0.7), + (Hyena, _) => (1.4), + }, + spring: match (body.species, body.body_type) { + (Pig, _) => (1.0), + (Fox, _) => (1.0), + (Sheep, _) => (1.2), + (Boar, _) => (0.8), + (Jackalope, _) => (2.2), + (Skunk, _) => (1.0), + (Cat, _) => (1.4), + (Batfox, _) => (1.1), + (Raccoon, _) => (1.1), + (Quokka, _) => (1.3), + (Dodarock, _) => (0.9), + (Holladon, _) => (0.7), + (Hyena, _) => (1.4), }, } } diff --git a/voxygen/src/anim/src/quadruped_small/run.rs b/voxygen/src/anim/src/quadruped_small/run.rs index 81812915c1..861c295211 100644 --- a/voxygen/src/anim/src/quadruped_small/run.rs +++ b/voxygen/src/anim/src/quadruped_small/run.rs @@ -14,46 +14,24 @@ impl Animation for RunAnimation { #[cfg_attr(feature = "be-dyn-lib", export_name = "quadruped_small_run")] fn update_skeleton_inner( skeleton: &Self::Skeleton, - (velocity, orientation, last_ori, _global_time, avg_vel): Self::Dependency, + (_velocity, orientation, last_ori, _global_time, avg_vel): Self::Dependency, anim_time: f64, _rate: &mut f32, skeleton_attr: &SkeletonAttr, ) -> Self::Skeleton { let mut next = (*skeleton).clone(); - let speed = Vec2::::from(velocity).magnitude(); - - let slow = (anim_time as f32 * 14.0).sin(); - let fast = (anim_time as f32 * 20.0).sin(); - let fast_alt = (anim_time as f32 * 20.0 + PI / 2.0).sin(); - let slow_alt = (anim_time as f32 * 14.0 + PI / 2.0).sin(); - let x_tilt = avg_vel.z.atan2(avg_vel.xy().magnitude()).max(-0.7); - let lab = 0.6; //6 - let speedmult = if speed > 8.0 { - 1.2 * (1.0) - } else { - 0.8 * (1.0) - }; - let abssin = (((anim_time as f32 * 5.0 * speedmult + PI * 1.6).sin().abs()) - 0.2).abs().max(-0.2); - let abssint = (((anim_time as f32 * 5.0 * speedmult).sin().abs()) - 0.2).abs().max(-0.2); - let shortalt = (anim_time as f32 * 16.0 * lab as f32 * speedmult + PI * 0.5).sin(); + let speedmult = skeleton_attr.tempo; + let short = (anim_time as f32 * 20.0 * lab as f32 * speedmult + PI * 1.0).sin(); + let shortalt = (anim_time as f32 * 20.0 * lab as f32 * speedmult + PI * 0.5).sin(); let footvert = (anim_time as f32 * 20.0 * lab as f32 * speedmult + PI * 0.0).sin(); let footvertt = (anim_time as f32 * 20.0 * lab as f32 * speedmult + PI * 0.4).sin(); - let footvertalt = (anim_time as f32 * 20.0 * lab as f32 * speedmult + PI * 1.2).sin(); - let footverttalt = (anim_time as f32 * 20.0 * lab as f32 * speedmult + PI * 1.6).sin(); let footvertf = (anim_time as f32 * 20.0 * lab as f32 * speedmult + PI * 0.3).sin(); let footverttf = (anim_time as f32 * 20.0 * lab as f32 * speedmult + PI * 0.7).sin(); - let footvertaltf = (anim_time as f32 * 20.0 * lab as f32 * speedmult + PI * 1.5).sin(); - let footverttaltf = (anim_time as f32 * 20.0 * lab as f32 * speedmult + PI * 1.9).sin(); - - let footvertfslow = (anim_time as f32 * 20.0 * lab as f32 * speedmult + PI * 0.6).sin(); - let footverttfslow = (anim_time as f32 * 20.0 * lab as f32 * speedmult + PI * 1.0).sin(); - let footvertaltfslow = (anim_time as f32 * 20.0 * lab as f32 * speedmult + PI * 1.8).sin(); - let footverttaltfslow = (anim_time as f32 * 20.0 * lab as f32 * speedmult + PI * 2.2).sin(); let ori: Vec2 = Vec2::from(orientation); let last_ori = Vec2::from(last_ori); @@ -70,9 +48,8 @@ impl Animation for RunAnimation { } * 1.3; let x_tilt = avg_vel.z.atan2(avg_vel.xy().magnitude()); - next.head.offset = - Vec3::new(0.0, skeleton_attr.head.0, skeleton_attr.head.1 + abssint * 2.0); - next.head.ori = Quaternion::rotation_x(0.2 + slow * 0.05 + x_tilt * -0.5) + next.head.offset = Vec3::new(0.0, skeleton_attr.head.0, skeleton_attr.head.1); + next.head.ori = Quaternion::rotation_x(x_tilt * -0.5 + short * -0.2) * Quaternion::rotation_y(tilt * 0.8) * Quaternion::rotation_z(tilt * -1.2); next.head.scale = Vec3::one(); @@ -80,55 +57,60 @@ impl Animation for RunAnimation { next.chest.offset = Vec3::new( 0.0, skeleton_attr.chest.0, - skeleton_attr.chest.1 + abssin * 8.0 + x_tilt * 6.0, - ) / 11.0; - next.chest.ori = Quaternion::rotation_x(abssin * 0.5 - 0.2 + x_tilt) - * Quaternion::rotation_y(tilt * 0.8) - * Quaternion::rotation_z(tilt * -1.5); - next.chest.scale = Vec3::one() / 11.0; + skeleton_attr.chest.1 + + 2.0 * skeleton_attr.spring + + shortalt * 3.0 * skeleton_attr.spring, + ) / 11.0 + * skeleton_attr.scaler; + next.chest.ori = Quaternion::rotation_x(short * 0.2 * skeleton_attr.spring + x_tilt) + * Quaternion::rotation_y(tilt * 0.8) + * Quaternion::rotation_z(tilt * -1.5); + next.chest.scale = Vec3::one() / 11.0 * skeleton_attr.scaler; next.leg_fl.offset = Vec3::new( -skeleton_attr.feet_f.0, - skeleton_attr.feet_f.1 + footvertaltf * -1.3, - skeleton_attr.feet_f.2 + 1.0 + footverttaltf * -1.9, + skeleton_attr.feet_f.1 + footverttf * 3.0 * skeleton_attr.maximize, + skeleton_attr.feet_f.2 + ((footvertf * -1.5).max(-1.0)), ); - next.leg_fl.ori = Quaternion::rotation_x(footverttaltf * -0.65) + next.leg_fl.ori = Quaternion::rotation_x(skeleton_attr.minimize * footverttf * 0.5) * Quaternion::rotation_z(tilt * -0.5) * Quaternion::rotation_y(tilt * 1.5); next.leg_fl.scale = Vec3::one() * 1.02; next.leg_fr.offset = Vec3::new( skeleton_attr.feet_f.0, - skeleton_attr.feet_f.1 + footvertaltf * -1.3, - skeleton_attr.feet_f.2 + 1.0 + footvertaltf * -1.9, + skeleton_attr.feet_f.1 + footvertt * 3.0 * skeleton_attr.minimize, + skeleton_attr.feet_f.2 + ((footvert * -1.5).max(-1.0)), ); - next.leg_fr.ori = Quaternion::rotation_x(footvertaltf * -0.65) + next.leg_fr.ori = Quaternion::rotation_x(skeleton_attr.maximize * footvertt * 0.5) * Quaternion::rotation_z(tilt * -0.5) * Quaternion::rotation_y(tilt * 1.5); next.leg_fr.scale = Vec3::one() * 1.02; next.leg_bl.offset = Vec3::new( -skeleton_attr.feet_b.0, - skeleton_attr.feet_b.1 + footvert * -1.7, - skeleton_attr.feet_b.2 + 1.0 + footvertt * -1.5, + skeleton_attr.feet_b.1 + footvertt * -1.4, + skeleton_attr.feet_b.2 + ((footvert * 1.5).max(-1.0)), ); - next.leg_bl.ori = Quaternion::rotation_x(footvertt * -0.45 - 0.2) + next.leg_bl.ori = Quaternion::rotation_x(skeleton_attr.maximize * footvertt * -0.6) * Quaternion::rotation_y(tilt * 1.5) * Quaternion::rotation_z(tilt * -1.5); next.leg_bl.scale = Vec3::one() * 1.02; next.leg_br.offset = Vec3::new( skeleton_attr.feet_b.0, - skeleton_attr.feet_b.1 + footvertt * -1.7, - skeleton_attr.feet_b.2 + 1.0 + footvertt * -1.5, + skeleton_attr.feet_b.1 + footverttf * -1.4, + skeleton_attr.feet_b.2 + ((footvertf * 1.5).max(-1.0)), ); - next.leg_br.ori = Quaternion::rotation_x(footvertt * -0.45 - 0.2) + next.leg_br.ori = Quaternion::rotation_x(skeleton_attr.maximize * footverttf * -0.6) * Quaternion::rotation_y(tilt * 1.5) * Quaternion::rotation_z(tilt * -1.5); next.leg_br.scale = Vec3::one() * 1.02; next.tail.offset = Vec3::new(0.0, skeleton_attr.tail.0, skeleton_attr.tail.1); - next.tail.ori = Quaternion::rotation_z(0.0); + next.tail.ori = Quaternion::rotation_x(short * 0.2 + x_tilt) + * Quaternion::rotation_y(tilt * 0.8) + * Quaternion::rotation_z(tilt * 1.5); next.tail.scale = Vec3::one(); next } diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index a2e139ba0c..923abac39b 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -1340,25 +1340,21 @@ impl FigureMgr { physics.in_fluid, // In water ) { // Standing - (true, false, false) => { - anim::dragon::IdleAnimation::update_skeleton( - &DragonSkeleton::new(), - time, - state.state_time, - &mut state_animation_rate, - skeleton_attr, - ) - }, + (true, false, false) => anim::dragon::IdleAnimation::update_skeleton( + &DragonSkeleton::new(), + time, + state.state_time, + &mut state_animation_rate, + skeleton_attr, + ), // Running - (true, true, false) => { - anim::dragon::RunAnimation::update_skeleton( - &DragonSkeleton::new(), - (vel.0.magnitude(), ori, state.last_ori, time, state.avg_vel), - state.state_time, - &mut state_animation_rate, - skeleton_attr, - ) - }, + (true, true, false) => anim::dragon::RunAnimation::update_skeleton( + &DragonSkeleton::new(), + (vel.0.magnitude(), ori, state.last_ori, time, state.avg_vel), + state.state_time, + &mut state_animation_rate, + skeleton_attr, + ), // In air (false, _, false) => anim::dragon::FlyAnimation::update_skeleton( &DragonSkeleton::new(),