From fbdffb59053ed80e57cfa963d8156ac7a76514f8 Mon Sep 17 00:00:00 2001 From: Tony Grosinger Date: Tue, 20 Sep 2011 14:57:18 -0700 Subject: [PATCH] -Sorted files into different packages to clean up object list Signed-off-by: Tony Grosinger --- .../grosinger/nomads/Building$Structure.class | Bin 1318 -> 0 bytes bin/net/grosinger/nomads/Building.class | Bin 2450 -> 0 bytes bin/net/grosinger/nomads/Drone.class | Bin 565 -> 0 bytes .../nomads/DroneListItem$Direction.class | Bin 1272 -> 0 bytes .../nomads/DroneListItem$EnumMove.class | Bin 1480 -> 0 bytes bin/net/grosinger/nomads/DroneListItem.class | Bin 11707 -> 0 bytes bin/net/grosinger/nomads/DroneTeam.class | Bin 4771 -> 0 bytes bin/net/grosinger/nomads/DroneTools.class | Bin 7495 -> 8053 bytes bin/net/grosinger/nomads/House.class | Bin 799 -> 0 bytes bin/net/grosinger/nomads/InitializeGame.class | Bin 5566 -> 5661 bytes bin/net/grosinger/nomads/Inventory.class | Bin 1871 -> 1892 bytes .../grosinger/nomads/NeighborBuilding.class | Bin 1495 -> 0 bytes bin/net/grosinger/nomads/NeighborDrone.class | Bin 1014 -> 0 bytes bin/net/grosinger/nomads/Nomads.class | Bin 5313 -> 5411 bytes bin/net/grosinger/nomads/Police.class | Bin 1447 -> 0 bytes bin/net/grosinger/nomads/PoliceStation.class | Bin 607 -> 0 bytes bin/net/grosinger/nomads/RepairShop.class | Bin 598 -> 0 bytes bin/net/grosinger/nomads/TownHall.class | Bin 2422 -> 0 bytes .../nomads/Upgrade$UpgradeType.class | Bin 1556 -> 1556 bytes bin/net/grosinger/nomads/Upgrade.class | Bin 3998 -> 4012 bytes bin/net/grosinger/nomads/World.class | Bin 9355 -> 9509 bytes .../nomads/buildings/Building$Structure.class | Bin 0 -> 1388 bytes .../grosinger/nomads/buildings/Building.class | Bin 0 -> 2551 bytes .../grosinger/nomads/buildings/House.class | Bin 0 -> 873 bytes .../nomads/buildings/NeighborBuilding.class | Bin 0 -> 1559 bytes .../nomads/buildings/PoliceStation.class | Bin 0 -> 671 bytes .../nomads/buildings/RepairShop.class | Bin 0 -> 662 bytes .../grosinger/nomads/buildings/TownHall.class | Bin 0 -> 2521 bytes .../nomads/{ => buildings}/UpgradeShop.class | Bin 1713 -> 1798 bytes bin/net/grosinger/nomads/drones/Drone.class | Bin 0 -> 600 bytes .../drones/DroneListItem$Direction.class | Bin 0 -> 1321 bytes .../drones/DroneListItem$EnumMove.class | Bin 0 -> 1529 bytes .../nomads/drones/DroneListItem.class | Bin 0 -> 11917 bytes .../grosinger/nomads/drones/DroneTeam.class | Bin 0 -> 4896 bytes .../nomads/drones/NeighborDrone.class | Bin 0 -> 1028 bytes bin/net/grosinger/nomads/drones/Police.class | Bin 0 -> 1496 bytes src/net/grosinger/nomads/DroneTools.java | 90 +++++++++++------- src/net/grosinger/nomads/InitializeGame.java | 5 +- src/net/grosinger/nomads/Inventory.java | 1 + src/net/grosinger/nomads/Nomads.java | 4 + src/net/grosinger/nomads/Upgrade.java | 2 + src/net/grosinger/nomads/World.java | 11 ++- .../nomads/{ => buildings}/Building.java | 5 +- .../nomads/{ => buildings}/House.java | 5 +- .../{ => buildings}/NeighborBuilding.java | 6 +- .../nomads/{ => buildings}/PoliceStation.java | 4 +- .../nomads/{ => buildings}/RepairShop.java | 4 +- .../nomads/{ => buildings}/TownHall.java | 10 +- .../nomads/{ => buildings}/UpgradeShop.java | 4 +- .../grosinger/nomads/{ => drones}/Drone.java | 6 +- .../nomads/{ => drones}/DroneListItem.java | 9 +- .../nomads/{ => drones}/DroneTeam.java | 8 +- .../nomads/{ => drones}/NeighborDrone.java | 4 +- .../grosinger/nomads/{ => drones}/Police.java | 5 +- 54 files changed, 132 insertions(+), 51 deletions(-) delete mode 100644 bin/net/grosinger/nomads/Building$Structure.class delete mode 100644 bin/net/grosinger/nomads/Building.class delete mode 100644 bin/net/grosinger/nomads/Drone.class delete mode 100644 bin/net/grosinger/nomads/DroneListItem$Direction.class delete mode 100644 bin/net/grosinger/nomads/DroneListItem$EnumMove.class delete mode 100644 bin/net/grosinger/nomads/DroneListItem.class delete mode 100644 bin/net/grosinger/nomads/DroneTeam.class delete mode 100644 bin/net/grosinger/nomads/House.class delete mode 100644 bin/net/grosinger/nomads/NeighborBuilding.class delete mode 100644 bin/net/grosinger/nomads/NeighborDrone.class delete mode 100644 bin/net/grosinger/nomads/Police.class delete mode 100644 bin/net/grosinger/nomads/PoliceStation.class delete mode 100644 bin/net/grosinger/nomads/RepairShop.class delete mode 100644 bin/net/grosinger/nomads/TownHall.class create mode 100644 bin/net/grosinger/nomads/buildings/Building$Structure.class create mode 100644 bin/net/grosinger/nomads/buildings/Building.class create mode 100644 bin/net/grosinger/nomads/buildings/House.class create mode 100644 bin/net/grosinger/nomads/buildings/NeighborBuilding.class create mode 100644 bin/net/grosinger/nomads/buildings/PoliceStation.class create mode 100644 bin/net/grosinger/nomads/buildings/RepairShop.class create mode 100644 bin/net/grosinger/nomads/buildings/TownHall.class rename bin/net/grosinger/nomads/{ => buildings}/UpgradeShop.class (53%) create mode 100644 bin/net/grosinger/nomads/drones/Drone.class create mode 100644 bin/net/grosinger/nomads/drones/DroneListItem$Direction.class create mode 100644 bin/net/grosinger/nomads/drones/DroneListItem$EnumMove.class create mode 100644 bin/net/grosinger/nomads/drones/DroneListItem.class create mode 100644 bin/net/grosinger/nomads/drones/DroneTeam.class create mode 100644 bin/net/grosinger/nomads/drones/NeighborDrone.class create mode 100644 bin/net/grosinger/nomads/drones/Police.class rename src/net/grosinger/nomads/{ => buildings}/Building.java (94%) rename src/net/grosinger/nomads/{ => buildings}/House.java (79%) rename src/net/grosinger/nomads/{ => buildings}/NeighborBuilding.java (91%) rename src/net/grosinger/nomads/{ => buildings}/PoliceStation.java (78%) rename src/net/grosinger/nomads/{ => buildings}/RepairShop.java (77%) rename src/net/grosinger/nomads/{ => buildings}/TownHall.java (84%) rename src/net/grosinger/nomads/{ => buildings}/UpgradeShop.java (90%) rename src/net/grosinger/nomads/{ => drones}/Drone.java (86%) rename src/net/grosinger/nomads/{ => drones}/DroneListItem.java (97%) rename src/net/grosinger/nomads/{ => drones}/DroneTeam.java (96%) rename src/net/grosinger/nomads/{ => drones}/NeighborDrone.java (93%) rename src/net/grosinger/nomads/{ => drones}/Police.java (92%) diff --git a/bin/net/grosinger/nomads/Building$Structure.class b/bin/net/grosinger/nomads/Building$Structure.class deleted file mode 100644 index a41e01f48f5391f85582af193c56af3ca47b9519..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1318 zcmb7D+fvg|6kUh3NgBe%D));QP}+i2Q1H^iP_atK&~`{$r{hy7v4&|=CvBPG8~hn9 z4=_41KKoIQ`y2}7MW^;5JL_bxz4zK(=hyFV=Kxl*si2Qx!L?iQs@G^bZq@eUZli7; zG~+MZPVInB=FOJZuC&^otsuZKcxWA2@tWmU<7u~DXHW~dciEkkVK79E9xEjnw7qmb zmDw|Qa(RaSV*bru>Q(vz4dio1W;<;bQiV(|%Mjej70ondrL)D|`BKU#rcH*}`~T>s zCMz|^by}MYQY2bp2y8bFY!yKb3}GENaf?Atc2hupl+w`&&iT18s!xEMiJY*R5DLQVp?7EIP9x;S0&$EszjZeq4 zQorup{-IrIB{IHMTprOb7!)y3?gPVypVnPh?^fV4pXgY@8pE2u(ss>iHWR+~SEa9| za0_xXnT@trv0poUl>?W~UFLbD&~&P<#SP5hFUPsbo;|clZS;)m+MbxpZYoGJ%>2{v zy!Ykh*;=9hU!q$lZ%uFu0TjtSB9d`LB+rOQb^(Sbxmk!2AY%<+koZG{J`?7@>UXem zcvw2cjT4LrFcuJCT!6`-08;|Y$O6m?a7Pi~uKI&2NF9uri7if_V&R%7Qv$jqUA!xZaD{Y7 zqKI|r>$DY4AMIeS{8oycmy>+HU1{nJi%VbV%f%QM)!5YtA+pYDw?>R|crPu?VrO{# b6YTFi3G1TfQ#=##IbLuk@yRCG*qZnQ`5q}d diff --git a/bin/net/grosinger/nomads/Building.class b/bin/net/grosinger/nomads/Building.class deleted file mode 100644 index e1aee83b2b022eb04ba965f078175e3bb8cdacbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2450 zcma)7ZBr9h6n-uw*$@`RRIJF0R)Z$%OX^!|i*E>lL}C(2fKqJjl5Al$WSLE(^+Wq} z>P)8}&=%`-I)3bj&h#(UK4+I8$~t3a?%s3mp10?m=WhP_@6T5NE}*WVOJSs8wbHAu z)3h6_mYZ%k>t?N)zSXwtHJ)e)DfB-uADQX8*;q{%R~}f^mWGJJ(Ll!;bKUZd6ndI1 zw_Ra%ONt8RL;|ie$gDAxFZ}RdrtC4pt%UoAD794KMbsAQM7PM49aOJq3 zC|pjI7ju=#?ET8bt$ZfIQW86m6F%g`-cl60mKh*&)o$3W>k5TraMrz^6-#m z3j{Oi)T|h~aY#oTA1ibxQwu#%7}TL58lyC%qaVXGO{SJ}F^uAvhNB9nKCqiQKEZJX z&2c$Rv+iZcMUha5R-DI;tXZ#1zLPq75Q`$I5Sz0$OxrE5IU7+J3cd3itFBqI{DU(J zeI=)ESFLi(Y}rmDigOC#tkZ5<66jMMz0gIvpra4_M7pG7KlUl?&)W^F&|Y7$+={tU z_a^LA&H94r+M;hChFWWOlk^I1V5ip{ur7ujU07p1{>tB$SS9PLKD=XYcu_TQe4~Lq z+nETvv}&~q9`z0;Q$getgUXW)R(_fWf#Ev!yhUiwkF4zB{4zSG5tW`5=gXNGt|6=A z25v@in^Y^cSJ+&lU?u^>jbOB9r?7$K-nxWI8o~RehiEIF$(+Y9YD+SNity-w5NJWi zB4`nLWY*gjJAH=K`d}~u;cFes0->)|%;zRE<;p}QS1ibzZ*+VsZ(?(q(nM~qoGq5* z_&Xh@97ij~#X@!>pO?d`j+z|y&X;E9CZ;lCtl@iwBX6#K!6~<^Ytyz>uVq}T(m~_=wMgfJ&f?QGllL2L_DOTR8j@M~vTb_ytDJ{o=W!z)f+9U4rW@ z*JoTexUxq4#1_V$B4NZ&dBTtpPkBPzh%+8v^%(K96pX>p7ShJ>7S0o|r9oWKmz-o`1EkVF}$v4k_Yhcs4j32Th7&T?FQ?iF>( zhePcOBNG_DV0)zeCcb1Nx;$x|Qnx2bvqHE^c@UA;bP8)w8b%c#*MKO0VY-vme#e-W z-(i}E*`={f3SAzCh<7;d)u8(Z+chX+xWyB;`z`0g?>bKfI#2FoE-{s49+3Gw$JEd0 zrIdbwnay}kg8AL_krg=TA_skUSI~j&iUcj`6KAwp91ke%{I9gwjca*Vl<*F&e4z8i zcb#j2&UeTwzbV(5O2!fq{*4JO{M0e;)aF1Rco7cyRy(7O5TLMGkr;RP#2O;c-i_5{ ztk!#C2{|OzTyQLpuDk2{k+FVyPb{IA>W|9b-F997O2dh4@j1#%e(4Zw~$s DIt0>* diff --git a/bin/net/grosinger/nomads/Drone.class b/bin/net/grosinger/nomads/Drone.class deleted file mode 100644 index 68c295f85268eb5e92ceb6998883e95f51f0de53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 565 zcmb7>K~DlP6ols??BWW73MyPo3^5QBH}T5FMAU4u>H+m$uvr&(+oUc0I1l~+f0VHl z4F@5{Lpz5zU*9zI@%i=+;2doq1wvbJ6DCUPR3u!5LgwsQhXW-A_faI&Cv3*TjEN+? zA5Hk!`0xlvE2$fn^M#2})!evO9;D1Pq0^05GD}at_eAh4_81Ka&2GHhJT%J2TNsjW zL!;aK?I09$Ipc)TPS@{?Q*9!{^Ujr+=C>B;6H3}}mJv?Yk#{^zUPe;6#1`L%w z2!?X1#{4?X?Bc+U&*s?)l}HG#E;FVz*FN?Mr~e4$i_@% diff --git a/bin/net/grosinger/nomads/DroneListItem$Direction.class b/bin/net/grosinger/nomads/DroneListItem$Direction.class deleted file mode 100644 index 6bcd1f011adf3df2db9326b40f7a3986adc2985e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1272 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 diff --git a/bin/net/grosinger/nomads/DroneTeam.class b/bin/net/grosinger/nomads/DroneTeam.class deleted file mode 100644 index 5ab7df0bf0654852ad317b3b89c7ea4f4995d468..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4771 zcmbtXYjjjs75>g-CO4V6B_upUpaP+gOn^{J1I<8e8lX*0QY2|;sImvGGwAS{O=Ez{e7ou4R|Y_wt926~S+xJGq&JJM@P?a_8KA z_x|?lJNumc{OTJQ0K5}FG!Rm_IcvMEBTg=#%8uAhYc`j$hV!jkoLtr(u&s=Nu)^&9 z)r!(W%=@Kly!KxoqBb#*!{GSE%VpW$nJP%pThru=b>NeR4@FJ!m;8 zc`pjX?!FX@u=EB2O4Fnsx<3*vdsHT&yV(e@pNZx{11l7kzkM?etW;Q3UN4G9G)Xy{ z6`m^NczPvokc?mL8|Wl%@J$y(Iu+IB(0&z`1zVJqLy}lyVl7%}I%2zB9xb_Bnwo=+ zHFP3|TX3t%y>**{K|7D?b7^!P*@Yapo2WvytTvd4B4*$Yg*jSvI>DpZh`FM-$%KiU zxRD6H&D()1Zy1taK`)>ly$vNLe~Xc`++;UVB-NVSXA34{o*oF9b$jrax7}Y=c|YVT zcb{F1-k{VA%Al~gqRgw@yr%05C+#${_PD1JrLLb!xT#w=n_qodO)8soY%6d3l3Htc zIOV2tSu5?!swf-CZOsl#=le|zpq5@F4*QTRvOyC&MHZuMyJH_raUOYb$b_TZu`{`Y zwx)sTKWO5;=;VlCT^|s^Lna=c6by;LGO-67H!*5VB8q(2ge`K-A9|OmncJb!*`|Ki zN*?I7MvDVMc+g9~d9mDY;($yTQ>UEa9PJ$8cxpt(L{@x@cK@ht>nul2yblhA8S8*8 z7tPOR8rBZm!yIVaoLt5)Y-H3)$snI4 zO>pf#d%U;_yZ(>ausxT`x|~@udLJ|KI6ma%*2PnX;m(<4s6Mf@FcHNQIAY)<9JNzh zQGYV=Q9Q{UNt$ksWbfRWzGaI;GK!;k#=z4Yz*88WjhnKBQCkls?NM2n_?UE}hS_Ib z-LnD5O0pTx3c@F*Bc#*zh?VY4ChdIQN01}qR+%TCHqniHqj(;lHSigQ#=zOz&9f_I zrBjdEGR91NPDT)^m9-s~{r>JP0`&zGFW_DtbtExG;^Ipt-heLIVVjP zEe;;8`YT)b9emHgcgqE-wM?AEDQ3?2ysmX}1FdZ8?hZySnfWp~s?xpg-f2pKw4stPd2;M4%HfTD$=kBiKo8#R!(gsJ$1BdDEq)#wht8t?3=&gG*U>f5#Wc1MW-HU%rX8CeP|>ksI2}bNt^5@y z5%F=7ix4A*t_HBZ#5m#`zbnvq;Y{P9Kx1Bf0z9vuX}l-U_)c^N7`MGLBkTi##&@wU zp(3NUXdad3o|qYd8wj%1Ct(M{ghiE_fKx4qYUyKS-{Tr#zNh8)ypk>PxOR6i*20-s zM~U@x8LWGXSe*aG%1n!E{YA(2O5r zJ$`}>_$kN6Mcj#>=@7la(dmcSiM=|+2({u|g)kzeMfeJ;3^c9{%jDQMIZ2eFf{fX% z5`E7E5)3!Rzx3vCN4PCKfu(%OwMFJdUO@Gc3N?YsBVjc!TzLYO6R29U_{6opQX|>Z za{1cjsSLKUJisrR!JEwBSNy-@*OdH*D_GU(t(~3i#Tqcv(dJd#OHLz$>R%ofzh_7Dx5(GTtG>nqwV2Sb(?K zoqzGmf2eVVUHLB$o2$H(T|<)!@fKKt%_@RERfz#rh25$edsPevm8lD`gVs#V=iWHC zj|?!8y~ZsR;`bbnr2;z>LmFrCI=$DkC+F}6pN)ETp3gq=`}?$w;0LspGs&~OKuhT# hS$>TnMhqyD*uXIZPZ+$E^6hB1foH|*Me2oc>3`D_7y|$R diff --git a/bin/net/grosinger/nomads/DroneTools.class b/bin/net/grosinger/nomads/DroneTools.class index 3a42fa9713ea4def0c99e325b9507b9589e4846e..72d7f095cc237ffa7c6502608b009632c8046ae7 100644 GIT binary patch delta 2511 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 eth+%Qjwp6D4{#C z7LgZ`v75 z!W9kV{STN(C~h{LnC1St=eV6PyN=^~Tyfe@|AjL*L!W%9Q&T&fwJx7n@MglU$T{yz z!GugD$)gH~6j9P#pqgT8xr9p@S5;l-0XOL97Q=d;a+^u5)70^TJIqnfJoi}UK3kgn z#zVeq-KK#bH1dlk_GspS77<#-p-sZHOCj~5??_pIPN}BL`y6$}?#3pg9KB{gHlEB8 zWJtRarFz0eMwM!eN+zgL2A5}CW6GGqasRCT;kk*#SJMlsUUQyBDp*qXH_G#lN6Od1 i3Z1;Cn-BEykwI3?PJA-DhM#ppY!G9OA~wxXqVYF-yn8MH delta 415 zcmXAk-%FEm6vjViwXJt-L-)35rdzz!+FHM+geDYAG)hfWNUoM{|a{ih_^FbD@? zuAxL@91En(>%gYVIanVCvl43sKb$g~%(?m7j;kh!-DPMsOipuuF)a-)$ zmHx0~o*w;vepRP;9Ou3M^noruD#s^A`NBAB+-F_=OJw<~uHQ^=c)q!en;!)DNr*Bh J_+_f$+xtn{TIv7* diff --git a/bin/net/grosinger/nomads/Inventory.class b/bin/net/grosinger/nomads/Inventory.class index a70817ef306fa741c2379e2b8ea57ab4f8da11ee..236ced4be55a90feb16d75ab02ac51200abce471 100644 GIT binary patch delta 180 zcmX@l_k?dk5RzEid;qsF&F|QHiWnf|8W8h@q zXAof!V31%CoZQdi%_;>Hk)C`X$Wj5aR441R`ZDTIu4T;^v;wNPVGv@lWsqX9XHaHv zocxzHh|zO$0Glss5Ku07@**}5#_-9n*_;)l8Mql@7~~ij7M!K6Hc0+428@CTAi G3;_TvOC$II delta 137 zcmaFDcb;!T5R;0}L;=x>1rwRoH9)M*3XE%*7?psm$uF5#3Gy(oFz_;PGVn2oFz_=- zFbGUu!s5*;2^5i<`~}ET2C`HpyRiB)>P?=+nlESxRBz27#9+f9#bC#v%-}Fth%JcG hV{$5+FKZxBE@<+0HV?+IN$k$7Q4HJ+(UU#cWdJ9C925Wm diff --git a/bin/net/grosinger/nomads/NeighborBuilding.class b/bin/net/grosinger/nomads/NeighborBuilding.class deleted file mode 100644 index f4f69c35f6ccfd90d17078356d5edeb4334b1cef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1495 zcmZuw>r&HD5dKb^Hl+k8$i-61O)hN^s(3*K>nILPXKK}<(^3AV?Xd*g#7R?>r_l%C zhdNeg{NV%mOpfE8lW?(QI?3)i*>AtyZ@0hy{`>`C9gkFm7#1z=<{FOOHmwGCa+cjP z>g`;Kn~j62?L6t2%{qNip)e#4jUyx1G^|GMdG(OjToqAn20L+i|RIhZ`=hGq3_ZALuz|h*f=Vq9_J(oEArEB6Y{Mh+`o*@~QY*G}~^$ zXR?((FkIEpkGSwA zHE5nUr9nkZ+)Zm3z@YGEH4Guqhj}chxW)^HQ61Z$sijb$!V38__!zxS&-;*R;|*xS8|(KPF(OWQ=! z@6)!`I*!9Fw@e~24D7i^?d>z;ov%TB&+a%izGDiN#(H~R6Wfb9k~U0F1W|;<#OSXS z5=u);Q0(Czin%V9zEEfg8G6r4(n(62BH}5cNK?XTBr!w3Su9bJS&GYh>7iqVPDCV@j>v^4 z3Jgh4v=Ek_C{~f4C^tfp*RkpsngapF diff --git a/bin/net/grosinger/nomads/NeighborDrone.class b/bin/net/grosinger/nomads/NeighborDrone.class deleted file mode 100644 index a84a5551a2a860968e6bce83a79c6b07e7c68b2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1014 zcmZuuO>fgc6r6ROxD75XP180>q4Wc=jldFcqpAc{ph!_Tv_x=p(v|Bfu_edlK!rP+$*hkSnZIJrm%@@1r%U*Yjk zd5#@wE%B6L!cgM*_YGx?jG`GGxnIxd>2p0{J@5MOZUy(~pYqGmTHU|PJ)kxK diff --git a/bin/net/grosinger/nomads/Nomads.class b/bin/net/grosinger/nomads/Nomads.class index 9bb175ffb4275536ce2603f624dfd4f8682271e6..5e05e9164ba9d8425ab1af078834fc3a99f66224 100644 GIT binary patch delta 570 zcmY+9T}YEr7{`BSZF}|IYt!jV3&Z?q=UUkXW( zMeE!Ib>R@Sx{E5ap^bMjj%U|N! zn&}L1cQvDR299MJi}FO8o9YYix;T@`j;y33p06>#yJC5=CV zvURs+^w=s^(iQ*b6=*&Ekw~a7Ch%v4e`1u2eKM6}%0(lyaPqIwXv@t*XQMj0tatAe zx(vG$4F}1g6%Xxr>0mRRl+r~RNAPis8oJrV2?CsCKWCJ)m&2UrC>J7=`>>?!3UeeIbnJ*Kv`2RB zn0BkIpf!Cnm29;6!#^*74F|LQQr^%^Z*k!sG2xwRVkplJ^Z28tPFiw8(%>(0 zF8j~8a&y_IXFry_3>-I>Yy{@dCh&2NAniox-~gRO=^{oq74&hGeoinzBZIUs%muC} zy~;(d>C1KJUB1Wkq*XCO9vM~Np@6%DxW^$LsA`l`JfuPIR>o*!oFtFA!4qyXsfnjb zr+LIPCNw+63xrv52Oa-wa#$e18!CA#E5Ygb2VLGF%tuQ2r0zvZ`Aj)qsAGv{zLL1tGBIpB#h!mS9wU_{X@NHTqWpO*3>`w7-X`(Ul z!5`p{GTxajqGcQOVfW7L-gD2n=iVPbzkLU=f#((y4D(VbrxW<0D?1`^q~GNyq4U=F z+_tcgV#uBGbMAOtcASIOnP@8u8HTx7SS9eKV6ZFuua2wLTBEvKuQRZB4C8yg3>BBE z$-SOPk^sh#lDtdlll4oALluyaZHDA=t-_F2zVC$$`TB6aBb`Es%nMh#YKNf3Qj?1B z`6nWaB&KZSaFb!8?n=?y2Q8;&lnj)Y*t68hLJy2 zEM0A26byH5jKQYV@FI1(cr{aNwWRnE70XaAb*|y}ZH#MphJG3|GDK+(iXwog+omYx47zXp7gbp21k;=(=73+MJq{BG~hI7>dxsQ-;<5P-S6@ zY`Y#n23$0PJlT?@Cyf;5U}1#LqqLq0Wa**#nKKQ-L~@U!wvtwg-jj55C^Cxa@>ksY zWYVVToiQJCn4z;BCEzyh(2Zf1s0P8GG5>J@yc7#wz`Z_rhZH6>ReALb<}azWa$uQy zS}_%7qO3l>mbPdlF)YQ`$`95mQ?1n@wI1|q6=Ivp4>sk*HnmJrBS-#f>fxY}O%k#- zL`aE-qeoFDsZp&pbEjdlK^41ys7U;t%NibCi>$^X*Z%=|5Q9w6`sihQj3*Sc#J+(| IJbO9&3+%oF;s5{u diff --git a/bin/net/grosinger/nomads/PoliceStation.class b/bin/net/grosinger/nomads/PoliceStation.class deleted file mode 100644 index 947e8477f9a5d41d8d6fad0d0f915976b228c341..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 607 zcmZ`#O-lnY5PhlJ57*Ud{VWQiD5#(dUMoGQ2n$OQDm{41c0-NqCa{}|{wz;|2Y-M+ zN}Q}(C~gxnnVC%9yf>d;?;ilp(XOMyu&;#iN14v08i~wTI^}Wh-|9pTMc;5EwW`Bm zI4rH}2|0R*bapwGNlXX~wF{}F=`!3O1wr`8pSYiJHS+r=qxVi&3iJ1U#`ATil?Y{S z0wdDS@qod((y?$chj|ZG)EJtfRH8RdBaz+lC=m>;P!D-B;F+}XZ_+UjGG{m_r!l3v z!@!>D1aw}gqvC0S`cD!=BbvzHEk~XRWT?hg%}fr{S{dBF9%n;wBMVJa49_eT?19l7 z>>{Fe7-Z`dCFIrU_D;5UPTNkq`i90U#TB?@UAnDZC^pdjsfC9{%F{0_p-D*ATPDv| adssoM=;dJ*YjBF(IyR^)!zM))Y<&at6q`N( diff --git a/bin/net/grosinger/nomads/RepairShop.class b/bin/net/grosinger/nomads/RepairShop.class deleted file mode 100644 index 2b9375d7b0f138b55e093668d3b9f500e2982b50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 598 zcmZ`#%SyvQ6g^YZhcQ~M&!SKY3My#8ZKVqpArQK-(uKQ8GqfYgq)bxL&vGTW@B{oP z@lMnhG0t$`&vV~DUf%$mp;<+Vp`}FTj&zbrH4@rYNzB94y%7^Gb$^^ps<0Ri3X^(5 zj>bWvFQzgIshpv5E|tu>40nf~=il=O?nYdV+KH*35JHB40$x*S{nP?X=P)XGPH}=m_zO`uty?~ z=!wQD9_KCp;9;l*GwiM6wlj1L<D zYuo9>nL1PL*Z!k+dV9_;#4v7VXK&}cx952;=Z}AX{SCkr$~syEPPsD36n(F3yG7|| zT(4vn%9(X<$GvMhjt))WY^=zNw2NCCp1)ABodT5w+OONL9n1?nPG_^ZXJ*yRIHp_7 ztOY*z=W?-T4%C}$-}XIM=InBi4PC&J=9;C@;0I^~IyUOan;5NQ6KE?a zAOfTD?hnHh=(5c6R@SXbH}HJM(VAA!6N@h`xgFS^%iIkJ+>B*Z)`c>w8_%Q_Jdm5x zm#!sOD?z~wWT9>*0TzIPAq)!~uS(zE+>KQ7rehcEAoBdUlVYb0^x@+K&fu($QGt1 zE(~16r;%}0SjfRGq9}4 z=_EM|Ud0V|Rn}Gw+{1m&5MP$Os%n&Ue5eiS7|ScoH3RFaes#ONSlU+BlE|ykz$iQI z_brr)w^uI-cD@#bh1Nu}o*qheSrwlx6-3C`9r4B+g5?OPMy1fT7MRxaWpg_mOgf%& zD8=&qUR&UpFJDw-IarZ9bv8+NvzEB$*>1pEW6CeZ+HM#U3ufU#WV~T6oWZ7nqT=-= z^K`2bE%R7jsyI#uY=O(m=1aR&DW%+S0H?go)PAJ0kn+OuqvTVj!%8mfrc7(gmQ`6u zz`}EtB}bqy{o!Gua=QrEfQRjdYHPs0(4;^Pji9+EO&#&WiMr-hd`m8|ahcSEL*Rm% z_BhR{*UFO;d@_4z=TqmO!>@L}jq!oO$$qWB?KL`n;(rSgd?xtj9*&@kH!vT`a;1xZ zYUe1rX-R#3#IH!Y2fd*$1IKV2TDZ$`ORoYaaFSB}T+{fMR56HNuC#H*9>iGu=YF<^ zFS#`_S;NXi4G;GId-n=Q-XQttHNJYQ0Jeqz=NUA37U&GGo57u6Xh~iv4B#9FIap6| z`VDbN4P%L`_c4MzWuD?JwkV-UnT~?rC#9P*5Ak&fHH$}hOmHdM_y$kt^CG=`%Ui>D z)a*z5KS=7B)N%E1jOzHl=Pzh~qEn~3iH&`x+WAhh#8ke12=fPAh`1VwIFftldIRfG z@78NPdrLy1<M$XA8tQ!D8mjz(} delta 23 ecmbQjGlge^7Aq?ULj?o-WPMf>M)t`mtQ!D8Sp{1F diff --git a/bin/net/grosinger/nomads/Upgrade.class b/bin/net/grosinger/nomads/Upgrade.class index d245490f91dad9dea95854e1dacb3359f92f3aa3..95b15e083de2e371385b4b4f14d8cedfbe141845 100644 GIT binary patch delta 313 zcmXBJO(?^09LMqZ_h-w7<+RO8Epl0FmK~9$*lA%V<{^)phhkeE^Ds7}FiQTC69+|U z7wxoiRoq-9<><1ba^qk6^f|nHT{-j4(=%~vX|Wlji-~yb;qKWWE-fS0|1M;Wo-(r? z12vd&Xhl;%>dwqrt6NVGHX3Qbi;pHc@oAUldrPY>ZMyh%X)knFys4caCc3E9-$4%{ zeN*(3But7v(hP7yglh)LGenVL9vS6@G2R*HiwVA&E|GE!n!e#xpT_LPHtRm*{L daj052QUP)*%(3d{R7E&1lq^A!a;>>K`UkS)NIL)k delta 301 zcmWNGO(?^09EYFp&sO_mxXe;&wRTyfX-6;Z!jcw7W@x*KG{Oz zGHZ;y!>hkf+a^3T6TnXwEoRZUwzuliu1kk5!E&PVRb_jy5vEG7lU^e9k))pmO5GyfMlrV|+8t4@t3-5+@VlW>Wl2Nq`v%GAj|%5@$}PnU^$+ zl3_`XSeA2E|I ULlxyj#VC}2?O_qC*4cITjQOiYFL6E3`o=0xIIkxd&Yo1b%Lw zuua8t4@(*qiAUmr`rtA(n)qbm6U1ZQ+4eB^1&xKL|L=Q!uKahqx^jOXuh%5nRih?C z@7YjU;Z-Sm3mqy`WBOdL(NEUK*&PEL(SsWsr(_K*&LDy-yqgE##Ka*8kMwbxNrRBV z#hccad)8Kzs&GRj;|EX!tyIG}Arja?tI9A&=d`^|MrWXvYh1*P;aj(i`!%ki2~~%BXbtfD zpNDSJiMcNk`fI|rYfY1&Lp+Q~#8+@42H(Jjsmd_A*pwyRSr~Dj!Y=b z!#=q2BfQv;DjYx!4x$N%unUJ}dPJ%YbfFVx@iWfj7hJ-xxQ(Ou1IO?f$MHm_&u{`S zaT2d_3hxB_Z~P{F5WPWwdK0~IK#fM70?K-r6i4+dypQ%}u{!>>zJHzdHDFpESR?x^gjf)V$H z`hiRy%Kjt&>8SZE>Jwf47%93F@d7ELJqLdY=qnV82RGiJ3~x~`Ubf)9WcNXG>z91` z#Q%RdjgPoWpqIp5YVd+ux&DZMXz(wLooUbELn3vFfVj zTu3~EX~zipt82&hIFb?0X&BEGOyP8-at6|virMmYF%2u24lln$4YU02m?}+uo*d7S z$#AJv-URV{GCXe$UJF@fOQ?k2~4NANeg`X*vKM4e?<@sfmB;V8yz}C+3qrB%m^V$iv1r0O*At9E)2lnzwLQD8eQkND(MJ!p ziS&xB7`HtkOLxTZA0=eOhYG^sTaV~332}-GPWALJd7+~{vNH0_#&RD=8A;@r$d0kg zrk!%dap^8A>4@gUx?D&qQHdM$&2!bh8kM_dU#1Hs2i%yiL8Y<$(&Qme^^}C0$t}0& z(cbBs-cLv+N{~+paWaN3oI;ohAwwFLwNUVSu4~uZsRYJ!mrHd zGK=`l7W&R>xc3d|rE}7hMlXHU)n6xqfaGHNP!+(apX~;=# zNYSgamnkQeB&BhiW)hH}e5JEM0V?fXYxxGvc1>9)lY&gsTxQr04P<{2Dk4?I1XaR4 zTEP7(r9um-u{*3XR_i_@dVsB}j80~6^6acJ^20{1#jh|KT4uE6l&X$0)w5VDcti~} z>QS1k)~Z!JuSRz1G5XcSt9so2?P^B#6esjFpR1YgEIy|eE~=GliZG!yOlqwX^qi8l zUTNB(Icif#8&y=HcGajub=s^(ZLxHxo!iu{F1={yu(oSNJ$g^Q`cOOcmDcEcMRZ<$ zx~!L?`N7l5*<%{|&8EG!|0~?70SdH_BJF3922H~Omy-Lw-x05a+@&F_3{$K_rtGl$ IG53l80g?jnkN^Mx diff --git a/bin/net/grosinger/nomads/buildings/Building$Structure.class b/bin/net/grosinger/nomads/buildings/Building$Structure.class new file mode 100644 index 0000000000000000000000000000000000000000..7da348eb7021c122f977c6fb2f87974cfbbe04cc GIT binary patch literal 1388 zcmbVLT~pIQ6g^AYrVT-`3IatGL1_z8%a71E3~h(Bbviz!CDt%)>Le{Q{09Gw zmIoLe8K3=8j(3*=eQ`#~L++lIu#1G#P@${JY#vM%Niu^#87z zVo>(9LMFRs?Boj!gQdduUgouSj)n?(J-ekD#Y{1q&oTIS@+Cu~EG<{sohxVbl4dZh zzQ5MF!E~)*J9c}6L5jx848E<_z7>RD0Yg~DE!<`Zq=vcH^kH)Su0|kp%lJS^fq_4LluWdC|B=CeGWV)_- zRBL@YVu<%oAYVPOYVB0EZzvaAG!+I}NXvg<*zTwG1{b@=596(`sz_puVXeRBR>SnX zRG*N`L#~?QR^?VRS{=7$y|MXthb|nx#Pg_E!>&6fH#&pXSB`Vj*ATox2dY`ev0S0h z@?@kL=Kt}Ea6K0nZ!<|gk?8IQHYd2%0E*-?5y@a8lD9-8TLB}J+*HKykpYKrgZRUQ zJ`?6o{X1ACJR+Uo<}pSExZ@LGT!2Zx01*N11_YQE;Jz%tOz;O)kh&N(D!wkpjf%gE zh*1f2F>O@jE@q5l%zmY#2Jn#H3Pm7-3?}hN?D8*k!+OG!)E;k8jxS7|VE&32pak?t zs#wd2@($@P#Srh&*J&!8KGwx-<*gJytE9QUT`6*kg~c!QM0Q&4)reCL jKT8R-_$gL?g8iK*VO`XGif1A|#|zFRK0^vGHz)o8kMczt literal 0 HcmV?d00001 diff --git a/bin/net/grosinger/nomads/buildings/Building.class b/bin/net/grosinger/nomads/buildings/Building.class new file mode 100644 index 0000000000000000000000000000000000000000..6211b433bb3d94923d60f062142320c6c0d6f887 GIT binary patch literal 2551 zcmbVN-*XdH6#j0TWYcsDB~qmPC$^99{{7n<02fi$(5G;=VYQM~ z$8OddRm({>>~*u!OqSZUdWAd9j@_`D$yu3- zRHT9Wnj^#ULg8ktu#zdxq#qZjZ)a06#un>VBj!~j){QOJsm4xh3Vja<6}nz))LK&t zkK_JfbTPUW-NCq)$@m-f#GY7Yx-)jgil85dbVTvKLVrB5JOG7J9U8(BN=J1J;}})r zi3gbo#&A-@355&)x$-(bz$pdIcE|>^?)u7v5mN{k?dOfOS+9%dGdczk2_vo$S+q9H znp0S_H^ML!2A4Lfj#;t1jSm%u@^-yewhAq?RkIsmOeh4?cDrc_&__B3p^J1;#}M|3 zbV{HmEtu?HL_Ik;3ie{YTwZb*) z`Dfm=%6J)R`RP4#!^PLY9*_Ihac{F&wyM=yaCv($p73L?C=_38FqO+x@I~znco%Ox z7sBcRHaVqZ4q+*0ZmE!p;0Dqr?XkvEbFMq=HOC(esOv>CCVDU zQaG~njx5-Pc6n{CX4NYx$FUs^2MAuU+fLbZ!B*kzmU7(&ZM?Gli2P|S_8uoDIeEzaie&T--CdPp^qp))A$u5#FF5=P$0vSp&9T5qafn`w<2=U|j+-25BYJuZ6{j$T)0oB?%;PNXz(5}7 zP{0IMk;Fs(wUqEN)~LCTPvGEFH>gWqIy|{bWG2S5up54p8vB^8>|LYO?@Cgv0IpLW zMd&S!f*O>DF~!dfAk1Ho=H$0mF}mi9PW2$GG`>lp&&?s^Zce!|=$^uM42n72<_^pK zFXO{|jpu!hXS$yAbS0igq(3h)`yB=;C0}8FGnx@FubN(F_u1%0HoCYAbYwds$(Hnq z674R_+#A}3AE~iBuSdI3g5A8bzQ&V#jjO)K_sA>H^Auf4TSCIWaiN9hI^you+0bjvskWMnBhE&dn}Z-%@U8V2iydt_`-=e2GbgC1 bEFTMZeLif&n%kxto^X~YWsKwLtfgc5Pj>oF?LN;0|i1`K2vCegazdmgn%GKq^Orx6`ar}9;Jq4E$!Oyr?^mo zkT~!I_)&=2ZJ>x+DzdaYGy7)V%p3ps`RzM^2iOSU33L>d=|mSMR}<2yDrPb>>8Q%5 z8AnX|vZxFN@CELif_yg55m+oMt@@f|Ntu8c2s9t%DlZ=kyxAQ7XPM4!sjD$pqTXOo zpOooBkx8H1Ymeltx3w?e_lt}oG_V*Wz?l$d(F(96uv$yJ;|7kgj3(#W#zP34i?Lt> ztzoWcr<#pO@5#}W_+?m(<#b=_-1_sNUmoN};C6kR|A^TWh%NqDukF+FenbD#gqv0L z;nmUg+P2OD@RI6FoluHbGNJP6gePijZt;eq-J;TCdXd{9Be(T?Z{>T*%?^|z-JeQh z$OO10aKBc`<1tURD-ix!CvLF74gLiMJgYKW9^1StK1252add(2q{}LJx<3ZT;`J2YBP=JtSf9;@&v0`gU|2lxH>1^ sc8vfb({(>1$v!gBgC%UbLTyJBJ3E{cdAR0K*Lf}=;sGsE)E&Lr zF`IR|ar6>58~fF^{m{Qr5Mf9j7)OTQG^~dHvUN>96(hJHb_*&-ksQJjRun8VqyvpA$@Z$af&_62#|3sx#gMod zEt(cDby`(!myK#ucB)-7niaz~#o51%xcjEVuoYZl-;2S~A$OGqcS~{xCNkOc?vf@7 zcrB}^0T72b9;nQXRsz>?Q^5@q99UeRxi3gN~uPVb9!`b4-Gt!vs(OlavYrnQ+a zQrborX)P7$VpdBwKs8g$BxI?zm4}iP4=jST>xsue+oiqtr{fubjBrIwQ k%f@HtkT}^f&NkxB_C&7b1z#k<} z(kc`yS(u&o_sz`b*ZT*63pC3p5YDtr96vI#(!PuwZ9*}Qo#9jkV~)hmoe9)P_7jmP zqsy=ePEJQpDt|IG(bXJ-P`XrFC0)YfvFmyd;z>Ax(7w}8BIf9LIerq;wCcev<3w0+Ki=*6|7cKM2S%Ml$O0|IF!-77zUEi@XSaA0}-jzp9igEqGCcj zZ?1*YbO`j!;$JDRvyRi?u25tDB*N@&(bpx?7o>sBYCT`br(i% zr?cS*#3xE0PoCb1|1x_4TP4=jlY_(arqwLIq4LUp0XF|OYtCT}H5Q;dtK~?Iy)?6q gIwPgl23xc0O*AsDDz>l=m&84dq9)rT_o{ literal 0 HcmV?d00001 diff --git a/bin/net/grosinger/nomads/buildings/RepairShop.class b/bin/net/grosinger/nomads/buildings/RepairShop.class new file mode 100644 index 0000000000000000000000000000000000000000..4f85893e1c812e2e83c08cc68cb0f8ffda8edb49 GIT binary patch literal 662 zcmah_%SyvQ6g^YZhq1L0@nx<69m zDl7)4V7w<}IP#Ugo&hjau4E#!F2mEY>w1s;nL80rLZ_c;BItMpfODWFgMn6wNS#~b zJeg*0CgRS?fWf*^fv~ZH)jGNTeJ{*n zI07Sa%%io9LiATDizup)ub&`_+2{txO=u-X6s literal 0 HcmV?d00001 diff --git a/bin/net/grosinger/nomads/buildings/TownHall.class b/bin/net/grosinger/nomads/buildings/TownHall.class new file mode 100644 index 0000000000000000000000000000000000000000..bcd1adca4867f9623753a63bae3c9febb18bc7d7 GIT binary patch literal 2521 zcma)7Yg5!#7=8`}B5RO>(#l0x5M;Tz7OmEzNKw#jmy1HzVr^^49+p5h!6ds#{|Udq zudUNrXX;F~U;B^R>Fr4Z%Z_Hpe#p7yy*zp7+ulCDY3D#7nO^d-gruvQ#Jn>GudPNwcuE;ka{$>H^I-OxyHl1a?xHOmuF233+YwgrTOXXdkh{Ksw0?p9b0Ldjw`<*_TzJ z^zz2GH2ep0Q@YYN%Poa%_JajPD3C11sel8J@2oW7E5>vpJ=#>Yb+o_ zAg?7B7}J?a;5umIGlAjQ=-!5-;RbH&DKaz8m&46;A~EV`)Fu7C7z7rzPq6OLDJDDp{|0PgWe$_E~w%{N-5NH4S7= z&p(Ka*Yu3@*wj!6=snAH-L6H;bb1RV%Q^v5;M$`8%q*6QNjvP@NoO;87^%!Bov<|p z@=4udLFf0Ay0K--vdkx7U?)hHCD56A_t6PbJP%uggWZ~f z=;NxN;SDgTK_uDGM=->0JIt1Nfh}tU3rOKUdwh;EPk3{;kPbff$?3=9lL3?b|cOpFX#lRq+wN+*?O=A>lir5Edm7Ni#?rlbaE#eNTp!G&4VynQbuh8= vGjKBqOs-?yr6>nv$ukHrC^CpLC^5(~C^M)4p&o-8gC$VA3xnq5NVW(7^7~8+ delta 195 zcmZqU+sG?$>ff$?3=9lL3?b|cOpFW)6DNvJE?{Nn3eLzcU}s=qWKac)OpKRijG9=j zJ#mBl#A|_!N)soDffP;lXS8CJ2XaK5N;7j(GV{`{85vkpit_VP85vYSif%JL1gZua zd6P+wQE9Rvi-f2PNIE1nG1r=lL7hR9ok4?SM i1_1_n22lnDAWM-!g+Yly4@g=vs4}=Ps83$U76AaLxG(Ym diff --git a/bin/net/grosinger/nomads/drones/Drone.class b/bin/net/grosinger/nomads/drones/Drone.class new file mode 100644 index 0000000000000000000000000000000000000000..d02ee6ef56c8bf34690fcabf436991ff90dece9e GIT binary patch literal 600 zcmb7?K~DlP5QX0$?BWWF3MyWV2?zF|n{e>L#YEJQpdL`~1)6nnw@uo@kMrOU@JAWD zMT3bX>Y@D(eQ)MXrf=^ruK+qY^id!j3vQxVNu7w8t4PR{I-Qg9vha`-3`YEw36 zQOZOd-HoPvYtnH!SBQ)BBW#^$$ zHswMPe+ugD@TY=M%;cOC&g|>Te%}WiB-->1&svvamfcuimr&A%vy^c1OMzRS#7`rs zTz>2Gm@#bpObCW@rpEj#No|b4J)h>25Gs8kxVlK0)?EA8BXs^B(Z>NH{Iicx{u<7% xjj(1<$^HV*uGU8x`HI&OIBuZgSjDE}7HW>$IZ?olyLVBy3~ZeS_R&0VegI?}sjvV5 literal 0 HcmV?d00001 diff --git a/bin/net/grosinger/nomads/drones/DroneListItem$Direction.class b/bin/net/grosinger/nomads/drones/DroneListItem$Direction.class new file mode 100644 index 0000000000000000000000000000000000000000..f4cc324e6711941cb8a986f1bf09e50ab85a3a1b GIT binary patch literal 1321 zcmbVMT~8B16g|VX-F8`_R0R1FKTz6&tQA4D4S_&4jio#+)HFUVWvoluU9-C-_Frjv zfM_H>`=g9^hDz556VoQ!J7@NuJNL|-*`L3@UIKWEmnw!BRvjJ~4bSy$r@=kLaa-20 zZybBB!+m2{gtF}irGU21KV{}L>NX+tW(QqT28|#I_(w%t1zsU2Pl^(u1Qak zp0^Cc#meE{LUp@*SfttYcLSD;7wS#hv4c$pC7r1I9g9+D=Mpi|JAsG_X@#z3{ zEMb`;VR@d_skk{i72)-+U>w6Mv>?D;QMS-2QupQkd4;t;|5@B;-HQ@fbNW zPq^w%)AId%sFmww`m%)Y$UK_qw!J!kWy>x8%d;yYnIxNb!?A+4M`!RlR8tfv4Al1~ zt*e(DhkLS7?yJ~f$o#kasi*7fw3Q>%D0C;ITT{Yn07Y_{jASqw$y-2jS~!a`BV;@s zH;6Yv=o4Y_JNO1xON}b$NS z)?!`EnP-^)LUo65kN!1^Aa^~(BJRss@rJHZuZtXM5GvH{((E}N^ocP_K#!!$v5EyD zhc3)RJnGTcNxGmnnP;U}BTG4AEiJ{e f7chQ+{hO!ICs5Q}B|##tVO=nZ&+r^Cwx)gqQ2{s| literal 0 HcmV?d00001 diff --git a/bin/net/grosinger/nomads/drones/DroneListItem$EnumMove.class b/bin/net/grosinger/nomads/drones/DroneListItem$EnumMove.class new file mode 100644 index 0000000000000000000000000000000000000000..a8ee0cea2ed05d6a37cd53f10eb73fc9ce49d8bd GIT binary patch literal 1529 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 literal 0 HcmV?d00001 diff --git a/bin/net/grosinger/nomads/drones/DroneTeam.class b/bin/net/grosinger/nomads/drones/DroneTeam.class new file mode 100644 index 0000000000000000000000000000000000000000..9cb2da86618b293c597c0cc033bdfb389f806945 GIT binary patch literal 4896 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 C8Acxf literal 0 HcmV?d00001 diff --git a/bin/net/grosinger/nomads/drones/NeighborDrone.class b/bin/net/grosinger/nomads/drones/NeighborDrone.class new file mode 100644 index 0000000000000000000000000000000000000000..3fac130e48e237c2a205d5722a94aaf890d4e66e GIT binary patch literal 1028 zcmZuvO>fgc6r6ROxD75XP1BO5G_>U-b^%KWPM};Gfg(lW&=SGXNmi+=#FlKAj~hRT z14u+j9QXnJD8%eKP?7kse($Yk-kUe}uirm@0(cD9f+669GWEuBlmy{e#$Fgr{ZZnL z;wY4f*OS5cd=SNLRa!6wHZJ^kzBlp1vG;0lA&04jl0YN3$xDAKGmwB8vJlwpUhz-U zm@}UVhz~p+o{s{B*PXUN>3I+aX^ZNboz604`NrvU#7Q)gWfXA3#u_%+tLgMtA+Tj* z6=jue+qjlxH*Hv0QFpsGY^(^ZcY{#&E~f(-pZSA{78?!yN#BnHRnITY^gKuej=Q-l z=lRABt+7md+JLR5v#g%l33#Iw(+5?&r3nn$4J-M}t~Qs+YIQ4=@3a2p)95lD$`^rN z;J@$pNLh~qu3X?L!i1qb;J;ufe{`ffI?@rw5^-y|&gVL-Ps9}&cir#UaO*Qv+`Sp9 z?!y^&+?qK3>%`lARtl*U2%RYnhR&3_g3gp4 zlkXe2Jy+u~DtyuXhMg}=435eq14nv@odM=U1Xn-IAy+;xkRRldk8;V?Me@^J@||4S vwME&jT=HGqo6Bx-N##t*J*MYZZfAa-(9^c=u$`g)xm&`0`ltMA>Rp{blvkzD literal 0 HcmV?d00001 diff --git a/bin/net/grosinger/nomads/drones/Police.class b/bin/net/grosinger/nomads/drones/Police.class new file mode 100644 index 0000000000000000000000000000000000000000..48c6232ab3638aa94d3387cb6b78af1d59ebe2c7 GIT binary patch literal 1496 zcmb7CTTc@~6#k~Sg|d~4fFddutF+t}QSbpnloo4~T1kLD_%^YhpD9{|?z+(L|DUJB*30zY(RO9YPe+x#eWjsjnb z(Ao1nw<#V+#^wN21` zp-$vQ|45_}$E1xhj5CZ@T`6jvc0&XQyx|#PzsbEi4_tljeN3ohmlSi+isxb?QL80X z&2%xDFI?dwmKQKgkXk01Y{J@aj_d7vTyms|qM!MH2hsx5;5lOD!&a z#cW?%I|m+9PYZ@&x?9zg*Vg8YC58vlT-iacCE{AXgzI6CD;L>RcCe|n$fh2V-EJc1 znpzk%vOz{RFELV};pkB;VyVZqY|b=HHt1sKFBh>tb6Lj9mB=@d$kl5g_acxnx<2}{ Rt>Fo+X;NRuGi<(``3*mE7c~F? literal 0 HcmV?d00001 diff --git a/src/net/grosinger/nomads/DroneTools.java b/src/net/grosinger/nomads/DroneTools.java index f513921..02f6f43 100644 --- a/src/net/grosinger/nomads/DroneTools.java +++ b/src/net/grosinger/nomads/DroneTools.java @@ -2,7 +2,18 @@ package net.grosinger.nomads; import java.util.ArrayList; -import net.grosinger.nomads.Building.Structure; +import net.grosinger.nomads.buildings.Building; +import net.grosinger.nomads.buildings.House; +import net.grosinger.nomads.buildings.NeighborBuilding; +import net.grosinger.nomads.buildings.PoliceStation; +import net.grosinger.nomads.buildings.RepairShop; +import net.grosinger.nomads.buildings.TownHall; +import net.grosinger.nomads.buildings.UpgradeShop; +import net.grosinger.nomads.buildings.Building.Structure; +import net.grosinger.nomads.drones.Drone; +import net.grosinger.nomads.drones.DroneListItem; +import net.grosinger.nomads.drones.DroneTeam; +import net.grosinger.nomads.drones.NeighborDrone; /** * Tools for the Drone to use. Only place methods in here that you want the @@ -147,40 +158,33 @@ public class DroneTools { int maxDistance = listItem.getVisibleDistance(); for (int i = maxDistance * -1; i <= maxDistance; i++) { for (int j = maxDistance * -1; j <= maxDistance; j++) { - if (getX() + i >= worldSize - 1 || getX() + i < 0 - || getY() + j >= worldSize - 1 || getY() + j < 0) { + if (getX() + i >= worldSize - 1 || getX() + i < 0 || getY() + j >= worldSize - 1 + || getY() + j < 0) { } else if (i != 0 && j != 0) { - GameObject objectHere = worldReference.getObjectAt(getX() - + i, getY() + j); + GameObject objectHere = worldReference.getObjectAt(getX() + i, getY() + j); if (objectHere instanceof Building) { Building buildingHere = (Building) objectHere; NeighborBuilding aWildNeighbor; if (buildingHere.getType() == Structure.TOWNHALL) { - aWildNeighbor = new TownHall(buildingHere.getX(), - buildingHere.getY(), - buildingHere.getName(), buildingHere, - listItem); + aWildNeighbor = new TownHall(buildingHere.getX(), buildingHere.getY(), + buildingHere.getName(), buildingHere, listItem); } else if (buildingHere.getType() == Structure.REPAIRSHOP) { aWildNeighbor = new RepairShop(buildingHere.getX(), - buildingHere.getY(), - buildingHere.getName(), buildingHere, + buildingHere.getY(), buildingHere.getName(), buildingHere, listItem); } else if (buildingHere.getType() == Structure.UPGRADESHOP) { - aWildNeighbor = new UpgradeShop( - buildingHere.getX(), buildingHere.getY(), - buildingHere.getName(), buildingHere, + aWildNeighbor = new UpgradeShop(buildingHere.getX(), + buildingHere.getY(), buildingHere.getName(), buildingHere, listItem); } else if (buildingHere.getType() == Structure.POLICESTATION) { - aWildNeighbor = new PoliceStation( - buildingHere.getX(), buildingHere.getY(), - buildingHere.getName(), buildingHere, + aWildNeighbor = new PoliceStation(buildingHere.getX(), + buildingHere.getY(), buildingHere.getName(), buildingHere, listItem); } else { - aWildNeighbor = new NeighborBuilding( - buildingHere.getX(), buildingHere.getY(), - buildingHere.getName(), buildingHere, + aWildNeighbor = new NeighborBuilding(buildingHere.getX(), + buildingHere.getY(), buildingHere.getName(), buildingHere, listItem); } @@ -203,19 +207,16 @@ public class DroneTools { int maxDistance = listItem.getVisibleDistance(); for (int i = maxDistance * -1; i <= maxDistance; i++) { for (int j = maxDistance * -1; j <= maxDistance; j++) { - if (getX() + i >= worldSize - 1 || getX() + i < 0 - || getY() + j >= worldSize - 1 || getY() + j < 0) { + if (getX() + i >= worldSize - 1 || getX() + i < 0 || getY() + j >= worldSize - 1 + || getY() + j < 0) { } else if (i != 0 && j != 0) { - GameObject objectHere = worldReference.getObjectAt(getX() - + i, getY() + j); + GameObject objectHere = worldReference.getObjectAt(getX() + i, getY() + j); if (objectHere instanceof Drone) { Drone droneHere = (Drone) objectHere; - DroneListItem listItemHere = Nomads - .droneToListItem(droneHere); - NeighborDrone aWildNeighbor = new NeighborDrone( - listItemHere.getX(), listItemHere.getY(), - droneHere.getName(), droneHere.getUID()); + DroneListItem listItemHere = Nomads.droneToListItem(droneHere); + NeighborDrone aWildNeighbor = new NeighborDrone(listItemHere.getX(), + listItemHere.getY(), droneHere.getName(), droneHere.getUID()); neighbors.add(aWildNeighbor); } } @@ -224,6 +225,30 @@ public class DroneTools { return neighbors; } + /** + * Retrieve a list of all MoneyPiles that are visible from this drone. + * Does not return the money pile itself, rather just a point where one + * lies. + * + * @return ArrayList of Points + */ + public ArrayList checkLumaLocator() { + // TODO - Implement LumaLocator + return null; + } + + /** + * Retrieve a list of all objectives that are visible from this drone. + * Will tell if the objective belongs to this drone or not. + * + * @return ArrayList of ObjectiveReferences + */ + public ArrayList checkObjectiveLocator() { + // TODO - Implement ObjectiveLocator + // Should not actually return an Objective + return null; + } + /** * If your team has enough money, will create a house 1 space east of * current location. @@ -237,8 +262,8 @@ public class DroneTools { Point intendedPoint = new Point(getX(), getY()); findEmptyPoint(intendedPoint); - House newHouse = new House(Structure.HOUSE, intendedPoint.getX(), - intendedPoint.getY(), currentTeam); + House newHouse = new House(Structure.HOUSE, intendedPoint.getX(), intendedPoint.getY(), + currentTeam); worldReference.placeNewBuilding(newHouse); currentTeam.deductFromBalance(Nomads.HOUSEPRICE); listItem.setWaiting(Nomads.CREATIONTIME); @@ -268,8 +293,7 @@ public class DroneTools { */ private Point findEmptyPoint(Point currentPoint) { // Current point is where the drone is - boolean validSpace = worldReference.getObjectAt(currentPoint.getX(), - currentPoint.getY()) == null; + boolean validSpace = worldReference.getObjectAt(currentPoint.getX(), currentPoint.getY()) == null; Point tryThis = new Point(currentPoint.getX(), currentPoint.getY()); int outX = 1; int outY = 0; diff --git a/src/net/grosinger/nomads/InitializeGame.java b/src/net/grosinger/nomads/InitializeGame.java index b641769..775f5aa 100644 --- a/src/net/grosinger/nomads/InitializeGame.java +++ b/src/net/grosinger/nomads/InitializeGame.java @@ -10,7 +10,10 @@ import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import net.grosinger.nomads.Building.Structure; +import net.grosinger.nomads.buildings.Building; +import net.grosinger.nomads.buildings.Building.Structure; +import net.grosinger.nomads.drones.Drone; +import net.grosinger.nomads.drones.DroneTeam; /** * Various methods used when first setting up the game and loading everything diff --git a/src/net/grosinger/nomads/Inventory.java b/src/net/grosinger/nomads/Inventory.java index 4608521..4a13d9b 100644 --- a/src/net/grosinger/nomads/Inventory.java +++ b/src/net/grosinger/nomads/Inventory.java @@ -2,6 +2,7 @@ package net.grosinger.nomads; import java.util.ArrayList; +import net.grosinger.nomads.drones.DroneListItem; import net.grosinger.nomads.exceptions.FullInventoryException; public class Inventory { diff --git a/src/net/grosinger/nomads/Nomads.java b/src/net/grosinger/nomads/Nomads.java index 5d21a40..c1d1761 100644 --- a/src/net/grosinger/nomads/Nomads.java +++ b/src/net/grosinger/nomads/Nomads.java @@ -3,6 +3,10 @@ package net.grosinger.nomads; import java.io.IOException; import java.util.ArrayList; +import net.grosinger.nomads.drones.Drone; +import net.grosinger.nomads.drones.DroneListItem; +import net.grosinger.nomads.drones.DroneTeam; + public class Nomads { public static World awesomeWorld; diff --git a/src/net/grosinger/nomads/Upgrade.java b/src/net/grosinger/nomads/Upgrade.java index d02f60c..a7104c2 100644 --- a/src/net/grosinger/nomads/Upgrade.java +++ b/src/net/grosinger/nomads/Upgrade.java @@ -2,6 +2,8 @@ package net.grosinger.nomads; import java.util.Hashtable; +import net.grosinger.nomads.drones.DroneListItem; + public class Upgrade { public enum UpgradeType { diff --git a/src/net/grosinger/nomads/World.java b/src/net/grosinger/nomads/World.java index e8f86a8..c399e1d 100644 --- a/src/net/grosinger/nomads/World.java +++ b/src/net/grosinger/nomads/World.java @@ -9,6 +9,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import net.grosinger.nomads.buildings.Building; +import net.grosinger.nomads.buildings.House; +import net.grosinger.nomads.drones.Drone; +import net.grosinger.nomads.drones.DroneListItem; +import net.grosinger.nomads.drones.DroneTeam; + /** * Main class where information about the world is stored * @@ -173,10 +179,9 @@ public class World { * GameObject to be placed */ public void setObjectRandom(GameObject newItem) { - // TODO - Able to go out of bounds // Min + (int)(Math.random() * ((Max - Min) + 1)) - int randX = 0 + (int) (Math.random() * ((getWorldSize() - 0) + 1)); - int randY = 0 + (int) (Math.random() * ((getWorldSize() - 0) + 1)); + int randX = 0 + (int) (Math.random() * ((getWorldSize() - 1 - 0) + 1)); + int randY = 0 + (int) (Math.random() * ((getWorldSize() - 1 - 0) + 1)); setObjectAt(randX, randY, newItem); } diff --git a/src/net/grosinger/nomads/Building.java b/src/net/grosinger/nomads/buildings/Building.java similarity index 94% rename from src/net/grosinger/nomads/Building.java rename to src/net/grosinger/nomads/buildings/Building.java index 6d707b9..584348d 100644 --- a/src/net/grosinger/nomads/Building.java +++ b/src/net/grosinger/nomads/buildings/Building.java @@ -1,4 +1,7 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.buildings; + +import net.grosinger.nomads.GameObject; +import net.grosinger.nomads.drones.DroneTeam; /* diff --git a/src/net/grosinger/nomads/House.java b/src/net/grosinger/nomads/buildings/House.java similarity index 79% rename from src/net/grosinger/nomads/House.java rename to src/net/grosinger/nomads/buildings/House.java index 1600914..b59c744 100644 --- a/src/net/grosinger/nomads/House.java +++ b/src/net/grosinger/nomads/buildings/House.java @@ -1,4 +1,7 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.buildings; + +import net.grosinger.nomads.Nomads; +import net.grosinger.nomads.drones.DroneTeam; /** diff --git a/src/net/grosinger/nomads/NeighborBuilding.java b/src/net/grosinger/nomads/buildings/NeighborBuilding.java similarity index 91% rename from src/net/grosinger/nomads/NeighborBuilding.java rename to src/net/grosinger/nomads/buildings/NeighborBuilding.java index 8b40dbe..5a1fe99 100644 --- a/src/net/grosinger/nomads/NeighborBuilding.java +++ b/src/net/grosinger/nomads/buildings/NeighborBuilding.java @@ -1,4 +1,8 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.buildings; + +import net.grosinger.nomads.GameObject; +import net.grosinger.nomads.Nomads; +import net.grosinger.nomads.drones.DroneListItem; /** * An array of NeigborBuildings will be given to a drone that is searching for diff --git a/src/net/grosinger/nomads/PoliceStation.java b/src/net/grosinger/nomads/buildings/PoliceStation.java similarity index 78% rename from src/net/grosinger/nomads/PoliceStation.java rename to src/net/grosinger/nomads/buildings/PoliceStation.java index 0bee961..a366693 100644 --- a/src/net/grosinger/nomads/PoliceStation.java +++ b/src/net/grosinger/nomads/buildings/PoliceStation.java @@ -1,4 +1,6 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.buildings; + +import net.grosinger.nomads.drones.DroneListItem; /** * A representation of a PoliceStation. Allows Drones to interact with this diff --git a/src/net/grosinger/nomads/RepairShop.java b/src/net/grosinger/nomads/buildings/RepairShop.java similarity index 77% rename from src/net/grosinger/nomads/RepairShop.java rename to src/net/grosinger/nomads/buildings/RepairShop.java index 46fd9cc..8749652 100644 --- a/src/net/grosinger/nomads/RepairShop.java +++ b/src/net/grosinger/nomads/buildings/RepairShop.java @@ -1,4 +1,6 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.buildings; + +import net.grosinger.nomads.drones.DroneListItem; /** * A representation of a RepairShop. Allows Drones to interact with this diff --git a/src/net/grosinger/nomads/TownHall.java b/src/net/grosinger/nomads/buildings/TownHall.java similarity index 84% rename from src/net/grosinger/nomads/TownHall.java rename to src/net/grosinger/nomads/buildings/TownHall.java index 577538b..820df11 100644 --- a/src/net/grosinger/nomads/TownHall.java +++ b/src/net/grosinger/nomads/buildings/TownHall.java @@ -1,5 +1,13 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.buildings; +import net.grosinger.nomads.GameObject; +import net.grosinger.nomads.Inventory; +import net.grosinger.nomads.MoneyPile; +import net.grosinger.nomads.Nomads; +import net.grosinger.nomads.Objective; +import net.grosinger.nomads.Point; +import net.grosinger.nomads.drones.DroneListItem; +import net.grosinger.nomads.drones.DroneTeam; import net.grosinger.nomads.exceptions.BadRequestException; import net.grosinger.nomads.exceptions.ObjectReferenceOutdatedException; diff --git a/src/net/grosinger/nomads/UpgradeShop.java b/src/net/grosinger/nomads/buildings/UpgradeShop.java similarity index 90% rename from src/net/grosinger/nomads/UpgradeShop.java rename to src/net/grosinger/nomads/buildings/UpgradeShop.java index a5e9497..b909212 100644 --- a/src/net/grosinger/nomads/UpgradeShop.java +++ b/src/net/grosinger/nomads/buildings/UpgradeShop.java @@ -1,5 +1,7 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.buildings; +import net.grosinger.nomads.Upgrade; +import net.grosinger.nomads.drones.DroneListItem; import net.grosinger.nomads.exceptions.InsufficientFundsException; import net.grosinger.nomads.exceptions.InvalidUpgradeException; diff --git a/src/net/grosinger/nomads/Drone.java b/src/net/grosinger/nomads/drones/Drone.java similarity index 86% rename from src/net/grosinger/nomads/Drone.java rename to src/net/grosinger/nomads/drones/Drone.java index 92143e7..1bca593 100644 --- a/src/net/grosinger/nomads/Drone.java +++ b/src/net/grosinger/nomads/drones/Drone.java @@ -1,6 +1,8 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.drones; -import net.grosinger.nomads.DroneListItem.EnumMove; +import net.grosinger.nomads.DroneTools; +import net.grosinger.nomads.GameObject; +import net.grosinger.nomads.drones.DroneListItem.EnumMove; /** * All drones will extend this class. Gives them access to basic set of tools diff --git a/src/net/grosinger/nomads/DroneListItem.java b/src/net/grosinger/nomads/drones/DroneListItem.java similarity index 97% rename from src/net/grosinger/nomads/DroneListItem.java rename to src/net/grosinger/nomads/drones/DroneListItem.java index 764e451..f2b04fd 100644 --- a/src/net/grosinger/nomads/DroneListItem.java +++ b/src/net/grosinger/nomads/drones/DroneListItem.java @@ -1,7 +1,14 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.drones; import java.util.ArrayList; +import net.grosinger.nomads.DroneTools; +import net.grosinger.nomads.GameObject; +import net.grosinger.nomads.Inventory; +import net.grosinger.nomads.MoneyPile; +import net.grosinger.nomads.Nomads; +import net.grosinger.nomads.Objective; +import net.grosinger.nomads.Upgrade; import net.grosinger.nomads.Upgrade.UpgradeType; import net.grosinger.nomads.exceptions.FullInventoryException; diff --git a/src/net/grosinger/nomads/DroneTeam.java b/src/net/grosinger/nomads/drones/DroneTeam.java similarity index 96% rename from src/net/grosinger/nomads/DroneTeam.java rename to src/net/grosinger/nomads/drones/DroneTeam.java index c3d5123..7e60f92 100644 --- a/src/net/grosinger/nomads/DroneTeam.java +++ b/src/net/grosinger/nomads/drones/DroneTeam.java @@ -1,7 +1,13 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.drones; import java.util.ArrayList; +import net.grosinger.nomads.GameObject; +import net.grosinger.nomads.InitializeGame; +import net.grosinger.nomads.Nomads; +import net.grosinger.nomads.Point; +import net.grosinger.nomads.buildings.House; + /** * Contains a pointer to the first and the last DroneListItem in a particular diff --git a/src/net/grosinger/nomads/NeighborDrone.java b/src/net/grosinger/nomads/drones/NeighborDrone.java similarity index 93% rename from src/net/grosinger/nomads/NeighborDrone.java rename to src/net/grosinger/nomads/drones/NeighborDrone.java index aaa16b2..8844f40 100644 --- a/src/net/grosinger/nomads/NeighborDrone.java +++ b/src/net/grosinger/nomads/drones/NeighborDrone.java @@ -1,4 +1,6 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.drones; + +import net.grosinger.nomads.GameObject; /** diff --git a/src/net/grosinger/nomads/Police.java b/src/net/grosinger/nomads/drones/Police.java similarity index 92% rename from src/net/grosinger/nomads/Police.java rename to src/net/grosinger/nomads/drones/Police.java index 7985bb5..b4adf12 100644 --- a/src/net/grosinger/nomads/Police.java +++ b/src/net/grosinger/nomads/drones/Police.java @@ -1,6 +1,7 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.drones; -import net.grosinger.nomads.DroneListItem.EnumMove; +import net.grosinger.nomads.DroneTools; +import net.grosinger.nomads.drones.DroneListItem.EnumMove; /** * Enforcer of the law. Has the ability to arrest drones that are wanted. Police