From c82ae011fb125a8a41c2c7f74140306e51376285 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Thu, 16 Mar 2017 12:40:35 +0900
Subject: [PATCH 1/4] Make ScoreProcessors take generic judgements.

---
 osu.Game.Modes.Catch/CatchRuleset.cs          |  2 -
 osu.Game.Modes.Catch/CatchScoreProcessor.cs   | 21 ++++++++
 osu.Game.Modes.Catch/UI/CatchHitRenderer.cs   |  4 +-
 .../osu.Game.Modes.Catch.csproj               |  1 +
 osu.Game.Modes.Catch/packages.config          |  1 +
 osu.Game.Modes.Mania/ManiaRuleset.cs          |  2 -
 osu.Game.Modes.Mania/ManiaScoreProcessor.cs   | 21 ++++++++
 osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs   |  4 +-
 .../osu.Game.Modes.Mania.csproj               |  1 +
 osu.Game.Modes.Mania/packages.config          |  1 +
 osu.Game.Modes.Osu/OsuRuleset.cs              |  2 -
 osu.Game.Modes.Osu/OsuScoreProcessor.cs       | 13 ++---
 osu.Game.Modes.Osu/UI/OsuHitRenderer.cs       |  4 +-
 osu.Game.Modes.Osu/packages.config            |  1 +
 osu.Game.Modes.Taiko/TaikoRuleset.cs          |  2 -
 osu.Game.Modes.Taiko/TaikoScoreProcessor.cs   | 21 ++++++++
 osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs   |  4 +-
 .../osu.Game.Modes.Taiko.csproj               |  1 +
 osu.Game.Modes.Taiko/packages.config          |  1 +
 osu.Game/Database/ScoreDatabase.cs            |  3 +-
 osu.Game/Modes/Ruleset.cs                     |  2 -
 osu.Game/Modes/ScoreProcesssor.cs             | 50 ++++++++++++-------
 osu.Game/Modes/UI/HitRenderer.cs              | 23 ++++-----
 osu.Game/Screens/Play/Player.cs               |  7 +--
 osu.Game/packages.config                      |  1 +
 25 files changed, 137 insertions(+), 56 deletions(-)
 create mode 100644 osu.Game.Modes.Catch/CatchScoreProcessor.cs
 create mode 100644 osu.Game.Modes.Mania/ManiaScoreProcessor.cs
 create mode 100644 osu.Game.Modes.Taiko/TaikoScoreProcessor.cs

diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs
index cb695aaabe..0166948fcb 100644
--- a/osu.Game.Modes.Catch/CatchRuleset.cs
+++ b/osu.Game.Modes.Catch/CatchRuleset.cs
@@ -87,8 +87,6 @@ namespace osu.Game.Modes.Catch
             new KeyCounterMouse(MouseButton.Right)
         };
 
-        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => null;
-
         public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new CatchDifficultyCalculator(beatmap);
     }
 }
diff --git a/osu.Game.Modes.Catch/CatchScoreProcessor.cs b/osu.Game.Modes.Catch/CatchScoreProcessor.cs
new file mode 100644
index 0000000000..e653297a15
--- /dev/null
+++ b/osu.Game.Modes.Catch/CatchScoreProcessor.cs
@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Modes.Catch.Judgements;
+using osu.Game.Modes.Catch.Objects;
+using osu.Game.Modes.UI;
+
+namespace osu.Game.Modes.Catch
+{
+    internal class CatchScoreProcessor : ScoreProcessor<CatchBaseHit, CatchJudgementInfo>
+    {
+        public CatchScoreProcessor(HitRenderer<CatchBaseHit, CatchJudgementInfo> hitRenderer)
+            : base(hitRenderer)
+        {
+        }
+
+        protected override void UpdateCalculations(CatchJudgementInfo newJudgement)
+        {
+        }
+    }
+}
diff --git a/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
index e45ca7d293..c02b6b6c49 100644
--- a/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
+++ b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
@@ -17,11 +17,13 @@ namespace osu.Game.Modes.Catch.UI
         {
         }
 
+        public override ScoreProcessor CreateScoreProcessor() => new CatchScoreProcessor(this);
+
         protected override IBeatmapConverter<CatchBaseHit> CreateBeatmapConverter() => new CatchBeatmapConverter();
 
         protected override IBeatmapProcessor<CatchBaseHit> CreateBeatmapProcessor() => new CatchBeatmapProcessor();
-        protected override Playfield<CatchBaseHit, CatchJudgementInfo> CreatePlayfield() => new CatchPlayfield();
 
