From 00d1cf1ce2b693348633919d649a15388f955072 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Tue, 14 Apr 2020 18:42:18 +0300
Subject: [PATCH] Recommend from all rulesets

---
 .../Screens/Select/DifficultyRecommender.cs   | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/DifficultyRecommender.cs b/osu.Game/Screens/Select/DifficultyRecommender.cs
index 20cdca858a..76b1188298 100644
--- a/osu.Game/Screens/Select/DifficultyRecommender.cs
+++ b/osu.Game/Screens/Select/DifficultyRecommender.cs
@@ -44,16 +44,27 @@ namespace osu.Game.Screens.Select
         /// <returns>The recommended difficulty, or null if a recommendation could not be provided.</returns>
         public BeatmapInfo GetRecommendedBeatmap(IEnumerable<BeatmapInfo> beatmaps)
         {
-            if (recommendedStarDifficulty.TryGetValue(ruleset.Value, out var stars))
+            if (!recommendedStarDifficulty.Any())
+                return null;
+
+            BeatmapInfo beatmap = null;
+
+            foreach (var r in getBestRulesetOrder())
             {
-                return beatmaps.OrderBy(b =>
+                if (!recommendedStarDifficulty.TryGetValue(ruleset.Value, out var stars))
+                    break;
+
+                beatmap = beatmaps.Where(b => b.Ruleset.Equals(r)).OrderBy(b =>
                 {
                     var difference = b.StarDifficulty - stars;
                     return difference >= 0 ? difference * 2 : difference * -1; // prefer easier over harder
                 }).FirstOrDefault();
+
+                if (beatmap != null)
+                    break;
             }
 
-            return null;
+            return beatmap;
         }
 
         private void calculateRecommendedDifficulties()
@@ -72,6 +83,26 @@ namespace osu.Game.Screens.Select
             });
         }
 
+        private IEnumerable<RulesetInfo> bestRulesetOrder;
+
+        private IEnumerable<RulesetInfo> getBestRulesetOrder()
+        {
+            if (bestRulesetOrder != null)
+                return bestRulesetOrder;
+
+            var otherRulesets = recommendedStarDifficulty.ToList()
+                                                         .Where(pair => !pair.Key.Equals(ruleset.Value))
+                                                         .OrderBy(pair => pair.Value)
+                                                         .Select(pair => pair.Key)
+                                                         .Reverse();
+
+            var rulesetList = new List<RulesetInfo>(new[] { ruleset.Value });
+            rulesetList.AddRange(otherRulesets);
+
+            bestRulesetOrder = rulesetList;
+            return rulesetList;
+        }
+
         public void APIStateChanged(IAPIProvider api, APIState state)
         {
             switch (state)