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

fmt

Browse Source 
Former-commit-id: 7535fe743722967dd59e383aa93cb78cb3be6e23
This commit is contained in:
Joshua Barretto 2019-05-28 19:59:32 +01:00
parent bfc70f4d78
commit 8407908af2
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/src/sys/agent.rs
View File

@ -1,11 +1,11 @@
// Library
use rand::Rng;
use specs::{Entities, Join, Read, ReadStorage, System, WriteStorage};
use vek::*;
use rand::Rng;
// Crate
use crate::{
comp::{phys::Pos, Agent, Control, Jumping, Attacking},
comp::{phys::Pos, Agent, Attacking, Control, Jumping},
state::Time,
};
@ -70,7 +70,7 @@ impl<'a> System<'a> for Sys {
Vec2::new(rand::random::<f32>() - 0.5, rand::random::<f32>() - 0.5)
* 10.0;
}
},
}
Agent::Enemy { target } => {
let choose_new = match target.map(|tgt| positions.get(tgt)).flatten() {
Some(tgt_pos) => {
@ -84,29 +84,32 @@ impl<'a> System<'a> for Sys {
false
} else if dist < 60.0 {
control.move_dir = Vec2::<f32>::from(tgt_pos.0 - pos.0).normalized() * 0.96;
control.move_dir =
Vec2::<f32>::from(tgt_pos.0 - pos.0).normalized() * 0.96;
false
} else {
true
}
},
}
None => {
control.move_dir = Vec2::one();
true
},
}
};
if choose_new {
let entities = (&entities, &positions)
.join()
.filter(|(_, e_pos)| Vec2::<f32>::from(e_pos.0 - pos.0).magnitude() < 30.0)
.filter(|(_, e_pos)| {
Vec2::<f32>::from(e_pos.0 - pos.0).magnitude() < 30.0
})
.map(|(e, _)| e)
.collect::<Vec<_>>();
*target = rand::thread_rng().choose(&entities).cloned();
}
},
}
}
}
}

4
server/src/cmd.rs
View File

@ -285,9 +285,7 @@ fn handle_enemy(server: &mut Server, entity: EcsEntity, args: String, action: &C
"Tobermory".to_owned(),
comp::Body::Humanoid(comp::HumanoidBody::random()),
)
.with(comp::Agent::Enemy {
target: None,
})
.with(comp::Agent::Enemy { target: None })
.build();
server
.clients