1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 11:42:56 +08:00

Naming pass

This commit is contained in:
Bartłomiej Dach 2022-12-30 20:30:58 +01:00
parent d60349c7c6
commit 6d42cc5a36
No known key found for this signature in database
2 changed files with 18 additions and 18 deletions

View File

@ -42,12 +42,12 @@ namespace osu.Game.Rulesets.Scoring
/// <summary>
/// The accuracy which increase from 0%.
/// </summary>
public readonly BindableDouble IncreaseAccuracy = new BindableDouble(0) { MinValue = 0, MaxValue = 1 };
public readonly BindableDouble MinimumAccuracy = new BindableDouble(0) { MinValue = 0, MaxValue = 1 };
/// <summary>
/// The accuracy which Decrease from 100%.
/// </summary>
public readonly BindableDouble DecreaseAccuracy = new BindableDouble(0) { MinValue = 0, MaxValue = 1 };
public readonly BindableDouble MaximumAccuracy = new BindableDouble(0) { MinValue = 0, MaxValue = 1 };
/// <summary>
/// The current combo.
@ -274,8 +274,8 @@ namespace osu.Game.Rulesets.Scoring
private void updateScore()
{
Accuracy.Value = currentMaximumScoringValues.BaseScore > 0 ? (double)currentScoringValues.BaseScore / currentMaximumScoringValues.BaseScore : 1;
IncreaseAccuracy.Value = maximumScoringValues.BaseScore > 0 ? (double)currentScoringValues.BaseScore / maximumScoringValues.BaseScore : 0;
DecreaseAccuracy.Value = maximumScoringValues.BaseScore > 0
MinimumAccuracy.Value = maximumScoringValues.BaseScore > 0 ? (double)currentScoringValues.BaseScore / maximumScoringValues.BaseScore : 0;
MaximumAccuracy.Value = maximumScoringValues.BaseScore > 0
? (double)(maximumScoringValues.BaseScore - (currentMaximumScoringValues.BaseScore - currentScoringValues.BaseScore)) / maximumScoringValues.BaseScore
: 1;
TotalScore.Value = computeScore(Mode.Value, currentScoringValues, maximumScoringValues);

View File

@ -12,8 +12,8 @@ namespace osu.Game.Screens.Play.HUD
{
public abstract partial class GameplayAccuracyCounter : PercentageCounter
{
[SettingSource("Accuracy Display Mode", "Which Accuracy will display")]
public Bindable<AccuracyType> AccuracyDisplay { get; } = new Bindable<AccuracyType>();
[SettingSource("Accuracy display mode", "Which accuracy mode should be displayed.")]
public Bindable<AccuracyDisplayMode> AccuracyDisplay { get; } = new Bindable<AccuracyDisplayMode>();
[BackgroundDependencyLoader]
private void load(ScoreProcessor scoreProcessor)
@ -24,31 +24,31 @@ namespace osu.Game.Screens.Play.HUD
switch (mod.NewValue)
{
case AccuracyType.Rolling:
case AccuracyDisplayMode.Standard:
Current.BindTo(scoreProcessor.Accuracy);
break;
case AccuracyType.Increase:
Current.BindTo(scoreProcessor.IncreaseAccuracy);
case AccuracyDisplayMode.MinimumAchievable:
Current.BindTo(scoreProcessor.MinimumAccuracy);
break;
case AccuracyType.Decrease:
Current.BindTo(scoreProcessor.DecreaseAccuracy);
case AccuracyDisplayMode.MaximumAchievable:
Current.BindTo(scoreProcessor.MaximumAccuracy);
break;
}
}, true);
}
public enum AccuracyType
public enum AccuracyDisplayMode
{
[Description("Rolling")]
Rolling,
[Description("Standard")]
Standard,
[Description("Best achievable")]
Increase,
[Description("Maximum achievable")]
MaximumAchievable,
[Description("Worst achievable")]
Decrease
[Description("Minimum achievable")]
MinimumAchievable
}
}
}