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

Hits -> JudgedHits

Browse Source
This commit is contained in:
Dean Herbert 2018-02-01 17:48:26 +09:00
parent 2971991dfe
commit 1cc7c23982
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs
View File

@ -53,7 +53,7 @@ namespace osu.Game.Rulesets.Taiko.Scoring
/// <summary> /// <summary>
/// Taiko fails at the end of the map if the player has not half-filled their HP bar. /// Taiko fails at the end of the map if the player has not half-filled their HP bar.
/// </summary> /// </summary>
protected override bool DefaultFailCondition => Hits == MaxHits && Health.Value <= 0.5; protected override bool DefaultFailCondition => JudgedHits == MaxHits && Health.Value <= 0.5;
private double hpIncreaseTick; private double hpIncreaseTick;
private double hpIncreaseGreat; private double hpIncreaseGreat;

12
osu.Game/Rulesets/Scoring/ScoreProcessor.cs
View File

@ -171,10 +171,10 @@ namespace osu.Game.Rulesets.Scoring
public readonly Bindable<ScoringMode> Mode = new Bindable<ScoringMode>(); public readonly Bindable<ScoringMode> Mode = new Bindable<ScoringMode>();
protected sealed override bool HasCompleted => Hits == MaxHits; protected sealed override bool HasCompleted => JudgedHits == MaxHits;
protected int MaxHits { get; private set; } protected int MaxHits { get; private set; }
protected int Hits { get; private set; } protected int JudgedHits { get; private set; }
private double maxHighestCombo; private double maxHighestCombo;
@ -259,7 +259,7 @@ namespace osu.Game.Rulesets.Scoring
baseScore += judgement.NumericResult; baseScore += judgement.NumericResult;
rollingMaxBaseScore += judgement.MaxNumericResult; rollingMaxBaseScore += judgement.MaxNumericResult;
Hits++; JudgedHits++;
} }
else if (judgement.IsHit) else if (judgement.IsHit)
bonusScore += judgement.NumericResult; bonusScore += judgement.NumericResult;
@ -279,7 +279,7 @@ namespace osu.Game.Rulesets.Scoring
baseScore -= judgement.NumericResult; baseScore -= judgement.NumericResult;
rollingMaxBaseScore -= judgement.MaxNumericResult; rollingMaxBaseScore -= judgement.MaxNumericResult;
Hits--; JudgedHits--;
} }
else if (judgement.IsHit) else if (judgement.IsHit)
bonusScore -= judgement.NumericResult; bonusScore -= judgement.NumericResult;
@ -305,14 +305,14 @@ namespace osu.Game.Rulesets.Scoring
{ {
if (storeResults) if (storeResults)
{ {
MaxHits = Hits; MaxHits = JudgedHits;
maxHighestCombo = HighestCombo; maxHighestCombo = HighestCombo;
maxBaseScore = baseScore; maxBaseScore = baseScore;
} }
base.Reset(storeResults); base.Reset(storeResults);
Hits = 0; JudgedHits = 0;
baseScore = 0; baseScore = 0;
rollingMaxBaseScore = 0; rollingMaxBaseScore = 0;
bonusScore = 0; bonusScore = 0;