diff --git a/assets/voxygen/voxel/npc/grolgar/female/foot_bl.vox b/assets/voxygen/voxel/npc/grolgar/female/foot_bl.vox index cc8d76b20d..0d73b9b1b7 100644 Binary files a/assets/voxygen/voxel/npc/grolgar/female/foot_bl.vox and b/assets/voxygen/voxel/npc/grolgar/female/foot_bl.vox differ diff --git a/assets/voxygen/voxel/npc/grolgar/female/foot_br.vox b/assets/voxygen/voxel/npc/grolgar/female/foot_br.vox index a1d6c4974a..950b33e69b 100644 Binary files a/assets/voxygen/voxel/npc/grolgar/female/foot_br.vox and b/assets/voxygen/voxel/npc/grolgar/female/foot_br.vox differ diff --git a/assets/voxygen/voxel/npc/grolgar/female/foot_fl.vox b/assets/voxygen/voxel/npc/grolgar/female/foot_fl.vox index 9e2b073502..c68529471f 100644 Binary files a/assets/voxygen/voxel/npc/grolgar/female/foot_fl.vox and b/assets/voxygen/voxel/npc/grolgar/female/foot_fl.vox differ diff --git a/assets/voxygen/voxel/npc/grolgar/female/foot_fr.vox b/assets/voxygen/voxel/npc/grolgar/female/foot_fr.vox index d1c66f00fd..b438522f4a 100644 Binary files a/assets/voxygen/voxel/npc/grolgar/female/foot_fr.vox and b/assets/voxygen/voxel/npc/grolgar/female/foot_fr.vox differ diff --git a/assets/voxygen/voxel/npc/grolgar/female/head_upper.vox b/assets/voxygen/voxel/npc/grolgar/female/head_upper.vox index 2021178639..a9ba5344be 100644 Binary files a/assets/voxygen/voxel/npc/grolgar/female/head_upper.vox and b/assets/voxygen/voxel/npc/grolgar/female/head_upper.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 cc8d76b20d..0d73b9b1b7 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 a1d6c4974a..950b33e69b 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 9e2b073502..c68529471f 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 d1c66f00fd..b438522f4a 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/head_upper.vox b/assets/voxygen/voxel/npc/grolgar/male/head_upper.vox index 2021178639..a9ba5344be 100644 Binary files a/assets/voxygen/voxel/npc/grolgar/male/head_upper.vox and b/assets/voxygen/voxel/npc/grolgar/male/head_upper.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/female/head_upper.vox b/assets/voxygen/voxel/npc/tarasque/female/head_upper.vox index 89e4fd10cc..0bbe6fe200 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/female/head_upper.vox and b/assets/voxygen/voxel/npc/tarasque/female/head_upper.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/ears.vox b/assets/voxygen/voxel/npc/tarasque/male/ears.vox index 9ecce1afd0..951618ad66 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/ears.vox and b/assets/voxygen/voxel/npc/tarasque/male/ears.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/foot_bl.vox b/assets/voxygen/voxel/npc/tarasque/male/foot_bl.vox index caa5390b0c..b8fd2258fb 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/foot_bl.vox and b/assets/voxygen/voxel/npc/tarasque/male/foot_bl.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/foot_br.vox b/assets/voxygen/voxel/npc/tarasque/male/foot_br.vox index 9574407838..85ebfc089c 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/foot_br.vox and b/assets/voxygen/voxel/npc/tarasque/male/foot_br.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/foot_fl.vox b/assets/voxygen/voxel/npc/tarasque/male/foot_fl.vox index c02dd99a61..552d81b8e9 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/foot_fl.vox and b/assets/voxygen/voxel/npc/tarasque/male/foot_fl.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/foot_fr.vox b/assets/voxygen/voxel/npc/tarasque/male/foot_fr.vox index 03f2da135a..150b7bbb4f 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/foot_fr.vox and b/assets/voxygen/voxel/npc/tarasque/male/foot_fr.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/head_lower.vox b/assets/voxygen/voxel/npc/tarasque/male/head_lower.vox index c498fb81eb..55062ab9a8 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/head_lower.vox and b/assets/voxygen/voxel/npc/tarasque/male/head_lower.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/head_upper.vox b/assets/voxygen/voxel/npc/tarasque/male/head_upper.vox index 89e4fd10cc..0bbe6fe200 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/head_upper.vox and b/assets/voxygen/voxel/npc/tarasque/male/head_upper.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/jaw.vox b/assets/voxygen/voxel/npc/tarasque/male/jaw.vox index cde41851d3..a208531027 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/jaw.vox and b/assets/voxygen/voxel/npc/tarasque/male/jaw.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/leg_bl.vox b/assets/voxygen/voxel/npc/tarasque/male/leg_bl.vox index de83509a07..5dc9f4cce0 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/leg_bl.vox and b/assets/voxygen/voxel/npc/tarasque/male/leg_bl.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/leg_br.vox b/assets/voxygen/voxel/npc/tarasque/male/leg_br.vox index 875d1ba12f..881feae056 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/leg_br.vox and b/assets/voxygen/voxel/npc/tarasque/male/leg_br.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/leg_fl.vox b/assets/voxygen/voxel/npc/tarasque/male/leg_fl.vox index 38835efb4d..b518f39121 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/leg_fl.vox and b/assets/voxygen/voxel/npc/tarasque/male/leg_fl.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/leg_fr.vox b/assets/voxygen/voxel/npc/tarasque/male/leg_fr.vox index 3dcbe012b5..9704d4d62b 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/leg_fr.vox and b/assets/voxygen/voxel/npc/tarasque/male/leg_fr.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/tail.vox b/assets/voxygen/voxel/npc/tarasque/male/tail.vox index c603af7695..07295e5a48 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/tail.vox and b/assets/voxygen/voxel/npc/tarasque/male/tail.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/torso_back.vox b/assets/voxygen/voxel/npc/tarasque/male/torso_back.vox index da1f32367d..62d86e6750 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/torso_back.vox and b/assets/voxygen/voxel/npc/tarasque/male/torso_back.vox differ diff --git a/assets/voxygen/voxel/npc/tarasque/male/torso_front.vox b/assets/voxygen/voxel/npc/tarasque/male/torso_front.vox index 2f7a489199..b62a9f01c0 100644 Binary files a/assets/voxygen/voxel/npc/tarasque/male/torso_front.vox and b/assets/voxygen/voxel/npc/tarasque/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 33e977b3a2..d42e0f47c4 100644 --- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron @@ -2,7 +2,7 @@ (Grolgar, Male): ( upper: ( offset: (-7.0, 0.0, -9.0), - central: ("npc.grolgar.female.head_upper"), + central: ("npc.grolgar.male.head_upper"), ), lower: ( offset: (-6.0, -4.5, -4.0), @@ -241,7 +241,7 @@ ), (Tarasque, Male): ( upper: ( - offset: (-9.0, -13.0, -10.5), + offset: (-10.0, -9.0, -10.0), central: ("npc.tarasque.male.head_upper"), ), lower: ( @@ -271,7 +271,7 @@ ), (Tarasque, Female): ( upper: ( - offset: (-9.0, -13.0, -10.5), + offset: (-10.0, -9.0, -10.0), central: ("npc.tarasque.female.head_upper"), ), lower: ( @@ -296,7 +296,7 @@ ), tail: ( offset: (-5.0, -19.0, -10.0), - central: ("npc.tarasque.male.tail"), + central: ("npc.tarasque.female.tail"), ), ), (Tiger, Male): ( diff --git a/voxygen/src/anim/src/quadruped_medium/mod.rs b/voxygen/src/anim/src/quadruped_medium/mod.rs index 2a98e566b4..40c9e8aa2c 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 comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (-11.0, -3.0), (Tuskram, _) => (6.0, 1.0), (Lion, _) => (12.0, 2.0), - (Tarasque, _) => (14.0, 3.5), + (Tarasque, _) => (5.5, 3.5), (Tiger, _) => (2.0, 1.0), }, head_lower: match (body.species, body.body_type) { @@ -156,7 +156,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (1.0, 0.0), (Tuskram, _) => (1.0, 1.0), (Lion, _) => (0.5, 1.0), - (Tarasque, _) => (0.5, -2.0), + (Tarasque, _) => (0.5, -4.0), (Tiger, _) => (-5.0, -6.0), }, jaw: match (body.species, body.body_type) { @@ -164,7 +164,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (18.0, -1.0), (Tuskram, _) => (4.0, -4.0), (Lion, _) => (0.0, -4.5), - (Tarasque, _) => (0.0, -10.0), + (Tarasque, _) => (9.0, -10.0), (Tiger, _) => (7.0, -4.0), }, tail: match (body.species, body.body_type) { @@ -188,7 +188,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (-19.5, 0.0), (Tuskram, _) => (-18.0, -2.0), (Lion, _) => (-19.0, -1.0), - (Tarasque, _) => (-26.5, -1.0), + (Tarasque, _) => (-26.0, -1.0), (Tiger, _) => (-19.0, 0.0), }, ears: match (body.species, body.body_type) { @@ -196,7 +196,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (13.0, 7.0), (Tuskram, _) => (1.5, 9.5), (Lion, _) => (-8.0, 4.5), - (Tarasque, _) => (-5.0, 1.0), + (Tarasque, _) => (3.0, 1.0), (Tiger, _) => (2.5, 5.0), }, leg_f: match (body.species, body.body_type) { @@ -204,7 +204,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (7.0, -7.5, -3.5), (Tuskram, _) => (6.0, -6.5, -5.5), (Lion, _) => (7.5, -4.5, -6.0), - (Tarasque, _) => (7.5, -2.0, -6.0), + (Tarasque, _) => (7.0, -8.0, -6.0), (Tiger, _) => (7.0, -2.0, -1.0), }, leg_b: match (body.species, body.body_type) { @@ -212,7 +212,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (6.0, -1.0, -4.0), (Tuskram, _) => (5.0, 0.5, -3.5), (Lion, _) => (6.0, 0.0, -2.0), - (Tarasque, _) => (6.0, 4.5, -6.0), + (Tarasque, _) => (6.0, 7.5, -6.5), (Tiger, _) => (7.0, -2.0, -1.0), }, feet_f: match (body.species, body.body_type) { @@ -220,7 +220,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (1.0, 3.0, -1.0), (Tuskram, _) => (0.5, 2.0, -5.0), (Lion, _) => (0.0, 2.0, -4.5), - (Tarasque, _) => (2.0, -0.5, -4.5), + (Tarasque, _) => (1.0, 0.0, -3.0), (Tiger, _) => (1.0, 0.0, -5.0), }, feet_b: match (body.species, body.body_type) { @@ -228,7 +228,7 @@ impl<'a> From<&'a comp::quadruped_medium::Body> for SkeletonAttr { (Saber, _) => (1.0, 0.0, 0.0), (Tuskram, _) => (0.5, 0.0, -4.0), (Lion, _) => (0.5, 0.5, -4.0), - (Tarasque, _) => (1.5, -0.5, -3.5), + (Tarasque, _) => (1.5, -2.5, -2.5), (Tiger, _) => (1.0, 0.5, -4.0), }, height: match (body.species, body.body_type) { diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index 471406bdf7..afc3ff526c 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -929,7 +929,7 @@ impl FigureMgr { is_player, ); }, - Body::QuadrupedMedium(quadruped_body) => { + Body::QuadrupedMedium(_) => { let skeleton_attr = &self .quadruped_medium_model_cache .get_or_create_model( @@ -941,7 +941,6 @@ impl FigureMgr { None, ) .1; - let ref skeleton_attr = quadruped_body.into(); let state = self .quadruped_medium_states @@ -1013,7 +1012,7 @@ impl FigureMgr { is_player, ); }, - Body::QuadrupedLow(quadruped_body) => { + Body::QuadrupedLow(_) => { let skeleton_attr = &self .quadruped_low_model_cache .get_or_create_model( @@ -1025,7 +1024,6 @@ impl FigureMgr { None, ) .1; - let ref skeleton_attr = quadruped_body.into(); let state = self .quadruped_low_states