diff --git a/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.Designer.cs b/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.Designer.cs index 367129c00..ab02506f8 100644 --- a/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.Designer.cs +++ b/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.Designer.cs @@ -703,12 +703,12 @@ private void InitializeComponent() 65536}); this.numVolPreview.Location = new System.Drawing.Point(72, 69); this.numVolPreview.Maximum = new decimal(new int[] { - 30, + 45, 0, 0, 0}); this.numVolPreview.Minimum = new decimal(new int[] { - 30, + 45, 0, 0, -2147483648}); @@ -788,12 +788,12 @@ private void InitializeComponent() 65536}); this.numVolSong.Location = new System.Drawing.Point(8, 69); this.numVolSong.Maximum = new decimal(new int[] { - 30, + 45, 0, 0, 0}); this.numVolSong.Minimum = new decimal(new int[] { - 30, + 45, 0, 0, -2147483648}); diff --git a/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs b/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs index 527e6292b..ea9fe9cde 100644 --- a/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs +++ b/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs @@ -1829,10 +1829,10 @@ public DLCPackageData PackageGenerate() "hanging and the song stats will be reset to zero."; var result = BetterDialog2.ShowDialog(diaMsg, MESSAGEBOX_CAPTION, "Yes", "No", "Abort", Bitmap.FromHicon(SystemIcons.Hand.Handle), "ReadMe ...", 150, 150); - if (result == DialogResult.Cancel) + if (result == DialogResult.Cancel || result == DialogResult.Abort) return null; - if (result == DialogResult.OK) + if (result == DialogResult.Yes) { updateArrangmentID = true; @@ -2484,9 +2484,9 @@ private void Volume_MouseEnter(object sender, EventArgs e) Control control = (Control)sender; string name = control.Name; if (name == "numVolSong") - tt.SetToolTip(numVolSong, "Soft 0.0 ... -7.0 (default) ... -30.0 Loud" + Environment.NewLine + "LF (Loudness Factor)"); + tt.SetToolTip(numVolSong, "0.0 Soft, -7.0 (Default), -30.0 Loud" + Environment.NewLine + "LF (Loudness Factor)"); else // preview audio volume is normally softer than the main audio - tt.SetToolTip(numVolPreview, "Soft 0.0 ... -5.0 (default) ... -30.0 Loud" + Environment.NewLine + "LF (Loudness Factor)"); + tt.SetToolTip(numVolPreview, "0.0 Soft, -5.0 (Default), -30.0 Loud" + Environment.NewLine + "LF (Loudness Factor)"); } private void btnAlbumArt_Click(object sender, EventArgs e) diff --git a/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.resx b/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.resx index b2610346b..1cd07dce7 100644 --- a/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.resx +++ b/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.resx @@ -120,6 +120,9 @@ 23, 3 + + 23, 3 + WARNING: If the toolkit locates an existing *_preview.* audio file diff --git a/RocksmithTookitGUI/DLCPackageCreator/ToneControl.Designer.cs b/RocksmithTookitGUI/DLCPackageCreator/ToneControl.Designer.cs index ec03bafe8..a5664b1ee 100644 --- a/RocksmithTookitGUI/DLCPackageCreator/ToneControl.Designer.cs +++ b/RocksmithTookitGUI/DLCPackageCreator/ToneControl.Designer.cs @@ -489,12 +489,12 @@ private void InitializeComponent() 65536}); this.volumeBox.Location = new System.Drawing.Point(180, 19); this.volumeBox.Maximum = new decimal(new int[] { - 30, + 45, 0, 0, 0}); this.volumeBox.Minimum = new decimal(new int[] { - 30, + 45, 0, 0, -2147483648}); diff --git a/RocksmithTookitGUI/DLCPackageCreator/ToneControl.cs b/RocksmithTookitGUI/DLCPackageCreator/ToneControl.cs index b967b1ae2..0fed8a715 100644 --- a/RocksmithTookitGUI/DLCPackageCreator/ToneControl.cs +++ b/RocksmithTookitGUI/DLCPackageCreator/ToneControl.cs @@ -157,7 +157,7 @@ private void Tone_Volume_Tip(object sender, EventArgs f) tvt.IsBalloon = true; tvt.InitialDelay = 0; tvt.ShowAlways = true; - tvt.SetToolTip(volumeBox, "Soft 0.0 ... -20.0 (default) ... -30.0 Loud"); + tvt.SetToolTip(volumeBox, "0.0 Soft, -20.0 (Default), -30.0 Loud"); } private void UpdateToneDescription(ComboBox combo) diff --git a/RocksmithTookitGUI/Properties/AssemblyInfo.cs b/RocksmithTookitGUI/Properties/AssemblyInfo.cs index eeaf32ac6..b9493b2a9 100644 --- a/RocksmithTookitGUI/Properties/AssemblyInfo.cs +++ b/RocksmithTookitGUI/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // // THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT [assembly: AssemblyVersion("2.9.2.1")] -[assembly: AssemblyInformationalVersion("0b6278e4")] -[assembly: AssemblyConfiguration("2020-02-14T16:26:02")] +[assembly: AssemblyInformationalVersion("ef67384e")] +[assembly: AssemblyConfiguration("2020-02-18T15:58:11")] diff --git a/RocksmithTookitGUI/ReleaseNotes.txt b/RocksmithTookitGUI/ReleaseNotes.txt index 0baee05b1..0cbd167df 100644 --- a/RocksmithTookitGUI/ReleaseNotes.txt +++ b/RocksmithTookitGUI/ReleaseNotes.txt @@ -1,6 +1,8 @@ Rocksmith Toolkit Release Notes -- updated RocksmithToolkitLib.SongAppId.xml dlc AppIDs +- based on feedback changed audio/tone volume (LF) min/max range (45 to -45) +- fixed update Arrangement Identification bug +- updated RocksmithToolkitLib.SongAppId.xml dlc AppIds - improved auto repair of some old toolkit multitone exceptions - volume ranges settable from 0 to -30 with better defaults - fixed packer/unpacker PromptComplete now comes to front diff --git a/RocksmithToolkitLib/DLCPackage/DLCPackageData.cs b/RocksmithToolkitLib/DLCPackage/DLCPackageData.cs index d70d2c556..ff34ab9f6 100644 --- a/RocksmithToolkitLib/DLCPackage/DLCPackageData.cs +++ b/RocksmithToolkitLib/DLCPackage/DLCPackageData.cs @@ -716,8 +716,8 @@ public static DLCPackageData LoadFromFolder(string unpackedDir, Platform targetP bnkPreviewVolume = bnkWemList.Where(fn => fn.BnkFileName.EndsWith("_preview.bnk")).Select(vf => vf.VolumeFactor).FirstOrDefault(); // validate bnk volumes - var isAudioVolValid = bnkAudioVolume.IsVolumeValid(DEFAULT_AUDIO_VOLUME); - var isPreviewVolValid = bnkPreviewVolume.IsVolumeValid(DEFAULT_PREVIEW_VOLUME); + var isAudioVolValid = bnkAudioVolume.IsVolumeValid(); + var isPreviewVolValid = bnkPreviewVolume.IsVolumeValid(); // use default volumes if (!isAudioVolValid || !isPreviewVolValid) diff --git a/RocksmithToolkitLib/Extensions/StringExtensions.cs b/RocksmithToolkitLib/Extensions/StringExtensions.cs index d106ea713..efb6f9819 100644 --- a/RocksmithToolkitLib/Extensions/StringExtensions.cs +++ b/RocksmithToolkitLib/Extensions/StringExtensions.cs @@ -296,14 +296,14 @@ public static string GetValidVersion(this string value) return ""; } - public static bool IsVolumeValid(this float? value, float defaultVolume = -7.0F) + public static bool IsVolumeValid(this float? value) { if (value == null) return false; // check for valid volume float volume = (float)Math.Round((double)value, 1); - if (volume > -30.0F && volume < 30.0F) + if (volume >= -45.0F && volume <= 45.0F) return true; return false; @@ -316,7 +316,7 @@ public static float GetValidVolume(this float? value, float defaultVolume = -7.0 // check for valid volume float volume = (float)Math.Round((double)value, 1); - if (volume >= -30.0F && volume <= 30.0F) + if (volume >= -45.0F && volume <= 45.0F) return volume; // use default volume diff --git a/RocksmithToolkitLib/Properties/AssemblyInfo.cs b/RocksmithToolkitLib/Properties/AssemblyInfo.cs index d0b3e56df..de1fff9bf 100644 --- a/RocksmithToolkitLib/Properties/AssemblyInfo.cs +++ b/RocksmithToolkitLib/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // // THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT [assembly: AssemblyVersion("2.9.2.1")] -[assembly: AssemblyInformationalVersion("0b6278e4")] -[assembly: AssemblyConfiguration("2020-02-14T16:26:02")] +[assembly: AssemblyInformationalVersion("ef67384e")] +[assembly: AssemblyConfiguration("2020-02-18T15:58:11")] diff --git a/RocksmithToolkitUpdater/Properties/AssemblyInfo.cs b/RocksmithToolkitUpdater/Properties/AssemblyInfo.cs index 5dfda529d..cd3b370b5 100644 --- a/RocksmithToolkitUpdater/Properties/AssemblyInfo.cs +++ b/RocksmithToolkitUpdater/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // // THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT [assembly: AssemblyVersion("2.9.2.1")] -[assembly: AssemblyInformationalVersion("0b6278e4")] -[assembly: AssemblyConfiguration("2020-02-14T16:26:02")] +[assembly: AssemblyInformationalVersion("ef67384e")] +[assembly: AssemblyConfiguration("2020-02-18T15:58:11")] diff --git a/VersionInfo.txt b/VersionInfo.txt index b9341be1b..45de28413 100644 --- a/VersionInfo.txt +++ b/VersionInfo.txt @@ -1,3 +1,3 @@ 2.9.2.1 -0b6278e4 -2020-02-14T16:26:02 +ef67384e +2020-02-18T15:58:11