From b53eec8a61b9d22c7a6a8698a187d9073c81cb7f Mon Sep 17 00:00:00 2001 From: Tony Grosinger Date: Mon, 25 Apr 2011 22:27:19 -0700 Subject: [PATCH] -Added to building class -Buildings now generated and placed on map -Maps only generated on interval -Fixed grid lines (I think) Signed-off-by: Tony Grosinger --- .../grosinger/nomads/Building$Structure.class | Bin 1270 -> 1270 bytes bin/net/grosinger/nomads/Building.class | Bin 1566 -> 2096 bytes bin/net/grosinger/nomads/DroneListItem.class | Bin 5764 -> 5662 bytes bin/net/grosinger/nomads/InitializeGame.class | Bin 4563 -> 5223 bytes bin/net/grosinger/nomads/Nomads.class | Bin 3782 -> 3872 bytes bin/net/grosinger/nomads/World.class | Bin 6205 -> 6711 bytes src/net/grosinger/nomads/Building.java | 58 +++++++++++++++++- src/net/grosinger/nomads/DroneListItem.java | 10 --- src/net/grosinger/nomads/InitializeGame.java | 12 ++++ src/net/grosinger/nomads/Nomads.java | 15 ++++- src/net/grosinger/nomads/World.java | 34 +++++++++- 11 files changed, 112 insertions(+), 17 deletions(-) diff --git a/bin/net/grosinger/nomads/Building$Structure.class b/bin/net/grosinger/nomads/Building$Structure.class index e252234141a0218cb16345729f96915546a03eaf..7065ade3daac60f52a59ee34ed015278e3626d63 100644 GIT binary patch delta 23 ecmeyy`Hgb}4-2a#g9(GgWI+}aMv2L8EE@nzuLY|B delta 23 ecmeyy`Hgb}4-2a}g9(G!WI+}aMzP6mEE@nzaRsFS diff --git a/bin/net/grosinger/nomads/Building.class b/bin/net/grosinger/nomads/Building.class index ab296d47119efae716c8153d080998b7b4f3048b..5c3d0fb46763e7f2467ddcaba5ae4ac1bf26dfc2 100644 GIT binary patch literal 2096 zcma)6ZBr9h7(Ew4HVI2fqtGHRYKfXGNLsD66{Un2$VyCTUI>)V=n{5db;&ZDMC&hd zrqd5pOY3wxe(Z<-p?<49cb7m5vBNNT@4e4`Ue5EJ6aM`Bx3>Up;5!990^<#{mD+Zl zrq$Rs-BiQbHMW|mg|=mH(V`$A5Pf1iGg7wE*iIEUpP2QQf}p^~u7OL&uIW1ogqtn5 zU2nBrQy`h|>fWgnFLzvL1p*Bw5s2lF>++ds_$I#R(z#v;+=`cLdL@&4R7o%7vvC%P zA2ky98;PGTAkeeH1i`yj!)nb5%p}eXP1lpFgqLx)%m{jMUPTl`0=Q;{w;tI0F?IaY;aNTykL8UIjgbPXt00=XoP%*tV<}R}n@e zgsTFPlDTJCZh6Pq3n3xUU)|ewjV;qRXaWN(j&0S=a?5C0PD4gdtLTR+Pcte8pb8A; zt%g}>?{1oI#n`kx3Y@xOuNtl;?}x@fYsYGm|NkEwxl*NLhX6^d`Fzda)(MDE>Q5gU zdxu$-ZL?MIct4*=c4J;TR9@^6)f64hI7z7{#>ukWSXOCv$_yn=SCRB8gy{nb&{sw# zeA;pP2Vm+*KrjLGI`l)yLEHXl4K8bsG5;cq)%@&OgCd2&8F-veDo8=Wlo`&tB-$> zn&%f%i{4IEc{?=)L?d!o-Yfr+;6p~mc>4=I2ylO_{fcwi)B%Ry;A8D)4F7`BnIF7x zq`3($>34}M$#sKkR*PLez~oDeYOyQcA*RKyd55qTOY)$N9bifuKfv{$=--PJzjufO zoK*nhL^?ri6Zo8Y@35PDh$Dk5SVRJO)+u5dReXkTS?>{U;!{RyK3-ZS1|p|D);tQUK(D#lH0R=+Am|!EJP^gaqxA7&vatJBzvcWz!KDp0BkB2nq8E<=4 zRo~&Ts=!yodpdadWbk~~;90hNI(X{G6P5L@!FRg`Uq2aK>Kc3xbBC4Z*rXg)P?A0= z>G7M6c-9&PwdQ3Q_PvhA9mLm^mz>u;h2eK`oNJVPpUh=2*XDb2Ny22Vh3>gL+58*V zQ|7YYlS@)Aq9OSY{}9(}NZ~pm4duUp;f7;d5X8nno{Pzc%mLwIcF)wNrZC> iYVUAPYOy9iRV@Ga!*Q?CwFm1|J-ktmv5AfOk$(U%dWG@; literal 1566 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 K2>i8b+W!CmNwSCl diff --git a/bin/net/grosinger/nomads/InitializeGame.class b/bin/net/grosinger/nomads/InitializeGame.class index 505f2b7306538742883579f30507cf779a959c25..dec170ba76740ceb5f532a9245cedb4bbc993470 100644 GIT binary patch delta 885 zcmZvaOH5Ny5QhILEq$HBg@RZFs^!&!idKArLWPD_Yg=37VWP2?8*IF`wU0oI3C0** zxYGJejE_XOCP0FTCa#SO7rN7xD;I2ZZ6wZV0~^gv&Yge$IWym#+%N4v+?J1PZ{Gv( zl4sEp7u7~0LhBu+(SEd;(q>ZWSu<6U!AN>SH>bPS(;e|bu9z$obE=?fG7?PVk;!nt z7YY$PA+B`&TRC7MkXgV$9PD(W>E^QJJq5q{zH2 z8VLnQ{PA($crX%{PQ4(zbSyD{)EA7&3npqTofA&0g__7=q|Jn82{)O^X)}VFX$wKg zYKf#8R_E4P2(B_*&3actBdf-4WTG0m=cA*Qq;l*AAupb%@;u;2V8;5ZhL%5G&ynqj{F^Ufe;xmrnD~{tk zLRdu@KM}=moWvi*NQWU3=%YqVQ!7rx%KyU+*dVALi_1!FCz;Q}j06LmFC9_lJ1@e5 zG^;G*Tt*vmjFV@$IR=}@9$aCltEF$syx}Ip-zrVjITu!8;0L(0gogUH6|}q~OfQj6 zX;a*9$P}tbE6YKaCn~Z=@s{0iMb@#D?jb!lu~P$g>FHgeO+DM?u|pmXJ)dQ_h22FS zsAE`Q!OJTI?lI2;G~ppH?-5fzh96IO9ZwO*Gfd$*&hXljc*zTWRbE7Yg__#P$@iNu tL0f4Xi0_Y)iz6L(IY8|kRdFvjb#SDIjymON>Y{FbTRA$twDjV%oP)uot|=ucNd*ZhiNz&S#K0h7Z6Yp1rLojdldUIBn8ZII zIhq&@Hi;P7m`nzXRnd4!Sibj{@BO~#_q@a&x`TI>t7{-3emA&mdi)|zCe*Ie#Au?A2ywa?(Az;03^Btnn~ZY67)Oj#AW4x4&Y0w! zDQ=nOUSB;j%QJJlGS3?+K3L$3MKMT8S u1r2uPl2)Dd!e1~nxVkp96l}bD78F%f*fGtV{NoiNUa8W(NcGPT5#Kk8H$Pqg diff --git a/bin/net/grosinger/nomads/Nomads.class b/bin/net/grosinger/nomads/Nomads.class index 0395beee6f992d2bf92fbc908c96326c62a7cd64..a1b3a255a72685409599e9a3964f3bd2ab766f91 100644 GIT binary patch delta 1954 zcmY*a>sM4&6#t#MckaD2+yDuc0fdp4JS0ey=ctjOjsl`0J}PU38;lM!Fmq85b=1tP zOw-d-%dm%2TE?RWlzjA3S6}*4t1tDjwfYzQP_)k-tkuj~_ng_!-~R2r@7!51lH>gG z@9Q@KEWy1oXB+EwwluV@X=>fn(B8zryb`Hw44S7i;1BxE6%0~wNe6?xD%54D$YywW zw{NenV!-qVDjLFJ-%ztZVmgt9938oEF(@9((E)~qI#g)lmd~%SN|wWaW8RgE@ra6Y zhEyw1z!&VU*gO<5jb0rUsHB9U0h3{Fv!(WjD%!&Spt;!$8@}Fp4NG{Jtx$OkRVtS8 z)3yw$8a4c~t$@|>en&>`)=)Um`$}(d=4#0{j-fPR>@g>eztp3~G-r(rOG6r_{tZbx-Ik7ImT zDa}02p!fO%0e{5k3X-N}Wr;S7S9F}jtNgxFpw;5Ej@NL87pm@>H}IB< zH~-h>_8w|tmyWmb4ud@sFpNH$tm1Vg9ZsAVG`~x=oz-$A4Hx(Y)s;V@?aPPA$-TQnIDl3euI=&!)yR}X& zj0qiI;w%1(R;5hhnu;kt$FWGdj%i-+s8nv?mWrD+NV(E&a^a5C%*peeN1`sw#XK6Q zWU(HYFUA@faFHaFB-JDnpOk52ZJ)$~3Ap767r^1wib;lXSZ1*Hd_!;4idp zJLy(U(VxMybn}r#5~OV^8rP`sMr9(8mMT#!Gl>qBEY1qly9l*ZFL`1xk1=)(Yzkcs z<8a5(Q)iDM-DSUq0K;vB>tvT4hbaX67|zZ7NtV?z#hAwM_OyeOh|ZJUMjS`dUWntx zI9{g6S@sd=<574r<2WUG(s6bQugBo5Q(Q_M=f;tDZsw$b@t#HG`=bQ0kCt(W20B4m z2Qdh&Cd$@Q_r1`u9w}%h`dUb{fr!|MN^HV1I#*%~5ws1vh@x(yCrAYK5gE}T5)Gph zhspUk_TUr(7N;wS2`5hA1DZ}y=;Qd%no}3Ke}s>zk(KlYyhNPJ6xf3p$z+OTr{JHE zui&{D%3nxfYzFDDGbR(Yy+G;=>LAlkYTDYUiu3o$+#z0Ei6+2Lff%`$l-@XQHGHfXsa74vxU^Z`_ zl~w#pjZ%=repyR`K`V&Z0tZGhHfw*8Y(%=6#7wlrP_+2LM2KY=Z!M1_ehptUlv>YA zu$PaLi8Uj?T3LD$xHE|Y-~jP-klJ>LCOt~?et@>(h?UxHt$7W;!M9|WPB!0J)9j-A c_xORdg6}!7%}~=M6*m%8i;C`$!iKy50MizIdH?_b delta 1877 zcmYLJSyxk66#h|5keEZw`oQq3-%=7&G z-_>gXR^o>V&rTr+ME1HIfdxH*p+MDOEZA377l{OpHV30I53;eyz+z+xI5z}C!PrJO z1eO@k;Zl-M-ViHN775s6-NC3po)qpZ>9v(P%TTVvFY9cX+HzFL4x3L@$z!&Xg1fLv z$I9FJg5j#2kzgpcI~Fkm{RUQJjl6Cvw$}*co=?w|H#JAD2h~`lveg=J!0EvTY}9eL zKoKn}n}{kH=nEb*8w35OflUf*y26^&)&RsxYXEs% z%vei!$c(0-2ZIKNa6~}w4n$kc;h2?XpN^vf3+1SDVTlWm3Zz)}zF0Wi>+@h3kE@Qa zQBvH%37nMYo&MY>1dM(QtJxV29VDT{cv2mok-s`ux`y$zfoJfnOw)^9)p*{(S-c?E z>ptg8cv**(0X;MK6}&3oi1wN004Jt&d)XcjE-2DpmoMr?HE*!gJKS}#h0$*Fpofir z%fQ=;dpC<~4~9Z!L`~daBqSi3|Dj zxH?^7j2oE1r2NZO?fe1>9bd`{_cCo7GqT;i!g&>6>6n#g-TB(rbh+$4C){$A=VY7% zk4$6{%tGFs8rZl3X|u@gm`3gt^6XQ{pP9s$uvC@erkl zX^{eLua3G#9SwGJ$Lq!e)+!nhcalWlltR6qs5MsDbsAy@fz6Z1OTetPkHMQ`zk;B^ zb%a|h5;&}WIrJlQf6{IXeP=P;;XO8u#|rYz1de-8C2%@{rx=g~5`XY+<+SSyBViu?-n~LHyW( zO73gX%4cgA3D`~VJ@jrzFKHQ|{SYuypzD&Z>F7tlB$u1y=<8 z)_Mt!igB7)-TqCC(>IAT*P5Hdq%y(@jB-|EsA$1qj_Ht<+DAhs!Zm!uJ%dKqt%1y; dd;{O|RFOL$wmCLN({VM)Y$1_;#{(O_{~w>+cp3lz diff --git a/bin/net/grosinger/nomads/World.class b/bin/net/grosinger/nomads/World.class index 74072dd47ebd624187fa28ec0fbfaa7176553c46..7bcc59e2556dcbfd841a491e58044c41d5e865bc 100644 GIT binary patch delta 3008 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 + */ + public Structure getType() { + return structure; + } + + /** + * Retrieve x index + * + * return int + */ + public int getX() { + return x; + } + + /** + * Retrieve y index + * + * @return int + */ + public int getY() { + return y; + } + @Override public void setName(String newName) { name = newName; } + /** + * Sets a new x value for the building (As if buildings could move) + * + * @param newX + * - int, new x location + */ + public void setX(int newX) { + x = newX; + } + + /** + * Sets a new y value for the building (As if buildings could move) + * + * @param newY + * - int, new y location + */ + public void setY(int newY) { + y = newY; + } + /* * Information about how to use the switch command with enums * http://download.oracle.com/javase/tutorial/java/javaOO/enum.html diff --git a/src/net/grosinger/nomads/DroneListItem.java b/src/net/grosinger/nomads/DroneListItem.java index ab689f1..11090e7 100644 --- a/src/net/grosinger/nomads/DroneListItem.java +++ b/src/net/grosinger/nomads/DroneListItem.java @@ -38,7 +38,6 @@ public class DroneListItem { private int reliability; private int defenses; private int speed; // Reflected in movements per turn - private int turning; private int cargoSpace; private int theft; @@ -149,15 +148,6 @@ public class DroneListItem { return speed; } - /** - * Retrieve the turning factor of this drone - * - * @return int - */ - public int getTurning() { - return turning; - } - /** * Retrieve the total space in the cargo hold of this drone. Does include * diff --git a/src/net/grosinger/nomads/InitializeGame.java b/src/net/grosinger/nomads/InitializeGame.java index 3bad486..8ada0eb 100644 --- a/src/net/grosinger/nomads/InitializeGame.java +++ b/src/net/grosinger/nomads/InitializeGame.java @@ -10,6 +10,8 @@ import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; +import net.grosinger.nomads.Building.Structure; + /** * Various methods used when first setting up the game and loading everything * into the world. @@ -145,9 +147,19 @@ public class InitializeGame { if (Nomads.DEBUGSTATUS) System.out.println("Generating and placing required buildings..."); + Building townHall = new Building(Structure.TOWNHALL, 30, 40); + Building upgradeShop = new Building(Structure.UPGRADESHOP, 30, 60); + Building policeStation = new Building(Structure.POLICESTATION, 50, 40); + Building RepairShop = new Building(Structure.REPAIRSHOP, 50, 60); + if (Nomads.DEBUGSTATUS) System.out.println("Building generation complete"); + awesomeWorld.placeNewBuilding(townHall); + awesomeWorld.placeNewBuilding(upgradeShop); + awesomeWorld.placeNewBuilding(policeStation); + awesomeWorld.placeNewBuilding(RepairShop); + if (Nomads.DEBUGSTATUS) System.out.println("Building placement complete"); } diff --git a/src/net/grosinger/nomads/Nomads.java b/src/net/grosinger/nomads/Nomads.java index 7aa3a30..6b63c56 100644 --- a/src/net/grosinger/nomads/Nomads.java +++ b/src/net/grosinger/nomads/Nomads.java @@ -17,6 +17,12 @@ public class Nomads { public static final boolean DEBUGCREATIONS = true; public static final boolean DEBUGBUILDINGS = true; + /** + * How frequently should a new map be generated? (In turns, 1 means every + * turn) + */ + public static final int MAPGENRATE = 2; + public static void main(String[] args) { if (DEBUGSTATUS) System.out.println("Game initialization beginning..."); @@ -64,9 +70,10 @@ public class Nomads { System.out.println("Game loop starting..."); int turn = 0; + int counter = 0; while (running) { - + counter++; turn++; long startTime = System.currentTimeMillis(); @@ -80,7 +87,11 @@ public class Nomads { if (DEBUGSTATUS) System.out.println("Moves took " + (endTime - startTime) + "milliseconds"); - awesomeWorld.generateMap(turn); + // Create a new map + if (counter == MAPGENRATE) { + awesomeWorld.generateMap(turn); + counter = 0; + } try { Thread.sleep(200); diff --git a/src/net/grosinger/nomads/World.java b/src/net/grosinger/nomads/World.java index e97fd7b..db26d70 100644 --- a/src/net/grosinger/nomads/World.java +++ b/src/net/grosinger/nomads/World.java @@ -143,6 +143,19 @@ public class World { setObjectAt(lastUsedX, 20, newDrone.getCurrent()); } + /** + * Places a building in the world + * + * @param newBuilding + * The building to be placed + */ + public void placeNewBuilding(Building newBuilding) { + int x = newBuilding.getX(); + int y = newBuilding.getY(); + + theWorld[x][y] = newBuilding; + } + /** * Returns if the Drone at given coordinates is in a safe zone * @@ -181,6 +194,22 @@ public class World { return false; } + /** + * Searches for any buildings within range spaces of x,y + * + * @param x + * - X Index + * @param y + * - Y Index + * @param range + * - range to search + * @return Arraylist(building) + */ + public ArrayList buildingsInRange(int x, int y, int range) { + // TODO - implement buildingsInRange + return null; + } + /** * Outputs an HTML file showing the world */ @@ -209,7 +238,7 @@ public class World { // draw grid lines g2d.setColor(Color.black); - for (int i = 10; i <= 1000; i += 100) { + for (int i = 0; i <= 1000; i += 100) { g2d.drawLine(i, 0, i, 1000); g2d.drawLine(0, i, 1000, i); } @@ -224,7 +253,8 @@ public class World { g2d.setColor(color); g2d.fillOval(j * 10, i * 10, 10, 10); } else if (objectHere instanceof Building) { - // TODO - output for buildings + g2d.setColor(Color.black); + g2d.fillRect(j * 10, i * 10, 10, 10); } } }