Skip to content
Permalink
Browse files

- updated RocksmithToolkitLib.SongAppId.xml dlc AppIds

  • Loading branch information
cozy1 committed Feb 14, 2020
1 parent 0b6278e commit ef67384e056a37725e08dd077eff13ff67d2ad1a
@@ -1470,30 +1470,18 @@ private void ImportTone(string toneImportFile)

private void PopulateAppIdCombo()
{
var i = 0;
var currentGameVersion = CurrentGameVersion;
if (rbConvert.Checked)
currentGameVersion = GameVersion.RS2014;

cmbAppIds.Items.Clear();

foreach (var song in SongAppIdRepository.Instance().Select(currentGameVersion))
{
var delimiters = new[] { "-" };
var songSplit = song.Name.Split(delimiters, StringSplitOptions.None);
if (songSplit.Length != 2)
{
i++;
throw new DataException("<ERROR> Invalid RocksmithToolkitLib.SongAppId.xml entry. Found too many dashes '-' in: " + song.Name);
}

foreach (var song in SongAppIdRepository.Instance().Select(currentGameVersion))
cmbAppIds.Items.Add(song);
}


var songAppId = SongAppIdRepository.Instance().Select((currentGameVersion == GameVersion.RS2014) ? ConfigRepository.Instance()["general_defaultappid_RS2014"] : ConfigRepository.Instance()["general_defaultappid_RS2012"], currentGameVersion);
cmbAppIds.SelectedItem = songAppId;
AppId = songAppId.AppId;
Debug.WriteLine("<DebugMe> RocksmithToolkitLib.SongAppId.xml contains (" + i + ") invalid entries ...");
}

private void PopulateArrangements(GameVersion oldGameVersion)
@@ -1617,7 +1605,7 @@ private void SelectComboAppId(string appId)
else
{
if (!appId.IsAppIdSixDigits())
MessageBox.Show("Please enter a valid six digit " + Environment.NewLine + "App ID before continuing.", MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Stop);
MessageBox.Show("Please enter a valid six or seven digit " + Environment.NewLine + "App ID before continuing.", MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Stop);
else
{
cmbAppIds.Items.Insert(0, new SongAppId() { Name = "Unknown AppID", AppId = appId });
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.1")]
[assembly: AssemblyInformationalVersion("5c76cd1f")]
[assembly: AssemblyConfiguration("2020-02-12T23:57:55")]
[assembly: AssemblyInformationalVersion("0b6278e4")]
[assembly: AssemblyConfiguration("2020-02-14T16:26:02")]
@@ -1,6 +1,5 @@
Rocksmith Toolkit Release Notes

- added RocksmithToolkitLib.SongAppId.xml validation
- 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
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.1")]
[assembly: AssemblyInformationalVersion("5c76cd1f")]
[assembly: AssemblyConfiguration("2020-02-12T23:57:55")]
[assembly: AssemblyInformationalVersion("0b6278e4")]
[assembly: AssemblyConfiguration("2020-02-14T16:26:02")]

Large diffs are not rendered by default.

@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.1")]
[assembly: AssemblyInformationalVersion("5c76cd1f")]
[assembly: AssemblyConfiguration("2020-02-12T23:57:55")]
[assembly: AssemblyInformationalVersion("0b6278e4")]
[assembly: AssemblyConfiguration("2020-02-14T16:26:02")]
@@ -1,3 +1,3 @@
2.9.2.1
5c76cd1f
2020-02-12T23:57:55
0b6278e4
2020-02-14T16:26:02

0 comments on commit ef67384

Please sign in to comment.
You can’t perform that action at this time.