Permalink
Browse files

- Fixed typo/bug in GenerateSng

  • Loading branch information...
cozy1 committed Nov 7, 2018
1 parent 1e2ddd6 commit 8c8e32f281b0c34bf1ac10d8990b07b711d2c269
@@ -66,8 +66,8 @@
\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\rsid1010091\rsid1596048\rsid2703131\rsid3495053\rsid4289800\rsid6300002\rsid7086855\rsid8091389\rsid8338931\rsid8457098\rsid9002083\rsid9046583\rsid9456744\rsid9846673\rsid10357349\rsid11038411\rsid11229351
\rsid11405303\rsid12549519\rsid13112591\rsid13443476\rsid13593537\rsid13643383\rsid13981760\rsid14635904\rsid15667500}{\*\generator Microsoft Word 10.0.6612;}{\info{\author PowerUser}{\operator PowerUser}{\creatim\yr2018\mo9\dy24\hr19\min15}
{\revtim\yr2018\mo11\dy6\hr15\min12}{\printim\yr2018\mo11\dy5\hr10\min23}{\version29}{\edmins49}{\nofpages2}{\nofwords395}{\nofchars2257}{\*\company Cozumel}{\nofcharsws2647}{\vern16389}}
\rsid11405303\rsid12549519\rsid13112591\rsid13443476\rsid13593537\rsid13636370\rsid13643383\rsid13981760\rsid14635904\rsid15667500}{\*\generator Microsoft Word 10.0.6612;}{\info{\author PowerUser}{\operator PowerUser}{\creatim\yr2018\mo9\dy24\hr19\min15}
{\revtim\yr2018\mo11\dy7\hr10\min59}{\printim\yr2018\mo11\dy5\hr10\min23}{\version30}{\edmins50}{\nofpages2}{\nofwords400}{\nofchars2283}{\*\company Cozumel}{\nofcharsws2678}{\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 (}
@@ -77,8 +77,11 @@
\par What's new for the toolkit:
\par }\pard \ql \li0\ri0\widctlpar\faauto\rin0\lin0\itap0\pararsid11229351 {\f36\fs20\cf11\insrsid9046583\charrsid9046583 }{\f2\fs22\insrsid11229351
\par }\pard \ql \li0\ri0\widctlpar\faauto\rin0\lin0\itap0\pararsid9046583 {\f36\fs20\insrsid9046583\charrsid9046583
\par {\listtext\pard\plain\f3\fs20\cf1\insrsid13443476 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\widctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid11229351 {\f36\fs20\cf1\insrsid13443476 Correctly set manifest boolean
property \lquote DLC\rquote so that CDLC are not tagged as DLC in the in-game setlist.}{\f3\fs20\cf1\insrsid13443476\charrsid13443476
\par {\listtext\pard\plain\f3\fs20\cf1\insrsid13636370 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\widctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid11229351 {\f36\fs20\cf1\insrsid13636370 Fixed typo/bug in GenerateSng}{
\f3\fs20\cf1\insrsid13636370\charrsid13636370
\par }\pard \ql \li0\ri0\widctlpar\faauto\rin0\lin0\itap0\pararsid13636370 {\f3\fs20\cf1\insrsid13636370\charrsid13636370
\par {\listtext\pard\plain\f3\fs20\cf1\insrsid13443476 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\widctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid11229351 {\f36\fs20\cf1\insrsid13443476
Correctly set manifest boolean property \lquote DLC\rquote so that CDLC are not tagged as DLC in the in-game setlist.}{\f3\fs20\cf1\insrsid13443476\charrsid13443476
\par }\pard \ql \li0\ri0\widctlpar\faauto\rin0\lin0\itap0\pararsid13443476 {\f3\fs20\cf1\insrsid13443476\charrsid13443476
\par {\listtext\pard\plain\f3\fs20\insrsid11229351 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ql \fi-360\li360\ri0\widctlpar\jclisttab\tx360\faauto\ls6\rin0\lin360\itap0\pararsid11229351 {\f36\fs20\insrsid11229351 Applied }{\f36\fs20\insrsid11405303 a }{
\f36\fs20\insrsid11229351 perma fix to prevent creating property values in }{\f36\fs20\insrsid11405303 the }{\f36\fs20\insrsid11229351 designer}{\f36\fs20\insrsid1010091 when the CDLC Creator GUI design is modified}{\f36\fs20\insrsid7086855
@@ -90,8 +93,8 @@ Improved RS1 to RS2014 and RS2014 to RS1 conversions}{\f36\fs20\cf1\insrsid42898
\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 a
rrangement represent (Default/Bonus/Alternate) validation to CDLC Creator.}{\f3\fs20\cf1\insrsid9846673\charrsid9846673
\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
@@ -108,8 +111,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 Arr
ow (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
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.1.0")]
[assembly: AssemblyInformationalVersion("e38678ba")]
[assembly: AssemblyInformationalVersion("1e2ddd6a")]
[assembly: AssemblyConfiguration("BETA")]
@@ -357,10 +357,10 @@ private static void GenerateRS2014SongPsarc(Stream output, DLCPackageData info,
packPsarc = new PSARC.PSARC();
// Stream objects
Stream soundStream = null,
soundPreviewStream = null,
rsenumerableRootStream = null,
rsenumerableSongStream = null;
Stream soundStream = null;
Stream soundPreviewStream = null;
Stream rsenumerableRootStream = null;
Stream rsenumerableSongStream = null;
try
{
@@ -1183,10 +1183,9 @@ public static void GenerateSNG(Arrangement arr, Platform platform)
SngFileWriter.Write(arr, sngFile, platform);
break;
case GameVersion.RS2014:
// Sng2014File can be reused when generating for multiple platforms from cached results
// Sng2014File can be reused when generating multiple platforms from cached results
if (arr.Sng2014 == null)
{
SngFileWriter.Write(arr, sngFile, platform);
// cache results
arr.Sng2014 = Sng2014File.ConvertXML(arr.SongXml.File, arr.ArrangementType, arr.FontSng);
if (arr.CustomFont)
@@ -96,10 +96,10 @@ public AttributesHeader2014(string arrangementFileName, Arrangement arrangement,
JapaneseVocal |= arrangement.ArrangementName == Sng.ArrangementName.JVocals;
ArrangementName = IsVocal ? Sng.ArrangementName.Vocals.ToString() : arrangement.ArrangementName.ToString(); //HACK: weird vocals stuff
DLCKey = info.Name; // in RS2 DLCKey = SongKey, in RS1 they are different
SongKey = info.Name; // in RS2 DLCKey = SongKey, in RS1 they are different
SongKey = info.Name;
LeaderboardChallengeRating = 0;
ManifestUrn = jsonUrn;
MasterID_RDV = arrangement.MasterId;
MasterID_RDV = arrangement.MasterId; // must be unique else in-game hang occures
PersistentID = arrangement.Id.ToString().Replace("-", "").ToUpper();
Shipping = true;
@@ -112,7 +112,7 @@ public AttributesHeader2014(string arrangementFileName, Arrangement arrangement,
SKU = "RS2"; // shows purple marker w/ "DLC" text overlay
// SKU = ""; // or DLC = false hides marker for RS2
// this SKU and DLCKey combination shows black marker w/ "RS1" text overlay on album artwork in-game setlist
// SKU and DLCKey combination shows black marker w/ "RS1" text overlay on album artwork in-game setlist
// SKU = "RS1";
// DLCKey = "RS1CompatibilityDisc";
@@ -1042,7 +1042,7 @@ private static void UpdateManifest2014(string srcPath, Platform targetPlatform)
{
var tkInfo = GeneralExtensions.ReadToolkitInfo(toolkitVersionFile);
if (tkInfo != null && tkInfo.PackageAuthor != "Ubisoft")
attr.DLC = false;
attr.DLC = false; // hides album artwork marker in-game setlist
}
}
@@ -27,5 +27,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.1.0")]
[assembly: AssemblyInformationalVersion("e38678ba")]
[assembly: AssemblyInformationalVersion("1e2ddd6a")]
[assembly: AssemblyConfiguration("BETA")]
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.1.0")]
[assembly: AssemblyInformationalVersion("e38678ba")]
[assembly: AssemblyInformationalVersion("1e2ddd6a")]
[assembly: AssemblyConfiguration("BETA")]
@@ -1,3 +1,3 @@
2.9.1.0
e38678ba
1e2ddd6a
BETA

0 comments on commit 8c8e32f

Please sign in to comment.