mirror of
https://github.com/osukey/osukey.git
synced 2025-05-04 21:27:22 +09:00
Make combo be changed by the base ScoreProcessor.
This commit is contained in:
parent
98630dd06c
commit
37129bf03d
@ -15,6 +15,8 @@ namespace osu.Game.Modes.Taiko.Judgements
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public override string MaxResultString => string.Empty;
|
public override string MaxResultString => string.Empty;
|
||||||
|
|
||||||
|
public override bool AffectsCombo => false;
|
||||||
|
|
||||||
protected override int NumericResultForScore(TaikoHitResult result)
|
protected override int NumericResultForScore(TaikoHitResult result)
|
||||||
{
|
{
|
||||||
switch (result)
|
switch (result)
|
||||||
|
@ -187,20 +187,6 @@ namespace osu.Game.Modes.Taiko.Scoring
|
|||||||
if (!isTick)
|
if (!isTick)
|
||||||
totalHits++;
|
totalHits++;
|
||||||
|
|
||||||
// Apply combo changes, must be done before the hit score is added
|
|
||||||
if (!isTick)
|
|
||||||
{
|
|
||||||
switch (judgement.Result)
|
|
||||||
{
|
|
||||||
case HitResult.Miss:
|
|
||||||
Combo.Value = 0;
|
|
||||||
break;
|
|
||||||
case HitResult.Hit:
|
|
||||||
Combo.Value++;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply score changes
|
// Apply score changes
|
||||||
addHitScore(judgement);
|
addHitScore(judgement);
|
||||||
|
|
||||||
|
@ -17,10 +17,7 @@ namespace osu.Game.Modes.Judgements
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public double TimeOffset;
|
public double TimeOffset;
|
||||||
|
|
||||||
/// <summary>
|
public virtual bool AffectsCombo => true;
|
||||||
/// The combo after this judgement was processed.
|
|
||||||
/// </summary>
|
|
||||||
public int ComboAtHit;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The string representation for the result achieved.
|
/// The string representation for the result achieved.
|
||||||
|
@ -8,6 +8,7 @@ using osu.Game.Beatmaps;
|
|||||||
using osu.Game.Modes.Judgements;
|
using osu.Game.Modes.Judgements;
|
||||||
using osu.Game.Modes.Objects;
|
using osu.Game.Modes.Objects;
|
||||||
using osu.Game.Modes.UI;
|
using osu.Game.Modes.UI;
|
||||||
|
using osu.Game.Modes.Objects.Drawables;
|
||||||
|
|
||||||
namespace osu.Game.Modes.Scoring
|
namespace osu.Game.Modes.Scoring
|
||||||
{
|
{
|
||||||
@ -145,10 +146,21 @@ namespace osu.Game.Modes.Scoring
|
|||||||
|
|
||||||
if (!exists)
|
if (!exists)
|
||||||
{
|
{
|
||||||
|
if (judgement.AffectsCombo)
|
||||||
|
{
|
||||||
|
switch (judgement.Result)
|
||||||
|
{
|
||||||
|
case HitResult.Miss:
|
||||||
|
Combo.Value = 0;
|
||||||
|
break;
|
||||||
|
case HitResult.Hit:
|
||||||
|
Combo.Value++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Judgements.Add(judgement);
|
Judgements.Add(judgement);
|
||||||
OnNewJudgement(judgement);
|
OnNewJudgement(judgement);
|
||||||
|
|
||||||
judgement.ComboAtHit = Combo.Value;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
OnJudgementChanged(judgement);
|
OnJudgementChanged(judgement);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user