RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added arbitrary hit handler to drum roll object

This commit is contained in:
Tim Oliver 2020-04-07 16:40:01 +08:00
parent 6e12f1b69b
commit 1057981c79
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,14 @@ public class DrawableDrumRoll : DrawableTaikoHitObject<DrumRoll>
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> OnHit;
public DrawableDrumRoll(DrumRoll drumRoll)
: base(drumRoll)
{
@ -86,15 +94,27 @@ protected override DrawableHitObject CreateNestedHitObject(HitObject hitObject)
protected override TaikoPiece CreateMainPiece() => new ElongatedCirclePiece();
public override bool OnPressed(TaikoAction action) => false;
public override bool OnPressed(TaikoAction action)
{
if (judgingStarted)
OnHit.Invoke(action);
return 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);
judgingStarted = true;
rollingHits++;
}
else
rollingHits--;
@ -113,8 +133,11 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
return;
int countHit = NestedHitObjects.Count(o => o.IsHit);
if (countHit >= HitObject.RequiredGoodHits)
{
ApplyResult(r => r.Type = countHit >= HitObject.RequiredGreatHits ? HitResult.Great : HitResult.Good);
}
else
ApplyResult(r => r.Type = HitResult.Miss);
}