Merge pull request #28399 from matheus-cesquim/total-playlist-duration-not-considering-altered-song-durations-from-speed-changing-mods-#28398

Fix playlist total time not considering rate adjust mods

osu.Game/Beatmaps/Drawables/DifficultyIconTooltip.cs

@@ -13,6 +13,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Utils;
 using osuTK;
 
 namespace osu.Game.Beatmaps.Drawables
@@ -124,12 +125,8 @@ namespace osu.Game.Beatmaps.Drawables
             miscFillFlowContainer.Show();
 
             double rate = 1;
-
             if (displayedContent.Mods != null)
-            {
+                rate = ModUtils.CalculateRateWithMods(displayedContent.Mods);
-                foreach (var mod in displayedContent.Mods.OfType<IApplicableToRate>())
-                    rate = mod.ApplyToRate(0, rate);
-            }
 
             double bpmAdjusted = displayedContent.BeatmapInfo.BPM * rate;
 

osu.Game/Online/Rooms/PlaylistExtensions.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using Humanizer;
 using Humanizer.Localisation;
 using osu.Framework.Bindables;
+using osu.Game.Utils;
 
 namespace osu.Game.Online.Rooms
 {
@@ -38,7 +39,21 @@ namespace osu.Game.Online.Rooms
                 : GetUpcomingItems(playlist).First();
         }
 
+        /// <summary>
+        /// Returns the total duration from the <see cref="PlaylistItem"/> in playlist order from the supplied <paramref name="playlist"/>,
+        /// </summary>
         public static string GetTotalDuration(this BindableList<PlaylistItem> playlist) =>
-            playlist.Select(p => p.Beatmap.Length).Sum().Milliseconds().Humanize(minUnit: TimeUnit.Second, maxUnit: TimeUnit.Hour, precision: 2);
+            playlist.Select(p =>
+            {
+                double rate = 1;
+
+                if (p.RequiredMods.Length > 0)
+                {
+                    var ruleset = p.Beatmap.Ruleset.CreateInstance();
+                    rate = ModUtils.CalculateRateWithMods(p.RequiredMods.Select(mod => mod.ToMod(ruleset)));
+                }
+
+                return p.Beatmap.Length / rate;
+            }).Sum().Milliseconds().Humanize(minUnit: TimeUnit.Second, maxUnit: TimeUnit.Hour, precision: 2);
     }
 }

osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs

@@ -165,9 +165,7 @@ namespace osu.Game.Overlays.Mods
                     starRatingDisplay.FinishTransforms(true);
             });
 
-            double rate = 1;
+            double rate = ModUtils.CalculateRateWithMods(Mods.Value);
-            foreach (var mod in Mods.Value.OfType<IApplicableToRate>())
-                rate = mod.ApplyToRate(0, rate);
 
             bpmDisplay.Current.Value = FormatUtils.RoundBPM(BeatmapInfo.Value.BPM, rate);
 

osu.Game/Screens/Select/BeatmapInfoWedge.cs

@@ -402,9 +402,7 @@ namespace osu.Game.Screens.Select
                     return;
 
                 // this doesn't consider mods which apply variable rates, yet.
-                double rate = 1;
+                double rate = ModUtils.CalculateRateWithMods(mods.Value);
-                foreach (var mod in mods.Value.OfType<IApplicableToRate>())
-                    rate = mod.ApplyToRate(0, rate);
 
                 int bpmMax = FormatUtils.RoundBPM(beatmap.ControlPointInfo.BPMMaximum, rate);
                 int bpmMin = FormatUtils.RoundBPM(beatmap.ControlPointInfo.BPMMinimum, rate);

osu.Game/Screens/Select/Details/AdvancedStats.cs

@@ -27,6 +27,7 @@ using osu.Game.Configuration;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Rulesets;
 using osu.Game.Overlays.Mods;
+using osu.Game.Utils;
 
 namespace osu.Game.Screens.Select.Details
 {
@@ -179,9 +180,7 @@ namespace osu.Game.Screens.Select.Details
 
                 if (Ruleset.Value != null)
                 {
-                    double rate = 1;
+                    double rate = ModUtils.CalculateRateWithMods(mods.Value);
-                    foreach (var mod in mods.Value.OfType<IApplicableToRate>())
-                        rate = mod.ApplyToRate(0, rate);
 
                     adjustedDifficulty = Ruleset.Value.CreateInstance().GetRateAdjustedDisplayDifficulty(originalDifficulty, rate);
 

osu.Game/Utils/ModUtils.cs

@@ -276,5 +276,20 @@ namespace osu.Game.Utils
 
             return scoreMultiplier.ToLocalisableString("0.00x");
         }
+
+        /// <summary>
+        /// Calculate the rate for the song with the selected mods.
+        /// </summary>
+        /// <param name="mods">The list of selected mods.</param>
+        /// <returns>The rate with mods.</returns>
+        public static double CalculateRateWithMods(IEnumerable<Mod> mods)
+        {
+            double rate = 1;
+
+            foreach (var mod in mods.OfType<IApplicableToRate>())
+                rate = mod.ApplyToRate(0, rate);
+
+            return rate;
+        }
     }
 }