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 5a5636c50f..791e8d24a7 100644 Binary files a/assets/voxygen/voxel/npc/catoblepas/male/foot_fl.vox and b/assets/voxygen/voxel/npc/catoblepas/male/foot_fl.vox differ diff --git a/assets/voxygen/voxel/npc/catoblepas/male/foot_fr.vox b/assets/voxygen/voxel/npc/catoblepas/male/foot_fr.vox index 43f33c4841..286d47768d 100644 Binary files a/assets/voxygen/voxel/npc/catoblepas/male/foot_fr.vox and b/assets/voxygen/voxel/npc/catoblepas/male/foot_fr.vox differ diff --git a/assets/voxygen/voxel/npc/catoblepas/male/leg_fl.vox b/assets/voxygen/voxel/npc/catoblepas/male/leg_fl.vox index 30f53292cb..2ca7b50525 100644 Binary files a/assets/voxygen/voxel/npc/catoblepas/male/leg_fl.vox and b/assets/voxygen/voxel/npc/catoblepas/male/leg_fl.vox differ diff --git a/assets/voxygen/voxel/npc/catoblepas/male/leg_fr.vox b/assets/voxygen/voxel/npc/catoblepas/male/leg_fr.vox index 1a213054ae..b1f90e5234 100644 Binary files a/assets/voxygen/voxel/npc/catoblepas/male/leg_fr.vox and b/assets/voxygen/voxel/npc/catoblepas/male/leg_fr.vox differ diff --git a/assets/voxygen/voxel/npc/grolgar/male/foot_bl.vox b/assets/voxygen/voxel/npc/grolgar/male/foot_bl.vox index 0d73b9b1b7..2a7a3d0165 100644 Binary files a/assets/voxygen/voxel/npc/grolgar/male/foot_bl.vox and b/assets/voxygen/voxel/npc/grolgar/male/foot_bl.vox differ diff --git a/assets/voxygen/voxel/npc/grolgar/male/foot_br.vox b/assets/voxygen/voxel/npc/grolgar/male/foot_br.vox index 950b33e69b..cab4c28e19 100644 Binary files a/assets/voxygen/voxel/npc/grolgar/male/foot_br.vox and b/assets/voxygen/voxel/npc/grolgar/male/foot_br.vox differ diff --git a/assets/voxygen/voxel/npc/grolgar/male/foot_fl.vox b/assets/voxygen/voxel/npc/grolgar/male/foot_fl.vox index c68529471f..0e67dbb2f2 100644 Binary files a/assets/voxygen/voxel/npc/grolgar/male/foot_fl.vox and b/assets/voxygen/voxel/npc/grolgar/male/foot_fl.vox differ diff --git a/assets/voxygen/voxel/npc/grolgar/male/foot_fr.vox b/assets/voxygen/voxel/npc/grolgar/male/foot_fr.vox index b438522f4a..97163318d9 100644 Binary files a/assets/voxygen/voxel/npc/grolgar/male/foot_fr.vox and b/assets/voxygen/voxel/npc/grolgar/male/foot_fr.vox differ diff --git a/assets/voxygen/voxel/npc/grolgar/male/leg_bl.vox b/assets/voxygen/voxel/npc/grolgar/male/leg_bl.vox index a3e85d4508..c1076caf06 100644 Binary files a/assets/voxygen/voxel/npc/grolgar/male/leg_bl.vox and b/assets/voxygen/voxel/npc/grolgar/male/leg_bl.vox differ diff --git a/assets/voxygen/voxel/npc/grolgar/male/leg_br.vox b/assets/voxygen/voxel/npc/grolgar/male/leg_br.vox index c26d7422b3..9303ac8ef0 100644 Binary files a/assets/voxygen/voxel/npc/grolgar/male/leg_br.vox and b/assets/voxygen/voxel/npc/grolgar/male/leg_br.vox differ diff --git a/assets/voxygen/voxel/npc/grolgar/male/leg_fl.vox b/assets/voxygen/voxel/npc/grolgar/male/leg_fl.vox index c014543d87..2befe25e20 100644 Binary files a/assets/voxygen/voxel/npc/grolgar/male/leg_fl.vox and b/assets/voxygen/voxel/npc/grolgar/male/leg_fl.vox differ diff --git a/assets/voxygen/voxel/npc/grolgar/male/leg_fr.vox b/assets/voxygen/voxel/npc/grolgar/male/leg_fr.vox index ccf10306b3..2bd00c59ed 100644 Binary files a/assets/voxygen/voxel/npc/grolgar/male/leg_fr.vox and b/assets/voxygen/voxel/npc/grolgar/male/leg_fr.vox differ 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..dcf707fc9a Binary files /dev/null and b/assets/voxygen/voxel/npc/hirdrasil/male/neck.vox differ 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..93746f4e37 Binary files /dev/null and b/assets/voxygen/voxel/npc/hirdrasil/male/torso_front.vox differ 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 ae433a7851..0000000000 Binary files a/assets/voxygen/voxel/npc/hirdrassil/male/neck.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/lion/male/foot_bl.vox b/assets/voxygen/voxel/npc/lion/male/foot_bl.vox index 111c15fea5..816e22ba2e 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/foot_bl.vox and b/assets/voxygen/voxel/npc/lion/male/foot_bl.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/foot_br.vox b/assets/voxygen/voxel/npc/lion/male/foot_br.vox index d0c02b7eb1..9bf9d7d207 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/foot_br.vox and b/assets/voxygen/voxel/npc/lion/male/foot_br.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/foot_fl.vox b/assets/voxygen/voxel/npc/lion/male/foot_fl.vox index bbb281ac94..4dec3fe598 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/foot_fl.vox and b/assets/voxygen/voxel/npc/lion/male/foot_fl.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/foot_fr.vox b/assets/voxygen/voxel/npc/lion/male/foot_fr.vox index 312dde3f5b..fee64f1491 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/foot_fr.vox and b/assets/voxygen/voxel/npc/lion/male/foot_fr.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/leg_bl.vox b/assets/voxygen/voxel/npc/lion/male/leg_bl.vox index 1f02772c67..0a9b248299 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/leg_bl.vox and b/assets/voxygen/voxel/npc/lion/male/leg_bl.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/leg_br.vox b/assets/voxygen/voxel/npc/lion/male/leg_br.vox index 791de7c1e3..f1d6bc499a 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/leg_br.vox and b/assets/voxygen/voxel/npc/lion/male/leg_br.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/leg_fl.vox b/assets/voxygen/voxel/npc/lion/male/leg_fl.vox index 1a5d8d51e3..56cdb9d444 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/leg_fl.vox and b/assets/voxygen/voxel/npc/lion/male/leg_fl.vox differ diff --git a/assets/voxygen/voxel/npc/lion/male/leg_fr.vox b/assets/voxygen/voxel/npc/lion/male/leg_fr.vox index 6a46112e8c..5e8312e003 100644 Binary files a/assets/voxygen/voxel/npc/lion/male/leg_fr.vox and b/assets/voxygen/voxel/npc/lion/male/leg_fr.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/foot_bl.vox b/assets/voxygen/voxel/npc/tiger/male/foot_bl.vox index 74c360990a..beeb0f7976 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/foot_bl.vox and b/assets/voxygen/voxel/npc/tiger/male/foot_bl.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/foot_br.vox b/assets/voxygen/voxel/npc/tiger/male/foot_br.vox index b160dbb328..0648c821b1 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/foot_br.vox and b/assets/voxygen/voxel/npc/tiger/male/foot_br.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/foot_fl.vox b/assets/voxygen/voxel/npc/tiger/male/foot_fl.vox index 8f4b28db0d..879cf90238 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/foot_fl.vox and b/assets/voxygen/voxel/npc/tiger/male/foot_fl.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/foot_fr.vox b/assets/voxygen/voxel/npc/tiger/male/foot_fr.vox index f5d54a1eef..bb81a11002 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/foot_fr.vox and b/assets/voxygen/voxel/npc/tiger/male/foot_fr.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/head.vox b/assets/voxygen/voxel/npc/tiger/male/head.vox index fee927047c..7322619e73 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/head.vox and b/assets/voxygen/voxel/npc/tiger/male/head.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/jaw.vox b/assets/voxygen/voxel/npc/tiger/male/jaw.vox index 3e148fabc9..71a464b3a6 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/jaw.vox and b/assets/voxygen/voxel/npc/tiger/male/jaw.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/leg_bl.vox b/assets/voxygen/voxel/npc/tiger/male/leg_bl.vox index 3519108d86..70283ab4bc 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/leg_bl.vox and b/assets/voxygen/voxel/npc/tiger/male/leg_bl.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/leg_br.vox b/assets/voxygen/voxel/npc/tiger/male/leg_br.vox index 5ce0a2aedc..88c6f0dffc 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/leg_br.vox and b/assets/voxygen/voxel/npc/tiger/male/leg_br.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/leg_fl.vox b/assets/voxygen/voxel/npc/tiger/male/leg_fl.vox index 692358cb4c..8d9a9399bb 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/leg_fl.vox and b/assets/voxygen/voxel/npc/tiger/male/leg_fl.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/leg_fr.vox b/assets/voxygen/voxel/npc/tiger/male/leg_fr.vox index 8dd4f55da6..31acc72faa 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/leg_fr.vox and b/assets/voxygen/voxel/npc/tiger/male/leg_fr.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/neck.vox b/assets/voxygen/voxel/npc/tiger/male/neck.vox index cf3f3839f7..65f16c3932 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/neck.vox and b/assets/voxygen/voxel/npc/tiger/male/neck.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/torso_back.vox b/assets/voxygen/voxel/npc/tiger/male/torso_back.vox index 85708a6929..fa6d9ad839 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/torso_back.vox and b/assets/voxygen/voxel/npc/tiger/male/torso_back.vox differ diff --git a/assets/voxygen/voxel/npc/tiger/male/torso_front.vox b/assets/voxygen/voxel/npc/tiger/male/torso_front.vox index 9ed832769a..b4b74fd447 100644 Binary files a/assets/voxygen/voxel/npc/tiger/male/torso_front.vox and b/assets/voxygen/voxel/npc/tiger/male/torso_front.vox differ diff --git a/assets/voxygen/voxel/npc/tuskram/male/foot_bl.vox b/assets/voxygen/voxel/npc/tuskram/male/foot_bl.vox index a0675eabfc..7db7b3b9df 100644 Binary files a/assets/voxygen/voxel/npc/tuskram/male/foot_bl.vox and b/assets/voxygen/voxel/npc/tuskram/male/foot_bl.vox differ diff --git a/assets/voxygen/voxel/npc/tuskram/male/foot_br.vox b/assets/voxygen/voxel/npc/tuskram/male/foot_br.vox index 2988cb31b1..48daa1c6e6 100644 Binary files a/assets/voxygen/voxel/npc/tuskram/male/foot_br.vox and b/assets/voxygen/voxel/npc/tuskram/male/foot_br.vox differ diff --git a/assets/voxygen/voxel/npc/tuskram/male/foot_fl.vox b/assets/voxygen/voxel/npc/tuskram/male/foot_fl.vox index 85dcd5043d..fb214e8572 100644 Binary files a/assets/voxygen/voxel/npc/tuskram/male/foot_fl.vox and b/assets/voxygen/voxel/npc/tuskram/male/foot_fl.vox differ diff --git a/assets/voxygen/voxel/npc/tuskram/male/foot_fr.vox b/assets/voxygen/voxel/npc/tuskram/male/foot_fr.vox index 2fc6b34a4b..5cc46ff310 100644 Binary files a/assets/voxygen/voxel/npc/tuskram/male/foot_fr.vox and b/assets/voxygen/voxel/npc/tuskram/male/foot_fr.vox differ diff --git a/assets/voxygen/voxel/npc/tuskram/male/leg_bl.vox b/assets/voxygen/voxel/npc/tuskram/male/leg_bl.vox index 128e7bd0eb..a04cf11301 100644 Binary files a/assets/voxygen/voxel/npc/tuskram/male/leg_bl.vox and b/assets/voxygen/voxel/npc/tuskram/male/leg_bl.vox differ diff --git a/assets/voxygen/voxel/npc/tuskram/male/leg_br.vox b/assets/voxygen/voxel/npc/tuskram/male/leg_br.vox index de20ec4be4..a32879c7a1 100644 Binary files a/assets/voxygen/voxel/npc/tuskram/male/leg_br.vox and b/assets/voxygen/voxel/npc/tuskram/male/leg_br.vox differ diff --git a/assets/voxygen/voxel/npc/tuskram/male/leg_fl.vox b/assets/voxygen/voxel/npc/tuskram/male/leg_fl.vox index 63d3fc488b..3fa9788982 100644 Binary files a/assets/voxygen/voxel/npc/tuskram/male/leg_fl.vox and b/assets/voxygen/voxel/npc/tuskram/male/leg_fl.vox differ diff --git a/assets/voxygen/voxel/npc/tuskram/male/leg_fr.vox b/assets/voxygen/voxel/npc/tuskram/male/leg_fr.vox index 07c851adef..13ef677f4a 100644 Binary files a/assets/voxygen/voxel/npc/tuskram/male/leg_fr.vox and b/assets/voxygen/voxel/npc/tuskram/male/leg_fr.vox differ diff --git a/assets/voxygen/voxel/npc/tuskram/male/neck.vox b/assets/voxygen/voxel/npc/tuskram/male/neck.vox index 874b36148c..72511726be 100644 Binary files a/assets/voxygen/voxel/npc/tuskram/male/neck.vox and b/assets/voxygen/voxel/npc/tuskram/male/neck.vox differ diff --git a/assets/voxygen/voxel/npc/tuskram/male/torso_front.vox b/assets/voxygen/voxel/npc/tuskram/male/torso_front.vox index 0381fd4a35..572778ed47 100644 Binary files a/assets/voxygen/voxel/npc/tuskram/male/torso_front.vox and b/assets/voxygen/voxel/npc/tuskram/male/torso_front.vox differ 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), }, }