From aab755aaefec9230a6ee9f77a6079f199ff7d740 Mon Sep 17 00:00:00 2001 From: Tony Grosinger Date: Fri, 16 Sep 2011 16:03:37 -0700 Subject: [PATCH] -Fixed initialization -Added mapping for MoneyPiles and Objectives Signed-off-by: Tony Grosinger --- bin/net/grosinger/nomads/InitializeGame.class | Bin 5576 -> 5566 bytes bin/net/grosinger/nomads/Nomads.class | Bin 5165 -> 5313 bytes bin/net/grosinger/nomads/World.class | Bin 9243 -> 9355 bytes src/net/grosinger/nomads/InitializeGame.java | 21 ++++++++---------- src/net/grosinger/nomads/Nomads.java | 8 ++++++- src/net/grosinger/nomads/World.java | 15 ++++++++----- 6 files changed, 25 insertions(+), 19 deletions(-) diff --git a/bin/net/grosinger/nomads/InitializeGame.class b/bin/net/grosinger/nomads/InitializeGame.class index 4c2177c0fea74a96f1d21538b690457b2d728ccb..cbd8dd39c54b2f1beb00484d54e79a50383fa21c 100644 GIT binary patch delta 469 zcmXAmOGwmV6vcmchVe0tGuliKog8DtL1#?oK~!Qk1xgPUbrXgNwQ*sD)?$VVjEGva z%6~6GvjN40iphvUfo)oZ;;v0=ml8pnHkO@e@!j*?^F7Wv+%JiZMCIn64;w(*(xteJ zdM6b)^z5B~HM8k2^V$)M`z%om1d^_aC}lL_qlqfwRFj~VR-z<{ks{4WE^>;SoZ+@s zjyCQIA8?kZbTCPl7o4ZS1wPTqHeGxbe&Z55TxORm{G^*bdd=uFAN}TMz=C8=Iu@?pxkE+020gZYM0yxdYVCR5`?Bp>CDEaqe{Plmg)cHfx^<~@%U;fYfd zs`RXFO7UKEnkiYDW`H+bWtJh{N~*vJb5fXheud6W{KhEN%N#D; z!ej3C1%e+fHu&Bed*aRO*7V3MTp20se_z$PTMpqc9@RzFB`R3vp!Q)_I3V`;|9>oE qb?RJ7Qe;gk6?m-KPKenOuMzEu2nRH(mVfuG)sjLlW^Th$+3LUgeo{dI delta 467 zcmW-cOGuP)6vcn%8^&?I#>sI;OT!V02FK6GIAdXrpr}xyMOYA$3qzqzqVxb2QHd5s zyFQ9u5L%!sUlR!mwv(uB8`sgwU4d?-y2XWi@A>}^_nfosefHchzc;smtXkIGU(vEK zY1KuPRE?`+s*k9l5ImZ3W=~N}nh15o@TjDoYBHRpnG{*8vs|Q=ALR-5jWJxU|}3lU5!Z{?U7>+Uqu{_j+9tz2hdGI9SlAXY#cC1#IV02lCT|}(h zOw`C%HI!+QrY5~q9-a|=+sn81u!s4`vaGZ;vzKLVcV+?goMO+J`M&w?cfa5L-+MpS zrR;J>?z_5qJAh0UCLoNVx5~^hYJfAhq+RASEsz(C zJf&Lkl+eH@VggDfltEDknzHk!G4%Q0O|A;BTsuzj$i}X630^1+(Ms1L@-+hsD%CR6 zt=1|DHu#7{y(r#dDU{viITlo_2Tk$j8VNH{t6nf2W^>dX=J?3D5^h4ch*6j?;Yrl1 z=gbM_1riowks2ZNcPzm(0-k2DPjyds532SnonQ0nU+SZldv8e z)OnWv_qRxBMH@LTmAyKz>~dE!@F{uD@g_>3{# z&Dg?V@_A(0*f+*GUc@#$AYi*5?Lun;XTeT2%^GWdTf#f=sbj3gY`?nRnl}0%LquVj z?5I(^bhe|$?W33)a9F|z*gztXG6n8(S;SC$B;jKmAuyjZlZuB_$%gwxS$4XiRl;h!_9PfQC_ZyOZZK|uQ!B#ufK}QQ^N1~qivsU9A^z8jDEl*wNJ!= zyL0U&8pgJws2vZrBG*2(Yv$2s6*Ozd!?d1j_tQA79n)KAw;eI)g~`U-fhpiHoIH+1 zq&g=eDUg9e454<&!9?7NV&tI&E|j8(x?>^~+(EXf;B^Mf#3S^MrP-r+3=B!eXcmoJ zRKx*1PNUgmVFNcoz~s9GOyObGdw~{)0L%k3{eY!9;}gWl1=>)@`8Fr$fAVb6R`g9q?^59vr8%d6~pmCyo#U{LxlqhRhZEw=> zx`wyNdz@({!bvW2tf869iN?luXiX4@nPN>EwzeWCusm3=!|X7`+to~<)fD9{s^o^sLiDchPPhH}EFke9w z3+mZmJOuKN@E}oejOT&T0=8Wysjd2L6B3_t$z$4WCd7 zn~lUCT?P|tX8GLhp*$Bfp=U-{mR;!@j`v;zQ+hsqGg5sfwYeK*Ak`D-Y7x;!so97G zXrx>RlIgJqlq# zqUHpg4-xhw!YlZvlW;{RVOBR`-x~-6*CSpJr?=Emc1`Cvqf?I&$8jP!L6V&$0gqA9 gp1O`U3s(^|XnS_k+W(XGQi#^(0AsX){&};10W!+yx&QzG delta 1743 zcmZ{k3zSV&7{`BS&b{~CIro?uW5i6;xTe88yuupB5NWK4QLT_#sV;72mRqL#^_jmUG_V@k&|L@y-N7|ZH zbMJ-C+kg)IvDQp*nHQ1e{<*Os^&gN(f9|ao8sp^=O=p7gg6lQxVQawD0 zo-r0e(gSWjgc5L)uI7WCcT+vF`XG|sFCEEWpO_bsOd&a&m0~!s8DN+Ci+|+ zQo9Ym>tT%~b=*qGv?H5T@~Fi;I%s%D21|2`#|J|`=AbMdV}XW|7YGdqPAJvTQ`7D+ zSfsMOiB~Vy@Hwvj(&FOLev^efVbO(KY-^dtlPp)0yy*!~X;_8%1qJz`;PB$25g~i~ z8GC!B+UD)xUC475Rjg9yye&O1SiHz;l@jUiQcaD)T8)@df$@QM1%aZG?FQzR1Op>1 z*0Em09V!S0$7r}xZ%i9(66S7$jW(?dkx9CjO=?+Wyl0EWRtnVC$l=->%5P@$*`*OZ zFfZsY%P%SlmiWs8Apu^=9*Z|wB}|3>fIwl;q!Vvhyv;sI5Xzqvbg1{Wm-kz|%X>5A`k_Q##R(bjac``_z7Os<)D(7RUHh4f17rKI036&(%C%EB#BpQd@lO zJtz6b;A?f(*R1s^JGn=a59*s^a+)&+-~EgFt)(UTMI$Y~=ZAIOtef@7qeRFDIch<4 ztHeRIjHn?eHZM&7T1NG^?Lx6LYAIG{q7(E?8Yo{(^YRRa(viF9On@E?<9dd3t%OO( zWd|cfsm$^6H;(aWGLpv=-E}2%|fdwXNv0{S*WGFXAN0lW_EQ|5gYH?#B7c2R1Rnp<`MgMzQ&TeQ{vZ4 z0&QX8?XizSA=;w%(D_b!M%d08V1!cCCu}Bb{uPJdASO+t2^EuWn+a diff --git a/bin/net/grosinger/nomads/World.class b/bin/net/grosinger/nomads/World.class index 8350017f47ea83d37fed4518a06f72063087ad14..d0434b3397bff38b48e833eadb9e2a026a019544 100644 GIT binary patch delta 1271 zcmaJ>YfzMB7(EB}&Td?`mE9Idb^~P#S#Von6OmLd2?)d`bSzL;h;V@gN=Ty|X0*KI z^py@{H8oB{){lzSg|HI4*!aT+X8O_PM>RB!bg`P6X{4f_Z^^&ykLP*!d7t-v&N=Vd zJymhI^34s2b|V&9VCHH%32l2g7!2uoCy}buq@=nGTtis)wDt7mRk!uzHVlMACiwagdfq0 zpU{bG=)%v~i(haAzv7tmpTrzq!gZX%f{ghSm+%*^;BV<(l+FcQCnNRFDrP3bNGpsVI@}6;iLGQ@N0K&gg=HZdiDmvOj$)$BSg{quOgVGNf&XW_CL3T*m+I!C}0JnNehoGe2N*=p3df(;PaRA<5KX(@RJ)B}vIO29MhL1Mq(8!Ab@53vw%Y=KmaIb)km9Vo) zSXaZ(8WeF0*0UCyS%)Upqeb?1vJt&(!V_#3OSRxQx8enE$1A)auk!&+vK1f6dWJjj z6?ftqgZQ1hvA}lf*ueyL4%5nqn8q&Va1Xr?a@2b0c&R!}A+%!aIl)YM;uKa>NV4 zZL`8vCmQ6z!%E&G&*z65Z(~ZVScK)=OeYM&u!B{igjRUA3A`3oei^`+G{#9TRZh8_%vauU`Gyb5C5Ob=PYR=_1oUC7=Y+i8H%ze zca?;gp-chI?YR!kB>S4jkWn)Z>yqmRr8hUqN0<7P<8G%-frif_i_Zzn6UgUDan`6Z O?M{ssos}=#rT+qrybG@Y delta 1196 zcmXw2ZA@Eb6n-9BZa-*+Qah*xwiR$|kwF>j04Ezvp$zC?gR-jAF{ubb#|ksUk2Fhg zLpRCBU1p-rs0rfqkE637Qx`NY{?Lg3O!mXL#rQonnke{rZil(aJ@0$Y$vMyS+~*!| zdOq;x_DsdV3L-}hX6Lw#tR$?1-9y7=t=&VV9fx93Gkwg^UYjkfVzqiY)0^+(?G|pq zIAI()uzMud7wt8JthI0}wJa zOX*^f9AkT?B&tr@UQm2IC~Fgy*`tc}JZzYO8wq%DL7mTi-1aWacn{gQ zgj~FjTk(O~=;2LhiSJ;5BQH5_1z_)0{cL?Eo?86V} z$B!7mbsWY|IDwxrA^p$dDqg}LIEN)!v5d?3QwIMfoqtQ$5|)U>E>{cJX2Ha4WYLZs z-i&p0ppvVwRqg@FxAPYDQr=spwJ_2RD+|>p^5;Eeu(2F&R-lX4L7R= zYl`DGr)dF;&p`?cxY9Ldq{Eoi^YXu=V+J}5+Nsa$OutB9*v^f!+~i8qpJdG}?>G-Y zFKPm>!z(NA65I`fyAciskjrL4+yXyaQOzK>aVMJDh7j8kmf8dCz(ID#afBgp$R3iljsXe!RGZXBVNnO&L%L;H)i2%l zlAYpQU|RapB-WM8uq}y?x+LyiiJ_GkR#z8R#>ZsxlVZoCLh+c;7{_`(g>pWPDjt^) zb|R&fhCrqXk(5-ZO9{jjI*UjqHP#C{B2D|PC2A->6B*Jaw%GYl@FJD4=Ahf=*e@2c zGn(X3=>~bFoMf)imy|m7a~$rPMnP}}_8WE^mEO`MAG^^vS>$q@gr28R%t=A1!pGBM RsWWPMQI1Z8S9cWE{RiDk`T+m{ diff --git a/src/net/grosinger/nomads/InitializeGame.java b/src/net/grosinger/nomads/InitializeGame.java index 5444f2e..b641769 100644 --- a/src/net/grosinger/nomads/InitializeGame.java +++ b/src/net/grosinger/nomads/InitializeGame.java @@ -29,8 +29,7 @@ public class InitializeGame { * @throws IOException * @throws ClassNotFoundException */ - public static void initializeDrones() throws ClassNotFoundException, - IOException { + public static void initializeDrones() throws ClassNotFoundException, IOException { if (Nomads.DEBUGSTATUS) System.out.println("Loading the drones into world..."); /* @@ -53,11 +52,10 @@ public class InitializeGame { if (Nomads.DEBUGSTATUS) System.out.println("Loading " + filename); - File file = new File(System.getProperty("user.dir") + "/drones/" - + filename); + File file = new File(System.getProperty("user.dir") + "/drones/" + filename); - URLClassLoader clazzLoader = URLClassLoader - .newInstance(new URL[] { file.toURI().toURL() }); + URLClassLoader clazzLoader = URLClassLoader.newInstance(new URL[] { file.toURI() + .toURL() }); // System.class.getClassLoader() JarFile jarFile = new JarFile(file); @@ -68,8 +66,8 @@ public class InitializeGame { if (element.getName().endsWith(className + ".class")) { try { @SuppressWarnings("rawtypes") - Class c = clazzLoader.loadClass(element.getName() - .replaceAll(".class", "").replaceAll("/", ".")); + Class c = clazzLoader.loadClass(element.getName().replaceAll(".class", "") + .replaceAll("/", ".")); // Create new GameObject GameObject newGameObject = (GameObject) c.newInstance(); @@ -151,8 +149,7 @@ public class InitializeGame { Building townHall = new Building(Structure.TOWNHALL, 30, 40, null); Building upgradeShop = new Building(Structure.UPGRADESHOP, 30, 60, null); - Building policeStation = new Building(Structure.POLICESTATION, 50, 40, - null); + Building policeStation = new Building(Structure.POLICESTATION, 50, 40, null); Building RepairShop = new Building(Structure.REPAIRSHOP, 50, 60, null); if (Nomads.DEBUGSTATUS) @@ -170,10 +167,10 @@ public class InitializeGame { /** * Generate the money piles and place them on the map */ - public static void initializeMoneyPiles() { + public static void initializeMoneyPiles(World awesomeWorld) { for (int i = 0; i < Nomads.MONEYPILES; i++) { MoneyPile newPile = new MoneyPile(); - Nomads.awesomeWorld.setObjectRandom(newPile); + awesomeWorld.setObjectRandom(newPile); } } } diff --git a/src/net/grosinger/nomads/Nomads.java b/src/net/grosinger/nomads/Nomads.java index 868b705..5d21a40 100644 --- a/src/net/grosinger/nomads/Nomads.java +++ b/src/net/grosinger/nomads/Nomads.java @@ -80,7 +80,13 @@ public class Nomads { // Generate and place all required buildings into world if (DEBUGSTATUS) - InitializeGame.initializeBuildngs(awesomeWorld); + System.out.println("Initializing and placing buildings"); + InitializeGame.initializeBuildngs(awesomeWorld); + + // Generate and place MoneyPiles + if (DEBUGSTATUS) + System.out.println("Initializing and placing MoneyPiles"); + InitializeGame.initializeMoneyPiles(awesomeWorld); // Check to make sure allTeams has been set up properly if (allTeams == null) { diff --git a/src/net/grosinger/nomads/World.java b/src/net/grosinger/nomads/World.java index 94eeebb..e8f86a8 100644 --- a/src/net/grosinger/nomads/World.java +++ b/src/net/grosinger/nomads/World.java @@ -173,6 +173,7 @@ 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)); @@ -370,13 +371,15 @@ public class World { g2d.setColor(Color.black); g2d.fillRect(j * 10, i * 10, 10, 10); } else if (objectHere instanceof MoneyPile) { - // TODO - Implement mapping of MoneyPiles - // Should be black since they are world owned but a - // different shape than anything else + // Green Rectangles represent a MoneyPile + Color color = Color.green; + g2d.setColor(color); + g2d.fillRect(j * 10, i * 10, 10, 10); } else if (objectHere instanceof Objective) { - // TODO - Implement mapping of Objective - // Should be black since they are world owned but a - // different shape than anything else + // Black Oval represents an Objective + Color color = Color.black; + g2d.setColor(color); + g2d.fillRect(j * 10, i * 10, 10, 10); } } }