Commit a508206e authored by Zach Capalbo's avatar Zach Capalbo

Special Button Combo

parent 60bb019a
......@@ -29,6 +29,7 @@ class NoteButton extends Button
note = null
shifted = null
lowered = null
special = null
}
class OpenNoteButton extends NoteButton
......
......@@ -39,9 +39,15 @@ function findNote () {
}
}
if (shifter.pressed()) {
local shiftedUp = shifter.pressed()
local shiftedDown = downShifer.pressed()
if (shiftedUp && shiftedDown)
{
return highest.special;
} else if (shiftedUp) {
return highest.shifted;
} else if (downShifer.pressed()) {
} else if (shiftedDown) {
return highest.lowered;
} else {
return highest.note;
......
{
"Standard G": {
"buttons": [
{"note":"D4", "shifted": "B4", "lowered": "G3"},
{"note":"E4", "shifted": "C5", "lowered": "G3" },
{ "note": "FS4", "shifted": "D5", "lowered": "A3" },
{ "note": "G4", "shifted": "E5", "lowered": "B3"},
{ "note": "A4", "shifted": "G5", "lowered": "C4" }
{"note":"D4", "shifted": "B4", "lowered": "G3", "special": "FS5"},
{"note":"E4", "shifted": "C5", "lowered": "G3", "special": "FS5" },
{ "note": "FS4", "shifted": "D5", "lowered": "A3", "special": "FS5" },
{ "note": "G4", "shifted": "E5", "lowered": "B3", "special": "FS5"},
{ "note": "A4", "shifted": "G5", "lowered": "C4", "special": "FS5" }
],
"drones": ["G3", "C3", "D3", "E3", "G4", "FS4", "G2", "A3"],
"current_tuning": true,
......@@ -13,55 +13,55 @@
},
"C/F": {
"buttons": [
{"note":"C4", "shifted": "A4", "lowered": "E3"},
{"note":"D4", "shifted": "AS4", "lowered": "F3" },
{ "note": "E4", "shifted": "C5", "lowered": "G3" },
{ "note": "F4", "shifted": "D5", "lowered": "A3"},
{ "note": "G4", "shifted": "E5", "lowered": "B3" }
{"note":"C4", "shifted": "A4", "lowered": "E3", "special": "F5"},
{"note":"D4", "shifted": "AS4", "lowered": "F3", "special": "F5" },
{ "note": "E4", "shifted": "C5", "lowered": "G3", "special": "F5" },
{ "note": "F4", "shifted": "D5", "lowered": "A3", "special": "F5"},
{ "note": "G4", "shifted": "E5", "lowered": "B3", "special": "F5" }
],
"drones": ["F3", "C3", "AS3", "A3", "C4", "E3", "AS4"],
"color": [1, 4, 5]
},
"C2": {
"buttons": [
{"note":"C4", "shifted": "A4", "lowered": "E3"},
{"note":"D4", "shifted": "B4", "lowered": "F3" },
{ "note": "E4", "shifted": "C5", "lowered": "G3" },
{ "note": "F4", "shifted": "D5", "lowered": "A3"},
{ "note": "G4", "shifted": "E5", "lowered": "B3" }
{"note":"C4", "shifted": "A4", "lowered": "E3", "special": "F5"},
{"note":"D4", "shifted": "B4", "lowered": "F3", "special": "F5" },
{ "note": "E4", "shifted": "C5", "lowered": "G3", "special": "F5" },
{ "note": "F4", "shifted": "D5", "lowered": "A3", "special": "F5"},
{ "note": "G4", "shifted": "E5", "lowered": "B3", "special": "F5" }
],
"drones": ["F3", "C3", "G3", "A3", "C4", "E3", "G4"],
"color": [1, 1, 12]
},
"D": {
"buttons": [
{"note":"D4", "shifted": "A4", "lowered": "FS3"},
{"note":"E4", "shifted": "B4", "lowered": "G3" },
{ "note": "F4", "shifted": "C5", "lowered": "A3" },
{ "note": "FS4", "shifted": "D5", "lowered": "B3"},
{ "note": "G4", "shifted": "E5", "lowered": "CS4" }
{"note":"D4", "shifted": "A4", "lowered": "FS3", "special": "FS5"},
{"note":"E4", "shifted": "B4", "lowered": "G3", "special": "FS5" },
{ "note": "F4", "shifted": "C5", "lowered": "A3", "special": "FS5" },
{ "note": "FS4", "shifted": "D5", "lowered": "B3", "special": "FS5"},
{ "note": "G4", "shifted": "E5", "lowered": "CS4", "special": "FS5" }
],
"drones": ["G3", "C3", "D3", "A3", "FS3", "D4", "F4"],
"color": [1, 1, 5]
},
"D/G": {
"buttons": [
{"note":"E4", "shifted": "C5", "lowered": "G3"},
{"note":"FS4", "shifted": "D5", "lowered": "A3" },
{ "note": "G4", "shifted": "E5", "lowered": "B3" },
{ "note": "A4", "shifted": "FS5", "lowered": "C4"},
{ "note": "B4", "shifted": "G5", "lowered": "D4" }
{"note":"E4", "shifted": "C5", "lowered": "G3", "special": "A5"},
{"note":"FS4", "shifted": "D5", "lowered": "A3", "special": "A5" },
{ "note": "G4", "shifted": "E5", "lowered": "B3", "special": "A5" },
{ "note": "A4", "shifted": "FS5", "lowered": "C4", "special": "A5"},
{ "note": "B4", "shifted": "G5", "lowered": "D4", "special": "A5" }
],
"drones": ["G3", "C3", "D3", "E3", "G4", "FS4", "G2", "A3"],
"color": [3, 5, 0]
},
"Standard A": {
"buttons": [
{"note":"A4", "shifted": "FS5", "lowered": "CS4"},
{"note":"B4", "shifted": "G5", "lowered": "D4" },
{ "note": "CS5", "shifted": "A5", "lowered": "E4" },
{ "note": "D5", "shifted": "B5", "lowered": "FS4"},
{ "note": "E5", "shifted": "CS6", "lowered": "GS4" }
{"note":"A4", "shifted": "FS5", "lowered": "CS4", "special": "D6"},
{"note":"B4", "shifted": "G5", "lowered": "D4", "special": "D6" },
{ "note": "CS5", "shifted": "A5", "lowered": "E4", "special": "D6" },
{ "note": "D5", "shifted": "B5", "lowered": "FS4", "special": "D6"},
{ "note": "E5", "shifted": "CS6", "lowered": "GS4", "special": "D6" }
],
"drones": ["G3", "CS3", "D3", "A3", "FS3", "D4", "FS4"],
"current_tuning": true,
......
......@@ -32,6 +32,7 @@ function setTuning(tuningName) {
buttons[i].note = tuning.buttons[i].note;
buttons[i].shifted = tuning.buttons[i].shifted;
buttons[i].lowered = tuning.buttons[i].lowered;
buttons[i].special = tuning.buttons[i].special;
}
droneNotes.clear()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment