Skip to content
Permalink
Browse files

- devs remnants

  • Loading branch information...
cozy1 committed Feb 28, 2019
1 parent 5b20d98 commit a61b2199458545523787082e6c5e012618572874

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -1025,15 +1025,15 @@ private DLCPackageData GetPackageData(bool validate, out string errorMsg)
{
if (!PlatformPC && !PlatformMAC && !PlatformXBox360 && !PlatformPS3)
{
MessageBox.Show("<ERROR> No game platform selected", MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Error);
errorMsg = "No game platform selected ...";
return null;
}
}
else
{
if (!PlatformPC && !PlatformXBox360 && !PlatformPS3)
{
MessageBox.Show("<ERROR> No game platform selected", MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Error);
errorMsg = "No game platform selected ...";
return null;
}
}
@@ -1050,7 +1050,7 @@ private DLCPackageData GetPackageData(bool validate, out string errorMsg)
if (DLCKey == SongTitle.GetValidKey() && CurrentGameVersion == GameVersion.RS2012)
{
DLCKey = SongTitle.GetValidKey(SongTitle); // fix the condition and move on
//MessageBox.Show("<ERROR> DLC Key can't be the same of song name", MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Error);
// errorMsg = "<ERROR> DLC Key can't be the same as song name";
//txtDlcKey.Focus();
//return null;
}
@@ -1059,11 +1059,13 @@ private DLCPackageData GetPackageData(bool validate, out string errorMsg)
if (txtJapaneseSongTitle.Enabled && String.IsNullOrEmpty(JapaneseSongTitle))
{
txtJapaneseSongTitle.Focus();
errorMsg = "JapaneseSongTitle is missing ...";
return null;
}
if (txtJapaneseArtist.Enabled && String.IsNullOrEmpty(JapaneseArtist))
{
txtJapaneseArtist.Focus();
errorMsg = "JapaneseArtist is missing ...";
return null;
}*/

@@ -1126,21 +1128,19 @@ private DLCPackageData GetPackageData(bool validate, out string errorMsg)

if (!PackageVersion.Equals(PackageVersion.GetValidVersion()))
{
MessageBox.Show(String.Format("Package version field contain invalid characters!\n" + "Please replace this: {0}\n" + "with something like this: 1 or 2.1 or 2.2.1", PackageVersion), MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Error);
errorMsg = String.Format("Package version field contain invalid characters!" + Environment.NewLine +
"Please replace this: {0}" + Environment.NewLine +
"with something like this: 1 or 2.1 or 2.2.1", PackageVersion);
txtVersion.Focus();
return null;
}

//Album Art validation (alert only)
if (String.IsNullOrEmpty(AlbumArtPath) || !File.Exists(AlbumArtPath))
{
var diagResult = MessageBox.Show("Album Artwork not found." + Environment.NewLine + "Default album art will be used." + Environment.NewLine + "Click 'Yes' to continue or 'No' to select Album Artwork.", MESSAGEBOX_CAPTION, MessageBoxButtons.YesNo, MessageBoxIcon.Warning);

if (diagResult == DialogResult.No)
{
txtAlbumArtPath.Focus();
return null;
}
txtAlbumArtPath.Focus();
errorMsg = "AlbumArtPath file could not be found ...";
return null;
}

// NOTE: CDLC produced with older versions of toolkit may not
@@ -1182,22 +1182,22 @@ private DLCPackageData GetPackageData(bool validate, out string errorMsg)

if (arrangements.Count(x => x.ArrangementType == ArrangementType.Vocal && x.ArrangementName == ArrangementName.Vocals) > 1)
{
MessageBox.Show("<ERROR> Multiple Vocals arrangement found. " + Environment.NewLine +
"Please remove any multiples and retry.", MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Error);
errorMsg = "<ERROR> Multiple Vocals arrangement found. " + Environment.NewLine +
"Please remove any multiples and retry.";
return null;
}

if (arrangements.Count(x => x.ArrangementType == ArrangementType.Vocal && x.ArrangementName == ArrangementName.JVocals) > 1)
{
MessageBox.Show("<ERROR> Multiple JVocals arrangement found. " + Environment.NewLine +
"Please remove any multiples and retry.", MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Error);
errorMsg = "<ERROR> Multiple JVocals arrangement found. " + Environment.NewLine +
"Please remove any multiples and retry.";
return null;
}

if (arrangements.Count(x => x.ArrangementType == ArrangementType.ShowLight && x.ArrangementName == ArrangementName.ShowLights) > 1)
{
MessageBox.Show("<ERROR> Multiple Showlights arrangements found. " + Environment.NewLine +
"Please remove any multiples and retry.", MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Error);
errorMsg = "<ERROR> Multiple Showlights arrangements found. " + Environment.NewLine +
"Please remove any multiples and retry.";
return null;
}

@@ -1211,7 +1211,7 @@ private DLCPackageData GetPackageData(bool validate, out string errorMsg)
{
if (!File.Exists(arr.SongXml.File))
{
MessageBox.Show("<ERROR> Song Arrangement Xml file doesn't exist: " + arr.SongXml.File, MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Error);
errorMsg = "<ERROR> Song Arrangement Xml file doesn't exist: " + arr.SongXml.File;
return null;
}

@@ -1270,7 +1270,7 @@ private DLCPackageData GetPackageData(bool validate, out string errorMsg)
}
catch (InvalidDataException ex)
{
MessageBox.Show(ex.Message, MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Error);
errorMsg = ex.Message;
return null;
}

@@ -1699,6 +1699,7 @@ public DLCPackageData PackageGenerate()
{
var packageDataError = String.Empty;
var packageData = GetPackageData(true, out packageDataError);
// TODO: may want to change this to a MessageBox with return instead of throwing exception
if (packageData == null)
throw new InvalidDataException("<ERROR> DLCPackageData is null, " + packageDataError + Environment.NewLine + Environment.NewLine);

@@ -120,6 +120,20 @@
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>23, 3</value>
</metadata>
<data name="txtAudioPath.ToolTip" xml:space="preserve">
<value>WARNING: If the toolkit locates
an existing *_preview.* audio file
in the project folder then it will be
used in the CDLC.

This can produce undesired results.
It is recommended that you delete
any existing *_preview.* audio files
first to ensure that the toolkit auto
generate them correctly. Unless of
course that is your desired effect to
have customized preview audio.</value>
</data>
<data name="chkShowlights.ToolTip" xml:space="preserve">
<value>If toolkit throws errors during generation,
or the CDLC is locking up in-game during
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("e972ddc7")]
[assembly: AssemblyInformationalVersion("5b20d981")]
[assembly: AssemblyConfiguration("")]
@@ -1,5 +1,6 @@
Rocksmith Toolkit Release Notes

- added tooltip warning to the audio path textbox about existing preview audio files
- added verbose messages to '<ERROR> DLCPackageData is null' exception
- fixed CDLC 2 Tab menu generator
- fixed AlbumArtPath exceptions caused by image file names that have extra underscores '_'
@@ -27,5 +27,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("e972ddc7")]
[assembly: AssemblyInformationalVersion("5b20d981")]
[assembly: AssemblyConfiguration("")]
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("e972ddc7")]
[assembly: AssemblyInformationalVersion("5b20d981")]
[assembly: AssemblyConfiguration("")]
@@ -1,3 +1,3 @@
2.9.2.0
e972ddc7
5b20d981

0 comments on commit a61b219

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