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 'timo-fix-hostile' into 'master'

Browse Source 
Fix hostile npc's new target selection

See merge request veloren/veloren!392
This commit is contained in:
Joshua Barretto 2019-08-02 18:55:44 +00:00
commit 595f2bf1f1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ impl<'a> System<'a> for Sys {
);
fn run(&mut self, (entities, mut agents, positions, mut controllers): Self::SystemData) {
for (_entity, agent, pos, controller) in
for (entity, agent, pos, controller) in
(&entities, &mut agents, &positions, &mut controllers).join()
{
match agent {
@ -88,8 +88,9 @@ impl<'a> System<'a> for Sys {
if choose_new {
let entities = (&entities, &positions)
.join()
.filter(|(_, e_pos)| {
.filter(|(e, e_pos)| {
Vec2::<f32>::from(e_pos.0 - pos.0).magnitude() < 30.0
&& *e != entity
})
.map(|(e, _)| e)
.collect::<Vec<_>>();