diff --git a/bin/net/grosinger/nomads/DroneTools.class b/bin/net/grosinger/nomads/DroneTools.class index 8fd5f8c..04c38a8 100644 Binary files a/bin/net/grosinger/nomads/DroneTools.class and b/bin/net/grosinger/nomads/DroneTools.class differ diff --git a/bin/net/grosinger/nomads/drones/Police.class b/bin/net/grosinger/nomads/drones/Police.class index 61f3e9e..5b91d71 100644 Binary files a/bin/net/grosinger/nomads/drones/Police.class and b/bin/net/grosinger/nomads/drones/Police.class differ diff --git a/src/net/grosinger/nomads/DroneTools.java b/src/net/grosinger/nomads/DroneTools.java index 8fd9245..3746f97 100644 --- a/src/net/grosinger/nomads/DroneTools.java +++ b/src/net/grosinger/nomads/DroneTools.java @@ -387,4 +387,17 @@ public class DroneTools { public int getTeamBalance() { return currentTeam.getBalance(); } + + /** + * Calculates and returns the distance of the drone from a provided point. + * Number is rounded up to nearest whole number >= actual distance. + * + * @param p + * Point to find distance to + * @return int + */ + public int distanceFromPoint(Point p) { + return 1; + // TODO - Implement distanceFromePoint + } } diff --git a/src/net/grosinger/nomads/drones/Police.java b/src/net/grosinger/nomads/drones/Police.java index 837023f..623db45 100644 --- a/src/net/grosinger/nomads/drones/Police.java +++ b/src/net/grosinger/nomads/drones/Police.java @@ -77,8 +77,12 @@ public class Police implements Drone { for (NeighborDrone aDrone : tools.checkRadar()) { if (aDrone.getUID().equals(UIDofDroneIAmFollowing)) { // If I am within 1 space of it, attack - // TODO - // Else move towards it + Point droneBeingFollowed = new Point(aDrone.getX(), aDrone.getY()); + if (tools.distanceFromPoint(droneBeingFollowed) <= 1) { + return EnumMove.Attack; + } else { + goToPoint(droneBeingFollowed); + } } } } else if (iAmGoingToGiveBackup != null) {