From a8eff6b0964f92e7fdabba70ed5919fe5b7afbd2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 29 May 2025 17:13:00 +0900
Subject: [PATCH] Split out difficulties when sorting and grouping by "last
 played"

---
 .../Screens/SelectV2/BeatmapCarouselFilterGrouping.cs  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs b/osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs
index 27f3dcf8ff..1174e172e1 100644
--- a/osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs
+++ b/osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs
@@ -124,7 +124,15 @@ namespace osu.Game.Screens.SelectV2
 
         public static bool ShouldGroupBeatmapsTogether(FilterCriteria criteria)
         {
-            return criteria.Sort != SortMode.Difficulty && criteria.Group != GroupMode.Difficulty;
+            // In certain cases, we intentionally split out difficulties
+            // where it's more relevant or convenient to view them as individual items.
+            if (criteria.Sort == SortMode.Difficulty || criteria.Group == GroupMode.Difficulty)
+                return false;
+            if (criteria.Sort == SortMode.LastPlayed && criteria.Group == GroupMode.LastPlayed)
+                return false;
+
+            // In the majority case we group sets together for display.
+            return true;
         }
 
         private List<GroupMapping> getGroups(List<CarouselItem> items, FilterCriteria criteria)