From 8407908af280e342e5c064ec894d345ae53eca47 Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Tue, 28 May 2019 19:59:32 +0100 Subject: [PATCH] fmt Former-commit-id: 7535fe743722967dd59e383aa93cb78cb3be6e23 --- common/src/sys/agent.rs | 19 +++++++++++-------- server/src/cmd.rs | 4 +--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/common/src/sys/agent.rs b/common/src/sys/agent.rs index a9dcf46dc8..1b8e359d31 100644 --- a/common/src/sys/agent.rs +++ b/common/src/sys/agent.rs @@ -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::() - 0.5, rand::random::() - 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::::from(tgt_pos.0 - pos.0).normalized() * 0.96; + control.move_dir = + Vec2::::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::::from(e_pos.0 - pos.0).magnitude() < 30.0) + .filter(|(_, e_pos)| { + Vec2::::from(e_pos.0 - pos.0).magnitude() < 30.0 + }) .map(|(e, _)| e) .collect::>(); *target = rand::thread_rng().choose(&entities).cloned(); } - }, + } } } } diff --git a/server/src/cmd.rs b/server/src/cmd.rs index 5771e06090..d21c554416 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -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