diff --git a/app.js b/app.js index 8000b34..265d6b6 100644 --- a/app.js +++ b/app.js @@ -350,7 +350,6 @@ class Tetromino extends THREE.Group { let testFacing = (this.facing + rotation + 4) % 4 return this.srs[this.facing][rotation].some((translation, rotationPoint) => { if (this.move(translation, testFacing)) { - //rotateSound.play() this.facing = testFacing this.rotatedLast = true if (rotationPoint == 4) this.rotationPoint4Used = true @@ -898,10 +897,12 @@ nextQueue.position.set(4, SKYLINE + 3) scene.add(nextQueue) let ghost = new Ghost() -const lineClearSound = new Audio("audio/line_clear.ogg") -const tetrisSound = new Audio("audio/tetris.ogg") -const music = new Audio("https://iterations.org/files/music/remixes/Tetris_CheDDer_OC_ReMix.mp3") -music.loop = true +const lineClearSound = new Audio("audio/line-clear.wav") +const tetrisSound = new Audio("audio/tetris.wav") +const hardDropSound = new Audio("audio/hard-drop.wav") +const tSpinSound = new Audio("audio/t-spin.wav") +const music = new Audio("https://iterations.org/files/music/remixes/Tetris_CheDDer_OC_ReMix.mp3") + music.loop = true window.addEventListener("resize", () => { renderer.setSize(window.innerWidth, window.innerHeight) @@ -1015,7 +1016,9 @@ function resume(event) { stats.time = stats.pauseTime lineClearSound.volume = settings.sfxVolume - tetrisSound.volume = settings.sfxVolume + tetrisSound.volume = settings.sfxVolume + hardDropSound.volume = settings.sfxVolume + tSpinSound.volume = settings.sfxVolume if (settings.musicVolume > 0) { music.volume = settings.musicVolume music.play() @@ -1060,7 +1063,11 @@ let playerActions = { hardDrop: function () { scheduler.clearTimeout(lockDown) - //hardDropSound.play() + hardDropSound.play() + if (settings.sfxVolume) { + hardDropSound.currentTime = 0 + hardDropSound.play() + } while (piece.move(TRANSLATION.DOWN)) stats.score += 2 lockDown() }, @@ -1153,12 +1160,14 @@ function lockDown() { scene.remove(piece) let tSpin = piece.tSpin let nbClearedLines = matrix.clearLines() - if (nbClearedLines == 4 || (nbClearedLines && tSpin)) { - tetrisSound.currentTime = 0 - if (tetrisSound.volume) tetrisSound.play() - } else if (nbClearedLines || tSpin) { - lineClearSound.currentTime = 0 - if (lineClearSound.volume) lineClearSound.play() + if (settings.sfxVolume) { + if (nbClearedLines == 4 || (tSpin && nbClearedLines)) { + tetrisSound.currentTime = 0 + tetrisSound.play() + } else if (nbClearedLines || tSpin) { + lineClearSound.currentTime = 0 + lineClearSound.play() + } } stats.lockDown(nbClearedLines, tSpin) diff --git a/audio/hard-drop.wav b/audio/hard-drop.wav new file mode 100644 index 0000000..183f33b Binary files /dev/null and b/audio/hard-drop.wav differ diff --git a/audio/line-clear.wav b/audio/line-clear.wav new file mode 100644 index 0000000..e6507cd Binary files /dev/null and b/audio/line-clear.wav differ diff --git a/audio/line_clear.ogg b/audio/line_clear.ogg deleted file mode 100644 index bc6616d..0000000 Binary files a/audio/line_clear.ogg and /dev/null differ diff --git a/audio/tetris.ogg b/audio/tetris.ogg deleted file mode 100644 index 8af92f0..0000000 Binary files a/audio/tetris.ogg and /dev/null differ diff --git a/audio/tetris.wav b/audio/tetris.wav new file mode 100644 index 0000000..f6cc51d Binary files /dev/null and b/audio/tetris.wav differ diff --git a/audio/tetris.xt b/audio/tetris.xt deleted file mode 100644 index 22b1b37..0000000 Binary files a/audio/tetris.xt and /dev/null differ diff --git a/favicon.ico b/favicon.ico index ff44603..bae2821 100644 Binary files a/favicon.ico and b/favicon.ico differ