Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes

Browse Source
This commit is contained in:
Joshua Yanovski 2020-05-21 22:47:07 +02:00
commit eaea83fe6a
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/world/map/veloren_0_5_0_0.bin (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/world/map/veloren_0_6_0_0.bin (Stored with Git LFS) Normal file
View File

Binary file not shown.

2
server/src/settings.rs
View File

@ -3,7 +3,7 @@ use serde_derive::{Deserialize, Serialize};
use std::{fs, io::prelude::*, net::SocketAddr, path::PathBuf}; use std::{fs, io::prelude::*, net::SocketAddr, path::PathBuf};
use world::sim::FileOpts; use world::sim::FileOpts;
const DEFAULT_WORLD_SEED: u32 = 5284; const DEFAULT_WORLD_SEED: u32 = 59686;
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(default)] #[serde(default)]

4
world/src/civ/mod.rs
View File

@ -28,7 +28,7 @@ use rand::prelude::*;
use rand_chacha::ChaChaRng; use rand_chacha::ChaChaRng;
use vek::*; 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)] #[derive(Default)]
pub struct Civs { 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, || { attempt(5, || {
let loc = find_site_loc(&mut ctx, None)?; let loc = find_site_loc(&mut ctx, None)?;
this.establish_site(&mut ctx.reseed(), loc, |place| Site { this.establish_site(&mut ctx.reseed(), loc, |place| Site {

2
world/src/sim/mod.rs
View File

@ -232,7 +232,7 @@ pub type ModernMap = WorldMap_0_5_0;
/// TODO: Consider using some naming convention to automatically change this /// TODO: Consider using some naming convention to automatically change this
/// with changing versions, or at least keep it in a constant somewhere that's /// with changing versions, or at least keep it in a constant somewhere that's
/// easy to change. /// 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 { impl WorldFileLegacy {
#[inline] #[inline]