From 891002c6466b66e680b5896c8e0c5b8808ff035c Mon Sep 17 00:00:00 2001
From: Tony Grosinger <tony@grosinger.net>
Date: Sat, 10 Sep 2011 22:36:27 -0700
Subject: [PATCH] Updated to use NeighborDrone instead of Neighbor

Signed-off-by: Tony Grosinger <tony@grosinger.net>
---
 .../nomads/sampleDrone/SampleDrone.class      | Bin 2438 -> 2453 bytes
 .../nomads/sampleDrone/SampleDrone.java       |  34 ++++++++----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/bin/net/grosinger/nomads/sampleDrone/SampleDrone.class b/bin/net/grosinger/nomads/sampleDrone/SampleDrone.class
index 88943738fe99b642635008b04451a4c567f87983..97a5c3545af8ed6f03e3ceda01b265755c10b932 100644
GIT binary patch
delta 509
zcmYk2O-oxr6o#M4z1Ms=0U^YXomE@4(oI1Hzna#HB3Px>#Kvlk8jWAMHi@>iws9fu
zWf1X42+<Z7F8l%h0~fB`cGI;WoqKZ;7ju~Bob$ft%<M-FBcZGNi%Z}oyQiURLv@%f
zPvepVlY+|mRCdJPN)M#+1%c7hnhcWUlb<O;+d)-SjTx3YG9$(`GwQ_bF3w6)j!=5S
z5B6pu<7nn33(N>CHxnYpqGajuj6^zLa5|SID^92BB%H=I$@*i@cXqDqX-hU-&xcG!
zPLkKF)LD(<nd-Ibt+zQln^x0S#{4B{@K*kPYyA_!znBR9@I7_oA1o%G|DpMuiDUd{
zd@PmevrBUxrCrK+wCYl}bjFvGb}@+R*g;swb^`j=M5o@qiy?Y=PcL!$nB|rJhZtF2
zlj99L^s~zV)lFI^%j-}>t)_xL0n9t%;c!@2HrZ15fhS^E)d!=-SC2+r`o?#s_F|ms
Z2Opp3<6~RreEiVEAf%m={G=GG`ww;mZhrs(

delta 481
zcmZ9IOHUI~6vuzJGm}osz`~|H5*AY=0Te<p@(K$<M1#@92<1^;9dNMaF$1<d4G|Xj
z1#VpM3Eb97Sh(;5_zm2-?I&PCLb#naE?C@q&j0?-`RAPbE%r4Q{d4>4H}HhdKcauN
zcR6p$S$EUE=L)pWuC&RFAU0_`+jh>g9Xqe6eXOv_oS-QHo?o~Jql}WaSYT29(;l}j
zTdXiGs9STqxBk96;p7Vu9M;0D${szbeZZ9&eWdTBMYd9C)e5Kly+XE9xnZ%18p-(o
zvTfn1F57r067tk&mWzfdb4FG_612&r-uCm_D2qrL9ijF+m*w!QFBdeF=zfs8;^}wl
zD(S3BA6?RM#r$kFE?p2VkttTydZ2Q}5?e)OqY)22%TjkgCIhrHsFoe#HN&JBVTotB
zjN$W~JmZ}3f-_#ys5%l>brzavR?=6;M86>wj@K))!>+84B*Yup8;NV5YU+KU@)Rnp
dXD%?R`h;peA@-D0h<y%Jj4CIGLykvV?f?{%XXXF^

diff --git a/src/net/grosinger/nomads/sampleDrone/SampleDrone.java b/src/net/grosinger/nomads/sampleDrone/SampleDrone.java
index d28cb22..7a2dc5b 100644
--- a/src/net/grosinger/nomads/sampleDrone/SampleDrone.java
+++ b/src/net/grosinger/nomads/sampleDrone/SampleDrone.java
@@ -3,7 +3,7 @@ package net.grosinger.nomads.sampleDrone;
 import net.grosinger.nomads.Drone;
 import net.grosinger.nomads.DroneListItem.EnumMove;
 import net.grosinger.nomads.DroneTools;
-import net.grosinger.nomads.Neighbor;
+import net.grosinger.nomads.NeighborDrone;
 import net.grosinger.nomads.Upgrade;
 
 public class SampleDrone implements Drone {
@@ -11,10 +11,10 @@ public class SampleDrone implements Drone {
 	// You can change this if you want
 	private static final boolean DEBUGGINGALL = true;
 
-	//Do not change these
+	// Do not change these
 	private String name;
 	private String UID;
-	
+
 	// Define any variables that you need
 	private DroneTools tools;
 
@@ -29,17 +29,17 @@ public class SampleDrone implements Drone {
 	public void setName(String newName) {
 		name = newName;
 	}
-	
+
 	@Override
 	public void setUID(String newUID) {
 		UID = newUID;
 	}
-	
+
 	@Override
 	public String getUID() {
 		return UID;
 	}
-	
+
 	@Override
 	public void setDroneTools(DroneTools newTools) {
 		tools = newTools;
@@ -49,42 +49,38 @@ public class SampleDrone implements Drone {
 
 	@Override
 	public EnumMove move() {
-		if (DEBUGGINGALL){
+		if (DEBUGGINGALL) {
 			System.out.println("SampleDrone initiating move...");
 			System.out.println("Current X = " + tools.getX());
 			System.out.println("Current Y = " + tools.getY());
-			if(tools.inSafeZone()){
-				System.out.println("I am in a safe zone");
-			}else{
-				System.out.println("I am not in a safe zone");
-			}
 		}
-		
+
 		tools.checkRadar();
-		
+
 		if (tools.canMoveEast())
 			return EnumMove.East;
 		else if (tools.canMoveSouth())
 			return EnumMove.South;
+		else if (tools.canMoveWest())
+			return EnumMove.West;
+		else if (tools.canMoveNorth())
+			return EnumMove.North;
 		else
 			return EnumMove.NoMove;
 	}
 
 	@Override
-	public Neighbor steal() {
-		// TODO Auto-generated method stub
+	public NeighborDrone steal() {
 		return null;
 	}
 
 	@Override
-	public Neighbor attack() {
-		// TODO Auto-generated method stub
+	public NeighborDrone attack() {
 		return null;
 	}
 
 	@Override
 	public Upgrade upgrade() {
-		// TODO Auto-generated method stub
 		return null;
 	}
 }