diff --git a/assets/world/map/veloren_0_5_0_0.bin b/assets/world/map/veloren_0_6_0_0.bin similarity index 64% rename from assets/world/map/veloren_0_5_0_0.bin rename to assets/world/map/veloren_0_6_0_0.bin index 2827571d24..5924ec99f5 100644 Binary files a/assets/world/map/veloren_0_5_0_0.bin and b/assets/world/map/veloren_0_6_0_0.bin differ 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 32199f46b4..7c4558a3de 100644 --- a/world/src/civ/mod.rs +++ b/world/src/civ/mod.rs @@ -21,7 +21,7 @@ use rand_chacha::ChaChaRng; use std::{fmt, hash::Hash, ops::Range}; 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 { @@ -66,7 +66,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 131eabac01..bd12949dbd 100644 --- a/world/src/sim/mod.rs +++ b/world/src/sim/mod.rs @@ -229,7 +229,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]