From a95f2e4319049e6d8695f3647c95bef452c2d761 Mon Sep 17 00:00:00 2001
From: Bui <bui@bui.pm>
Date: Sun, 2 Sep 2018 13:05:08 +0100
Subject: [PATCH] use mekadon voices for autoplay

---
 public/src/js/assets.js     | 21 ++++++++++++++++++++-
 public/src/js/controller.js |  6 +++++-
 public/src/js/game.js       | 30 +++++++++++++++---------------
 3 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/public/src/js/assets.js b/public/src/js/assets.js
index 4631b7b..7aeeee6 100644
--- a/public/src/js/assets.js
+++ b/public/src/js/assets.js
@@ -34,6 +34,7 @@ var assets = {
 		'start.wav',
 		'don.wav',
 		'ka.wav',
+
 		'combo-50.wav',
 		'combo-100.wav',
 		'combo-200.wav',
@@ -49,13 +50,31 @@ var assets = {
 		'combo-1200.wav',
 		'combo-1300.wav',
 		'combo-1400.wav',
+		'fullcombo.wav',
+
+		'combo-50-meka.wav',
+		'combo-100-meka.wav',
+		'combo-200-meka.wav',
+		'combo-300-meka.wav',
+		'combo-400-meka.wav',
+		'combo-500-meka.wav',
+		'combo-600-meka.wav',
+		'combo-700-meka.wav',
+		'combo-800-meka.wav',
+		'combo-900-meka.wav',
+		'combo-1000-meka.wav',
+		'combo-1100-meka.wav',
+		'combo-1200-meka.wav',
+		'combo-1300-meka.wav',
+		'combo-1400-meka.wav',
+		'fullcombo-meka.wav',
+
 		'song-select.wav',
 		'title.ogg',
 		'pause.wav',
 		'cancel.wav',
 		'results.wav',
 		'diffsel.wav',
-		'fullcombo.wav',
 
 		'gamefullcombo.wav',
 		'gameclear.wav',
diff --git a/public/src/js/controller.js b/public/src/js/controller.js
index a8af97e..486866f 100644
--- a/public/src/js/controller.js
+++ b/public/src/js/controller.js
@@ -86,7 +86,7 @@ function Controller(selectedSong, songData, autoPlayEnabled){
         if (score.fail == 0) {
             vp = 'fullcombo';
             setTimeout(function(){
-                assets.sounds['fullcombo'].playAsset();
+                _this.playSoundMeka('fullcombo');
             }, 1350);
         } else if (score.hp >= 50) {
             vp = 'clear';
@@ -135,6 +135,10 @@ function Controller(selectedSong, songData, autoPlayEnabled){
     this.playSound = function(soundID){
         _game.playSound(soundID);
     }
+
+    this.playSoundMeka = function(soundID){
+        _game.playSound(soundID + (autoPlayEnabled ? '-meka' : ''));
+    }
     
     this.pauseSound = function(soundID, stop){
         _game.pauseSound(soundID, stop);
diff --git a/public/src/js/game.js b/public/src/js/game.js
index 9b36758..747b169 100644
--- a/public/src/js/game.js
+++ b/public/src/js/game.js
@@ -310,49 +310,49 @@ function Game(controller, selectedSong, songData){
         
         switch(_combo){
             case 50:
-                controller.playSound("combo-50");
+                controller.playSoundMeka("combo-50");
                 break;
             case 100:
-                controller.playSound("combo-100");
+                controller.playSoundMeka("combo-100");
                 break;
             case 200:
-                controller.playSound("combo-200");
+                controller.playSoundMeka("combo-200");
                 break;
             case 300:
-                controller.playSound("combo-300");
+                controller.playSoundMeka("combo-300");
                 break;
             case 400:
-                controller.playSound("combo-400");
+                controller.playSoundMeka("combo-400");
                 break;
             case 500:
-                controller.playSound("combo-500");
+                controller.playSoundMeka("combo-500");
                 break;
             case 600:
-                controller.playSound("combo-600");
+                controller.playSoundMeka("combo-600");
                 break;
             case 700:
-                controller.playSound("combo-700");
+                controller.playSoundMeka("combo-700");
                 break;
             case 800:
-                controller.playSound("combo-800");
+                controller.playSoundMeka("combo-800");
                 break;
             case 900:
-                controller.playSound("combo-900");
+                controller.playSoundMeka("combo-900");
                 break;
             case 1000:
-                controller.playSound("combo-1000");
+                controller.playSoundMeka("combo-1000");
                 break;
             case 1100:
-                controller.playSound("combo-1100");
+                controller.playSoundMeka("combo-1100");
                 break;
             case 1200:
-                controller.playSound("combo-1200");
+                controller.playSoundMeka("combo-1200");
                 break;
             case 1300:
-                controller.playSound("combo-1300");
+                controller.playSoundMeka("combo-1300");
                 break;
             case 1400:
-                controller.playSound("combo-1400");
+                controller.playSoundMeka("combo-1400");
                 break;
         }
     }