diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json index f3fb272e08..d8bb02f0a7 100644 --- a/assets/common/npc_names.json +++ b/assets/common/npc_names.json @@ -459,6 +459,10 @@ "peacock": { "keyword": "peacock", "generic": "Peacock" + }, + "eagle": { + "keyword": "eagle", + "generic": "Eagle" } } }, diff --git a/assets/voxygen/voxel/bird_medium_center_manifest.ron b/assets/voxygen/voxel/bird_medium_center_manifest.ron index 8dde25c342..6951c0e7af 100644 --- a/assets/voxygen/voxel/bird_medium_center_manifest.ron +++ b/assets/voxygen/voxel/bird_medium_center_manifest.ron @@ -111,4 +111,32 @@ center: ("npc.peacock.female.tail"), ) ), + (Eagle, Male): ( + head: ( + offset: (-2.0, -2.0, -3.5), + center: ("npc.eagle.female.head"), + ), + torso: ( + offset: (-3.0, -4.5, -4.5), + center: ("npc.eagle.female.torso"), + ), + tail: ( + offset: (-2.0, -3.5, -3.5), + center: ("npc.eagle.female.tail"), + ) + ), + (Eagle, Female): ( + head: ( + offset: (-2.0, -2.0, -3.5), + center: ("npc.eagle.female.head"), + ), + torso: ( + offset: (-3.0, -4.5, -4.5), + center: ("npc.eagle.female.torso"), + ), + tail: ( + offset: (-2.0, -3.5, -3.5), + center: ("npc.eagle.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 3fef62853c..a934c5695e 100644 --- a/assets/voxygen/voxel/bird_medium_lateral_manifest.ron +++ b/assets/voxygen/voxel/bird_medium_lateral_manifest.ron @@ -143,4 +143,40 @@ lateral: ("npc.peacock.female.leg_r"), ) ), + (Eagle, Male): ( + wing_l: ( + offset: (-1.0, -3.5, -13.0), + lateral: ("npc.eagle.male.wing_l"), + ), + wing_r: ( + offset: (-1.0, -3.5, -13.0), + lateral: ("npc.eagle.male.wing_r"), + ), + foot_l: ( + offset: (-1.5, 0.0, -8.0), + lateral: ("npc.eagle.male.leg_l"), + ), + foot_r: ( + offset: (-1.5, 0.0, -8.0), + lateral: ("npc.eagle.male.leg_r"), + ) + ), + (Eagle, Female): ( + wing_l: ( + offset: (-1.0, -3.5, -13.0), + lateral: ("npc.eagle.female.wing_l"), + ), + wing_r: ( + offset: (-1.0, -3.5, -13.0), + lateral: ("npc.eagle.female.wing_r"), + ), + foot_l: ( + offset: (-1.5, 0.0, -8.0), + lateral: ("npc.eagle.female.leg_l"), + ), + foot_r: ( + offset: (-1.5, 0.0, -8.0), + lateral: ("npc.eagle.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 new file mode 100644 index 0000000000..3aeffecc8c --- /dev/null +++ b/assets/voxygen/voxel/npc/eagle/female/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b36eeef95b39217885e50d9c33d711187a90b1245a088c54d045ea484ca18491 +size 1608 diff --git a/assets/voxygen/voxel/npc/eagle/female/leg_l.vox b/assets/voxygen/voxel/npc/eagle/female/leg_l.vox new file mode 100644 index 0000000000..38e5e2c5c6 --- /dev/null +++ b/assets/voxygen/voxel/npc/eagle/female/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6e82c2c806c245f8fdebb830b0763a1aa796593c041ad4ace556c8e413f5aa9 +size 55651 diff --git a/assets/voxygen/voxel/npc/eagle/female/leg_r.vox b/assets/voxygen/voxel/npc/eagle/female/leg_r.vox new file mode 100644 index 0000000000..a2ec2f7233 --- /dev/null +++ b/assets/voxygen/voxel/npc/eagle/female/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ecb3129efdb691a6b81d691bd34e01920bf0c9703d9e76bd6fafaeac978146f +size 55651 diff --git a/assets/voxygen/voxel/npc/eagle/female/tail.vox b/assets/voxygen/voxel/npc/eagle/female/tail.vox new file mode 100644 index 0000000000..f7bfb10410 --- /dev/null +++ b/assets/voxygen/voxel/npc/eagle/female/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10fe121790e8434a04bcfc1288693d8ac30171aa991a15e7533fcb62290e2368 +size 55675 diff --git a/assets/voxygen/voxel/npc/eagle/female/torso.vox b/assets/voxygen/voxel/npc/eagle/female/torso.vox new file mode 100644 index 0000000000..c299b03331 --- /dev/null +++ b/assets/voxygen/voxel/npc/eagle/female/torso.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f2df57bf231b5cdf34ce748f51394bc5fa67fff021244408babd2fbb40ce7f3 +size 56619 diff --git a/assets/voxygen/voxel/npc/eagle/female/wing_l.vox b/assets/voxygen/voxel/npc/eagle/female/wing_l.vox new file mode 100644 index 0000000000..c989207c3c --- /dev/null +++ b/assets/voxygen/voxel/npc/eagle/female/wing_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9c4bc7aac5811e9189116501858b5a1cf12187e6e08d6798e6810c04154ffdf +size 56027 diff --git a/assets/voxygen/voxel/npc/eagle/female/wing_r.vox b/assets/voxygen/voxel/npc/eagle/female/wing_r.vox new file mode 100644 index 0000000000..b2aa360724 --- /dev/null +++ b/assets/voxygen/voxel/npc/eagle/female/wing_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65369f781827ace2267b450a5c40027748f1077a1245d5493c166571349af727 +size 56027 diff --git a/assets/voxygen/voxel/npc/eagle/male/head.vox b/assets/voxygen/voxel/npc/eagle/male/head.vox new file mode 100644 index 0000000000..3aeffecc8c --- /dev/null +++ b/assets/voxygen/voxel/npc/eagle/male/head.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b36eeef95b39217885e50d9c33d711187a90b1245a088c54d045ea484ca18491 +size 1608 diff --git a/assets/voxygen/voxel/npc/eagle/male/leg_l.vox b/assets/voxygen/voxel/npc/eagle/male/leg_l.vox new file mode 100644 index 0000000000..38e5e2c5c6 --- /dev/null +++ b/assets/voxygen/voxel/npc/eagle/male/leg_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6e82c2c806c245f8fdebb830b0763a1aa796593c041ad4ace556c8e413f5aa9 +size 55651 diff --git a/assets/voxygen/voxel/npc/eagle/male/leg_r.vox b/assets/voxygen/voxel/npc/eagle/male/leg_r.vox new file mode 100644 index 0000000000..a2ec2f7233 --- /dev/null +++ b/assets/voxygen/voxel/npc/eagle/male/leg_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ecb3129efdb691a6b81d691bd34e01920bf0c9703d9e76bd6fafaeac978146f +size 55651 diff --git a/assets/voxygen/voxel/npc/eagle/male/tail.vox b/assets/voxygen/voxel/npc/eagle/male/tail.vox new file mode 100644 index 0000000000..f7bfb10410 --- /dev/null +++ b/assets/voxygen/voxel/npc/eagle/male/tail.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10fe121790e8434a04bcfc1288693d8ac30171aa991a15e7533fcb62290e2368 +size 55675 diff --git a/assets/voxygen/voxel/npc/eagle/male/torso.vox b/assets/voxygen/voxel/npc/eagle/male/torso.vox new file mode 100644 index 0000000000..c299b03331 --- /dev/null +++ b/assets/voxygen/voxel/npc/eagle/male/torso.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f2df57bf231b5cdf34ce748f51394bc5fa67fff021244408babd2fbb40ce7f3 +size 56619 diff --git a/assets/voxygen/voxel/npc/eagle/male/wing_l.vox b/assets/voxygen/voxel/npc/eagle/male/wing_l.vox new file mode 100644 index 0000000000..c989207c3c --- /dev/null +++ b/assets/voxygen/voxel/npc/eagle/male/wing_l.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9c4bc7aac5811e9189116501858b5a1cf12187e6e08d6798e6810c04154ffdf +size 56027 diff --git a/assets/voxygen/voxel/npc/eagle/male/wing_r.vox b/assets/voxygen/voxel/npc/eagle/male/wing_r.vox new file mode 100644 index 0000000000..b2aa360724 --- /dev/null +++ b/assets/voxygen/voxel/npc/eagle/male/wing_r.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65369f781827ace2267b450a5c40027748f1077a1245d5493c166571349af727 +size 56027 diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron index 6afce36256..8e3d3b12d6 100644 --- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron @@ -386,7 +386,7 @@ central: ("npc.lion.male.ears"), ), tail: ( - offset: (-0.5, -1.0, -8.0), + offset: (-0.5, -1.0, -1.0), central: ("npc.lion.male.tail"), ), ), @@ -417,7 +417,7 @@ ), tail: ( offset: (-0.5, -1.0, -1.0), - central: ("npc.lion.male.tail"), + central: ("npc.lion.female.tail"), ), ), (Tarasque, Male): ( diff --git a/common/src/comp/body/bird_medium.rs b/common/src/comp/body/bird_medium.rs index 477250c767..6447925f3a 100644 --- a/common/src/comp/body/bird_medium.rs +++ b/common/src/comp/body/bird_medium.rs @@ -31,6 +31,7 @@ pub enum Species { Chicken = 1, Goose = 2, Peacock = 3, + Eagle = 4, } /// Data representing per-species generic data. @@ -42,6 +43,7 @@ pub struct AllSpecies { pub chicken: SpeciesMeta, pub goose: SpeciesMeta, pub peacock: SpeciesMeta, + pub eagle: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -54,15 +56,17 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Chicken => &self.chicken, Species::Goose => &self.goose, Species::Peacock => &self.peacock, + Species::Eagle => &self.eagle, } } } -pub const ALL_SPECIES: [Species; 4] = [ +pub const ALL_SPECIES: [Species; 5] = [ Species::Duck, Species::Chicken, Species::Goose, Species::Peacock, + Species::Eagle, ]; 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 d5e7832e74..8e15bdaef2 100644 --- a/voxygen/src/anim/bird_medium/mod.rs +++ b/voxygen/src/anim/bird_medium/mod.rs @@ -103,30 +103,35 @@ 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), }, chest: match (body.species, body.body_type) { (Duck, _) => (0.0, 5.0), (Chicken, _) => (0.0, 5.0), (Goose, _) => (0.0, 8.0), (Peacock, _) => (0.0, 10.0), + (Eagle, _) => (0.0, 8.0), }, tail: match (body.species, body.body_type) { (Duck, _) => (-3.0, 1.5), (Chicken, _) => (-3.0, 1.5), (Goose, _) => (-5.0, 3.0), (Peacock, _) => (-5.5, 2.0), + (Eagle, _) => (-8.0, -4.0), }, wing: match (body.species, body.body_type) { (Duck, _) => (2.75, 0.0, 6.0), (Chicken, _) => (2.75, 0.0, 6.0), (Goose, _) => (3.75, -1.0, 9.0), (Peacock, _) => (3.0, 0.0, 9.0), + (Eagle, _) => (3.0, -8.0, 5.0), }, foot: match (body.species, body.body_type) { (Duck, _) => (2.0, -1.5, 4.0), (Chicken, _) => (2.0, -1.5, 4.0), (Goose, _) => (2.0, -1.5, 7.0), (Peacock, _) => (2.0, -2.5, 8.0), + (Eagle, _) => (2.0, -2.0, 8.0), }, } }