sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Make hp work + cleanup

Browse Source
This commit is contained in:
smoogipoo
2019-04-22 17:51:43 +09:00
parent 144e6012dc
commit 4edb17a88a
6 changed files with 17 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,9 +206,6 @@ namespace osu.Game.Rulesets.Scoring
private double baseScore;
private double bonusScore;
private double rollingHp;
private double rollingMaxHp;
protected ScoreProcessor()
{
}
@ -304,6 +301,7 @@ namespace osu.Game.Rulesets.Scoring
{
result.ComboAtJudgement = Combo.Value;
result.HighestComboAtJudgement = HighestCombo.Value;
result.HealthAtJudgement = Health.Value;
JudgedHits++;
@ -336,8 +334,7 @@ namespace osu.Game.Rulesets.Scoring
rollingMaxBaseScore += result.Judgement.MaxNumericResult;
}
rollingHp += HpFactorFor(result.Judgement, result.Type) * result.Judgement.HealthIncreaseFor(result);
rollingMaxHp += HpFactorFor(result.Judgement, result.Judgement.MaxResult) * result.Judgement.MaxHealthIncrease;
Health.Value += HpFactorFor(result) * result.Judgement.HealthIncreaseFor(result);
}
/// <summary>
@ -349,6 +346,7 @@ namespace osu.Game.Rulesets.Scoring
{
Combo.Value = result.ComboAtJudgement;
HighestCombo.Value = result.HighestComboAtJudgement;
Health.Value = result.HealthAtJudgement;
JudgedHits--;
@ -362,12 +360,9 @@ namespace osu.Game.Rulesets.Scoring
baseScore -= result.Judgement.NumericResultFor(result);
rollingMaxBaseScore -= result.Judgement.MaxNumericResult;
}
rollingHp -= HpFactorFor(result.Judgement, result.Type) * result.Judgement.HealthIncreaseFor(result);
rollingMaxHp -= HpFactorFor(result.Judgement, result.Judgement.MaxResult) * result.Judgement.MaxHealthIncrease;
}
protected virtual double HpFactorFor(Judgement judgement, HitResult result) => 1;
protected virtual double HpFactorFor(JudgementResult result) => 1;
private void updateScore()
{