diff --git a/public/assets/audio/calibration.wav b/public/assets/audio/se_calibration.wav similarity index 100% rename from public/assets/audio/calibration.wav rename to public/assets/audio/se_calibration.wav diff --git a/public/assets/audio/v_combo_1000_meka.wav b/public/assets/audio/v_combo_1000_meka.wav deleted file mode 100644 index ae8127d..0000000 Binary files a/public/assets/audio/v_combo_1000_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_combo_100_meka.wav b/public/assets/audio/v_combo_100_meka.wav deleted file mode 100644 index 2636bef..0000000 Binary files a/public/assets/audio/v_combo_100_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_combo_1100_meka.wav b/public/assets/audio/v_combo_1100_meka.wav deleted file mode 100644 index 616058c..0000000 Binary files a/public/assets/audio/v_combo_1100_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_combo_1200_meka.wav b/public/assets/audio/v_combo_1200_meka.wav deleted file mode 100644 index ac68af2..0000000 Binary files a/public/assets/audio/v_combo_1200_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_combo_1300_meka.wav b/public/assets/audio/v_combo_1300_meka.wav deleted file mode 100644 index 1d2d4b4..0000000 Binary files a/public/assets/audio/v_combo_1300_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_combo_1400_meka.wav b/public/assets/audio/v_combo_1400_meka.wav deleted file mode 100644 index 4ea2511..0000000 Binary files a/public/assets/audio/v_combo_1400_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_combo_over1500.wav b/public/assets/audio/v_combo_1500.wav similarity index 100% rename from public/assets/audio/v_combo_over1500.wav rename to public/assets/audio/v_combo_1500.wav diff --git a/public/assets/audio/v_combo_over1500_meka.wav b/public/assets/audio/v_combo_1600.wav similarity index 100% rename from public/assets/audio/v_combo_over1500_meka.wav rename to public/assets/audio/v_combo_1600.wav diff --git a/public/assets/audio/v_combo_1700.wav b/public/assets/audio/v_combo_1700.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_1700.wav differ diff --git a/public/assets/audio/v_combo_1800.wav b/public/assets/audio/v_combo_1800.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_1800.wav differ diff --git a/public/assets/audio/v_combo_1900.wav b/public/assets/audio/v_combo_1900.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_1900.wav differ diff --git a/public/assets/audio/v_combo_2000.wav b/public/assets/audio/v_combo_2000.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_2000.wav differ diff --git a/public/assets/audio/v_combo_200_meka.wav b/public/assets/audio/v_combo_200_meka.wav deleted file mode 100644 index 99a29ef..0000000 Binary files a/public/assets/audio/v_combo_200_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_combo_2100.wav b/public/assets/audio/v_combo_2100.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_2100.wav differ diff --git a/public/assets/audio/v_combo_2200.wav b/public/assets/audio/v_combo_2200.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_2200.wav differ diff --git a/public/assets/audio/v_combo_2300.wav b/public/assets/audio/v_combo_2300.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_2300.wav differ diff --git a/public/assets/audio/v_combo_2400.wav b/public/assets/audio/v_combo_2400.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_2400.wav differ diff --git a/public/assets/audio/v_combo_2500.wav b/public/assets/audio/v_combo_2500.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_2500.wav differ diff --git a/public/assets/audio/v_combo_2600.wav b/public/assets/audio/v_combo_2600.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_2600.wav differ diff --git a/public/assets/audio/v_combo_2700.wav b/public/assets/audio/v_combo_2700.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_2700.wav differ diff --git a/public/assets/audio/v_combo_2800.wav b/public/assets/audio/v_combo_2800.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_2800.wav differ diff --git a/public/assets/audio/v_combo_2900.wav b/public/assets/audio/v_combo_2900.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_2900.wav differ diff --git a/public/assets/audio/v_combo_3000.wav b/public/assets/audio/v_combo_3000.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_3000.wav differ diff --git a/public/assets/audio/v_combo_300_meka.wav b/public/assets/audio/v_combo_300_meka.wav deleted file mode 100644 index c5809c7..0000000 Binary files a/public/assets/audio/v_combo_300_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_combo_3100.wav b/public/assets/audio/v_combo_3100.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_3100.wav differ diff --git a/public/assets/audio/v_combo_3200.wav b/public/assets/audio/v_combo_3200.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_3200.wav differ diff --git a/public/assets/audio/v_combo_3300.wav b/public/assets/audio/v_combo_3300.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_3300.wav differ diff --git a/public/assets/audio/v_combo_3400.wav b/public/assets/audio/v_combo_3400.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_3400.wav differ diff --git a/public/assets/audio/v_combo_3500.wav b/public/assets/audio/v_combo_3500.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_3500.wav differ diff --git a/public/assets/audio/v_combo_3600.wav b/public/assets/audio/v_combo_3600.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_3600.wav differ diff --git a/public/assets/audio/v_combo_3700.wav b/public/assets/audio/v_combo_3700.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_3700.wav differ diff --git a/public/assets/audio/v_combo_3800.wav b/public/assets/audio/v_combo_3800.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_3800.wav differ diff --git a/public/assets/audio/v_combo_3900.wav b/public/assets/audio/v_combo_3900.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_3900.wav differ diff --git a/public/assets/audio/v_combo_4000.wav b/public/assets/audio/v_combo_4000.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_4000.wav differ diff --git a/public/assets/audio/v_combo_400_meka.wav b/public/assets/audio/v_combo_400_meka.wav deleted file mode 100644 index d76bf6a..0000000 Binary files a/public/assets/audio/v_combo_400_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_combo_4100.wav b/public/assets/audio/v_combo_4100.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_4100.wav differ diff --git a/public/assets/audio/v_combo_4200.wav b/public/assets/audio/v_combo_4200.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_4200.wav differ diff --git a/public/assets/audio/v_combo_4300.wav b/public/assets/audio/v_combo_4300.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_4300.wav differ diff --git a/public/assets/audio/v_combo_4400.wav b/public/assets/audio/v_combo_4400.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_4400.wav differ diff --git a/public/assets/audio/v_combo_4500.wav b/public/assets/audio/v_combo_4500.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_4500.wav differ diff --git a/public/assets/audio/v_combo_4600.wav b/public/assets/audio/v_combo_4600.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_4600.wav differ diff --git a/public/assets/audio/v_combo_4700.wav b/public/assets/audio/v_combo_4700.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_4700.wav differ diff --git a/public/assets/audio/v_combo_4800.wav b/public/assets/audio/v_combo_4800.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_4800.wav differ diff --git a/public/assets/audio/v_combo_4900.wav b/public/assets/audio/v_combo_4900.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_4900.wav differ diff --git a/public/assets/audio/v_combo_5000.wav b/public/assets/audio/v_combo_5000.wav new file mode 100644 index 0000000..a5034f1 Binary files /dev/null and b/public/assets/audio/v_combo_5000.wav differ diff --git a/public/assets/audio/v_combo_500_meka.wav b/public/assets/audio/v_combo_500_meka.wav deleted file mode 100644 index 17bd25e..0000000 Binary files a/public/assets/audio/v_combo_500_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_combo_50_meka.wav b/public/assets/audio/v_combo_50_meka.wav deleted file mode 100644 index 1fb3c2b..0000000 Binary files a/public/assets/audio/v_combo_50_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_combo_600_meka.wav b/public/assets/audio/v_combo_600_meka.wav deleted file mode 100644 index f57f443..0000000 Binary files a/public/assets/audio/v_combo_600_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_combo_700_meka.wav b/public/assets/audio/v_combo_700_meka.wav deleted file mode 100644 index b23db58..0000000 Binary files a/public/assets/audio/v_combo_700_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_combo_800_meka.wav b/public/assets/audio/v_combo_800_meka.wav deleted file mode 100644 index 84fad8a..0000000 Binary files a/public/assets/audio/v_combo_800_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_combo_900_meka.wav b/public/assets/audio/v_combo_900_meka.wav deleted file mode 100644 index 86ca70b..0000000 Binary files a/public/assets/audio/v_combo_900_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_fullcombo_meka.wav b/public/assets/audio/v_fullcombo_meka.wav deleted file mode 100644 index 0c683b6..0000000 Binary files a/public/assets/audio/v_fullcombo_meka.wav and /dev/null differ diff --git a/public/assets/audio/v_renda_meka.wav b/public/assets/audio/v_renda_meka.wav deleted file mode 100644 index 9cfb6f0..0000000 Binary files a/public/assets/audio/v_renda_meka.wav and /dev/null differ diff --git a/public/src/js/assets.js b/public/src/js/assets.js index 5c3e3bf..10967a6 100644 --- a/public/src/js/assets.js +++ b/public/src/js/assets.js @@ -90,32 +90,13 @@ var assets = { "se_don.wav", "se_ka.wav", "se_pause.wav", - - "v_combo_50_meka.wav", - "v_combo_100_meka.wav", - "v_combo_200_meka.wav", - "v_combo_300_meka.wav", - "v_combo_400_meka.wav", - "v_combo_500_meka.wav", - "v_combo_600_meka.wav", - "v_combo_700_meka.wav", - "v_combo_800_meka.wav", - "v_combo_900_meka.wav", - "v_combo_1000_meka.wav", - "v_combo_1100_meka.wav", - "v_combo_1200_meka.wav", - "v_combo_1300_meka.wav", - "v_combo_1400_meka.wav", - "v_combo_over1500_meka.wav", + "se_calibration.wav", - "v_fullcombo_meka.wav", - "v_renda_meka.wav", "v_results.wav", "v_sanka.wav", "v_songsel.wav", "v_start.wav", - "v_title.wav", - "calibration.wav" + "v_title.wav" ], "audioSfxLR": [ "neiro_1_don.wav", @@ -143,8 +124,43 @@ var assets = { "v_combo_1200.wav", "v_combo_1300.wav", "v_combo_1400.wav", - "v_combo_over1500.wav", - + "v_combo_1500.wav", + "v_combo_1600.wav", + "v_combo_1700.wav", + "v_combo_1800.wav", + "v_combo_1900.wav", + "v_combo_2000.wav", + "v_combo_2100.wav", + "v_combo_2200.wav", + "v_combo_2300.wav", + "v_combo_2400.wav", + "v_combo_2500.wav", + "v_combo_2600.wav", + "v_combo_2700.wav", + "v_combo_2800.wav", + "v_combo_2900.wav", + "v_combo_3000.wav", + "v_combo_3100.wav", + "v_combo_3200.wav", + "v_combo_3300.wav", + "v_combo_3400.wav", + "v_combo_3500.wav", + "v_combo_3600.wav", + "v_combo_3700.wav", + "v_combo_3800.wav", + "v_combo_3900.wav", + "v_combo_4000.wav", + "v_combo_4100.wav", + "v_combo_4200.wav", + "v_combo_4300.wav", + "v_combo_4400.wav", + "v_combo_4500.wav", + "v_combo_4600.wav", + "v_combo_4700.wav", + "v_combo_4800.wav", + "v_combo_4900.wav", + "v_combo_5000.wav", + "v_fullcombo.wav", "v_renda.wav", "v_results_fullcombo.wav", diff --git a/public/src/js/controller.js b/public/src/js/controller.js index 78f64ef..d1d683d 100644 --- a/public/src/js/controller.js +++ b/public/src/js/controller.js @@ -157,7 +157,7 @@ class Controller{ if(Math.round(score.gauge / 2) - 1 >= 25){ if(score.bad === 0){ vp = "fullcombo" - this.playSoundMeka("v_fullcombo", 1.350) + this.playSound("v_fullcombo", 1.350) }else{ vp = "clear" } @@ -225,13 +225,6 @@ class Controller{ this.playedSounds[id] = ms } } - playSoundMeka(soundID, time){ - var meka = "" - if(this.autoPlayEnabled && !this.multiplayer){ - meka = "_meka" - } - this.playSound(soundID + meka, time) - } togglePause(forcePause, pauseMove, noSound){ if(this.multiplayer === 1){ this.syncWith.game.togglePause(forcePause, pauseMove, noSound) diff --git a/public/src/js/game.js b/public/src/js/game.js index 6a2aa13..bb790ba 100644 --- a/public/src/js/game.js +++ b/public/src/js/game.js @@ -94,7 +94,7 @@ class Game{ circle.rendaPlayed = true if(this.rules.difficulty === "easy"){ assets.sounds["v_renda" + this.controller.snd].stop() - this.controller.playSoundMeka("v_renda") + this.controller.playSound("v_renda") } } if(!circle.beatMSCopied){ @@ -609,8 +609,8 @@ class Game{ if(this.combo > this.globalScore.maxCombo){ this.globalScore.maxCombo = this.combo } - if(this.combo === 50 || this.combo > 0 && this.combo % 100 === 0 && this.combo < 1500 || this.combo > 0 && this.combo % 500 === 0){ - this.controller.playSoundMeka("v_combo_" + (this.combo <= 1400 ? this.combo : "over1500")) + if(this.combo === 50 || this.combo > 0 && this.combo % 100 === 0 && this.combo <= 5000){ + this.controller.playSound("v_combo_" + this.combo) } if (this.songData.scoremode == 2 && this.combo > 0 && this.combo % 100 == 0) { this.globalScore.points += 10000; @@ -755,7 +755,7 @@ class Game{ case "audio": case "video": if(state === "audio" && !this.mainAsset){ - this.mainAsset = assets.sounds["calibration"] + this.mainAsset = assets.sounds["se_calibration"] this.mainMusicPlaying = false } if(progress.hit >= progress.requirement){