- Quick Fixes

- Coin Animation readded
- Point Animation added

audio/Song.java

@@ -155,4 +155,14 @@ public class Song implements Comparable<Song>{
 	public int compareTo(Song s) {
 		return getTitle().compareTo(s.getTitle());
 	}
+	
+	public int getTimesPlayed()
+	{
+		int timesPlayed = 0;
+		for(SongInstance s : songs)
+		{
+			timesPlayed += s.getTimesPlayed();
+		}
+		return timesPlayed;
+	}
 }

audio/SongInstance.java

@@ -6,6 +6,7 @@ import java.util.List;
 public class SongInstance {
 
 	private String difficulty;
+	private int timesPlayed;
 	
 	private List<ObjectInstance> objects;
 	private List<ButtonInstance> buttons;
@@ -13,6 +14,7 @@ public class SongInstance {
 	public SongInstance(String difficulty)
 	{
 		this.difficulty = difficulty;
+		this.timesPlayed = 0;
 		
 		objects = new ArrayList<ObjectInstance>();
 		buttons = new ArrayList<ButtonInstance>();
@@ -83,4 +85,17 @@ public class SongInstance {
 		
 		return b;
 	}
+
+	public int getTimesPlayed() {
+		return timesPlayed;
+	}
+
+	public void setTimesPlayed(int timesPlayed) {
+		this.timesPlayed = timesPlayed;
+	}
+	
+	public void played()
+	{
+		timesPlayed++;
+	}
 }

audio/io/Main.java

@@ -1,21 +0,0 @@
-package audio.io;
-
-import java.io.File;
-import java.io.IOException;
-
-import audio.Song;
-
-public class Main {
-
-	public static void main(String[] args) {
-		Song s = null;
-		try {
-			s = JSONReader.readSong(new File("C:\\Users\\Kenneth\\Development\\Java Development\\SimApplicatie\\Arcade\\songs\\NAME_OF_SONG\\NAME_OF_SONG.csf"));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		System.out.println("---");
-		System.out.println(s);
-	}
-
-}

audio/sorting/SortPLAYED.java

@@ -8,7 +8,12 @@ public class SortPLAYED implements Comparator<Song> {
 
 	@Override
 	public int compare(Song s1, Song s2) {
-		return s1.getAuthor().compareTo(s2.getAuthor());
+		if(s1.getTimesPlayed() < s2.getTimesPlayed())
+			return 1;
+		else if(s1.getTimesPlayed() > s2.getTimesPlayed())
+			return -1;
+		else
+			return s1.getTitle().compareTo(s2.getTitle());
 	}
 
 }

control/GameControl.java

@@ -32,19 +32,17 @@ public class GameControl implements JoystickListener, ButtonListener, ActionList
 
 	@Override
 	public void buttonPressed(ButtonEvent e) {	
-//		System.out.println("Game control, button pressed: "+e.getButton().getButtonID());
-		gsm.currentState.buttonPressed(e);
+		gsm.buttonPressed(e);
 	}
 
 	@Override
 	public void buttonReleased(ButtonEvent e) {	
-//		System.out.println("Game control, button released: "+e.getButton().getButtonID());
-		gsm.currentState.buttonReleased(e);
+		gsm.buttonReleased(e);
 	}
 
 	@Override
 	public void onJoystickMoved(JoystickEvent e) {
-		gsm.currentState.onJoystickMoved(e);
+		gsm.onJoystickMoved(e);
 	}
 
 	@Override

control/GameStateManager.java

@@ -10,9 +10,12 @@ import model.gameState.GameState;
 import model.gameState.HelpState;
 import model.gameState.MenuState;
 import model.gameState.PlayState;
+import model.gameState.PreGameState;
 import model.gameState.TitleState;
 import control.button.Button;
+import control.button.ButtonEvent;
 import control.button.ButtonHandler;
+import control.joystick.JoystickEvent;
 import control.joystick.JoystickHandler;
 import data.io.SQLConnector;
 
@@ -22,13 +25,15 @@ public class GameStateManager {
 	public GameState currentState;
 	private int index = 0;
 	public int fps;
+	private float timeOfNoAction = 0,maxTimeToHaveNoAction = 45000;
 	
 	public enum State {
 		TITLE_STATE,
 		MENU_STATE,
 		HELP_STATE,
 		PLAY_STATE,
-		GAMEOVER_STATE
+		GAMEOVER_STATE,
+		PRE_GAME_STATE
 	}
 	
 	public GameStateManager(SongHandler sh, SQLConnector sql){
@@ -38,11 +43,14 @@ public class GameStateManager {
 		gamestates.add(new HelpState(this, sh, sql));
 		gamestates.add(new PlayState(this, sh, sql));
 		gamestates.add(new GameOverState(this, sh, sql));
+		gamestates.add(new PreGameState(this,sh, sql));
 		setState(State.TITLE_STATE);
 	}
 	
-	public void setState(State st)
-	{
+	public void setState(State st)	{
+		if (st.ordinal() > 0 && !(currentState instanceof TitleState))
+			currentState.stopAudio();
+
 		currentState = gamestates.get(st.ordinal());
 		init();
 	}
@@ -54,7 +62,12 @@ public class GameStateManager {
 		init();
 	}
 	
-	public void update(float factor){		
+	public void update(float factor){
+		timeOfNoAction += factor;	
+		if(timeOfNoAction > maxTimeToHaveNoAction){
+			setState(State.TITLE_STATE);
+			timeOfNoAction = 0;
+		}
 		currentState.update(factor);
 		fps = (int) (60/(factor/10));
 	}
@@ -68,4 +81,21 @@ public class GameStateManager {
 		}
 		currentState.init();
 	}
+
+	public void buttonPressed(ButtonEvent e) {
+		timeOfNoAction = 0;
+		currentState.buttonPressed(e);
+		
+	}
+
+	public void buttonReleased(ButtonEvent e) {
+		timeOfNoAction = 0;
+		currentState.buttonReleased(e);
+		
+	}
+
+	public void onJoystickMoved(JoystickEvent e) {
+		timeOfNoAction = 0;
+		currentState.onJoystickMoved(e);		
+	}
 }

control/NetworkHandler.java

@@ -3,27 +3,29 @@ package control;
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
+import java.net.InetAddress;
 import java.net.SocketException;
+import java.net.UnknownHostException;
 
 import control.button.ButtonHandler;
 import control.joystick.Joystick.Position;
 import control.joystick.JoystickHandler;
 
 public class NetworkHandler implements Runnable{
-	
-	DatagramSocket udp;
-	
-	String host;
-	int port;
-	
-	boolean running;
-	Thread t;
-	
-	byte[] send;
-	byte[] receive;
-	
-	ButtonHandler bth;
-	JoystickHandler jth;
+
+	private DatagramSocket udp;
+
+	private String 	host;
+	private int 	port;
+
+	private boolean running;
+	private Thread  t;
+
+	private byte[] 	send,
+					receive;
+
+	private ButtonHandler bth;
+	private JoystickHandler jth;
 	
 	public NetworkHandler(String host, int port, ButtonHandler bth, JoystickHandler jth)
 	{
@@ -39,7 +41,7 @@ public class NetworkHandler implements Runnable{
 		receive = new byte[1024];
 		
 			try {
-				udp = new DatagramSocket(1112);
+				udp = new DatagramSocket(1113);
 			} catch (SocketException e) {
 				e.printStackTrace();
 			}
@@ -62,12 +64,14 @@ public class NetworkHandler implements Runnable{
 	
 	private void send(String str)
 	{
-		send = str.getBytes();
 		try {
-			udp.send(new DatagramPacket(send, send.length));
+			DatagramPacket sendPacket = new DatagramPacket(str.getBytes(), str.length(), InetAddress.getByName(host), 1113);
+			udp.send(sendPacket);
+		} catch (UnknownHostException e) {
+			e.printStackTrace();
 		} catch (IOException e) {
 			e.printStackTrace();
-		}
+		}  
 	}
 	
 	public void close()
@@ -90,10 +94,7 @@ public class NetworkHandler implements Runnable{
 			}                   
 			String sentence = new String( receivePacket.getData());  
 			
-			if(sentence.length() != 21)
-				return;
-			
-			System.out.println("RECEIVED: " + sentence); 
+			sentence = sentence.trim();
 			
 			String[] controls = sentence.split("\\|");
 			int[] control = new int[controls.length];
@@ -103,7 +104,6 @@ public class NetworkHandler implements Runnable{
 			for(int i = 0; i < 7; i++){
 				if(control[i] != ButtonHandler.getButton(i).pressed)
 				{
-					System.out.println("PRESS BITCH " + controls[i]);
 					ButtonHandler.getButton(i).pressed = control[i];
 					if(control[i] == 0)
 						bth.buttonPress(ButtonHandler.getButton(i));
@@ -166,8 +166,13 @@ public class NetworkHandler implements Runnable{
 					JoystickHandler.j.setPosition(Position.DOWN);
 					jth.onJoystickMoved(JoystickHandler.j);
 				}
+			}else {
+				if(JoystickHandler.j.getPos() != Position.CENTER){
+					JoystickHandler.j.setPosition(Position.CENTER);
+					jth.onJoystickMoved(JoystickHandler.j);
+				}
 			}
 		}
 			
 	}
-}
+}

data/io/.gitignore

@@ -1 +1,2 @@
 /SQLConnector.class
+/WebcamUploader.class

data/io/SQLConnector.java

@@ -8,6 +8,8 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.sun.crypto.provider.RSACipher;
+
 import model.objects.highscore.Highscore;
 import audio.Song;
 import audio.SongInstance;
@@ -22,7 +24,7 @@ public class SQLConnector
         this("178.62.254.153", "3306","colorstrike","csadmin","aardbei123");
     }
 
-    //Start connection with Databse
+    //Start connection with Database
     public SQLConnector(String host, String port, String dbName, String userName, String password)
     {
         try
@@ -156,6 +158,17 @@ public class SQLConnector
 	    			} catch (SQLException e) {
 	    				e.printStackTrace();
 	    			}
+	    			
+	    			Statement st3 = executeResultQuery("SELECT COUNT(1) FROM playdata WHERE songinstance = (SELECT id FROM songinstance WHERE difficulty='" + si.getDifficulty() + "' AND song=(SELECT id FROM song WHERE folder='" + s.getFolder() + "'))");
+	    			try {
+						ResultSet rs3 = st3.getResultSet();
+						rs3.next();
+						int i = rs3.getInt(1);
+		    			si.setTimesPlayed(i);
+		    			System.out.println(s.getTitle() + " - " + si.getDifficulty() + ": " + i);
+					} catch (SQLException e) {
+						e.printStackTrace();
+					}
     			}
     		}
     		else

image/Images.java

@@ -33,6 +33,7 @@ public class Images {
 		   	images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/aanwijzers4sho.png"))));
 		   	images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/kast.png"))));
 		   	images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/gameover.png"))));
+		   	images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/screenshot.png"))));
 		   	images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/help.png"))));
 		} catch (IOException e) {
 			e.printStackTrace();
@@ -44,7 +45,7 @@ public class Images {
 	}
 
 	public enum ImageType {
-		pulse,cursor,pressstart,colorstrike,background,aanwijzers,kast,gameover,help
+		pulse,cursor,pressstart,colorstrike,background,aanwijzers,kast,gameover, screenshot, help
 	}
 
 	public static BufferedImage readImage(File f) {

main/Window.java

@@ -36,27 +36,29 @@ public class Window extends JFrame {
 		setSize(WIDTH, HEIGHT);
 		
 		//Create Events
-		Window.ON_RASP = ON_RASP;
-		if(ON_RASP){ //Only on the raspberry pi
-			GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment.getLocalGraphicsEnvironment();
-			GraphicsDevice[] devices =  graphicsEnvironment.getScreenDevices();
-
-			if (!devices[0].isFullScreenSupported ()){
-			     throw new UnsupportedOperationException ("Fullscreen mode is unsupported.");
-			}else{
-				devices[0].setFullScreenWindow(this);
-			}			
-			//Remove cursor
-			BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
-			Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(cursorImg, new Point(0, 0), "blank cursor");
-			this.setCursor(blankCursor);
-		}
+//		Window.ON_RASP = ON_RASP;
+//		if(ON_RASP){ //Only on the raspberry pi
+//			GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment.getLocalGraphicsEnvironment();
+//			GraphicsDevice[] devices =  graphicsEnvironment.getScreenDevices();
+//
+//			if (!devices[0].isFullScreenSupported ()){
+//			     throw new UnsupportedOperationException ("Fullscreen mode is unsupported.");
+//			}else{
+//				devices[0].setFullScreenWindow(this);
+//			}			
+//			//Remove cursor
+//			BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
+//			Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(cursorImg, new Point(0, 0), "blank cursor");
+//			this.setCursor(blankCursor);
+//		}
 		
 		ButtonHandler bth = new ButtonHandler();
 		JoystickHandler jsh = new JoystickHandler();
 		
+
 		final SQLConnector sql = new SQLConnector();
-		NetworkHandler ntw = new NetworkHandler("192.168.1.6", 1113, bth, jsh);
+
+		NetworkHandler ntw = new NetworkHandler("10.42.0.5", 1113, bth, jsh);
 		
 		bth.setNetwork(ntw);
 		
@@ -89,6 +91,7 @@ public class Window extends JFrame {
 		jsh.addJoystickListener(control);
 		
 		//Display
+		setResizable(false);
 		pack();
 		setVisible(true);
 	}

model/SongHandler.java

@@ -11,7 +11,7 @@ import audio.AudioPlayer;
 import audio.Song;
 import audio.SongInstance;
 import audio.io.DirScanner;
-import audio.sorting.SortALPHA;
+import audio.sorting.SortPLAYED;
 import data.io.SQLConnector;
 
 public class SongHandler {
@@ -46,10 +46,10 @@ public class SongHandler {
 		
 		songs = DirScanner.scanDirectories(dir);
 		
-		sort(new SortALPHA());
-		
 		sql.update(songs);
 		
+		sort(new SortPLAYED());
+		
 		updatePlayer();
 	}
 	
@@ -72,7 +72,9 @@ public class SongHandler {
 	{
 		currentSongInstance = si;
 	}
-	
+	public boolean isPlaying(){
+		return getProgress() > 0 ? true : false;
+	}
 	
 	private void updatePlayer()
 	{

model/drawObjects/CoinAnimation.java

@@ -0,0 +1,74 @@
+package model.drawObjects;
+
+import model.gameState.PlayState;
+
+import java.awt.*;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.Point2D;
+
+/**
+ * CoinAnimation klasse: Weergeeft een balletje (resembleerd een muntje) dat omlaag valt.
+ *      Je hoeft alleen achter elkaar de paint(Graphics2D) methode aan te roepen, deze roep automatisch een 'reposition' aan,
+ *      waardoor je het balletje alleen snel achter elkaar hoeft te repainten.
+ *
+ * *    Init (startX, startY):  Punt waar de animatie begint met vallen
+ *
+ *      start(): aanroepen om te starten
+ * *
+ * *
+ **/
+public class CoinAnimation extends DrawObject {
+
+    private Ellipse2D       coinShape;
+    private Point2D.Double  coinSetPoint;
+
+    // Hoevaak de timer gelopen heeft
+    private static int timerLoops      = 0;
+
+    public CoinAnimation(int startX, int startY) {
+        coinSetPoint        = new Point2D.Double(startX, startY);
+        coinShape           = new Ellipse2D.Double(startX, startY, 20, 20);
+    }
+
+    // Start
+    public void start() {
+        timerLoops          = 1;
+    }
+
+    public void draw(Graphics2D g2) {
+        Color oldColor = g2.getColor();
+        update(timerLoops);                                             // UPDATE
+        g2.setColor(new Color(255, 255, 0));    // GEEL
+        g2.draw(coinShape);                                             // MUNTJE TEKENEN
+        g2.fill(coinShape);
+        g2.setColor(oldColor);
+    }
+
+    // Wordt na elke paint aangeroepen
+    public void update(float factor) {
+
+        // Coin omlaag verschuiven doordat Y * loops omlaag gaat.
+        // Per frame verschuift het balletje delta 10 op Y-as.
+        try {
+            coinShape.setFrame(coinSetPoint.getX() * timerLoops * 10, coinSetPoint.getY() * timerLoops,
+                                coinShape.getWidth(), coinShape.getHeight());
+/*            coinShape.setFrame(coinSetPoint.getX(), coinSetPoint.getY() + (1000 - 35 * PlayState.comboScore) / 25 * timerLoops,
+                    coinShape.getWidth(), coinShape.getHeight());*/
+        } catch (ArithmeticException a) { a.printStackTrace(); }
+
+        timerLoops++;
+    }
+
+    // Zijn we al begonnen/klaar?
+    public boolean areWeDoneYet() {
+        if (timerLoops > 24 || timerLoops == 0) {
+            timerLoops = 0;
+            return true;
+        }
+        return false;
+    }
+
+    // Zitten we in de laatste loop?
+    public boolean isLastLoop() { return (timerLoops == 24) ? true : false;  }
+
+}

model/drawObjects/PointAnimation.java

@@ -0,0 +1,48 @@
+package model.drawObjects;
+
+import model.gameState.PlayState;
+
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.util.LinkedList;
+
+public class PointAnimation extends DrawObject {
+
+    LinkedList<Point2D.Double>   puntenPos   =   new LinkedList<>();
+    LinkedList<Integer>          puntenGain  =   new LinkedList<>();
+    LinkedList<Integer>          iterations  =   new LinkedList<>();
+
+    public static double LastPointIncrement = 0;
+
+    public PointAnimation() {    }
+
+    public void enemyDied(Point2D.Double p) {
+        puntenPos.add(new Point2D.Double(p.getX(), p.getY()));
+        puntenGain.add((int)LastPointIncrement);
+        iterations.add(0);
+    }
+
+    @Override
+    public void draw(Graphics2D g2) {
+            for (int x = 0; x < puntenPos.size(); x++) {
+                g2.drawString("" + puntenGain.get(x), (int) puntenPos.get(x).getX(), (int) puntenPos.get(x).getY());
+
+                update(0);
+            }
+    }
+
+    @Override
+    public void update(float factor) {
+
+        for (int x = 0; x < puntenPos.size(); x++) {
+            puntenPos.get(x).setLocation(puntenPos.get(x).getX(), puntenPos.get(x).getY() - 3);
+            iterations.set(x, iterations.get(x) + 1);
+
+            if (iterations.get(x) > 100) {
+                puntenPos.remove(x);
+                iterations.remove(x);
+                puntenGain.remove(x);
+            }
+        }
+    }
+}

model/gameState/GameOverState.java

@@ -9,21 +9,15 @@ import java.awt.RenderingHints;
 import java.awt.Transparency;
 import java.awt.image.BufferedImage;
 import java.awt.image.VolatileImage;
-import java.awt.image.WritableRenderedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 
-import javax.imageio.ImageIO;
-
-import com.google.zxing.WriterException;
-
 import model.GameModel;
 import model.SongHandler;
 import model.objects.InfoPanel;
 import model.objects.highscore.HighscoreName;
-import net.glxn.qrgen.QRCode;
-import net.glxn.qrgen.image.ImageType;
+
+import com.google.zxing.WriterException;
+
 import control.GameStateManager;
 import control.GameStateManager.State;
 import control.button.ButtonEvent;
@@ -54,6 +48,7 @@ public class GameOverState extends GameState {
 	public void init() {
 		createBackground();
 		ButtonHandler.getButton(1).setColor(GameModel.colors[0]);
+		ButtonHandler.getButton(2).setColor(GameModel.colors[2]);
 		JoystickHandler.REPEAT = true;
 		uploaded = false;
 	}
@@ -71,7 +66,8 @@ public class GameOverState extends GameState {
 		if(!uploaded)
 			hsn.drawName(g2);
 		else if(QRimage != null){
-			g2.drawImage(QRimage, 400, 600, 400, 400, null);
+			g2.drawImage(QRimage, (1280/2)-(QRimage.getWidth()/2), 600,null);
+			//1280 is de breedte van de panel
 		}
 			
 	}
@@ -80,6 +76,9 @@ public class GameOverState extends GameState {
 	public void buttonPressed(ButtonEvent e) {
 		//System.out.println("Name: "+hsn.getName());
 		switch(e.getButton().getButtonID()){
+		case 0:
+			gsm.setState(State.TITLE_STATE);
+			break;
 		case 1:
 			if(hsn.getName().trim().length() >= 3)
 			{
@@ -98,7 +97,6 @@ public class GameOverState extends GameState {
 					}
 					uploaded = true;
 
-					System.out.println(id);
 				}else{
 					gsm.setState(State.MENU_STATE);
 				}
@@ -106,6 +104,7 @@ public class GameOverState extends GameState {
 			break;			
 		case 2:
 			gsm.setState(State.MENU_STATE);
+			break;
 		}
 		
 		

model/gameState/GameState.java

@@ -26,4 +26,5 @@ public abstract class GameState  {
 	public abstract void buttonPressed(ButtonEvent e);	
 	public abstract void buttonReleased(ButtonEvent e);	
 	public abstract void onJoystickMoved(JoystickEvent e);
+	public void stopAudio() { 	sh.close();   }
 }

model/gameState/MenuState.java

@@ -40,7 +40,7 @@ public class MenuState extends GameState {
 	private ArrayList<DifficultyButton> buttons2;
 	private int selected, oldselected;
 	private List<Song> songs;
-	SQLConnector sql = new SQLConnector();
+	SQLConnector sql;
 
 	private int animationcounter;
 	private boolean subscreen, startanimation;
@@ -72,6 +72,7 @@ public class MenuState extends GameState {
 		this.songs = sh.getSongs();
 		startanimation = true;
 		subscreen = false;
+		this.sql = sql;
 		
 		selected = 0;
 		oldselected = -1;
@@ -143,11 +144,11 @@ public class MenuState extends GameState {
 	public void draw(Graphics2D g2) {
 
 		buttons.clear();		
-		buttons.add(new MenuButton(400,250,GameModel.colors[kleurButton1],selectedToSong(selected-2)));
-		buttons.add(new MenuButton(400,390,GameModel.colors[kleurButton2],selectedToSong(selected-1)));
-		buttons.add(new MenuButton(360,525,920,80,GameModel.colors[kleurButton3],selectedToSong(selected)));
-		buttons.add(new MenuButton(400,670,GameModel.colors[kleurButton4],selectedToSong(selected+1)));
-		buttons.add(new MenuButton(400,810,GameModel.colors[kleurButton5],selectedToSong(selected+2)));
+		buttons.add(new MenuButton(300,260,GameModel.colors[kleurButton1],selectedToSong(selected-2)));
+		buttons.add(new MenuButton(300,380,GameModel.colors[kleurButton2],selectedToSong(selected-1)));
+		buttons.add(new MenuButton(260,520,1020,80,GameModel.colors[kleurButton3],selectedToSong(selected)));
+		buttons.add(new MenuButton(300,680,GameModel.colors[kleurButton4],selectedToSong(selected+1)));
+		buttons.add(new MenuButton(300,800,GameModel.colors[kleurButton5],selectedToSong(selected+2)));
 		buttons.get(2).setSelected(true);
 		
 		
@@ -179,7 +180,7 @@ public class MenuState extends GameState {
 			}
 			if(e.getButton().getButtonID() == 1){
 				sh.close();
-				gsm.setState(control.GameStateManager.State.PLAY_STATE);
+				gsm.setState(control.GameStateManager.State.PRE_GAME_STATE);
 			}
 		}else{										//Screen for selecting song
 			if(e.getButton().getButtonID() == 1){
@@ -225,9 +226,8 @@ public class MenuState extends GameState {
 					difSelect = 0;
 				}
 				
-				//System.out.println(difSelect);
 			}
-			else if(e.getJoystick().getPos() == Position.CENTER)	
+			else if(e.getJoystick().getPos() == Joystick.Position.CENTER)	
 			{
 				sh.set(selectedToSong(selected).getSongs().get(difSelect));
 			}
@@ -428,51 +428,6 @@ public class MenuState extends GameState {
 			g2.drawString("No Highscores found", 30, 400);
 		}
 		
-		/*
-		List<Highscore> highscores = sql.getHighscores(selectedToSong(selected), sh.getCurrentSong().getSongs().get(difSelect));
-		List<Highscore> dailyHighs = new ArrayList<Highscore>();
-		int highest = 0;
-		int oldHighest = 0;
-		
-		Date date = new Date();
-		int time = date.getDay();
-		int dailyHighest = 0;
-		int oldDailyHighest = 0;
-		
-		
-		String name = "";
-		String dailyName = "";
-		
-		for(Highscore h:highscores){
-			
-			oldHighest = h.getScore();
-			if(oldHighest > highest){
-				highest = oldHighest;
-				name = h.getName();
-			}
-			
-			
-			if(time == h.getDate().getDay())
-				dailyHighs.add(h);
-			for(int i = 0; i < dailyHighs.size(); i ++){
-				oldDailyHighest = dailyHighs.get(i).getDate().getDay();
-				if(oldDailyHighest > dailyHighest){
-					dailyHighest = oldDailyHighest;
-					dailyName = h.getName();
-				}
-			}	
-		}
-		
-		
-		g2.setColor(Color.WHITE);
-		g2.drawString("Author: " + selectedToSong(selected).getAuthor(), 30, 200);
-		g2.drawString("Overall Highscore: " + highest , 30, 300);
-		g2.drawString("Overall Highscore by: " + name, 30, 400);
-		g2.drawString("Daily Highscore: " + dailyHighest, 30, 500);
-		g2.drawString("Daily Highscore by: : " + dailyName, 30, 600);
-		
-		*/
-		
 		
 		for(DifficultyButton b : buttons2){
 			b.draw(g2);

model/gameState/PlayState.java

@@ -5,6 +5,7 @@ import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Stroke;
 import java.awt.geom.Ellipse2D;
+import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.util.Iterator;
 
@@ -12,6 +13,7 @@ import main.Window;
 import model.SongHandler;
 import model.drawObjects.Enemy;
 import model.drawObjects.Player;
+import model.drawObjects.PointAnimation;
 import model.objects.InfoPanel;
 import model.objects.Path;
 import model.objects.PlayArea;
@@ -107,8 +109,6 @@ public class PlayState extends GameState {
 		if(progress > sh.getCurrentSongInstance().getEndTime() + Enemy.secondsToEnd*1000*2)
 			endGame();
 
-//		System.out.println(progress - oldProgress + " / " + area.paths.get(player.getIndex()).getEnemysInPath().size());
-
 		oldProgress = progress;
 
 		Enemy closedEnemy = null;
@@ -120,7 +120,6 @@ public class PlayState extends GameState {
 			while (enemyIterator.hasNext()) {
 
 				Enemy e = enemyIterator.next();
-//				System.out.println("Path: "+e.getIndex()+"\tDistance: "+(Enemy.distanceToOctagon-e.getDistanceFromStart()));				
 				if (e.getDistanceFromStart() > Enemy.distanceToOctagon + (sizeOfEnemy * 1.5)) {
 					enemyIterator.remove();
 					lifePoints -= 5;
@@ -161,8 +160,16 @@ public class PlayState extends GameState {
 	}
 
 	private void endGame() {
-		gsm.setState(State.GAMEOVER_STATE);
-		sql.addPlaydata(sh.getCurrentSong(), sh.getCurrentSongInstance(), sh.getProgress()/1000, enemies_missed, enemies_hit, buttons_pressed, joystick_moved);
+		if(sh.getProgress()/1000 < 5000)	
+		{
+			sql.addPlaydata(sh.getCurrentSong(), sh.getCurrentSongInstance(), sh.getProgress()/1000, enemies_missed, enemies_hit, buttons_pressed, joystick_moved);
+			sh.getCurrentSongInstance().played();
+		}
+		
+		if(currentScore == 0)
+			gsm.setState(State.MENU_STATE);
+		else
+			gsm.setState(State.GAMEOVER_STATE);
 	}
 
 	@Override
@@ -210,19 +217,21 @@ public class PlayState extends GameState {
 			Enemy enemy = enemysInPath.next();
 			if (enemy.getDistanceFromStart() > Enemy.distanceToOctagon || enemy.getDistanceFromStart() > Enemy.distanceToOctagon + sizeOfEnemy) {
 				if (e.getButton().getColor().equals(enemy.getColor())) {
-					currentScore += enemy.getDistanceFromStart() - Enemy.distanceToOctagon;
+					PointAnimation.LastPointIncrement = (int)(enemy.getDistanceFromStart() - Enemy.distanceToOctagon);
+					currentScore += PointAnimation.LastPointIncrement;
 					comboScore += 5;
 					lifePoints = Math.min(lifePoints+10, 100);
 					area.setHitAreaColor(enemy.getColor());
+					area.enemyDied((Point2D.Double) enemy.getEnemy().getP1());
 					area.hit();
 					enemies_hit++;
+					infoPanel.throwACoin(); // Coin Animatie starten bij hit
 					enemysInPath.remove();
 					notHit = false;
 					break;
 				}
 			}
 		}
-		
 
 		player.setBeat();
 

model/gameState/PreGameState.java

@@ -0,0 +1,89 @@
+package model.gameState;
+
+import image.Images;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+
+import model.SongHandler;
+import control.GameStateManager;
+import control.button.ButtonEvent;
+import control.joystick.JoystickEvent;
+import data.io.SQLConnector;
+
+public class PreGameState extends GameState {
+
+	double index2 = 3;
+	double index = 3;
+	double timer;
+	int grootte = 150;
+	BasicStroke s = new BasicStroke(20);
+	
+	BufferedImage screenshot;
+	
+	public PreGameState(GameStateManager gsm, SongHandler sh, SQLConnector sql) {
+		super(gsm, sh, sql);
+		screenshot = Images.getImage(Images.ImageType.screenshot);	
+	}
+
+	@Override
+	public void init() {
+		
+	}
+
+	@Override
+	public void update(float factor) {
+		index2 -= factor/1000;
+		index = (double) Math.round(index2*1000)/1000;
+		if(index <= 0){
+			gsm.setState(control.GameStateManager.State.PLAY_STATE);
+		}
+		
+		if(grootte > 270)
+			grootte = 150;
+		grootte+=2;
+	}
+
+	@Override
+	public void draw(Graphics2D g2) {
+		g2.drawImage(screenshot,0,0,1280,1024,null);
+		Font textFont = new Font("OCR A Extended", Font.BOLD,grootte);		
+		g2.setFont(textFont);
+		g2.setStroke(s);
+		g2.setColor(Color.RED);
+		String text = "" + index;
+		int width = g2.getFontMetrics().stringWidth(text);		
+		g2.drawString(text,  325, 400);
+		if(index < 1){
+			text = "GO!!!";
+		}
+		else if (index < 2){
+			text = "SET";
+		}
+		else{
+			text = "READY";
+		}
+		width =  g2.getFontMetrics().stringWidth(text);
+		g2.drawString(text, (256+1024/2)-width/2, 600);
+	}
+	
+
+	@Override
+	public void buttonPressed(ButtonEvent e) {
+		
+	}
+
+	@Override
+	public void buttonReleased(ButtonEvent e) {
+		
+	}
+
+	@Override
+	public void onJoystickMoved(JoystickEvent e) {
+		
+	}
+
+}

model/gameState/TitleState.java

@@ -21,23 +21,23 @@ import data.io.SQLConnector;
 
 public class TitleState extends GameState {
 
-    BufferedImage pressStart = Images.getImage(ImageType.pressstart);
-    BufferedImage colorStrike = Images.getImage(ImageType.colorstrike);
-    BufferedImage kast = Images.getImage(ImageType.kast);
-    VolatileImage background;
-	Font textFont = new Font("OCR A Extended", Font.BOLD, 15);
-	Font textFont2 = new Font("OCR A Extended", Font.BOLD, 130);
-	GradientPaint gp = new GradientPaint(300, 0, new Color(0, 0, 1, 0.6f), 980, 1024, new Color(0, 0, 1, 0.2f));
+	private BufferedImage 	pressStart 	= 	Images.getImage(ImageType.pressstart),
+			colorStrike = 	Images.getImage(ImageType.colorstrike),
+			kast 		= 	Images.getImage(ImageType.kast);
+	private VolatileImage 	background;
 
-	
-    int index = 0;
-    int varx = 0;
-    int frame;
+	private Font 			textFont 	= 	new Font("OCR A Extended", Font.BOLD, 15),
+			textFont2 	=	new Font("OCR A Extended", Font.BOLD, 130);
+
+	private GradientPaint gp = new GradientPaint(300, 0, new Color(0, 0, 1, 0.6f), 980, 1024, new Color(0, 0, 1, 0.2f));
+
+
+	private int index 		= 0,
+			varx 		= 0,
+			indexKast 	= 0,
+			xKast	  	= 0,
+			frame;
 
-    
-    int indexKast = 0;
-    int xKast=0;
-    
 	public TitleState(GameStateManager gsm, SongHandler sh, SQLConnector sql){
 		super(gsm, sh, sql);
 		createBackground();
@@ -50,34 +50,35 @@ public class TitleState extends GameState {
 
 	@Override
 	public void update(float factor) {
-
-        frame++;
-        indexKast++;
+		frame++;
+		indexKast++;
 	}
 
-	@Override
 	public void draw(Graphics2D g2) {
-		g2.drawImage(background, 0, 0, 1280, 1024, null);
-		int image_x = ((frame / 6) % 6) * 49;
-		g2.drawImage(pressStart.getSubimage(image_x, 0, 49, 26),  640-122, 512, 245, 130, null);
-		
-		
-		
-		xKast = indexKast/10;
-		xKast%=4;
-		//g2.drawImage(kast.getSubimage(xKast*300,0,300,400), 640-122,650,300,400,null);
-		g2.drawImage(kast.getSubimage(xKast*300,0,300,400), 100,300,300,400,null);
+		// Scherm beelt wat kleurrijke rectangles op het scherm.
+		if (frame > 0) {
+			g2.drawImage(background, 0, 0, 1280, 1024, null);
+			createBackground();
+		}
+		if (frame > 160) {
+			// Code die de arcadekast en 'Press Start' toont.
+			int image_x = ((frame / 6) % 6) * 49;
+			g2.drawImage(pressStart.getSubimage(image_x, 0, 49, 26), 640 - 122, 512, 245, 130, null);
+
+			xKast = indexKast / 10;
+			xKast %= 4;
+			g2.drawImage(kast.getSubimage(xKast * 300, 0, 300, 400), 100, 300, 300, 400, null);
+		}
 	}
 
 	@Override
 	public void buttonPressed(ButtonEvent e) {
 
 		switch (e.getButton().getButtonID()) {
-		case 0:
-			gsm.setState(State.MENU_STATE);
-			break;
+			case 0:
+				gsm.setState(State.MENU_STATE);
+				break;
 		}
-
 	}
 
 	@Override
@@ -92,35 +93,47 @@ public class TitleState extends GameState {
 	public void createBackground() {
 		background = Images.initVolatileImage(1280, 1024, Transparency.OPAQUE);
 		Graphics2D g2 = background.createGraphics();
-		RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-		g2.setRenderingHints(rh);
-		g2.setColor(new Color(1, 1, 1, 0.3f));
-		g2.fillRect(0, 0, 1280, 1024);
 
-		g2.setColor(new Color(0, 1, 0, 0.7f));
-		g2.fillRect(0, 0, 100, 1024);
-		g2.fillRect(1180, 0, 100, 1024);
+		if (frame > 0) {
+			RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+			g2.setRenderingHints(rh);
+		}
+		if (frame > 20) {
+			g2.setColor(new Color(1, 1, 1, 0.3f));
+			g2.fillRect(0, 0, 1280, 1024);
+		}
+		if (frame > 40) {
+			g2.setColor(new Color(0, 1, 0, 0.7f));
+			g2.fillRect(0, 0, 100, 1024);
+			g2.fillRect(1180, 0, 100, 1024);
+		}
+		if (frame > 60) {
+			g2.setColor(new Color(1, 1, 0, 0.7f));
+			g2.fillRect(100, 0, 100, 1024);
+			g2.fillRect(1080, 0, 100, 1024);
+		}
+		if (frame > 80) {
+			g2.setColor(new Color(1, 0, 0, 0.7f));
+			g2.fillRect(200, 0, 100, 1024);
+			g2.fillRect(980, 0, 100, 1024);
+		}
+		if (frame > 100) {
+			g2.setPaint(gp);
+			g2.fillRect(300, 0, 680, 1024);
+		}
+		if (frame > 120) {
+			g2.setFont(textFont);
+			g2.setColor(Color.WHITE);
+			g2.drawString("©2015 Team Hamtaro", 550, 1012);
+		}
+		if (frame > 140) {
+			g2.setColor(Color.RED);
+			g2.setFont(textFont2);
+			g2.drawString("Color", 385, 212);
+			g2.drawString("Strike", 390, 342);
+			g2.dispose();
+		}
 
-		g2.setColor(new Color(1, 1, 0, 0.7f));
-		g2.fillRect(100, 0, 100, 1024);
-		g2.fillRect(1080, 0, 100, 1024);
-
-		g2.setColor(new Color(1, 0, 0, 0.7f));
-		g2.fillRect(200, 0, 100, 1024);
-		g2.fillRect(980, 0, 100, 1024);
-
-		g2.setPaint(gp);
-		g2.fillRect(300, 0, 680, 1024);
-
-		g2.setFont(textFont);
-		g2.setColor(Color.WHITE);
-		g2.drawString("©2015 Team Hamtaro", 550, 1012);
-
-		g2.setColor(Color.RED);
-		g2.setFont(textFont2);
-		g2.drawString("Color", 385, 212);
-		g2.drawString("Strike", 390, 342);
-		g2.dispose();
 		background.createGraphics();
 	}
 

model/objects/InfoPanel.java

@@ -11,6 +11,7 @@ import java.awt.Transparency;
 import java.awt.image.VolatileImage;
 
 import model.SongHandler;
+import model.drawObjects.CoinAnimation;
 import model.gameState.PlayState;
 
 public class InfoPanel {
@@ -20,6 +21,10 @@ public class InfoPanel {
 	private VolatileImage infoPanel;
 	private SongHandler sh;
 	private String time;
+
+	private int tempComboMulitplier;
+
+	private CoinAnimation coinAnimation = new CoinAnimation(125, 300);
 	
 	public InfoPanel(int x, int y, SongHandler sh){
 		this.x = x;
@@ -40,7 +45,7 @@ public class InfoPanel {
 //		time = progress + ":" +  time;
 		
 		long progress = (sh.getProgress() / 1000);
-		String millis = ((progress) % 1000) + "".length() > 3 ? ("" +((progress) % 1000)).substring(0, 2) : "" + ((progress) % 1000);
+		String millis = (((progress) % 1000) + "").length() > 3 ? ("" +((progress) % 1000)).substring(0, 2) : "" + ((progress) % 1000);
 		String second = ((progress / 1000) % 60 + "").length() <= 1 ? "0" +((progress / 1000) % 60) : "" + ((progress / 1000) % 60);
 		String minute = ((progress / (1000 * 60)) % 60 + "").length() <= 1 ? "0" +((progress / (1000 * 60)) % 60) : "" + ((progress / (1000 * 60)) % 60);
 		time = minute + ":" + second + ":" + millis;
@@ -80,14 +85,27 @@ public class InfoPanel {
 //	    GradientPaint gp = new GradientPaint(300, 0, new Color(200,200,255), 256, 1024, Color.WHITE);
 //	    g2.setPaint(gp);
 //		g2.fillRect(x, y, 256, 1024);
-			
-			
-		g2.setColor(Color.YELLOW);		
+
+		g2.setColor(Color.YELLOW);
+		// Controlen of coin animatie nodig is
+		if (!coinAnimation.areWeDoneYet()) {
+			coinAnimation.draw(g2);
+			// Score pas updaten wanneer coin in zijn laatste draw loop zit
+			if (coinAnimation.isLastLoop())
+				tempComboMulitplier = PlayState.comboScore;
+		} else
+			tempComboMulitplier = PlayState.comboScore;
+
+
 		g2.fillRect(25, 1000 - 7 * PlayState.comboScore, 200, 0 + 7 * PlayState.comboScore);
 		g2.dispose();
 		infoPanel.createGraphics();
 	}
-	
+
+	public void throwACoin() {
+		coinAnimation.start();		// Teller weer op 1 zetten
+	}
+
 	public void draw(Graphics2D g2){
 		g2.drawImage(infoPanel, 0, 0, 256,1024,null);
 	}

model/objects/MenuButton.java

@@ -5,6 +5,7 @@ import java.awt.Font;
 import java.awt.Graphics2D;
 import java.util.ArrayList;
 
+import main.Window;
 import audio.Song;
 
 public class MenuButton {
@@ -50,9 +51,9 @@ public class MenuButton {
 		}
 		else{
 			g2d.setColor(color.darker().darker());
-			g2d.fillRect(x-5, y-5,890,80);
+			g2d.fillRect(x-5, y-5,990,80);
 			g2d.setColor(color);
-			g2d.fillRect(x,y,880,70);
+			g2d.fillRect(x,y,980,70);
 		}
 
 		//draw text
@@ -60,7 +61,14 @@ public class MenuButton {
 		Font textFont = new Font("OCR A Extended", Font.BOLD,60);
 		g2d.setFont(textFont);
 		if(selected)
+		{
 			g2d.drawString(song.getTitle(),  x+50, y+63);
+			
+			Font textFont2 = new Font("OCR A Extended", Font.PLAIN,30);
+			g2d.setFont(textFont2);
+			g2d.drawString("# Played: " + song.getTimesPlayed(), Window.WIDTH - 450 - Math.min(song.getAuthor().length()*16, 570), y+yy+45);
+			g2d.drawString("Author: " + song.getAuthor(), Window.WIDTH - 200 - Math.min(song.getAuthor().length()*16, 570) , y+yy+45);
+		}
 		else
 			g2d.drawString(song.getTitle(),  x+50, y+57);
 	}

model/objects/PlayArea.java

@@ -2,22 +2,17 @@ package model.objects;
 
 import image.Images;
 
-import java.awt.AlphaComposite;
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Polygon;
-import java.awt.RenderingHints;
-import java.awt.Stroke;
-import java.awt.Transparency;
+import java.awt.*;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Line2D;
+import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.VolatileImage;
 import java.util.ArrayList;
 import java.util.List;
 
 import model.drawObjects.Enemy;
+import model.drawObjects.PointAnimation;
 import model.gameState.PlayState;
 
 public class PlayArea {
@@ -30,6 +25,7 @@ public class PlayArea {
 	private boolean hit = false;
 	private int count = 0,maxCount = 100,pathID = -1;
 	private Stroke stroke = new BasicStroke(5);
+	private PointAnimation pointAnimation = new PointAnimation();
 	
 	private Rectangle2D backgroundPlay = new Rectangle2D.Double(256, 0, 1024, 1024);
 	
@@ -122,8 +118,14 @@ public class PlayArea {
 			g2.setColor(pathColor);
 			g2.draw(paths.get(pathID));
 		}
+
+		Font scoreFont = new Font("OCR A Extended", Font.BOLD, 40);
+		Font tempFont = g2.getFont();
+		g2.setFont(scoreFont);
+		pointAnimation.draw(g2);
+		g2.setFont(tempFont);
 	}
-	
+
 	public Line2D getLine(int index){
 		if(index < 0){
 			index = 0;
@@ -158,4 +160,6 @@ public class PlayArea {
 		this.pathID = pathID;
 		this.pathColor = pathColor;
 	}
+
+	public void enemyDied(Point2D.Double p) { pointAnimation.enemyDied(p); }
 }

model/objects/highscore/HighscoreName.java

@@ -6,7 +6,7 @@ import java.awt.Graphics2D;
 
 public class HighscoreName {
 
-	private final char[] characters = " abcdefghijklmnopqrstuvwxyz0123456789†".toUpperCase().toCharArray();
+	private final char[] characters = " abcdefghijklmnopqrstuvwxyz0123456789+-?!".toUpperCase().toCharArray();
 	private int spacing = 10;
 	private HighscoreLetter[] letters;
 	private Font font;
@@ -18,7 +18,6 @@ public class HighscoreName {
 		int marge = (int) (Math.floor(nameLength/2)-1)*spacing;
 		x -= (double)HighscoreLetter.charLength*(nameLength/2.0) + marge;
 		
-		System.out.println(x);
 		for(int i = 0; i < letters.length; i++){			
 				letters[i] = new HighscoreLetter(characters, x+(HighscoreLetter.charLength*i)+(spacing*i), y);		
 		}