diff --git a/images/triangle.png b/images/triangle.png
new file mode 100644
index 0000000..3aad3dd
Binary files /dev/null and b/images/triangle.png differ
diff --git a/index.html b/index.html
index 1357bc6..9b0c794 100644
--- a/index.html
+++ b/index.html
@@ -84,6 +84,10 @@
Tambourine
B
+
+ Triangle
+ S
+
Meow
SPACE
@@ -116,6 +120,7 @@
+
@@ -128,6 +133,7 @@
+
diff --git a/js/core.js b/js/core.js
index c1d03d9..80a1804 100644
--- a/js/core.js
+++ b/js/core.js
@@ -8,7 +8,8 @@ const InstrumentEnum = Object.freeze({
CYMBAL: 4,
MARIMBA: 5,
TAMBOURINE: 6,
- COWBELL: 7
+ COWBELL: 7,
+ TRIANGLE: 8,
})
const KeyEnum = Object.freeze({
"A": 1,
@@ -37,7 +38,8 @@ const KeyEnum = Object.freeze({
"O": 9,
"P": 0,
"B": 1,
- "F": 1
+ "F": 1,
+ "S": 1,
})
const InstrumentPerKeyEnum = Object.freeze({
"A": InstrumentEnum.BONGO,
@@ -66,7 +68,8 @@ const InstrumentPerKeyEnum = Object.freeze({
"O": InstrumentEnum.MARIMBA,
"P": InstrumentEnum.MARIMBA,
"B": InstrumentEnum.TAMBOURINE,
- "F": InstrumentEnum.COWBELL
+ "F": InstrumentEnum.COWBELL,
+ "S": InstrumentEnum.TRIANGLE,
})
const ClickKeyEquivalentEnum = Object.freeze({
"1": "A",
@@ -81,6 +84,7 @@ const TapKeyEquivalentEnum = Object.freeze({
"BONGO": ["D"],
"CYMBAL": ["C"],
"TAMBOURINE": ["B"],
+ "TRIANGLE": ["S"],
"COWBELL": ["F"]
},
"tap-space": {
@@ -134,6 +138,7 @@ const TapKeysPerLayerEnum = Object.freeze({
"layer-cymbal": ["tap-right"],
"layer-marimba": ["tap-keys"],
"layer-tambourine": ["tap-right"],
+ "layer-triangle": ["tap-right"],
"layer-cowbell": ["tap-right"]
})
const LayersPerInstrumentEnum = Object.freeze({
@@ -143,7 +148,8 @@ const LayersPerInstrumentEnum = Object.freeze({
"layer-cymbal": InstrumentEnum.CYMBAL,
"layer-marimba": InstrumentEnum.MARIMBA,
"layer-tambourine": InstrumentEnum.TAMBOURINE,
- "layer-cowbell": InstrumentEnum.COWBELL
+ "layer-cowbell": InstrumentEnum.COWBELL,
+ "layer-triangle": InstrumentEnum.TRIANGLE
})
var pressed = [];
var currentLayer;
@@ -163,6 +169,7 @@ $(document).ready(function() {
$.loadSimple("meow");
$.loadSimple("cymbal");
$.loadSimple("tambourine");
+ $.loadSimple("triangle");
$.loadSimple("cowbell");
$.layers("layer-bongo");
$("select#select-instrument").on("change", function() {
@@ -298,6 +305,9 @@ var i18n_map = {
"Tambourine": {
"en": "Tambourine",
"ca": "Pandereta"},
+ "Triangle": {
+ "en": "Triangle",
+ "ca": "Triangle"},
"Meow": {
"en": "Meow",
"ca": "Miol"},
diff --git a/sounds/triangle.mp3 b/sounds/triangle.mp3
new file mode 100644
index 0000000..07c2315
Binary files /dev/null and b/sounds/triangle.mp3 differ
diff --git a/sounds/triangle.wav b/sounds/triangle.wav
new file mode 100644
index 0000000..4054563
Binary files /dev/null and b/sounds/triangle.wav differ
diff --git a/style/style.css b/style/style.css
index 7492423..b50e160 100644
--- a/style/style.css
+++ b/style/style.css
@@ -280,6 +280,10 @@ select#select-instrument option {
background-image: url(../images/cowbell.png)
}
+.instruments>#triangle, #layer-triangle {
+ background-image: url(../images/triangle.png);
+}
+
.instruments>#keyboard, .instruments>#cymbal, .instruments>#marimba, .instruments>#tambourine, .instruments>#cowbell {
visibility: hidden
}