diff --git a/common/Cargo.toml b/common/Cargo.toml index 345267acbe..a9706d48a2 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" no-assets = [] tracy = ["common-base/tracy"] simd = ["vek/platform_intrinsics"] -bin_csv = ["csv", "structopt"] +bin_csv = ["ron", "csv", "structopt"] default = ["simd"] @@ -19,7 +19,6 @@ common-base = { package = "veloren-common-base", path = "base" } # Serde serde = { version = "1.0.110", features = ["derive", "rc"] } -ron = { version = "0.6", default-features = false } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] approx = "0.4.0" @@ -47,6 +46,8 @@ dot_vox = "4.0" # Assets serde_repr = "0.1.6" +# csv import +ron = { version = "0.6", default-features = false, optional = true } # csv export csv = { version = "1.1.3", optional = true } structopt = { version = "0.3.13", optional = true } diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index d101cb1a14..b7d2b62528 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -365,10 +365,9 @@ impl Body { quadruped_low::Species::Monitor => Vec3::new(1.0, 2.3, 1.5), quadruped_low::Species::Pangolin => Vec3::new(1.0, 2.0, 1.3), quadruped_low::Species::Rocksnapper => Vec3::new(1.0, 1.6, 2.9), - quadruped_low::Species::Basilisk => Vec3::new(1.0, 1.6, 2.9), + quadruped_low::Species::Basilisk => Vec3::new(1.8, 2.2, 2.9), quadruped_low::Species::Salamander => Vec3::new(1.0, 2.4, 1.3), quadruped_low::Species::Tortoise => Vec3::new(1.0, 1.6, 2.0), - quadruped_low::Species::Basilisk => Vec3::new(1.8, 2.2, 2.9), _ => Vec3::new(1.0, 1.6, 1.3), }, Body::Ship(ship) => ship.dimensions(),