From 2de93e31e6a55f7289a49d5639ed15e5f0abc2b2 Mon Sep 17 00:00:00 2001 From: Tony Grosinger Date: Mon, 29 Aug 2011 15:53:53 -0700 Subject: [PATCH] -Continued work on Upgrade Class Signed-off-by: Tony Grosinger --- bin/net/grosinger/nomads/DroneListItem.class | Bin 9373 -> 9588 bytes bin/net/grosinger/nomads/Nomads.class | Bin 4731 -> 5057 bytes bin/net/grosinger/nomads/Police.class | Bin 285 -> 1545 bytes bin/net/grosinger/nomads/Upgrade.class | Bin 536 -> 1510 bytes src/net/grosinger/nomads/DroneListItem.java | 12 +++- src/net/grosinger/nomads/Nomads.java | 10 +++ src/net/grosinger/nomads/Police.java | 68 ++++++++++++++++++- src/net/grosinger/nomads/Upgrade.java | 49 +++++++++++-- 8 files changed, 131 insertions(+), 8 deletions(-) diff --git a/bin/net/grosinger/nomads/DroneListItem.class b/bin/net/grosinger/nomads/DroneListItem.class index f189d1e1a6919c782e607cd04be09c8fd6627bbe..1af12f32c1a3756a8af46e3123561c684b22960f 100644 GIT binary patch literal 9588 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