+        protected override Playfield<CatchBaseHit, CatchJudgementInfo> CreatePlayfield() => new CatchPlayfield();
 
         protected override DrawableHitObject<CatchBaseHit, CatchJudgementInfo> GetVisualRepresentation(CatchBaseHit h) => null;
     }
diff --git a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
index e6861b54ef..a32416173d 100644
--- a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
+++ b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
@@ -50,6 +50,7 @@
     <Compile Include="Beatmaps\CatchBeatmapConverter.cs" />
     <Compile Include="Beatmaps\CatchBeatmapProcessor.cs" />
     <Compile Include="CatchDifficultyCalculator.cs" />
+    <Compile Include="CatchScoreProcessor.cs" />
     <Compile Include="Judgements\CatchJudgementInfo.cs" />
     <Compile Include="Objects\CatchBaseHit.cs" />
     <Compile Include="Objects\Drawable\DrawableFruit.cs" />
diff --git a/osu.Game.Modes.Catch/packages.config b/osu.Game.Modes.Catch/packages.config
index 4031dd62a8..08fca09c35 100644
--- a/osu.Game.Modes.Catch/packages.config
+++ b/osu.Game.Modes.Catch/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs
index 5b12e621d2..8b4d79ac38 100644
--- a/osu.Game.Modes.Mania/ManiaRuleset.cs
+++ b/osu.Game.Modes.Mania/ManiaRuleset.cs
@@ -102,8 +102,6 @@ namespace osu.Game.Modes.Mania
 
         public override IEnumerable<KeyCounter> CreateGameplayKeys() => new KeyCounter[] { /* Todo: Should be keymod specific */ };
 
-        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => null;
-
         public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new ManiaDifficultyCalculator(beatmap);
     }
 }
diff --git a/osu.Game.Modes.Mania/ManiaScoreProcessor.cs b/osu.Game.Modes.Mania/ManiaScoreProcessor.cs
new file mode 100644
index 0000000000..5a763dc273
--- /dev/null
+++ b/osu.Game.Modes.Mania/ManiaScoreProcessor.cs
@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Modes.Mania.Judgements;
+using osu.Game.Modes.Mania.Objects;
+using osu.Game.Modes.UI;
+
+namespace osu.Game.Modes.Mania
+{
+    internal class ManiaScoreProcessor : ScoreProcessor<ManiaBaseHit, ManiaJudgementInfo>
+    {
+        public ManiaScoreProcessor(HitRenderer<ManiaBaseHit, ManiaJudgementInfo> hitRenderer)
+            : base(hitRenderer)
+        {
+        }
+
+        protected override void UpdateCalculations(ManiaJudgementInfo newJudgement)
+        {
+        }
+    }
+}
diff --git a/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
index 22b9c90a1a..0f26c944a0 100644
--- a/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
+++ b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
@@ -20,11 +20,13 @@ namespace osu.Game.Modes.Mania.UI
             this.columns = columns;
         }
 
+        public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor(this);
+
         protected override IBeatmapConverter<ManiaBaseHit> CreateBeatmapConverter() => new ManiaBeatmapConverter();
 
         protected override IBeatmapProcessor<ManiaBaseHit> CreateBeatmapProcessor() => new ManiaBeatmapProcessor();
-        protected override Playfield<ManiaBaseHit, ManiaJudgementInfo> CreatePlayfield() => new ManiaPlayfield(columns);
 
+        protected override Playfield<ManiaBaseHit, ManiaJudgementInfo> CreatePlayfield() => new ManiaPlayfield(columns);
 
         protected override DrawableHitObject<ManiaBaseHit, ManiaJudgementInfo> GetVisualRepresentation(ManiaBaseHit h) => null;
     }
diff --git a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
index 4a5c081e8b..8b78929510 100644
--- a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
+++ b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
@@ -51,6 +51,7 @@
     <Compile Include="Beatmaps\ManiaBeatmapProcessor.cs" />
     <Compile Include="Judgements\ManiaJudgementInfo.cs" />
     <Compile Include="ManiaDifficultyCalculator.cs" />
+    <Compile Include="ManiaScoreProcessor.cs" />
     <Compile Include="Objects\Drawable\DrawableNote.cs" />
     <Compile Include="Objects\HoldNote.cs" />
     <Compile Include="Objects\ManiaBaseHit.cs" />
diff --git a/osu.Game.Modes.Mania/packages.config b/osu.Game.Modes.Mania/packages.config
index 4031dd62a8..08fca09c35 100644
--- a/osu.Game.Modes.Mania/packages.config
+++ b/osu.Game.Modes.Mania/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Modes.Osu/OsuRuleset.cs b/osu.Game.Modes.Osu/OsuRuleset.cs
index 370cd53aa2..109809126a 100644
--- a/osu.Game.Modes.Osu/OsuRuleset.cs
+++ b/osu.Game.Modes.Osu/OsuRuleset.cs
@@ -95,8 +95,6 @@ namespace osu.Game.Modes.Osu
 
         public override FontAwesome Icon => FontAwesome.fa_osu_osu_o;
 
