Added second player

src/model/levels/level1.bb

@@ -1,3 +1,3 @@
 2,200,red,200,400,-1,0.0
-speed|life
+speed
 18000

src/model/levels/level2.bb

@@ -1,3 +1,3 @@
-3,200,green,200,200,-1,0.0|4,300,green,500,200,1,0.0
+2,200,green,200,200,-1,0.0|3,300,magenta,500,200,1,0.0
 speed|life
 30000

src/model/state/PlayState.java

@@ -25,6 +25,7 @@ import resources.image.Images.ImageType;
 public class PlayState extends State{
 	
 	private Player player;
+	private Player player2;
 	private ShootingLine line;
 	private ArrayList<Ball> balls;
 	private ArrayList<Level> levels;
@@ -38,8 +39,7 @@ public class PlayState extends State{
 	public PlayState(GameStateManager gsm) {
 		super("play", gsm);
 		player = new Player(Images.getImage(ImageType.PLAYER1), 40, 550, "Janco");
-		Player player2 = new Player(Images.getImage(ImageType.PLAYER1), 40, 550, "Kenneth");
-		player2.setScore(200);
+		player2 = new Player(Images.getImage(ImageType.PLAYER1), 40, 550, "Kenneth");
 		infopanel = new InfoPanel(player, player2, this);
 		balls = new ArrayList<Ball>();
 		readLevelsFromFiles();
@@ -153,7 +153,20 @@ public class PlayState extends State{
 		}
 		timeleft -= (System.currentTimeMillis() - lasttime);
 		if(balls.size() == 0){
-			playLevel(levels.get(currentlevel+=1));
+			if(player.getHealth() > 0)
+				player.setScore(player.getScore()+(timeleft/100));
+			else
+				player.setScore(player.getScore()+(timeleft/100)/2);
+			
+			if(player2.getHealth() > 0)
+				player2.setScore(player2.getScore()+(timeleft/100));
+			else
+				player2.setScore(player2.getScore()+(timeleft/100)/2);
+			
+			if(currentlevel+1 >= levels.size())
+				gsm.setState("end");
+			else
+				playLevel(levels.get(currentlevel+=1));
 		}else if(timeleft < 0){
 			player.setHealth(player.getHealth()-1);
 			playLevel(getCurrentLevel());