From 06a0fe0b46996f1d62068dd6176b8e8bc17de722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Ple=C3=9F?= Date: Sun, 3 Jun 2012 17:05:20 +0200 Subject: [PATCH] changed music --- src/de/ctdo/crashtest/TestClass.java | 10 ---------- src/de/ctdo/crashtest/game/TheGame.java | 19 +++++++++++++++---- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/de/ctdo/crashtest/TestClass.java b/src/de/ctdo/crashtest/TestClass.java index 3520787..878f2bf 100644 --- a/src/de/ctdo/crashtest/TestClass.java +++ b/src/de/ctdo/crashtest/TestClass.java @@ -11,17 +11,7 @@ public class TestClass { public static void main(String args[]) throws InterruptedException { - IMPDController mpdController = new MPDController(); - mpdController.playSong("VNV Nation", "Nemesis"); - - Thread.sleep(2000); - - mpdController.playSong("Enter Shikari", "Sorry, You're Not A Winner"); - - - Thread.sleep(2000); - mpdController.playSong("Calabria", "Pump It Up (Club Mix)"); } diff --git a/src/de/ctdo/crashtest/game/TheGame.java b/src/de/ctdo/crashtest/game/TheGame.java index b5c06d6..7093355 100644 --- a/src/de/ctdo/crashtest/game/TheGame.java +++ b/src/de/ctdo/crashtest/game/TheGame.java @@ -51,17 +51,21 @@ public class TheGame implements StateChangeListener, GuiEventListener, IRCEventL switch (newState) { case IDLE: - mpdController.playSong("VNV Nation", "Nemesis"); + mpdController.setVolume(45); + mpdController.playSong("start", "mix"); bunti.setPar56(0,0,0); bunti.setLampel(false,false,false); guiControl.showCountDown(false); break; case ENTERED_ROOM: - mpdController.playSong("Blümchen", "Herz an Herz"); + mpdController.setVolume(70); + mpdController.playSong("Modem", "Dial_In_and_HF Longplay"); bunti.setLampel(false,false,false); bunti.setPar56(20,0,100); break; case TABLE_GAME_ONE: + mpdController.setVolume(70); + mpdController.playSong("K2", "Der Berg Ruft"); bunti.setLampel(true,false,false); guiControl.showCountDown(true); bunti.setPar56(255,0,100); @@ -73,6 +77,8 @@ public class TheGame implements StateChangeListener, GuiEventListener, IRCEventL case TABLE_GAME_THREE: bunti.setLampel(false,true,false); bunti.setPar56(255,35,0); + mpdController.setVolume(60); + mpdController.playSong("Mo-Do","9 Eins Zwei Polizei"); break; case TABLE_GAME_FOUR: bunti.setLampel(false,true,false); @@ -85,21 +91,26 @@ public class TheGame implements StateChangeListener, GuiEventListener, IRCEventL case TABLE_GAME_SIX: bunti.setLampel(false,true,false); bunti.setPar56(255,100,0); + mpdController.setVolume(60); + mpdController.playSong("Zlatko & Jürgen","Großer Bruder"); break; case TABLE_GAME_SEVEN: bunti.setLampel(false,false,true); bunti.setPar56(255,100,0); - mpdController.playSong("K2", "Der berg ruft"); - ircClient.say("table game complete"); sayScore(); break; case TABLE_FINISH: // und roket muss starten bunti.setLampel(false,false,true); bunti.setPar56(0, 255, 0); + ircClient.say("table game complete, r0kets now"); + mpdController.setVolume(50); + mpdController.playSong("The Underdog Project", "Summer Jam"); break; case ROKET_DONE: bunti.setLampel(true,true,true); bunti.setPar56(255, 196, 0); + mpdController.setVolume(50); + mpdController.playSong("Coldplay", "Amsterdam"); break; }