From 589eb0f8e7c5757429811b4619c1dc79fe791fc9 Mon Sep 17 00:00:00 2001
From: Tony Grosinger <tony@grosinger.net>
Date: Tue, 4 Oct 2011 14:47:09 -0700
Subject: [PATCH] -Started to add distanceFromPoint to drone tools -Continued
 implementation of move in Police

Signed-off-by: Tony Grosinger <tony@grosinger.net>
---
 bin/net/grosinger/nomads/DroneTools.class    | Bin 9200 -> 9326 bytes
 bin/net/grosinger/nomads/drones/Police.class | Bin 4325 -> 4555 bytes
 src/net/grosinger/nomads/DroneTools.java     |  13 +++++++++++++
 src/net/grosinger/nomads/drones/Police.java  |   8 ++++++--
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/bin/net/grosinger/nomads/DroneTools.class b/bin/net/grosinger/nomads/DroneTools.class
index 8fd5f8cff79e4cf5be5f426087a1942e9d261dd6..04c38a8fa2a5d767a13a2412126e67a13fe9b13d 100644
GIT binary patch
delta 176
zcmez1{?0?-)W2Q(7#J9g7!BANm>3!4Co?jNPUdIk+NiHCEGn3iSzMBsmz?TWl%E@r
zpP5$zQqjOIKDmIEmEBs?laYb3U~-6XDWmA-Q^LFgv5btGj9Ltg48lMo&44r$kY-|8
z10or8fg~GHjDc|igC3AA29agZXD|TrfGQZZ8TdeY7<IrrT}F^9E}%#yLlL9CgCqbI
Cd>ilp

