audio update

public/src/js/assets.js

@@ -90,32 +90,13 @@ var assets = {
 		"se_don.wav",
 		"se_ka.wav",
 		"se_pause.wav",
+		"se_calibration.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",
-
-		"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,7 +124,42 @@ 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",

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)

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){