From 756d7527dafbf41b350b45934e298d8c890421da Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Tue, 12 Sep 2017 22:33:39 +0900 Subject: [PATCH] Remove NumericAccuracyResult from ManiaJudgement --- .../Judgements/HoldNoteTailJudgement.cs | 12 -------- .../Judgements/HoldNoteTickJudgement.cs | 1 - .../Judgements/ManiaJudgement.cs | 29 ------------------- 3 files changed, 42 deletions(-) diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTailJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTailJudgement.cs index cc7aa63f7e..a8d1b079eb 100644 --- a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTailJudgement.cs +++ b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTailJudgement.cs @@ -23,17 +23,5 @@ namespace osu.Game.Rulesets.Mania.Judgements return base.NumericResultFor(HasBroken ? HitResult.Good : result); } } - - protected override int NumericResultForAccuracy(HitResult result) - { - switch (result) - { - default: - return base.NumericResultForAccuracy(result); - case HitResult.Great: - case HitResult.Perfect: - return base.NumericResultForAccuracy(HasBroken ? HitResult.Good : result); - } - } } } \ No newline at end of file diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs index 132856713a..46e6f0feec 100644 --- a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs +++ b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs @@ -11,6 +11,5 @@ namespace osu.Game.Rulesets.Mania.Judgements public override bool AffectsAccuracy => false; protected override int NumericResultFor(HitResult result) => 20; - protected override int NumericResultForAccuracy(HitResult result) => 0; // Don't count ticks into accuracy } } \ No newline at end of file diff --git a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs index e36146aa71..1f3b352da4 100644 --- a/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs +++ b/osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs @@ -8,11 +8,6 @@ namespace osu.Game.Rulesets.Mania.Judgements { public class ManiaJudgement : Judgement { - /// - /// The maximum result value for the accuracy portion of the score. - /// - public int MaxNumericAccuracyResult => NumericResultForAccuracy(HitResult.Perfect); - protected override int NumericResultFor(HitResult result) { switch (result) @@ -30,29 +25,5 @@ namespace osu.Game.Rulesets.Mania.Judgements return 300; } } - - public int NumericAccuracyResult => NumericResultForAccuracy(Result); - - /// - /// The result value for the accuracy portion of the score. - /// - protected virtual int NumericResultForAccuracy(HitResult result) - { - switch (result) - { - default: - return 0; - case HitResult.Meh: - return 50; - case HitResult.Ok: - return 100; - case HitResult.Good: - return 200; - case HitResult.Great: - return 300; - case HitResult.Perfect: - return 305; - } - } } }