- use SKU (empty) to hide the in-game marker with fewer side effects

rscustom · Nov 8, 2018 · 79a2304 · L0FKA · Nov 9, 2018 · 79a2304
1 parent 8c8e32f
commit 79a2304
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 16 deletions.
diff --git a/RocksmithTookitGUI/DLCPackageCreator/ArrangementForm.cs b/RocksmithTookitGUI/DLCPackageCreator/ArrangementForm.cs
@@ -175,18 +175,21 @@ private set
                 var scrollSpeed = value.ScrollSpeed;
                 if (scrollSpeed == 0)
                     scrollSpeed = Convert.ToInt32(ConfigRepository.Instance().GetDecimal("creator_scrollspeed") * 10);
+
                 tbarScrollSpeed.Value = Math.Min(scrollSpeed, tbarScrollSpeed.Maximum);
                 UpdateScrollSpeedDisplay();
 
                 if (Arrangement.RouteMask == RouteMask.Bass)
                     chkBassPicked.Checked = value.PluckedType == PluckedType.Picked;
+
                 // TODO: monitor this change
-                // for default => represent is true and bonus is false 
+                // Default => represent is true and bonus is false 
-                // for bonus => represent is false and bonus is true     
+                // Bonus => represent is false and bonus is true     
-                // for alternate => both represent and bonus are false
+                // Alternate => both represent and bonus are false
+                // Unknown => both represent and bonus are true
                 if (value.Represent && value.BonusArr)
                 {
-                    var diaMsg = "Illegal Arrangement Default/Bonus/Alternate Conditon ...  " + Environment.NewLine + Environment.NewLine +
+                    var diaMsg = "Invalid Arrangement Default/Bonus/Alternate Conditon ...  " + Environment.NewLine + Environment.NewLine +
                                  "Toolkit will reset the arrangement to" + Environment.NewLine +
                                  "the default represent condition." + Environment.NewLine;
                     BetterDialog2.ShowDialog(diaMsg, "<WARNING> Arrangement Represent", null, null, "OK", Bitmap.FromHicon(SystemIcons.Warning.Handle), "Warning", 150, 150);

diff --git a/RocksmithTookitGUI/Properties/AssemblyInfo.cs b/RocksmithTookitGUI/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //
 // THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
 [assembly: AssemblyVersion("2.9.1.0")]
-[assembly: AssemblyInformationalVersion("1e2ddd6a")]
+[assembly: AssemblyInformationalVersion("8c8e32f2")]
 [assembly: AssemblyConfiguration("BETA")]
diff --git a/RocksmithToolkitLib/DLCPackage/Manifest2014/Header/AttributesHeader2014.cs b/RocksmithToolkitLib/DLCPackage/Manifest2014/Header/AttributesHeader2014.cs
@@ -103,16 +103,17 @@ public AttributesHeader2014(string arrangementFileName, Arrangement arrangement,
             PersistentID = arrangement.Id.ToString().Replace("-", "").ToUpper();
             Shipping = true;
 
+            // DLC controls wheter album artwork marker is shown in-game setlist, but has
+            // negative effect that 'Alternate Arrangements' are locked for new player profiles
+            DLC = true;
+
             // TODO: monitor this change
             if (info.ToolkitInfo == null || info.ToolkitInfo.PackageAuthor == "Ubisoft")
-                DLC = true; // shows album artwork marker in-game setlist
+                SKU = "RS2"; // shows purple marker w/ "DLC" text overlay
             else
-                DLC = false; // hides album artwork marker in-game setlist
+                SKU = ""; // hides album artwork marker in-game setlist
-
-            SKU = "RS2"; // shows purple marker w/ "DLC" text overlay
-            // SKU = ""; // or DLC = false hides marker for RS2
 
-            // SKU and DLCKey combination shows black marker w/ "RS1" text overlay on album artwork in-game setlist
+            // this SKU and DLCKey combination shows black marker w/ "RS1" text overlay on album artwork in-game setlist
             // SKU = "RS1";
             // DLCKey = "RS1CompatibilityDisc";
 

diff --git a/RocksmithToolkitLib/DLCPackage/Packer.cs b/RocksmithToolkitLib/DLCPackage/Packer.cs
@@ -1037,12 +1037,13 @@ private static void UpdateManifest2014(string srcPath, Platform targetPlatform)
                     attr.MaxPhraseDifficulty = manifestFunctions.GetMaxDifficulty(song2014);
 
                     // TODO: monitor this change updates both json and hsan files
-                    attr.DLC = true; // shows album artwork marker in-game setlist
                     if (!String.IsNullOrEmpty(toolkitVersionFile))
                     {
                         var tkInfo = GeneralExtensions.ReadToolkitInfo(toolkitVersionFile);
+                        // hide album artwork marker in-game setlist
+                        // while leaving Alternate Arrangements unlocked for new user profile
                         if (tkInfo != null && tkInfo.PackageAuthor != "Ubisoft")
-                            attr.DLC = false; // hides album artwork marker in-game setlist
+                            attr.SKU = "";
                     }
                 }
 

diff --git a/RocksmithToolkitLib/Properties/AssemblyInfo.cs b/RocksmithToolkitLib/Properties/AssemblyInfo.cs
@@ -27,5 +27,5 @@
 //
 // THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
 [assembly: AssemblyVersion("2.9.1.0")]
-[assembly: AssemblyInformationalVersion("1e2ddd6a")]
+[assembly: AssemblyInformationalVersion("8c8e32f2")]
 [assembly: AssemblyConfiguration("BETA")]
diff --git a/RocksmithToolkitUpdater/Properties/AssemblyInfo.cs b/RocksmithToolkitUpdater/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //
 // THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
 [assembly: AssemblyVersion("2.9.1.0")]
-[assembly: AssemblyInformationalVersion("1e2ddd6a")]
+[assembly: AssemblyInformationalVersion("8c8e32f2")]
 [assembly: AssemblyConfiguration("BETA")]
diff --git a/VersionInfo.txt b/VersionInfo.txt
@@ -1,3 +1,3 @@
 2.9.1.0
-1e2ddd6a
+8c8e32f2
 BETA