Make judgements able to be "added" plus make everything compile and run.

osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs

@@ -46,13 +46,19 @@ namespace osu.Game.Rulesets.Objects.Drawables
         where TObject : HitObject
         where TJudgement : Judgement
     {
-        public event Action<DrawableHitObject<TObject, TJudgement>> OnJudgement;
+        public event Action<DrawableHitObject, Judgement> OnJudgement;
 
         public override bool HandleInput => Interactive;
 
         public bool Interactive = true;
 
-        public TJudgement Judgement;
+        /// <summary>
+        /// Whether this <see cref="DrawableHitObject"/> can be judged.
+        /// </summary>
+        protected virtual bool ProvidesJudgement => true;
+
+        private readonly List<Judgement> judgements = new List<Judgement>();
+        public IReadOnlyList<Judgement> Judgements => judgements;
 
         protected List<SampleChannel> Samples = new List<SampleChannel>();
 
@@ -95,69 +101,73 @@ namespace osu.Game.Rulesets.Objects.Drawables
             UpdateState(State);
         }
 
-        /// <summary>
-        /// Whether this hit object and all of its nested hit objects have been judged.
-        /// </summary>
-        public bool Judged => (Judgement?.Result ?? HitResult.None) != HitResult.None && (NestedHitObjects?.All(h => h.Judged) ?? true);
+        private bool hasJudgementResult;
+        private bool judgementOccurred;
 
         /// <summary>
-        /// Process a hit of this hitobject. Carries out judgement.
+        /// Whether this <see cref="DrawableHitObject"/> and all of its nested <see cref="DrawableHitObject"/>s have been judged.
         /// </summary>
-        /// <returns>Whether a hit was processed.</returns>
-        protected bool UpdateJudgement(bool userTriggered)
+        public virtual bool AllJudged => (!ProvidesJudgement || hasJudgementResult) && (NestedHitObjects?.All(h => h.AllJudged) ?? true);
+
+        /// <summary>
+        /// Notifies that a new judgement has occurred for this <see cref="DrawableHitObject"/>.
+        /// </summary>
+        /// <param name="judgement">The <see cref="Judgement"/>.</param>
+        protected void AddJudgement(Judgement judgement)
         {
-            if (Judgement == null)
-                return false;
+            hasJudgementResult = judgement.Result >= HitResult.Miss;
+            judgementOccurred = true;
 
-            var partial = Judgement as IPartialJudgement;
+            // Ensure that the judgement is given a valid time offset, because this may not get set by the caller
+            var endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime;
+            judgement.TimeOffset = Time.Current - endTime;
 
-            // Never re-process non-partial hits
-            if (Judgement.Result != HitResult.None && partial == null)
-                return false;
+            judgements.Add(judgement);
 
-            // Update the judgement state
-            double endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime;
-            Judgement.TimeOffset = Time.Current - endTime;
-
-            // Update the judgement state
-            bool hadResult = Judgement.Result != HitResult.None;
-            CheckJudgement(userTriggered);
-
-            // Don't process judgements with no result
-            if (Judgement.Result == HitResult.None)
-                return false;
-
-            // Don't process judgements that previously had results but the results were unchanged
-            if (hadResult && partial?.Changed != true)
-                return false;
-
-            switch (Judgement.Result)
-            {
-                default:
-                    State = ArmedState.Hit;
-                    break;
-                case HitResult.Miss:
-                    State = ArmedState.Miss;
-                    break;
-            }
-
-            OnJudgement?.Invoke(this);
-
-            if (partial != null)
-                partial.Changed = false;
-
-            return true;
+            OnJudgement?.Invoke(this, judgement);
         }
 
-        protected virtual void CheckJudgement(bool userTriggered)
+        /// <summary>
+        /// Processes this <see cref="DrawableHitObject"/>, checking if any judgements have occurred.
+        /// </summary>
+        /// <param name="userTriggered">Whether the user triggered this process.</param>
+        /// <returns>Whether a judgement has occurred from this <see cref="DrawableHitObject"/> or any nested <see cref="DrawableHitObject"/>s.</returns>
+        protected bool UpdateJudgement(bool userTriggered)
         {
+            judgementOccurred = false;
+
+            if (AllJudged)
+                return false;
+
             if (NestedHitObjects != null)
             {
                 foreach (var d in NestedHitObjects)
-                    d.CheckJudgement(userTriggered);
+                {
+                    if (d.AllJudged)
+                        continue;
+
+                    d.UpdateJudgement(userTriggered);
+
+                    if (d.AllJudged)
+                        return true;
+                }
             }
+
+            var endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime;
+            CheckForJudgements(userTriggered, Time.Current - endTime);
+
+            return judgementOccurred;
         }
 
+        /// <summary>
+        /// Checks if any judgements have occurred for this <see cref="DrawableHitObject"/>. This method must construct
+        /// all <see cref="Judgement"/>s and notify of them through <see cref="AddJudgement"/>.
+        /// </summary>
+        /// <param name="userTriggered">Whether the user triggered this check.</param>
+        /// <param name="timeOffset">The offset from the <see cref="HitObject"/> end time at which this check occurred. A <paramref name="timeOffset"/> &gt; 0
+        /// implies that this check occurred after the end time of <see cref="HitObject"/>. </param>
+        protected virtual void CheckForJudgements(bool userTriggered, double timeOffset) { }
+
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
@@ -188,7 +198,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (nestedHitObjects == null)
                 nestedHitObjects = new List<DrawableHitObject<TObject, TJudgement>>();
 
-            h.OnJudgement += d => OnJudgement?.Invoke(d);
+            h.OnJudgement += (d, j) => OnJudgement?.Invoke(d, j);
             nestedHitObjects.Add(h);
         }