Various bugfixes

- Fixed a bug where Noise channels have incorrect labels in Mod channels
- Fixed a bug where pasting mod channels would result in an invalid instrument type
- Fixed a bug where drumset spectrums wouldn't get marked as dirty, resulting in strange behavior
- Made the document.title changes consistent
- Updated the "Instrument Type" tip prompt and manifest.webmanifest
- Removed unnecessary and incorrect ,operatorRow code in Layout.ts
- Removed scrollbars from the instrument settings

Author: Main

editor/Layout.ts

@@ -66,9 +66,6 @@ export class Layout {
 				.beepboxEditor.selectRow {
 					height: 2em;
 				}
-				.beepboxEditor .operatorRow {
-					heiht: 2em;
-				}
 				.beepboxEditor .trackAndMuteContainer {
 					max-height: 446px;
 				}

editor/Piano.ts

@@ -435,15 +435,15 @@ export class Piano {
 						}
 						break;
 					case 2:
-						channelVal = instrument.modChannels[Config.modCount - j - 1] + 1 - this._doc.song.pitchChannelCount;
-						instrumentsLength = this._doc.song.channels[channelVal - 1].instruments.length;
+						const absoluteChannelVal: number = instrument.modChannels[Config.modCount - j - 1];
+						const relativeChannelVal: number = absoluteChannelVal - this._doc.song.pitchChannelCount;
 
-						if (this._doc.song.channels[channelVal - 1].name == "") {
+						if (this._doc.song.channels[absoluteChannelVal].name == "") {
 
 							if (instrumentsLength > 1) {
 
-								if (channelVal >= 10 || instrumentVal >= 10) {
-									firstRow = "N" + channelVal;
+								if ((relativeChannelVal + 1) >= 10 || instrumentVal >= 10) {
+									firstRow = "N" + (relativeChannelVal + 1);
 									if (instrumentVal - 1 == instrumentsLength) {
 										firstRow += " All";
 									}
@@ -455,7 +455,7 @@ export class Piano {
 									}
 								}
 								else {
-									firstRow = "Noise" + channelVal;
+									firstRow = "Noise" + (relativeChannelVal + 1);
 									if (instrumentVal - 1 == instrumentsLength) {
 										firstRow += " All";
 									}
@@ -468,7 +468,7 @@ export class Piano {
 								}
 							}
 							else {
-								firstRow = "Noise " + channelVal;
+								firstRow = "Noise " + (relativeChannelVal + 1);
 							}
 						} else {
 
@@ -482,10 +482,10 @@ export class Piano {
 								} else {
 									insText = " I" + instrumentVal;
 								}
-								firstRow = "N" + channelVal + " " + this._doc.song.channels[channelVal - 1].name + insText;
+								firstRow = "N" + (relativeChannelVal + 1) + " " + this._doc.song.channels[absoluteChannelVal].name + insText;
 							}
 							else {
-								firstRow = "N" + channelVal + " " + this._doc.song.channels[channelVal - 1].name;
+								firstRow = "N" + (relativeChannelVal + 1) + " " + this._doc.song.channels[absoluteChannelVal].name;
 							}
 
 						}

editor/SongEditor.ts

@@ -3681,6 +3681,7 @@ export class SongEditor {
         const instrument: Instrument = channel.instruments[this._doc.getCurrentInstrument()];
         const instrumentCopy: any = instrument.toJsonObject();
         instrumentCopy["isDrum"] = this._doc.song.getChannelIsNoise(this._doc.channel);
+        instrumentCopy["isMod"] = this._doc.song.getChannelIsMod(this._doc.channel);
         window.localStorage.setItem("instrumentCopy", JSON.stringify(instrumentCopy));
         this.refocusStage();
     }
@@ -3689,7 +3690,7 @@ export class SongEditor {
         const channel: Channel = this._doc.song.channels[this._doc.channel];
         const instrument: Instrument = channel.instruments[this._doc.getCurrentInstrument()];
         const instrumentCopy: any = JSON.parse(String(window.localStorage.getItem("instrumentCopy")));
-        if (instrumentCopy != null && instrumentCopy["isDrum"] == this._doc.song.getChannelIsNoise(this._doc.channel)) {
+        if (instrumentCopy != null && instrumentCopy["isDrum"] == this._doc.song.getChannelIsNoise(this._doc.channel) && instrumentCopy["isMod"] == this._doc.song.getChannelIsMod(this._doc.channel)) {
             this._doc.record(new ChangePasteInstrument(this._doc, instrument, instrumentCopy));
         }
         this.refocusStage();

editor/TipPrompt.ts

@@ -109,7 +109,7 @@ export class TipPrompt implements Prompt {
 				message = div(
 					h2("Instrument Type"),
 					p("JummBox comes with many instrument presets, try them out! You can also create your own custom instruments!"),
-					p("There are also options for copying and pasting instrument settings and for generating random instruments at the top of the instrument type menu."),
+					p("There are also buttons for copying and pasting instruments at the bottom of the instrument settings tab, and for generating random instruments in the \"Randomize\" category in the instrument type menu."),
 				);
 			} break;
 			case "eqFilter": {

editor/style.ts

@@ -220,6 +220,7 @@ document.head.appendChild(HTML.style({ type: "text/css" }, `
     -ms-transition: opacity 0.5s ease-in;
     transition: opacity 0.5s ease-in;
     transition-delay: 0.45s;
+	scrollbar-width: none;
 }
 
 .trackAndMuteContainer {

synth/synth.ts

@@ -2011,6 +2011,7 @@ export class Instrument {
                             this.drumsetSpectrumWaves[j].spectrum[i] = Math.max(0, Math.min(Config.spectrumMax, Math.round(Config.spectrumMax * (+drum["spectrum"][i]) / 100)));
                         }
                     }
+                    this.drumsetSpectrumWaves[j].markCustomWaveDirty();
                 }
             }
         }
@@ -2510,7 +2511,7 @@ export class Song {
         this.patternInstruments = false;
 
         this.title = "Unnamed";
-        document.title = EditorConfig.versionDisplayName;
+        document.title = this.title + " - " + EditorConfig.versionDisplayName;
 
         if (andResetChannels) {
             this.pitchChannelCount = 3;

website/manifest.webmanifest

@@ -1,7 +1,7 @@
 {
-	"name": "BeepBox",
-	"short_name": "BeepBox",
-	"description": "BeepBox is a tool for sketching and sharing instrumental melodies.",
+	"name": "JummBox",
+	"short_name": "JummBox",
+	"description": "JummBox is a tool for sketching and sharing instrumental melodies.",
 	"scope": "/",
 	"start_url": ".",
 	"display": "browser",