diff --git a/osu.Game.Modes.Taiko/Judgements/TaikoScoreResult.cs b/osu.Game.Modes.Taiko/Judgements/TaikoHitResult.cs similarity index 84% rename from osu.Game.Modes.Taiko/Judgements/TaikoScoreResult.cs rename to osu.Game.Modes.Taiko/Judgements/TaikoHitResult.cs index 004b9c4973..d425616b66 100644 --- a/osu.Game.Modes.Taiko/Judgements/TaikoScoreResult.cs +++ b/osu.Game.Modes.Taiko/Judgements/TaikoHitResult.cs @@ -3,7 +3,7 @@ namespace osu.Game.Modes.Taiko.Judgements { - public enum TaikoScoreResult + public enum TaikoHitResult { Good, Great diff --git a/osu.Game.Modes.Taiko/Judgements/TaikoJudgementInfo.cs b/osu.Game.Modes.Taiko/Judgements/TaikoJudgementInfo.cs index aa6901c2f5..0448ee5367 100644 --- a/osu.Game.Modes.Taiko/Judgements/TaikoJudgementInfo.cs +++ b/osu.Game.Modes.Taiko/Judgements/TaikoJudgementInfo.cs @@ -10,32 +10,32 @@ namespace osu.Game.Modes.Taiko.Judgements /// /// The maximum score value. /// - public const TaikoScoreResult MAX_SCORE = TaikoScoreResult.Great; + public const TaikoHitResult MAX_SCORE = TaikoHitResult.Great; /// /// The score value. /// - public TaikoScoreResult Score; + public TaikoHitResult TaikoResult; /// /// The score value for the combo portion of the score. /// - public int ScoreValue => ScoreToInt(Score); + public int ScoreValue => NumericResultForScore(TaikoResult); /// /// The score value for the accuracy portion of the score. /// - public int AccuracyScoreValue => AccuracyScoreToInt(Score); + public int AccuracyScoreValue => NumericResultForAccuracy(TaikoResult); /// /// The maximum score value for the combo portion of the score. /// - public int MaxScoreValue => ScoreToInt(MAX_SCORE); + public int MaxScoreValue => NumericResultForScore(MAX_SCORE); /// /// The maximum score value for the accuracy portion of the score. /// - public int MaxAccuracyScoreValue => AccuracyScoreToInt(MAX_SCORE); + public int MaxAccuracyScoreValue => NumericResultForAccuracy(MAX_SCORE); /// /// Whether this Judgement has a secondary hit in the case of finishers. @@ -43,38 +43,39 @@ namespace osu.Game.Modes.Taiko.Judgements public bool SecondHit; /// - /// Computes the score value for the combo portion of the score. - /// For the accuracy portion of the score (including accuracy percentage), see . + /// Computes the numeric score 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 int score value. - protected virtual int ScoreToInt(TaikoScoreResult result) + /// The numeric score value. + protected virtual int NumericResultForScore(TaikoHitResult result) { switch (result) { default: return 0; - case TaikoScoreResult.Good: + case TaikoHitResult.Good: return 100; - case TaikoScoreResult.Great: + case TaikoHitResult.Great: return 300; } } /// - /// Computes the score value for the accuracy portion of the score. + /// Computes the numeric score 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 int score value. - protected virtual int AccuracyScoreToInt(TaikoScoreResult result) + /// The numeric score value. + protected virtual int NumericResultForAccuracy(TaikoHitResult result) { switch (result) { default: return 0; - case TaikoScoreResult.Good: + case TaikoHitResult.Good: return 150; - case TaikoScoreResult.Great: + case TaikoHitResult.Great: return 300; } } diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj index cd73566ab3..65ee442d33 100644 --- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj +++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj @@ -50,7 +50,7 @@ - +