sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Combine Judgement.HitResults into one.

Browse Source
This commit is contained in:
Dean Herbert
2017-09-05 19:44:59 +09:00
committed by smoogipooo
parent d69b8d7784
commit 84c22df3f5
46 changed files with 265 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
}
}
protected override TaikoJudgement CreateJudgement() => new TaikoJudgement { SecondHit = HitObject.IsStrong };
protected TaikoJudgement CreateJudgement() => new TaikoJudgement { SecondHit = HitObject.IsStrong };
protected override TaikoPiece CreateMainPiece() => new ElongatedCirclePiece();
@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
private void onTickJudgement(DrawableHitObject<TaikoHitObject, TaikoJudgement> obj)
{
if (obj.Judgement.Result == HitResult.Hit)
if (obj.Judgement.Result > HitResult.Miss)
rollingHits++;
else
rollingHits--;
@ -86,12 +86,11 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
if (Judgement.TimeOffset < 0)
return;
int countHit = NestedHitObjects.Count(o => o.Judgement.Result == HitResult.Hit);
int countHit = NestedHitObjects.Count(o => o.Judgement.Result > HitResult.Miss);
if (countHit > HitObject.RequiredGoodHits)
{
Judgement.Result = HitResult.Hit;
Judgement.TaikoResult = countHit >= HitObject.RequiredGreatHits ? TaikoHitResult.Great : TaikoHitResult.Good;
Judgement.Result = countHit >= HitObject.RequiredGreatHits ? HitResult.Great : HitResult.Good;
}
else
Judgement.Result = HitResult.Miss;