From b4cd1a6ecb83984c6f895bafa866bed5dba19496 Mon Sep 17 00:00:00 2001 From: ssl10003 Date: Mon, 13 Apr 2015 18:24:29 -0400 Subject: [PATCH] Changed the Basic Minion to have clear background --- src/Basic Minion.png | Bin 0 -> 3270 bytes src/Minion.png | Bin 2493 -> 0 bytes src/MinionTypes.java | 8 ++++---- src/MockGui.java | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 src/Basic Minion.png delete mode 100644 src/Minion.png diff --git a/src/Basic Minion.png b/src/Basic Minion.png new file mode 100644 index 0000000000000000000000000000000000000000..5d6b6dd633a6e657fc85c236fbd7a69db79b1645 GIT binary patch literal 3270 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 Ef^#26X#fBK literal 0 HcmV?d00001 diff --git a/src/Minion.png b/src/Minion.png deleted file mode 100644 index abcf631c20644d6397eeb6b7c4c0e917f417a504..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2493 zcmV;u2}1UXP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2~tT!K~zXfeO3ol zlgSpIbpdH1B#=%oBHgm00=iGo6$J~5%DUoGEa=grC`x&vfGFrwpNc+3g`hMQLI+Vg z2?0V#2!s*>NT}i}h~gSR`QO0LMjnr|bH0CQMm(t8F@IP_HddV^Xj2gDp9CZ{Hvh2v{su zRaFf&guBG!HQ;32gFA0pa^NzsW1EY%HVtJ&7ok9hcszkjB)*qa37K)T1)xu<$&biH zf;w)-3Ww9c<24Bc0*OSTQmC4Ee12xKxF!+!9`Mql(KIyRM!vJ7fHTU<7(4s5(!LT2 z|7kb>Syx?3J141`MTbeT-qDdlCdsTIJCQ_$RJvL^T2va9LUD51)Gtg2Riz9$c?AlY zj54CD(f+i6>OmimGk(6_p1*nS-*eXQF#TR+8#fafZ?m#6qf(}uT$0)3m5$im9pT+twV=RhN|h{4w}JPEKAC=8uYs8jK^#j>^EJgH25hr)OYjWNd;C z*KgSHi^I?QdO9$MFgRo~MT-V^KE;j-XyP^8+;;a0Qm5*mgOl(^ToD=)uzIzvq0wR( zL1+VIpx%N7@=;g+)jiNZJUSw5X=-j0^$fnHCnTF&SVI}OY}#E75{W#UouEmOlT&Ww zyny)%rc)xmnHB$Nl<*$l?lZ<7-U;;0N10az>t4y?C_0=?ami=h_|9Q46p)U|1pI`&k! zWu&w5-2;9}EHYY%yzxW&e3730Nb}y5w9=^arv#jG$T%?cIrm{qR$?OTf00h`IW?|3 zb_9i7hR1-x;_?_zL{9~K%qTI!5+`gE2@w$&HUDRmiSA)>d|<|2Q@G{4%*%ih&l zv9Bk|wGj7zUlqw;ccQ?pB1jBsh$Kai$~(F=t)E0Vl$NoN`X2G{JVcM!Jo0L} zICGUCbshJqlQ`cU87vc&PrU>((%G01XkyU^JD5{73V^bbJR;gXSmuO?c7Ek=M?^b} z42%F!1waXa1vre#ALUMea-6^NTqgv-jyL#?y{V}$i$!^$j11_^i~u~MjAxG^`|dsN z@N=Ub1psVz^h!jyW1P1g5x6`GvIyE|@HoT*5jcOV-#W(KCav8i<#~N+xbV4$4U-Tu zh}iM)vzZwS-<*!xBzUe+W=f#3BCf09MQzc|hN26T2y*4hRhTMSxrGO|QxK7xv=-92 zAi`}(-R5zQ^C)Z6hq4VHnVY1%J!AEUrNRhgOjup=jPdkQUJj$Ur1-U@@8IF1(Rc0+ zG-XVCz>FK}EMdL8#$`B9er~U-<|ZX2m6Vh~KdcsEkk`LT>$ZR4Y?0PFOKV+FjMur0 zakhTp>>TADL*YY>sUwBGGY?N%vgMgV#<#M~@-xj~TTSQ@|S*xn^rHO#72 zt8{gB{ryh`1e|3sQad|4e0>jj`yA}zrvrQYHBcY6U9Jurtrld2>RXyjy{>Ck6OgWb zlkM)~t!~oBZPJD<5MzxHTg#K|6Rs@19cZ!LfeKe{*yyxojeTxzc6oUTL`q5$n_U?a za_$$WEsd4Wz~#_WCy(wQ`}1|MsX34b9wy|_NLsnd)_SQ;K~{pe z`U&XdCc}$*sK4@es-d>L+&^{5H}$ERi}kWh^h$L}gH^SXfU^S@`h8~lZ-N4QnKd1T z+8M@rmJ0A@nrR7RDykv(mEL%CKj#R;{&hln&)Ag>V#)i&j)kR3`LwSI@qm=U_$vsx`Ce1FzXJKAyW4 zD0%{rK_OQf=?g6vi2I%UWW}MIofm(3 zfL1w+E{6XD`zs}-ImvSJX*l(mg{qeT;GPSK`4^&q~jIw3zjE}4F- zFegFMQX#H?CE~qot1oP+E2yhr)Uz0E{Ct=va}4JJ>+yd9ijGaP6s9uv00000NkvXX Hu0mjfNX4!H diff --git a/src/MinionTypes.java b/src/MinionTypes.java index e8245d0..f726289 100644 --- a/src/MinionTypes.java +++ b/src/MinionTypes.java @@ -6,10 +6,10 @@ public enum MinionTypes { //NAME (Health, Attack, Speed) - WEAKLING(100, 1, 1, "Minion.png"), - BASIC (255, 1, 1, "Minion.png"), - SPEEDO (100, 1, 4, "Minion.png"), - SUPERSPEEDO (255, 1, 4, "Minion.png"); + WEAKLING(100, 1, 1, "Basic Minion.png"), + BASIC (255, 1, 1, "Basic Minion.png"), + SPEEDO (100, 1, 4, "Basic Minion.png"), + SUPERSPEEDO (255, 1, 4, "Basic Minion.png"); private int health, attackDamage, movementSpeed; private BufferedImage sprite; diff --git a/src/MockGui.java b/src/MockGui.java index a36ba13..1e932ba 100644 --- a/src/MockGui.java +++ b/src/MockGui.java @@ -180,6 +180,7 @@ public void drawMinion(int x, int y, int health, Graphics g) { public void drawMinion(MinionMock m, Graphics g) { g.drawImage(m.getSprite(), m.getX(), m.getY(), null); + } public void drawAllTowers(TowerFactory TF, Graphics g) {