diff --git a/assets/voxygen/element/buttons/inv_slot.png b/assets/voxygen/element/buttons/inv_slot.png index 4bc7730fa0..3526eed1c1 100644 --- a/assets/voxygen/element/buttons/inv_slot.png +++ b/assets/voxygen/element/buttons/inv_slot.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51ab0acb02be338ca481b020f8832f047dc5a41d0f10732785f3c4835dd506ec +oid sha256:6059f16ab4b46dbc90e7fba91316b92a96207e394efd95c2033443dcae0137f7 size 320 diff --git a/assets/voxygen/voxel/armor/chest/chest_none.vox b/assets/voxygen/voxel/armor/chest/chest_none.vox index 1e9089c6b0..dbe488be63 100644 --- a/assets/voxygen/voxel/armor/chest/chest_none.vox +++ b/assets/voxygen/voxel/armor/chest/chest_none.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aaf05edac3fb92fab781293452dd074f915763bc3650cf79c4dbf356da3cfb23 -size 57075 +oid sha256:19ce5a0ccf3ed427296539202df2e6ea65f00abec4058195527a2c285bc117de +size 2632 diff --git a/assets/voxygen/voxel/armor/chest/cultist.vox b/assets/voxygen/voxel/armor/chest/cultist.vox index 52dc8a29ef..8f6650a63d 100644 --- a/assets/voxygen/voxel/armor/chest/cultist.vox +++ b/assets/voxygen/voxel/armor/chest/cultist.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76489efbe59edafd33676e940e890ba47922b4b074a423d816f522842e83baf9 +oid sha256:11d101fab4091587164ce170580ff5a46ffd3900447aed3da671286c75fc45b7 size 2792 diff --git a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron index fc41ce56ac..cf01dba1b4 100644 --- a/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron +++ b/assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron @@ -113,21 +113,21 @@ ), CultistPurple: ( left: ( - vox_spec: ("armor.shoulder.cultist_right", (-2.0, -3.5, 1.0)), + vox_spec: ("armor.shoulder.cultist_right", (-2.0, -3.5, 0.0)), color: Some((30, 0, 64)) ), right: ( - vox_spec: ("armor.shoulder.cultist_right", (-2.9, -3.5, 1.0)), + vox_spec: ("armor.shoulder.cultist_right", (-2.9, -3.5, 0.0)), color: Some((30, 0, 64)) ) ), CultistBlue: ( left: ( - vox_spec: ("armor.shoulder.cultist_right", (-2.0, -3.5, 1.0)), + vox_spec: ("armor.shoulder.cultist_right", (-2.0, -3.5, 0.0)), color: Some((57, 81, 132)) ), right: ( - vox_spec: ("armor.shoulder.cultist_right", (-2.9, -3.5, 1.0)), + vox_spec: ("armor.shoulder.cultist_right", (-2.9, -3.5, 0.0)), color: Some((57, 81, 132)) ) ), diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index 275b78f912..2a6aa52f6d 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -1,3 +1,6 @@ +// Note: If you changes here "break" old character saves you can change the +// version in voxygen\src\meta.rs in order to reset save files to being empty + use crate::comp::{ body::object, projectile, Body, CharacterAbility, Gravity, HealthChange, HealthSource, LightEmitter, Projectile, diff --git a/voxygen/src/anim/character/mod.rs b/voxygen/src/anim/character/mod.rs index 0265ffcb16..a3ff928ea7 100644 --- a/voxygen/src/anim/character/mod.rs +++ b/voxygen/src/anim/character/mod.rs @@ -31,6 +31,7 @@ pub use self::{ use super::{Bone, Skeleton}; use crate::render::FigureBoneData; use common::comp; + #[derive(Clone, Default)] pub struct CharacterSkeleton { head: Bone, @@ -167,18 +168,18 @@ impl SkeletonAttr { pub fn calculate_scale(body: &comp::humanoid::Body) -> f32 { use comp::humanoid::{BodyType::*, Race::*}; match (body.race, body.body_type) { - (Orc, Male) => 0.95 * 1.2, - (Orc, Female) => 0.85 * 1.2, - (Human, Male) => 0.85 * 1.2, - (Human, Female) => 0.8 * 1.2, - (Elf, Male) => 0.85 * 1.2, - (Elf, Female) => 0.8 * 1.2, - (Dwarf, Male) => 0.7 * 1.2, - (Dwarf, Female) => 0.65 * 1.2, - (Undead, Male) => 0.8 * 1.2, - (Undead, Female) => 0.75 * 1.2, - (Danari, Male) => 0.58 * 1.2, - (Danari, Female) => 0.58 * 1.2, + (Orc, Male) => 1.14, + (Orc, Female) => 1.02, + (Human, Male) => 1.02, + (Human, Female) => 0.96, + (Elf, Male) => 1.02, + (Elf, Female) => 0.96, + (Dwarf, Male) => 0.84, + (Dwarf, Female) => 0.78, + (Undead, Male) => 0.96, + (Undead, Female) => 0.9, + (Danari, Male) => 0.696, + (Danari, Female) => 0.696, } } } @@ -206,7 +207,7 @@ impl<'a> From<&'a comp::humanoid::Body> for SkeletonAttr { (Orc, Male) => (0.0, 14.0), (Orc, Female) => (0.0, 14.0), (Human, Male) => (0.3, 13.5), - (Human, Female) => (-0.6, 13.5), + (Human, Female) => (0.0, 13.8), (Elf, Male) => (0.0, 13.5), (Elf, Female) => (0.0, 13.5), (Dwarf, Male) => (0.0, 14.5), diff --git a/voxygen/src/meta.rs b/voxygen/src/meta.rs index af884eee76..71d66087f9 100644 --- a/voxygen/src/meta.rs +++ b/voxygen/src/meta.rs @@ -4,6 +4,7 @@ use log::warn; use serde_derive::{Deserialize, Serialize}; use std::{fs, io::Write, path::PathBuf}; +const VALID_VERSION: u32 = 0; // Change this if you broke charsaves #[derive(Clone, Debug, Serialize, Deserialize)] #[repr(C)] pub struct CharacterData { @@ -13,11 +14,12 @@ pub struct CharacterData { } #[derive(Clone, Debug, Default, Serialize, Deserialize)] -#[serde(default)] +//#[serde(default)] #[repr(C)] pub struct Meta { pub characters: Vec, pub selected_character: usize, + pub version: u32, } impl Meta { @@ -38,8 +40,12 @@ impl Meta { let path = Self::get_meta_path(); if let Ok(file) = fs::File::open(&path) { - match ron::de::from_reader(file) { - Ok(s) => return s, + match ron::de::from_reader::<_, Meta>(file) { + Ok(s) => { + if s.version == VALID_VERSION { + return s; + } + }, Err(e) => { log::warn!("Failed to parse meta file! Fallback to default. {}", e); // Rename the corrupted settings file