From 1709842a9ac8521f18296a79286a6361aa64bcc1 Mon Sep 17 00:00:00 2001 From: Zach Jordan Date: Mon, 5 Jun 2023 08:59:00 -0400 Subject: new apathetic empathy difficulty --- src/assets/mountains-1412683.svg | 5 +++++ src/assets/mountains-1412683_1920.png | Bin 0 -> 1115601 bytes src/assets/mountains.png | Bin 0 -> 1115601 bytes src/gameplay/SongPlayer.java | 2 +- src/gui/Driver.java | 2 +- src/gui/style.css | 2 +- src/main/SoundController.java | 2 +- 7 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 src/assets/mountains-1412683.svg create mode 100644 src/assets/mountains-1412683_1920.png create mode 100644 src/assets/mountains.png (limited to 'src') diff --git a/src/assets/mountains-1412683.svg b/src/assets/mountains-1412683.svg new file mode 100644 index 0000000..a6f5585 --- /dev/null +++ b/src/assets/mountains-1412683.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/assets/mountains-1412683_1920.png b/src/assets/mountains-1412683_1920.png new file mode 100644 index 0000000..39d560e Binary files /dev/null and b/src/assets/mountains-1412683_1920.png differ diff --git a/src/assets/mountains.png b/src/assets/mountains.png new file mode 100644 index 0000000..39d560e Binary files /dev/null and b/src/assets/mountains.png differ diff --git a/src/gameplay/SongPlayer.java b/src/gameplay/SongPlayer.java index 13b2b72..436c336 100644 --- a/src/gameplay/SongPlayer.java +++ b/src/gameplay/SongPlayer.java @@ -279,7 +279,7 @@ public class SongPlayer extends Pane { */ public void cancel() { Driver.soundController.playMenuSong(); - gui.Driver.setBackground("assets/forest.png"); + gui.Driver.setBackground("assets/mountains.png"); gameLoop.stop(); Driver.soundController.endSong(); } diff --git a/src/gui/Driver.java b/src/gui/Driver.java index 00a71cf..b588b22 100644 --- a/src/gui/Driver.java +++ b/src/gui/Driver.java @@ -75,7 +75,7 @@ public class Driver extends Application setMenu(new MainMenu()); - setBackground("assets/forest.png"); + setBackground("assets/mountains.png"); primaryStage.addEventHandler(KeyEvent.KEY_PRESSED, event -> { //full screen stuff if (KeyCode.F11.equals(event.getCode())) { diff --git a/src/gui/style.css b/src/gui/style.css index 3b05196..70dd775 100644 --- a/src/gui/style.css +++ b/src/gui/style.css @@ -189,7 +189,7 @@ Slider:focused .thumb{ .t0 { -fx-font-size: 125; - -fx-fill: white; + -fx-fill: black; } .t1 { diff --git a/src/main/SoundController.java b/src/main/SoundController.java index 0d2061c..b3c6d23 100644 --- a/src/main/SoundController.java +++ b/src/main/SoundController.java @@ -12,7 +12,7 @@ public class SoundController public MediaPlayer songMediaPlayer; public MediaPlayer sfxMediaPlayer; private HashMap presets = new HashMap<>(); - private File mainMenuSong = new File("src/assets/MenuMusicPlaceholder.wav"); + private File mainMenuSong = new File("src/assets/fairyfountain.wav"); public SoundController() { -- cgit v1.2.3