Merge pull request #472 from LumpBloom7/Touch-Early-windows

Ignore Touch hit attempts before the early Perfect window

Author: LumpBloom7

osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouch.cs

@@ -19,7 +19,7 @@ public partial class DrawableTouch : DrawableSentakkiHitObject
         public override bool HandlePositionalInput => true;
 
         // This HitObject uses a completely different offset
-        protected override double InitialLifetimeOffset => base.InitialLifetimeOffset + HitObject.HitWindows.WindowFor(HitResult.Ok);
+        protected override double InitialLifetimeOffset => base.InitialLifetimeOffset + HitObject.HitWindows.WindowFor(HitResult.Great);
 
         // Similar to IsHovered for mouse, this tracks whether a pointer (touch or mouse) is interacting with this drawable
         // Interaction == (IsHovered && ActionPressed) || (OnTouch && TouchPointerInBounds)
@@ -80,11 +80,11 @@ protected override void UpdateInitialTransforms()
         {
             base.UpdateInitialTransforms();
             double fadeIn = AdjustedAnimationDuration / 2;
-            double moveTo = HitObject.HitWindows.WindowFor(HitResult.Ok);
+            double moveTo = HitObject.HitWindows.WindowFor(HitResult.Great);
 
             TouchBody.FadeIn(fadeIn);
 
-            using (BeginDelayedSequence(AdjustedAnimationDuration))
+            using (BeginAbsoluteSequence(HitObject.StartTime - moveTo))
             {
                 TouchBody.ResizeTo(90, moveTo, Easing.InCirc);
                 TouchBody.BorderContainer.Delay(moveTo).FadeIn();
@@ -108,11 +108,13 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
 
             var result = HitObject.HitWindows.ResultFor(timeOffset);
 
+            // This is hit before any hit window
             if (result == HitResult.None)
                 return;
 
-            if (timeOffset < 0)
-                result = Result.Judgement.MaxResult;
+            // Hit before the early Great window
+            if (timeOffset < 0 && result is not HitResult.Great)
+                return;
 
             ApplyResult(result);
         }

osu.Game.Rulesets.Sentakki/UI/SentakkiHitObjectLifetimeEntry.cs

@@ -8,7 +8,12 @@ namespace osu.Game.Rulesets.Sentakki.UI
 {
     public class SentakkiHitObjectLifetimeEntry : HitObjectLifetimeEntry
     {
-        protected override double InitialLifetimeOffset => initialLifetimeOffsetFor(HitObject);
+        protected override double InitialLifetimeOffset
+            => HitObject switch
+            {
+                Touch => AdjustedAnimationDuration + HitObject.HitWindows.WindowFor(HitResult.Great),
+                _ => AdjustedAnimationDuration
+            };
 
         private readonly DrawableSentakkiRuleset drawableRuleset;
 
@@ -43,17 +48,5 @@ private void bindAnimationDuration()
                     break;
             }
         }
-
-        private double initialLifetimeOffsetFor(HitObject hitObject)
-        {
-            switch (hitObject)
-            {
-                case Touch:
-                    return AdjustedAnimationDuration + HitObject.HitWindows.WindowFor(HitResult.Ok);
-
-                default:
-                    return AdjustedAnimationDuration;
-            }
-        }
     }
 }