From b5ad6ae73536a82c4536832ba1fc95497665287a Mon Sep 17 00:00:00 2001 From: Shawdooow Date: Tue, 26 Sep 2017 12:21:39 -0400 Subject: [PATCH] appveyor fixes --- .../Objects/Drawables/DrawableSlider.cs | 9 ++++----- .../Objects/Drawables/DrawableSliderBouncer.cs | 7 +------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs index 61d4ec493c..2833cc81bf 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs @@ -9,7 +9,6 @@ using System.Collections.Generic; using System.Linq; using osu.Framework.Graphics.Containers; using osu.Game.Rulesets.Osu.Judgements; -using osu.Game.Rulesets.Classic.Objects.Drawables; namespace osu.Game.Rulesets.Osu.Objects.Drawables { @@ -132,12 +131,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables { if (!userTriggered && Time.Current >= slider.EndTime) { - var ticksCount = ticks.Children.Count + 1; - var ticksHit = ticks.Children.Count(t => t.Judgements.Any(j => j.IsHit)); + var judgementsCount = ticks.Children.Count + bouncers.Children.Count + 1; + var judgementsHit = ticks.Children.Count(t => t.Judgements.Any(j => j.IsHit)) + bouncers.Children.Count(t => t.Judgements.Any(j => j.IsHit)); if (initialCircle.Judgements.Any(j => j.IsHit)) - ticksHit++; + judgementsHit++; - var hitFraction = (double)ticksHit / ticksCount; + var hitFraction = (double)judgementsHit / judgementsCount; if (hitFraction == 1 && initialCircle.Judgements.Any(j => j.Result == HitResult.Great)) AddJudgement(new OsuJudgement { Result = HitResult.Great }); else if (hitFraction >= 0.5 && initialCircle.Judgements.Any(j => j.Result >= HitResult.Good)) diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBouncer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBouncer.cs index e1f668da86..45be022027 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBouncer.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderBouncer.cs @@ -5,15 +5,10 @@ using System; using osu.Framework.Graphics; using osu.Game.Rulesets.Objects.Drawables; using OpenTK; -using OpenTK.Graphics; -using osu.Framework.Graphics.Shapes; -using osu.Framework.Graphics.Sprites; using osu.Game.Graphics; -using osu.Game.Rulesets.Osu.Objects.Drawables; -using osu.Game.Rulesets.Osu.Objects; using osu.Game.Rulesets.Osu.Judgements; -namespace osu.Game.Rulesets.Classic.Objects.Drawables +namespace osu.Game.Rulesets.Osu.Objects.Drawables { public class DrawableSliderBouncer : DrawableOsuHitObject {