Permalink
Browse files

- Improved RS1 to RS2014, and RS2014 to RS1 conversions

- Improved RS1 Import Package function to collect
- Add arrangement represent (Default/Bonus/Alternate) validation
  • Loading branch information...
cozy1 committed Oct 26, 2018
1 parent 005d680 commit 70c3036af228969e944991e890c765087a828567
Showing with 1,402 additions and 983 deletions.
  1. +22 −13 RocksmithTookitGUI/BetaInfo.rtf
  2. +80 −25 RocksmithTookitGUI/DLCPackageCreator/ArrangementForm.Designer.cs
  3. +172 −131 RocksmithTookitGUI/DLCPackageCreator/ArrangementForm.cs
  4. +19 −19 RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.Designer.cs
  5. +233 −173 RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs
  6. +13 −6 RocksmithTookitGUI/DLCPackageCreator/ToneControl.cs
  7. +1 −0 RocksmithTookitGUI/DLCPackageCreator/ToneForm.cs
  8. +1 −1 RocksmithTookitGUI/Properties/AssemblyInfo.cs
  9. +4 −0 RocksmithTookitGUI/RocksmithToolkitGUI.csproj
  10. +1 −0 RocksmithToolkitGUI.Tests/DLCPackageCreatorTest.cs
  11. +53 −45 RocksmithToolkitLib/Conversion/Rs1Converter.cs
  12. +7 −3 RocksmithToolkitLib/DLCPackage/AggregateGraph/AggregateGraph.cs
  13. +2 −0 RocksmithToolkitLib/DLCPackage/AggregateGraph/ElementFile.cs
  14. +1 −1 RocksmithToolkitLib/DLCPackage/AggregateGraph2014/AggregateGraph2014.cs
  15. +16 −12 RocksmithToolkitLib/DLCPackage/Arrangement.cs
  16. +216 −197 RocksmithToolkitLib/DLCPackage/DLCPackageCreator.cs
  17. +146 −97 RocksmithToolkitLib/DLCPackage/DLCPackageData.cs
  18. +6 −5 RocksmithToolkitLib/DLCPackage/Manifest/Attributes.cs
  19. +2 −2 RocksmithToolkitLib/DLCPackage/Manifest/Functions/ManifestFunctions.cs
  20. +119 −62 RocksmithToolkitLib/DLCPackage/Manifest/ManifestBuilder.cs
  21. +18 −16 RocksmithToolkitLib/DLCPackage/Manifest2014/Attributes2014.cs
  22. +7 −7 RocksmithToolkitLib/DLCPackage/Manifest2014/Header/AttributesHeader2014.cs
  23. +38 −54 RocksmithToolkitLib/DLCPackage/Packer.cs
  24. +1 −1 RocksmithToolkitLib/DLCPackage/SoundBankGenerator.cs
  25. +1 −0 RocksmithToolkitLib/DLCPackage/ToneGenerator.cs
  26. +1 −1 RocksmithToolkitLib/DLCPackage/XBlock/GameXblock.cs
  27. +1 −0 RocksmithToolkitLib/Extensions/GeneralExtension.cs
  28. +8 −5 RocksmithToolkitLib/Extensions/StringExtensions.cs
  29. +58 −13 RocksmithToolkitLib/PSARC/PSARC.cs
  30. +1 −1 RocksmithToolkitLib/Properties/AssemblyInfo.cs
  31. +9 −3 RocksmithToolkitLib/PsarcLoader/PSARC.cs
  32. +1 −0 RocksmithToolkitLib/PsarcLoader/PsarcExtensions.cs
  33. +2 −2 RocksmithToolkitLib/PsarcLoader/PsarcLoader.cs
  34. +1 −0 RocksmithToolkitLib/Sng/Sng2014File.cs
  35. +8 −9 RocksmithToolkitLib/Sng/Sng2014FileWriter.cs
  36. +53 −8 RocksmithToolkitLib/Sng/SngFileWriter.cs
  37. +74 −48 RocksmithToolkitLib/XML/Song.cs
  38. +4 −21 RocksmithToolkitLib/XmlRepository/TuningDefinitionRepository.cs
  39. +1 −1 RocksmithToolkitUpdater/Properties/AssemblyInfo.cs
  40. +1 −1 VersionInfo.txt
