mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'treeco/new-map' into 'master'
Changed default map and seed, lowered site counts See merge request veloren/veloren!992
This commit is contained in:
commit
2f89b863e0
BIN
assets/world/map/veloren_0_5_0_0.bin
(Stored with Git LFS)
BIN
assets/world/map/veloren_0_5_0_0.bin
(Stored with Git LFS)
Binary file not shown.
BIN
assets/world/map/veloren_0_6_0_0.bin
(Stored with Git LFS)
Normal file
BIN
assets/world/map/veloren_0_6_0_0.bin
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -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)]
|
||||||
|
@ -21,7 +21,7 @@ use rand_chacha::ChaChaRng;
|
|||||||
use std::{fmt, hash::Hash, ops::Range};
|
use std::{fmt, hash::Hash, ops::Range};
|
||||||
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 {
|
||||||
@ -66,7 +66,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 {
|
||||||
|
@ -229,7 +229,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]
|
||||||
|
Loading…
Reference in New Issue
Block a user