diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableCentreHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableCentreHit.cs index c79351f4d9..add656f208 100644 --- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableCentreHit.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableCentreHit.cs @@ -15,6 +15,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables public DrawableCentreHit(Hit hit) : base(hit) { + Circle.Add(new CentreHitSymbolPiece()); } [BackgroundDependencyLoader] @@ -22,10 +23,5 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables { Circle.AccentColour = colours.PinkDarker; } - - protected override CirclePiece CreateCirclePiece() => new CirclePiece - { - Children = new[] { new CentreHitSymbolPiece() } - }; } } diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs index 4e8d75315d..48bd3e4eb1 100644 --- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableDrumRoll.cs @@ -110,7 +110,5 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables protected override void UpdateState(ArmedState state) { } - - protected virtual CirclePiece CreateCirclePiece() => new CirclePiece(); } } diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs index 25ecd5ac84..19799f7ada 100644 --- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableHit.cs @@ -109,7 +109,5 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables Expire(); } - - protected abstract CirclePiece CreateCirclePiece(); } } diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableRimHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableRimHit.cs index 0fa51b1661..ff8881172d 100644 --- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableRimHit.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableRimHit.cs @@ -15,6 +15,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables public DrawableRimHit(Hit hit) : base(hit) { + Circle.Add(new RimHitSymbolPiece()); } [BackgroundDependencyLoader] @@ -22,10 +23,5 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables { Circle.AccentColour = colours.BlueDarker; } - - protected override CirclePiece CreateCirclePiece() => new CirclePiece - { - Children = new[] { new RimHitSymbolPiece() } - }; } } diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongCentreHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongCentreHit.cs index 815c19779a..a84c8894d5 100644 --- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongCentreHit.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongCentreHit.cs @@ -15,6 +15,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables public DrawableStrongCentreHit(Hit hit) : base(hit) { + Circle.Add(new CentreHitSymbolPiece()); } [BackgroundDependencyLoader] @@ -22,10 +23,5 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables { Circle.AccentColour = colours.PinkDarker; } - - protected override CirclePiece CreateCirclePiece() => new StrongCirclePiece - { - Children = new[] { new CentreHitSymbolPiece() } - }; } } diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongHit.cs index 116ef94ee4..107f476ae2 100644 --- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongHit.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongHit.cs @@ -6,6 +6,7 @@ using System.Linq; using osu.Framework.Input; using osu.Game.Modes.Objects.Drawables; using osu.Game.Modes.Taiko.Judgements; +using osu.Game.Modes.Taiko.Objects.Drawables.Pieces; using OpenTK.Input; namespace osu.Game.Modes.Taiko.Objects.Drawables @@ -29,6 +30,8 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables protected override TaikoJudgement CreateJudgement() => new TaikoStrongHitJudgement(); + protected override CirclePiece CreateCirclePiece() => new StrongCirclePiece(); + protected override void CheckJudgement(bool userTriggered) { if (Judgement.Result == HitResult.None) diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongRimHit.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongRimHit.cs index 3af0ff399b..7ab9be548e 100644 --- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongRimHit.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableStrongRimHit.cs @@ -15,6 +15,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables public DrawableStrongRimHit(Hit hit) : base(hit) { + Circle.Add(new RimHitSymbolPiece()); } [BackgroundDependencyLoader] @@ -22,10 +23,5 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables { Circle.AccentColour = colours.BlueDarker; } - - protected override CirclePiece CreateCirclePiece() => new StrongCirclePiece - { - Children = new[] { new RimHitSymbolPiece() } - }; } } diff --git a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs index 5f85903827..8afe6ad4cf 100644 --- a/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs +++ b/osu.Game.Modes.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs @@ -6,6 +6,7 @@ using osu.Framework.Graphics; using osu.Framework.Input; using osu.Game.Modes.Objects.Drawables; using osu.Game.Modes.Taiko.Judgements; +using osu.Game.Modes.Taiko.Objects.Drawables.Pieces; using OpenTK.Input; namespace osu.Game.Modes.Taiko.Objects.Drawables @@ -36,6 +37,8 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables protected override TaikoJudgement CreateJudgement() => new TaikoJudgement(); + protected virtual CirclePiece CreateCirclePiece() => new CirclePiece(); + /// /// Sets the scroll position of the DrawableHitObject relative to the offset between /// a time value and the HitObject's StartTime.