diff --git a/images/metalpipe.png b/images/metalpipe.png new file mode 100644 index 0000000..147687f Binary files /dev/null and b/images/metalpipe.png differ diff --git a/index.html b/index.html index 1357bc6..76637f2 100644 --- a/index.html +++ b/index.html @@ -88,6 +88,10 @@ Meow SPACE +
+ Metal pipe + M +
Piano 1 ... @@ -117,6 +121,7 @@
+
@@ -125,6 +130,7 @@ + diff --git a/js/core.js b/js/core.js index c1d03d9..d804a58 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, + METALPIPE: 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, + "M": 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, + "M": InstrumentEnum.METALPIPE }) const ClickKeyEquivalentEnum = Object.freeze({ "1": "A", @@ -81,7 +84,8 @@ const TapKeyEquivalentEnum = Object.freeze({ "BONGO": ["D"], "CYMBAL": ["C"], "TAMBOURINE": ["B"], - "COWBELL": ["F"] + "COWBELL": ["F"], + "METALPIPE": ["M"] }, "tap-space": { "MEOW": [" "] @@ -134,7 +138,8 @@ const TapKeysPerLayerEnum = Object.freeze({ "layer-cymbal": ["tap-right"], "layer-marimba": ["tap-keys"], "layer-tambourine": ["tap-right"], - "layer-cowbell": ["tap-right"] + "layer-cowbell": ["tap-right"], + "layer-metalpipe": ["tap-right"] }) const LayersPerInstrumentEnum = Object.freeze({ "layer-bongo": InstrumentEnum.BONGO, @@ -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-metalpipe": InstrumentEnum.METALPIPE }) var pressed = []; var currentLayer; @@ -164,6 +170,7 @@ $(document).ready(function() { $.loadSimple("cymbal"); $.loadSimple("tambourine"); $.loadSimple("cowbell"); + $.loadSimple("metalpipe"); $.layers("layer-bongo"); $("select#select-instrument").on("change", function() { $.layers($(this).val()); @@ -298,6 +305,9 @@ var i18n_map = { "Tambourine": { "en": "Tambourine", "ca": "Pandereta"}, + "Metalpipe": { + "en": "Metal pipe", + "ca": "Tub metàl·lic"}, "Meow": { "en": "Meow", "ca": "Miol"}, diff --git a/sounds/metalpipe.mp3 b/sounds/metalpipe.mp3 new file mode 100644 index 0000000..acf000d Binary files /dev/null and b/sounds/metalpipe.mp3 differ diff --git a/sounds/metalpipe.wav b/sounds/metalpipe.wav new file mode 100644 index 0000000..7eb1c30 Binary files /dev/null and b/sounds/metalpipe.wav differ diff --git a/style/style.css b/style/style.css index 7492423..762aed0 100644 --- a/style/style.css +++ b/style/style.css @@ -280,7 +280,11 @@ select#select-instrument option { background-image: url(../images/cowbell.png) } -.instruments>#keyboard, .instruments>#cymbal, .instruments>#marimba, .instruments>#tambourine, .instruments>#cowbell { +.instruments>#metalpipe, #layer-metalpipe { + background-image: url(../images/metalpipe.png) +} + +.instruments>#keyboard, .instruments>#cymbal, .instruments>#marimba, .instruments>#tambourine, .instruments>#cowbell, .instruments>#metalpipe { visibility: hidden }