From 4e31e3b4439fe4658bb30abe849593bf44ceabf2 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Fri, 24 Mar 2017 09:50:18 +0900 Subject: [PATCH] Rename things around to make a bit more sense. --- .../Judgements/CatchJudgement.cs | 4 +-- .../Judgements/ManiaJudgement.cs | 4 +-- osu.Game.Modes.Osu/Judgements/OsuJudgement.cs | 4 +-- .../Judgements/TaikoDrumRollTickJudgement.cs | 4 +-- .../Judgements/TaikoJudgement.cs | 36 +++++++++---------- .../Scoring/TaikoScoreProcessor.cs | 12 +++---- .../Modes/Judgements/DrawableJudgement.cs | 4 +-- osu.Game/Modes/Judgements/Judgement.cs | 8 ++--- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/osu.Game.Modes.Catch/Judgements/CatchJudgement.cs b/osu.Game.Modes.Catch/Judgements/CatchJudgement.cs index 8e18c68153..eaacedd7e0 100644 --- a/osu.Game.Modes.Catch/Judgements/CatchJudgement.cs +++ b/osu.Game.Modes.Catch/Judgements/CatchJudgement.cs @@ -7,8 +7,8 @@ namespace osu.Game.Modes.Catch.Judgements { public class CatchJudgement : Judgement { - public override string ScoreString => string.Empty; + public override string ResultString => string.Empty; - public override string MaxScoreString => string.Empty; + public override string MaxResultString => string.Empty; } } diff --git a/osu.Game.Modes.Mania/Judgements/ManiaJudgement.cs b/osu.Game.Modes.Mania/Judgements/ManiaJudgement.cs index 07c5fcbfef..3ef5b0f29b 100644 --- a/osu.Game.Modes.Mania/Judgements/ManiaJudgement.cs +++ b/osu.Game.Modes.Mania/Judgements/ManiaJudgement.cs @@ -7,8 +7,8 @@ namespace osu.Game.Modes.Mania.Judgements { public class ManiaJudgement : Judgement { - public override string ScoreString => string.Empty; + public override string ResultString => string.Empty; - public override string MaxScoreString => string.Empty; + public override string MaxResultString => string.Empty; } } diff --git a/osu.Game.Modes.Osu/Judgements/OsuJudgement.cs b/osu.Game.Modes.Osu/Judgements/OsuJudgement.cs index bbb1754ce6..e65d3dde3a 100644 --- a/osu.Game.Modes.Osu/Judgements/OsuJudgement.cs +++ b/osu.Game.Modes.Osu/Judgements/OsuJudgement.cs @@ -25,9 +25,9 @@ namespace osu.Game.Modes.Osu.Judgements /// public OsuScoreResult MaxScore = OsuScoreResult.Hit300; - public override string ScoreString => Score.GetDescription(); + public override string ResultString => Score.GetDescription(); - public override string MaxScoreString => MaxScore.GetDescription(); + public override string MaxResultString => MaxScore.GetDescription(); public int ScoreValue => scoreToInt(Score); diff --git a/osu.Game.Modes.Taiko/Judgements/TaikoDrumRollTickJudgement.cs b/osu.Game.Modes.Taiko/Judgements/TaikoDrumRollTickJudgement.cs index 7faf9db02f..b6a727aeb4 100644 --- a/osu.Game.Modes.Taiko/Judgements/TaikoDrumRollTickJudgement.cs +++ b/osu.Game.Modes.Taiko/Judgements/TaikoDrumRollTickJudgement.cs @@ -8,12 +8,12 @@ namespace osu.Game.Modes.Taiko.Judgements /// /// Drum roll ticks don't display judgement text. /// - public override string ScoreString => string.Empty; + public override string ResultString => string.Empty; /// /// Drum roll ticks don't display judgement text. /// - public override string MaxScoreString => string.Empty; + public override string MaxResultString => string.Empty; protected override int NumericResultForScore(TaikoHitResult result) { diff --git a/osu.Game.Modes.Taiko/Judgements/TaikoJudgement.cs b/osu.Game.Modes.Taiko/Judgements/TaikoJudgement.cs index d715fd0183..e50a685e24 100644 --- a/osu.Game.Modes.Taiko/Judgements/TaikoJudgement.cs +++ b/osu.Game.Modes.Taiko/Judgements/TaikoJudgement.cs @@ -9,38 +9,38 @@ namespace osu.Game.Modes.Taiko.Judgements public class TaikoJudgement : Judgement { /// - /// The maximum score value. + /// The maximum result. /// public const TaikoHitResult MAX_HIT_RESULT = TaikoHitResult.Great; /// - /// The score value. + /// The result. /// public TaikoHitResult TaikoResult; /// - /// The score value for the combo portion of the score. + /// The result value for the combo portion of the score. /// - public int ScoreValue => NumericResultForScore(TaikoResult); + public int ResultValueForScore => NumericResultForScore(TaikoResult); /// - /// The score value for the accuracy portion of the score. + /// The result value for the accuracy portion of the score. /// - public int AccuracyScoreValue => NumericResultForAccuracy(TaikoResult); + public int ResultValueForAccuracy => NumericResultForAccuracy(TaikoResult); /// - /// The maximum score value for the combo portion of the score. + /// The maximum result value for the combo portion of the score. /// - public int MaxScoreValue => NumericResultForScore(MAX_HIT_RESULT); + public int MaxResultValueForScore => NumericResultForScore(MAX_HIT_RESULT); /// - /// The maximum score value for the accuracy portion of the score. + /// The maximum result value for the accuracy portion of the score. /// - public int MaxAccuracyScoreValue => NumericResultForAccuracy(MAX_HIT_RESULT); + public int MaxResultValueForAccuracy => NumericResultForAccuracy(MAX_HIT_RESULT); - public override string ScoreString => TaikoResult.GetDescription(); + public override string ResultString => TaikoResult.GetDescription(); - public override string MaxScoreString => MAX_HIT_RESULT.GetDescription(); + public override string MaxResultString => MAX_HIT_RESULT.GetDescription(); /// /// Whether this Judgement has a secondary hit in the case of finishers. @@ -48,11 +48,11 @@ namespace osu.Game.Modes.Taiko.Judgements public bool SecondHit; /// - /// Computes the numeric score value for the combo portion of the score. + /// Computes the numeric result value for the combo portion of the score. /// For the accuracy portion of the score (including accuracy percentage), see . /// - /// The result to compute the score value for. - /// The numeric score value. + /// The result to compute the value for. + /// The numeric result value. protected virtual int NumericResultForScore(TaikoHitResult result) { switch (result) @@ -67,11 +67,11 @@ namespace osu.Game.Modes.Taiko.Judgements } /// - /// Computes the numeric score value for the accuracy portion of the score. + /// Computes the numeric result value for the accuracy portion of the score. /// For the combo portion of the score, see . /// - /// The result to compute the score value for. - /// The numeric score value. + /// The result to compute the value for. + /// The numeric result value. protected virtual int NumericResultForAccuracy(TaikoHitResult result) { switch (result) diff --git a/osu.Game.Modes.Taiko/Scoring/TaikoScoreProcessor.cs b/osu.Game.Modes.Taiko/Scoring/TaikoScoreProcessor.cs index 2002dcb9a7..acf739d137 100644 --- a/osu.Game.Modes.Taiko/Scoring/TaikoScoreProcessor.cs +++ b/osu.Game.Modes.Taiko/Scoring/TaikoScoreProcessor.cs @@ -196,7 +196,7 @@ namespace osu.Game.Modes.Taiko.Scoring // Apply score changes if (newJudgement.Result == HitResult.Hit) { - double baseValue = newJudgement.ScoreValue; + double baseValue = newJudgement.ResultValueForScore; // Add bonus points for hitting a finisher with the second key if (newJudgement.SecondHit) @@ -243,16 +243,16 @@ namespace osu.Game.Modes.Taiko.Scoring } // Compute the new score + accuracy - int score = 0; - int maxScore = 0; + int scoreForAccuracy = 0; + int maxScoreForAccuracy = 0; foreach (var j in Judgements) { - score += j.AccuracyScoreValue; - maxScore = j.MaxAccuracyScoreValue; + scoreForAccuracy += j.ResultValueForAccuracy; + maxScoreForAccuracy = j.MaxResultValueForAccuracy; } - Accuracy.Value = (double)score / maxScore; + Accuracy.Value = (double)scoreForAccuracy / maxScoreForAccuracy; TotalScore.Value = comboScore + accuracyScore + bonusScore; } diff --git a/osu.Game/Modes/Judgements/DrawableJudgement.cs b/osu.Game/Modes/Judgements/DrawableJudgement.cs index ef67d07310..76c73335dd 100644 --- a/osu.Game/Modes/Judgements/DrawableJudgement.cs +++ b/osu.Game/Modes/Judgements/DrawableJudgement.cs @@ -35,7 +35,7 @@ namespace osu.Game.Modes.Judgements AutoSizeAxes = Axes.Both; - string scoreString = judgement.Result == HitResult.Hit ? judgement.ScoreString : judgement.Result.GetDescription(); + string resultString = judgement.Result == HitResult.Hit ? judgement.ResultString : judgement.Result.GetDescription(); Children = new[] { @@ -43,7 +43,7 @@ namespace osu.Game.Modes.Judgements { Origin = Anchor.Centre, Anchor = Anchor.Centre, - Text = scoreString.ToUpper(), + Text = resultString.ToUpper(), Font = @"Venera", TextSize = 16 } diff --git a/osu.Game/Modes/Judgements/Judgement.cs b/osu.Game/Modes/Judgements/Judgement.cs index 45f40647ca..d916fc15de 100644 --- a/osu.Game/Modes/Judgements/Judgement.cs +++ b/osu.Game/Modes/Judgements/Judgement.cs @@ -23,13 +23,13 @@ namespace osu.Game.Modes.Judgements public ulong? ComboAtHit; /// - /// The string representation for the score achieved. + /// The string representation for the result achieved. /// - public abstract string ScoreString { get; } + public abstract string ResultString { get; } /// - /// The string representation for the max score achievable. + /// The string representation for the max result achievable. /// - public abstract string MaxScoreString { get; } + public abstract string MaxResultString { get; } } } \ No newline at end of file