diff --git a/assets/common/npc_names.json b/assets/common/npc_names.json index 320c078280..7807251c42 100644 --- a/assets/common/npc_names.json +++ b/assets/common/npc_names.json @@ -453,6 +453,10 @@ "rabbit": { "keyword": "rabbit", "generic": "Rabbit" + }, + "truffler": { + "keyword": "truffler", + "generic": "Truffler" } } }, @@ -513,6 +517,14 @@ "cyclops": { "keyword": "cyclops", "generic": "Cyclops" + }, + "wendigo": { + "keyword": "wendigo", + "generic": "Wendigo" + }, + "troll": { + "keyword": "troll", + "generic": "Troll" } } }, diff --git a/assets/voxygen/voxel/biped_large_center_manifest.ron b/assets/voxygen/voxel/biped_large_center_manifest.ron index bd6ec60904..158c86588f 100644 --- a/assets/voxygen/voxel/biped_large_center_manifest.ron +++ b/assets/voxygen/voxel/biped_large_center_manifest.ron @@ -55,4 +55,60 @@ center: ("npc.cyclops.male.torso_lower"), ) ), + (Wendigo, Male): ( + head: ( + offset: (-15.0, -4.5, -9.5), + center: ("npc.wendigo.male.head"), + ), + torso_upper: ( + offset: (-6.0, -5.5, -6.5), + center: ("npc.wendigo.male.torso_upper"), + ), + torso_lower: ( + offset: (-4.0, -2.0, -2.0), + center: ("npc.wendigo.male.torso_lower"), + ) + ), + (Wendigo, Female): ( + head: ( + offset: (-15.0, -4.5, -9.5), + center: ("npc.wendigo.male.head"), + ), + torso_upper: ( + offset: (-6.0, -5.5, -6.5), + center: ("npc.wendigo.male.torso_upper"), + ), + torso_lower: ( + offset: (-4.0, -2.0, -2.0), + center: ("npc.wendigo.male.torso_lower"), + ) + ), + (Troll, Male): ( + head: ( + offset: (-8.0, -8.5, -9.0), + center: ("npc.troll.male.head"), + ), + torso_upper: ( + offset: (-8.0, -7.5, -11.0), + center: ("npc.troll.male.torso_upper"), + ), + torso_lower: ( + offset: (-6.0, -3.5, -2.5), + center: ("npc.troll.male.torso_lower"), + ) + ), + (Troll, Female): ( + head: ( + offset: (-8.0, -8.5, -9.0), + center: ("npc.troll.male.head"), + ), + torso_upper: ( + offset: (-8.0, -7.5, -11.0), + center: ("npc.troll.male.torso_upper"), + ), + torso_lower: ( + offset: (-6.0, -3.5, -2.5), + center: ("npc.troll.male.torso_lower"), + ) + ), }) diff --git a/assets/voxygen/voxel/biped_large_lateral_manifest.ron b/assets/voxygen/voxel/biped_large_lateral_manifest.ron index 32a3a55245..f93a9bdf5c 100644 --- a/assets/voxygen/voxel/biped_large_lateral_manifest.ron +++ b/assets/voxygen/voxel/biped_large_lateral_manifest.ron @@ -135,4 +135,140 @@ lateral: ("npc.cyclops.male.foot_r"), ) ), + (Wendigo, Male): ( + shoulder_l: ( + offset: (-3.0, -4.0, -5.0), + lateral: ("npc.wendigo.male.shoulder_l"), + ), + shoulder_r: ( + offset: (-3.0, -4.0, -5.0), + lateral: ("npc.wendigo.male.shoulder_r"), + ), + hand_l: ( + offset: (-4.0, -3.5, -18.0), + lateral: ("npc.wendigo.male.hand_l"), + ), + hand_r: ( + offset: (-4.0, -3.5, -18.0), + lateral: ("npc.wendigo.male.hand_r"), + ), + leg_l: ( + offset: (-4.0, -2.5, -9.0), + lateral: ("npc.wendigo.male.leg_l"), + ), + leg_r: ( + offset: (0.0, -2.5, -9.0), + lateral: ("npc.wendigo.male.leg_r"), + ), + foot_l: ( + offset: (-4.0, -5.0, -5.5), + lateral: ("npc.wendigo.male.foot_l"), + ), + foot_r: ( + offset: (-4.0, -5.0, -5.5), + lateral: ("npc.wendigo.male.foot_r"), + ) + ), + (Wendigo, Female): ( + shoulder_l: ( + offset: (-3.0, -4.0, -5.0), + lateral: ("npc.wendigo.male.shoulder_l"), + ), + shoulder_r: ( + offset: (-3.0, -4.0, -5.0), + lateral: ("npc.wendigo.male.shoulder_r"), + ), + hand_l: ( + offset: (-4.0, -3.5, -18.0), + lateral: ("npc.wendigo.male.hand_l"), + ), + hand_r: ( + offset: (-4.0, -3.5, -18.0), + lateral: ("npc.wendigo.male.hand_r"), + ), + leg_l: ( + offset: (-4.0, -2.5, -9.0), + lateral: ("npc.wendigo.male.leg_l"), + ), + leg_r: ( + offset: (0.0, -2.5, -9.0), + lateral: ("npc.wendigo.male.leg_r"), + ), + foot_l: ( + offset: (-4.0, -5.0, -5.5), + lateral: ("npc.wendigo.male.foot_l"), + ), + foot_r: ( + offset: (-4.0, -5.0, -5.5), + lateral: ("npc.wendigo.male.foot_r"), + ) + ), + (Troll, Male): ( + shoulder_l: ( + offset: (-5.0, -4.5, -7.0), + lateral: ("npc.troll.male.shoulder_l"), + ), + shoulder_r: ( + offset: (-5.0, -4.5, -7.0), + lateral: ("npc.troll.male.shoulder_r"), + ), + hand_l: ( + offset: (-3.5, -4.0, -15.0), + lateral: ("npc.troll.male.hand_l"), + ), + hand_r: ( + offset: (-3.5, -4.0, -15.0), + lateral: ("npc.troll.male.hand_r"), + ), + leg_l: ( + offset: (-3.0, -2.5, -4.5), + lateral: ("npc.troll.male.leg_l"), + ), + leg_r: ( + offset: (-3.0, -2.5, -4.5), + lateral: ("npc.troll.male.leg_r"), + ), + foot_l: ( + offset: (-3.0, -5.0, -2.5), + lateral: ("npc.troll.male.foot_l"), + ), + foot_r: ( + offset: (-3.0, -5.0, -2.5), + lateral: ("npc.troll.male.foot_r"), + ) + ), + (Troll, Female): ( + shoulder_l: ( + offset: (-5.0, -4.5, -7.0), + lateral: ("npc.troll.male.shoulder_l"), + ), + shoulder_r: ( + offset: (-5.0, -4.5, -7.0), + lateral: ("npc.troll.male.shoulder_r"), + ), + hand_l: ( + offset: (-3.5, -4.0, -15.0), + lateral: ("npc.troll.male.hand_l"), + ), + hand_r: ( + offset: (-3.5, -4.0, -15.0), + lateral: ("npc.troll.male.hand_r"), + ), + leg_l: ( + offset: (-3.0, -2.5, -4.5), + lateral: ("npc.troll.male.leg_l"), + ), + leg_r: ( + offset: (-3.0, -2.5, -4.5), + lateral: ("npc.troll.male.leg_r"), + ), + foot_l: ( + offset: (-3.0, -5.0, -2.5), + lateral: ("npc.troll.male.foot_l"), + ), + foot_r: ( + offset: (-3.0, -5.0, -2.5), + lateral: ("npc.troll.male.foot_r"), + ) + ), }) diff --git a/assets/voxygen/voxel/npc/hyena/male/Jackalope-0.vox b/assets/voxygen/voxel/npc/hyena/male/Jackalope-0.vox deleted file mode 100644 index 603824cd30..0000000000 Binary files a/assets/voxygen/voxel/npc/hyena/male/Jackalope-0.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/hyena/male/Jackalope-1.vox b/assets/voxygen/voxel/npc/hyena/male/Jackalope-1.vox deleted file mode 100644 index ac7b26525a..0000000000 Binary files a/assets/voxygen/voxel/npc/hyena/male/Jackalope-1.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/hyena/male/Jackalope-2.vox b/assets/voxygen/voxel/npc/hyena/male/Jackalope-2.vox deleted file mode 100644 index c413d4bccf..0000000000 Binary files a/assets/voxygen/voxel/npc/hyena/male/Jackalope-2.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/hyena/male/Jackalope-3.vox b/assets/voxygen/voxel/npc/hyena/male/Jackalope-3.vox deleted file mode 100644 index 5690feb0ee..0000000000 Binary files a/assets/voxygen/voxel/npc/hyena/male/Jackalope-3.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/hyena/male/Jackalope-4.vox b/assets/voxygen/voxel/npc/hyena/male/Jackalope-4.vox deleted file mode 100644 index 327eb368c3..0000000000 Binary files a/assets/voxygen/voxel/npc/hyena/male/Jackalope-4.vox and /dev/null differ diff --git a/assets/voxygen/voxel/npc/troll/male/foot_l.vox b/assets/voxygen/voxel/npc/troll/male/foot_l.vox new file mode 100644 index 0000000000..f8c2fb0c4f Binary files /dev/null and b/assets/voxygen/voxel/npc/troll/male/foot_l.vox differ diff --git a/assets/voxygen/voxel/npc/troll/male/foot_r.vox b/assets/voxygen/voxel/npc/troll/male/foot_r.vox new file mode 100644 index 0000000000..3d3192b71b Binary files /dev/null and b/assets/voxygen/voxel/npc/troll/male/foot_r.vox differ diff --git a/assets/voxygen/voxel/npc/troll/male/hand_l.vox b/assets/voxygen/voxel/npc/troll/male/hand_l.vox new file mode 100644 index 0000000000..57f6da8e90 Binary files /dev/null and b/assets/voxygen/voxel/npc/troll/male/hand_l.vox differ diff --git a/assets/voxygen/voxel/npc/troll/male/hand_r.vox b/assets/voxygen/voxel/npc/troll/male/hand_r.vox new file mode 100644 index 0000000000..9e134366b2 Binary files /dev/null and b/assets/voxygen/voxel/npc/troll/male/hand_r.vox differ diff --git a/assets/voxygen/voxel/npc/troll/male/head.vox b/assets/voxygen/voxel/npc/troll/male/head.vox new file mode 100644 index 0000000000..4323146ab3 Binary files /dev/null and b/assets/voxygen/voxel/npc/troll/male/head.vox differ diff --git a/assets/voxygen/voxel/npc/troll/male/jaw.vox b/assets/voxygen/voxel/npc/troll/male/jaw.vox new file mode 100644 index 0000000000..b8c5269004 Binary files /dev/null and b/assets/voxygen/voxel/npc/troll/male/jaw.vox differ diff --git a/assets/voxygen/voxel/npc/troll/male/leg_l.vox b/assets/voxygen/voxel/npc/troll/male/leg_l.vox new file mode 100644 index 0000000000..a1b16691b3 Binary files /dev/null and b/assets/voxygen/voxel/npc/troll/male/leg_l.vox differ diff --git a/assets/voxygen/voxel/npc/troll/male/leg_r.vox b/assets/voxygen/voxel/npc/troll/male/leg_r.vox new file mode 100644 index 0000000000..57c3621903 Binary files /dev/null and b/assets/voxygen/voxel/npc/troll/male/leg_r.vox differ diff --git a/assets/voxygen/voxel/npc/troll/male/shoulder_l.vox b/assets/voxygen/voxel/npc/troll/male/shoulder_l.vox new file mode 100644 index 0000000000..85f266a856 Binary files /dev/null and b/assets/voxygen/voxel/npc/troll/male/shoulder_l.vox differ diff --git a/assets/voxygen/voxel/npc/troll/male/shoulder_r.vox b/assets/voxygen/voxel/npc/troll/male/shoulder_r.vox new file mode 100644 index 0000000000..7cb763eabc Binary files /dev/null and b/assets/voxygen/voxel/npc/troll/male/shoulder_r.vox differ diff --git a/assets/voxygen/voxel/npc/troll/male/torso_lower.vox b/assets/voxygen/voxel/npc/troll/male/torso_lower.vox new file mode 100644 index 0000000000..917c12b6d8 Binary files /dev/null and b/assets/voxygen/voxel/npc/troll/male/torso_lower.vox differ diff --git a/assets/voxygen/voxel/npc/troll/male/torso_upper.vox b/assets/voxygen/voxel/npc/troll/male/torso_upper.vox new file mode 100644 index 0000000000..7513362417 Binary files /dev/null and b/assets/voxygen/voxel/npc/troll/male/torso_upper.vox differ diff --git a/assets/voxygen/voxel/npc/troll/male/weapon_r.vox b/assets/voxygen/voxel/npc/troll/male/weapon_r.vox new file mode 100644 index 0000000000..b526b85dfe Binary files /dev/null and b/assets/voxygen/voxel/npc/troll/male/weapon_r.vox differ diff --git a/assets/voxygen/voxel/npc/truffler/male/chest.vox b/assets/voxygen/voxel/npc/truffler/male/chest.vox new file mode 100644 index 0000000000..f979ed0905 Binary files /dev/null and b/assets/voxygen/voxel/npc/truffler/male/chest.vox differ diff --git a/assets/voxygen/voxel/npc/truffler/male/foot_bl.vox b/assets/voxygen/voxel/npc/truffler/male/foot_bl.vox new file mode 100644 index 0000000000..8b1e89430e Binary files /dev/null and b/assets/voxygen/voxel/npc/truffler/male/foot_bl.vox differ diff --git a/assets/voxygen/voxel/npc/truffler/male/foot_br.vox b/assets/voxygen/voxel/npc/truffler/male/foot_br.vox new file mode 100644 index 0000000000..8b1e89430e Binary files /dev/null and b/assets/voxygen/voxel/npc/truffler/male/foot_br.vox differ diff --git a/assets/voxygen/voxel/npc/truffler/male/foot_fl.vox b/assets/voxygen/voxel/npc/truffler/male/foot_fl.vox new file mode 100644 index 0000000000..8b1e89430e Binary files /dev/null and b/assets/voxygen/voxel/npc/truffler/male/foot_fl.vox differ diff --git a/assets/voxygen/voxel/npc/truffler/male/foot_fr.vox b/assets/voxygen/voxel/npc/truffler/male/foot_fr.vox new file mode 100644 index 0000000000..8b1e89430e Binary files /dev/null and b/assets/voxygen/voxel/npc/truffler/male/foot_fr.vox differ diff --git a/assets/voxygen/voxel/npc/truffler/male/head.vox b/assets/voxygen/voxel/npc/truffler/male/head.vox new file mode 100644 index 0000000000..ccaf7bd922 Binary files /dev/null and b/assets/voxygen/voxel/npc/truffler/male/head.vox differ diff --git a/assets/voxygen/voxel/npc/wendigo/male/foot_l.vox b/assets/voxygen/voxel/npc/wendigo/male/foot_l.vox new file mode 100644 index 0000000000..309f5806cf Binary files /dev/null and b/assets/voxygen/voxel/npc/wendigo/male/foot_l.vox differ diff --git a/assets/voxygen/voxel/npc/wendigo/male/foot_r.vox b/assets/voxygen/voxel/npc/wendigo/male/foot_r.vox new file mode 100644 index 0000000000..a6758dc217 Binary files /dev/null and b/assets/voxygen/voxel/npc/wendigo/male/foot_r.vox differ diff --git a/assets/voxygen/voxel/npc/wendigo/male/hand_l.vox b/assets/voxygen/voxel/npc/wendigo/male/hand_l.vox new file mode 100644 index 0000000000..a059bc4283 Binary files /dev/null and b/assets/voxygen/voxel/npc/wendigo/male/hand_l.vox differ diff --git a/assets/voxygen/voxel/npc/wendigo/male/hand_r.vox b/assets/voxygen/voxel/npc/wendigo/male/hand_r.vox new file mode 100644 index 0000000000..8c252edaa8 Binary files /dev/null and b/assets/voxygen/voxel/npc/wendigo/male/hand_r.vox differ diff --git a/assets/voxygen/voxel/npc/wendigo/male/head.vox b/assets/voxygen/voxel/npc/wendigo/male/head.vox new file mode 100644 index 0000000000..9632063d1f Binary files /dev/null and b/assets/voxygen/voxel/npc/wendigo/male/head.vox differ diff --git a/assets/voxygen/voxel/npc/wendigo/male/leg_l.vox b/assets/voxygen/voxel/npc/wendigo/male/leg_l.vox new file mode 100644 index 0000000000..3567514b3f Binary files /dev/null and b/assets/voxygen/voxel/npc/wendigo/male/leg_l.vox differ diff --git a/assets/voxygen/voxel/npc/wendigo/male/leg_r.vox b/assets/voxygen/voxel/npc/wendigo/male/leg_r.vox new file mode 100644 index 0000000000..92a20e6518 Binary files /dev/null and b/assets/voxygen/voxel/npc/wendigo/male/leg_r.vox differ diff --git a/assets/voxygen/voxel/npc/wendigo/male/shoulder_l.vox b/assets/voxygen/voxel/npc/wendigo/male/shoulder_l.vox new file mode 100644 index 0000000000..8f3e5e0882 Binary files /dev/null and b/assets/voxygen/voxel/npc/wendigo/male/shoulder_l.vox differ diff --git a/assets/voxygen/voxel/npc/wendigo/male/shoulder_r.vox b/assets/voxygen/voxel/npc/wendigo/male/shoulder_r.vox new file mode 100644 index 0000000000..5e827ba186 Binary files /dev/null and b/assets/voxygen/voxel/npc/wendigo/male/shoulder_r.vox differ diff --git a/assets/voxygen/voxel/npc/wendigo/male/torso_lower.vox b/assets/voxygen/voxel/npc/wendigo/male/torso_lower.vox new file mode 100644 index 0000000000..aa8aa327b5 Binary files /dev/null and b/assets/voxygen/voxel/npc/wendigo/male/torso_lower.vox differ diff --git a/assets/voxygen/voxel/npc/wendigo/male/torso_upper.vox b/assets/voxygen/voxel/npc/wendigo/male/torso_upper.vox new file mode 100644 index 0000000000..e0c2e73069 Binary files /dev/null and b/assets/voxygen/voxel/npc/wendigo/male/torso_upper.vox differ diff --git a/assets/voxygen/voxel/quadruped_small_central_manifest.ron b/assets/voxygen/voxel/quadruped_small_central_manifest.ron index 0d916f3f7a..28474862ca 100644 --- a/assets/voxygen/voxel/quadruped_small_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_small_central_manifest.ron @@ -406,4 +406,32 @@ central: ("npc.rabbit.male.tail"), ), ), + (Truffler, Male):( + head: ( + offset: (-8.5, 0.0, -4.5), + central: ("npc.truffler.male.head"), + ), + chest: ( + offset: (-10.5, -11.0, -15.0), + central: ("npc.truffler.male.chest"), + ), + tail: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + ), + (Truffler, Female):( + head: ( + offset: (-8.5, 0.0, -4.5), + central: ("npc.truffler.male.head"), + ), + chest: ( + offset: (-10.5, -11.0, -15.0), + central: ("npc.truffler.male.chest"), + ), + tail: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ), + ), }) \ 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 791860d0e1..aa991feeec 100644 --- a/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_small_lateral_manifest.ron @@ -520,4 +520,41 @@ lateral: ("npc.rabbit.male.foot_br"), ), ), + (Truffler, Male): ( + left_front: ( + offset: (-2.5, -3.0, -6.5), + lateral: ("npc.truffler.male.foot_fl"), + ), + right_front: ( + offset: (-2.5, -3.0, -6.5), + lateral: ("npc.truffler.male.foot_fr"), + ), + left_back: ( + offset: (-2.5, -3.0, -6.5), + lateral: ("npc.truffler.male.foot_bl"), + ), + right_back: ( + offset: (-2.5, -3.0, -6.5), + lateral: ("npc.truffler.male.foot_br"), + ), + ), + + (Truffler, Female): ( + left_front: ( + offset: (-2.5, -3.0, -6.5), + lateral: ("npc.truffler.male.foot_fl"), + ), + right_front: ( + offset: (-2.5, -3.0, -6.5), + lateral: ("npc.truffler.male.foot_fr"), + ), + left_back: ( + offset: (-2.5, -3.0, -6.5), + lateral: ("npc.truffler.male.foot_bl"), + ), + right_back: ( + offset: (-2.5, -3.0, -6.5), + lateral: ("npc.truffler.male.foot_br"), + ), + ), }) \ No newline at end of file diff --git a/common/src/comp/body/biped_large.rs b/common/src/comp/body/biped_large.rs index 0d79798692..524807a21f 100644 --- a/common/src/comp/body/biped_large.rs +++ b/common/src/comp/body/biped_large.rs @@ -30,6 +30,8 @@ impl From for super::Body { pub enum Species { Ogre = 0, Cyclops = 1, + Wendigo = 2, + Troll = 3, } /// Data representing per-species generic data. @@ -39,6 +41,8 @@ pub enum Species { pub struct AllSpecies { pub ogre: SpeciesMeta, pub cyclops: SpeciesMeta, + pub wendigo: SpeciesMeta, + pub troll: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -49,11 +53,18 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies match index { Species::Ogre => &self.ogre, Species::Cyclops => &self.cyclops, + Species::Wendigo => &self.wendigo, + Species::Troll => &self.troll, } } } -pub const ALL_SPECIES: [Species; 2] = [Species::Ogre, Species::Cyclops]; +pub const ALL_SPECIES: [Species; 4] = [ + Species::Ogre, + Species::Cyclops, + Species::Wendigo, + Species::Troll, +]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { type IntoIter = std::iter::Copied>; diff --git a/common/src/comp/body/quadruped_small.rs b/common/src/comp/body/quadruped_small.rs index a70d2721cf..63ce8f192c 100644 --- a/common/src/comp/body/quadruped_small.rs +++ b/common/src/comp/body/quadruped_small.rs @@ -42,6 +42,7 @@ pub enum Species { Holladon = 11, Hyena = 12, Rabbit = 13, + Truffler = 14, } /// Data representing per-species generic data. @@ -63,6 +64,7 @@ pub struct AllSpecies { pub holladon: SpeciesMeta, pub hyena: SpeciesMeta, pub rabbit: SpeciesMeta, + pub truffler: SpeciesMeta, } impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies { @@ -85,11 +87,12 @@ impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies Species::Holladon => &self.holladon, Species::Hyena => &self.hyena, Species::Rabbit => &self.rabbit, + Species::Truffler => &self.truffler, } } } -pub const ALL_SPECIES: [Species; 14] = [ +pub const ALL_SPECIES: [Species; 15] = [ Species::Pig, Species::Fox, Species::Sheep, @@ -104,6 +107,7 @@ pub const ALL_SPECIES: [Species; 14] = [ Species::Holladon, Species::Hyena, Species::Rabbit, + Species::Truffler, ]; impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies { diff --git a/voxygen/src/anim/src/biped_large/mod.rs b/voxygen/src/anim/src/biped_large/mod.rs index 29405a89e9..a017d111a2 100644 --- a/voxygen/src/anim/src/biped_large/mod.rs +++ b/voxygen/src/anim/src/biped_large/mod.rs @@ -132,30 +132,44 @@ impl<'a> From<&'a comp::biped_large::Body> for SkeletonAttr { head: match (body.species, body.body_type) { (Ogre, _) => (3.0, 6.0), (Cyclops, _) => (3.0, 9.0), + (Wendigo, _) => (3.0, 13.5), + (Troll, _) => (6.0, 10.0), }, upper_torso: match (body.species, body.body_type) { (Ogre, _) => (0.0, 19.0), (Cyclops, _) => (-1.0, 27.0), + (Wendigo, _) => (-1.0, 27.0), + (Troll, _) => (-1.0, 25.5), }, lower_torso: match (body.species, body.body_type) { (Ogre, _) => (1.0, -9.5), (Cyclops, _) => (1.0, -10.5), + (Wendigo, _) => (-1.5, -8.0), + (Troll, _) => (1.0, -12.5), }, shoulder: match (body.species, body.body_type) { (Ogre, _) => (6.1, 0.5, 2.5), (Cyclops, _) => (9.5, 0.5, 2.5), + (Wendigo, _) => (9.0, 0.5, -0.5), + (Troll, _) => (11.0, 0.5, -2.5), }, hand: match (body.species, body.body_type) { (Ogre, _) => (10.5, -1.0, -0.5), (Cyclops, _) => (10.5, 0.0, -0.5), + (Wendigo, _) => (12.0, 0.0, -0.5), + (Troll, _) => (11.5, 0.0, -1.5), }, leg: match (body.species, body.body_type) { (Ogre, _) => (0.0, 0.0, -6.0), (Cyclops, _) => (0.0, 0.0, -9.0), + (Wendigo, _) => (2.0, 0.0, -8.5), + (Troll, _) => (5.0, 0.0, -16.0), }, foot: match (body.species, body.body_type) { (Ogre, _) => (4.0, 0.5, 5.5), (Cyclops, _) => (4.0, 0.5, 5.0), + (Wendigo, _) => (5.0, 0.5, 5.5), + (Troll, _) => (6.0, 0.5, 3.0), }, } } diff --git a/voxygen/src/anim/src/quadruped_small/mod.rs b/voxygen/src/anim/src/quadruped_small/mod.rs index 0995dafd23..4665e928a4 100644 --- a/voxygen/src/anim/src/quadruped_small/mod.rs +++ b/voxygen/src/anim/src/quadruped_small/mod.rs @@ -128,6 +128,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Holladon, _) => (7.0, 1.0), (Hyena, _) => (7.5, 2.0), (Rabbit, _) => (4.0, 3.0), + (Truffler, _) => (7.5, -9.0), }, chest: match (body.species, body.body_type) { (Pig, _) => (0.0, 7.0), @@ -144,6 +145,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Holladon, _) => (-2.0, 9.0), (Hyena, _) => (-2.0, 9.0), (Rabbit, _) => (-2.0, 6.0), + (Truffler, _) => (-2.0, 16.0), }, feet_f: match (body.species, body.body_type) { (Pig, _) => (4.5, 3.0, -2.0), @@ -160,6 +162,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Holladon, _) => (5.0, 4.0, -2.5), (Hyena, _) => (2.5, 5.0, -4.0), (Rabbit, _) => (3.0, 3.0, -3.0), + (Truffler, _) => (2.5, 5.0, -9.0), }, feet_b: match (body.species, body.body_type) { (Pig, _) => (3.5, -2.0, -1.5), @@ -176,6 +179,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Holladon, _) => (4.0, -2.0, -3.0), (Hyena, _) => (3.0, -5.0, -2.5), (Rabbit, _) => (3.5, -2.0, -1.0), + (Truffler, _) => (3.0, -5.0, -9.5), }, tail: match (body.species, body.body_type) { (Pig, _) => (-4.5, 2.5), @@ -192,6 +196,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Holladon, _) => (-1.0, 4.0), (Hyena, _) => (-7.0, 0.0), (Rabbit, _) => (-4.0, -0.0), + (Truffler, _) => (-7.0, 0.0), }, scaler: match (body.species, body.body_type) { (Pig, _) => (0.9), @@ -208,6 +213,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Holladon, _) => (1.4), (Hyena, _) => (1.0), (Rabbit, _) => (0.7), + (Truffler, _) => (1.0), }, tempo: match (body.species, body.body_type) { (Pig, _) => (1.0), @@ -224,6 +230,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Holladon, _) => (1.0), (Hyena, _) => (1.1), (Rabbit, _) => (1.15), + (Truffler, _) => (1.0), }, maximize: match (body.species, body.body_type) { (Pig, _) => (1.0), @@ -240,6 +247,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Holladon, _) => (1.0), (Hyena, _) => (1.4), (Rabbit, _) => (1.3), + (Truffler, _) => (1.0), }, minimize: match (body.species, body.body_type) { (Pig, _) => (0.6), @@ -256,6 +264,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Holladon, _) => (0.7), (Hyena, _) => (1.4), (Rabbit, _) => (0.8), + (Truffler, _) => (1.0), }, spring: match (body.species, body.body_type) { (Pig, _) => (1.0), @@ -272,6 +281,7 @@ impl<'a> From<&'a comp::quadruped_small::Body> for SkeletonAttr { (Holladon, _) => (0.7), (Hyena, _) => (1.4), (Rabbit, _) => (2.5), + (Truffler, _) => (0.8), }, } }