-        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => new OsuScoreProcessor(hitObjectCount);
-
         public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new OsuDifficultyCalculator(beatmap);
 
         protected override PlayMode PlayMode => PlayMode.Osu;
diff --git a/osu.Game.Modes.Osu/OsuScoreProcessor.cs b/osu.Game.Modes.Osu/OsuScoreProcessor.cs
index 425c454dc7..20b19a68a4 100644
--- a/osu.Game.Modes.Osu/OsuScoreProcessor.cs
+++ b/osu.Game.Modes.Osu/OsuScoreProcessor.cs
@@ -1,22 +1,23 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Modes.Judgements;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Judgements;
+using osu.Game.Modes.Osu.Objects;
+using osu.Game.Modes.UI;
 
 namespace osu.Game.Modes.Osu
 {
-    internal class OsuScoreProcessor : ScoreProcessor
+    internal class OsuScoreProcessor : ScoreProcessor<OsuHitObject, OsuJudgementInfo>
     {
-        public OsuScoreProcessor(int hitObjectCount = 0)
-            : base(hitObjectCount)
+        public OsuScoreProcessor(HitRenderer<OsuHitObject, OsuJudgementInfo> hitRenderer)
+            : base(hitRenderer)
         {
             Health.Value = 1;
             Accuracy.Value = 1;
         }
 
-        protected override void UpdateCalculations(JudgementInfo judgement)
+        protected override void UpdateCalculations(OsuJudgementInfo judgement)
         {
             if (judgement != null)
             {
@@ -38,7 +39,7 @@ namespace osu.Game.Modes.Osu
 
             foreach (var judgementInfo in Judgements)
             {
-                var j = (OsuJudgementInfo)judgementInfo;
+                var j = judgementInfo;
                 score += j.ScoreValue;
                 maxScore += j.MaxScoreValue;
             }
diff --git a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
index f9aed40a63..7a1e83d3a5 100644
--- a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
+++ b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
@@ -19,11 +19,13 @@ namespace osu.Game.Modes.Osu.UI
         {
         }
 
+        public override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor(this);
+
         protected override IBeatmapConverter<OsuHitObject> CreateBeatmapConverter() => new OsuBeatmapConverter();
 
         protected override IBeatmapProcessor<OsuHitObject> CreateBeatmapProcessor() => new OsuBeatmapProcessor();
-        protected override Playfield<OsuHitObject, OsuJudgementInfo> CreatePlayfield() => new OsuPlayfield();
 
+        protected override Playfield<OsuHitObject, OsuJudgementInfo> CreatePlayfield() => new OsuPlayfield();
 
         protected override KeyConversionInputManager CreateKeyConversionInputManager() => new OsuKeyConversionInputManager();
 
diff --git a/osu.Game.Modes.Osu/packages.config b/osu.Game.Modes.Osu/packages.config
index 4031dd62a8..08fca09c35 100644
--- a/osu.Game.Modes.Osu/packages.config
+++ b/osu.Game.Modes.Osu/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game.Modes.Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs
index 9782606a69..dfbee82693 100644
--- a/osu.Game.Modes.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs
@@ -88,8 +88,6 @@ namespace osu.Game.Modes.Taiko
             new KeyCounterKeyboard(Key.K)
         };
 
-        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => null;
-
         public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new TaikoDifficultyCalculator(beatmap);
     }
 }
diff --git a/osu.Game.Modes.Taiko/TaikoScoreProcessor.cs b/osu.Game.Modes.Taiko/TaikoScoreProcessor.cs
new file mode 100644
index 0000000000..184d431c42
--- /dev/null
+++ b/osu.Game.Modes.Taiko/TaikoScoreProcessor.cs
@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Modes.Taiko.Judgements;
+using osu.Game.Modes.Taiko.Objects;
+using osu.Game.Modes.UI;
+
+namespace osu.Game.Modes.Taiko
+{
+    internal class TaikoScoreProcessor : ScoreProcessor<TaikoBaseHit, TaikoJudgementInfo>
+    {
+        public TaikoScoreProcessor(HitRenderer<TaikoBaseHit, TaikoJudgementInfo> hitRenderer)
+            : base(hitRenderer)
+        {
+        }
+
+        protected override void UpdateCalculations(TaikoJudgementInfo newJudgement)
+        {
+        }
+    }
+}
diff --git a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
index 6c6e509f76..385b0915f4 100644
--- a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
+++ b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
@@ -17,11 +17,13 @@ namespace osu.Game.Modes.Taiko.UI
         {
         }
 
+        public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor(this);
+
         protected override IBeatmapConverter<TaikoBaseHit> CreateBeatmapConverter() => new TaikoBeatmapConverter();
 
         protected override IBeatmapProcessor<TaikoBaseHit> CreateBeatmapProcessor() => new TaikoBeatmapProcessor();
-        protected override Playfield<TaikoBaseHit, TaikoJudgementInfo> CreatePlayfield() => new TaikoPlayfield();
 
+        protected override Playfield<TaikoBaseHit, TaikoJudgementInfo> CreatePlayfield() => new TaikoPlayfield();
 
         protected override DrawableHitObject<TaikoBaseHit, TaikoJudgementInfo> GetVisualRepresentation(TaikoBaseHit h) => null;
     }
diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
index 9edb9eaff3..bc38781b01 100644
--- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
+++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
@@ -54,6 +54,7 @@
     <Compile Include="Objects\Drawable\DrawableTaikoHit.cs" />
     <Compile Include="Objects\TaikoBaseHit.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TaikoScoreProcessor.cs" />
     <Compile Include="UI\TaikoHitRenderer.cs" />
     <Compile Include="UI\TaikoPlayfield.cs" />
     <Compile Include="TaikoRuleset.cs" />
diff --git a/osu.Game.Modes.Taiko/packages.config b/osu.Game.Modes.Taiko/packages.config
index 4031dd62a8..08fca09c35 100644
--- a/osu.Game.Modes.Taiko/packages.config
+++ b/osu.Game.Modes.Taiko/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
diff --git a/osu.Game/Database/ScoreDatabase.cs b/osu.Game/Database/ScoreDatabase.cs
index b437b354d3..0d6a5bf2a3 100644
--- a/osu.Game/Database/ScoreDatabase.cs
+++ b/osu.Game/Database/ScoreDatabase.cs
@@ -39,9 +39,8 @@ namespace osu.Game.Database
             using (SerializationReader sr = new SerializationReader(s))
             {
                 var ruleset = Ruleset.GetRuleset((PlayMode)sr.ReadByte());
-                var processor = ruleset.CreateScoreProcessor();
 
-                score = processor.GetScore();
+                score = new Score();
 
                 /* score.Pass = true;*/
                 var version = sr.ReadInt32();
diff --git a/osu.Game/Modes/Ruleset.cs b/osu.Game/Modes/Ruleset.cs
index 8cbfa3fa46..cce4b4ae33 100644
--- a/osu.Game/Modes/Ruleset.cs
+++ b/osu.Game/Modes/Ruleset.cs
@@ -29,8 +29,6 @@ namespace osu.Game.Modes
 
         public abstract IEnumerable<Mod> GetModsFor(ModType type);
 
-        public abstract ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0);
-
         public abstract HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap);
 
         public abstract DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap);
diff --git a/osu.Game/Modes/ScoreProcesssor.cs b/osu.Game/Modes/ScoreProcesssor.cs
index c7a882cfab..bd17984a0f 100644
--- a/osu.Game/Modes/ScoreProcesssor.cs
+++ b/osu.Game/Modes/ScoreProcesssor.cs
@@ -5,6 +5,8 @@ using osu.Framework.Configuration;
 using System;
 using System.Collections.Generic;
 using osu.Game.Modes.Judgements;
+using osu.Game.Modes.UI;
+using osu.Game.Modes.Objects;
 
 namespace osu.Game.Modes
 {
@@ -28,36 +30,50 @@ namespace osu.Game.Modes
         public readonly BindableInt Combo = new BindableInt();
 
         /// <summary>
-        /// Are we allowed to fail?
+        /// Keeps track of the highest combo ever achieved in this play.
+        /// This is handled automatically by ScoreProcessor.
         /// </summary>
-        protected bool CanFail => true;
-
-        protected bool HasFailed { get; private set; }
+        public readonly BindableInt HighestCombo = new BindableInt();
 
         /// <summary>
         /// Called when we reach a failing health of zero.
         /// </summary>
         public event Action Failed;
 
-        /// <summary>
-        /// Keeps track of the highest combo ever achieved in this play.
-        /// This is handled automatically by ScoreProcessor.
-        /// </summary>
-        public readonly BindableInt HighestCombo = new BindableInt();
+        protected void TriggerFailed()
+        {
+            Failed?.Invoke();
+        }
+    }
 
