From e6050715fc23eef8e45aa9c4da4af8630f8b692f Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Fri, 19 Jun 2015 18:58:32 +0200 Subject: [PATCH 1/4] Small bugfix for playdata --- model/gameState/PlayState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/gameState/PlayState.java b/model/gameState/PlayState.java index db82b7b..10b1b50 100644 --- a/model/gameState/PlayState.java +++ b/model/gameState/PlayState.java @@ -158,7 +158,7 @@ public class PlayState extends GameState { } private void endGame() { - if(sh.getProgress()/1000 < 5000) + 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(); From 1ed5ac1be2bfeb038782e7bccbc50d7f572744fa Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Fri, 19 Jun 2015 19:10:15 +0200 Subject: [PATCH 2/4] Fixed skipping gameover --- model/gameState/GameOverState.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/model/gameState/GameOverState.java b/model/gameState/GameOverState.java index 6b65eb8..a6f703d 100644 --- a/model/gameState/GameOverState.java +++ b/model/gameState/GameOverState.java @@ -49,6 +49,13 @@ public class GameOverState extends GameState { createBackground(); ButtonHandler.getButton(1).setColor(GameModel.colors[0]); ButtonHandler.getButton(2).setColor(GameModel.colors[2]); + + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + JoystickHandler.REPEAT = true; uploaded = false; } From 5ce645482413c6314e0d85f8af6c6c3a1b3ed739 Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Fri, 19 Jun 2015 19:10:56 +0200 Subject: [PATCH 3/4] Spacing --- image/Images.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image/Images.java b/image/Images.java index a6c8b91..b562183 100644 --- a/image/Images.java +++ b/image/Images.java @@ -33,7 +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/help.png")))); + images.add(toCompatibleImage(ImageIO.read(Main.class.getResource("/image/help.png")))); } catch (IOException e) { e.printStackTrace(); } @@ -44,7 +44,7 @@ public class Images { } public enum ImageType { - pulse,cursor,pressstart,colorstrike,background,aanwijzers,kast,gameover,help + pulse,cursor,pressstart,colorstrike,background,aanwijzers,kast,gameover, help } public static BufferedImage readImage(File f) { From 2ba069c0e232995a163fcf060c949c38187f0854 Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Fri, 19 Jun 2015 19:11:09 +0200 Subject: [PATCH 4/4] Fixed import --- model/gameState/MenuState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/gameState/MenuState.java b/model/gameState/MenuState.java index 58a5499..4aec2cd 100644 --- a/model/gameState/MenuState.java +++ b/model/gameState/MenuState.java @@ -30,6 +30,7 @@ import control.GameStateManager.State; import control.button.ButtonEvent; import control.button.ButtonHandler; import control.joystick.Joystick; +import control.joystick.Joystick.Position; import control.joystick.JoystickEvent; import control.joystick.JoystickHandler; import data.io.SQLConnector; @@ -465,7 +466,6 @@ public class MenuState extends GameState { animationcounter++; if(buttons.get(button).getX() >= -200) buttonInAnimation(button+1); - } } }