diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java index a1d4137c750eb46110c1c1a020b7fb09aae8923e..6f980d5271853b580f31e74f3b3cac3ea1a9758d 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MenuBorderPaneController.java @@ -8,6 +8,7 @@ import javafx.scene.image.ImageView; import javafx.scene.layout.BorderPane; import javafx.scene.media.Media; import javafx.scene.media.MediaPlayer; +import javafx.scene.media.MediaView; import javafx.stage.Screen; import java.io.File; @@ -22,7 +23,7 @@ public class MenuBorderPaneController implements Initializable { public Button btnRight; @FXML public ImageView imgLeft, imgRight; - private int counter = 0; + private int counter = 1; private final SceneLoader sceneLoader = new SceneLoader(); MediaPlayer musicPlayer; @@ -36,19 +37,29 @@ public class MenuBorderPaneController implements Initializable { imgRight.setPreserveRatio(true); imgLeft.setFitWidth(imageWidth); imgLeft.setPreserveRatio(true); - backgroundMusic(); + backgroundMusic("cocBackgroundMusicTest.mp3"); } public void easterEgg() { btnRight.setOnMouseClicked(mouseEvent -> counter++); - if (counter == 4) { -// TODO: implement something stupid - System.out.println("monke"); + switch (counter) { + case 5: + musicPlayer.dispose(); + backgroundMusic("spongeBob.mp3"); + break; + case 12: + musicPlayer.dispose(); + backgroundMusic("stadiumRave.mp3"); + break; + case 20: + musicPlayer.dispose(); + backgroundMusic("wii.mp3"); + break; } } - private void backgroundMusic() { - Media media = new Media(new File("src/main/resources/sound/music/cocBackgroundMusicTest.mp3").toURI().toString()); + private void backgroundMusic(String file) { + Media media = new Media(new File("src/main/resources/sound/music/" + file).toURI().toString()); musicPlayer = new MediaPlayer(media); musicPlayer.setCycleCount(MediaPlayer.INDEFINITE); musicPlayer.play(); diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MusicPlayerSingleton.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MusicPlayerSingleton.java index 07c29f1027d9f636c6fe366483d9744d1c700c0c..0337d7e544b593ce0f36e4a71ca1f55343d50141 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MusicPlayerSingleton.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MusicPlayerSingleton.java @@ -2,6 +2,7 @@ package de.hdm_stuttgart.battlearena.Controller; import javafx.scene.media.MediaPlayer; public class MusicPlayerSingleton { +// creating a singleton so it can be stopped from other controller classes private static final MusicPlayerSingleton instance = new MusicPlayerSingleton(); private MediaPlayer mediaPlayer; diff --git a/src/main/resources/sound/music/spongeBob.mp3 b/src/main/resources/sound/music/spongeBob.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..cd919cc16ea0c103c0cc1c095f4a19ce5c88960c Binary files /dev/null and b/src/main/resources/sound/music/spongeBob.mp3 differ diff --git a/src/main/resources/sound/music/stadiumRave.mp3 b/src/main/resources/sound/music/stadiumRave.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..990274fd88b95bfc5fe584184f838cbc54c2dbdc Binary files /dev/null and b/src/main/resources/sound/music/stadiumRave.mp3 differ diff --git a/src/main/resources/sound/music/wii.mp3 b/src/main/resources/sound/music/wii.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..8b471420a2a4fbb8ff28b6ff2f8cfee463670097 Binary files /dev/null and b/src/main/resources/sound/music/wii.mp3 differ diff --git a/src/main/resources/styles/style.css b/src/main/resources/styles/style.css index 10e87f79316dd0b63888660131de8d5b470e4496..4841857be68584111ca0e31c4d4b02f1dbd1eb9d 100644 --- a/src/main/resources/styles/style.css +++ b/src/main/resources/styles/style.css @@ -25,10 +25,6 @@ -fx-skin: "de.hdm_stuttgart.battlearena.Controller.ButtonTransitionScale" } -#btnRight { - -fx-skin: none; -} - .accordion { -fx-font-size: 30; } diff --git a/src/main/resources/textures/images/gear_with_shadow.png b/src/main/resources/textures/images/gear_with_shadow.png index 257b137d61b5766a8e11338a5b977081e88de18c..7dad227dd915ca1907589a15b55cecd734d03cb9 100644 Binary files a/src/main/resources/textures/images/gear_with_shadow.png and b/src/main/resources/textures/images/gear_with_shadow.png differ diff --git a/src/main/resources/textures/videos/allMyFellas.mp4 b/src/main/resources/textures/videos/allMyFellas.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..4234d4da1c07a7e775bced2e4e44c2329c8be972 Binary files /dev/null and b/src/main/resources/textures/videos/allMyFellas.mp4 differ diff --git a/src/main/resources/textures/videos/bobama.mp4 b/src/main/resources/textures/videos/bobama.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..2052b4d842a398ac1788025ed579c5054fdad680 Binary files /dev/null and b/src/main/resources/textures/videos/bobama.mp4 differ diff --git a/src/main/resources/textures/videos/lifeCouldBeMonke.mp4 b/src/main/resources/textures/videos/lifeCouldBeMonke.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..67a0106470b6e00d968f9930b5081d517545b3e4 Binary files /dev/null and b/src/main/resources/textures/videos/lifeCouldBeMonke.mp4 differ diff --git a/src/main/resources/textures/videos/russianKid.mp4 b/src/main/resources/textures/videos/russianKid.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..08a7fe2015e28dc08e1ca6fbe907e46f691cec21 Binary files /dev/null and b/src/main/resources/textures/videos/russianKid.mp4 differ