From 171e865f57601d9184d62d916fbb809a4fe12876 Mon Sep 17 00:00:00 2001 From: Justin Shipsey Date: Tue, 28 Apr 2020 03:13:23 +0000 Subject: [PATCH] new animals --- CHANGELOG.md | 1 + assets/common/npc_names.json | 12 +++ .../voxel/bird_medium_center_manifest.ron | 65 ++++++++++++++-- .../voxel/bird_medium_lateral_manifest.ron | 74 ++++++++++++++++++- .../voxygen/voxel/npc/eagle/female/head.vox | 4 +- .../voxygen/voxel/npc/eagle/female/leg_l.vox | 4 +- .../voxygen/voxel/npc/eagle/female/leg_r.vox | 4 +- .../voxygen/voxel/npc/eagle/female/tail.vox | 4 +- .../voxygen/voxel/npc/eagle/female/torso.vox | 4 +- .../voxygen/voxel/npc/eagle/female/wing_l.vox | 4 +- .../voxygen/voxel/npc/eagle/female/wing_r.vox | 4 +- assets/voxygen/voxel/npc/eagle/male/head.vox | 4 +- assets/voxygen/voxel/npc/eagle/male/leg_l.vox | 4 +- assets/voxygen/voxel/npc/eagle/male/leg_r.vox | 4 +- assets/voxygen/voxel/npc/eagle/male/tail.vox | 4 +- assets/voxygen/voxel/npc/eagle/male/torso.vox | 4 +- .../voxygen/voxel/npc/eagle/male/wing_l.vox | 4 +- .../voxygen/voxel/npc/eagle/male/wing_r.vox | 4 +- .../voxygen/voxel/npc/hyena/female/chest.vox | 3 + .../voxel/npc/hyena/female/foot_bl.vox | 3 + .../voxel/npc/hyena/female/foot_br.vox | 3 + .../voxel/npc/hyena/female/foot_fl.vox | 3 + .../voxel/npc/hyena/female/foot_fr.vox | 3 + .../voxygen/voxel/npc/hyena/female/head.vox | 3 + assets/voxygen/voxel/npc/hyena/male/chest.vox | 3 + .../voxygen/voxel/npc/hyena/male/foot_bl.vox | 3 + .../voxygen/voxel/npc/hyena/male/foot_br.vox | 3 + .../voxygen/voxel/npc/hyena/male/foot_fl.vox | 3 + .../voxygen/voxel/npc/hyena/male/foot_fr.vox | 3 + assets/voxygen/voxel/npc/hyena/male/head.vox | 3 + .../voxygen/voxel/npc/parrot/female/head.vox | 3 + .../voxygen/voxel/npc/parrot/female/leg_l.vox | 3 + .../voxygen/voxel/npc/parrot/female/leg_r.vox | 3 + .../voxygen/voxel/npc/parrot/female/tail.vox | 3 + .../voxygen/voxel/npc/parrot/female/torso.vox | 3 + .../voxygen/voxel/npc/parrot/female/wing.vox | 3 + assets/voxygen/voxel/npc/parrot/male/head.vox | 3 + .../voxygen/voxel/npc/parrot/male/leg_l.vox | 3 + .../voxygen/voxel/npc/parrot/male/leg_r.vox | 3 + assets/voxygen/voxel/npc/parrot/male/tail.vox | 3 + .../voxygen/voxel/npc/parrot/male/torso.vox | 3 + assets/voxygen/voxel/npc/parrot/male/wing.vox | 3 + assets/voxygen/voxel/npc/sheep/male/head.vox | 4 +- .../voxel/npc/snowyowl/female/head.vox | 3 + .../voxel/npc/snowyowl/female/leg_l.vox | 3 + .../voxel/npc/snowyowl/female/leg_r.vox | 3 + .../voxel/npc/snowyowl/female/tail.vox | 3 + .../voxel/npc/snowyowl/female/torso.vox | 3 + .../voxel/npc/snowyowl/female/wing_l.vox | 3 + .../voxel/npc/snowyowl/female/wing_r.vox | 3 + .../voxygen/voxel/npc/snowyowl/male/head.vox | 3 + .../voxygen/voxel/npc/snowyowl/male/leg_l.vox | 3 + .../voxygen/voxel/npc/snowyowl/male/leg_r.vox | 3 + .../voxygen/voxel/npc/snowyowl/male/tail.vox | 3 + .../voxygen/voxel/npc/snowyowl/male/torso.vox | 3 + .../voxel/npc/snowyowl/male/wing_l.vox | 3 + .../voxel/npc/snowyowl/male/wing_r.vox | 3 + .../quadruped_small_central_manifest.ron | 26 ++++++- .../quadruped_small_lateral_manifest.ron | 39 +++++++++- common/src/comp/body/bird_medium.rs | 10 ++- common/src/comp/body/quadruped_small.rs | 6 +- voxygen/src/anim/bird_medium/mod.rs | 12 ++- voxygen/src/anim/quadruped_small/mod.rs | 4 + 63 files changed, 381 insertions(+), 42 deletions(-) create mode 100644 assets/voxygen/voxel/npc/hyena/female/chest.vox create mode 100644 assets/voxygen/voxel/npc/hyena/female/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/hyena/female/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/hyena/female/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/hyena/female/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/hyena/female/head.vox create mode 100644 assets/voxygen/voxel/npc/hyena/male/chest.vox create mode 100644 assets/voxygen/voxel/npc/hyena/male/foot_bl.vox create mode 100644 assets/voxygen/voxel/npc/hyena/male/foot_br.vox create mode 100644 assets/voxygen/voxel/npc/hyena/male/foot_fl.vox create mode 100644 assets/voxygen/voxel/npc/hyena/male/foot_fr.vox create mode 100644 assets/voxygen/voxel/npc/hyena/male/head.vox create mode 100644 assets/voxygen/voxel/npc/parrot/female/head.vox create mode 100644 assets/voxygen/voxel/npc/parrot/female/leg_l.vox create mode 100644 assets/voxygen/voxel/npc/parrot/female/leg_r.vox create mode 100644 assets/voxygen/voxel/npc/parrot/female/tail.vox create mode 100644 assets/voxygen/voxel/npc/parrot/female/torso.vox create mode 100644 assets/voxygen/voxel/npc/parrot/female/wing.vox create mode 100644 assets/voxygen/voxel/npc/parrot/male/head.vox create mode 100644 assets/voxygen/voxel/npc/parrot/male/leg_l.vox create mode 100644 assets/voxygen/voxel/npc/parrot/male/leg_r.vox create mode 100644 assets/voxygen/voxel/npc/parrot/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/parrot/male/torso.vox create mode 100644 assets/voxygen/voxel/npc/parrot/male/wing.vox create mode 100644 assets/voxygen/voxel/npc/snowyowl/female/head.vox create mode 100644 assets/voxygen/voxel/npc/snowyowl/female/leg_l.vox create mode 100644 assets/voxygen/voxel/npc/snowyowl/female/leg_r.vox create mode 100644 assets/voxygen/voxel/npc/snowyowl/female/tail.vox create mode 100644 assets/voxygen/voxel/npc/snowyowl/female/torso.vox create mode 100644 assets/voxygen/voxel/npc/snowyowl/female/wing_l.vox create mode 100644 assets/voxygen/voxel/npc/snowyowl/female/wing_r.vox create mode 100644 assets/voxygen/voxel/npc/snowyowl/male/head.vox create mode 100644 assets/voxygen/voxel/npc/snowyowl/male/leg_l.vox create mode 100644 assets/voxygen/voxel/npc/snowyowl/male/leg_r.vox create mode 100644 assets/voxygen/voxel/npc/snowyowl/male/tail.vox create mode 100644 assets/voxygen/voxel/npc/snowyowl/male/torso.vox create mode 100644 assets/voxygen/voxel/npc/snowyowl/male/wing_l.vox create mode 100644 assets/voxygen/voxel/npc/snowyowl/male/wing_r.vox diff --git a/CHANGELOG.md b/CHANGELOG.md index 31e03ccaf6..1782eff3de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added non-uniform block heights - Added `/sudo` command - Added a Level of Detail (LoD) system for terrain sprites and entities +- Added owl, hyena, parrot npcs ### Changed diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json index b7add4fb9d..bced2a7ad1 100644 --- a/assets/common/npc_names.json +++ b/assets/common/npc_names.json @@ -433,6 +433,10 @@ "holladon": { "keyword": "holladon", "generic": "Holladon" + }, + "hyena": { + "keyword": "hyena", + "generic": "Hyena" } } }, @@ -463,6 +467,14 @@ "eagle": { "keyword": "eagle", "generic": "Eagle" + }, + "snowyowl": { + "keyword": "snowyowl", + "generic": "Snowy Owl" + }, + "parrot": { + "keyword": "parrot", + "generic": "Parrot" } } }, diff --git a/assets/voxygen/voxel/bird_medium_center_manifest.ron b/assets/voxygen/voxel/bird_medium_center_manifest.ron index 2d7b1ceebd..d89959dc10 100644 --- a/assets/voxygen/voxel/bird_medium_center_manifest.ron +++ b/assets/voxygen/voxel/bird_medium_center_manifest.ron @@ -114,15 +114,15 @@ (Eagle, Male): ( head: ( offset: (-2.0, -2.0, -3.5), - center: ("npc.eagle.female.head"), + center: ("npc.eagle.male.head"), ), torso: ( offset: (-3.0, -4.5, -4.5), - center: ("npc.eagle.female.torso"), + center: ("npc.eagle.male.torso"), ), tail: ( offset: (-2.0, -3.5, -3.5), - center: ("npc.eagle.female.tail"), + center: ("npc.eagle.male.tail"), ) ), (Eagle, Female): ( @@ -139,5 +139,60 @@ center: ("npc.eagle.female.tail"), ) ), -}) - + (Snowyowl, Male): ( + head: ( + offset: (-3.5, -4.5, -4.0), + center: ("npc.snowyowl.male.head"), + ), + torso: ( + offset: (-3.5, -5.0, -3.0), + center: ("npc.snowyowl.male.torso"), + ), + tail: ( + offset: (-2.5, -3.0, -2.0), + center: ("npc.snowyowl.male.tail"), + ) + ), + (Snowyowl, Female): ( + head: ( + offset: (-3.5, -4.5, -4.0), + center: ("npc.snowyowl.female.head"), + ), + torso: ( + offset: (-3.5, -5.0, -3.0), + center: ("npc.snowyowl.female.torso"), + ), + tail: ( + offset: (-2.5, -3.0, -2.0), + center: ("npc.snowyowl.female.tail"), + ) + ), + (Parrot, Male): ( + head: ( + offset: (-1.5, -1.5, -2.5), + center: ("npc.parrot.male.head"), + ), + torso: ( + offset: (-1.5, -3.5, -3.5), + center: ("npc.parrot.male.torso"), + ), + tail: ( + offset: (-1.5, -4.5, -1.5), + center: ("npc.parrot.male.tail"), + ) + ), + (Parrot, Female): ( + head: ( + offset: (-1.5, -1.5, -2.5), + center: ("npc.parrot.female.head"), + ), + torso: ( + offset: (-1.5, -3.5, -3.5), + center: ("npc.parrot.female.torso"), + ), + tail: ( + offset: (-1.5, -4.5, -1.5), + center: ("npc.parrot.female.tail"), + ) + ), +}) \ No newline at end of file diff --git a/assets/voxygen/voxel/bird_medium_lateral_manifest.ron b/assets/voxygen/voxel/bird_medium_lateral_manifest.ron index 909c2fc823..fcde79c0ca 100644 --- a/assets/voxygen/voxel/bird_medium_lateral_manifest.ron +++ b/assets/voxygen/voxel/bird_medium_lateral_manifest.ron @@ -179,4 +179,76 @@ lateral: ("npc.eagle.female.leg_r"), ) ), -}) + (Snowyowl, Male): ( + wing_l: ( + offset: (-1.0, -2.5, -8.0), + lateral: ("npc.snowyowl.male.wing_l"), + ), + wing_r: ( + offset: (-1.0, -2.5, -8.0), + lateral: ("npc.snowyowl.male.wing_r"), + ), + foot_l: ( + offset: (-1.0, 0.0, -6.5), + lateral: ("npc.snowyowl.male.leg_l"), + ), + foot_r: ( + offset: (-1.0, 0.0, -6.5), + lateral: ("npc.snowyowl.male.leg_r"), + ) + ), + (Snowyowl, Female): ( + wing_l: ( + offset: (-1.0, -2.5, -8.0), + lateral: ("npc.snowyowl.female.wing_l"), + ), + wing_r: ( + offset: (-1.0, -2.5, -8.0), + lateral: ("npc.snowyowl.female.wing_r"), + ), + foot_l: ( + offset: (-1.0, 0.0, -6.5), + lateral: ("npc.snowyowl.female.leg_l"), + ), + foot_r: ( + offset: (-1.0, 0.0, -6.5), + lateral: ("npc.snowyowl.female.leg_r"), + ) + ), + (Parrot, Male): ( + wing_l: ( + offset: (-0.5, -2.5, -8.0), + lateral: ("npc.parrot.female.wing"), + ), + wing_r: ( + offset: (-0.5, -2.5, -8.0), + lateral: ("npc.parrot.female.wing"), + ), + foot_l: ( + offset: (-1.0, 0.0, -3.0), + lateral: ("npc.parrot.female.leg_l"), + ), + foot_r: ( + offset: (-1.0, 0.0, -3.0), + lateral: ("npc.parrot.female.leg_r"), + ) + ), + (Parrot, Female): ( + wing_l: ( + offset: (-0.5, -2.5, -8.0), + lateral: ("npc.parrot.female.wing"), + ), + wing_r: ( + offset: (-0.5, -2.5, -8.0), + lateral: ("npc.parrot.female.wing"), + ), + foot_l: ( + offset: (-1.0, 0.0, -3.0), + lateral: ("npc.parrot.female.leg_l"), + ), + foot_r: ( + offset: (-1.0, 0.0, -3.0), + lateral: ("npc.parrot.female.leg_r"), + ) + ), +}) \ No newline at end of file diff --git a/assets/voxygen/voxel/npc/eagle/female/head.vox b/assets/voxygen/voxel/npc/eagle/female/head.vox index 3aeffecc8c..7e9b90a8bb 100644 --- a/assets/voxygen/voxel/npc/eagle/female/head.vox +++ b/assets/voxygen/voxel/npc/eagle/female/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b36eeef95b39217885e50d9c33d711187a90b1245a088c54d045ea484ca18491 -size 1608 +oid sha256:ffd195f8da588b1e0820fa1a485f3eb614cf333db8d23c4196bf5d37704b4d9b +size 56359 diff --git a/assets/voxygen/voxel/npc/eagle/female/leg_l.vox b/assets/voxygen/voxel/npc/eagle/female/leg_l.vox index 31b8befb4f..9af164237c 100644 --- a/assets/voxygen/voxel/npc/eagle/female/leg_l.vox +++ b/assets/voxygen/voxel/npc/eagle/female/leg_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30a26bcede8cd210e71cc743ce08cc29ff76df8b55be39ca81ba1ac93d20d909 -size 1168 +oid sha256:3320d3347b0985ed30004d006a1af88560e2e72ba9240782bb3063318237a8fb +size 55935 diff --git a/assets/voxygen/voxel/npc/eagle/female/leg_r.vox b/assets/voxygen/voxel/npc/eagle/female/leg_r.vox index fdf449ec92..5cc9a0d963 100644 --- a/assets/voxygen/voxel/npc/eagle/female/leg_r.vox +++ b/assets/voxygen/voxel/npc/eagle/female/leg_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5bda2e9383f59ec4317f8e3c57175fe2acafa5a067fa8c9c1eef9e4650fef46 -size 1168 +oid sha256:e5a13d38921242ff84e2c0b4c57dfa5b411edbb33f45f0030bcde460c9c30f5d +size 55935 diff --git a/assets/voxygen/voxel/npc/eagle/female/tail.vox b/assets/voxygen/voxel/npc/eagle/female/tail.vox index 1d805965b7..3d5781c99d 100644 --- a/assets/voxygen/voxel/npc/eagle/female/tail.vox +++ b/assets/voxygen/voxel/npc/eagle/female/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:615dc2933805af3f0be6241021305ef5da3490d28e3774bf83d8030e5ef966db -size 1192 +oid sha256:7ba93bbb5eea8ed012ddff0a6b41183250dc185e4f5525a30424932b32d6c765 +size 55959 diff --git a/assets/voxygen/voxel/npc/eagle/female/torso.vox b/assets/voxygen/voxel/npc/eagle/female/torso.vox index 17a4a09ea4..99a75779b2 100644 --- a/assets/voxygen/voxel/npc/eagle/female/torso.vox +++ b/assets/voxygen/voxel/npc/eagle/female/torso.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a7bf5e7a20fc8b2a924eee317123760f9ceba4f714e1a5ad6e34735111b634c -size 2136 +oid sha256:8069c0886888fa3dc741ff0eb7c4701ffe93f3cff5017a6c7c4fff248ea4da1d +size 56911 diff --git a/assets/voxygen/voxel/npc/eagle/female/wing_l.vox b/assets/voxygen/voxel/npc/eagle/female/wing_l.vox index 71dbf9a9b8..945571cf36 100644 --- a/assets/voxygen/voxel/npc/eagle/female/wing_l.vox +++ b/assets/voxygen/voxel/npc/eagle/female/wing_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a8c4852cb663caf77805a111f8b4d8ae27b17bf5819e281d3f1b3d6f0866250 -size 1532 +oid sha256:d7be8776a3f86210e4154384ef5511151192b189dcfd752dc19e2b4870be3472 +size 56295 diff --git a/assets/voxygen/voxel/npc/eagle/female/wing_r.vox b/assets/voxygen/voxel/npc/eagle/female/wing_r.vox index 53ddbe5680..d229ec73eb 100644 --- a/assets/voxygen/voxel/npc/eagle/female/wing_r.vox +++ b/assets/voxygen/voxel/npc/eagle/female/wing_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a9efd962517729b3aaedebf4d8bb08914885670edd5fbb134f49f28cf837c2f -size 1532 +oid sha256:579a144b10cefe371fcc16f60625887f4ad99cc8433fc0fc9e3c6bc4361d41eb +size 56295 diff --git a/assets/voxygen/voxel/npc/eagle/male/head.vox b/assets/voxygen/voxel/npc/eagle/male/head.vox index 3aeffecc8c..7e9b90a8bb 100644 --- a/assets/voxygen/voxel/npc/eagle/male/head.vox +++ b/assets/voxygen/voxel/npc/eagle/male/head.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b36eeef95b39217885e50d9c33d711187a90b1245a088c54d045ea484ca18491 -size 1608 +oid sha256:ffd195f8da588b1e0820fa1a485f3eb614cf333db8d23c4196bf5d37704b4d9b +size 56359 diff --git a/assets/voxygen/voxel/npc/eagle/male/leg_l.vox b/assets/voxygen/voxel/npc/eagle/male/leg_l.vox index 31b8befb4f..9af164237c 100644 --- a/assets/voxygen/voxel/npc/eagle/male/leg_l.vox +++ b/assets/voxygen/voxel/npc/eagle/male/leg_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30a26bcede8cd210e71cc743ce08cc29ff76df8b55be39ca81ba1ac93d20d909 -size 1168 +oid sha256:3320d3347b0985ed30004d006a1af88560e2e72ba9240782bb3063318237a8fb +size 55935 diff --git a/assets/voxygen/voxel/npc/eagle/male/leg_r.vox b/assets/voxygen/voxel/npc/eagle/male/leg_r.vox index fdf449ec92..5cc9a0d963 100644 --- a/assets/voxygen/voxel/npc/eagle/male/leg_r.vox +++ b/assets/voxygen/voxel/npc/eagle/male/leg_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5bda2e9383f59ec4317f8e3c57175fe2acafa5a067fa8c9c1eef9e4650fef46 -size 1168 +oid sha256:e5a13d38921242ff84e2c0b4c57dfa5b411edbb33f45f0030bcde460c9c30f5d +size 55935 diff --git a/assets/voxygen/voxel/npc/eagle/male/tail.vox b/assets/voxygen/voxel/npc/eagle/male/tail.vox index 1d805965b7..89de841150 100644 --- a/assets/voxygen/voxel/npc/eagle/male/tail.vox +++ b/assets/voxygen/voxel/npc/eagle/male/tail.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:615dc2933805af3f0be6241021305ef5da3490d28e3774bf83d8030e5ef966db -size 1192 +oid sha256:04378f81b5f5cce6ad5d6126217e5ad0ce3b1c59095b154d957cbf3dddc38fd4 +size 55959 diff --git a/assets/voxygen/voxel/npc/eagle/male/torso.vox b/assets/voxygen/voxel/npc/eagle/male/torso.vox index 17a4a09ea4..99a75779b2 100644 --- a/assets/voxygen/voxel/npc/eagle/male/torso.vox +++ b/assets/voxygen/voxel/npc/eagle/male/torso.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a7bf5e7a20fc8b2a924eee317123760f9ceba4f714e1a5ad6e34735111b634c -size 2136 +oid sha256:8069c0886888fa3dc741ff0eb7c4701ffe93f3cff5017a6c7c4fff248ea4da1d +size 56911 diff --git a/assets/voxygen/voxel/npc/eagle/male/wing_l.vox b/assets/voxygen/voxel/npc/eagle/male/wing_l.vox index 71dbf9a9b8..945571cf36 100644 --- a/assets/voxygen/voxel/npc/eagle/male/wing_l.vox +++ b/assets/voxygen/voxel/npc/eagle/male/wing_l.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a8c4852cb663caf77805a111f8b4d8ae27b17bf5819e281d3f1b3d6f0866250 -size 1532 +oid sha256:d7be8776a3f86210e4154384ef5511151192b189dcfd752dc19e2b4870be3472 +size 56295 diff --git a/assets/voxygen/voxel/npc/eagle/male/wing_r.vox b/assets/voxygen/voxel/npc/eagle/male/wing_r.vox index 53ddbe5680..d229ec73eb 100644 --- a/assets/voxygen/voxel/npc/eagle/male/wing_r.vox +++ b/assets/voxygen/voxel/npc/eagle/male/wing_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a9efd962517729b3aaedebf4d8bb08914885670edd5fbb134f49f28cf837c2f -size 1532 +oid sha256:579a144b10cefe371fcc16f60625887f4ad99cc8433fc0fc9e3c6bc4361d41eb +size 56295 diff --git a/assets/voxygen/voxel/npc/hyena/female/chest.vox b/assets/voxygen/voxel/npc/hyena/female/chest.vox new file mode 100644 index 0000000000..b17066fdc7 --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/female/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:637e62b0a5d3eeb9d029c177cfebf5d756770f4c328e12123d938a82c6347455 +size 57259 diff --git a/assets/voxygen/voxel/npc/hyena/female/foot_bl.vox b/assets/voxygen/voxel/npc/hyena/female/foot_bl.vox new file mode 100644 index 0000000000..b878edabf2 --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/female/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:177489285a01e175402ec4c2fc12cc01446ba36ad4abc7c5e843b1a9c157d176 +size 55727 diff --git a/assets/voxygen/voxel/npc/hyena/female/foot_br.vox b/assets/voxygen/voxel/npc/hyena/female/foot_br.vox new file mode 100644 index 0000000000..75a40b49bd --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/female/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63a1228b6a3d021b58cb38f10ada645352fc51523703f965c026e432f847ab8f +size 55727 diff --git a/assets/voxygen/voxel/npc/hyena/female/foot_fl.vox b/assets/voxygen/voxel/npc/hyena/female/foot_fl.vox new file mode 100644 index 0000000000..4dbda92c7e --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/female/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cc757e64f3b5f7109df888d1549eac48555251aa03d69884ffa3bfe41eaac5d +size 55755 diff --git a/assets/voxygen/voxel/npc/hyena/female/foot_fr.vox b/assets/voxygen/voxel/npc/hyena/female/foot_fr.vox new file mode 100644 index 0000000000..f9c83ee8ed --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/female/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a545bd32088e335ec2ab921098110ae41522ae7d4d815803f005bd2440689d03 +size 55755 diff --git a/assets/voxygen/voxel/npc/hyena/female/head.vox b/assets/voxygen/voxel/npc/hyena/female/head.vox new file mode 100644 index 0000000000..6dd7361de0 --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/female/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:640a8b9d79048abe27f5dedbbb8c13eb1fd388ffcfe432cf0146ac4dd7c98617 +size 56011 diff --git a/assets/voxygen/voxel/npc/hyena/male/chest.vox b/assets/voxygen/voxel/npc/hyena/male/chest.vox new file mode 100644 index 0000000000..b17066fdc7 --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/male/chest.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:637e62b0a5d3eeb9d029c177cfebf5d756770f4c328e12123d938a82c6347455 +size 57259 diff --git a/assets/voxygen/voxel/npc/hyena/male/foot_bl.vox b/assets/voxygen/voxel/npc/hyena/male/foot_bl.vox new file mode 100644 index 0000000000..b878edabf2 --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/male/foot_bl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:177489285a01e175402ec4c2fc12cc01446ba36ad4abc7c5e843b1a9c157d176 +size 55727 diff --git a/assets/voxygen/voxel/npc/hyena/male/foot_br.vox b/assets/voxygen/voxel/npc/hyena/male/foot_br.vox new file mode 100644 index 0000000000..75a40b49bd --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/male/foot_br.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63a1228b6a3d021b58cb38f10ada645352fc51523703f965c026e432f847ab8f +size 55727 diff --git a/assets/voxygen/voxel/npc/hyena/male/foot_fl.vox b/assets/voxygen/voxel/npc/hyena/male/foot_fl.vox new file mode 100644 index 0000000000..4dbda92c7e --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/male/foot_fl.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cc757e64f3b5f7109df888d1549eac48555251aa03d69884ffa3bfe41eaac5d +size 55755 diff --git a/assets/voxygen/voxel/npc/hyena/male/foot_fr.vox b/assets/voxygen/voxel/npc/hyena/male/foot_fr.vox new file mode 100644 index 0000000000..f9c83ee8ed --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/male/foot_fr.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a545bd32088e335ec2ab921098110ae41522ae7d4d815803f005bd2440689d03 +size 55755 diff --git a/assets/voxygen/voxel/npc/hyena/male/head.vox b/assets/voxygen/voxel/npc/hyena/male/head.vox new file mode 100644 index 0000000000..6dd7361de0 --- /dev/null +++ b/assets/voxygen/voxel/npc/hyena/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:640a8b9d79048abe27f5dedbbb8c13eb1fd388ffcfe432cf0146ac4dd7c98617 +size 56011 diff --git a/assets/voxygen/voxel/npc/parrot/female/head.vox b/assets/voxygen/voxel/npc/parrot/female/head.vox new file mode 100644 index 0000000000..5d7c990133 --- /dev/null +++ b/assets/voxygen/voxel/npc/parrot/female/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66c365bb5e8149927759c82af7eb881228a49abb04243021800fd2be29ca5c4b +size 55827 diff --git a/assets/voxygen/voxel/npc/parrot/female/leg_l.vox b/assets/voxygen/voxel/npc/parrot/female/leg_l.vox new file mode 100644 index 0000000000..d977d83d76 --- /dev/null +++ b/assets/voxygen/voxel/npc/parrot/female/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:844daecb446b9e9d12521c5b56a6040e1e3cd0e494391a5fddfb4369dd50e97f +size 55599 diff --git a/assets/voxygen/voxel/npc/parrot/female/leg_r.vox b/assets/voxygen/voxel/npc/parrot/female/leg_r.vox new file mode 100644 index 0000000000..3fec4b1c02 --- /dev/null +++ b/assets/voxygen/voxel/npc/parrot/female/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:949103f9884dc1ed422037e616a310e9b577515aa9075879591465a3c076b11e +size 55599 diff --git a/assets/voxygen/voxel/npc/parrot/female/tail.vox b/assets/voxygen/voxel/npc/parrot/female/tail.vox new file mode 100644 index 0000000000..78fa5607cd --- /dev/null +++ b/assets/voxygen/voxel/npc/parrot/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ca097a4bf6730a3585944f368a67a6aa751a620d909548ec78a167f273a4d95 +size 55711 diff --git a/assets/voxygen/voxel/npc/parrot/female/torso.vox b/assets/voxygen/voxel/npc/parrot/female/torso.vox new file mode 100644 index 0000000000..9bfa6d80aa --- /dev/null +++ b/assets/voxygen/voxel/npc/parrot/female/torso.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ff169f4873e685cf808d265ccb8da38f5fe2c04bd0e38cb0c8e4e650cbde606 +size 55887 diff --git a/assets/voxygen/voxel/npc/parrot/female/wing.vox b/assets/voxygen/voxel/npc/parrot/female/wing.vox new file mode 100644 index 0000000000..e3e9bae821 --- /dev/null +++ b/assets/voxygen/voxel/npc/parrot/female/wing.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f7358b05929a0825d3bb9ef3fd91e47cd8e646cb50a19c9902885623a39c702 +size 55707 diff --git a/assets/voxygen/voxel/npc/parrot/male/head.vox b/assets/voxygen/voxel/npc/parrot/male/head.vox new file mode 100644 index 0000000000..5d7c990133 --- /dev/null +++ b/assets/voxygen/voxel/npc/parrot/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66c365bb5e8149927759c82af7eb881228a49abb04243021800fd2be29ca5c4b +size 55827 diff --git a/assets/voxygen/voxel/npc/parrot/male/leg_l.vox b/assets/voxygen/voxel/npc/parrot/male/leg_l.vox new file mode 100644 index 0000000000..d977d83d76 --- /dev/null +++ b/assets/voxygen/voxel/npc/parrot/male/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:844daecb446b9e9d12521c5b56a6040e1e3cd0e494391a5fddfb4369dd50e97f +size 55599 diff --git a/assets/voxygen/voxel/npc/parrot/male/leg_r.vox b/assets/voxygen/voxel/npc/parrot/male/leg_r.vox new file mode 100644 index 0000000000..3fec4b1c02 --- /dev/null +++ b/assets/voxygen/voxel/npc/parrot/male/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:949103f9884dc1ed422037e616a310e9b577515aa9075879591465a3c076b11e +size 55599 diff --git a/assets/voxygen/voxel/npc/parrot/male/tail.vox b/assets/voxygen/voxel/npc/parrot/male/tail.vox new file mode 100644 index 0000000000..78fa5607cd --- /dev/null +++ b/assets/voxygen/voxel/npc/parrot/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ca097a4bf6730a3585944f368a67a6aa751a620d909548ec78a167f273a4d95 +size 55711 diff --git a/assets/voxygen/voxel/npc/parrot/male/torso.vox b/assets/voxygen/voxel/npc/parrot/male/torso.vox new file mode 100644 index 0000000000..9bfa6d80aa --- /dev/null +++ b/assets/voxygen/voxel/npc/parrot/male/torso.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ff169f4873e685cf808d265ccb8da38f5fe2c04bd0e38cb0c8e4e650cbde606 +size 55887 diff --git a/assets/voxygen/voxel/npc/parrot/male/wing.vox b/assets/voxygen/voxel/npc/parrot/male/wing.vox new file mode 100644 index 0000000000..e3e9bae821 --- /dev/null +++ b/assets/voxygen/voxel/npc/parrot/male/wing.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f7358b05929a0825d3bb9ef3fd91e47cd8e646cb50a19c9902885623a39c702 +size 55707 diff --git a/assets/voxygen/voxel/npc/sheep/male/head.vox b/assets/voxygen/voxel/npc/sheep/male/head.vox index b73deee331..81eacd37ea 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:9afd4b0377c1a29586d614cd40b1b8bafb9bbc0e6655386eb2a4c97e9ed645a6 -size 1568 +oid sha256:bafb91f085e9328bc9432855165cab42b26aee02ebc23d3deff48ef77df5cbb0 +size 56403 diff --git a/assets/voxygen/voxel/npc/snowyowl/female/head.vox b/assets/voxygen/voxel/npc/snowyowl/female/head.vox new file mode 100644 index 0000000000..5233239b84 --- /dev/null +++ b/assets/voxygen/voxel/npc/snowyowl/female/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:566aa6781dd74473afc16d3ff16f77427c69f3725f1aca5596371c2b03a97390 +size 56655 diff --git a/assets/voxygen/voxel/npc/snowyowl/female/leg_l.vox b/assets/voxygen/voxel/npc/snowyowl/female/leg_l.vox new file mode 100644 index 0000000000..c6f0c929ec --- /dev/null +++ b/assets/voxygen/voxel/npc/snowyowl/female/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed574df7ee18a8c146347449442a1a5bd78915d35a69059fd56257a32e3d512f +size 55679 diff --git a/assets/voxygen/voxel/npc/snowyowl/female/leg_r.vox b/assets/voxygen/voxel/npc/snowyowl/female/leg_r.vox new file mode 100644 index 0000000000..bae9b62566 --- /dev/null +++ b/assets/voxygen/voxel/npc/snowyowl/female/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1775296d1871876b2d45afc759964f135bab071e92d27984b6a3b5a4495cc05f +size 55679 diff --git a/assets/voxygen/voxel/npc/snowyowl/female/tail.vox b/assets/voxygen/voxel/npc/snowyowl/female/tail.vox new file mode 100644 index 0000000000..3052142f41 --- /dev/null +++ b/assets/voxygen/voxel/npc/snowyowl/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ad90ce412f238f4ccba6c6f178a60292414795d0bf1c8a785df5bade6e9f587 +size 55787 diff --git a/assets/voxygen/voxel/npc/snowyowl/female/torso.vox b/assets/voxygen/voxel/npc/snowyowl/female/torso.vox new file mode 100644 index 0000000000..d8ea6b7177 --- /dev/null +++ b/assets/voxygen/voxel/npc/snowyowl/female/torso.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c27bab60f306c074147bb7ddd32c51b51f9fd132997d4911c60696bd9fb45d3 +size 56611 diff --git a/assets/voxygen/voxel/npc/snowyowl/female/wing_l.vox b/assets/voxygen/voxel/npc/snowyowl/female/wing_l.vox new file mode 100644 index 0000000000..743fb4dbba --- /dev/null +++ b/assets/voxygen/voxel/npc/snowyowl/female/wing_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cabfd81ba0a052193a41b534589cf1fb5a3eae68a6d491ac778b72d3fb3e25e2 +size 55843 diff --git a/assets/voxygen/voxel/npc/snowyowl/female/wing_r.vox b/assets/voxygen/voxel/npc/snowyowl/female/wing_r.vox new file mode 100644 index 0000000000..1d39ae0be4 --- /dev/null +++ b/assets/voxygen/voxel/npc/snowyowl/female/wing_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8272e4d9d53d60af121fe9a2f4499e8c269e107b0c04a24fd52f1305ac222158 +size 55843 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/head.vox b/assets/voxygen/voxel/npc/snowyowl/male/head.vox new file mode 100644 index 0000000000..5233239b84 --- /dev/null +++ b/assets/voxygen/voxel/npc/snowyowl/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:566aa6781dd74473afc16d3ff16f77427c69f3725f1aca5596371c2b03a97390 +size 56655 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/leg_l.vox b/assets/voxygen/voxel/npc/snowyowl/male/leg_l.vox new file mode 100644 index 0000000000..c6f0c929ec --- /dev/null +++ b/assets/voxygen/voxel/npc/snowyowl/male/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed574df7ee18a8c146347449442a1a5bd78915d35a69059fd56257a32e3d512f +size 55679 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/leg_r.vox b/assets/voxygen/voxel/npc/snowyowl/male/leg_r.vox new file mode 100644 index 0000000000..bae9b62566 --- /dev/null +++ b/assets/voxygen/voxel/npc/snowyowl/male/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1775296d1871876b2d45afc759964f135bab071e92d27984b6a3b5a4495cc05f +size 55679 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/tail.vox b/assets/voxygen/voxel/npc/snowyowl/male/tail.vox new file mode 100644 index 0000000000..3052142f41 --- /dev/null +++ b/assets/voxygen/voxel/npc/snowyowl/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ad90ce412f238f4ccba6c6f178a60292414795d0bf1c8a785df5bade6e9f587 +size 55787 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/torso.vox b/assets/voxygen/voxel/npc/snowyowl/male/torso.vox new file mode 100644 index 0000000000..d8ea6b7177 --- /dev/null +++ b/assets/voxygen/voxel/npc/snowyowl/male/torso.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c27bab60f306c074147bb7ddd32c51b51f9fd132997d4911c60696bd9fb45d3 +size 56611 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/wing_l.vox b/assets/voxygen/voxel/npc/snowyowl/male/wing_l.vox new file mode 100644 index 0000000000..743fb4dbba --- /dev/null +++ b/assets/voxygen/voxel/npc/snowyowl/male/wing_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cabfd81ba0a052193a41b534589cf1fb5a3eae68a6d491ac778b72d3fb3e25e2 +size 55843 diff --git a/assets/voxygen/voxel/npc/snowyowl/male/wing_r.vox b/assets/voxygen/voxel/npc/snowyowl/male/wing_r.vox new file mode 100644 index 0000000000..1d39ae0be4 --- /dev/null +++ b/assets/voxygen/voxel/npc/snowyowl/male/wing_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8272e4d9d53d60af121fe9a2f4499e8c269e107b0c04a24fd52f1305ac222158 +size 55843 diff --git a/assets/voxygen/voxel/quadruped_small_central_manifest.ron b/assets/voxygen/voxel/quadruped_small_central_manifest.ron index 5a48727736..90cd011fdd 100644 --- a/assets/voxygen/voxel/quadruped_small_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_small_central_manifest.ron @@ -44,7 +44,7 @@ (Sheep, Male):( head: ( - offset: (-5.0, -4.5, -3.5), + offset: (-6.0, -5.5, -4.0), central: ("npc.sheep.male.head"), ), chest: ( @@ -251,4 +251,26 @@ central: ("npc.holladon.female.chest"), ), ), -}) + + (Hyena, Male):( + head: ( + offset: (-3.0, -2.0, -4.0), + central: ("npc.hyena.male.head"), + ), + chest: ( + offset: (-3.0, -9.0, -5.0), + central: ("npc.hyena.male.chest"), + ), + ), + + (Hyena, Female):( + head: ( + offset: (-3.0, -2.0, -4.0), + central: ("npc.hyena.female.head"), + ), + chest: ( + offset: (-3.0, -9.0, -5.0), + central: ("npc.hyena.female.chest"), + ), + ), +}) \ No newline at end of file diff --git a/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron index 17657d7b07..c93f32789c 100644 --- a/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron @@ -447,4 +447,41 @@ lateral: ("npc.holladon.female.foot_br"), ), ), -}) + (Hyena, Male): ( + left_front: ( + offset: (-1.5, -2.0, -5.0), + lateral: ("npc.hyena.male.foot_fl"), + ), + right_front: ( + offset: (-1.5, -2.0, -5.0), + lateral: ("npc.hyena.male.foot_fr"), + ), + left_back: ( + offset: (-1.5, -2.0, -4.5), + lateral: ("npc.hyena.male.foot_bl"), + ), + right_back: ( + offset: (-1.5, -2.0, -4.5), + lateral: ("npc.hyena.male.foot_br"), + ), + ), + + (Hyena, Female): ( + left_front: ( + offset: (-1.5, -2.0, -5.0), + lateral: ("npc.hyena.female.foot_fl"), + ), + right_front: ( + offset: (-1.5, -2.0, -5.0), + lateral: ("npc.hyena.female.foot_fr"), + ), + left_back: ( + offset: (-1.5, -2.0, -4.5), + lateral: ("npc.hyena.female.foot_bl"), + ), + right_back: ( + offset: (-1.5, -2.0, -4.5), + lateral: ("npc.hyena.female.foot_br"), + ), + ), +}) \ No newline at end of file diff --git a/common/src/comp/body/bird_medium.rs b/common/src/comp/body/bird_medium.rs index 6447925f3a..363c6c1867 100644 --- a/common/src/comp/body/bird_medium.rs +++ b/common/src/comp/body/bird_medium.rs @@ -32,6 +32,8 @@ pub enum Species { Goose = 2, Peacock = 3, Eagle = 4, + Snowyowl = 5, + Parrot = 6, } /// Data representing per-species generic data. @@ -44,6 +46,8 @@ pub struct AllSpecies { pub goose: SpeciesMeta, pub peacock: SpeciesMeta, pub eagle: SpeciesMeta, + pub snowyowl: SpeciesMeta, + pub parrot: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -57,16 +61,20 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Goose => &self.goose, Species::Peacock => &self.peacock, Species::Eagle => &self.eagle, + Species::Snowyowl => &self.snowyowl, + Species::Parrot => &self.parrot, } } } -pub const ALL_SPECIES: [Species; 5] = [ +pub const ALL_SPECIES: [Species; 7] = [ Species::Duck, Species::Chicken, Species::Goose, Species::Peacock, Species::Eagle, + Species::Snowyowl, + Species::Parrot, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/common/src/comp/body/quadruped_small.rs b/common/src/comp/body/quadruped_small.rs index 3b8dd5a26c..51e5376828 100644 --- a/common/src/comp/body/quadruped_small.rs +++ b/common/src/comp/body/quadruped_small.rs @@ -39,6 +39,7 @@ pub enum Species { Quokka = 9, Dodarock = 10, Holladon = 11, + Hyena = 12, } /// Data representing per-species generic data. @@ -58,6 +59,7 @@ pub struct AllSpecies { pub quokka: SpeciesMeta, pub dodarock: SpeciesMeta, pub holladon: SpeciesMeta, + pub hyena: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -78,11 +80,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Quokka => &self.quokka, Species::Dodarock => &self.dodarock, Species::Holladon => &self.holladon, + Species::Hyena => &self.hyena, } } } -pub const ALL_SPECIES: [Species; 12] = [ +pub const ALL_SPECIES: [Species; 13] = [ Species::Pig, Species::Fox, Species::Sheep, @@ -95,6 +98,7 @@ pub const ALL_SPECIES: [Species; 12] = [ Species::Quokka, Species::Dodarock, Species::Holladon, + Species::Hyena, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/voxygen/src/anim/bird_medium/mod.rs b/voxygen/src/anim/bird_medium/mod.rs index 78a9ed1217..d5fab6015e 100644 --- a/voxygen/src/anim/bird_medium/mod.rs +++ b/voxygen/src/anim/bird_medium/mod.rs @@ -103,7 +103,9 @@ impl<'a> From<&'a comp::bird_medium::Body> for SkeletonAttr { (Chicken, _) => (4.0, 3.0), (Goose, _) => (5.0, 5.0), (Peacock, _) => (4.0, 7.0), - (Eagle, _) => (3.5, 5.0), + (Eagle, _) => (2.5, 5.0), + (Snowyowl, _) => (2.5, 5.0), + (Parrot, _) => (0.5, 4.5), }, chest: match (body.species, body.body_type) { (Duck, _) => (0.0, 5.0), @@ -111,6 +113,8 @@ impl<'a> From<&'a comp::bird_medium::Body> for SkeletonAttr { (Goose, _) => (0.0, 8.0), (Peacock, _) => (0.0, 10.0), (Eagle, _) => (0.0, 8.0), + (Snowyowl, _) => (0.0, 4.5), + (Parrot, _) => (0.0, 5.0), }, tail: match (body.species, body.body_type) { (Duck, _) => (-3.0, 1.5), @@ -118,6 +122,8 @@ impl<'a> From<&'a comp::bird_medium::Body> for SkeletonAttr { (Goose, _) => (-5.0, 3.0), (Peacock, _) => (-5.5, 2.0), (Eagle, _) => (-8.0, -4.0), + (Snowyowl, _) => (-6.0, -2.0), + (Parrot, _) => (-8.0, -2.0), }, wing: match (body.species, body.body_type) { (Duck, _) => (2.75, 0.0, 1.0), @@ -125,6 +131,8 @@ impl<'a> From<&'a comp::bird_medium::Body> for SkeletonAttr { (Goose, _) => (3.75, -1.0, 2.0), (Peacock, _) => (3.0, 0.0, 1.0), (Eagle, _) => (3.0, -8.0, 4.0), + (Snowyowl, _) => (3.5, -5.5, 4.0), + (Parrot, _) => (2.0, -4.5, 3.0), }, foot: match (body.species, body.body_type) { (Duck, _) => (2.0, -1.5, 4.0), @@ -132,6 +140,8 @@ impl<'a> From<&'a comp::bird_medium::Body> for SkeletonAttr { (Goose, _) => (2.0, -1.5, 7.0), (Peacock, _) => (2.0, -2.5, 8.0), (Eagle, _) => (2.0, -2.0, 8.0), + (Snowyowl, _) => (1.5, -2.5, 7.0), + (Parrot, _) => (1.5, -3.0, 3.0), }, } } diff --git a/voxygen/src/anim/quadruped_small/mod.rs b/voxygen/src/anim/quadruped_small/mod.rs index b043d01751..3e17cce90c 100644 --- a/voxygen/src/anim/quadruped_small/mod.rs +++ b/voxygen/src/anim/quadruped_small/mod.rs @@ -104,6 +104,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Quokka, _) => (10.0, 10.0), (Dodarock, _) => (8.0, 9.0), (Holladon, _) => (8.0, 8.0), + (Hyena, _) => (7.5, 13.0), }, chest: match (body.species, body.body_type) { (Pig, _) => (0.0, 8.0), @@ -118,6 +119,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Quokka, _) => (2.0, 8.0), (Dodarock, _) => (-2.0, 8.0), (Holladon, _) => (-2.0, 6.0), + (Hyena, _) => (-2.0, 9.0), }, feet_f: match (body.species, body.body_type) { (Pig, _) => (3.0, 5.0, 2.0), @@ -132,6 +134,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Quokka, _) => (3.0, 5.0, 3.0), (Dodarock, _) => (3.5, 5.0, 4.0), (Holladon, _) => (3.0, 5.0, 4.0), + (Hyena, _) => (2.5, 5.0, 6.0), }, feet_b: match (body.species, body.body_type) { (Pig, _) => (3.0, -2.0, 2.0), @@ -146,6 +149,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Quokka, _) => (3.0, -4.0, 3.0), (Dodarock, _) => (4.5, -3.0, 4.0), (Holladon, _) => (4.0, -4.0, 3.0), + (Hyena, _) => (2.5, -7.0, 6.0), }, } }