diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json index 2484cb4486..fb5f7b2a76 100644 --- a/assets/common/npc_names.json +++ b/assets/common/npc_names.json @@ -291,9 +291,9 @@ "keyword": "deer", "generic": "Deer" }, - "hirdrassil": { - "keyword": "hirdrassil", - "generic": "Hirdrassil" + "hirdrasil": { + "keyword": "hirdrasil", + "generic": "Hirdrasil" } } }, diff --git a/assets/voxygen/voxel/npc/catoblepas/male/foot_fl.vox b/assets/voxygen/voxel/npc/catoblepas/male/foot_fl.vox index 0bb861a008..2378aa6d83 100644 --- a/assets/voxygen/voxel/npc/catoblepas/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/catoblepas/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36cd396b6676ebae90614b0b23b6234768cbf3feec21e89e9d7af1c1cf748365 -size 1984 +oid sha256:f852128a1b1dda0f6c0f0b3574070360366dcc121f758c8dd57428a7bd14a8b0 +size 1968 diff --git a/assets/voxygen/voxel/npc/catoblepas/male/foot_fr.vox b/assets/voxygen/voxel/npc/catoblepas/male/foot_fr.vox index e5b4696b11..e2ce2d13f5 100644 --- a/assets/voxygen/voxel/npc/catoblepas/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/catoblepas/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:299eaedeee8acb0b4e0ff9a6b7ab85dde9f788e5f3a4a37da9ca9c705b7d9411 -size 1984 +oid sha256:fd9bd42b20ddd1cb83b2b98e6b70263ae6d1a69d8a72ce09e5309d9652dbc0b2 +size 1968 diff --git a/assets/voxygen/voxel/npc/catoblepas/male/leg_fl.vox b/assets/voxygen/voxel/npc/catoblepas/male/leg_fl.vox index fa70793c8c..e0a298a2cd 100644 --- a/assets/voxygen/voxel/npc/catoblepas/male/leg_fl.vox +++ b/assets/voxygen/voxel/npc/catoblepas/male/leg_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3caf6830cf45638f5bebc71e1a95c0af5a685bbed19983700e6826e5e7f74025 -size 2224 +oid sha256:42c2918702fe0bfb5a999f0e32a88324e4f6fe6182498567ad29c75769da0a76 +size 2280 diff --git a/assets/voxygen/voxel/npc/catoblepas/male/leg_fr.vox b/assets/voxygen/voxel/npc/catoblepas/male/leg_fr.vox index 0cb7d1d311..c15bdf9dca 100644 --- a/assets/voxygen/voxel/npc/catoblepas/male/leg_fr.vox +++ b/assets/voxygen/voxel/npc/catoblepas/male/leg_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3686d1afbcbe88864e782208c38b0e0c77278d8cd9be3950b267f31b6a1d96bc -size 2224 +oid sha256:7bc02d3904bc9532a1067ea11cccd3a3c197373ffbbead00ca1f8dc5130d0786 +size 2280 diff --git a/assets/voxygen/voxel/npc/grolgar/male/foot_bl.vox b/assets/voxygen/voxel/npc/grolgar/male/foot_bl.vox index efb32c8183..8cd108d0ef 100644 --- a/assets/voxygen/voxel/npc/grolgar/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/grolgar/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8fad3dc54937596d94d6cee4278e20f51dcc6b87b796c3079f9a599fa97aa2d -size 1316 +oid sha256:c47ae981b9ca75752b3abf681710dd73e129382848e2bce98a2f949132bdbc35 +size 1496 diff --git a/assets/voxygen/voxel/npc/grolgar/male/foot_br.vox b/assets/voxygen/voxel/npc/grolgar/male/foot_br.vox index 4b143b4a6f..c0688db076 100644 --- a/assets/voxygen/voxel/npc/grolgar/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/grolgar/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c2da9531c4ac3f73c7d43ec179f90fed880ac6483ffa7b2116998605bf976a4 -size 1316 +oid sha256:9ac91eecb5da372509b85e3a088dbd9b7279ec496c0249fa08bb8b9f41c62e7f +size 1496 diff --git a/assets/voxygen/voxel/npc/grolgar/male/foot_fl.vox b/assets/voxygen/voxel/npc/grolgar/male/foot_fl.vox index e956683bdf..cd907abb47 100644 --- a/assets/voxygen/voxel/npc/grolgar/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/grolgar/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b59077d362cd7a213fadfb58ffcf6208f421a53da53113e703064dc94fed15c3 -size 1564 +oid sha256:caf9d5bc5a4ea243c404b0ee6a586b8f4db803b9986eea8aaa148746b923482e +size 1912 diff --git a/assets/voxygen/voxel/npc/grolgar/male/foot_fr.vox b/assets/voxygen/voxel/npc/grolgar/male/foot_fr.vox index a48a461ed6..23c93f0a9d 100644 --- a/assets/voxygen/voxel/npc/grolgar/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/grolgar/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6c85c057c0ff0d303942d6c591c14fdf5b3062ffb9db05224b2b028b88c9d21 -size 1564 +oid sha256:9d989f261ac4eccd3d2010b8bb1938151c0d9e1893c10c35b3cb608ac365078e +size 1912 diff --git a/assets/voxygen/voxel/npc/grolgar/male/leg_bl.vox b/assets/voxygen/voxel/npc/grolgar/male/leg_bl.vox index f7d7636d4e..57f9f93b73 100644 --- a/assets/voxygen/voxel/npc/grolgar/male/leg_bl.vox +++ b/assets/voxygen/voxel/npc/grolgar/male/leg_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e94f1f78999e0ebffd0a2df8767353e0a4a3e4894ff130147313b9e0b63b9d67 -size 1720 +oid sha256:8d6399c3a8fa21357d18f540d8fea0b30d720efa1506afed7da7af51438e15d2 +size 1588 diff --git a/assets/voxygen/voxel/npc/grolgar/male/leg_br.vox b/assets/voxygen/voxel/npc/grolgar/male/leg_br.vox index acabb360cf..ccf2cdf362 100644 --- a/assets/voxygen/voxel/npc/grolgar/male/leg_br.vox +++ b/assets/voxygen/voxel/npc/grolgar/male/leg_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb1882d71d271aaa7d79a0901df40ac6bf2219902d5b21c8530c20cf5979a3ad -size 1720 +oid sha256:aa715992284eb9b9d9a49f9a453763ea6ad5e479f5d037b16f451f0d7df01177 +size 1588 diff --git a/assets/voxygen/voxel/npc/grolgar/male/leg_fl.vox b/assets/voxygen/voxel/npc/grolgar/male/leg_fl.vox index f7d2b86bd0..a43052bb31 100644 --- a/assets/voxygen/voxel/npc/grolgar/male/leg_fl.vox +++ b/assets/voxygen/voxel/npc/grolgar/male/leg_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d27cb3b64d87584a6187dd6d9659286b21929601f355d6d6a429beceaf90dc1 -size 2048 +oid sha256:0afaa656dc9db27231d7aa323c43cf80f097de1ba82d01c1298a20cce0429e99 +size 1872 diff --git a/assets/voxygen/voxel/npc/grolgar/male/leg_fr.vox b/assets/voxygen/voxel/npc/grolgar/male/leg_fr.vox index f785e54fb5..a4df310863 100644 --- a/assets/voxygen/voxel/npc/grolgar/male/leg_fr.vox +++ b/assets/voxygen/voxel/npc/grolgar/male/leg_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11b15296f442601a33790d750a8401d578b191666a654f055ee67aed1224706f -size 2048 +oid sha256:fb3d8a82145cea5908af15b3c95fef34941a8daa4c7c1090bc4102231e84a129 +size 1872 diff --git a/assets/voxygen/voxel/npc/hirdrassil/male/foot_bl.vox b/assets/voxygen/voxel/npc/hirdrasil/male/foot_bl.vox similarity index 100% rename from assets/voxygen/voxel/npc/hirdrassil/male/foot_bl.vox rename to assets/voxygen/voxel/npc/hirdrasil/male/foot_bl.vox diff --git a/assets/voxygen/voxel/npc/hirdrassil/male/foot_br.vox b/assets/voxygen/voxel/npc/hirdrasil/male/foot_br.vox similarity index 100% rename from assets/voxygen/voxel/npc/hirdrassil/male/foot_br.vox rename to assets/voxygen/voxel/npc/hirdrasil/male/foot_br.vox diff --git a/assets/voxygen/voxel/npc/hirdrassil/male/foot_fl.vox b/assets/voxygen/voxel/npc/hirdrasil/male/foot_fl.vox similarity index 100% rename from assets/voxygen/voxel/npc/hirdrassil/male/foot_fl.vox rename to assets/voxygen/voxel/npc/hirdrasil/male/foot_fl.vox diff --git a/assets/voxygen/voxel/npc/hirdrassil/male/foot_fr.vox b/assets/voxygen/voxel/npc/hirdrasil/male/foot_fr.vox similarity index 100% rename from assets/voxygen/voxel/npc/hirdrassil/male/foot_fr.vox rename to assets/voxygen/voxel/npc/hirdrasil/male/foot_fr.vox diff --git a/assets/voxygen/voxel/npc/hirdrassil/male/head.vox b/assets/voxygen/voxel/npc/hirdrasil/male/head.vox similarity index 100% rename from assets/voxygen/voxel/npc/hirdrassil/male/head.vox rename to assets/voxygen/voxel/npc/hirdrasil/male/head.vox diff --git a/assets/voxygen/voxel/npc/hirdrassil/male/jaw.vox b/assets/voxygen/voxel/npc/hirdrasil/male/jaw.vox similarity index 100% rename from assets/voxygen/voxel/npc/hirdrassil/male/jaw.vox rename to assets/voxygen/voxel/npc/hirdrasil/male/jaw.vox diff --git a/assets/voxygen/voxel/npc/hirdrassil/male/leg_bl.vox b/assets/voxygen/voxel/npc/hirdrasil/male/leg_bl.vox similarity index 100% rename from assets/voxygen/voxel/npc/hirdrassil/male/leg_bl.vox rename to assets/voxygen/voxel/npc/hirdrasil/male/leg_bl.vox diff --git a/assets/voxygen/voxel/npc/hirdrassil/male/leg_br.vox b/assets/voxygen/voxel/npc/hirdrasil/male/leg_br.vox similarity index 100% rename from assets/voxygen/voxel/npc/hirdrassil/male/leg_br.vox rename to assets/voxygen/voxel/npc/hirdrasil/male/leg_br.vox diff --git a/assets/voxygen/voxel/npc/hirdrassil/male/leg_fl.vox b/assets/voxygen/voxel/npc/hirdrasil/male/leg_fl.vox similarity index 100% rename from assets/voxygen/voxel/npc/hirdrassil/male/leg_fl.vox rename to assets/voxygen/voxel/npc/hirdrasil/male/leg_fl.vox diff --git a/assets/voxygen/voxel/npc/hirdrassil/male/leg_fr.vox b/assets/voxygen/voxel/npc/hirdrasil/male/leg_fr.vox similarity index 100% rename from assets/voxygen/voxel/npc/hirdrassil/male/leg_fr.vox rename to assets/voxygen/voxel/npc/hirdrasil/male/leg_fr.vox diff --git a/assets/voxygen/voxel/npc/hirdrasil/male/neck.vox b/assets/voxygen/voxel/npc/hirdrasil/male/neck.vox new file mode 100644 index 0000000000..b113108049 --- /dev/null +++ b/assets/voxygen/voxel/npc/hirdrasil/male/neck.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8be1e7ee62a90e0afa0c74040faf999f3b8e0c894f28d99b51a21d8db6308192 +size 2800 diff --git a/assets/voxygen/voxel/npc/hirdrassil/male/tail.vox b/assets/voxygen/voxel/npc/hirdrasil/male/tail.vox similarity index 100% rename from assets/voxygen/voxel/npc/hirdrassil/male/tail.vox rename to assets/voxygen/voxel/npc/hirdrasil/male/tail.vox diff --git a/assets/voxygen/voxel/npc/hirdrassil/male/torso_back.vox b/assets/voxygen/voxel/npc/hirdrasil/male/torso_back.vox similarity index 100% rename from assets/voxygen/voxel/npc/hirdrassil/male/torso_back.vox rename to assets/voxygen/voxel/npc/hirdrasil/male/torso_back.vox diff --git a/assets/voxygen/voxel/npc/hirdrasil/male/torso_front.vox b/assets/voxygen/voxel/npc/hirdrasil/male/torso_front.vox new file mode 100644 index 0000000000..993aa70cc0 --- /dev/null +++ b/assets/voxygen/voxel/npc/hirdrasil/male/torso_front.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa52e4b08a06147895680476e6415b61bf7593576ddccff88cdac51aa4d5e15f +size 3656 diff --git a/assets/voxygen/voxel/npc/hirdrassil/male/torso_front.vox b/assets/voxygen/voxel/npc/hirdrasil/torso_front.vox similarity index 100% rename from assets/voxygen/voxel/npc/hirdrassil/male/torso_front.vox rename to assets/voxygen/voxel/npc/hirdrasil/torso_front.vox diff --git a/assets/voxygen/voxel/npc/hirdrassil/male/neck.vox b/assets/voxygen/voxel/npc/hirdrassil/male/neck.vox deleted file mode 100644 index e38e9e4dee..0000000000 --- a/assets/voxygen/voxel/npc/hirdrassil/male/neck.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:974a71aacf4c20b7bcb8891828be573756748fb3f50942e790e0b62994ee6f15 -size 2784 diff --git a/assets/voxygen/voxel/npc/lion/male/foot_bl.vox b/assets/voxygen/voxel/npc/lion/male/foot_bl.vox index caa6986012..a5befd56c3 100644 --- a/assets/voxygen/voxel/npc/lion/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/lion/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f52555a03158b801e0b748398de1afaae702d1f50e8680459410c8e87ad451a4 -size 1344 +oid sha256:957d4b22454283b4e99c2280119776556680b6a79dc408d432c003b6226286d9 +size 1476 diff --git a/assets/voxygen/voxel/npc/lion/male/foot_br.vox b/assets/voxygen/voxel/npc/lion/male/foot_br.vox index 863b0ec8b6..6710c2ade2 100644 --- a/assets/voxygen/voxel/npc/lion/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/lion/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f47069ee06dc088f3386a05436373afb733ac8a2bb8db68e1503e4d638043070 -size 1344 +oid sha256:fe318c93a4744e220c37744ccadb5118f38fd52a6dfd7eec574ae4f0b20f2afd +size 1476 diff --git a/assets/voxygen/voxel/npc/lion/male/foot_fl.vox b/assets/voxygen/voxel/npc/lion/male/foot_fl.vox index e5fdd31ddb..efc590cfac 100644 --- a/assets/voxygen/voxel/npc/lion/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/lion/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1232a6c70aa203f517ff5c1e84272f99ec8a691d1a01fac4963cf5290396e46 -size 1308 +oid sha256:64105ef321498314896ee0a0a0c2c36ee33ee3f5078f642f626dc02dbd8023a1 +size 1428 diff --git a/assets/voxygen/voxel/npc/lion/male/foot_fr.vox b/assets/voxygen/voxel/npc/lion/male/foot_fr.vox index b5d4ecd98f..912b8b7731 100644 --- a/assets/voxygen/voxel/npc/lion/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/lion/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9051c63f61e9e10a3eaa6625974b02db0741237c931d2fb62dedc3a4ddd2990d -size 1308 +oid sha256:10af50be30c3f4576390b2fa02d6b76f05b20f3019fc2165ba2926ebb1251d19 +size 1428 diff --git a/assets/voxygen/voxel/npc/lion/male/leg_bl.vox b/assets/voxygen/voxel/npc/lion/male/leg_bl.vox index aa5bf3eede..3f2ffc03db 100644 --- a/assets/voxygen/voxel/npc/lion/male/leg_bl.vox +++ b/assets/voxygen/voxel/npc/lion/male/leg_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9bf6beb766138ad541acebef1a4c0b6a3ba3c5eb80a1ef08f0cbdf608b57b25 -size 1588 +oid sha256:dea3c84abed1ea8aab9c9b396b3be97bdf103aa74633302eeb671980b6d75728 +size 1544 diff --git a/assets/voxygen/voxel/npc/lion/male/leg_br.vox b/assets/voxygen/voxel/npc/lion/male/leg_br.vox index 1dac10f122..346b8b4f99 100644 --- a/assets/voxygen/voxel/npc/lion/male/leg_br.vox +++ b/assets/voxygen/voxel/npc/lion/male/leg_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9431feda9b80d726934e5fb0db1e9ff3f17fa146af81b13bd2b1f50ddc5e965 -size 1588 +oid sha256:6f43a264287889a95f7c8346b876c5b28e42b7eaa81c12c7e21df4c5a19237c3 +size 1544 diff --git a/assets/voxygen/voxel/npc/lion/male/leg_fl.vox b/assets/voxygen/voxel/npc/lion/male/leg_fl.vox index aba893c97e..4d43fa8b0f 100644 --- a/assets/voxygen/voxel/npc/lion/male/leg_fl.vox +++ b/assets/voxygen/voxel/npc/lion/male/leg_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e85ef52e3cced1d3a191c96f3525728f59cb22c5199a54d8c40e7b466727fb9e -size 1528 +oid sha256:0795d8d3e25c5380dcbc03d13cc6a15dbc11cc2063fd6f6c60185e4a469f68c4 +size 1440 diff --git a/assets/voxygen/voxel/npc/lion/male/leg_fr.vox b/assets/voxygen/voxel/npc/lion/male/leg_fr.vox index 7312111cb1..452a885ee4 100644 --- a/assets/voxygen/voxel/npc/lion/male/leg_fr.vox +++ b/assets/voxygen/voxel/npc/lion/male/leg_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f21165abe9e4689eb196eacbbabaea6a55168b00c3830a3bb1c44612095ba54 -size 1528 +oid sha256:c15c6afae38bb44fb5317672ebd6e85534c6b7d14bcf7dbbfe921ffb2a14f8cb +size 1440 diff --git a/assets/voxygen/voxel/npc/tiger/male/foot_bl.vox b/assets/voxygen/voxel/npc/tiger/male/foot_bl.vox index 819c7d7efb..4fbeb4ea4a 100644 --- a/assets/voxygen/voxel/npc/tiger/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/tiger/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e19ddbda8aa47c07f5cfb65d2cb4050cb8d5f3694ab1137c76f2e1266aa8515 -size 1328 +oid sha256:5fc36f1582e07d01ab581cecd7f4d2f72313f9b49e3a7f772ac93f1e2a3dae8e +size 1512 diff --git a/assets/voxygen/voxel/npc/tiger/male/foot_br.vox b/assets/voxygen/voxel/npc/tiger/male/foot_br.vox index 4d8f111ca5..e1f36b6ce6 100644 --- a/assets/voxygen/voxel/npc/tiger/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/tiger/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2774120fa18ca3e0213560733855b914d7888997fa3f3107d3bd39854acc16a -size 1328 +oid sha256:226d129ca8a3ac22fc952b8478c0255627e4d8e67b90084e97abdce09291e488 +size 1512 diff --git a/assets/voxygen/voxel/npc/tiger/male/foot_fl.vox b/assets/voxygen/voxel/npc/tiger/male/foot_fl.vox index e4530bdae1..1f5fd1500d 100644 --- a/assets/voxygen/voxel/npc/tiger/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/tiger/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd8df382684c91bc0708ef70f324eb8f7c83f601c182addde38840840c23f2ed -size 1372 +oid sha256:a277796105f0ce2dae26ce7ae5f620609316c3ecdb66ae1b63200453b1752099 +size 1464 diff --git a/assets/voxygen/voxel/npc/tiger/male/foot_fr.vox b/assets/voxygen/voxel/npc/tiger/male/foot_fr.vox index d546ee9768..e78de976cb 100644 --- a/assets/voxygen/voxel/npc/tiger/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/tiger/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c16ae266a9cb0022de6d7571e3e4db5793348934df700380bbe07f25edcba32 -size 1372 +oid sha256:085458fa1a107d454855054bd2c18796522adc276f624e1a8ce794196e5030e2 +size 1464 diff --git a/assets/voxygen/voxel/npc/tiger/male/head.vox b/assets/voxygen/voxel/npc/tiger/male/head.vox index b441012667..30e7895baa 100644 --- a/assets/voxygen/voxel/npc/tiger/male/head.vox +++ b/assets/voxygen/voxel/npc/tiger/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9999b37d5a531d224f292d929d7cc6a3efcd4d11d3f1851206d3bd0a3ce4bb76 +oid sha256:af0d5f9945faeb4f8fe71c950f55f530a493616359ed888c0c77ab3627ccdc64 size 3220 diff --git a/assets/voxygen/voxel/npc/tiger/male/jaw.vox b/assets/voxygen/voxel/npc/tiger/male/jaw.vox index 0714f7c330..98b0567a11 100644 --- a/assets/voxygen/voxel/npc/tiger/male/jaw.vox +++ b/assets/voxygen/voxel/npc/tiger/male/jaw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11f7aeda1a4136225b84a1caba3f7de1fcf70d30803cf3cf0eb5c28fc2f127c2 +oid sha256:b59f32209dfe283cc8a685b8b10dc8a8e2e1c9a312a42be060592d1b2b5b74f2 size 1240 diff --git a/assets/voxygen/voxel/npc/tiger/male/leg_bl.vox b/assets/voxygen/voxel/npc/tiger/male/leg_bl.vox index 13e9c41222..2ac0c5494f 100644 --- a/assets/voxygen/voxel/npc/tiger/male/leg_bl.vox +++ b/assets/voxygen/voxel/npc/tiger/male/leg_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f4fccbc3635759e620f27492eb18ff75e6e9b342d7a06ab8b3a5a5fd9cc3106 -size 1640 +oid sha256:afee004920aa78cb665e10710a92cd3133741ea648687bbf2c0f69dad17c664b +size 1512 diff --git a/assets/voxygen/voxel/npc/tiger/male/leg_br.vox b/assets/voxygen/voxel/npc/tiger/male/leg_br.vox index 8ff8305f6d..583e717d6f 100644 --- a/assets/voxygen/voxel/npc/tiger/male/leg_br.vox +++ b/assets/voxygen/voxel/npc/tiger/male/leg_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e0add5116505b375ee75a705028f800fb72e24cf1056dd40a8506954da355d3 -size 1640 +oid sha256:c445d64098d8b966db98138de3730d798834285425fd3f9cc2eb8656416b5c1b +size 1512 diff --git a/assets/voxygen/voxel/npc/tiger/male/leg_fl.vox b/assets/voxygen/voxel/npc/tiger/male/leg_fl.vox index a02904c910..b7f35b0181 100644 --- a/assets/voxygen/voxel/npc/tiger/male/leg_fl.vox +++ b/assets/voxygen/voxel/npc/tiger/male/leg_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f731c2714243a9b17c026986b22d7f913e56c5c45c32da882eee27aebc4aa929 -size 1636 +oid sha256:56987d55e8988bd14133ba78a1f7686a0e40f921c995900fa49d27f526ad9d42 +size 1580 diff --git a/assets/voxygen/voxel/npc/tiger/male/leg_fr.vox b/assets/voxygen/voxel/npc/tiger/male/leg_fr.vox index e4b0749159..74eee4b336 100644 --- a/assets/voxygen/voxel/npc/tiger/male/leg_fr.vox +++ b/assets/voxygen/voxel/npc/tiger/male/leg_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:becfa3d7edf43c34378fde2ebc9254fd99635d89ee58babf1216dce76721b8b3 -size 1636 +oid sha256:c1783a001f84ec45f16f08a525aaf42b6b88e36743fd3be06d1e8802047850c7 +size 1580 diff --git a/assets/voxygen/voxel/npc/tiger/male/neck.vox b/assets/voxygen/voxel/npc/tiger/male/neck.vox index 627248724d..56c7dbcc5d 100644 --- a/assets/voxygen/voxel/npc/tiger/male/neck.vox +++ b/assets/voxygen/voxel/npc/tiger/male/neck.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3f2c3ef17593009168b4f7ee6ebd5f6119a58f5a815a927383edab5d6ff4579 -size 2124 +oid sha256:e8f4594b0c96169e6cac8d9631f726e4e69cec7d3f5f33f48b328e53444b8c90 +size 2424 diff --git a/assets/voxygen/voxel/npc/tiger/male/torso_back.vox b/assets/voxygen/voxel/npc/tiger/male/torso_back.vox index 9bf1866628..3b9c285596 100644 --- a/assets/voxygen/voxel/npc/tiger/male/torso_back.vox +++ b/assets/voxygen/voxel/npc/tiger/male/torso_back.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3d36feec8d21c89f48deb58629b6518c3163cf40d7ba19a7042f36e33331133 -size 4660 +oid sha256:8666513c4f911a8da957c214b6e3e0bf84149a5f262afc41471b4f84e4e13f9c +size 5236 diff --git a/assets/voxygen/voxel/npc/tiger/male/torso_front.vox b/assets/voxygen/voxel/npc/tiger/male/torso_front.vox index 9c278ce34a..52711f8197 100644 --- a/assets/voxygen/voxel/npc/tiger/male/torso_front.vox +++ b/assets/voxygen/voxel/npc/tiger/male/torso_front.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cd842de8a4b9831d2c1b9e12fbc7ad49ed8e6ff02fca23492b189d5f65c0354 +oid sha256:9f2348de485f1e1ab2b2bf40e10d517a54400a1ef73b2ae499f6db5ddd84e9a4 size 6196 diff --git a/assets/voxygen/voxel/npc/tuskram/male/foot_bl.vox b/assets/voxygen/voxel/npc/tuskram/male/foot_bl.vox index 2dee7b8a8c..cff8a41e09 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/foot_bl.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/foot_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bacb74898e1424f8da52e2ed13e1b0851ef59cf7b41a300ba541538f51009136 -size 1288 +oid sha256:2e456782a34461d944feed285c31558fa4b0232b4152c90f02bcda0ad28edf73 +size 1412 diff --git a/assets/voxygen/voxel/npc/tuskram/male/foot_br.vox b/assets/voxygen/voxel/npc/tuskram/male/foot_br.vox index deec278db7..7b68f3b280 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a04ae98a07ab025c19b26a0e26096593e88dabcda9ba71728ba1bc76eb90e2c5 -size 1288 +oid sha256:c47e6b396fed4b4875e11f10c00240c9e97b5e2765feca0edcaf7b6c423aa846 +size 1412 diff --git a/assets/voxygen/voxel/npc/tuskram/male/foot_fl.vox b/assets/voxygen/voxel/npc/tuskram/male/foot_fl.vox index 33575ac5c7..f0d059013b 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/foot_fl.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/foot_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60f41f842b6d5a340b586fac511e3ddc441a48aca50a7b147ea9a986bfd6845b -size 1348 +oid sha256:f9ba5463684946e1a13270e079b87bd51071e20506622307c28f5f182cc88e0d +size 1500 diff --git a/assets/voxygen/voxel/npc/tuskram/male/foot_fr.vox b/assets/voxygen/voxel/npc/tuskram/male/foot_fr.vox index 78c08d2584..ce7982ae96 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b06f357f56c9e0567ed7474e4ddb4f8adfbc1bcd3d6968ae3cbd09eb3c83536 -size 1348 +oid sha256:b7b14cb13d878d073b982801179873c65d19880975f86d1734ac8729a57ea309 +size 1500 diff --git a/assets/voxygen/voxel/npc/tuskram/male/leg_bl.vox b/assets/voxygen/voxel/npc/tuskram/male/leg_bl.vox index 5887cef4c9..530a5cd6a5 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/leg_bl.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/leg_bl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82bacb5173c205bdefacc3125b1626cbb91dbd205901511c4e085096a63f88f6 -size 1512 +oid sha256:9d327bf97ccd7bbe82f4d8415466b70007d4c88ec7b32fc633c2c9de10af0917 +size 1460 diff --git a/assets/voxygen/voxel/npc/tuskram/male/leg_br.vox b/assets/voxygen/voxel/npc/tuskram/male/leg_br.vox index 59a3a974b3..1afa6ac8f9 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/leg_br.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/leg_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e86ebe755bd518b20900d09ebd8385b0b70cbce604a9c4cbf58385ebd03a655 -size 1512 +oid sha256:3f03f866f9d6a001ac1969d6eb4883f49cb6d6e0e6a648964ca10c591ef82c91 +size 1460 diff --git a/assets/voxygen/voxel/npc/tuskram/male/leg_fl.vox b/assets/voxygen/voxel/npc/tuskram/male/leg_fl.vox index aa39e44650..b4aacb93a5 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/leg_fl.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/leg_fl.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f15a0b8d971d88ca2f718f01148c79a93765a2a3a3c77993fe22858786fc2c8c -size 1528 +oid sha256:db5d9e78e9c0d2e3af48c5961a4f0f82857cb044a109ddb9e07ffa6b81b0b7c5 +size 1432 diff --git a/assets/voxygen/voxel/npc/tuskram/male/leg_fr.vox b/assets/voxygen/voxel/npc/tuskram/male/leg_fr.vox index f213db33e3..3b7f0d803f 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/leg_fr.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/leg_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45dc4382a63c33326f45b68895de3a5f8275413bf3105f5b961e538e9cae9f7e -size 1528 +oid sha256:1f4f35838fa43f23662a44c21eb2d6ef17a26e49ee76a18d187bf0b78c2d6a14 +size 1432 diff --git a/assets/voxygen/voxel/npc/tuskram/male/neck.vox b/assets/voxygen/voxel/npc/tuskram/male/neck.vox index a1efbe5bd4..860561f6ab 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/neck.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/neck.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:232081227b38b2b480e6433a587dd75952ac043b901536b7d4fa502f22f6c05c -size 1904 +oid sha256:6e6786377fa59115afdfa3ceb5bd03842501500eb981a78afa010c59d578f4a4 +size 2072 diff --git a/assets/voxygen/voxel/npc/tuskram/male/torso_front.vox b/assets/voxygen/voxel/npc/tuskram/male/torso_front.vox index 7688bab3d2..ab7cd73ac8 100644 --- a/assets/voxygen/voxel/npc/tuskram/male/torso_front.vox +++ b/assets/voxygen/voxel/npc/tuskram/male/torso_front.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b04dd83d748675fbaee2afdca25c872c4df0b9c915b3aa7350b92d702dc44f48 -size 5452 +oid sha256:bfff23a60496a1738f161bd94c2a4b0fd3f55e8da86e49c25bee8994bbe597d6 +size 5572 diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron index 3c50063065..5fb291e362 100644 --- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron @@ -125,7 +125,7 @@ central: ("npc.tuskram.male.head"), ), neck: ( - offset: (-4.0, -4.0, -3.5), + offset: (-4.0, -5.0, -3.5), central: ("npc.tuskram.male.neck"), ), jaw: ( @@ -155,7 +155,7 @@ central: ("npc.tuskram.male.head"), ), neck: ( - offset: (-4.0, -4.0, -3.5), + offset: (-4.0, -5.0, -3.5), central: ("npc.tuskram.male.neck"), ), jaw: ( @@ -301,7 +301,7 @@ ), (Tiger, Male): ( head: ( - offset: (-5.5, 0.0, -5.0), + offset: (-5.5, -1.0, -5.0), central: ("npc.tiger.male.head"), ), neck: ( @@ -331,7 +331,7 @@ ), (Tiger, Female): ( head: ( - offset: (-5.5, 0.0, -5.0), + offset: (-5.5, -1.0, -5.0), central: ("npc.tiger.male.head"), ), neck: ( @@ -719,26 +719,26 @@ central: ("npc.deer.male.tail"), ), ), - (Hirdrassil, Male): ( + (Hirdrasil, Male): ( head: ( offset: (-9.0, -12.0, 0.0), - central: ("npc.hirdrassil.male.head"), + central: ("npc.hirdrasil.male.head"), ), neck: ( offset: (-4.0, -4.0, -6.0), - central: ("npc.hirdrassil.male.neck"), + central: ("npc.hirdrasil.male.neck"), ), jaw: ( offset: (-1.0, 0.0, -7.0), - central: ("npc.hirdrassil.male.jaw"), + central: ("npc.hirdrasil.male.jaw"), ), torso_front: ( offset: (-4.0, -10.0, -5.5), - central: ("npc.hirdrassil.male.torso_front"), + central: ("npc.hirdrasil.male.torso_front"), ), torso_back: ( offset: (-4.0, -11.0, -4.0), - central: ("npc.hirdrassil.male.torso_back"), + central: ("npc.hirdrasil.male.torso_back"), ), ears: ( offset: (0.0, 0.0, 0.0), @@ -746,29 +746,29 @@ ), tail: ( offset: (-2.0, -2.0, 0.0), - central: ("npc.hirdrassil.male.tail"), + central: ("npc.hirdrasil.male.tail"), ), ), - (Hirdrassil, Female): ( + (Hirdrasil, Female): ( head: ( offset: (-9.0, -12.0, 0.0), - central: ("npc.hirdrassil.male.head"), + central: ("npc.hirdrasil.male.head"), ), neck: ( offset: (-4.0, -4.0, -6.0), - central: ("npc.hirdrassil.male.neck"), + central: ("npc.hirdrasil.male.neck"), ), jaw: ( offset: (-1.0, 0.0, -7.0), - central: ("npc.hirdrassil.male.jaw"), + central: ("npc.hirdrasil.male.jaw"), ), torso_front: ( offset: (-4.0, -10.0, -5.5), - central: ("npc.hirdrassil.male.torso_front"), + central: ("npc.hirdrasil.male.torso_front"), ), torso_back: ( offset: (-4.0, -11.0, -4.0), - central: ("npc.hirdrassil.male.torso_back"), + central: ("npc.hirdrasil.male.torso_back"), ), ears: ( offset: (0.0, 0.0, 0.0), @@ -776,7 +776,7 @@ ), tail: ( offset: (-2.0, -2.0, 0.0), - central: ("npc.hirdrassil.male.tail"), + central: ("npc.hirdrasil.male.tail"), ), ), }) diff --git a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron index 3eefeef7c1..a00fa3b1b8 100644 --- a/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_lateral_manifest.ron @@ -1,69 +1,69 @@ ({ (Grolgar, Male): ( leg_fl: ( - offset: (-2.5, -5.0, -10.0),//these are done very case by case + offset: (-2.5, -4.5, -4.0),//these are done very case by case lateral: ("npc.grolgar.male.leg_fl"), ), leg_fr: ( - offset: (-2.5, -5.0, -10.0), + offset: (-2.5, -4.5, -4.0), lateral: ("npc.grolgar.male.leg_fr"), ), leg_bl: ( - offset: (-2.0, -3.5, -5.0), + offset: (-2.5, -3.5, -3.5), lateral: ("npc.grolgar.male.leg_bl"), ), leg_br: ( - offset: (-2.0, -3.5, -5.0), + offset: (-2.0, -3.5, -3.5), lateral: ("npc.grolgar.male.leg_br"), ), foot_fl: ( - offset: (-2.5, -2.0, -6.0),//y pivot should be -1/4 of the y dimension of the model + offset: (-2.5, -4.5, -8.0),//y pivot should be -1/4 of the y dimension of the model lateral: ("npc.grolgar.male.foot_fl"), ), foot_fr: ( - offset: (-2.5, -2.0, -6.0),//y pivot should be -1/4 of the y dimension of the model + offset: (-2.5, -4.5, -8.0),//y pivot should be -1/4 of the y dimension of the model lateral: ("npc.grolgar.male.foot_fr"), ), foot_bl: ( - offset: (-2.5, -2.0, -4.0),//y pivot should be -1/4 of the y dimension of the model + offset: (-2.5, -2.0, -8.0),//y pivot should be -1/4 of the y dimension of the model lateral: ("npc.grolgar.male.foot_bl"), ), foot_br: ( - offset: (-2.5, -2.0, -4.0),//y pivot should be -1/4 of the y dimension of the model + offset: (-2.5, -2.0, -8.0),//y pivot should be -1/4 of the y dimension of the model lateral: ("npc.grolgar.male.foot_br"), ), ), (Grolgar, Female): ( leg_fl: ( - offset: (-2.5, -5.0, -10.0), + offset: (-2.5, -4.5, -4.0),//these are done very case by case lateral: ("npc.grolgar.male.leg_fl"), ), leg_fr: ( - offset: (-2.5, -5.0, -10.0), + offset: (-2.5, -4.5, -4.0), lateral: ("npc.grolgar.male.leg_fr"), ), leg_bl: ( - offset: (-2.0, -3.5, -5.0), + offset: (-2.5, -3.5, -3.5), lateral: ("npc.grolgar.male.leg_bl"), ), leg_br: ( - offset: (-2.0, -3.5, -5.0), + offset: (-2.0, -3.5, -3.5), lateral: ("npc.grolgar.male.leg_br"), ), foot_fl: ( - offset: (-2.5, -2.0, -6.0), + offset: (-2.5, -4.5, -8.0),//y pivot should be -1/4 of the y dimension of the model lateral: ("npc.grolgar.male.foot_fl"), ), foot_fr: ( - offset: (-2.5, -2.0, -6.0), + offset: (-2.5, -4.5, -8.0),//y pivot should be -1/4 of the y dimension of the model lateral: ("npc.grolgar.male.foot_fr"), ), foot_bl: ( - offset: (-2.5, -2.0, -4.0), + offset: (-2.5, -2.0, -8.0),//y pivot should be -1/4 of the y dimension of the model lateral: ("npc.grolgar.male.foot_bl"), ), foot_br: ( - offset: (-2.5, -2.0, -4.0), + offset: (-2.5, -2.0, -8.0),//y pivot should be -1/4 of the y dimension of the model lateral: ("npc.grolgar.male.foot_br"), ), ), @@ -137,137 +137,137 @@ ), (Tuskram, Male): ( leg_fl: ( - offset: (-2.0, -2.5, -10.0), + offset: (-2.0, -2.5, -3.0), lateral: ("npc.tuskram.male.leg_fl"), ), leg_fr: ( - offset: (-2.0, -2.5, -10.0), + offset: (-2.0, -2.5, -3.0), lateral: ("npc.tuskram.male.leg_fr"), ), leg_bl: ( - offset: (-2.0, -2.5, -4.0), + offset: (-2.0, -2.5, -3.0), lateral: ("npc.tuskram.male.leg_bl"), ), leg_br: ( - offset: (-2.0, -2.5, -4.0), + offset: (-2.0, -2.5, -3.0), lateral: ("npc.tuskram.male.leg_br"), ), foot_fl: ( - offset: (-2.5, -2.0, -5.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.tuskram.male.foot_fl"), ), foot_fr: ( - offset: (-2.5, -2.0, -5.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.tuskram.male.foot_fr"), ), foot_bl: ( - offset: (-1.5, -1.5, -6.0), + offset: (-1.5, -1.5, -8.0), lateral: ("npc.tuskram.male.foot_bl"), ), foot_br: ( - offset: (-1.5, -1.5, -6.0), + offset: (-1.5, -1.5, -8.0), lateral: ("npc.tuskram.male.foot_br"), ), ), (Tuskram, Female): ( leg_fl: ( - offset: (-2.0, -2.5, -10.0), + offset: (-2.0, -2.5, -3.0), lateral: ("npc.tuskram.male.leg_fl"), ), leg_fr: ( - offset: (-2.0, -2.5, -10.0), + offset: (-2.0, -2.5, -3.0), lateral: ("npc.tuskram.male.leg_fr"), ), leg_bl: ( - offset: (-2.0, -2.5, -4.0), + offset: (-2.0, -2.5, -3.0), lateral: ("npc.tuskram.male.leg_bl"), ), leg_br: ( - offset: (-2.0, -2.5, -4.0), + offset: (-2.0, -2.5, -3.0), lateral: ("npc.tuskram.male.leg_br"), ), foot_fl: ( - offset: (-2.5, -2.0, -5.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.tuskram.male.foot_fl"), ), foot_fr: ( - offset: (-2.5, -2.0, -5.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.tuskram.male.foot_fr"), ), foot_bl: ( - offset: (-1.5, -1.5, -6.0), + offset: (-1.5, -1.5, -8.0), lateral: ("npc.tuskram.male.foot_bl"), ), foot_br: ( - offset: (-1.5, -1.5, -6.0), + offset: (-1.5, -1.5, -8.0), lateral: ("npc.tuskram.male.foot_br"), ), ), (Lion, Male): ( leg_fl: ( - offset: (-2.0, -2.5, -7.5), + offset: (-2.0, -2.5, -3.5), lateral: ("npc.lion.male.leg_fl"), ), leg_fr: ( - offset: (-2.0, -2.5, -7.5), + offset: (-2.0, -2.5, -3.5), lateral: ("npc.lion.male.leg_fr"), ), leg_bl: ( - offset: (-2.0, -3.0, -6.0), + offset: (-2.0, -3.0, -3.5), lateral: ("npc.lion.male.leg_bl"), ), leg_br: ( - offset: (-2.0, -3.0, -6.0), + offset: (-2.0, -3.0, -3.5), lateral: ("npc.lion.male.leg_br"), ), foot_fl: ( - offset: (-2.5, -2.0, -5.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.lion.male.foot_fl"), ), foot_fr: ( - offset: (-2.5, -2.0, -5.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.lion.male.foot_fr"), ), foot_bl: ( - offset: (-2.5, -2.0, -6.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.lion.male.foot_bl"), ), foot_br: ( - offset: (-2.5, -2.0, -6.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.lion.male.foot_br"), ), ), (Lion, Female): ( leg_fl: ( - offset: (-2.0, -2.5, -7.5), + offset: (-2.0, -2.5, -3.5), lateral: ("npc.lion.male.leg_fl"), ), leg_fr: ( - offset: (-2.0, -2.5, -7.5), + offset: (-2.0, -2.5, -3.5), lateral: ("npc.lion.male.leg_fr"), ), leg_bl: ( - offset: (-2.0, -3.0, -6.0), + offset: (-2.0, -3.0, -3.5), lateral: ("npc.lion.male.leg_bl"), ), leg_br: ( - offset: (-2.0, -3.0, -6.0), + offset: (-2.0, -3.0, -3.5), lateral: ("npc.lion.male.leg_br"), ), foot_fl: ( - offset: (-2.5, -2.0, -5.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.lion.male.foot_fl"), ), foot_fr: ( - offset: (-2.5, -2.0, -5.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.lion.male.foot_fr"), ), foot_bl: ( - offset: (-2.5, -2.0, -6.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.lion.male.foot_bl"), ), foot_br: ( - offset: (-2.5, -2.0, -6.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.lion.male.foot_br"), ), ), @@ -341,69 +341,69 @@ ), (Tiger, Male): ( leg_fl: ( - offset: (-2.0, -3.0, -10.0), + offset: (-2.0, -3.0, -4.0), lateral: ("npc.tiger.male.leg_fl"), ), leg_fr: ( - offset: (-2.0, -3.0, -10.0), + offset: (-2.0, -3.0, -4.0), lateral: ("npc.tiger.male.leg_fr"), ), leg_bl: ( - offset: (-2.0, -3.0, -10.0), + offset: (-2.0, -3.0, -3.0), lateral: ("npc.tiger.male.leg_bl"), ), leg_br: ( - offset: (-2.0, -3.0, -10.0), + offset: (-2.0, -3.0, -3.0), lateral: ("npc.tiger.male.leg_br"), ), foot_fl: ( - offset: (-2.5, -2.0, -6.0), + offset: (-2.5, -2.0, -7.0), lateral: ("npc.tiger.male.foot_fl"), ), foot_fr: ( - offset: (-2.5, -2.0, -6.0), + offset: (-2.5, -2.0, -7.0), lateral: ("npc.tiger.male.foot_fr"), ), foot_bl: ( - offset: (-2.5, -2.0, -6.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.tiger.male.foot_bl"), ), foot_br: ( - offset: (-2.5, -2.0, -6.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.tiger.male.foot_br"), ), ), (Tiger, Female): ( leg_fl: ( - offset: (-2.0, -3.0, -10.0), + offset: (-2.0, -3.0, -4.0), lateral: ("npc.tiger.male.leg_fl"), ), leg_fr: ( - offset: (-2.0, -3.0, -10.0), + offset: (-2.0, -3.0, -4.0), lateral: ("npc.tiger.male.leg_fr"), ), leg_bl: ( - offset: (-2.0, -3.0, -10.0), + offset: (-2.0, -3.0, -3.0), lateral: ("npc.tiger.male.leg_bl"), ), leg_br: ( - offset: (-2.0, -3.0, -10.0), + offset: (-2.0, -3.0, -3.0), lateral: ("npc.tiger.male.leg_br"), ), foot_fl: ( - offset: (-2.5, -2.0, -6.0), + offset: (-2.5, -2.0, -7.0), lateral: ("npc.tiger.male.foot_fl"), ), foot_fr: ( - offset: (-2.5, -2.0, -6.0), + offset: (-2.5, -2.0, -7.0), lateral: ("npc.tiger.male.foot_fr"), ), foot_bl: ( - offset: (-2.5, -2.0, -6.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.tiger.male.foot_bl"), ), foot_br: ( - offset: (-2.5, -2.0, -6.0), + offset: (-2.5, -2.0, -8.0), lateral: ("npc.tiger.male.foot_br"), ), ), @@ -613,11 +613,11 @@ ), (Catoblepas, Male): ( leg_fl: ( - offset: (-2.5, -4.0, -4.5), + offset: (-2.5, -4.0, -5.0), lateral: ("npc.catoblepas.male.leg_fl"), ), leg_fr: ( - offset: (-2.5, -4.0, -4.5), + offset: (-2.5, -4.0, -5.0), lateral: ("npc.catoblepas.male.leg_fr"), ), leg_bl: ( @@ -629,11 +629,11 @@ lateral: ("npc.catoblepas.male.leg_br"), ), foot_fl: ( - offset: (-3.0, -7.0, -11.0), + offset: (-3.0, -3.0, -9.0), lateral: ("npc.catoblepas.male.foot_fl"), ), foot_fr: ( - offset: (-3.0, -7.0, -11.0), + offset: (-3.0, -3.0, -9.0), lateral: ("npc.catoblepas.male.foot_fr"), ), foot_bl: ( @@ -647,11 +647,11 @@ ), (Catoblepas, Female): ( leg_fl: ( - offset: (-2.5, -4.0, -4.5), + offset: (-2.5, -4.0, -5.0), lateral: ("npc.catoblepas.male.leg_fl"), ), leg_fr: ( - offset: (-2.5, -4.0, -4.5), + offset: (-2.5, -4.0, -5.0), lateral: ("npc.catoblepas.male.leg_fr"), ), leg_bl: ( @@ -663,11 +663,11 @@ lateral: ("npc.catoblepas.male.leg_br"), ), foot_fl: ( - offset: (-3.0, -7.0, -11.0), + offset: (-3.0, -3.0, -9.0), lateral: ("npc.catoblepas.male.foot_fl"), ), foot_fr: ( - offset: (-3.0, -7.0, -11.0), + offset: (-3.0, -3.0, -9.0), lateral: ("npc.catoblepas.male.foot_fr"), ), foot_bl: ( @@ -815,72 +815,72 @@ lateral: ("npc.deer.female.foot_br"), ), ), - (Hirdrassil, Male): ( + (Hirdrasil, Male): ( leg_fl: ( offset: (-1.5, -3.0, -4.0), - lateral: ("npc.hirdrassil.male.leg_fl"), + lateral: ("npc.hirdrasil.male.leg_fl"), ), leg_fr: ( offset: (-1.5, -3.0, -4.0), - lateral: ("npc.hirdrassil.male.leg_fr"), + lateral: ("npc.hirdrasil.male.leg_fr"), ), leg_bl: ( offset: (-2.0, -2.5, -5.0), - lateral: ("npc.hirdrassil.male.leg_bl"), + lateral: ("npc.hirdrasil.male.leg_bl"), ), leg_br: ( offset: (-2.0, -2.5, -5.0), - lateral: ("npc.hirdrassil.male.leg_br"), + lateral: ("npc.hirdrasil.male.leg_br"), ), foot_fl: ( offset: (-2.0, -1.0, -9.0), - lateral: ("npc.hirdrassil.male.foot_fl"), + lateral: ("npc.hirdrasil.male.foot_fl"), ), foot_fr: ( offset: (-2.0, -1.0, -9.0), - lateral: ("npc.hirdrassil.male.foot_fr"), + lateral: ("npc.hirdrasil.male.foot_fr"), ), foot_bl: ( offset: (-2.0, -2.5, -7.0), - lateral: ("npc.hirdrassil.male.foot_bl"), + lateral: ("npc.hirdrasil.male.foot_bl"), ), foot_br: ( offset: (-2.0, -2.5, -7.0), - lateral: ("npc.hirdrassil.male.foot_br"), + lateral: ("npc.hirdrasil.male.foot_br"), ), ), - (Hirdrassil, Female): ( + (Hirdrasil, Female): ( leg_fl: ( offset: (-1.5, -3.0, -4.0), - lateral: ("npc.hirdrassil.male.leg_fl"), + lateral: ("npc.hirdrasil.male.leg_fl"), ), leg_fr: ( offset: (-1.5, -3.0, -4.0), - lateral: ("npc.hirdrassil.male.leg_fr"), + lateral: ("npc.hirdrasil.male.leg_fr"), ), leg_bl: ( offset: (-2.0, -2.5, -5.0), - lateral: ("npc.hirdrassil.male.leg_bl"), + lateral: ("npc.hirdrasil.male.leg_bl"), ), leg_br: ( offset: (-2.0, -2.5, -5.0), - lateral: ("npc.hirdrassil.male.leg_br"), + lateral: ("npc.hirdrasil.male.leg_br"), ), foot_fl: ( offset: (-2.0, -1.0, -9.0), - lateral: ("npc.hirdrassil.male.foot_fl"), + lateral: ("npc.hirdrasil.male.foot_fl"), ), foot_fr: ( offset: (-2.0, -1.0, -9.0), - lateral: ("npc.hirdrassil.male.foot_fr"), + lateral: ("npc.hirdrasil.male.foot_fr"), ), foot_bl: ( offset: (-2.0, -2.5, -7.0), - lateral: ("npc.hirdrassil.male.foot_bl"), + lateral: ("npc.hirdrasil.male.foot_bl"), ), foot_br: ( offset: (-2.0, -2.5, -7.0), - lateral: ("npc.hirdrassil.male.foot_br"), + lateral: ("npc.hirdrasil.male.foot_br"), ), ), }) diff --git a/common/src/comp/body/quadruped_medium.rs b/common/src/comp/body/quadruped_medium.rs index 25f144292b..17c662e239 100644 --- a/common/src/comp/body/quadruped_medium.rs +++ b/common/src/comp/body/quadruped_medium.rs @@ -44,7 +44,7 @@ pub enum Species { Catoblepas = 11, Bonerattler = 12, Deer = 13, - Hirdrassil = 14, + Hirdrasil = 14, } /// Data representing per-species generic data. @@ -64,7 +64,7 @@ pub struct AllSpecies { pub catoblepas: SpeciesMeta, pub bonerattler: SpeciesMeta, pub deer: SpeciesMeta, - pub hirdrassil: SpeciesMeta, + pub hirdrasil: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -85,7 +85,7 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Catoblepas => &self.catoblepas, Species::Bonerattler => &self.bonerattler, Species::Deer => &self.deer, - Species::Hirdrassil => &self.hirdrassil, + Species::Hirdrasil => &self.hirdrasil, } } } @@ -103,7 +103,7 @@ pub const ALL_SPECIES: [Species; 13] = [ Species::Catoblepas, Species::Bonerattler, Species::Deer, - Species::Hirdrassil, + Species::Hirdrasil, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs index 0ed951dca2..7985b40f70 100644 --- a/voxygen/src/anim/src/quadruped_medium/mod.rs +++ b/voxygen/src/anim/src/quadruped_medium/mod.rs @@ -148,7 +148,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Bonerattler, _) => (-1.0, 2.5), (Deer, Male) => (0.5, 3.5), (Deer, Female) => (0.5, 3.5), - (Hirdrassil, _) => (0.0, 5.0), + (Hirdrasil, _) => (0.0, 5.0), }, neck: match (body.species, body.body_type) { (Grolgar, _) => (1.0, -1.0), @@ -163,7 +163,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Catoblepas, _) => (19.5, -2.0), (Bonerattler, _) => (7.0, -1.5), (Deer, _) => (-0.5, 1.0), - (Hirdrassil, _) => (-1.0, 0.5), + (Hirdrasil, _) => (-1.0, 0.5), }, jaw: match (body.species, body.body_type) { (Grolgar, _) => (7.0, 1.5), @@ -178,7 +178,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Catoblepas, _) => (1.0, -4.0), (Bonerattler, _) => (3.0, -3.0), (Deer, _) => (3.5, 2.0), - (Hirdrassil, _) => (2.5, 2.5), + (Hirdrasil, _) => (2.5, 2.5), }, tail: match (body.species, body.body_type) { (Grolgar, _) => (-11.5, -0.5), @@ -193,22 +193,22 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Catoblepas, _) => (-8.5, -2.0), (Bonerattler, _) => (-10.0, 1.5), (Deer, _) => (-8.5, 0.5), - (Hirdrassil, _) => (-11.0, 2.0), + (Hirdrasil, _) => (-11.0, 2.0), }, torso_front: match (body.species, body.body_type) { (Grolgar, _) => (10.0, 13.0), (Saber, _) => (14.0, 14.0), (Tuskram, _) => (10.0, 14.5), - (Lion, _) => (10.0, 14.0), + (Lion, _) => (10.0, 12.5), (Tarasque, _) => (11.5, 18.5), - (Tiger, _) => (10.0, 14.0), + (Tiger, _) => (10.0, 13.0), (Wolf, _) => (12.0, 13.0), (Frostfang, _) => (9.0, 11.5), (Mouflon, _) => (11.0, 13.5), (Catoblepas, _) => (7.5, 19.5), (Bonerattler, _) => (6.0, 12.5), (Deer, _) => (11.0, 13.5), - (Hirdrassil, _) => (11.0, 14.5), + (Hirdrasil, _) => (11.0, 14.5), }, torso_back: match (body.species, body.body_type) { (Grolgar, _) => (-10.0, 1.5), @@ -216,14 +216,14 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Tuskram, _) => (-12.5, -2.0), (Lion, _) => (-12.0, -0.5), (Tarasque, _) => (-14.0, -1.0), - (Tiger, _) => (-13.0, 0.0), + (Tiger, _) => (-13.0, -0.5), (Wolf, _) => (-12.5, 1.0), (Frostfang, _) => (-10.5, 0.0), (Mouflon, _) => (-8.5, -0.5), (Catoblepas, _) => (-8.5, -4.5), (Bonerattler, _) => (-5.0, 0.0), (Deer, _) => (-9.0, 0.5), - (Hirdrassil, _) => (-9.0, -0.5), + (Hirdrasil, _) => (-9.0, -0.5), }, ears: match (body.species, body.body_type) { (Grolgar, _) => (5.0, 8.0), @@ -238,67 +238,67 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Catoblepas, _) => (11.0, -3.0), (Bonerattler, _) => (2.0, 3.5), (Deer, _) => (2.5, 5.0), - (Hirdrassil, _) => (2.5, 5.0), + (Hirdrasil, _) => (2.5, 5.0), }, leg_f: match (body.species, body.body_type) { - (Grolgar, _) => (7.0, -2.0, 2.0), + (Grolgar, _) => (7.5, -5.5, -1.0), (Saber, _) => (7.0, -4.0, -3.5), - (Tuskram, _) => (6.0, -6.5, -0.5), - (Lion, _) => (6.5, -6.5, -2.0), + (Tuskram, _) => (6.0, -6.5, -4.0), + (Lion, _) => (6.5, -6.5, -1.5), (Tarasque, _) => (7.0, -8.0, -6.0), - (Tiger, _) => (6.0, -5.0, 1.0), + (Tiger, _) => (6.0, -6.0, -1.5), (Wolf, _) => (4.5, -6.5, -1.5), (Frostfang, _) => (5.5, -5.5, -2.0), (Mouflon, _) => (4.0, -5.0, -4.0), - (Catoblepas, _) => (7.0, 2.0, -6.0), + (Catoblepas, _) => (7.0, 2.0, -5.0), (Bonerattler, _) => (5.5, 5.0, -4.0), (Deer, _) => (3.5, -4.5, -3.5), - (Hirdrassil, _) => (4.5, -5.0, -2.5), + (Hirdrasil, _) => (4.5, -5.0, -2.5), }, leg_b: match (body.species, body.body_type) { - (Grolgar, _) => (6.0, -6.5, -5.5), + (Grolgar, _) => (6.0, -6.5, -4.0), (Saber, _) => (6.0, -7.0, -3.5), - (Tuskram, _) => (5.0, -5.5, -3.5), - (Lion, _) => (6.0, -6.0, -2.0), + (Tuskram, _) => (5.0, -4.5, -2.5), + (Lion, _) => (6.0, -5.0, -1.5), (Tarasque, _) => (6.0, -6.5, -6.5), - (Tiger, _) => (6.0, -7.5, 1.0), + (Tiger, _) => (6.0, -7.0, -1.0), (Wolf, _) => (5.0, -6.5, -3.0), (Frostfang, _) => (3.5, -4.5, -2.0), (Mouflon, _) => (3.5, -8.0, -3.5), (Catoblepas, _) => (6.0, -2.5, -2.5), (Bonerattler, _) => (6.0, -8.0, -4.0), (Deer, _) => (3.0, -6.5, -3.5), - (Hirdrassil, _) => (4.0, -6.5, -3.0), + (Hirdrasil, _) => (4.0, -6.5, -3.0), }, feet_f: match (body.species, body.body_type) { - (Grolgar, _) => (0.0, -3.0, -9.0), + (Grolgar, _) => (0.0, 0.0, -4.0), (Saber, _) => (1.0, -3.5, -2.5), - (Tuskram, _) => (0.5, 0.5, -9.0), - (Lion, _) => (0.0, 0.0, -7.0), + (Tuskram, _) => (0.5, 0.5, -3.0), + (Lion, _) => (0.5, 0.5, -3.5), (Tarasque, _) => (1.0, 0.0, -3.0), - (Tiger, _) => (0.5, 0.0, -9.0), + (Tiger, _) => (0.5, 0.0, -4.5), (Wolf, _) => (0.5, 0.0, -2.0), (Frostfang, _) => (0.5, 1.5, -3.5), (Mouflon, _) => (-0.5, -0.5, -3.0), - (Catoblepas, _) => (1.0, 4.0, -3.0), + (Catoblepas, _) => (1.0, 0.0, -6.0), (Bonerattler, _) => (-0.5, -3.0, -2.5), (Deer, _) => (-0.5, -0.5, -2.5), - (Hirdrassil, _) => (-0.5, -3.0, -3.5), + (Hirdrasil, _) => (-0.5, -3.0, -3.5), }, feet_b: match (body.species, body.body_type) { - (Grolgar, _) => (0.0, -1.0, -5.0), + (Grolgar, _) => (0.5, -1.5, -3.0), (Saber, _) => (1.0, -1.0, -1.0), - (Tuskram, _) => (0.5, 0.0, -3.5), - (Lion, _) => (0.5, 0.5, -5.5), + (Tuskram, _) => (0.5,-1.0, -2.5), + (Lion, _) => (0.5, -1.0, -3.0), (Tarasque, _) => (1.5, -1.0, -2.5), - (Tiger, _) => (1.0, 0.5, -8.0), + (Tiger, _) => (0.5, -1.0, -4.0), (Wolf, _) => (0.0, -1.0, -1.5), (Frostfang, _) => (0.0, -1.5, -3.5), (Mouflon, _) => (-1.0, 0.0, -0.5), (Catoblepas, _) => (0.5, 0.5, -4.0), (Bonerattler, _) => (0.0, 3.0, -2.5), (Deer, _) => (-1.0, -0.5, -2.0), - (Hirdrassil, _) => (-1.0, -2.0, -4.5), + (Hirdrasil, _) => (-1.0, -2.0, -4.5), }, scaler: match (body.species, body.body_type) { (Grolgar, _) => (1.3), @@ -313,7 +313,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Catoblepas, _) => (1.3), (Bonerattler, _) => (1.0), (Deer, _) => (1.0), - (Hirdrassil, _) => (1.0), + (Hirdrasil, _) => (1.0), }, startangle: match (body.species, body.body_type) { //changes the default angle of front feet @@ -326,10 +326,10 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Wolf, _) => (0.0), (Frostfang, _) => (0.0), (Mouflon, _) => (0.0), - (Catoblepas, _) => (0.2), + (Catoblepas, _) => (-0.5), (Bonerattler, _) => (-0.7), (Deer, _) => (0.0), - (Hirdrassil, _) => (0.0), + (Hirdrasil, _) => (0.0), }, tempo: match (body.species, body.body_type) { (Grolgar, _) => (0.95), @@ -344,7 +344,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Catoblepas, _) => (0.8), (Bonerattler, _) => (1.0), (Deer, _) => (0.85), - (Hirdrassil, _) => (0.85), + (Hirdrasil, _) => (0.85), }, spring: match (body.species, body.body_type) { (Grolgar, _) => (1.0), @@ -355,17 +355,17 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Tiger, _) => (1.0), (Wolf, _) => (1.2), (Frostfang, _) => (1.0), - (Mouflon, _) => (0.6), + (Mouflon, _) => (0.9), (Catoblepas, _) => (0.7), (Bonerattler, _) => (1.1), (Deer, _) => (0.9), - (Hirdrassil, _) => (1.1), + (Hirdrasil, _) => (1.1), }, feed: match (body.species, body.body_type) { (Tuskram, _) => (true, 0.5), (Mouflon, _) => (true, 1.0), (Deer, _) => (true, 1.0), - (Hirdrassil, _) => (true, 0.9), + (Hirdrasil, _) => (true, 0.9), (_, _) => (false, 0.0), }, }