From 8d6840ac8730fe917146bbc10820d22d9bde5474 Mon Sep 17 00:00:00 2001 From: Tony Grosinger Date: Thu, 15 Sep 2011 13:52:08 -0700 Subject: [PATCH] -NeighborBuilding is now Drone specific. Signed-off-by: Tony Grosinger --- bin/net/grosinger/nomads/DroneTools.class | Bin 7419 -> 7495 bytes .../grosinger/nomads/NeighborBuilding.class | Bin 1374 -> 1495 bytes bin/net/grosinger/nomads/PoliceStation.class | Bin 512 -> 607 bytes bin/net/grosinger/nomads/RepairShop.class | Bin 503 -> 598 bytes bin/net/grosinger/nomads/TownHall.class | Bin 1934 -> 2049 bytes bin/net/grosinger/nomads/UpgradeShop.class | Bin 506 -> 601 bytes src/net/grosinger/nomads/DroneTools.java | 15 ++++++--- .../grosinger/nomads/NeighborBuilding.java | 4 ++- src/net/grosinger/nomads/PoliceStation.java | 5 +-- src/net/grosinger/nomads/RepairShop.java | 5 +-- src/net/grosinger/nomads/TownHall.java | 29 +++++++++++------- src/net/grosinger/nomads/UpgradeShop.java | 5 +-- 12 files changed, 40 insertions(+), 23 deletions(-) diff --git a/bin/net/grosinger/nomads/DroneTools.class b/bin/net/grosinger/nomads/DroneTools.class index 2b7333038a6fa6e7d34238334692f6bbfa8670ee..3a42fa9713ea4def0c99e325b9507b9589e4846e 100644 GIT binary patch delta 1017 zcmZ{iTWnNS6o$WlI?UlxU{I#*DKk(gm$uUu2t>k2DWD+`S|UnAATbb-w2=o$<3lx( zQPYqJ1cIj|ltvRuVG89^C`?Iega?TUh$wjB@_>r*#XwN5;Zj|v)Dj+e*n6$D_m{o? zwbp(#{hLJlhmMwc>z%2d=VW;mfx#U|oQ0XIZsO1%RNY0*(oWv3C_09lW=&Z%P%|^7 z3Nx<+Q+l;1O?hmEUFHYhX;$IWut|C5%!&m2F2cQWlR~jZ1tP&lo_I5}bCb1=Tyy)K zqBaq7LuuYSO5I+@cCmh`AAaO-AN$)UZpc^A$%cfJVoxvoX%D;kMeG)zeZQC8+QWYK zJez#>aDxw5_QKnH;2qDy&)A(lJGzUe7XhCqoVe?x`C>_ZP?2D?rTcV!hGJ%q$J>D* zCAOzgiB}zYE!o0ucG1QjJKD=hQhZG-XW7Sji+^E1zuWDf9N-oQxz8aU(WVRzYY6Rn zi6e?~RQYshg2fX#t|_EdMyFoqgyvaXNtYJ0U2oH%)tsW#(tkjvKVc>&nPg#qEvMOp zh_IH>LYM%tzC1fkZ#O}9G^W*=X=<|yEyhMBIb$RKUIkoLA-}1J8;WyF#oSg2_w4P5noOzJIwC!627~MigjJ5K SS&YyeZ*6qB7I^2Q#s2~7Vf!2a delta 928 zcmZvaTS$~)5Qd-8b$`>XwA|L!-Lfp#vaCovY)FwPNCcTk)J+jV(E&udkf63g3MGpA z6|$uwGY{FpG}d6D>>}-)9if7vn zn5!J(_K(IL2yt77xr0O8;nBEi?-m8~hrya5@W^Q3(NIBm5dUbG$Gk?G(+F^UWraoT z7FYf6XBFY%)_60m6|gWz&pJ}g6ZSmcNgAoAjnf2api{GM)%R)QInBJ}3~y=Slj^UW zl`zhUmGctA1#zgJ!bM4@P3F)p8LD##$YN@wkZLK?is|aK9b0Ho%w?Wtk+M|1Pa(ue z9`&1uA&fZ5Rnr*4acQXrRTfI=VFkrR;NzOM)ubD*SE5;4GPpCM2L3B?ji?+Y{&6j8 zX;U+`HD66~jooKZVo>Jscm{Erk&bUA*Y!W@Qpau_++Yef$>J78>ad!-tm7V=HJ0i~ z%C#dO52@e*dwE0^kE!N~KIf74_muPceTUY$%8T}r_-L8=hA5q00`ExTJ!yPkfyOL8 zvWQ*^b*jbmQ9{32={#iruJjM3f0DwW&gvIl{(ab9Wg&@@YX)6wq`*vc&;AR~hUd`$ diff --git a/bin/net/grosinger/nomads/NeighborBuilding.class b/bin/net/grosinger/nomads/NeighborBuilding.class index 0f34ca2105e53749d0b77fc2eca8785c09c04e73..3a023a8cb6eedcdc530b64900e1c860775a3a8f8 100644 GIT binary patch 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);Q3_Xr1fN^ ziy8eZ=DJw=A`@lkJugWop&&)XQ$&%bgwsf3hJLeHq9U^tm-o^`#|oW@NGu(Z3r`dn zlAdTGEIm=IB0W)Vgd(qF)h{+jRv;t#H>5t36M`ruDlZo$o#qAjbPQ_{AkpbX@We?E zcr6foBM_YI1#bj`X=i-qb+V%D7?qv=j`iNkA78-7&MLo)4IiJUK7~wCeTAlSJ_1j? z9TI6*W*GOP&ZLgw9?42;kNbGw=PLWT5;V`P6cx1e2@&NaEP4t{HNC7a2=($p)`Xu` Xp`mTc0d9$k!2V!RboY=>A>{u7NN^Zp literal 1374 zcmah{+fEZv6kVsCc1jtf0tHLC2#B=9rHXA38ue}3j%Bc&n&}kf8~h1B zfCn{J6CeBlzsVTanHerAlbFfOKIhC{Yp=cb`Th6jF9569P!SQBw@tTDcUo=BuA5H5 zZZ(ZsyHGT(`az}TJnmSH8vm$J1X72_kx^(EcD=AyIW()TinzdZD8X~1Y5GY5ip`C{ z(C#^Y-*w2kA<*x39DCa_4cDv*h#kHk_#O)+DnV_Q*bS|5DvmVqP0P02ErIpi&d%jJ z|H0?W6uI51nMp)3tYHu%0?}N)+y{YC4gE;U)in*8zZ%z|A|cNvGz{QMAEt0!#k4>+ zRB6$3Rl^LDtR!2O*f|Y-@?db+vdvy=Y&e$O2ZxG#V6_Dn!kg)x z7)?>@rd#x^AIaq}n?fZ_cFjtGFdF8QRjR`5KmyC#-#1E1kPs zN*b)%=KDa+k?B}(j{WOVHX2sVayf7s{+bt}+HoAyc1tu#U|`=hs&8Ky?*b2!`>l>s zHJ@41rF3u4EAoQTWODJ1@rlSe@wP{#(_Z8(y~s&=k<(*TnLmgWzgM~Y$ov@NjQ#^d zdbW$SKGDUPzT8Dd&nR7F^{<%hV)lziaf9C}QUDn!7-y+0NhdIjNuKa#U>fuMd)Ft$ zO)PLndU>%}Qm&+&h_{l0quxqNQ}{oJd?2jADDz|bH)K9@5rHfo_YUX0BATBN6cNy| z$P?MsMR5A02fP#tUJ3<|^@7(z!Mqni_%;EL?-0e2BR{0G=^_MiX& diff --git a/bin/net/grosinger/nomads/PoliceStation.class b/bin/net/grosinger/nomads/PoliceStation.class index 0ed2b4209c7b48935fa028f718755f5e0d6065f3..fc76bffccd18bfd65b8137e6835bd88bce60aafc 100644 GIT binary patch delta 191 zcmZo*xzECN>ff$?3=9lL43ZPM;uxbQW|~ZVD8}njl%JRClUZEiS(2JNan1oY))bJ) z#CwvcQj;SYZOU^P*np6Mfk#VPMpu$Wl65-+$3`HZiGd49asg=u25una0b&LQJBV5! yj~B=T>SEwy;Adb2vjl)FkZK+VK?WfPW-v>bL4<(?%o1e~V_*fU6bJH{7$g9aWFI&H delta 138 zcmcc5(!j!X>ff$?3=9lL4B`{H;uy^)W|~YqxPS6`M$7C3238kj3_J|HKpsejkAa_o5zG<*vLLDj8H5;^!D7M;A`C1* Lc~Kybi9rkioyZSk diff --git a/bin/net/grosinger/nomads/RepairShop.class b/bin/net/grosinger/nomads/RepairShop.class index f40258852a1bb20e7233c39257bb2c3fb0707745..28d520b7d4241303545b27706df73e83853d4563 100644 GIT binary patch delta 197 zcmey)e2sr#}Tm+F&QT;f@hnmcjkUM|)Y zkO(7#3a0erU`EUG90oQZWMJUYl9thxWRYau&cLw|$Y)~U0+L)nnt_2E2zh{*fx!-< z7RciT@_@P+_!#&Z7{M$7APc0Lhe41*h=Cc*5@rx#U;(p48N?V^fhxs;JSGMS0H}r@ At^fc4 delta 138 zcmcb{@|~IM)W2Q(7#J9g7{n)XMKhXBOf#9dZ_nhFjAq#h46H!Nz`&&?Eu$;RvYmlr zBap|$zy%Tm(jbzPfg1=J7)&548F(0Yfjp259|J!FBbX%sWIO3r L@}fW<6N4B4&Pxxw diff --git a/bin/net/grosinger/nomads/TownHall.class b/bin/net/grosinger/nomads/TownHall.class index 03558cf7313f760866be3b216ba4eab5eb8b0a75..5d7e0c5e2f9a7ba5e392d15a29dca2c58633f58d 100644 GIT binary patch delta 867 zcmZWnT~8B16g|`3W!hzEDOf19w1t9gX{&$*0Ttv+tw4dQMNwlKx*<(UYufU_6Y&pd zntd?+1-zmrt3hMn)klAhG3ec`;l*rb=FGk4ew;h|*7c^d^T);McK{Q3$zfv{(9fBt zF*3(?8ikZT&U*BBOtG&OYxQ(p+i$%8>QD;RN?BtV{?Ds#urGE7zrX+jdPeDWGDy+b zj*1Y5I0p3&n^y``VAK|puQCLwR#4)I>J7=8Sf{Lqo5hl*B7#wYI1&u@J*}S0mky{N zWlF2KhB1!oW&kzjhzX2ig27cR?^d;ZOj;Kka?{_FbTrw)0B*=O-o;2CmyMcF(mp^ZL3 zjQae^KDkf%4EqPV+n~~}(g`@x4i_z8uEm8w2i+)&d@e8xbrLe!0&a9cvQRg!K(>$v zJy3|*3oo(y$Yw)7_z{5%f(o74Q3Jjv){n6imkb2YFp^20BhrK~d4`CA*p!^`$Oe)h zal^pOF+Aj+Z^D@%|Ga?(a>bJdmbc>u9yI@aGlj^OkXdRJRF+dw6+U#sPiO!~VFVCE zkbb`qW-v$!hp<5BGKOh({n#R}sXWzc@ltsft5~y?XR(e9N$93m-M}U(57Q*JXvxS@ zr1-~L#UnzG$>M~f{zimj#J%(jN*kGtV|2Hs(N0=P&Grd9A){o8aaz+& c5q*-XOzW?BuXl%L-pVe4nNRYZ=r+9g3)K#c;{X5v delta 850 zcmYjP+fEZv6kVrt$k6Ekt)*JpLM@>5LMdRaR=gk;w6vCs+A6*{(vg&KF>N8?iSPp^ zbrO?)fZ-K2jtL-l2s5!R7T{a*T~!K zL>0p@Lsw;ExvFb5eM%#iW!k`rwrIx)Mr9-z`~uxk*j(4jH5FqRH{M92_9Rj=E;IN< zRVi&&*UBoc;HvRc3h-+uJdu{<%C@c`jq56I2yJ%KHnq96QQuME!z~q)xNYS5fY*nN ziaVHQkSn$6^_TS>Oa0P^J)UNy{eg;yqT0Q!S1T`eTHxfeQmzQBB#J6ZSTMe}&F?-# z8{L2s^#|fT{1e*W(U%R1$k7UPz>ZEhC`z_Ep;As<3gx@NtjI}`=vLsu8Aw*-MmIRs zJvd9XbCk2e3z^m*6baVc?mjXx$wbdFf`#}OgqrZjj}bC4kmAE0Zer*?;wCQb!$akC z6P?3UPn(#aQj97$OED8u&A&%NH@9?;SZckbqKCBl;D#Roy8G#;iJ_1Fvmi}4gbcj9 zn8m<<=5nXza+twg%UllkkR`$5+-8v@*Z`T$)5CF}NY#_B85Ag*qf7_5^czDmg05fW zlVKhU^cK#G1SICr#}Tm+F&QT;f@hnmcjUJ}%Z2 zkO(7#3a0erP)4ir90oQZWMJUYl9thxWRYau&cLw|$Y)~U0+L)nnt_2E2zh{*fx!-< z7RciT@_@P+_!#&Z7{M$7APc0Lhe41*h=Cc*5@rx#U;(p48N?V^fhxs;JSGMS0I?(< Ay8r+H delta 138 zcmcb~@{5`4)W2Q(7#J9g7{n)X#W0#pOgEXhfA8egjON)146H!Nz`&&?Eu$;RvYmlr zBap|$zy%Tm(jbzPfg1=J7)&548F(0Yfjp259|J!FBbX%sWIO3r L@}fW<6N4B4)SVB= diff --git a/src/net/grosinger/nomads/DroneTools.java b/src/net/grosinger/nomads/DroneTools.java index 09c7f37..f513921 100644 --- a/src/net/grosinger/nomads/DroneTools.java +++ b/src/net/grosinger/nomads/DroneTools.java @@ -160,23 +160,28 @@ public class DroneTools { if (buildingHere.getType() == Structure.TOWNHALL) { aWildNeighbor = new TownHall(buildingHere.getX(), buildingHere.getY(), - buildingHere.getName(), buildingHere); + buildingHere.getName(), buildingHere, + listItem); } else if (buildingHere.getType() == Structure.REPAIRSHOP) { aWildNeighbor = new RepairShop(buildingHere.getX(), buildingHere.getY(), - buildingHere.getName(), buildingHere); + buildingHere.getName(), buildingHere, + listItem); } else if (buildingHere.getType() == Structure.UPGRADESHOP) { aWildNeighbor = new UpgradeShop( buildingHere.getX(), buildingHere.getY(), - buildingHere.getName(), buildingHere); + buildingHere.getName(), buildingHere, + listItem); } else if (buildingHere.getType() == Structure.POLICESTATION) { aWildNeighbor = new PoliceStation( buildingHere.getX(), buildingHere.getY(), - buildingHere.getName(), buildingHere); + buildingHere.getName(), buildingHere, + listItem); } else { aWildNeighbor = new NeighborBuilding( buildingHere.getX(), buildingHere.getY(), - buildingHere.getName(), buildingHere); + buildingHere.getName(), buildingHere, + listItem); } neighbors.add(aWildNeighbor); diff --git a/src/net/grosinger/nomads/NeighborBuilding.java b/src/net/grosinger/nomads/NeighborBuilding.java index 6ad86c1..23d5d69 100644 --- a/src/net/grosinger/nomads/NeighborBuilding.java +++ b/src/net/grosinger/nomads/NeighborBuilding.java @@ -11,6 +11,7 @@ public class NeighborBuilding implements GameObject { private int x; private int y; private Building building; + private DroneListItem drone; /** * Class Constructor @@ -22,11 +23,12 @@ public class NeighborBuilding implements GameObject { * @param name * - Name of the Building */ - public NeighborBuilding(int x, int y, String name, Building building) { + public NeighborBuilding(int x, int y, String name, Building building, DroneListItem drone) { this.x = x; this.y = y; this.name = name; this.building = building; + this.drone = drone; turnCreated = Nomads.turn; } diff --git a/src/net/grosinger/nomads/PoliceStation.java b/src/net/grosinger/nomads/PoliceStation.java index ef01478..b0c7d69 100644 --- a/src/net/grosinger/nomads/PoliceStation.java +++ b/src/net/grosinger/nomads/PoliceStation.java @@ -6,8 +6,9 @@ package net.grosinger.nomads; */ public class PoliceStation extends NeighborBuilding { - public PoliceStation(int x, int y, String name, Building building) { - super(x, y, name, building); + public PoliceStation(int x, int y, String name, Building building, + DroneListItem drone) { + super(x, y, name, building, drone); } } diff --git a/src/net/grosinger/nomads/RepairShop.java b/src/net/grosinger/nomads/RepairShop.java index 790fc89..6ffa6b9 100644 --- a/src/net/grosinger/nomads/RepairShop.java +++ b/src/net/grosinger/nomads/RepairShop.java @@ -6,8 +6,9 @@ package net.grosinger.nomads; */ public class RepairShop extends NeighborBuilding { - public RepairShop(int x, int y, String name, Building building) { - super(x, y, name, building); + public RepairShop(int x, int y, String name, Building building, + DroneListItem drone) { + super(x, y, name, building, drone); } } diff --git a/src/net/grosinger/nomads/TownHall.java b/src/net/grosinger/nomads/TownHall.java index 2eecd9c..9dfb6eb 100644 --- a/src/net/grosinger/nomads/TownHall.java +++ b/src/net/grosinger/nomads/TownHall.java @@ -9,8 +9,9 @@ public class TownHall extends NeighborBuilding { // TODO - Rewrite class to make more accessible to Drones - public TownHall(int x, int y, String name, Building building) { - super(x, y, name, building); + public TownHall(int x, int y, String name, Building building, + DroneListItem drone) { + super(x, y, name, building, drone); } /** @@ -21,16 +22,21 @@ public class TownHall extends NeighborBuilding { * @param team */ public void cashInventory(ArrayList inventory, DroneTeam team) { - while (!inventory.isEmpty()) { - GameObject currentObject = inventory.get(0); - if (currentObject instanceof MoneyPile) { - int value = ((MoneyPile) currentObject).getValue(); - team.increaseBalance(value); - Nomads.awesomeWorld.generateMoneyPile(); - } else if (currentObject instanceof Objective) { - team.increaseBalance(((Objective) currentObject).getBounty()); + if (verifyObjectValidity()) { + while (!inventory.isEmpty()) { + GameObject currentObject = inventory.get(0); + if (currentObject instanceof MoneyPile) { + int value = ((MoneyPile) currentObject).getValue(); + team.increaseBalance(value); + Nomads.awesomeWorld.generateMoneyPile(); + } else if (currentObject instanceof Objective) { + team.increaseBalance(((Objective) currentObject) + .getBounty()); + } + inventory.remove(currentObject); } - inventory.remove(currentObject); + } else { + // Object not valid, do Nothing } } @@ -46,6 +52,7 @@ public class TownHall extends NeighborBuilding { if (verifyObjectValidity()) { return Nomads.awesomeWorld.generateObjective(UID); } else { + // Object not valid, do nothing return null; } } diff --git a/src/net/grosinger/nomads/UpgradeShop.java b/src/net/grosinger/nomads/UpgradeShop.java index 54331d0..658548f 100644 --- a/src/net/grosinger/nomads/UpgradeShop.java +++ b/src/net/grosinger/nomads/UpgradeShop.java @@ -6,8 +6,9 @@ package net.grosinger.nomads; */ public class UpgradeShop extends NeighborBuilding { - public UpgradeShop(int x, int y, String name, Building building) { - super(x, y, name, building); + public UpgradeShop(int x, int y, String name, Building building, + DroneListItem drone) { + super(x, y, name, building, drone); } }