From 50e2ea18dcf5dc5c838af1515f048db54e1658e3 Mon Sep 17 00:00:00 2001
From: Daniel <daan@compagner.com>
Date: Fri, 29 May 2015 18:41:31 +0200
Subject: [PATCH] Color Strike toegevoegt

---
 image/Images.java              |   3 ++-
 image/colorstrike.png          | Bin 0 -> 556 bytes
 image/pressstart.png           | Bin 0 -> 1423 bytes
 model/gameState/MenuState.java |  13 +++++++------
 4 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 image/colorstrike.png
 create mode 100644 image/pressstart.png

diff --git a/image/Images.java b/image/Images.java
index 6ecdff0..1e94133 100644
--- a/image/Images.java
+++ b/image/Images.java
@@ -21,6 +21,7 @@ public class Images{
 		   images.add(ImageIO.read(Main.class.getResource("/image/player.png"))); 
 		   images.add(ImageIO.read(Main.class.getResource("/image/player2.png"))); 
 		   images.add(ImageIO.read(Main.class.getResource("/image/pressstart.png"))); 
+		   images.add(ImageIO.read(Main.class.getResource("/image/colorstrike.png"))); 
 		   
 		  }catch(IOException e){
 		   e.printStackTrace();
@@ -34,6 +35,6 @@ public class Images{
 
 	 public enum ImageType
 	 {
-	  player,player2, pressstart
+	  player,player2, pressstart, colorstrike
 	 }
 }
diff --git a/image/colorstrike.png b/image/colorstrike.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c5d271b5e1fa018c01581d6c7c92490915a4c6d
GIT binary patch
literal 556
zcmV+{0@MA8P)<h;3K|Lk000e1NJLTq001@s000sQ1^@s65O^*900001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9
za%BK;VQFr3E^cLXAT%y8E;VI^GGzb&0i8)iK~z{r-IK9R13?f)uK=2$A3LKLB;*oE
z2#KHoA|!eswM0M@WMm*MH>Z26@9)`L&XHlHCwcztp62=Np?o}+9=r0|rQAJtxqmBN
z%F}J1;bI8(*QLpU*f6$=i}^fIF)|kdme>2BV%a=6NvvK@dX+-Nvsj$og+Qec@l3_4
zh-W57KQT^&NvvL)rJS=9i{<}=7(E$6e^yLEvL)u(+5gA*Out%8W$J_G+(i^-v3NEI
z#8gCK=3<$gOLWCru>2DGW?HcP638s!61mtf>Y?0p*<EeAynL4~@8fsSqg-ygOk$s3
z$3G7(mS?6y5R2=5B@@%R=CL@r%4jw%KKB__tOj#=AB&S^xELaysQ`JPc_!w)it&b=
zRLqOF!Z~_ntyl{e(a)>JqBy8fEKjaNkcrWgsesNjR~b+#7jurpyz0TRSe{IU=v@Sm
zbg>}jo@HV|OAHZb+Pof;(o7|StXDCYJXOpkSBpjI1L~!@5K$Q*cd<-P1$3sli)C`t
u;*vQBVoRlBEs$A41zI4pgua=aZTSHs$Yd|?to-l*0000<MNUMnLSTYP=<T2Y

literal 0
HcmV?d00001

diff --git a/image/pressstart.png b/image/pressstart.png
new file mode 100644
index 0000000000000000000000000000000000000000..fba57853410863b53314064f4a95edfd0dfa858f
GIT binary patch
literal 1423
zcmYjRYfw{17!BhSl(ZwYc7%WkLr^F!1uJ>r3=bQka1jtOMWBfBG1Nqon_PqdGg`ex
zYOF*c#01JS1T|H3s^%IP70mz=5Ttd01ksX^5N?RP1VMU1ndy(+J?GoAXZG9ucJucE
zG)ITc4mcdnksc8qi^JIwF}!*0YOJ4Zk(|c{J8mp36sOd>m@u;PSV&X|4tML)y1CR<
z7`Hza!QkR>_{WRQPQ$J{f(5?<cOL}f*hfJqmBYlHN<F~>{a8$JOQ7Gkemj`wzGLEW
zt8n!2ko}p-qs1W?(&_70F4P!4lt|Ra9CAa+<eI{Z57nJpUopMo|Cp*>pt@dSGKy1Z
zSK1nU2fSJ_%yt@T@NK)B&tVh~^-<x4wAXR6uz$u&#h^6LZGpN$KX~<U7YPh5&!=lr
zQ!<IV%rX45Olb`8Hw9S=5-6r02GywJ5{c&F^&_a0F8551O`)wAnTd=<sZ@Au3xUgd
zX3rOk(tzr-rY;J&Oz=7c+VC-s$22D35y9}U*hvwlk-BitK()vWp1YMdytwe@V}ZDT
zTUl7<Z$c8u&@3l=684tpYtjHgeOT9`Phm7KqPHRq@YB)niNxR%7LsfV3VksuB>9^n
z(JwmOsX)R|D@g*WAu>QN6I#6!w9g-msJk;_Vd2hga!S4-$tn|y$Y4C*2$3Y~1~ytj
z>5GbMoFSL?Cvp^wg_W&E+(2uVWihuk)a@)nc{cpv=@IMSblB}d)lQdX`dpf6<iBwr
zjS^dQWQizIV}#9rIrn61Z&Z=)^8_ei)>+iYW~T$o4u7h~N$XwT3LA@db3C!EeT)xg
z&zch%o-}N4_c_{=xnq>cc7$lH#tv&p+Bf%#kmFMTZlY&{&x*LL@w3px4c|f!6QG&^
zmek8mUeE>O=dMJHcY?4kZc?yoG^nQnKM<pIiIJOU1icwv1iiunSUq1TvUZj8r4YFl
zo%5^IK7`J7$O%T7kTdiv8ScBd26cOxp*MYU$rbmXe&=4yWaO@h@oQ@kTrGcXZ93f3
zbOdG@>Pl3*xb?0%n&FhEgNV6C*&(f`4OGZjcaaX0-c}knIZV0JJ<1P|zYm^Vt;m`n
z^qTlcX;rd$HV2>GlMC}zx=$`IudzHj>@N8ud#hcWo-}VGzHp~f=iT2Gi?ZgvbdpQ=
z!Kbu>&Ln&5j54nvKMtr13p&Ox87mv$A-6cK_Pn*mXXplnhJ6{W>`o3PJR;pj!p*kC
zNGWSiod;G<)QpiD5@Fm&Sw+6muaDxA4GD)dck+-O>M+gRg%R--TMc?7Wu=+PweyMJ
zw41yj*LzS}Z_{L#6uT3XvN_r|?JqZX76i(#HBhEe)^H{)>qAZe2}}sp={kjv0p8V!
z?8S1@>l{ae;^E|KXVbg$OWNZa1$km?yD3xDfUKDITBh|D^mlYmxT#v>V;tC+L<=Cc
z*R!5X(59}Rt{gdTsAlxsh+tPE)O6x=ULd#Yy7|C<wx^t}6Yrz3gCwLA2Y5d9I}69H
z4m{O+7qsPcV~qN;G%o=pv`fJh)imjsHAJ*nG=81Ugv(0z!`(JnBA~t9SVYJ=T4-po
z`5Eqn85sku_}~Egcz&88s$~YNq@_tGsI6rtYIe$b)wGx{iSGZJxFlrzu;<+^F%Pjf
zA9<)qSHqAv5k_uuhxM|1+mXGu1Bn*5mn0CX4Oab+%D_#8=_^a(sn0AfDs8jPiwT7y
zf~qs~D=4rsAS0enoNEN%48jMCnKO>z_kG*mo~%5C;qO0IoOcP6(b)E;BTx2o&t+O}
S`j6OuiKFiZ!j+*vo%s*MB;DKq

literal 0
HcmV?d00001

diff --git a/model/gameState/MenuState.java b/model/gameState/MenuState.java
index f7cc93e..33ca90e 100644
--- a/model/gameState/MenuState.java
+++ b/model/gameState/MenuState.java
@@ -14,7 +14,9 @@ import control.joystick.JoystickEvent;
 
 public class MenuState extends GameState {
 
-    BufferedImage PressStart = Images.getImage(ImageType.pressstart);
+    BufferedImage pressStart = Images.getImage(ImageType.pressstart);
+    BufferedImage colorStrike = Images.getImage(ImageType.colorstrike);
+    
     int index = 0;
     int varx = 0;
     int x,y,frame = 0,maxFrames = 5;
@@ -53,8 +55,11 @@ public class MenuState extends GameState {
 		
 		g2.translate(1280/2, 1024/2);               
 	        
-	    BufferedImage subImg = PressStart.getSubimage(x, y, 49, 26);
+	    BufferedImage subImg = pressStart.getSubimage(x, y, 49, 26);
 	    g2.drawImage(subImg, varx - 26*5, 0 - 20*5, 49*5, 26*5, null);
+	    
+	    BufferedImage subImg2 = colorStrike;
+	    g2.drawImage(subImg2,  0 -27*8 , 0 -300, 54*8, 18*8, null);
 	
 	    varx+=0;
 
@@ -63,10 +68,6 @@ public class MenuState extends GameState {
 		g2.setColor(Color.WHITE);
 		g2.drawString("Copyright 2015 by Daniel Compagner", -180, 500);
 		
-		Font cSFont = new Font("OCR A Extended", Font.BOLD, 100);
-		g2.setFont(cSFont);
-		g2.setColor(Color.GREEN);
-		g2.drawString("Color     Strike", -500, 0);
 	}
 	
 	@Override