h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 18:42:56 +08:00
Code Issues Releases Wiki Activity

Removed modifications to drum roll object

Browse Source
This commit is contained in:
Tim Oliver 2020-04-25 00:15:37 +08:00
parent 029d15f2a2
commit 2be3a8184d
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs
View File

@ -36,14 +36,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
private Color4 colourIdle;
private Color4 colourEngaged;
private bool judgingStarted;
/// <summary>
/// A handler action for when the drumroll has been hit,
/// regardless of any judgement.
/// </summary>
public Action<TaikoAction, bool> OnHit;
public DrawableDrumRoll(DrumRoll drumRoll)
: base(drumRoll)
{
@ -103,27 +95,15 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
protected override SkinnableDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.DrumRollBody),
_ => new ElongatedCirclePiece());
public override bool OnPressed(TaikoAction action)
{
if (judgingStarted)
OnHit.Invoke(action, HitObject.IsStrong);
return false;
}
public override bool OnPressed(TaikoAction action) => false;
private void onNewResult(DrawableHitObject obj, JudgementResult result)
{
if (!(obj is DrawableDrumRollTick))
return;
DrawableDrumRollTick drumRollTick = (DrawableDrumRollTick)obj;
if (result.Type > HitResult.Miss)
{
OnHit.Invoke(drumRollTick.JudgedAction, HitObject.IsStrong);
judgingStarted = true;
rollingHits++;
}
else
rollingHits--;