gmJrc;|_`9PKn_ziQ^vW!@aC!?`QS;pj?TE zz?lrC>>Y?VoYQ!VbYrTsRgJ@@vvYgRLrXDKeqi+O!TYQayDf}N=R-a}>^_R@JbPL1jYYme@$EY){#%!3_2VL?T8B4JFeB(`zfoyf zIq(JrF328~anH$wL7CW=98Yd5$hrp;1A}tjUC4Eizy8I^AsyeU3VJzC9Y0AO4^qcZ zQOBpKNf=@TTZPd?Fw5F6v{+miMJVK9FhhOUq{V z*g8zwj1(qqhF4CG&4?#uGoPkx<`c(eYVlKOq-XOqHu{@t`c|r;iQ^{9NS_@@oqGHx%}7ajyIhv*h=fEp}F)Zj()Jp1+AKlnc3N z9wy5ozBP+&)&ienmXG&F>IA_HYnv_koDSe4TfgGswMWQlv(5*6f!yj zC-d>gofWP1rVPr4;v>inBv)^m;*7}ApllwJ?ae%=LgQ&#%fNWeg9(}s6SXW9YS}2_ zvr@}JrKY1w%R{x6k2>uftk))Dqc#bRS}|I+DcH%@(57LJHXR9V2CmZ1$4%Ny+@_V_ zZfzDG)aKxrR*G+H0X(BEz_Z#SyrM0|YuYmWOuGmlXv^`5w!$*x^|me?T~aI3j1!dk zM7+&xqjXt_H>H)m3>eHLTbO@5%=I&+jTtBt4^rpb+4EXDp8J^hl$!goM1_vIwyuUkhqBcT3Q8kQ1`cO9xow1Ib1hui zapa3rG@na{1U_3`S79BVr%yPtX5zcFxJ_ORB-_idt! zwQ&^UC^ZOk;7NXoa*&xE#5nLK2fZBRXC+4m)F}1sN{*aQ+nF3_NLAmeN+73sJ_Jg aYjUG}nXSs`PcXaRw5Eu^E{fc|rs$9N%}xsd literal 9373 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 Za4JDC?| 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 W&N|yt)7jTtX9INepFB{9fBhf43DST7 delta 2401 zcmZ{ldvsLQ6~@0a_s-mzn`;OW3W;f)KoT=~Ob}@T1P~<%0Rkui#kSTl+>$GknK&~% z5-sBcEsu)AQ4xF~h>l9DA<;!T0xfwiqx#rkS}+qzu(pUbYM-?R=bj09Apt$r;UooqC{MS3AZKZz z(nd@%Fj=6$4I7QbR@N`+PNwWm3scb~H)}yLUGCQ^%Fe`D24)`L--*{RPB^jDl2pQu z(D!W2lAmei`fPz>MJ&U*F}4{YwfS5NUieJR!vX{I1;#6fa0@A&NYv@E=R`Vf3#|&i zK(Xhn&53x-PMTPRa}6w(H|iDB&r>cVx^nwQ+E=wDBJH+`Hs!JOYh*2pX0L0vyHZX( zrglBw!Ub3^Ki8*-AIn;Aqxn+{dALYmT$P+)mB_ceUd@k-8?CR33_%89KEhr=qTE(<3i-$Wx47LrKGhkPaeO02Q47VG4TzDi#Yt}t-9 z9P*9Peu4F}$O!6J3Y0SU(upS0xZ1)sDj)w!JJlLrV<+>_gKI5ZhhGX99g*ZhdtFLE zs|sCcV3WMwC>g&+AkTFTrsDBcK@%Hsy{h^wHM_yWjo2oS8r8*8!0L3OQ737)$73rf z;zr!8KHnk>{1g2fajS)$*d^!r%l*x`-NGHXQ?Bs`C-22R19yL;8QMBn;1w3`!My_B zWYo61*hN+ILd#6tr-Z*>CABzEN(uMNPyI!{-&lAM7s>oUyU5B!pl0qMi`Ld*2iH2W zn4Ji&jUldY?Rlp5GG37<;MjS@v@&Q!!qekyX-2s|BsOOjujbi{NfBEoXg8Kzr&a*olq@GVfySI7( zr+>B7=NfZMtegWTrg4TFZxVh)lR|idJ1L0fJ~R|g%VNf1G!x~Ve#{v}O9llCYO+|E zfnPnB^eO8y<$57q2l0~yYW_3MYX%WHz(|D{jj=q0>KWuw)7(57*!{pHF#kq=nnsuD zD8dZ7oQX2bB+6{maM>AHOphhBwqX{Qx(Qc9SAekbb3Tjswh|r0FLP%OXN?ShDOPb7 zrAHpL3k)opW1vl^c09VdTtyUVA4LRqDC$m9YyF68O&P4+0MUoIelgz%aoNm1Fx%Br z^$ZG&^n>UYcmnB#by-}cUN;Er8v2-iXEV-WY+PQrc>upEJJrr&YvJ}RZpvZ@gBN@6 zLOvB^;4E&_nnq!FdJuauFsFKpyjf)WP`7JnlVW+mRrA-q1YM2Gv7SdIC)_g12qwV$ z1{NZ0f_99=3XGx}CDb7Z2Mx@9Dxb~h#9VaoOOlop$JP9GGg=R>WYlZXp2im5A`%;1 zVJGpP&BrD@#1RZ-qZbE=&_H4PD5u77)6q|x#sFS!_b^8#aRq$;!ALQrsv&g#YxJ;J zhe)9boyD4K;Jz=YbUIq}J-L!`MjRDDFr(opyalg^;zxP}ANusVx_C-hUjoKvBY zYk{pCZ@>s_Llw5W3FP`Z()4JKRHOE))_ zm&8}86uXCGfXy|?!X88zhe$hsDR}e*HPD22@GhxGu>lpUpzj#GhxeJ2>Wz``3^5JO zz_A>11(83%hYDHMfA=tR!wKf{|I7Ss+GF3LJwlGBN$`xTVGWM(mO1)0+6H`tk6qd^ Xqz&hA3%?il%^Yr!p#S0u5B~i>&Xonk diff --git a/bin/net/grosinger/nomads/Police.class b/bin/net/grosinger/nomads/Police.class index cae0ff2af6c071dc5b2ac592fbd78e729cc7bbe0..ea42e199703e1bfb7e298fee182e3be708ad6bcd 100644 GIT binary patch literal 1545 zcmb7CTTc@~7(LV5LfHx;piof@C~ZMj>J5Vux!E+S)dc8+Z_{>C7PqrzcZz>Y6OD-v z{s4cJ@tbK8Q?@}LcE6e3bG~!F%gP-Z+*{g z3JVE_i4%Ux9goYl^QLhkn#w|oVJ?!k7x+>z*n9gsN9A&*R^F~w8Q439%&sp(#igoq zuPfqYfH5Q_?+|>ldMQS8g!ZGUdt-$+g(ewG>%YZm_7;$fEAz zUQ|)bgGScLNNI?X0u4uxqKK7#u2plVVX{FN8-KZo{h7-u?qAA$5y@Qp2j)&B)4_vF ZHOmpq7}m|Yl<<(EUdcyzf{mB6zX1)f5}^P9 delta 163 zcmeC=najj=>ff$?3=9lL3<49m%oP|J*laTMGE3|j8JIOR!x$M@obyvsxfqxkIC&UY z8Q3O%56IyP&Mz%WPIb%7No8c<4#>~ROitCyN-RrcP-FmV0~*Evq!~fVfh0SSrw`^c qFtBQEXW-Zf6kuZD0+JwU2A~3NAjtz}vjS;eAdiuO4@fdG@B;u$Y8Np8 diff --git a/bin/net/grosinger/nomads/Upgrade.class b/bin/net/grosinger/nomads/Upgrade.class index 76bcea6925258777ac82939c69ab2dd7a323d8c0..ad70fe064514fcc250eafa09b53a7bbcf5023b27 100644 GIT binary patch literal 1510 zcma)5Sx*yD6#gz0rY#q#peTxa)l!7ID^eFg3Y7}RR*2C=FYUDq4l~WnlxXzT#5aG2 ziSfY|jWIs@;Ez(znJy5c#7yR%`<;EeKYo7s2H+%S4YUaK+uBc+UB@%+vUXFpv!Y5~ z>Q<%fs**Mk5{NCURh6=oT~5s{F6*K%(CI&}=z>$%5=iDY^AfM?7075*;A}j~19V2eO& zVqiW3s!yT~?E+mn)7G=ql|}6q)S^WJyK_!aS@X&@8P}O1f64R&_HG)T$_#Oj1j1$Q z-*C+$T`6ETN&)*M4D2F}#K0Y5^kc7qJpzgU?V-dz><};!Zm{zW4#agjATTy4?VOw05iv**haSD4@CRkSWKXIx?;;P^}W zfzO;ti41ePR!z^Oi8mq}m=@Tz-rQLyUo9?WOl_4WUDt7`eNi}sZ71)7zFzF8`+P(?f@EW#u`~GrU2E7q{EF}i z`k5c8-x>e&7i-x6niN{WsYHXYy-4F!kcO-UsHbr_&=cucn4dr`3o#N@3cPrSBe%aJ z^k(5R65qZ?XOi!5j8Y2Ey+mk%K#D-DiB2+VZ^+INYHNV=1e%gj0!Bk}iH(|Qj8UW^ zyGkfj1GnGf$Qvp@hCbShDeS>fdKyz0#2K6?I)ZUb63t)^H;LwP7x#$X$1+xk+IWN~ zM4#dro)fM0hTG45;_>isxEpEoOdH7lq6P_~d`uzNJZAW|e*7UIFV_NJGsqF;Rq3by H`jx)lT;UBTRbZ8Wtk4U~lIVjv?MeDzB=( zs+ac(&aLS6y*~gfF*Q(v!d0rM7rXkoiGvUZp+MVm??cdci5%TQm!82yU}?4Pq_aw( z(1yntVHtGTebSb9#o3+RsQDGW3rS(%-a1`H+{gbvVk9Iwkus;r8(); @@ -486,6 +493,7 @@ public class DroneListItem { private void doUpgrade() { Upgrade newUpgrade = current.upgrade(); int price = newUpgrade.getPrice(); + //TODO - Hand price of upgrade being null if (team.getBalance() >= price) { // TODO - Implement purchasing upgrades diff --git a/src/net/grosinger/nomads/Nomads.java b/src/net/grosinger/nomads/Nomads.java index 8359eeb..aa32786 100644 --- a/src/net/grosinger/nomads/Nomads.java +++ b/src/net/grosinger/nomads/Nomads.java @@ -46,6 +46,16 @@ public class Nomads { public static final int MAXOBJECTIVEBOUNTY = 30; public static final int MINOBJECTIVEBOUNTY = 10; + + public static final int BASE_VISIBLEDISTANCE = 15; + public static final int BASE_LUMALOCATORDISTANCE = 10; + public static final int BASE_OBJECTLOCATORDISTANCE = 10; + public static final int BASE_RELIABILITY = 1; + public static final int BASE_ATTACK = 1; + public static final int BASE_DEFENSES = 1; + public static final int BASE_SPEED = 1; + public static final int BASE_CARGOSPACE = 3; + public static final int BASE_THEFT = 1; public static void main(String[] args) { if (DEBUGSTATUS) diff --git a/src/net/grosinger/nomads/Police.java b/src/net/grosinger/nomads/Police.java index 9394eff..b72ed73 100644 --- a/src/net/grosinger/nomads/Police.java +++ b/src/net/grosinger/nomads/Police.java @@ -1,9 +1,73 @@ package net.grosinger.nomads; +import net.grosinger.nomads.DroneListItem.EnumMove; + /** * Enforcer of the law. Has the ability to arrest drones that are wanted. + * Police have a move speed of 2 squares/turn and get faster each time they catch a criminal. + * Captured money and objects are turned into money which funds the police department. + * + * Police have a visible distance of 2X BASE_VISIBLEDISTANCE * */ -public class Police { - //TODO - Implement Police +public class Police implements Drone{ + // TODO - Implement Police + + private static final boolean DEBUGGINGALL = true; + + //Do not change these + private String name; + private String UID; + + // Define any variables that you need + private DroneTools tools; + + // Leave these methods alone, they are required // + + @Override + public String getName() { + return name; + } + + @Override + 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; + } + + // Edit from here down // + + @Override + public EnumMove move() { + return null; + } + + @Override + public Neighbor steal() { + return null; + } + + @Override + public Neighbor attack() { + return null; + } + + @Override + public Upgrade upgrade() { + return null; + } } diff --git a/src/net/grosinger/nomads/Upgrade.java b/src/net/grosinger/nomads/Upgrade.java index 4ab4199..28ea0cc 100644 --- a/src/net/grosinger/nomads/Upgrade.java +++ b/src/net/grosinger/nomads/Upgrade.java @@ -1,14 +1,55 @@ package net.grosinger.nomads; public class Upgrade { - + public enum UpgradeType { visibleDistance, lumaLocatorDistance, objectLocatorDistance, reliability, attack, defenses, speed, cargoSpace, theft } - + private UpgradeType typeToUpgrade; - - public Upgrade(UpgradeType type){ + + public Upgrade(UpgradeType type) { typeToUpgrade = type; } + + /** + * Provides the prices for a given update type + * Algorithm: (((Current Level - Original Level) + 5) * Multiplier)^2 + * + * @return int + */ + public int getPrice() { + switch (typeToUpgrade) { + case visibleDistance: { + + } + case lumaLocatorDistance: { + + } + case objectLocatorDistance: { + + } + case reliability: { + + } + case attack: { + + } + case defenses: { + + } + case speed: { + + } + case cargoSpace: { + + } + case theft: { + + } + default: { + return (Integer) null; + } + } + } }