-        public readonly List<JudgementInfo> Judgements;
+    public abstract class ScoreProcessor<TObject, TJudgement> : ScoreProcessor
+        where TObject : HitObject
+        where TJudgement : JudgementInfo
+    {
+        /// <summary>
+        /// All judgements held by this ScoreProcessor.
+        /// </summary>
+        protected List<TJudgement> Judgements;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ScoreProcessor"/> class.
+        /// Are we allowed to fail?
         /// </summary>
-        /// <param name="hitObjectCount">Number of HitObjects. It is used for specifying Judgements collection Capacity</param>
-        protected ScoreProcessor(int hitObjectCount = 0)
+        protected bool CanFail => true;
+
+        /// <summary>
+        /// Whether this ScoreProcessor has already triggered the failed event.
+        /// </summary>
+        protected bool HasFailed { get; private set; }
+
+        protected ScoreProcessor(HitRenderer<TObject, TJudgement> hitRenderer)
         {
             Combo.ValueChanged += delegate { HighestCombo.Value = Math.Max(HighestCombo.Value, Combo.Value); };
-            Judgements = new List<JudgementInfo>(hitObjectCount);
+            Judgements = new List<TJudgement>(hitRenderer.Beatmap.HitObjects.Count);
+
+            hitRenderer.OnJudgement += addJudgement;
         }
 
-        public void AddJudgement(JudgementInfo judgement)
+        private void addJudgement(TJudgement judgement)
         {
             Judgements.Add(judgement);
 
@@ -67,7 +83,7 @@ namespace osu.Game.Modes
             if (Health.Value == Health.MinValue && !HasFailed)
             {
                 HasFailed = true;
-                Failed?.Invoke();
+                TriggerFailed();
             }
         }
 
@@ -75,6 +91,6 @@ namespace osu.Game.Modes
         /// Update any values that potentially need post-processing on a judgement change.
         /// </summary>
         /// <param name="newJudgement">A new JudgementInfo that triggered this calculation. May be null.</param>
-        protected abstract void UpdateCalculations(JudgementInfo newJudgement);
+        protected abstract void UpdateCalculations(TJudgement newJudgement);
     }
 }
diff --git a/osu.Game/Modes/UI/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs
index 6dd85e0c3a..a0ca2549c0 100644
--- a/osu.Game/Modes/UI/HitRenderer.cs
+++ b/osu.Game/Modes/UI/HitRenderer.cs
@@ -25,14 +25,6 @@ namespace osu.Game.Modes.UI
     /// </summary>
     public abstract class HitRenderer : Container
     {
-        /// <summary>
-        /// The event that's fired when a hit object is judged.
-        /// </summary>
-        public event Action<JudgementInfo> OnJudgement;
-
-        /// <summary>
-        /// The event that's fired when all hit objects have been judged.
-        /// </summary>
         public event Action OnAllJudged;
 
         /// <summary>
@@ -57,17 +49,16 @@ namespace osu.Game.Modes.UI
         }
 
         /// <summary>
-        /// Triggers a judgement for further processing.
+        /// Checks whether all HitObjects have been judged, and invokes OnAllJudged.
         /// </summary>
-        /// <param name="j">The judgement to trigger.</param>
-        protected void TriggerOnJudgement(JudgementInfo j)
+        protected void CheckAllJudged()
         {
-            OnJudgement?.Invoke(j);
-
             if (AllObjectsJudged)
                 OnAllJudged?.Invoke();
         }
 
+        public abstract ScoreProcessor CreateScoreProcessor();
+
         /// <summary>
         /// Creates a key conversion input manager.
         /// </summary>
@@ -141,6 +132,8 @@ namespace osu.Game.Modes.UI
         where TObject : HitObject
         where TJudgement : JudgementInfo
     {
+        public event Action<TJudgement> OnJudgement;
+
         protected override Container<Drawable> Content => content;
         protected override bool AllObjectsJudged => Playfield.HitObjects.Children.All(h => h.Judgement.Result.HasValue);
 
@@ -197,8 +190,10 @@ namespace osu.Game.Modes.UI
         /// <param name="judgedObject">The object that Judgement has been updated for.</param>
         private void onJudgement(DrawableHitObject<TObject, TJudgement> judgedObject)
         {
-            TriggerOnJudgement(judgedObject.Judgement);
+            OnJudgement?.Invoke(judgedObject.Judgement);
             Playfield.OnJudgement(judgedObject);
+
+            CheckAllJudged();
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 1a3a5b7036..a4c7e84ce7 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -108,10 +108,13 @@ namespace osu.Game.Screens.Play
             });
 
             ruleset = Ruleset.GetRuleset(Beatmap.PlayMode);
+            hitRenderer = ruleset.CreateHitRendererWith(Beatmap);
+
+            scoreProcessor = hitRenderer.CreateScoreProcessor();
 
             hudOverlay = new StandardHudOverlay();
             hudOverlay.KeyCounter.Add(ruleset.CreateGameplayKeys());
