Merge pull request #52 from swoolcock/sawblade-regression

Actually fix sawblade leniency

Author: swoolcock

osu.Game.Rulesets.Rush/Objects/Drawables/DrawableSawblade.cs

@@ -65,16 +65,24 @@ private void updateDrawables()
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
+            // sawblades can't be user triggered, and will not hurt the player in the leading hit windows
             if (userTriggered || timeOffset < 0 || AllJudged)
                 return;
 
-            if (HitObject.HitWindows.ResultFor(timeOffset) != HitResult.None)
-                return;
+            switch (HitObject.HitWindows.ResultFor(timeOffset))
+            {
+                case HitResult.None:
+                    // if we've reached the trailing "none", we successfully dodged the sawblade
+                    ApplyResult(r => r.Type = HitResult.Perfect);
+                    break;
 
-            if (playfield.PlayerSprite.CollidesWith(HitObject))
-                ApplyResult(r => r.Type = HitResult.Miss);
-            else
-                ApplyResult(r => r.Type = HitResult.Perfect);
+                case HitResult.Miss:
+                    // sawblades only hurt the player if they collide within the trailing "miss" hit window
+                    if (playfield.PlayerSprite.CollidesWith(HitObject))
+                        ApplyResult(r => r.Type = HitResult.Miss);
+
+                    break;
+            }
         }
 
         protected class Saw : CompositeDrawable

osu.Game.Rulesets.Rush/Scoring/SawbladeHitWindows.cs

@@ -10,7 +10,7 @@ public class SawbladeHitWindows : RushHitWindows
         protected override DifficultyRange[] GetRanges() => new[]
         {
             new DifficultyRange(HitResult.Perfect, 20, 20, 20),
-            new DifficultyRange(HitResult.Miss, 400, 400, 400)
+            new DifficultyRange(HitResult.Miss, 50, 50, 50)
         };
 
         public override bool IsHitResultAllowed(HitResult result) => result == HitResult.Perfect || result == HitResult.Miss;