Give Slider a tail hitobject to make slider ends counts towards score

osu.Game.Rulesets.Osu/Judgements/OsuSliderTailJudgement.cs

@@ -0,0 +1,13 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Judgements
+{
+    public class OsuSliderTailJudgement : OsuJudgement
+    {
+        public override bool AffectsCombo => false;
+        protected override int NumericResultFor(HitResult result) => 0;
+    }
+}

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs

@@ -18,14 +18,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     public class DrawableSlider : DrawableOsuHitObject, IDrawableHitObjectWithProxiedApproach
     {
         private readonly Slider slider;
-
-        public readonly DrawableHitCircle HeadCircle;
-
         private readonly List<Drawable> components = new List<Drawable>();
 
-        private readonly Container<DrawableSliderTick> ticks;
+        public readonly DrawableHitCircle HeadCircle;
-        private readonly Container<DrawableRepeatPoint> repeatPoints;
-
         public readonly SliderBody Body;
         public readonly SliderBall Ball;
 
@@ -34,6 +29,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             slider = s;
 
+            DrawableSliderTail tail;
+            Container<DrawableSliderTick> ticks;
+            Container<DrawableRepeatPoint> repeatPoints;
+
             Children = new Drawable[]
             {
                 Body = new SliderBody(s)
@@ -51,7 +50,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     AlwaysPresent = true,
                     Alpha = 0
                 },
-                HeadCircle = new DrawableHitCircle(s.HeadCircle)
+                HeadCircle = new DrawableHitCircle(s.HeadCircle),
+                tail = new DrawableSliderTail(s.TailCircle)
             };
 
             components.Add(Body);
@@ -59,6 +59,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             AddNested(HeadCircle);
 
+            AddNested(tail);
+            components.Add(tail);
+
             foreach (var tick in s.NestedHitObjects.OfType<SliderTick>())
             {
                 var spanStartTime = s.StartTime + tick.SpanIndex * s.SpanDuration;
@@ -73,6 +76,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 };
 
                 ticks.Add(drawableTick);
+                components.Add(drawableTick);
                 AddNested(drawableTick);
             }
 
@@ -112,17 +116,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             foreach (var c in components.OfType<ISliderProgress>()) c.UpdateProgress(progress, span);
             foreach (var c in components.OfType<ITrackSnaking>()) c.UpdateSnakingPosition(slider.Curve.PositionAt(Body.SnakedStart ?? 0), slider.Curve.PositionAt(Body.SnakedEnd ?? 0));
-            foreach (var t in ticks.Children) t.Tracking = Ball.Tracking;
+            foreach (var t in components.OfType<IRequireTracking>()) t.Tracking = Ball.Tracking;
         }
 
         protected override void CheckForJudgements(bool userTriggered, double timeOffset)
         {
             if (!userTriggered && Time.Current >= slider.EndTime)
             {
-                var judgementsCount = ticks.Children.Count + repeatPoints.Children.Count + 1;
+                var judgementsCount = NestedHitObjects.Count;
-                var judgementsHit = ticks.Children.Count(t => t.Judgements.Any(j => j.IsHit)) + repeatPoints.Children.Count(t => t.Judgements.Any(j => j.IsHit));
+                var judgementsHit = NestedHitObjects.Count(h => h.IsHit);
-                if (HeadCircle.Judgements.Any(j => j.IsHit))
-                    judgementsHit++;
 
                 var hitFraction = (double)judgementsHit / judgementsCount;
                 if (hitFraction == 1 && HeadCircle.Judgements.Any(j => j.Result == HitResult.Great))

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs

@@ -0,0 +1,32 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables
+{
+    public class DrawableSliderTail : DrawableOsuHitObject, IRequireTracking
+    {
+        /// <summary>
+        /// The judgement text is provided by the <see cref="DrawableSlider"/>.
+        /// </summary>
+        public override bool DisplayJudgement => false;
+
+        public bool Tracking { get; set; }
+
+        public DrawableSliderTail(HitCircle hitCircle)
+            : base(hitCircle)
+        {
+            AlwaysPresent = true;
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        protected override void CheckForJudgements(bool userTriggered, double timeOffset)
+        {
+            if (!userTriggered && timeOffset >= 0)
+                AddJudgement(new OsuSliderTailJudgement { Result = Tracking ? HitResult.Great : HitResult.Miss });
+        }
+    }
+}

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs

@@ -12,14 +12,14 @@ using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
-    public class DrawableSliderTick : DrawableOsuHitObject
+    public class DrawableSliderTick : DrawableOsuHitObject, IRequireTracking
     {
         private readonly SliderTick sliderTick;
 
         public double FadeInTime;
         public double FadeOutTime;
 
-        public bool Tracking;
+        public bool Tracking { get; set; }
 
         public override bool DisplayJudgement => false;
 

osu.Game.Rulesets.Osu/Objects/Drawables/IRequireTracking.cs

@@ -0,0 +1,13 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables
+{
+    public interface IRequireTracking
+    {
+        /// <summary>
+        /// Whether the <see cref="DrawableSlider"/> is currently being tracked by the user.
+        /// </summary>
+        bool Tracking { get; set; }
+    }
+}

osu.Game.Rulesets.Osu/Objects/Slider.cs

@@ -81,6 +81,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         public double TickDistance;
 
         public HitCircle HeadCircle;
+        public HitCircle TailCircle;
 
         protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {
@@ -104,7 +105,18 @@ namespace osu.Game.Rulesets.Osu.Objects
                 SampleControlPoint = SampleControlPoint
             };
 
+            TailCircle = new HitCircle
+            {
+                StartTime = EndTime,
+                Position = StackedEndPosition,
+                IndexInCurrentCombo = IndexInCurrentCombo,
+                ComboColour = ComboColour,
+                Samples = Samples,
+                SampleControlPoint = SampleControlPoint
+            };
+
             HeadCircle.ApplyDefaults(controlPointInfo, difficulty);
+            TailCircle.ApplyDefaults(controlPointInfo, difficulty);
         }
 
         protected override void CreateNestedHitObjects()

osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj

@@ -55,6 +55,7 @@
     <Compile Include="Edit\OsuEditPlayfield.cs" />
     <Compile Include="Edit\OsuEditRulesetContainer.cs" />
     <Compile Include="Edit\OsuHitObjectComposer.cs" />
+    <Compile Include="Judgements\OsuSliderTailJudgement.cs" />
     <Compile Include="Mods\OsuModAutopilot.cs" />
     <Compile Include="Mods\OsuModAutoplay.cs" />
     <Compile Include="Mods\OsuModDaycore.cs" />
@@ -75,6 +76,8 @@
     <Compile Include="Objects\Drawables\Connections\FollowPointRenderer.cs" />
     <Compile Include="Judgements\OsuJudgement.cs" />
     <Compile Include="Objects\Drawables\DrawableRepeatPoint.cs" />
+    <Compile Include="Objects\Drawables\DrawableSliderTail.cs" />
+    <Compile Include="Objects\Drawables\IRequireTracking.cs" />
     <Compile Include="Objects\Drawables\ITrackSnaking.cs" />
     <Compile Include="Objects\Drawables\Pieces\ApproachCircle.cs" />
     <Compile Include="Objects\Drawables\Pieces\SpinnerBackground.cs" />