From ab596d2ae8fe2ff6b4edaa30d76696ca994a80d8 Mon Sep 17 00:00:00 2001 From: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Sat, 27 Mar 2021 15:09:34 +0000 Subject: [PATCH] New default world map, default continent scale doubled --- assets/world/map/veloren_0_6_0_0.bin | 3 --- assets/world/map/veloren_0_9_0_0.bin | 3 +++ server/src/settings.rs | 2 +- world/src/sim/mod.rs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 assets/world/map/veloren_0_6_0_0.bin create mode 100644 assets/world/map/veloren_0_9_0_0.bin diff --git a/assets/world/map/veloren_0_6_0_0.bin b/assets/world/map/veloren_0_6_0_0.bin deleted file mode 100644 index 6056e7869c..0000000000 --- a/assets/world/map/veloren_0_6_0_0.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d021e9faef8b1a34a7a3f28f80d7a057cd9b536025898e6c21ca01c40fecca7f -size 16777236 diff --git a/assets/world/map/veloren_0_9_0_0.bin b/assets/world/map/veloren_0_9_0_0.bin new file mode 100644 index 0000000000..87ffd860e1 --- /dev/null +++ b/assets/world/map/veloren_0_9_0_0.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16f43f83ba897f290eaa3a73c94a1d085de44d86a4faf9de8b834b706683ce60 +size 16777252 diff --git a/server/src/settings.rs b/server/src/settings.rs index 44b418a27c..67a1af3817 100644 --- a/server/src/settings.rs +++ b/server/src/settings.rs @@ -16,7 +16,7 @@ use std::{ use tracing::{error, warn}; use world::sim::FileOpts; -const DEFAULT_WORLD_SEED: u32 = 59686; +const DEFAULT_WORLD_SEED: u32 = 25269; const CONFIG_DIR: &str = "server_config"; const SETTINGS_FILENAME: &str = "settings.ron"; const WHITELIST_FILENAME: &str = "whitelist.ron"; diff --git a/world/src/sim/mod.rs b/world/src/sim/mod.rs index 7b064c02db..198eb31e93 100644 --- a/world/src/sim/mod.rs +++ b/world/src/sim/mod.rs @@ -265,7 +265,7 @@ pub type ModernMap = WorldMap_0_7_0; /// with changing versions, or at least keep it in a constant somewhere that's /// easy to change. #[allow(clippy::redundant_static_lifetimes)] // TODO: Pending review in #587 -pub const DEFAULT_WORLD_MAP: &'static str = "world.map.veloren_0_6_0_0"; +pub const DEFAULT_WORLD_MAP: &'static str = "world.map.veloren_0_9_0_0"; impl WorldFileLegacy { #[inline] @@ -462,7 +462,7 @@ impl WorldSim { // // FIXME: This is a hack! At some point we will hae a more principled way of // dealing with this. - let continent_scale_hack = 1.0/*4.0*/; + let continent_scale_hack = 2.0/*4.0*/; let (parsed_world_file, map_size_lg) = parsed_world_file .and_then(|map| match MapSizeLg::new(map.map_size_lg) { Ok(map_size_lg) => Some((Some(map), map_size_lg)),