Require isLnRelease and isMine parameter to be explicitly given in CalculateScore();

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, bool isMine = false);
+        public abstract void CalculateScore(Judgement judgement, bool isLongNoteRelease, bool isMine);
 
         /// <summary>
         ///     Calculates the accuracy of the current play session.

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

@@ -216,7 +216,7 @@ public Judgement CalculateScore(int hitDifference, KeyPressType keyPressType, bo
                 return judgement;
 
             if (calculateAllStats)
-                CalculateScore(judgement, keyPressType == KeyPressType.Release);
+                CalculateScore(judgement, keyPressType == KeyPressType.Release, isMine);
 
             return judgement;
         }
@@ -234,7 +234,7 @@ public void CalculateScore(HitStat hitStat)
         /// <param name="judgement"></param>
         /// <param name="isLongNoteRelease"></param>
         /// <param name="isMine"></param>
-        public override void CalculateScore(Judgement judgement, bool isLongNoteRelease = false, bool isMine = false)
+        public override void CalculateScore(Judgement judgement, bool isLongNoteRelease, bool isMine)
         {
             // Update Judgement count
             CurrentJudgements[judgement]++;

Quaver.API/Replays/Virtual/VirtualReplayPlayer.cs

@@ -174,10 +174,12 @@ public void PlayNextFrame()
                     {
                         var obj = Map.GetHitObjectAtJudgementIndex(i);
 
-                        ScoreProcessor.CalculateScore(Judgement.Miss);
+                        var hitStat = new HitStat(HitStatType.Miss, KeyPressType.None, obj, obj.StartTime,
+                            Judgement.Miss, int.MinValue, ScoreProcessor.Accuracy, ScoreProcessor.Health);
 
-                        ScoreProcessor.Stats.Add(new HitStat(HitStatType.Miss, KeyPressType.None, obj, obj.StartTime,
-                            Judgement.Miss, int.MinValue, ScoreProcessor.Accuracy, ScoreProcessor.Health));
+                        ScoreProcessor.CalculateScore(hitStat);
+
+                        ScoreProcessor.Stats.Add(hitStat);
 
                         if (!ScoreProcessor.Failed)
                             continue;
@@ -310,7 +312,7 @@ private void HandleKeyPressesInFrame()
                             // Add another miss for an LN (head and tail)
                             if (hitObject.IsLongNote)
                             {
-                                ScoreProcessor.CalculateScore(Judgement.Miss, true);
+                                ScoreProcessor.CalculateScore(Judgement.Miss, true, false);
 
                                 ScoreProcessor.Stats.Add(new HitStat(HitStatType.Miss, KeyPressType.Press, hitObject, Time, Judgement.Miss, int.MinValue,
                                     ScoreProcessor.Accuracy, ScoreProcessor.Health));
@@ -361,7 +363,7 @@ private void HandleKeyPressesInFrame()
                         // The LN was released too early (miss)
                         else
                         {
-                            ScoreProcessor.CalculateScore(Judgement.Miss, true);
+                            ScoreProcessor.CalculateScore(Judgement.Miss, true, false);
 
                             // Add a new stat to ScoreProcessor.
                             var stat = new HitStat(HitStatType.Hit, KeyPressType.Release, hitObject, Time, Judgement.Miss, hitDifference,
@@ -399,7 +401,7 @@ private void HandleMissedLongNoteReleases()
                 // Judgement when a user doesn't release an LN.
                 var missedReleaseJudgement = Judgement.Good;
 
-                ScoreProcessor.CalculateScore(missedReleaseJudgement, true);
+                ScoreProcessor.CalculateScore(missedReleaseJudgement, true, false);
 
                 // Add new miss stat.
                 var stat = new HitStat(HitStatType.Miss, KeyPressType.None, hitObject, hitObject.EndTime, missedReleaseJudgement, int.MinValue,
@@ -424,19 +426,20 @@ private void HandleMissedHitObjects()
             {
                 if (Time > hitObject.StartTime + ScoreProcessor.JudgementWindow[Judgement.Okay])
                 {
-                    // Add a miss to the score.
-                    ScoreProcessor.CalculateScore(Judgement.Miss);
-
                     // Create a new HitStat to add to the ScoreProcessor.
                     var stat = new HitStat(HitStatType.Miss, KeyPressType.None, hitObject, hitObject.StartTime, Judgement.Miss, int.MinValue,
                         ScoreProcessor.Accuracy, ScoreProcessor.Health);
 
+                    // Add a miss to the score.
+                    ScoreProcessor.CalculateScore(stat);
+
+
                     ScoreProcessor.Stats.Add(stat);
 
                     // Long notes count as two misses, so add another one if the object is one.
                     if (hitObject.IsLongNote)
                     {
-                        ScoreProcessor.CalculateScore(Judgement.Miss, true);
+                        ScoreProcessor.CalculateScore(Judgement.Miss, true, false);
                         ScoreProcessor.Stats.Add(stat);
                     }
 
@@ -453,13 +456,13 @@ private void HandleMissedHitObjects()
                 var endTime = hitObject.IsLongNote ? hitObject.EndTime : hitObject.StartTime;
                 if (Time > endTime + ScoreProcessor.JudgementWindow[Judgement.Marv])
                 {
-                    // Add a miss to the score.
-                    ScoreProcessor.CalculateScore(Judgement.Marv);
-
                     // Create a new HitStat to add to the ScoreProcessor.
                     var stat = new HitStat(HitStatType.Hit, KeyPressType.None, hitObject, hitObject.StartTime, Judgement.Marv, 0,
                         ScoreProcessor.Accuracy, ScoreProcessor.Health);
 
+                    // Add a miss to the score.
+                    ScoreProcessor.CalculateScore(stat);
+
                     ScoreProcessor.Stats.Add(stat);
                     ActiveMinesToRemove.Add(hitObject);
                 }

Quaver.Tools/Commands/RecalculateCommand.cs

@@ -63,22 +63,22 @@ private void Recalculate(JToken scores)
                 var processor = new ScoreProcessorKeys(qua, 0);
 
                 for (var i = 0; i < (int)score["count_marv"]; i++)
-                    processor.CalculateScore(Judgement.Marv);
+                    processor.CalculateScore(Judgement.Marv, false, false);
 
                 for (var i = 0; i < (int)score["count_perf"]; i++)
-                    processor.CalculateScore(Judgement.Perf);
+                    processor.CalculateScore(Judgement.Perf, false, false);
 
                 for (var i = 0; i < (int)score["count_great"]; i++)
-                    processor.CalculateScore(Judgement.Great);
+                    processor.CalculateScore(Judgement.Great, false, false);
 
                 for (var i = 0; i < (int)score["count_good"]; i++)
-                    processor.CalculateScore(Judgement.Good);
+                    processor.CalculateScore(Judgement.Good, false, false);
 
                 for (var i = 0; i < (int)score["count_okay"]; i++)
-                    processor.CalculateScore(Judgement.Okay);
+                    processor.CalculateScore(Judgement.Okay, false, false);
 
                 for (var i = 0; i < (int)score["count_miss"]; i++)
-                    processor.CalculateScore(Judgement.Miss);
+                    processor.CalculateScore(Judgement.Miss, false, false);
 
                 var difficultyRating = (double)score["performance_rating"] / Math.Pow((double)score["accuracy"] / 98, 6);