Skip to content

Commit

Permalink
Merge pull request #187 from zerkz/FEATURE/low-tuning-bass-fix
Browse files Browse the repository at this point in the history 
FEATURE: Low Tuning Bass Fix featuer in DLC Packer/Unpacker Tab
  • Loading branch information
@fabianosan
fabianosan committed Aug 26, 2014
2 parents 2d250ff + 26e3bc3 commit d54b795
Show file tree
Hide file tree
Showing 5 changed files with 712 additions and 423 deletions.
205 changes: 204 additions & 1 deletion RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
using RocksmithToolkitLib.DLCPackage.Manifest.Tone;
using X360.STFS;
using Ookii.Dialogs;
using RocksmithToolkitLib.Xml;

namespace RocksmithToolkitGUI.DLCPackageCreator
{
Expand Down Expand Up @@ -577,6 +578,208 @@ public void dlcImportButton_Click(object sender = null, EventArgs e = null) {
this.Focus();
}



/**
* Fixes B Standard and below tuning issues for bass. This is done by adjusting the pitch for the arrangement to 220hz,
* while raising the tuning 12 steps to offset the ptich change.
* This function is meant for fast and easy, one "click" fixes to PSARC's/packed CDLC.
* The CDLC will be unpacked, edited, and then repacked with '_bassfixed' appended to the file name.
* Parameters:
* quick - chooses directory of source file, uses source file name with "_bassfix" appended.
* deleteSourceFile - deletes source file after extracting needed information and generating the file.
**/
public void dlcLowTuningBassFix(object sender, EventArgs e, Button lowTuningBassFixButton, Boolean quick = false, Boolean deleteSourceFile = false)
{
string sourcePackage;
string saveWorkingDirectoryPath;

lowTuningBassFixButton.Enabled = false;

// GET PATH
using (var ofd = new OpenFileDialog())
{
ofd.Title = "Select one DLC to import";

var filter = CurrentRocksmithTitle + " PC/Mac Package (*.psarc)|*.psarc|";
filter += CurrentRocksmithTitle + " XBox360 Package (*.*)|*.*|";
filter += CurrentRocksmithTitle + " PS3 Package (*.edat)|*.edat";
ofd.Filter = filter;

if (ofd.ShowDialog() != DialogResult.OK)
{
lowTuningBassFixButton.Enabled = true;
return;
}
sourcePackage = ofd.FileName;
}


if (!sourcePackage.IsValidPSARC())
{
MessageBox.Show(String.Format("File '{0}' isn't valid. File extension was changed to '.invalid'", Path.GetFileName(sourcePackage)), MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}


if (!quick)
{
using (var fbd = new VistaFolderBrowserDialog())
{
fbd.Description = "Select folder to save project artifacts";
fbd.UseDescriptionForTitle = true;

if (fbd.ShowDialog() != DialogResult.OK)
{
lowTuningBassFixButton.Enabled = true;
return;
}
saveWorkingDirectoryPath = fbd.SelectedPath;
}
}
else
{
saveWorkingDirectoryPath = new FileInfo(sourcePackage).Directory.FullName;
}

// UNPACK
var unpackedDir = Packer.Unpack(sourcePackage, saveWorkingDirectoryPath, true, true, false);
var packagePlatform = sourcePackage.GetPlatform();

// REORGANIZE
var structured = ConfigRepository.Instance().GetBoolean("creator_structured");
if (structured && !quick)
unpackedDir = DLCPackageData.DoLikeProject(unpackedDir);

// LOAD DATA
var info = DLCPackageData.LoadFromFolder(unpackedDir, packagePlatform);
info.PackageVersion = "1";
switch (packagePlatform.platform)
{
case GamePlatform.Pc:
info.Pc = true;
break;
case GamePlatform.Mac:
info.Mac = true;
break;
case GamePlatform.XBox360:
info.XBox360 = true;
break;
case GamePlatform.PS3:
info.PS3 = true;
break;
}

//apply bass fix.
for (int i = 0; i < info.Arrangements.Count; i++)
{
Arrangement arr = info.Arrangements[i];
if (arr.ArrangementType == ArrangementType.Bass)
{

if (arr.TuningPitch == 220.0)
{
MessageBox.Show("This song is already at 220hz pitch (bass fixed applied already?)",
MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
else
{
arr.TuningPitch = 220.0;
}

Song2014 songXml = null;
using (var reader = new StreamReader(arr.SongXml.File))
{
songXml = (Song2014)new RocksmithToolkitLib.Extensions.XmlStreamingDeserializer<Song2014>(reader).Deserialize();
}
songXml.CentOffset = "-1200.0"; // Force 220Hz

// Octave up for each string
short[] strings = arr.TuningStrings.ToShortArray();
for (int s = 0; s < strings.Length; s++)
{
strings[s] += 12;
}
//Detect tuning
TuningDefinition tuning = TuningDefinitionRepository.Instance().SelectAny(new TuningStrings(strings), CurrentGameVersion);
if (tuning == null)
{
tuning = new TuningDefinition();
tuning.Tuning = new TuningStrings(strings);
tuning.UIName = tuning.Name = tuning.NameFromStrings(tuning.Tuning, true, false) + "BassFix";
tuning.Custom = true;
tuning.GameVersion = GameVersion.RS2014;
TuningDefinitionRepository.Instance().Add(tuning, true);
}
arr.TuningStrings = tuning.Tuning;
arr.Tuning = tuning.Name;
songXml.Tuning = tuning.Tuning;

XmlSerializerNamespaces ns = new XmlSerializerNamespaces();
ns.Add("", "");
XmlSerializer serializer = new XmlSerializer(typeof(Song2014));
TextWriter textWriter = new StreamWriter(arr.SongXml.File);
serializer.Serialize(textWriter, songXml, ns);
textWriter.Close();

}
}

if (!quick)
{
using (var ofd = new SaveFileDialog())
{
ofd.FileName = GeneralExtensions.GetShortName("{0}_{1}_v{2}", ArtistSort, SongTitleSort, PackageVersion, ConfigRepository.Instance().GetBoolean("creator_useacronyms"));
ofd.Filter = CurrentRocksmithTitle + " DLC (*.*)|*.*";
if (ofd.ShowDialog() != DialogResult.OK)
{
lowTuningBassFixButton.Enabled = true;
return;
}
dlcSavePath = ofd.FileName;
}
}
else
{

dlcSavePath = Path.Combine(saveWorkingDirectoryPath, Path.GetFileNameWithoutExtension(sourcePackage) + "_bassfix");
}

if (Path.GetFileName(dlcSavePath).Contains(" ") && platformPS3.Checked)
if (!ConfigRepository.Instance().GetBoolean("creator_ps3pkgnamewarn"))
{
MessageBox.Show(String.Format("PS3 package name can't support space character due to encryption limitation. {0} Spaces will be automatic removed for your PS3 package name.", Environment.NewLine), MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
else
{
ConfigRepository.Instance()["creator_ps3pkgnamewarn"] = true.ToString();
}

if(deleteSourceFile)
{
try
{
File.Delete(sourcePackage);
}
catch (Exception ex)
{
Console.Write(ex.Message);
MessageBox.Show("Denied rights needed to delete source package, or an error occured. Package still may exist. Try running as Administrator.");
}
}




if (!bwGenerate.IsBusy && info != null)
{

//Generate CDLC
bwGenerate.RunWorkerAsync(info);
}
}

private void FillPackageCreatorForm(DLCPackageData info, string filesBaseDir) {
RS2012.Checked = info.GameVersion == GameVersion.RS2012;
RS2014.Checked = info.GameVersion == GameVersion.RS2014;
Expand Down Expand Up @@ -669,7 +872,7 @@ private void FillPackageCreatorForm(DLCPackageData info, string filesBaseDir) {
{
try
{
//Load tunig from Arrangement
//Load tuning from Arrangement
var tuning = TuningDefinitionRepository.Instance().SelectAny(arrangement.TuningStrings, CurrentGameVersion);
if (tuning == null)
{
Expand Down
79 changes: 78 additions & 1 deletion RocksmithTookitGUI/DLCPackerUnpacker/DLCPackerUnpacker.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions RocksmithTookitGUI/DLCPackerUnpacker/DLCPackerUnpacker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public DLCPackerUnpacker()
bwUnpack.ProgressChanged += new ProgressChangedEventHandler(ProgressChanged);
bwUnpack.RunWorkerCompleted += new RunWorkerCompletedEventHandler(ProcessCompleted);
bwUnpack.WorkerReportsProgress = true;

}

private void cmbAppIds_SelectedValueChanged(object sender, EventArgs e)
Expand Down Expand Up @@ -270,5 +271,12 @@ private void ShowCurrentOperation(string message)
currentOperationLabel.Text = message;
currentOperationLabel.Refresh();
}

private void lowTuningBassFixButton_Click(object sender, EventArgs e)
{
dlcPackageCreatorControl.dlcLowTuningBassFix(sender, e, lowTuningBassFixButton, quickBassFixBox.Checked, deleteSourceFileCheckBox.Checked);
}


}
}
Loading

1 comment on commit d54b795

@MadMaxxx
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A suggestion:

it would probably also make sense to add a "fix B standard bass and below" checkbox in the "add Arrangement" and "Edit Arrangement" tab of the creator tab. That way the fix can be applied directly when creating the package.

Please sign in to comment.