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 'james/min-initial-civ-count' into 'master'

Browse Source 
Always generate at least one civilization

See merge request veloren/veloren!3927
This commit is contained in:
Isse 2023-09-17 16:57:06 +00:00
commit 478c37f6f1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,12 +30,13 @@ use rand_chacha::ChaChaRng;
use tracing::{debug, info, warn};
use vek::*;
const fn initial_civ_count(map_size_lg: MapSizeLg) -> u32 {
fn initial_civ_count(map_size_lg: MapSizeLg) -> u32 {
// NOTE: since map_size_lg's dimensions must fit in a u16, we can safely add
// them here.
//
// NOTE: 48 at "default" scale of 10 × 10 chunk bits (1024 × 1024 chunks).
(3 << (map_size_lg.vec().x + map_size_lg.vec().y)) >> 16
let cnt = (3 << (map_size_lg.vec().x + map_size_lg.vec().y)) >> 16;
cnt.max(1) // we need at least one civ in order to generate a starting site
}
pub struct CaveInfo {