Merge pull request #8769 from peppy/fix-osu-hidden-mod-alt

Fix spinners being considered the "first object" for increased visibility in hidden

osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModHidden.cs

@@ -0,0 +1,106 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public class TestSceneOsuModHidden : ModTestScene
+    {
+        public TestSceneOsuModHidden()
+            : base(new OsuRuleset())
+        {
+        }
+
+        [Test]
+        public void TestDefaultBeatmapTest() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModHidden(),
+            Autoplay = true,
+            PassCondition = checkSomeHit
+        });
+
+        [Test]
+        public void FirstCircleAfterTwoSpinners() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModHidden(),
+            Autoplay = true,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Spinner
+                    {
+                        Position = new Vector2(256, 192),
+                        EndTime = 1000,
+                    },
+                    new Spinner
+                    {
+                        Position = new Vector2(256, 192),
+                        StartTime = 1200,
+                        EndTime = 2200,
+                    },
+                    new HitCircle
+                    {
+                        Position = new Vector2(300, 192),
+                        StartTime = 3200,
+                    },
+                    new HitCircle
+                    {
+                        Position = new Vector2(384, 192),
+                        StartTime = 4200,
+                    }
+                }
+            },
+            PassCondition = checkSomeHit
+        });
+
+        [Test]
+        public void FirstSliderAfterTwoSpinners() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModHidden(),
+            Autoplay = true,
+            Beatmap = new Beatmap
+            {
+                HitObjects = new List<HitObject>
+                {
+                    new Spinner
+                    {
+                        Position = new Vector2(256, 192),
+                        EndTime = 1000,
+                    },
+                    new Spinner
+                    {
+                        Position = new Vector2(256, 192),
+                        StartTime = 1200,
+                        EndTime = 2200,
+                    },
+                    new Slider
+                    {
+                        StartTime = 3200,
+                        Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(100, 0), })
+                    },
+                    new Slider
+                    {
+                        StartTime = 5200,
+                        Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(100, 0), })
+                    }
+                }
+            },
+            PassCondition = checkSomeHit
+        });
+
+        private bool checkSomeHit()
+        {
+            return Player.ScoreProcessor.JudgedHits >= 4;
+        }
+    }
+}

osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs

@@ -23,6 +23,8 @@ public class OsuModHidden : ModHidden
         private const double fade_in_duration_multiplier = 0.4;
         private const double fade_out_duration_multiplier = 0.3;
 
+        protected override bool IsFirstHideableObject(DrawableHitObject hitObject) => !(hitObject is DrawableSpinner);
+
         public override void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
             static void adjustFadeIn(OsuHitObject h) => h.TimeFadeIn = h.TimePreempt * fade_in_duration_multiplier;

osu.Game/Rulesets/Mods/ModHidden.cs

@@ -23,6 +23,13 @@ public abstract class ModHidden : Mod, IReadFromConfig, IApplicableToDrawableHit
 
         protected Bindable<bool> IncreaseFirstObjectVisibility = new Bindable<bool>();
 
+        /// <summary>
+        /// Check whether the provided hitobject should be considered the "first" hideable object.
+        /// Can be used to skip spinners, for instance.
+        /// </summary>
+        /// <param name="hitObject">The hitobject to check.</param>
+        protected virtual bool IsFirstHideableObject(DrawableHitObject hitObject) => true;
+
         public void ReadFromConfig(OsuConfigManager config)
         {
             IncreaseFirstObjectVisibility = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility);
@@ -30,8 +37,11 @@ public void ReadFromConfig(OsuConfigManager config)
 
         public virtual void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
-            foreach (var d in drawables.Skip(IncreaseFirstObjectVisibility.Value ? 1 : 0))
-                d.ApplyCustomUpdateState += ApplyHiddenState;
+            if (IncreaseFirstObjectVisibility.Value)
+                drawables = drawables.SkipWhile(h => !IsFirstHideableObject(h)).Skip(1);
+
+            foreach (var dho in drawables)
+                dho.ApplyCustomUpdateState += ApplyHiddenState;
         }
 
         public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)