diff --git a/src/main/java/eu/midnightdust/yaytris/Tetris.java b/src/main/java/eu/midnightdust/yaytris/Tetris.java index f3c975d..09185e6 100644 --- a/src/main/java/eu/midnightdust/yaytris/Tetris.java +++ b/src/main/java/eu/midnightdust/yaytris/Tetris.java @@ -28,10 +28,6 @@ public class Tetris { ui = new TetrisUI(); } - public static TetrisUI getUi() { - return ui; - } - public static Space getSpace() { return space; } diff --git a/src/main/java/eu/midnightdust/yaytris/game/Space.java b/src/main/java/eu/midnightdust/yaytris/game/Space.java index 9ff4e1f..7da5f09 100644 --- a/src/main/java/eu/midnightdust/yaytris/game/Space.java +++ b/src/main/java/eu/midnightdust/yaytris/game/Space.java @@ -1,6 +1,7 @@ package eu.midnightdust.yaytris.game; import eu.midnightdust.yaytris.Tetris; +import eu.midnightdust.yaytris.util.SoundEffect; import java.awt.Color; import java.util.*; @@ -76,6 +77,7 @@ public class Space { combo *= completedLines.size(); } } + if (!completedLines.isEmpty()) SoundEffect.LINE_COMPLETED.play(); for (int completedIndex = 0; completedIndex < completedLines.size(); completedIndex++) { // Remove completed lines int line = completedLines.toArray(new Integer[0])[completedIndex]; for (int i = line; i >= 0; i--) { diff --git a/src/main/java/eu/midnightdust/yaytris/game/Tetromino.java b/src/main/java/eu/midnightdust/yaytris/game/Tetromino.java index f0115c1..8e8607c 100644 --- a/src/main/java/eu/midnightdust/yaytris/game/Tetromino.java +++ b/src/main/java/eu/midnightdust/yaytris/game/Tetromino.java @@ -21,7 +21,7 @@ public class Tetromino { public boolean fall() { Vec2i newPos = centerPos.offset(Vec2i.of(0, 1)); if (collidesVertically(newPos)) { - SoundEffect.BEEP.play(); + SoundEffect.BOOP.play(); int[] affectedLines = new int[this.collision.length]; int line = centerPos.getY(); for (int i = 0; i < this.collision.length; i++) { diff --git a/src/main/java/eu/midnightdust/yaytris/util/SoundEffect.java b/src/main/java/eu/midnightdust/yaytris/util/SoundEffect.java index 2c93781..cb29c19 100644 --- a/src/main/java/eu/midnightdust/yaytris/util/SoundEffect.java +++ b/src/main/java/eu/midnightdust/yaytris/util/SoundEffect.java @@ -1,7 +1,7 @@ package eu.midnightdust.yaytris.util; public enum SoundEffect { - BEEP("/sounds/beep.wav"); + BOOP("/sounds/boop.wav"), LINE_COMPLETED("/sounds/line-completed.wav"); final String location; SoundEffect(String location) { diff --git a/src/main/resources/music/theme.wav b/src/main/resources/music/theme.wav index 3d3497f..46b75d1 100644 Binary files a/src/main/resources/music/theme.wav and b/src/main/resources/music/theme.wav differ diff --git a/src/main/resources/sounds/beep.wav b/src/main/resources/sounds/beep.wav deleted file mode 100644 index a67b809..0000000 Binary files a/src/main/resources/sounds/beep.wav and /dev/null differ diff --git a/src/main/resources/textures/logo.png b/src/main/resources/textures/logo.png index df0d4d0..5e8ce0a 100644 Binary files a/src/main/resources/textures/logo.png and b/src/main/resources/textures/logo.png differ diff --git a/tetris_settings.json5 b/tetris_settings.json5 index 03185c0..14c05c0 100644 --- a/tetris_settings.json5 +++ b/tetris_settings.json5 @@ -1,5 +1,5 @@ { - "musicVolume": 100, + "musicVolume": 25, "soundVolume": 100, "guiScale": 5.0, "difficulty": "NORMAL"