-            hudOverlay.BindProcessor(scoreProcessor = ruleset.CreateScoreProcessor(beatmap.HitObjects.Count));
+            hudOverlay.BindProcessor(scoreProcessor);
 
             pauseOverlay = new PauseOverlay
             {
@@ -125,7 +128,6 @@ namespace osu.Game.Screens.Play
                 OnQuit = Exit
             };
 
-            hitRenderer = ruleset.CreateHitRendererWith(Beatmap);
 
             if (ReplayInputHandler != null)
                 hitRenderer.InputManager.ReplayInputHandler = ReplayInputHandler;
@@ -133,7 +135,6 @@ namespace osu.Game.Screens.Play
             hudOverlay.BindHitRenderer(hitRenderer);
 
             //bind HitRenderer to ScoreProcessor and ourselves (for a pass situation)
-            hitRenderer.OnJudgement += scoreProcessor.AddJudgement;
             hitRenderer.OnAllJudged += onPass;
 
             //bind ScoreProcessor to ourselves (for a fail situation)
diff --git a/osu.Game/packages.config b/osu.Game/packages.config
index 93df6b7e42..b2168b864e 100644
--- a/osu.Game/packages.config
+++ b/osu.Game/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

From 82033faaabe07faccc84a42b964aa59cc0aab2cd Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Thu, 16 Mar 2017 12:57:50 +0900
Subject: [PATCH 2/4] Warning/error fixing.

---
 osu.Game/Database/ScoreDatabase.cs | 3 +--
 osu.Game/Modes/ScoreProcesssor.cs  | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/ScoreDatabase.cs b/osu.Game/Database/ScoreDatabase.cs
index 0d6a5bf2a3..88d2f360ba 100644
--- a/osu.Game/Database/ScoreDatabase.cs
+++ b/osu.Game/Database/ScoreDatabase.cs
@@ -38,8 +38,7 @@ namespace osu.Game.Database
             using (Stream s = storage.GetStream(Path.Combine(replay_folder, replayFilename)))
             using (SerializationReader sr = new SerializationReader(s))
             {
-                var ruleset = Ruleset.GetRuleset((PlayMode)sr.ReadByte());
-
+                Ruleset.GetRuleset((PlayMode)sr.ReadByte());
                 score = new Score();
 
                 /* score.Pass = true;*/
diff --git a/osu.Game/Modes/ScoreProcesssor.cs b/osu.Game/Modes/ScoreProcesssor.cs
index bd17984a0f..cc30117831 100644
--- a/osu.Game/Modes/ScoreProcesssor.cs
+++ b/osu.Game/Modes/ScoreProcesssor.cs
@@ -40,6 +40,9 @@ namespace osu.Game.Modes
         /// </summary>
         public event Action Failed;
 
+        /// <summary>
+        /// Notifies subscribers that the score is in a failed state.
+        /// </summary>
         protected void TriggerFailed()
         {
             Failed?.Invoke();

From 7b66faab9eba3568771adfdbbcb5e04227012949 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Thu, 16 Mar 2017 12:59:09 +0900
Subject: [PATCH 3/4] Fix filename.

---
 osu.Game/Modes/{ScoreProcesssor.cs => ScoreProcessor.cs} | 0
 osu.Game/osu.Game.csproj                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename osu.Game/Modes/{ScoreProcesssor.cs => ScoreProcessor.cs} (100%)

diff --git a/osu.Game/Modes/ScoreProcesssor.cs b/osu.Game/Modes/ScoreProcessor.cs
similarity index 100%
rename from osu.Game/Modes/ScoreProcesssor.cs
rename to osu.Game/Modes/ScoreProcessor.cs
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3ec8b535c7..ac9dbaf05b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -119,7 +119,7 @@
     <Compile Include="Modes\Objects\Legacy\LegacyHitObjectType.cs" />
     <Compile Include="Modes\Replay.cs" />
     <Compile Include="Modes\Score.cs" />
-    <Compile Include="Modes\ScoreProcesssor.cs" />
+    <Compile Include="Modes\ScoreProcessor.cs" />
     <Compile Include="Modes\UI\HealthDisplay.cs" />
     <Compile Include="Modes\UI\HudOverlay.cs" />
     <Compile Include="Modes\UI\StandardHealthDisplay.cs" />

From 5cafec3b6ae5fbfdcfe2fb071523fa4885c3f87c Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Thu, 16 Mar 2017 13:13:45 +0900
Subject: [PATCH 4/4] Add back CreateScoreProcessor to Ruleset to instantiate a
 non-generic ScoreProcessor for ScoreDatabase.

---
 osu.Game.Modes.Catch/CatchRuleset.cs        |  2 ++
 osu.Game.Modes.Catch/CatchScoreProcessor.cs |  4 ++++
 osu.Game.Modes.Mania/ManiaRuleset.cs        |  2 ++
 osu.Game.Modes.Mania/ManiaScoreProcessor.cs |  4 ++++
 osu.Game.Modes.Osu/OsuRuleset.cs            |  2 ++
 osu.Game.Modes.Osu/OsuScoreProcessor.cs     | 10 ++++++++++
 osu.Game.Modes.Taiko/TaikoRuleset.cs        |  2 ++
 osu.Game.Modes.Taiko/TaikoScoreProcessor.cs |  4 ++++
 osu.Game/Database/ScoreDatabase.cs          |  4 ++--
 osu.Game/Modes/Ruleset.cs                   |  2 ++
 osu.Game/Modes/ScoreProcessor.cs            | 15 +++++++++++++--
 11 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs
index 0166948fcb..50224e3fdb 100644
--- a/osu.Game.Modes.Catch/CatchRuleset.cs
+++ b/osu.Game.Modes.Catch/CatchRuleset.cs
@@ -88,5 +88,7 @@ namespace osu.Game.Modes.Catch
         };
 
         public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new CatchDifficultyCalculator(beatmap);
+
+        public override ScoreProcessor CreateScoreProcessor() => new CatchScoreProcessor();
     }
 }
