From 54382e9c1d4cfc9f9608e237a3d131f4a6001979 Mon Sep 17 00:00:00 2001
From: Remco <Remco.boys@gmail.com>
Date: Wed, 27 May 2015 10:42:29 +0200
Subject: [PATCH] Colors

---
 model/GameModel.java           |  8 +++++++-
 model/drawObjects/Player.java  |  2 +-
 model/gameState/PlayState.java | 25 ++++++++++++-------------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/model/GameModel.java b/model/GameModel.java
index dc41e1c..85b594d 100644
--- a/model/GameModel.java
+++ b/model/GameModel.java
@@ -1,5 +1,6 @@
 package model;
 
+import java.awt.Color;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -7,12 +8,13 @@ import javax.swing.Timer;
 
 import view.GameView;
 import control.GameStateManager;
+import control.button.ButtonHandler;
 
 public class GameModel implements ActionListener{
 	
 	GameView view;
 	Timer update;
-	
+	public static Color[] colors = {Color.MAGENTA,Color.RED,Color.GREEN,Color.YELLOW,Color.CYAN,Color.BLUE};
 	GameStateManager gsm;
 	
 	public GameModel(GameView view,GameStateManager gsm)
@@ -21,6 +23,10 @@ public class GameModel implements ActionListener{
 		this.gsm = gsm;
 		update = new Timer(1000/30, this);
 		update.start();
+		
+		for(int i = 1; i < ButtonHandler.getButtons().size(); i++){
+			ButtonHandler.getButtons().get(i).setColor(colors[i-1]);;
+		}
 	}
 	
 	@Override
diff --git a/model/drawObjects/Player.java b/model/drawObjects/Player.java
index 29014f9..b3c1231 100644
--- a/model/drawObjects/Player.java
+++ b/model/drawObjects/Player.java
@@ -54,7 +54,7 @@ public class Player extends Person {
 	}
 	
 	public void addBullet(Color c){	
-		System.out.println(index);
+//		System.out.println(index);
 		bullets.add(new Bullet(10, c, 10, index,path.paths.get(index)));		
 	}
 	
diff --git a/model/gameState/PlayState.java b/model/gameState/PlayState.java
index 810c9e3..654e82d 100644
--- a/model/gameState/PlayState.java
+++ b/model/gameState/PlayState.java
@@ -8,6 +8,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import model.GameModel;
 import model.drawObjects.Bullet;
 import model.drawObjects.Enemy;
 import model.drawObjects.Player;
@@ -23,8 +24,7 @@ public class PlayState extends GameState{
 	private PlayArea area;
 	private InfoPanel infoPanel;
 	private Player player;
-	private List<Enemy> enemys;
-	private Color[] colors = {Color.MAGENTA,Color.RED,Color.GREEN,Color.YELLOW,Color.CYAN};
+	private List<Enemy> enemys;	
 
 	
 	public PlayState(GameStateManager gsm) {
@@ -35,7 +35,7 @@ public class PlayState extends GameState{
 		player = new Player(1280-1024+1024/2, 1024/2,area);
 		for(int i = 0; i < 8; i++){
 			Line2D line = area.getLine(i);
-			addEnemy(line, Color.BLUE, 100);
+			addEnemy(line, Color.BLUE, 200);
 		}
 	}
 
@@ -66,10 +66,9 @@ public class PlayState extends GameState{
 		}		
 		while(enemys.size() < 8){
 			int index = (int)(Math.random()*8);
-			int speed = (int)(Math.random()*1000);
-			int color = (int)(Math.random()*colors.length);
+			int color = (int)(Math.random()*GameModel.colors.length);
 			Line2D line = area.getLine(index);
-			addEnemy(line,colors[color],speed);
+			addEnemy(line,GameModel.colors[color],200);
 		}		
 	}
 
@@ -98,25 +97,25 @@ public class PlayState extends GameState{
 
 	@Override
 	public void buttonPressed(ButtonEvent e) {	
-		System.out.println("Playstate button pressed: "+e.getButton().getButtonID());
+//		System.out.println("Playstate button pressed: "+e.getButton().getButtonID());
 		switch(e.getButton().getButtonID()){
 			case 1:
-				player.addBullet(Color.RED);
+				player.addBullet(GameModel.colors[0]);
 				break;
 			case 2:
-				player.addBullet(Color.BLUE);
+				player.addBullet(GameModel.colors[1]);
 				break;
 			case 3:
-				player.addBullet(Color.GREEN);
+				player.addBullet(GameModel.colors[2]);
 				break;
 			case 4:
-				player.addBullet(Color.YELLOW);
+				player.addBullet(GameModel.colors[3]);
 				break;
 			case 5:
-				player.addBullet(Color.MAGENTA);
+				player.addBullet(GameModel.colors[4]);
 				break;
 			case 6:
-				player.addBullet(Color.CYAN);
+				player.addBullet(GameModel.colors[5]);
 				break;
 		}
 	}