changed game a bit

This commit is contained in:
Lucas Pleß 2012-06-10 21:59:11 +02:00
parent 535a66a216
commit d26fca6efb
1 changed files with 8 additions and 5 deletions

View File

@ -44,7 +44,6 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent
if(gamerRating < 1) gamerRating = 1; if(gamerRating < 1) gamerRating = 1;
} }
/** /**
* Event listener for state change events from statemachine * Event listener for state change events from statemachine
* @param newState the new game state from statemachine * @param newState the new game state from statemachine
@ -63,7 +62,7 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent
guiControl.setExtra(""); guiControl.setExtra("");
guiControl.setWall(""); guiControl.setWall("");
mpdController.setVolume(45); mpdController.setVolume(50);
mpdController.playSong("start", "mix"); mpdController.playSong("start", "mix");
bunti.setPar56(0,0,0); bunti.setPar56(0,0,0);
@ -86,7 +85,7 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent
break; break;
case TABLE_GAME_ONE: case TABLE_GAME_ONE:
relaisboard.setRelais(6, true); // enable third green circle 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.setVolume(70);
mpdController.playSong("K2", "Der Berg Ruft"); mpdController.playSong("K2", "Der Berg Ruft");
@ -159,6 +158,7 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent
case ROKET_STARTED: case ROKET_STARTED:
mpdController.setVolume(50); mpdController.setVolume(50);
mpdController.playSong("The Underdog Project", "Summer Jam"); mpdController.playSong("The Underdog Project", "Summer Jam");
mpdController.addToPlayList("Maximo Park", "Books of Boxes");
bunti.setLampel(false,true,false); bunti.setLampel(false,true,false);
bunti.setPar56(0, 255, 0); 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 @Override
public void timerTick(int tsecondsLeft) { public void timerTick(int tsecondsLeft) {
guiControl.setCountDown(tsecondsLeft); guiControl.setCountDown(tsecondsLeft);
@ -211,7 +215,6 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent
} }
} }
/** /**
* Event listener for keyPress events from the GUI * Event listener for keyPress events from the GUI
* @param key the pressed key * @param key the pressed key
@ -388,11 +391,11 @@ public class TheGame implements StatemachineListener, GuiEventListener, IRCEvent
ircClient.say("gamerRating: " + gamerRating); ircClient.say("gamerRating: " + gamerRating);
} }
private void resetDomotics() { private void resetDomotics() {
relaisboard.toggleRelais(2, 2000); relaisboard.toggleRelais(2, 2000);
relaisboard.setRelais(7, true); // enable light barrier over relais relaisboard.setRelais(7, true); // enable light barrier over relais
relaisboard.setRelais(6, true); // enable third green circle relaisboard.setRelais(6, true); // enable third green circle
mpdController.clearPlaylist();
} }
private void disco() { private void disco() {