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 'treeco/disable-human-rtsim' into 'master'

Browse Source 
Temporarily disable humanoid rtsim entities until their pathfinding is fixed

See merge request veloren/veloren!2015
This commit is contained in:
Joshua Yanovski 2021-03-28 15:01:05 +00:00
commit 84ce211bff
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/rtsim/entity.rs
View File

@ -34,19 +34,20 @@ impl Entity {
pub fn get_body(&self) -> comp::Body {
match self.rng(PERM_GENUS).gen::<f32>() {
// we want 5% airships, 45% birds, 50% humans
x if x < 0.05 => comp::Body::Ship(comp::ship::Body::DefaultAirship),
x if x < 0.50 => {
// HUMANS TEMPORARILY DISABLED UNTIL PATHFINDING FIXED
x if x < 0.10 => comp::Body::Ship(comp::ship::Body::DefaultAirship),
_ => {
let species = *(&comp::bird_medium::ALL_SPECIES)
.choose(&mut self.rng(PERM_SPECIES))
.unwrap();
comp::bird_medium::Body::random_with(&mut self.rng(PERM_BODY), &species).into()
},
_ => {
let species = *(&comp::humanoid::ALL_SPECIES)
.choose(&mut self.rng(PERM_SPECIES))
.unwrap();
comp::humanoid::Body::random_with(&mut self.rng(PERM_BODY), &species).into()
},
// _ => {
// let species = *(&comp::humanoid::ALL_SPECIES)
// .choose(&mut self.rng(PERM_SPECIES))
// .unwrap();
// comp::humanoid::Body::random_with(&mut self.rng(PERM_BODY), &species).into()
// },
}
}

2
server/src/rtsim/mod.rs
View File

@ -98,7 +98,7 @@ pub fn init(state: &mut State, #[cfg(feature = "worldgen")] world: &world::World
#[cfg(not(feature = "worldgen"))]
let mut rtsim = RtSim::new(Vec2::new(40, 40));
for _ in 0..5000 {
for _ in 0..2500 {
let pos = rtsim
.chunks
.size()