diff --git a/osu.Game.Modes.Catch/CatchScoreProcessor.cs b/osu.Game.Modes.Catch/CatchScoreProcessor.cs
index e653297a15..be4ae8b799 100644
--- a/osu.Game.Modes.Catch/CatchScoreProcessor.cs
+++ b/osu.Game.Modes.Catch/CatchScoreProcessor.cs
@@ -9,6 +9,10 @@ namespace osu.Game.Modes.Catch
 {
     internal class CatchScoreProcessor : ScoreProcessor<CatchBaseHit, CatchJudgementInfo>
     {
+        public CatchScoreProcessor()
+        {
+        }
+
         public CatchScoreProcessor(HitRenderer<CatchBaseHit, CatchJudgementInfo> hitRenderer)
             : base(hitRenderer)
         {
diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs
index 8b4d79ac38..27b3fcdf60 100644
--- a/osu.Game.Modes.Mania/ManiaRuleset.cs
+++ b/osu.Game.Modes.Mania/ManiaRuleset.cs
@@ -103,5 +103,7 @@ namespace osu.Game.Modes.Mania
         public override IEnumerable<KeyCounter> CreateGameplayKeys() => new KeyCounter[] { /* Todo: Should be keymod specific */ };
 
         public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new ManiaDifficultyCalculator(beatmap);
+
+        public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor();
     }
 }
diff --git a/osu.Game.Modes.Mania/ManiaScoreProcessor.cs b/osu.Game.Modes.Mania/ManiaScoreProcessor.cs
index 5a763dc273..60ed336c8e 100644
--- a/osu.Game.Modes.Mania/ManiaScoreProcessor.cs
+++ b/osu.Game.Modes.Mania/ManiaScoreProcessor.cs
@@ -9,6 +9,10 @@ namespace osu.Game.Modes.Mania
 {
     internal class ManiaScoreProcessor : ScoreProcessor<ManiaBaseHit, ManiaJudgementInfo>
     {
+        public ManiaScoreProcessor()
+        {
+        }
+
         public ManiaScoreProcessor(HitRenderer<ManiaBaseHit, ManiaJudgementInfo> hitRenderer)
             : base(hitRenderer)
         {
diff --git a/osu.Game.Modes.Osu/OsuRuleset.cs b/osu.Game.Modes.Osu/OsuRuleset.cs
index 109809126a..bbaf7eed5f 100644
--- a/osu.Game.Modes.Osu/OsuRuleset.cs
+++ b/osu.Game.Modes.Osu/OsuRuleset.cs
@@ -108,5 +108,7 @@ namespace osu.Game.Modes.Osu
             new KeyCounterMouse(MouseButton.Left),
             new KeyCounterMouse(MouseButton.Right)
         };
+
+        public override ScoreProcessor CreateScoreProcessor() => new OsuScoreProcessor();
     }
 }
diff --git a/osu.Game.Modes.Osu/OsuScoreProcessor.cs b/osu.Game.Modes.Osu/OsuScoreProcessor.cs
index 20b19a68a4..50eb685ecd 100644
--- a/osu.Game.Modes.Osu/OsuScoreProcessor.cs
+++ b/osu.Game.Modes.Osu/OsuScoreProcessor.cs
@@ -10,9 +10,19 @@ namespace osu.Game.Modes.Osu
 {
     internal class OsuScoreProcessor : ScoreProcessor<OsuHitObject, OsuJudgementInfo>
     {
+        public OsuScoreProcessor()
+        {
+        }
+
         public OsuScoreProcessor(HitRenderer<OsuHitObject, OsuJudgementInfo> hitRenderer)
             : base(hitRenderer)
         {
+        }
+
+        protected override void Reset()
+        {
+            base.Reset();
+
             Health.Value = 1;
             Accuracy.Value = 1;
         }
diff --git a/osu.Game.Modes.Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs
index dfbee82693..ff481e9162 100644
--- a/osu.Game.Modes.Taiko/TaikoRuleset.cs
+++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs
@@ -89,5 +89,7 @@ namespace osu.Game.Modes.Taiko
         };
 
         public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new TaikoDifficultyCalculator(beatmap);
+
+        public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor();
     }
 }
