mirror of
https://github.com/osukey/osukey.git
synced 2025-05-29 17:37:23 +09:00
Merge branch 'master' into fix-difficulty-calculator
This commit is contained in:
commit
2c0928896b
@ -68,6 +68,8 @@ namespace osu.Game.Rulesets.Osu.Scoring
|
|||||||
score.Statistics[HitResult.Miss] = scoreResultCounts.GetOrDefault(HitResult.Miss);
|
score.Statistics[HitResult.Miss] = scoreResultCounts.GetOrDefault(HitResult.Miss);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private const double harshness = 0.01;
|
||||||
|
|
||||||
protected override void OnNewJudgement(Judgement judgement)
|
protected override void OnNewJudgement(Judgement judgement)
|
||||||
{
|
{
|
||||||
base.OnNewJudgement(judgement);
|
base.OnNewJudgement(judgement);
|
||||||
@ -83,15 +85,15 @@ namespace osu.Game.Rulesets.Osu.Scoring
|
|||||||
switch (judgement.Result)
|
switch (judgement.Result)
|
||||||
{
|
{
|
||||||
case HitResult.Great:
|
case HitResult.Great:
|
||||||
Health.Value += (10.2 - hpDrainRate) * 0.02;
|
Health.Value += (10.2 - hpDrainRate) * harshness;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case HitResult.Good:
|
case HitResult.Good:
|
||||||
Health.Value += (8 - hpDrainRate) * 0.02;
|
Health.Value += (8 - hpDrainRate) * harshness;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case HitResult.Meh:
|
case HitResult.Meh:
|
||||||
Health.Value += (4 - hpDrainRate) * 0.02;
|
Health.Value += (4 - hpDrainRate) * harshness;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/*case HitResult.SliderTick:
|
/*case HitResult.SliderTick:
|
||||||
@ -99,7 +101,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
|
|||||||
break;*/
|
break;*/
|
||||||
|
|
||||||
case HitResult.Miss:
|
case HitResult.Miss:
|
||||||
Health.Value -= hpDrainRate * 0.04;
|
Health.Value -= hpDrainRate * (harshness * 2);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user