Permalink
Browse files

- fix missing DDC folder

  • Loading branch information...
cozy1 committed Jan 29, 2019
1 parent 71de56d commit 27063a468281ad6717d8a313f8312ba740536910
@@ -150,6 +150,7 @@ public string XmlPath
set { txtXmlPath.Text = value; }
}

// get/set data for JSON arrangement
public Arrangement Arrangement
{
get
@@ -207,6 +208,8 @@ private set
//DLC ID
txtPersistentId.Text = value.Id.ToString().Replace("-", "").ToUpper();
txtMasterId.Text = value.MasterId.ToString();

// TODO: confirm XML gets updated after this somewhere
}
}

@@ -1076,6 +1079,7 @@ private void btnOk_Click(object sender, EventArgs e)
if (!CheckBassTuning())
return;

// TODO: this should probably be a Save instead of Load
LoadArrangementData(XmlPath);
ConfigGlobals.DefaultProjectFolder = Path.GetDirectoryName(XmlPath);
DialogResult = DialogResult.OK;

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -670,8 +670,7 @@ public void UpdateSongXml(Arrangement arr, DLCPackageData info)
// TODO: monitor this new code for bugs
// represent is set to "1" by default, if there is a bonus then set represent to "0"
//songXml.ArrangementProperties.Represent = arr.BonusArr ? 0 : 1;

//// for alternate arrangement then both represent and bonus are set to "0"
// for alternate arrangement then both represent and bonus are set to "0"
//if (songXml.Part > 1 && !arr.BonusArr)
// songXml.ArrangementProperties.Represent = 0;

@@ -121,14 +121,13 @@
<value>23, 3</value>
</metadata>
<data name="chkShowlights.ToolTip" xml:space="preserve">
<value>CAUTION - FOR DEVELOPER USE ONLY -
If checked, generates only the minimum
required set of default Showlights.

If toolkit throws errors during generation,
<value>If toolkit throws errors during generation,
or the CDLC is locking up in-game during
startup, then try checking this box and
regenerate the CDLC.</value>
regenerate the CDLC.

If checked, generates only the minimum
required set of default Showlights.</value>
</data>
<data name="btnPackageImport.ToolTip" xml:space="preserve">
<value>NOTE:
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("824199a9")]
[assembly: AssemblyInformationalVersion("71de56d6")]
[assembly: AssemblyConfiguration("")]
@@ -347,9 +347,9 @@
<EmbeddedResource Include="ZpeConverter\ZpeConverter.resx">
<DependentUpon>ZpeConverter.cs</DependentUpon>
</EmbeddedResource>
<Content Include="App.config">
<None Include="app.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</None>
<None Include="app.manifest">
<SubType>Designer</SubType>
</None>
@@ -546,15 +546,19 @@ private static void GenerateRS2014SongPsarc(Stream output, DLCPackageData info,

if (false) // for debugging represent conflicts
{
//infoArrangement.ArrangementPropeties.BonusArr = arr.BonusArr ? 1 : 0;
//attribute.ArrangementProperties.BonusArr != infoArrangement.ArrangementPropeties.BonusArr;

// get XML represent elements and compare to JSON represent elements
var infoArrangement = info.Arrangements.Where(x => x.ArrangementName == arr.ArrangementName).FirstOrDefault();
if (arr.Represent != Convert.ToBoolean(infoArrangement.ArrangementPropeties.Represent))
if (infoArrangement.ArrangementPropeties.Represent != (arr.Represent ? 1 : 0))
Debug.WriteLine("PRE Conflicted XML/JSON Represent elements in: " + arr.ToString());
if (arr.BonusArr != Convert.ToBoolean(infoArrangement.ArrangementPropeties.BonusArr))
if (infoArrangement.ArrangementPropeties.BonusArr != (arr.BonusArr ? 1 : 0))
Debug.WriteLine("PRE Conflicted XML/JSON BonusArr elements in: " + arr.ToString());

if (attribute.ArrangementProperties.Represent != infoArrangement.ArrangementPropeties.Represent)
if (infoArrangement.ArrangementPropeties.Represent != (arr.Represent ? 1 : 0))
Debug.WriteLine("POST Conflicted XML/JSON Represent elements in: " + arr.ToString());
if (attribute.ArrangementProperties.BonusArr != infoArrangement.ArrangementPropeties.BonusArr)
if (infoArrangement.ArrangementPropeties.BonusArr != (arr.BonusArr ? 1 : 0))
Debug.WriteLine("POST Conflicted XML/JSON BonusArr elements in: " + arr.ToString());
}

@@ -27,5 +27,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("824199a9")]
[assembly: AssemblyInformationalVersion("71de56d6")]
[assembly: AssemblyConfiguration("")]
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("824199a9")]
[assembly: AssemblyInformationalVersion("71de56d6")]
[assembly: AssemblyConfiguration("")]
@@ -1,3 +1,3 @@
2.9.2.0
824199a9
71de56d6

@@ -48,12 +48,12 @@ after_build:
- ps: $env:BuildCommit = $env:APPVEYOR_REPO_COMMIT.Substring(0, 8)
- ps: $env:PkgName = "rstoolkit-" + $env:BuildVer + "-" + $env:BuildCommit
- rem Windows package
- mkdir tmp
- xcopy /E "%BIN%\Release\*" "%BIN%\tmp\RocksmithToolkit\"
- copy "%BIN%\Release\ReadMe.txt" "%BIN%\tmp\ReadMe.txt"
- copy "%BIN%\Release\tools\CreateToolkitShortcut.exe" "%BIN%\tmp\CreateToolkitShortcut.exe"
- del "%BIN%\Release\ReadMe.txt"
- del "%BIN%\Release\tools\CreateToolkitShortcut.exe"
- mkdir "%BIN%\tmp"
- xcopy /S /Y "%BIN%\Release\*" "%BIN%\tmp\RocksmithToolkit\*"
- copy /Y "%BIN%\Release\ReadMe.txt" "%BIN%\tmp\ReadMe.txt"
- copy /Y "%BIN%\Release\tools\CreateToolkitShortcut.exe" "%BIN%\tmp\CreateToolkitShortcut.exe"
- del /Q "%BIN%\Release\ReadMe.txt"
- del /Q "%BIN%\Release\tools\CreateToolkitShortcut.exe"
- 7z a %PkgName%-win.zip %BIN%\tmp\*
- rem Mac package
- del "%BIN%\RocksmithCustomSongToolkit.app\Contents\Resources\gitkeep.txt"

0 comments on commit 27063a4

Please sign in to comment.