diff --git a/src/de/ctdo/crashtest/game/TheGame.java b/src/de/ctdo/crashtest/game/TheGame.java index 2ba096b..cbfae9b 100644 --- a/src/de/ctdo/crashtest/game/TheGame.java +++ b/src/de/ctdo/crashtest/game/TheGame.java @@ -44,7 +44,6 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent if(gamerRating < 1) gamerRating = 1; } - /** * Event listener for state change events from statemachine * @param newState the new game state from statemachine @@ -63,7 +62,7 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent guiControl.setExtra(""); guiControl.setWall(""); - mpdController.setVolume(45); + mpdController.setVolume(50); mpdController.playSong("start", "mix"); bunti.setPar56(0,0,0); @@ -86,7 +85,7 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent break; case TABLE_GAME_ONE: relaisboard.setRelais(6, true); // enable third green circle - guiControl.setWall("64K RAM SYSTEM 38911 BASIC BYTES FREE. **** COMMODORE 64 BASIC V2 ****"); + //guiControl.setWall("64K RAM SYSTEM 38911 BASIC BYTES FREE. **** COMMODORE 64 BASIC V2 ****"); mpdController.setVolume(70); mpdController.playSong("K2", "Der Berg Ruft"); @@ -159,6 +158,7 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent case ROKET_STARTED: mpdController.setVolume(50); mpdController.playSong("The Underdog Project", "Summer Jam"); + mpdController.addToPlayList("Maximo Park", "Books of Boxes"); bunti.setLampel(false,true,false); bunti.setPar56(0, 255, 0); @@ -196,6 +196,10 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent } + /** + * Event listener for timer ticks from statemachine. + * @param tsecondsLeft the seconds left on the current game + */ @Override public void timerTick(int tsecondsLeft) { guiControl.setCountDown(tsecondsLeft); @@ -211,7 +215,6 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent } } - /** * Event listener for keyPress events from the GUI * @param key the pressed key @@ -388,11 +391,11 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent ircClient.say("gamerRating: " + gamerRating); } - private void resetDomotics() { relaisboard.toggleRelais(2, 2000); relaisboard.setRelais(7, true); // enable light barrier over relais relaisboard.setRelais(6, true); // enable third green circle + mpdController.clearPlaylist(); } private void disco() {