From 7ee4f440e5d8ef9e47e60aac6b797fc8e33bda0b Mon Sep 17 00:00:00 2001 From: Tony Grosinger Date: Wed, 14 Sep 2011 11:49:30 -0700 Subject: [PATCH] -Removed Upgrade from Drone. Upgrades will be performed by approaching an upgrade shop. Signed-off-by: Tony Grosinger --- .../grosinger/nomads/Building$Structure.class | Bin 1318 -> 1318 bytes bin/net/grosinger/nomads/Building.class | Bin 2450 -> 2450 bytes bin/net/grosinger/nomads/Drone.class | Bin 618 -> 565 bytes bin/net/grosinger/nomads/DroneListItem.class | Bin 10914 -> 9370 bytes bin/net/grosinger/nomads/DroneTeam.class | Bin 4771 -> 4771 bytes bin/net/grosinger/nomads/House.class | Bin 799 -> 799 bytes .../grosinger/nomads/NeighborBuilding.class | Bin 1124 -> 1124 bytes bin/net/grosinger/nomads/NeighborDrone.class | Bin 1014 -> 1014 bytes bin/net/grosinger/nomads/Nomads.class | Bin 5057 -> 5057 bytes bin/net/grosinger/nomads/Police.class | Bin 1550 -> 1447 bytes bin/net/grosinger/nomads/TownHall.class | Bin 1875 -> 1875 bytes .../nomads/Upgrade$UpgradeType.class | Bin 1556 -> 1556 bytes bin/net/grosinger/nomads/Upgrade.class | Bin 2978 -> 2978 bytes bin/net/grosinger/nomads/World.class | Bin 9180 -> 9180 bytes src/net/grosinger/nomads/Building.java | 1 + src/net/grosinger/nomads/Drone.java | 8 --- src/net/grosinger/nomads/DroneListItem.java | 67 ------------------ src/net/grosinger/nomads/DroneTeam.java | 1 + src/net/grosinger/nomads/House.java | 1 + .../grosinger/nomads/NeighborBuilding.java | 1 + src/net/grosinger/nomads/NeighborDrone.java | 1 + src/net/grosinger/nomads/Nomads.java | 1 + src/net/grosinger/nomads/Police.java | 9 --- src/net/grosinger/nomads/TownHall.java | 1 + src/net/grosinger/nomads/Upgrade.java | 1 + src/net/grosinger/nomads/World.java | 1 + 26 files changed, 9 insertions(+), 84 deletions(-) diff --git a/bin/net/grosinger/nomads/Building$Structure.class b/bin/net/grosinger/nomads/Building$Structure.class index 867b1c9631efd853fbaaf43bedf9e84b775d6dfe..a41e01f48f5391f85582af193c56af3ca47b9519 100644 GIT binary patch delta 23 ecmZ3+wTx?n4GXITgCm3ZWJeYgM)ApIEE@nsLj|V* delta 23 ecmZ3+wTx?n4GXI{gCm33WJeYgMzP6dEE@nsBn6}Z diff --git a/bin/net/grosinger/nomads/Building.class b/bin/net/grosinger/nomads/Building.class index 4753945ba7e31f1de543a7b51b72ad793b00aecf..e1aee83b2b022eb04ba965f078175e3bb8cdacbe 100644 GIT binary patch delta 170 zcmbOvJV|)NSyo4B1{MYx22KW91|A@`V3239V^CmlWKd>sXHa4AVo+xYV9;O)X3%Dc zWYA%VVbEttVlZLIU@&FKWiVqXVlbb~$JWefJ^4JF=;Y;W>WnTxmJg>N0~doogAhaD zWEFN-#%Qo?J-a$%3YfKrU4u1~ft4X^awCWMBn|`CVj!mk#F^{^Wt1nmJg>d0~doIgAhZ& zWEFN-#wf6CJ-a$%GMKf8U4u1)ft4Y1awCWMBn|`CA|R(2#F^{^Wfst*p g1e1Xj0~3P~Py-W#FoOt?=3-!E5M>Z&kaUm)02Y@HbpQYW delta 110 zcmdnW@`{D))W2Q(7#J9g7-Tkbc`$ObmlmWKC8ne@GAK+|WR&0tg>bDW2QX^0NH8*J zPu{?&G?|BylbM}CYVuk}TSoTDuNe)LSQr_E7=(caF)@gMNl^wdAkD?V$RN%j$sp|@ F2>=PO6*K?< diff --git a/bin/net/grosinger/nomads/DroneListItem.class b/bin/net/grosinger/nomads/DroneListItem.class index 1d346888552204db7b949aae7a660385e68fb87a..4f08f8016938ab666ca296d43ccdf2ca9a3e31a7 100644 GIT binary patch literal 9370 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 literal 10914 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 U@wBT1x|D@JWn);`wZ${{50QIbIRF3v delta 387 zcmW-dNhri&7{-5}{KIT!Mq?~7gp6HT#xly98y5$Mk)#}?9F!Xe7cLHbE|!ZXE)E7~ zgyf)^WKXi>CeCEb+yD0b-uLP0dEanBxFB+Bag`8HDM^&!pd2?9`rb0=3COgL6zWN% zfh-!yC8&F>BlcFDwBezh96EH=8dTl-z~<3DTcPSTRY=r;sTM^Ii)vS6CTH6H#smhF z`pNFq{q{;@T4=_k4WT)qd7(~YS=5R-Z*$ZbYgky<6ONE;lSCrYU`rZolfjODbxh^% zihEBs`($%K5rQY&nB<7M8y>o*BLg>ad9E{U6RTb>0IOEhJ0=*=1zX` zKoyVF%C3=TNr=h4FM8CuV7y6}cj@BQKG#22KWP20jKE24MzS21y3F$#i5QYE% diff --git a/bin/net/grosinger/nomads/NeighborDrone.class b/bin/net/grosinger/nomads/NeighborDrone.class index a76a08f58bd552a694730de56333869c4cfb8ad6..a84a5551a2a860968e6bce83a79c6b07e7c68b2f 100644 GIT binary patch delta 79 zcmeyy{*8S@ER(1N0}F#B11EzN10RDlgD`^(kS9C2h$)3padIHD=;Sv{>Wo@omL{`0 aqcM=aGHF9Sq%Vf5D-lO delta 79 zcmeyy{*8S@ER(1>0}F!$11Ezd10RDFgD`_MkR>y@h$)3pVR9g|=;Sv{>WrFTmL{`0 aqY;p0!)OiWFJ{(Ybzop+aGZRBSq%Vd7!W}K diff --git a/bin/net/grosinger/nomads/Nomads.class b/bin/net/grosinger/nomads/Nomads.class index e0347324d7537415cbb5f093e66bc27084360ff0..c51a5ab4c03d546443123dd0aadf20c759bc6087 100644 GIT binary patch delta 284 zcmWNM&nv@m9L8TO8pC(?oo`J^h-R&1$gj(U8g?N!Kk`|_D zB}oUdb!ypAT$%uzG_XYz+p_P{&mP0tHgYfI2OJ)0=1JLk+IXg&0)x1W w@FMtvU|&thzI95XcvFdYy7-`*5<`5NFZ;qNOZk@aLxf+|D$~cGIS3~H0johg)&Kwi delta 284 zcmWNMO)Erk7{z~6Ohz+z%;nZ73DKC8yk)TPp1~|6EAou!6-=&v51~kVxP+*2N z4t0H`%`y9&ik)%7xsWEy1%{ltt#U&J%D5!V6|G#G)krRWr-$!xc%Ys~Wk1nGk!GIh y3Z^CEjW0gAP3U`7~d4!6`}kmhwZKU)3tn!=K4iC;tJ5yF8Tu diff --git a/bin/net/grosinger/nomads/Police.class b/bin/net/grosinger/nomads/Police.class index 486e19453f96fa952f91d63b597985dafd009799..8b03ba93053e75cefe2b3ecbb4896ba02fbe23ba 100644 GIT binary patch delta 86 zcmeCff$?3=9lL4CWiTDwrm(XVPLZW@ONwC?GmnpGl03oxzlmK?%a+oovAD jz{t6|klBk#l8HedsEvuifWZ(*b1^UijWA&_bC3i8YCI3J delta 132 zcmZ3^-Nz$v>ff$?3=9lL43_K+OpFZDlOHmPPPSuY+o&DR#LZq>kY1FSlFG=SFgcJ( zf+G~dwVvF-q{Cv$$e;~Wtu)z&iIbU~!F=*Prc_3*%`VJdOstFy`V0n>O}0$O7Xq`4Rv8B7?=7%Utl0hFT~r2qf` diff --git a/bin/net/grosinger/nomads/TownHall.class b/bin/net/grosinger/nomads/TownHall.class index f276cbcaef55f021598a5725942d2abcdbef3364..3b69d5ec7b7d06e54ecdbbdf0190764903f1c870 100644 GIT binary patch delta 69 zcmcc2cbRX)0ajKX22KXv$wyf?X$mkfGYB&9FbFXS1ECCq2!j%XD1$bG7=samID;*N XB!e@90D~8U^yCF>J&babb=lPbsb~t% delta 69 zcmcc2cbRX)0ajLS22KW^$wyf?Y4S5LGYBy7FbFaTGYB!r07)eV5e97rQ3fLhF$P-( Y2?l2deg-cFsmTl2dKhIV>$0l>0H>G=!2kdN diff --git a/bin/net/grosinger/nomads/Upgrade$UpgradeType.class b/bin/net/grosinger/nomads/Upgrade$UpgradeType.class index 01c71640c1213ce1dd2373cdc83fed4095e024a8..231cb0b44939a061303798eece010e54607f64c0 100644 GIT binary patch delta 23 ecmbQjGlge^7Aq?|Lj?odWPMf>Mz+Z*tQ!D8It5q& delta 23 ecmbQjGlge^7Aq?oLj?otWPMf>M%KwGtQ!D88wFJW diff --git a/bin/net/grosinger/nomads/Upgrade.class b/bin/net/grosinger/nomads/Upgrade.class index 633199f42d2f21d1b6f026bee712c46d380e66ff..dd0f34164e58e3ccade72b074ca7441b473b4146 100644 GIT binary patch delta 209 zcmWN~Nh^e5007|Ut?A29PMAAc%9f=pjiD@MX)I+qNVXiN9B@%{m?Nbe%uy**uADP zr$<4rBYlqbD;iKT=+uxi!_JMkkaKC&RU%y*cVoh>N%y8aB=VyfPi8%v^J3ns1#ijp u-e}23(tTR-W!1MeKi2)(3c+TGY{!MFlMwdHzv*l^h`Xz6Lr9f#HM{?GWGw^$ delta 209 zcmWN~yDP+T008jMH~QsAS9F?(XSvHc z9&ny#T;LTK>E#mrT;?NJ_`+4bag86QJw&JNgT;&l=SA54;4WPFE#hs9c*k+V54av$ zux^X{h;Sa8;U`X1#ERgT3^(P`ytc@1{527UDjG16LB{abuJVp#-ka^6{ zh8EdS1|DS+u56<(VUBW`r(DvMM~?FGseo11E7MXcwTwerPQ84zY9$x6nhq6nLuor2<3erZowMmiMtZCY!#3|aUOl?!XD&$k8RXepyRobUA z9Z{*8bx<9u_J5DMC2x&+J#1$liL=v z{!uSxbK6*EuKjCkYhy+(nQ2ru^ZfUG&w0*y&iQtycci!CY&c0_^A^WksI`i5xh3$tyS*wS4XT;&U-WYKrkPP=M!`JY_`3u z`EF(UtjGro``*I*<|cp4dVpsPn&FUb{N;yXgZ%SP9=}4~U;;Fjv2qcn5T?q_EQPYr z-Wi7HDBNj^yb~~q(TXBSUMFiphc^zF;)zxQGnB}D&19KoldB}wE18{|=l4#G8+I_o zL`zJRibrXLE5p{8k)-7$E0aZ9L8eyXQxMZL~r!)G7r=HNeighbor */ public NeighborDrone attack(); - - /** - * Asks what the drone would like to upgrade. Will be called whenever the Move - * method returns Upgrade. - * - * @return Upgrade - */ - public Upgrade upgrade(); } diff --git a/src/net/grosinger/nomads/DroneListItem.java b/src/net/grosinger/nomads/DroneListItem.java index 1fe0300..db9ba5b 100644 --- a/src/net/grosinger/nomads/DroneListItem.java +++ b/src/net/grosinger/nomads/DroneListItem.java @@ -376,10 +376,6 @@ public class DroneListItem { } else return false; } - case Upgrade: { - doUpgrade(); - return true; - } case Attack: { doAttack(); return true; @@ -497,69 +493,6 @@ public class DroneListItem { } } - /** - * Finds the upgrade that the drone would like to purchase. Determines if - * upgrade is possible and performs action accordingly - */ - private void doUpgrade() { - Upgrade newUpgrade = current.upgrade(); - Integer price = newUpgrade.getPrice(); - if (price == null) { - // Invalid upgrade selection, turn lost. - return; - } - - if (team.getBalance() >= price) { - switch (newUpgrade.getUpgradeType()) { - case visibleDistance: { - visibleDistance++; - break; - } - case lumaLocatorDistance: { - lumaLocatorDistance++; - break; - } - case objectLocatorDistance: { - objectLocatorDistance++; - break; - } - case reliability: { - reliability++; - break; - } - case attack: { - attack++; - break; - } - case defenses: { - defenses++; - break; - } - case speed: { - speed++; - break; - } - case cargoSpace: { - cargoSpace++; - break; - } - case theft: { - theft++; - break; - } - default: { - // Must specify an Upgrade Type - } - } - - team.deductFromBalance(price); - return; - } else { - // Not enough money, do nothing. - return; - } - } - /** * Move the drone in a specified direction * diff --git a/src/net/grosinger/nomads/DroneTeam.java b/src/net/grosinger/nomads/DroneTeam.java index 730f1a8..c3d5123 100644 --- a/src/net/grosinger/nomads/DroneTeam.java +++ b/src/net/grosinger/nomads/DroneTeam.java @@ -2,6 +2,7 @@ package net.grosinger.nomads; import java.util.ArrayList; + /** * Contains a pointer to the first and the last DroneListItem in a particular * team. When adding drones to Team A they should be added to the end of the diff --git a/src/net/grosinger/nomads/House.java b/src/net/grosinger/nomads/House.java index 9a031b4..1600914 100644 --- a/src/net/grosinger/nomads/House.java +++ b/src/net/grosinger/nomads/House.java @@ -1,5 +1,6 @@ package net.grosinger.nomads; + /** * It is a house, just like it says. Basically a building that can be owned by a * team diff --git a/src/net/grosinger/nomads/NeighborBuilding.java b/src/net/grosinger/nomads/NeighborBuilding.java index f5a14cd..03a81e3 100644 --- a/src/net/grosinger/nomads/NeighborBuilding.java +++ b/src/net/grosinger/nomads/NeighborBuilding.java @@ -1,5 +1,6 @@ package net.grosinger.nomads; + /** * An array of NeigborBuildings will be given to a drone that is searching for * the buildings it is near. This is typically done from the town center. diff --git a/src/net/grosinger/nomads/NeighborDrone.java b/src/net/grosinger/nomads/NeighborDrone.java index eaa9985..aaa16b2 100644 --- a/src/net/grosinger/nomads/NeighborDrone.java +++ b/src/net/grosinger/nomads/NeighborDrone.java @@ -1,5 +1,6 @@ package net.grosinger.nomads; + /** * An array of NeighborDrones will be given to a drone that is using it's radar */ diff --git a/src/net/grosinger/nomads/Nomads.java b/src/net/grosinger/nomads/Nomads.java index aa32786..380cb2d 100644 --- a/src/net/grosinger/nomads/Nomads.java +++ b/src/net/grosinger/nomads/Nomads.java @@ -3,6 +3,7 @@ package net.grosinger.nomads; import java.io.IOException; import java.util.ArrayList; + public class Nomads { public static World awesomeWorld; diff --git a/src/net/grosinger/nomads/Police.java b/src/net/grosinger/nomads/Police.java index 31b4a97..7985bb5 100644 --- a/src/net/grosinger/nomads/Police.java +++ b/src/net/grosinger/nomads/Police.java @@ -78,13 +78,4 @@ public class Police implements Drone { // TODO - Implement Police Attack return null; } - - @Override - public Upgrade upgrade() { - // Police drones do not have upgrades. They will automatically upgrade - // throughout the game based on time played. - // TODO - Implement Police Upgrade - return null; - } - } diff --git a/src/net/grosinger/nomads/TownHall.java b/src/net/grosinger/nomads/TownHall.java index fff8340..237b16a 100644 --- a/src/net/grosinger/nomads/TownHall.java +++ b/src/net/grosinger/nomads/TownHall.java @@ -2,6 +2,7 @@ package net.grosinger.nomads; import java.util.ArrayList; + /** * A representation of a TownHall. Allows Drones to interact with this building. */ diff --git a/src/net/grosinger/nomads/Upgrade.java b/src/net/grosinger/nomads/Upgrade.java index c663b89..ded9b2c 100644 --- a/src/net/grosinger/nomads/Upgrade.java +++ b/src/net/grosinger/nomads/Upgrade.java @@ -1,5 +1,6 @@ package net.grosinger.nomads; + public class Upgrade { public enum UpgradeType { diff --git a/src/net/grosinger/nomads/World.java b/src/net/grosinger/nomads/World.java index 92db099..5981fbf 100644 --- a/src/net/grosinger/nomads/World.java +++ b/src/net/grosinger/nomads/World.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; + /** * Main class where information about the world is stored *