From 05ac23f99a880f034949f88aecb5060cc16b8ccc Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Wed, 13 Sep 2017 15:42:47 +0900
Subject: [PATCH] Remove AffectsAccuracy for now

---
 .../Judgements/HoldNoteTickJudgement.cs                    | 1 -
 .../Judgements/TaikoDrumRollTickJudgement.cs               | 1 -
 .../Judgements/TaikoStrongHitJudgement.cs                  | 1 -
 osu.Game/Rulesets/Judgements/Judgement.cs                  | 5 -----
 osu.Game/Rulesets/Scoring/ScoreProcessor.cs                | 7 +++----
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
index 46e6f0feec..d326c6fc0a 100644
--- a/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
+++ b/osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs
@@ -8,7 +8,6 @@ namespace osu.Game.Rulesets.Mania.Judgements
     public class HoldNoteTickJudgement : ManiaJudgement
     {
         public override bool AffectsCombo => false;
-        public override bool AffectsAccuracy => false;
 
         protected override int NumericResultFor(HitResult result) => 20;
     }
diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
index bd021a1560..c9daef8c99 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoDrumRollTickJudgement.cs
@@ -8,7 +8,6 @@ namespace osu.Game.Rulesets.Taiko.Judgements
     public class TaikoDrumRollTickJudgement : TaikoJudgement
     {
         public override bool AffectsCombo => false;
-        public override bool AffectsAccuracy => false;
 
         protected override int NumericResultFor(HitResult result)
         {
diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongHitJudgement.cs b/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongHitJudgement.cs
index 2cc4c922e2..f0b57e5c09 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongHitJudgement.cs
+++ b/osu.Game.Rulesets.Taiko/Judgements/TaikoStrongHitJudgement.cs
@@ -8,7 +8,6 @@ namespace osu.Game.Rulesets.Taiko.Judgements
     public class TaikoStrongHitJudgement : TaikoJudgement
     {
         public override bool AffectsCombo => false;
-        public override bool AffectsAccuracy => false;
 
         public TaikoStrongHitJudgement()
         {
diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index 71743b9988..0ae33272a7 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -25,11 +25,6 @@ namespace osu.Game.Rulesets.Judgements
         /// </summary>
         public double TimeOffset { get; internal set; }
 
-        /// <summary>
-        /// Whether the <see cref="Result"/> should be considered as a factor in the accuracy percentage and portion.
-        /// </summary>
-        public virtual bool AffectsAccuracy => true;
-
         /// <summary>
         /// Whether the <see cref="Result"/> should affect the combo portion of the score.
         /// If false, the <see cref="Result"/> will be considered for the bonus portion of the score.
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index a0b24c52df..7f3d5e2501 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Rulesets.Scoring
     {
         private const double max_score = 1000000;
 
-        public readonly Bindable<ScoringMode> Mode = new Bindable<ScoringMode>(ScoringMode.Exponential);
+        public readonly Bindable<ScoringMode> Mode = new Bindable<ScoringMode>(ScoringMode.Standardised);
 
         protected sealed override bool HasCompleted => Hits == MaxHits;
 
@@ -219,13 +219,12 @@ namespace osu.Game.Rulesets.Scoring
 
                 baseScore += judgement.NumericResult;
                 rollingMaxBaseScore += judgement.MaxNumericResult;
+
+                Hits++;
             }
             else if (judgement.IsHit)
                 bonusScore += judgement.NumericResult;
 
-            if (judgement.AffectsAccuracy)
-                Hits++;
-
             if (rollingMaxBaseScore != 0)
                 Accuracy.Value = baseScore / rollingMaxBaseScore;