@@ -1,12 +1,12 @@
{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
{\f2\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}{\f3\froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f10\fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings;}
{\f36\fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Microsoft Sans Serif;}{\f38\froman\fcharset238\fprq2 Times New Roman CE;}{\f39\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f41\froman\fcharset161\fprq2 Times New Roman Greek;}
{\f42\froman\fcharset162\fprq2 Times New Roman Tur;}{\f43\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f44\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f45\froman\fcharset186\fprq2 Times New Roman Baltic;}
{\f46\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f58\fmodern\fcharset238\fprq1 Courier New CE;}{\f59\fmodern\fcharset204\fprq1 Courier New Cyr;}{\f61\fmodern\fcharset161\fprq1 Courier New Greek;}
{\f62\fmodern\fcharset162\fprq1 Courier New Tur;}{\f63\fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f64\fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f65\fmodern\fcharset186\fprq1 Courier New Baltic;}
{\f66\fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f398\fswiss\fcharset238\fprq2 Microsoft Sans Serif CE;}{\f399\fswiss\fcharset204\fprq2 Microsoft Sans Serif Cyr;}{\f401\fswiss\fcharset161\fprq2 Microsoft Sans Serif Greek;}
{\f402\fswiss\fcharset162\fprq2 Microsoft Sans Serif Tur;}{\f403\fswiss\fcharset177\fprq2 Microsoft Sans Serif (Hebrew);}{\f404\fswiss\fcharset178\fprq2 Microsoft Sans Serif (Arabic);}{\f405\fswiss\fcharset186\fprq2 Microsoft Sans Serif Baltic;}
{\f406\fswiss\fcharset163\fprq2 Microsoft Sans Serif (Vietnamese);}{\f407\fswiss\fcharset222\fprq2 Microsoft Sans Serif (Thai);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;
{\f36\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Microsoft Sans Serif;}{\f74\froman\fcharset238\fprq2 Times New Roman CE;}{\f75\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f77\froman\fcharset161\fprq2 Times New Roman Greek;}
{\f78\froman\fcharset162\fprq2 Times New Roman Tur;}{\f79\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f80\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f81\froman\fcharset186\fprq2 Times New Roman Baltic;}
{\f82\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f94\fmodern\fcharset238\fprq1 Courier New CE;}{\f95\fmodern\fcharset204\fprq1 Courier New Cyr;}{\f97\fmodern\fcharset161\fprq1 Courier New Greek;}
{\f98\fmodern\fcharset162\fprq1 Courier New Tur;}{\f99\fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f100\fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f101\fmodern\fcharset186\fprq1 Courier New Baltic;}
{\f102\fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f434\fswiss\fcharset238\fprq2 Microsoft Sans Serif CE;}{\f435\fswiss\fcharset204\fprq2 Microsoft Sans Serif Cyr;}{\f437\fswiss\fcharset161\fprq2 Microsoft Sans Serif Greek;}
{\f438\fswiss\fcharset162\fprq2 Microsoft Sans Serif Tur;}{\f439\fswiss\fcharset177\fprq2 Microsoft Sans Serif (Hebrew);}{\f440\fswiss\fcharset178\fprq2 Microsoft Sans Serif (Arabic);}{\f441\fswiss\fcharset186\fprq2 Microsoft Sans Serif Baltic;}
{\f442\fswiss\fcharset163\fprq2 Microsoft Sans Serif (Vietnamese);}{\f443\fswiss\fcharset222\fprq2 Microsoft Sans Serif (Thai);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;
\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}
{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
@@ -62,16 +62,25 @@
\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext
\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1685859046}}{\*\listoverridetable{\listoverride\listid845022685\listoverridecount0\ls1}{\listoverride\listid359166142
\listoverridecount0\ls2}{\listoverride\listid1333413571\listoverridecount0\ls3}{\listoverride\listid1685859046\listoverridecount0\ls4}{\listoverride\listid338965384\listoverridecount0\ls5}{\listoverride\listid1120688297\listoverridecount0\ls6}}
{\*\rsidtbl \rsid143938\rsid208069\rsid276887\rsid1596048\rsid2703131\rsid3495053\rsid6300002\rsid8091389\rsid8338931\rsid9002083\rsid10357349\rsid11038411\rsid12549519\rsid13112591\rsid13593537\rsid13643383\rsid13981760\rsid14635904\rsid15667500}
{\*\generator Microsoft Word 10.0.6612;}{\info{\author PowerUser}{\operator PowerUser}{\creatim\yr2018\mo9\dy24\hr19\min15}{\revtim\yr2018\mo10\dy10\hr12\min14}{\version19}{\edmins30}{\nofpages1}{\nofwords317}{\nofchars1812}{\*\company Cozumel}
{\nofcharsws2125}{\vern16389}}\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3
{\*\rsidtbl \rsid143938\rsid208069\rsid276887\rsid1596048\rsid2703131\rsid3495053\rsid4289800\rsid6300002\rsid8091389\rsid8338931\rsid8457098\rsid9002083\rsid9456744\rsid9846673\rsid10357349\rsid11038411\rsid12549519\rsid13112591\rsid13593537\rsid13643383
\rsid13981760\rsid14635904\rsid15667500}{\*\generator Microsoft Word 10.0.6612;}{\info{\author PowerUser}{\operator PowerUser}{\creatim\yr2018\mo9\dy24\hr19\min15}{\revtim\yr2018\mo10\dy26\hr14\min28}{\version23}{\edmins36}{\nofpages1}{\nofwords353}
{\nofchars2016}{\*\company Cozumel}{\nofcharsws2365}{\vern16389}}\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3
\jcompress\viewkind4\viewscale100\nolnhtadjtbl\rsidroot13643383 \fet0\sectd \linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3
\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}
{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain
\ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\f36\fs22\cf1\insrsid13643383 This beta update of the toolkit contains some minor changes.
\par }{\b\f36\fs22\ul\cf13\insrsid13643383
\par What's new for the toolkit:
\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid15667500 {\b\f36\fs22\ul\cf13\insrsid15667500
\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid8457098 {\f3\fs20\cf1\insrsid8457098\charrsid8457098
\par {\listtext\pard\plain\f3\fs20\cf1\insrsid8457098 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\nowidctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid14635904 {\f36\fs20\cf1\insrsid8457098
Improved RS1 to RS2014 and RS2014 to RS1 conversions}{\f36\fs20\cf1\insrsid4289800 and }{\f36\fs20\cf1\insrsid8457098 better tone conversion}{\f36\fs20\cf1\insrsid4289800 s}{\f3\fs20\cf1\insrsid8457098\charrsid8457098
\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid8457098 {\f3\fs20\cf1\insrsid8457098\charrsid8457098
\par {\listtext\pard\plain\f3\fs20\cf1\insrsid9456744 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\nowidctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid14635904 {\f36\fs20\cf1\insrsid9456744
Improved RS1 Import Package function to collect more accurate package data.}{\f3\fs20\cf1\insrsid9456744\charrsid9456744
\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid9456744 {\f3\fs20\cf1\insrsid9456744\charrsid9456744
\par {\listtext\pard\plain\f3\fs20\cf1\insrsid9846673 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\nowidctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid14635904 {\f36\fs20\cf1\insrsid9846673
Add arrangement represent (Default/Bonus/Alternate) validation to CDLC Creator.}{\f3\fs20\cf1\insrsid9846673\charrsid9846673
\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid9846673 {\f3\fs20\cf1\insrsid9846673\charrsid9846673
\par {\listtext\pard\plain\f3\fs20\cf1\insrsid8338931 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\nowidctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid14635904 {\f36\fs20\cf1\insrsid8338931 Save most recent \lquote
Default Project }{\f36\fs20\cf1\insrsid10357349 Folder}{\f36\fs20\cf1\insrsid8338931 \rquote }{\f36\fs20\cf1\insrsid13112591 to Configuration}{\f36\fs20\cf1\insrsid8338931 }{\f36\fs20\cf1\insrsid10357349 from}{\f36\fs20\cf1\insrsid8338931 \lquote
Quick Add\rquote .}{\f3\fs20\cf1\insrsid8338931\charrsid8338931
@@ -87,8 +96,8 @@ The t}{\f36\fs20\cf1\insrsid14635904 oolkit alerts users if there are more than
\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid14635904 {\f3\fs20\cf1\insrsid14635904\charrsid14635904
\par {\listtext\pard\plain\f3\fs20\cf1\insrsid6300002 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\nowidctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid6300002 {\f36\fs20\cf1\insrsid6300002 Added Custom Open File Dialog to }{
\f36\fs20\cf1\insrsid276887 CDLC Creator }{\f36\fs20\cf1\insrsid6300002 \lquote Quick Add\rquote button }{\f36\fs20\cf1\insrsid14635904 which allows}{\f36\fs20\cf1\insrsid6300002 arrangements }{\f36\fs20\cf1\insrsid14635904 to be entered in }{
\f36\fs20\cf1\insrsid3495053 any }{\f36\fs20\cf1\insrsid14635904 specified }{\f36\fs20\cf1\insrsid6300002 order}{\f36\fs20\cf1\insrsid14635904 .}{\f36\fs20\cf1\insrsid276887
The order of Arrangement and Tone lists can be changed using Shift+Up/Down Arrow (see popup tooltips in CDLC Creator).}{\f3\fs20\cf1\insrsid6300002\charrsid6300002
\f36\fs20\cf1\insrsid3495053 any }{\f36\fs20\cf1\insrsid14635904 specified }{\f36\fs20\cf1\insrsid6300002 order}{\f36\fs20\cf1\insrsid14635904 .}{\f36\fs20\cf1\insrsid276887 The order of Arrangement and Tone lists can be changed using
Shift+Up/Down Arrow (see popup tooltips in CDLC Creator).}{\f3\fs20\cf1\insrsid6300002\charrsid6300002
\par }\pard \ql \li0\ri0\nowidctlpar\tx360\faauto\rin0\lin0\itap0\pararsid6300002 {\f3\fs20\cf1\insrsid6300002
\par }\pard \ql \fi-360\li360\ri0\nowidctlpar\tx360\faauto\rin0\lin360\itap0 {\f3\fs20\cf1\insrsid13643383 \'b7\tab }{\f36\fs20\cf1\insrsid9002083 F}{\f36\fs20\cf1\insrsid13593537 ix}{\f36\fs20\cf1\insrsid9002083 ed}{\f36\fs20\cf1\insrsid13593537
Mac Wine/Mono third party application processing}{\f36\fs20\cf1\insrsid13593537\charrsid13593537
Oops, something went wrong.

0 comments on commit 70c3036

Please sign in to comment.