From cef52a0440680ceecf21f27b5ae621370f909196 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Fri, 28 Jun 2019 14:45:02 +0000 Subject: [PATCH] Char fixes --- .../voxel/figure/head/head_elf_male.vox | 4 +- .../voxel/figure/head/head_human_male.vox | 4 +- .../voxel/figure/head/head_undead_female.vox | 4 +- .../voxel/figure/head/head_undead_male.vox | 4 +- .../voxel/figure/head_danari_female.vox | 3 - .../voxygen/voxel/figure/head_danari_male.vox | 3 - .../voxel/figure/head_dwarf_female.vox | 3 - .../voxygen/voxel/figure/head_dwarf_male.vox | 3 - .../voxygen/voxel/figure/head_elf_female.vox | 3 - assets/voxygen/voxel/figure/head_elf_male.vox | 3 - assets/voxygen/voxel/figure/head_female.vox | 3 - .../voxel/figure/head_human_female.vox | 3 - .../voxygen/voxel/figure/head_human_male.vox | 3 - .../voxygen/voxel/figure/head_orc_female.vox | 3 - assets/voxygen/voxel/figure/head_orc_male.vox | 3 - .../voxel/figure/head_undead_female.vox | 3 - .../voxygen/voxel/figure/head_undead_male.vox | 3 - common/src/comp/actor.rs | 7 +-- voxygen/src/anim/character/attack.rs | 2 +- voxygen/src/anim/character/gliding.rs | 2 +- voxygen/src/anim/character/idle.rs | 2 +- voxygen/src/anim/character/jump.rs | 2 +- voxygen/src/anim/character/roll.rs | 2 +- voxygen/src/anim/mod.rs | 55 ++++++++++++------- voxygen/src/menu/char_selection/ui.rs | 24 ++++---- voxygen/src/scene/figure.rs | 7 ++- 26 files changed, 69 insertions(+), 89 deletions(-) delete mode 100644 assets/voxygen/voxel/figure/head_danari_female.vox delete mode 100644 assets/voxygen/voxel/figure/head_danari_male.vox delete mode 100644 assets/voxygen/voxel/figure/head_dwarf_female.vox delete mode 100644 assets/voxygen/voxel/figure/head_dwarf_male.vox delete mode 100644 assets/voxygen/voxel/figure/head_elf_female.vox delete mode 100644 assets/voxygen/voxel/figure/head_elf_male.vox delete mode 100644 assets/voxygen/voxel/figure/head_female.vox delete mode 100644 assets/voxygen/voxel/figure/head_human_female.vox delete mode 100644 assets/voxygen/voxel/figure/head_human_male.vox delete mode 100644 assets/voxygen/voxel/figure/head_orc_female.vox delete mode 100644 assets/voxygen/voxel/figure/head_orc_male.vox delete mode 100644 assets/voxygen/voxel/figure/head_undead_female.vox delete mode 100644 assets/voxygen/voxel/figure/head_undead_male.vox diff --git a/assets/voxygen/voxel/figure/head/head_elf_male.vox b/assets/voxygen/voxel/figure/head/head_elf_male.vox index b6af9be9c1..646fa5524f 100644 --- a/assets/voxygen/voxel/figure/head/head_elf_male.vox +++ b/assets/voxygen/voxel/figure/head/head_elf_male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2f04815b2aadf653abe034916de8a7b27cd124944df66bf705550d4aea4d828 -size 4416 +oid sha256:aaf6c8d40ff51bdcc3177b4aab02885d11ce97db1fb13c62db8db1b5a98bb84b +size 47252 diff --git a/assets/voxygen/voxel/figure/head/head_human_male.vox b/assets/voxygen/voxel/figure/head/head_human_male.vox index bc3e4f3949..8e42300a24 100644 --- a/assets/voxygen/voxel/figure/head/head_human_male.vox +++ b/assets/voxygen/voxel/figure/head/head_human_male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adb056231cc8f1cda9e9f2047acdff88182a50e724b5c56733963d0544641ba6 -size 47807 +oid sha256:2ec795ccc978ba4ea8e35b0c585673dd89fe5b609f4b639808118fe7720203a9 +size 47244 diff --git a/assets/voxygen/voxel/figure/head/head_undead_female.vox b/assets/voxygen/voxel/figure/head/head_undead_female.vox index d7c83f6d63..661d62e698 100644 --- a/assets/voxygen/voxel/figure/head/head_undead_female.vox +++ b/assets/voxygen/voxel/figure/head/head_undead_female.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5cc8fbc43273908a486423ebf1358b5a78bf773593a5bc645a30a8be936432b -size 3904 +oid sha256:39ca7f57f89088ea037757f2bf776aa7be301a0759946c8c7e04f61a20c115ae +size 47451 diff --git a/assets/voxygen/voxel/figure/head/head_undead_male.vox b/assets/voxygen/voxel/figure/head/head_undead_male.vox index a637b1406e..2915f81f2d 100644 --- a/assets/voxygen/voxel/figure/head/head_undead_male.vox +++ b/assets/voxygen/voxel/figure/head/head_undead_male.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef0560a5e4aeb7c9d24072b4b9b9430d206089aa4bee2532a20ba32b9624bd80 -size 4144 +oid sha256:a1502c71eeb0b03b79fc98355f4878228e5f0a83b8383e901f5e7d27ebabbb94 +size 47059 diff --git a/assets/voxygen/voxel/figure/head_danari_female.vox b/assets/voxygen/voxel/figure/head_danari_female.vox deleted file mode 100644 index e01876e317..0000000000 --- a/assets/voxygen/voxel/figure/head_danari_female.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18899c4dfb1dba8730a097ae5d904688338cc74a7dbc083cb51d3f1b910e9ef7 -size 4288 diff --git a/assets/voxygen/voxel/figure/head_danari_male.vox b/assets/voxygen/voxel/figure/head_danari_male.vox deleted file mode 100644 index fcb3214afc..0000000000 --- a/assets/voxygen/voxel/figure/head_danari_male.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96398d31aa2b019b1efa58d615267eeab357e7a9bbab305e192ec9363a26479c -size 4104 diff --git a/assets/voxygen/voxel/figure/head_dwarf_female.vox b/assets/voxygen/voxel/figure/head_dwarf_female.vox deleted file mode 100644 index 3a2f18e355..0000000000 --- a/assets/voxygen/voxel/figure/head_dwarf_female.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70424ea32cc20f5101ce5d6877a37ceb67a1ae47509ef2710cab2c29b15c3109 -size 4392 diff --git a/assets/voxygen/voxel/figure/head_dwarf_male.vox b/assets/voxygen/voxel/figure/head_dwarf_male.vox deleted file mode 100644 index f1bb88b59a..0000000000 --- a/assets/voxygen/voxel/figure/head_dwarf_male.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1b01897892239ddca087b225e0e35bad47f3d0feb23122bba899c1ea9131fc3 -size 3824 diff --git a/assets/voxygen/voxel/figure/head_elf_female.vox b/assets/voxygen/voxel/figure/head_elf_female.vox deleted file mode 100644 index b87fcf2f0d..0000000000 --- a/assets/voxygen/voxel/figure/head_elf_female.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3503d62ba3971c4d2bfc02adf10ea3a449356281f4381c5308aa472fa43a2588 -size 4952 diff --git a/assets/voxygen/voxel/figure/head_elf_male.vox b/assets/voxygen/voxel/figure/head_elf_male.vox deleted file mode 100644 index b6af9be9c1..0000000000 --- a/assets/voxygen/voxel/figure/head_elf_male.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2f04815b2aadf653abe034916de8a7b27cd124944df66bf705550d4aea4d828 -size 4416 diff --git a/assets/voxygen/voxel/figure/head_female.vox b/assets/voxygen/voxel/figure/head_female.vox deleted file mode 100644 index b9410a8c4f..0000000000 --- a/assets/voxygen/voxel/figure/head_female.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d95c29862e6e17b26193fb16bd7680e6c27c3550ae45174374e4eb5e6bc1d79 -size 5168 diff --git a/assets/voxygen/voxel/figure/head_human_female.vox b/assets/voxygen/voxel/figure/head_human_female.vox deleted file mode 100644 index 9a33854f2d..0000000000 --- a/assets/voxygen/voxel/figure/head_human_female.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:808c77d7ed81aab362bc92a3d5273d1f836043127e3c0d8db7a5864aa58f44b7 -size 5168 diff --git a/assets/voxygen/voxel/figure/head_human_male.vox b/assets/voxygen/voxel/figure/head_human_male.vox deleted file mode 100644 index bc3e4f3949..0000000000 --- a/assets/voxygen/voxel/figure/head_human_male.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:adb056231cc8f1cda9e9f2047acdff88182a50e724b5c56733963d0544641ba6 -size 47807 diff --git a/assets/voxygen/voxel/figure/head_orc_female.vox b/assets/voxygen/voxel/figure/head_orc_female.vox deleted file mode 100644 index 784f986ab6..0000000000 --- a/assets/voxygen/voxel/figure/head_orc_female.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6c8acfe5845b88f1547748aaa40123b848adaab71b53ad5458be3178f17a55f -size 58215 diff --git a/assets/voxygen/voxel/figure/head_orc_male.vox b/assets/voxygen/voxel/figure/head_orc_male.vox deleted file mode 100644 index 49e36869b0..0000000000 --- a/assets/voxygen/voxel/figure/head_orc_male.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de5333722f1c5e018f6cffa3abd40283fd4dda574e50a5e8a7851a3a344633ae -size 46831 diff --git a/assets/voxygen/voxel/figure/head_undead_female.vox b/assets/voxygen/voxel/figure/head_undead_female.vox deleted file mode 100644 index d7c83f6d63..0000000000 --- a/assets/voxygen/voxel/figure/head_undead_female.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5cc8fbc43273908a486423ebf1358b5a78bf773593a5bc645a30a8be936432b -size 3904 diff --git a/assets/voxygen/voxel/figure/head_undead_male.vox b/assets/voxygen/voxel/figure/head_undead_male.vox deleted file mode 100644 index a637b1406e..0000000000 --- a/assets/voxygen/voxel/figure/head_undead_male.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef0560a5e4aeb7c9d24072b4b9b9430d206089aa4bee2532a20ba32b9624bd80 -size 4144 diff --git a/common/src/comp/actor.rs b/common/src/comp/actor.rs index ab7f6bb1f7..86b8ebc805 100644 --- a/common/src/comp/actor.rs +++ b/common/src/comp/actor.rs @@ -15,7 +15,6 @@ pub enum Race { pub enum BodyType { Female, Male, - Unspecified, } #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] @@ -156,7 +155,7 @@ pub const ALL_RACES: [Race; 6] = [ Race::Orc, Race::Undead, ]; -pub const ALL_BODY_TYPES: [BodyType; 3] = [BodyType::Female, BodyType::Male, BodyType::Unspecified]; +pub const ALL_BODY_TYPES: [BodyType; 2] = [BodyType::Female, BodyType::Male]; pub const ALL_CHESTS: [Chest; 5] = [ Chest::Blue, Chest::Brown, @@ -221,7 +220,7 @@ impl HumanoidBody { } } /////////// -const ALL_QBODY_TYPES: [BodyType; 3] = [BodyType::Female, BodyType::Male, BodyType::Unspecified]; +const ALL_QBODY_TYPES: [BodyType; 2] = [BodyType::Female, BodyType::Male]; const ALL_QPIG_HEADS: [PigHead; 1] = [PigHead::Default]; const ALL_QPIG_CHESTS: [PigChest; 1] = [PigChest::Default]; const ALL_QPIG_LEG_LS: [PigLegL; 1] = [PigLegL::Default]; @@ -249,7 +248,7 @@ impl QuadrupedBody { } } ///////////// -const ALL_QMBODY_TYPES: [BodyType; 3] = [BodyType::Female, BodyType::Male, BodyType::Unspecified]; +const ALL_QMBODY_TYPES: [BodyType; 2] = [BodyType::Female, BodyType::Male]; const ALL_QMWOLF_HEADS_UPPER: [WolfHeadUpper; 1] = [WolfHeadUpper::Default]; const ALL_QMWOLF_JAWS: [WolfJaw; 1] = [WolfJaw::Default]; const ALL_QMWOLF_HEADS_LOWER: [WolfHeadLower; 1] = [WolfHeadLower::Default]; diff --git a/voxygen/src/anim/character/attack.rs b/voxygen/src/anim/character/attack.rs index 55e817971b..283f10bcb0 100644 --- a/voxygen/src/anim/character/attack.rs +++ b/voxygen/src/anim/character/attack.rs @@ -29,7 +29,7 @@ impl Animation for AttackAnimation { let wave_stop_quick = (anim_time as f32 * 16.0).min(PI / 2.0).sin(); next.head.offset = Vec3::new( - 0.0, + 0.0 + skeleton_attr.neck_right, 0.0 + skeleton_attr.neck_forward, skeleton_attr.neck_height + 15.0, ); diff --git a/voxygen/src/anim/character/gliding.rs b/voxygen/src/anim/character/gliding.rs index feff70fbf5..2edfa8c05f 100644 --- a/voxygen/src/anim/character/gliding.rs +++ b/voxygen/src/anim/character/gliding.rs @@ -40,7 +40,7 @@ impl Animation for GlidingAnimation { * 0.25, ); next.head.offset = Vec3::new( - 0.0, + 0.0 + skeleton_attr.neck_right, 0.0 + skeleton_attr.neck_forward, skeleton_attr.neck_height + 6.0, ); diff --git a/voxygen/src/anim/character/idle.rs b/voxygen/src/anim/character/idle.rs index a628c8b37c..d74f8843b3 100644 --- a/voxygen/src/anim/character/idle.rs +++ b/voxygen/src/anim/character/idle.rs @@ -40,7 +40,7 @@ impl Animation for IdleAnimation { * 0.25, ); next.head.offset = Vec3::new( - 0.0, + 0.0 + skeleton_attr.neck_right, 0.0 + skeleton_attr.neck_forward, skeleton_attr.neck_height + 15.0 + wave_ultra_slow * 0.3, ); diff --git a/voxygen/src/anim/character/jump.rs b/voxygen/src/anim/character/jump.rs index b290ecc290..223f1c7e18 100644 --- a/voxygen/src/anim/character/jump.rs +++ b/voxygen/src/anim/character/jump.rs @@ -24,7 +24,7 @@ impl Animation for JumpAnimation { let wave_stop_alt = (anim_time as f32 * 5.0).min(PI / 2.0).sin(); next.head.offset = Vec3::new( - 0.0, + 0.0 + skeleton_attr.neck_right, 0.0 + skeleton_attr.neck_forward, skeleton_attr.neck_height + 15.0, ); diff --git a/voxygen/src/anim/character/roll.rs b/voxygen/src/anim/character/roll.rs index cfb0ae2c80..fd43915e91 100644 --- a/voxygen/src/anim/character/roll.rs +++ b/voxygen/src/anim/character/roll.rs @@ -27,7 +27,7 @@ impl Animation for RollAnimation { let wave_dub = (anim_time as f32 * 5.5).sin(); next.head.offset = Vec3::new( - 0.0, + 0.0 + skeleton_attr.neck_right, -2.0 + wave_slow * -3.0 + skeleton_attr.neck_forward, skeleton_attr.neck_height + 9.0 + wave_dub * -5.0, ); diff --git a/voxygen/src/anim/mod.rs b/voxygen/src/anim/mod.rs index 15864c1f72..122c6487f1 100644 --- a/voxygen/src/anim/mod.rs +++ b/voxygen/src/anim/mod.rs @@ -51,6 +51,7 @@ pub struct SkeletonAttr { head_scale: f32, neck_height: f32, neck_forward: f32, + neck_right: f32, weapon_x: f32, weapon_y: f32, } @@ -62,6 +63,7 @@ impl Default for SkeletonAttr { head_scale: 1.0, neck_height: 1.0, neck_forward: 1.0, + neck_right: 1.0, weapon_x: 1.0, weapon_y: 1.0, } @@ -76,23 +78,23 @@ impl<'a> From<&'a HumanoidBody> for SkeletonAttr { (Race::Orc, BodyType::Female) => 1.0, (Race::Human, BodyType::Male) => 1.0, (Race::Human, BodyType::Female) => 0.90, - (Race::Elf, BodyType::Male) => 1.10, + (Race::Elf, BodyType::Male) => 1.0, (Race::Elf, BodyType::Female) => 1.0, (Race::Dwarf, BodyType::Male) => 0.92, (Race::Dwarf, BodyType::Female) => 0.89, - (Race::Undead, BodyType::Male) => 1.0, - (Race::Undead, BodyType::Female) => 0.90, + (Race::Undead, BodyType::Male) => 0.98, + (Race::Undead, BodyType::Female) => 0.93, (Race::Danari, BodyType::Male) => 0.85, (Race::Danari, BodyType::Female) => 0.82, _ => 1.0, }, head_scale: match (body.race, body.body_type) { (Race::Orc, BodyType::Male) => 0.9, - (Race::Orc, BodyType::Female) => 0.88, + (Race::Orc, BodyType::Female) => 1.0, (Race::Human, BodyType::Male) => 1.0, (Race::Human, BodyType::Female) => 1.0, - (Race::Elf, BodyType::Male) => 0.9, - (Race::Elf, BodyType::Female) => 0.9, + (Race::Elf, BodyType::Male) => 1.0, + (Race::Elf, BodyType::Female) => 1.0, (Race::Dwarf, BodyType::Male) => 1.0, (Race::Dwarf, BodyType::Female) => 1.0, (Race::Undead, BodyType::Male) => 1.0, @@ -102,35 +104,50 @@ impl<'a> From<&'a HumanoidBody> for SkeletonAttr { _ => 1.0, }, neck_height: match (body.race, body.body_type) { - (Race::Orc, BodyType::Male) => -1.0, + (Race::Orc, BodyType::Male) => -2.0, (Race::Orc, BodyType::Female) => -2.0, - (Race::Human, BodyType::Male) => 0.0, + (Race::Human, BodyType::Male) => 6.0, (Race::Human, BodyType::Female) => -2.0, - (Race::Elf, BodyType::Male) => -0.5, - (Race::Elf, BodyType::Female) => -1.5, + (Race::Elf, BodyType::Male) => 0.75, + (Race::Elf, BodyType::Female) => -1.25, (Race::Dwarf, BodyType::Male) => -0.0, (Race::Dwarf, BodyType::Female) => -1.0, (Race::Undead, BodyType::Male) => -1.0, - (Race::Undead, BodyType::Female) => -1.0, + (Race::Undead, BodyType::Female) => -0.5, (Race::Danari, BodyType::Male) => 0.5, (Race::Danari, BodyType::Female) => -0.5, _ => 1.0, }, neck_forward: match (body.race, body.body_type) { - (Race::Orc, BodyType::Male) => -1.0, - (Race::Orc, BodyType::Female) => 2.0, - (Race::Human, BodyType::Male) => 1.0, - (Race::Human, BodyType::Female) => 1.0, - (Race::Elf, BodyType::Male) => -0.5, + (Race::Orc, BodyType::Male) => 1.0, + (Race::Orc, BodyType::Female) => -1.0, + (Race::Human, BodyType::Male) => 0.0, + (Race::Human, BodyType::Female) => -1.0, + (Race::Elf, BodyType::Male) => 1.75, (Race::Elf, BodyType::Female) => -0.5, - (Race::Dwarf, BodyType::Male) => 0.0, - (Race::Dwarf, BodyType::Female) => 2.0, + (Race::Dwarf, BodyType::Male) => 2.0, + (Race::Dwarf, BodyType::Female) => 0.0, (Race::Undead, BodyType::Male) => 1.0, (Race::Undead, BodyType::Female) => 1.0, (Race::Danari, BodyType::Male) => 0.5, (Race::Danari, BodyType::Female) => 0.0, _ => 1.0, }, + neck_right: match (body.race, body.body_type) { + (Race::Orc, BodyType::Male) => 0.0, + (Race::Orc, BodyType::Female) => 0.0, + (Race::Human, BodyType::Male) => 0.0, + (Race::Human, BodyType::Female) => 0.0, + (Race::Elf, BodyType::Male) => -1.0, + (Race::Elf, BodyType::Female) => 0.25, + (Race::Dwarf, BodyType::Male) => 0.0, + (Race::Dwarf, BodyType::Female) => 0.0, + (Race::Undead, BodyType::Male) => -0.5, + (Race::Undead, BodyType::Female) => 0.0, + (Race::Danari, BodyType::Male) => 0.0, + (Race::Danari, BodyType::Female) => 0.0, + _ => 1.0, + }, weapon_x: match body.weapon { Weapon::Sword => 0.0, Weapon::Axe => 3.0, @@ -143,7 +160,7 @@ impl<'a> From<&'a HumanoidBody> for SkeletonAttr { _ => 1.0, }, weapon_y: match body.weapon { - Weapon::Sword => -1.0, + Weapon::Sword => -1.25, Weapon::Axe => 0.0, Weapon::Hammer => -2.0, Weapon::SwordShield => 0.0, diff --git a/voxygen/src/menu/char_selection/ui.rs b/voxygen/src/menu/char_selection/ui.rs index 3c0bdbe6e8..a63d63dfa4 100644 --- a/voxygen/src/menu/char_selection/ui.rs +++ b/voxygen/src/menu/char_selection/ui.rs @@ -721,17 +721,17 @@ impl CharSelectionUi { self.imgs.icon_border }) .middle_of(self.ids.hammer) - //.hover_image(self.imgs.icon_border_mo) - //.press_image(self.imgs.icon_border_press) + .hover_image(self.imgs.icon_border_mo) + .press_image(self.imgs.icon_border_press) .set(self.ids.hammer_button, ui_widgets) .was_clicked() { - //self.character_body.weapon = Weapon::Hammer; + self.character_body.weapon = Weapon::Hammer; } // REMOVE THIS AFTER IMPLEMENTATION - Rectangle::fill_with([67.0, 67.0], color::rgba(0.0, 0.0, 0.0, 0.8)) - .middle_of(self.ids.hammer) - .set(self.ids.hammer_grey, ui_widgets); + /*Rectangle::fill_with([67.0, 67.0], color::rgba(0.0, 0.0, 0.0, 0.8)) + .middle_of(self.ids.hammer) + .set(self.ids.hammer_grey, ui_widgets);*/ // Bow @@ -830,17 +830,17 @@ impl CharSelectionUi { self.imgs.icon_border }) .middle_of(self.ids.axe) - //.hover_image(self.imgs.icon_border_mo) - //.press_image(self.imgs.icon_border_press) + .hover_image(self.imgs.icon_border_mo) + .press_image(self.imgs.icon_border_press) .set(self.ids.axe_button, ui_widgets) .was_clicked() { - //self.character_body.weapon = Weapon::Axe; + self.character_body.weapon = Weapon::Axe; } // REMOVE THIS AFTER IMPLEMENTATION - Rectangle::fill_with([67.0, 67.0], color::rgba(0.0, 0.0, 0.0, 0.8)) - .middle_of(self.ids.axe) - .set(self.ids.axe_grey, ui_widgets); + /*Rectangle::fill_with([67.0, 67.0], color::rgba(0.0, 0.0, 0.0, 0.8)) + .middle_of(self.ids.axe) + .set(self.ids.axe_grey, ui_widgets);*/ // Sliders diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs index d94cc99ac3..d915cd9f78 100644 --- a/voxygen/src/scene/figure.rs +++ b/voxygen/src/scene/figure.rs @@ -170,7 +170,7 @@ impl FigureModelCache { ), (Race::Elf, BodyType::Male) => ( "figure/head/head_elf_male.vox", - Vec3::new(-9.0, -6.5, -3.75), + Vec3::new(-7.0, -6.5, -3.75), ), (Race::Elf, BodyType::Female) => ( "figure/head/head_elf_female.vox", @@ -210,7 +210,10 @@ impl FigureModelCache { ), _ => { warn!("Invalid race, body_type combination for figure head"); - ("figure/head/head_human_male", Vec3::new(-7.0, -7.0, -9.25)) + ( + "figure/head/head_human_male.vox", + Vec3::new(-7.0, -5.5, -9.25), + ) } }; Self::load_mesh(name, offset)