combo pitch now goes up as combo count goes up

Author: michaelchadwick

assets/js/app/lib/audio.js

@@ -85,10 +85,10 @@ Deckdle._playSFX = (action, arg = null) => {
     Deckdle.config.synthSFX.setMasterVol(Deckdle.settings.soundSFXLevel)
     Deckdle.config.synthSFX.setProgram(0, 1)
 
-    let note = arg ? 42 + arg : 42
-
     switch (action) {
-      case 'click_stock':
+      case 'click_stock': {
+        let note = arg ? 42 + arg : 42
+
         Deckdle.config.synthSFX.send([0x90, note, 100])
         setTimeout(() => {
           Deckdle.config.synthSFX.send([0x90, note - 2, 100])
@@ -102,21 +102,25 @@ Deckdle._playSFX = (action, arg = null) => {
           Deckdle.config.synthSFX.send([0x80, note - 4, 0])
         }, 300)
         break
+      }
+
+      case 'click_tableau_valid': {
+        let note = arg ? 60 + arg : 60
 
-      case 'click_tableau_valid':
-        Deckdle.config.synthSFX.send([0x90, 60, 100])
+        Deckdle.config.synthSFX.send([0x90, note, 100])
         setTimeout(() => {
-          Deckdle.config.synthSFX.send([0x90, 62, 100])
+          Deckdle.config.synthSFX.send([0x90, note + 2, 100])
         }, 40)
         setTimeout(() => {
-          Deckdle.config.synthSFX.send([0x90, 65, 100])
-        }, 70)
+          Deckdle.config.synthSFX.send([0x90, note + 5, 100])
+        }, 55)
         setTimeout(() => {
-          Deckdle.config.synthSFX.send([0x80, 60, 0])
-          Deckdle.config.synthSFX.send([0x80, 62, 0])
-          Deckdle.config.synthSFX.send([0x80, 65, 0])
+          Deckdle.config.synthSFX.send([0x80, note, 0])
+          Deckdle.config.synthSFX.send([0x80, note + 2, 0])
+          Deckdle.config.synthSFX.send([0x80, note + 5, 0])
         }, 300)
         break
+      }
 
       case 'click_tableau_invalid':
         Deckdle.config.synthSFX.send([0x90, 59, 100])

assets/js/app/lib/classes/cards/tableau.js

@@ -468,7 +468,7 @@ Deckdle._onTableauClick = (card, colId, rowId) => {
 
   if (card.classList.contains('available')) {
     if (Deckdle._tableauCardIsValid(card.dataset)) {
-      Deckdle._playSFX('click_tableau_valid')
+      Deckdle._playSFX('click_tableau_valid', Deckdle.comboCurrent)
 
       Deckdle._removeCardFromTableau(card)
 

assets/js/app/lib/debug.js

@@ -156,7 +156,7 @@ Deckdle._clearLocalStorage = (showModal = true) => {
 }
 
 Deckdle._debugCombo = () => {
-  Deckdle._playSFX('click_tableau_valid')
+  Deckdle._playSFX('click_tableau_valid', Deckdle.comboCurrent)
   Deckdle._increaseCombo()
 }