diff --git a/assets/world/map/veloren_0_5_0_0.bin b/assets/world/map/veloren_0_5_0_0.bin deleted file mode 100644 index 3c52bd8161..0000000000 --- a/assets/world/map/veloren_0_5_0_0.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:267884532ae482c58f8cc2308c36824b4f4216b124b0310104364c7619e20130 -size 16777236 diff --git a/assets/world/map/veloren_0_6_0_0.bin b/assets/world/map/veloren_0_6_0_0.bin new file mode 100644 index 0000000000..6056e7869c --- /dev/null +++ b/assets/world/map/veloren_0_6_0_0.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d021e9faef8b1a34a7a3f28f80d7a057cd9b536025898e6c21ca01c40fecca7f +size 16777236 diff --git a/server/src/settings.rs b/server/src/settings.rs index 277877812e..81a429e405 100644 --- a/server/src/settings.rs +++ b/server/src/settings.rs @@ -3,7 +3,7 @@ use serde_derive::{Deserialize, Serialize}; use std::{fs, io::prelude::*, net::SocketAddr, path::PathBuf}; use world::sim::FileOpts; -const DEFAULT_WORLD_SEED: u32 = 5284; +const DEFAULT_WORLD_SEED: u32 = 59686; #[derive(Clone, Debug, Serialize, Deserialize)] #[serde(default)] diff --git a/world/src/civ/mod.rs b/world/src/civ/mod.rs index 68a1f04d3a..1c12ac383f 100644 --- a/world/src/civ/mod.rs +++ b/world/src/civ/mod.rs @@ -28,7 +28,7 @@ use rand::prelude::*; use rand_chacha::ChaChaRng; use vek::*; -const INITIAL_CIV_COUNT: usize = 64; +const INITIAL_CIV_COUNT: usize = (crate::sim::WORLD_SIZE.x * crate::sim::WORLD_SIZE.y * 3) / 65536; //48 at default scale #[derive(Default)] pub struct Civs { @@ -81,7 +81,7 @@ impl Civs { } } - for _ in 0..INITIAL_CIV_COUNT * 4 { + for _ in 0..INITIAL_CIV_COUNT * 3 { attempt(5, || { let loc = find_site_loc(&mut ctx, None)?; this.establish_site(&mut ctx.reseed(), loc, |place| Site { diff --git a/world/src/sim/mod.rs b/world/src/sim/mod.rs index 6947c3925a..7acecea941 100644 --- a/world/src/sim/mod.rs +++ b/world/src/sim/mod.rs @@ -232,7 +232,7 @@ pub type ModernMap = WorldMap_0_5_0; /// TODO: Consider using some naming convention to automatically change this /// with changing versions, or at least keep it in a constant somewhere that's /// easy to change. -pub const DEFAULT_WORLD_MAP: &'static str = "world.map.veloren_0_5_0_0"; +pub const DEFAULT_WORLD_MAP: &'static str = "world.map.veloren_0_6_0_0"; impl WorldFileLegacy { #[inline]