From ba31bfcdf12a76a085aaf015d62c8c9565a2a367 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Thu, 3 Aug 2017 20:19:50 +0930 Subject: [PATCH] CI fixes. --- osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs | 2 +- osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHitStrong.cs | 3 --- .../Objects/Drawables/DrawableTaikoHitObject.cs | 2 +- .../Objects/Drawables/Pieces/CirclePiece.cs | 3 +-- .../Objects/Drawables/Pieces/ElongatedCirclePiece.cs | 3 +-- .../Objects/Drawables/Pieces/SwellSymbolPiece.cs | 1 - 6 files changed, 4 insertions(+), 10 deletions(-) diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs index 756eff6fdf..74f0f2326d 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs @@ -50,7 +50,7 @@ public DrawableDrumRoll(DrumRoll drumRoll) protected override TaikoJudgement CreateJudgement() => new TaikoJudgement { SecondHit = HitObject.IsStrong }; - protected override TaikoPiece CreateMainPiece() => new ElongatedCirclePiece(HitObject.IsStrong) + protected override TaikoPiece CreateMainPiece() => new ElongatedCirclePiece { Length = (float)(HitObject.Duration / HitObject.ScrollTime), PlayfieldLengthReference = () => Parent.DrawSize.X diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHitStrong.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHitStrong.cs index 1c6b12ea43..57e7eea470 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHitStrong.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHitStrong.cs @@ -7,7 +7,6 @@ using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Taiko.Judgements; using OpenTK.Input; -using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces; namespace osu.Game.Rulesets.Taiko.Objects.Drawables { @@ -28,8 +27,6 @@ protected DrawableHitStrong(Hit hit) { } - protected override TaikoPiece CreateMainPiece() => new CirclePiece(true); - protected override TaikoJudgement CreateJudgement() => new TaikoStrongHitJudgement(); protected override void CheckJudgement(bool userTriggered) diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs index f039f35533..510994ed70 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs @@ -48,7 +48,7 @@ protected DrawableTaikoHitObject(TaikoHitType hitObject) protected override TaikoJudgement CreateJudgement() => new TaikoJudgement(); - protected virtual TaikoPiece CreateMainPiece() => new CirclePiece(HitObject.IsStrong); + protected virtual TaikoPiece CreateMainPiece() => new CirclePiece(); /// /// Sets the scroll position of the DrawableHitObject relative to the offset between diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs index c4746a664b..ba717371dd 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs @@ -9,7 +9,6 @@ using OpenTK.Graphics; using osu.Game.Beatmaps.ControlPoints; using osu.Framework.Audio.Track; -using OpenTK; namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces { @@ -64,7 +63,7 @@ public override bool KiaiMode public Box FlashBox; - public CirclePiece(bool isStrong = false) + public CirclePiece() { EarlyActivationMilliseconds = pre_beat_transition_time; diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/ElongatedCirclePiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/ElongatedCirclePiece.cs index ce591335f8..2f5b4eefd6 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/ElongatedCirclePiece.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/ElongatedCirclePiece.cs @@ -18,8 +18,7 @@ public class ElongatedCirclePiece : CirclePiece /// public float Length; - public ElongatedCirclePiece(bool isStrong = false) - : base(isStrong) + public ElongatedCirclePiece() { RelativeSizeAxes = Axes.Y; } diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs index ac10743539..c3fdc671a4 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/SwellSymbolPiece.cs @@ -1,7 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using OpenTK; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers;