make ScoreProcessor.CalculateScore() more consistent

Author: WilliamQiufeng

Quaver.API/Maps/Processors/Scoring/ScoreProcessor.cs

@@ -223,7 +223,7 @@ public ScoreProcessor(Replay replay, JudgementWindows windows = null)
         /// <summary>
         ///     Adds a judgement to the score and recalculates the score.
         /// </summary>
-        public abstract void CalculateScore(Judgement judgement, bool isLongNoteRelease = false);
+        public abstract void CalculateScore(Judgement judgement, bool isLongNoteRelease = false, bool isMine = false);
 
         /// <summary>
         ///     Calculates the accuracy of the current play session.

Quaver.API/Maps/Processors/Scoring/ScoreProcessorKeys.cs

@@ -173,8 +173,9 @@ public ScoreProcessorKeys(Replay replay, JudgementWindows windows = null) : base
         /// </summary>
         /// <param name="hitDifference"></param>
         /// <param name="keyPressType"></param>
+        /// <param name="isMine"></param>
         /// <param name="calculateAllStats"></param>
-        public Judgement CalculateScore(int hitDifference, KeyPressType keyPressType, bool calculateAllStats = true)
+        public Judgement CalculateScore(int hitDifference, KeyPressType keyPressType, bool isMine, bool calculateAllStats = true)
         {
             var absoluteDifference = 0;
 
@@ -220,13 +221,20 @@ public Judgement CalculateScore(int hitDifference, KeyPressType keyPressType, bo
             return judgement;
         }
 
+        public void CalculateScore(HitStat hitStat)
+        {
+            CalculateScore(hitStat.Judgement, hitStat.KeyPressType == KeyPressType.Release,
+                hitStat.HitObject.Type is HitObjectType.Mine);
+        }
+
         /// <inheritdoc />
         /// <summary>
         ///     Calculate Score and Health increase/decrease with a given judgement.
         /// </summary>
         /// <param name="judgement"></param>
         /// <param name="isLongNoteRelease"></param>
-        public override void CalculateScore(Judgement judgement, bool isLongNoteRelease = false)
+        /// <param name="isMine"></param>
+        public override void CalculateScore(Judgement judgement, bool isLongNoteRelease = false, bool isMine = false)
         {
             // Update Judgement count
             CurrentJudgements[judgement]++;
@@ -250,7 +258,9 @@ public override void CalculateScore(Judgement judgement, bool isLongNoteRelease
                     MultiplierCount++;
 
                 // Add to the combo since the user hit.
-                Combo++;
+                // Only do this when the note is not a mine (so it is a regular note)
+                if (!isMine)
+                    Combo++;
 
                 // Set the max combo if applicable.
                 if (Combo > MaxCombo)

Quaver.API/Replays/Virtual/VirtualReplayPlayer.cs

@@ -298,7 +298,7 @@ private void HandleKeyPressesInFrame()
                     var hitDifference = hitObject.StartTime - Time;
 
                     // Calculate Score.
-                    var judgement = ScoreProcessor.CalculateScore(hitDifference, KeyPressType.Press);
+                    var judgement = ScoreProcessor.CalculateScore(hitDifference, KeyPressType.Press, false);
 
                     switch (judgement)
                     {
@@ -347,7 +347,7 @@ private void HandleKeyPressesInFrame()
                         var hitDifference = hitObject.EndTime - Time;
 
                         // Calculate Score
-                        var judgement = ScoreProcessor.CalculateScore(hitDifference, KeyPressType.Release);
+                        var judgement = ScoreProcessor.CalculateScore(hitDifference, KeyPressType.Release, false);
 
                         // LN was released during a hit window.
                         if (judgement != Judgement.Ghost && judgement != Judgement.Miss)