diff --git a/osu.Game.Modes.Taiko/TaikoScoreProcessor.cs b/osu.Game.Modes.Taiko/TaikoScoreProcessor.cs
index 184d431c42..1e5c70cd2e 100644
--- a/osu.Game.Modes.Taiko/TaikoScoreProcessor.cs
+++ b/osu.Game.Modes.Taiko/TaikoScoreProcessor.cs
@@ -9,6 +9,10 @@ namespace osu.Game.Modes.Taiko
 {
     internal class TaikoScoreProcessor : ScoreProcessor<TaikoBaseHit, TaikoJudgementInfo>
     {
+        public TaikoScoreProcessor()
+        {
+        }
+
         public TaikoScoreProcessor(HitRenderer<TaikoBaseHit, TaikoJudgementInfo> hitRenderer)
             : base(hitRenderer)
         {
diff --git a/osu.Game/Database/ScoreDatabase.cs b/osu.Game/Database/ScoreDatabase.cs
index 88d2f360ba..a8eb5e1886 100644
--- a/osu.Game/Database/ScoreDatabase.cs
+++ b/osu.Game/Database/ScoreDatabase.cs
@@ -38,8 +38,8 @@ namespace osu.Game.Database
             using (Stream s = storage.GetStream(Path.Combine(replay_folder, replayFilename)))
             using (SerializationReader sr = new SerializationReader(s))
             {
-                Ruleset.GetRuleset((PlayMode)sr.ReadByte());
-                score = new Score();
+                var ruleset = Ruleset.GetRuleset((PlayMode)sr.ReadByte());
+                score = ruleset.CreateScoreProcessor().GetScore();
 
                 /* score.Pass = true;*/
                 var version = sr.ReadInt32();
diff --git a/osu.Game/Modes/Ruleset.cs b/osu.Game/Modes/Ruleset.cs
index cce4b4ae33..013ea1d4fc 100644
--- a/osu.Game/Modes/Ruleset.cs
+++ b/osu.Game/Modes/Ruleset.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Modes
 
         public abstract DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap);
 
+        public abstract ScoreProcessor CreateScoreProcessor();
+
         public static void Register(Ruleset ruleset) => availableRulesets.TryAdd(ruleset.PlayMode, ruleset.GetType());
 
         protected abstract PlayMode PlayMode { get; }
diff --git a/osu.Game/Modes/ScoreProcessor.cs b/osu.Game/Modes/ScoreProcessor.cs
index cc30117831..35e19626b2 100644
--- a/osu.Game/Modes/ScoreProcessor.cs
+++ b/osu.Game/Modes/ScoreProcessor.cs
@@ -68,11 +68,17 @@ namespace osu.Game.Modes
         /// </summary>
         protected bool HasFailed { get; private set; }
 
-        protected ScoreProcessor(HitRenderer<TObject, TJudgement> hitRenderer)
+        protected ScoreProcessor()
         {
             Combo.ValueChanged += delegate { HighestCombo.Value = Math.Max(HighestCombo.Value, Combo.Value); };
-            Judgements = new List<TJudgement>(hitRenderer.Beatmap.HitObjects.Count);
 
+            Reset();
+        }
+
+        protected ScoreProcessor(HitRenderer<TObject, TJudgement> hitRenderer)
+            : this()
+        {
+            Judgements = new List<TJudgement>(hitRenderer.Beatmap.HitObjects.Count);
             hitRenderer.OnJudgement += addJudgement;
         }
 
@@ -90,6 +96,11 @@ namespace osu.Game.Modes
             }
         }
 
+        /// <summary>
+        /// Resets this ScoreProcessor to a stale state.
+        /// </summary>
+        protected virtual void Reset() { }
+
         /// <summary>
         /// Update any values that potentially need post-processing on a judgement change.
         /// </summary>