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

Add setting to toggle standardised or exponential scoring display

Browse Source 
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
This commit is contained in:
Dean Herbert
2018-06-08 03:17:12 +09:00
parent d5e42a8daa
commit 0b4f5af52e
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,11 @@ namespace osu.Game.Rulesets.Scoring
/// </summary>
public readonly BindableInt HighestCombo = new BindableInt();
/// <summary>
/// The <see cref="ScoringMode"/> used to calculate scores.
/// </summary>
public readonly Bindable<ScoringMode> Mode = new Bindable<ScoringMode>();
/// <summary>
/// Whether all <see cref="Judgement"/>s have been processed.
/// </summary>
@ -169,8 +174,6 @@ namespace osu.Game.Rulesets.Scoring
private const double combo_portion = 0.7;
private const double max_score = 1000000;
public readonly Bindable<ScoringMode> Mode = new Bindable<ScoringMode>();
protected sealed override bool HasCompleted => JudgedHits == MaxHits;
protected int MaxHits { get; private set; }
@ -202,6 +205,8 @@ namespace osu.Game.Rulesets.Scoring
Mode.Value = ScoringMode.Exponential;
Mode.Disabled = true;
}
Mode.ValueChanged += _ => updateScore();
}
/// <summary>
@ -296,7 +301,7 @@ namespace osu.Game.Rulesets.Scoring
TotalScore.Value = max_score * (base_portion * baseScore / maxBaseScore + combo_portion * HighestCombo / maxHighestCombo) + bonusScore;
break;
case ScoringMode.Exponential:
TotalScore.Value = (baseScore + bonusScore) * Math.Log(HighestCombo + 1, 2);
TotalScore.Value = (baseScore + bonusScore) * Math.Max(0, HighestCombo - 1) / 25f;
break;
}
}