fix difficulty order

Ratismal · Apr 21, 2021 · 8d5abe0 · 8d5abe0
1 parent 72fdc26
commit 8d5abe0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/CustomBeats/CustomBeatsPlugin.cs b/CustomBeats/CustomBeatsPlugin.cs
@@ -55,6 +55,16 @@ void LoadSongs()
         {
             songs = new List<string>();
             beatmaps = new List<BeatmapInfo>();
+            string[] defaultDifficulties = new[]
+            {
+                "Beginner",
+                "Easy",
+                "Normal",
+                "Hard",
+                "UNBEATABLE",
+                "Trailer",
+                "Tutorial"
+            };
             difficulties = new List<string>();
 
             string customSongDir = $"{Application.dataPath.Substring(0, Application.dataPath.LastIndexOf('/'))}/CustomBeats/Songs/";
@@ -77,7 +87,7 @@ void LoadSongs()
                     asset.name = beatmapName;
                     var difficultyMatch = Regex.Match(content, "Version: *(.+?)\r?\n");
                     string difficulty = difficultyMatch.Groups[1].Value;
-                    if (!difficulties.Contains(difficulty))
+                    if (!defaultDifficulties.Contains(difficulty) && !difficulties.Contains(difficulty))
                     {
                         difficulties.Add(difficulty);
                     }
@@ -100,6 +110,12 @@ void LoadSongs()
                 }
             }
 
+            var allDifficulties = defaultDifficulties.Concat(difficulties).ToList();
+            beatmaps.Sort(delegate(BeatmapInfo x, BeatmapInfo y)
+            {
+                return allDifficulties.IndexOf(x.difficulty) - allDifficulties.IndexOf(y.difficulty);
+            });
+
             dirty = true;
         }
 

diff --git a/CustomBeats/Properties/AssemblyInfo.cs b/CustomBeats/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyFileVersion("1.0.0.1")]