delta 70
zcmaFo@xfi-)W2Q(7#J9g7<Jhhm>3!4Co?jNPUdIk+NiHCJb8j}F{8+477<<nNhU^3
YpfV;#Ek<o1&BegTP{~llsN*0B0B?p3dH?_b

diff --git a/bin/net/grosinger/nomads/drones/Police.class b/bin/net/grosinger/nomads/drones/Police.class
index 61f3e9e1c55244a09e3f227c7f7980d2407d27c6..5b91d71036aac29ac1a6d83bd757d974cfa7ea37 100644
GIT binary patch
delta 1827
zcmY*a`Bzj`9RJ*5X5KJdWD{^WjE;6r$_VN)%k-!ROes2o5^m@Z_FzUphxc@Npq4e6
z8M#2qb3+s(HL@}XkQoFr%p}9iwAD&m?Z^ItioW;Fvk1<8_kKU$eYtn;PP}?w^6=k%
z7XZw}?-DEwlk|)B?9SXjtab@cGGysDY*}laSb++TO86M8Reo(XL)?^{A_1@GsJaK2
zJFyNm9OJNo!8WC+C}*V;ixA+bg~E{HtEtmurP5y*RBM;1HHyYCLBDPr&x_)*2|)>)
z8D<Lq`aWq~MjcWZ>;;-8S8jBIp`N1wTl7JjJS_psu#Mv>Jk20g%XKCGtz?TrS`$x#
z&v0ZQU8saOp2H6PF<ZWUCw57AL2tHYOnXtN@d{N9_+@3K9H{pTt(Q2)B3+#JaHJwl
z=<nlb(&yW=*~|JG`+~GoUr<&23;i`pRiPRPs9XF#{h+-y`zYEZ9Ag->L2i(z2V|vc
zda<lka~#L(da;xh+JuuFr$j!s5;dq*i*!3U-ZGFfwLXTt&GC*vtc&G3O^BS~c+UV<
z`C~wsqf-F(617-u@RMjzR(zty>qY75vj`R9R3V|4A=8X!HU(6s1u5)>^)&&XKj=Uo
zLt;U#TCZpx;cc$Ri6{m{>+Tn)3mhL{P}dz^&xZ_29#hl^J|_E-khsi{r^}YH`Wp_{
z459Zi#}!OsaA<1Gp@?Xh<EkimLZz&TuthcwT+`>qyECtId_I~df^p!cuEe`bzU27I
zXqBmFcz56%N^H5RY^z%&y5Xr+8z?c4!4%$ZaeOyg%P6k{Kj^pOW$SMYIp%;Rc2_x5
zETKVI=^wb+g;}X{Bbetshk_xjrEPiyk3>*Z+<}7J^H|C-h!snwMzBhVL{Q#>oPMk;
zCq$;@kD|InXyrw)(Ru<>7u2vfFA8lHX>VmXGBVJC07+~g!X&TQqj)wH!ShGJO;QVc
zSr4{%ps)*#LrC$`Mh2F!ZZu8}lgjQRNcY-$u-og6Vs8(c32QbOZAkT&lYrGHxB_Ki
zN-GX-`mTqIzJ+k02uUc$WR&1Rx<iW*Dn%)tpnJR=Yl%^X)ljeo+lksmbJPSGI^FwL
zGI5-^?Wm@y-H0;?poeaCA4y-tX6kQH^bzC9jW<?LOn`@|$(V&#@G4!V#dIrQLpp`j
z3OiX%A#DHSB$AK#5ehR-B0!?3FoM~z5+z{;(GtZ$knMj034+T2x0E(6oel?ZP`{lx
zk?qh&64T=jnbdBBI*b;*bWGaP#!hl(F$&_O9h99F%|^@_25mEA205cblUWPNJV1LE
zNgpLtXysdb(K;6GdiR*gp%dXQyh-act#@gi{jccbDH-4p63~KN%6SIbs21&b7$-3g
z9i#l_n|>3hDP2e-fBQ+(3EQ8@WpVUJe(C9p#lhy76MKrf9HJTRrr|s1n@<!GJw!x&
z3uu`85iL(WA4R`Ag7;G|MsO*c4iOB|jJw<5iphV{f+R8dpAsrEa38(L`OM_pFgT~f
z+5hT%VRF8XAVf+h!t?-|=Dsyq-y2GzFrx~x5XqF*IV95PWT6*xFn~vK0ZZv(mC+c<
zxP%&9rm-5LQM!Vi7)B$F)&X3@F<ht8-551sr$o^nB7>lpHP)>}9L8;`pM}it#T`1u
wnU%Eug)+umE*J5{FG5rDM0Q6%o18h}N3+jAksS+u#xJysr+*WE#oc_@KMbk8JOBUy

delta 1649
zcmYjRX;WKO7=BI?a+7dr3Tc3J2&FhvG%!V>F4WS}iglO)s!~Dfv?U}F0^#18giWo%
zrFI)!IHG_R(OOa5!WLTELR%}f#aj36LqF+Pe}NU>bCXu?oqNu^Jm=i!UCvp&?XR^f
zulzeZ2cQVQOVBao@<*hs@q)h%>yz;?8f3W9$RIVlL)E^nFoXW~J9e4D;FXaMyM?4D
zWi+9g4;aggEeJ?x<=2hrS#4sO+^DJnpIfPQ2ikoCtIF7ir?}bZE)koAWUPW+NbNGx
zU=xr|8C@u5u<i4ES|4>QUbU^<AM|;`epM03r}-9XGw+iIjW6SngoFGplWpB$9APj9
zHMGXD+*r1fqN2x)SMZvIR~d>#X#Bb*g*O<@5gD%|l_9BG4ThTqh|73Gv(%{Vam$-B
z-VzqWgYHmRKn7(DX@)vq+;B|BJHlYBR;$zwA3+5N3(7Gf<2}4jh9+OQUZYfD!3P+T
zaDrjA;^Q@vjTah|b_wvPjE`=D9~ZDu37;@zw75Img#owHR9F)Z`jw__?f!t*7c}8B
zhLo*sYP%B75!^QBSTKe!WMpEUkj7<9V3KE;UCwC+Yfb{Hg&N1s2*gRg$6U0246`y$
zBbUJxR^$H>oX*Oa6E#fsxD^qb2-$>le9r8wyddMt<vzi|gs&LVcdANvs641DzMM9-
zgD7kK#D14#e696FVn2<H30HWYB|GyQ8CRD(wGx<cjqkR&*{_rHmQr105A^f`V-whr
zwlRiHt|@F?Kru~)F+31MMb#)A1*fos;T#^T%#Wc?Kw_w`BkNv<p`|}Z5g?mq0l6+Q
z&%hUhe+Y6yQ=%?54bLdHPawE}R2NM%P%7CZBEkG9EeQ|7?n;_Q*yWl*$27Xh)~z{)
zk>;u=fWa%g!pfpVR}UwRwXoB;9VS%3iYnxx8pSkk!A`Q)(pZPxcmh5eTd@}*G@=t8
zbi<1tI$sCS)Qn#E(T5fcq7BEPP|tKCo3_n~=LKs>0&Okh89YlzB?Ke(BbB7*G?ZzH
zxacL)B|6)%FCiIBsBlWQOgjk?^za)i*0TM4jn%GyKA{~DTEPo=kr1nCr&5}AG$-Xx
zA~;ThPK(i^84tsNBfP<yVSb5X7QimvW3?L&tin+~Xw8fCMkmlmUq5{V^u7Imma>T$
zz=>8r3h3<JNylviov`~bf=v{%2sT~&OIae=WZaEm*yukZL<^GsK>^d#Lnyjw;)GcV
zaWatq1eGO1&GIhw#&K^cX{3Be%E#W#)K#Z3R-g9i3_f?p5KWtkA(ll#45z5soWpR$
z@n;5M6)iYVRuO^o*iFy*gy*8>>5pdJTC<SwT#g|^i+ZD3w-zlXT;FPoL}HdDWE;dS
z7DWoiDf3e(!AU%XS?s_W)Zi>#&hyk0=cykqP|Yt=g%)rSmneOgDQ$~%1zpvW=8A_e
zlEzC@rTgQhNx=ZVqvYvm@1yvhBz+={h8w71%;9j5k1qFk8gY*(C%?ABe(xX4N})@X
cLbSmTiIV?FtabPaKWjx{banoM-^v{S0oId)RR910

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 <code>int</code>
+	 */
+	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) {