diffcalc should ignore mines

Author: WilliamQiufeng

Quaver.API/Maps/Processors/Difficulty/Rulesets/Keys/DifficultyProcessorKeys.cs

@@ -137,7 +137,7 @@ public DifficultyProcessorKeys(Qua map, StrainConstants constants, ModIdentifier
             StrainConstants = (StrainConstantsKeys)constants;
 
             // Don't bother calculating map difficulty if there's less than 2 hit objects
-            if (map.HitObjects.Count < 2)
+            if (map.DifficultyContributingHitObjects < 2)
                 return;
 
             // Solve for difficulty
@@ -203,6 +203,8 @@ private void ComputeBaseStrainStates(float rate, Hand assumeHand)
             {
                 if (Map.HasScratchKey && Map.HitObjects[i].Lane == Map.GetKeyCount())
                     continue;
+                if (Map.HitObjects[i].Type == HitObjectType.Mine)
+                    continue;
 
                 var curHitOb = new StrainSolverHitObject(Map.HitObjects[i]);
                 var curStrainData = new StrainSolverData(curHitOb, rate);
@@ -675,7 +677,7 @@ private float CalculateOverallDifficulty()
         private void ComputeNoteDensityData(float rate)
         {
             //MapLength = Qua.Length;
-            AverageNoteDensity = SECONDS_TO_MILLISECONDS * Map.HitObjects.Count / (Map.Length * (-.5f * rate + 1.5f));
+            AverageNoteDensity = SECONDS_TO_MILLISECONDS * Map.DifficultyContributingHitObjects / (Map.Length * (-.5f * rate + 1.5f));
         }
 
         /// <summary>

Quaver.API/Maps/Qua.cs

@@ -185,6 +185,19 @@ public List<ScrollSpeedFactorInfo> ScrollSpeedFactors
         /// </summary>
         public List<HitObjectInfo> HitObjects { get; private set; } = new List<HitObjectInfo>();
 
+        /// <summary>
+        ///     Number of mines in the map
+        /// </summary>
+        [YamlIgnore]
+        public int MineCount => HitObjects.Count(x => x.Type is HitObjectType.Mine);
+
+        /// <summary>
+        ///     Number of notes counted for diffcalc.
+        ///     Currently, it's every note except mines
+        /// </summary>
+        [YamlIgnore]
+        public int DifficultyContributingHitObjects => HitObjects.Count - MineCount;
+
         public Dictionary<string, TimingGroup> TimingGroups { get; private set; } =
             new Dictionary<string, TimingGroup>();