Merge pull request #209 from Quaver/revert-200-mines

Revert "Add mines"

Author: AiAe

Quaver.API/Enums/HitObjectType.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.DifficultyContributingHitObjects < 2)
+            if (map.HitObjects.Count < 2)
                 return;
 
             // Solve for difficulty
@@ -203,8 +203,6 @@ 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);
@@ -677,7 +675,7 @@ private float CalculateOverallDifficulty()
         private void ComputeNoteDensityData(float rate)
         {
             //MapLength = Qua.Length;
-            AverageNoteDensity = SECONDS_TO_MILLISECONDS * Map.DifficultyContributingHitObjects / (Map.Length * (-.5f * rate + 1.5f));
+            AverageNoteDensity = SECONDS_TO_MILLISECONDS * Map.HitObjects.Count / (Map.Length * (-.5f * rate + 1.5f));
         }
 
         /// <summary>

Quaver.API/Maps/Processors/Difficulty/Rulesets/Keys/DifficultyProcessorKeys.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 = false);
 
         /// <summary>
         ///     Calculates the accuracy of the current play session.

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

@@ -14,7 +14,6 @@
 using Quaver.API.Maps.Processors.Scoring.Data;
 using Quaver.API.Maps.Processors.Scoring.Multiplayer;
 using Quaver.API.Replays;
-using HitObjectType = Quaver.API.Enums.HitObjectType;
 
 namespace Quaver.API.Maps.Processors.Scoring
 {
@@ -174,9 +173,7 @@ public ScoreProcessorKeys(Replay replay, JudgementWindows windows = null) : base
         /// <param name="hitDifference"></param>
         /// <param name="keyPressType"></param>
         /// <param name="calculateAllStats"></param>
-        /// <param name="isMine"></param>
-        public Judgement CalculateScore(int hitDifference, KeyPressType keyPressType, bool calculateAllStats = true,
-            bool isMine = false)
+        public Judgement CalculateScore(int hitDifference, KeyPressType keyPressType, bool calculateAllStats = true)
         {
             var absoluteDifference = 0;
 
@@ -225,25 +222,18 @@ public Judgement CalculateScore(int hitDifference, KeyPressType keyPressType, bo
                 return judgement;
 
             if (calculateAllStats)
-                CalculateScore(judgement, keyPressType == KeyPressType.Release, isMine);
+                CalculateScore(judgement, keyPressType == KeyPressType.Release);
 
             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>
-        /// <param name="isMine"></param>
-        public override void CalculateScore(Judgement judgement, bool isLongNoteRelease = false, bool isMine = false)
+        public override void CalculateScore(Judgement judgement, bool isLongNoteRelease = false)
         {
             // Update Judgement count
             CurrentJudgements[judgement]++;
@@ -267,9 +257,7 @@ public override void CalculateScore(Judgement judgement, bool isLongNoteRelease
                     MultiplierCount++;
 
                 // Add to the combo since the user hit.
-                // Only do this when the note is not a mine (so it is a regular note)
-                if (!isMine)
-                    Combo++;
+                Combo++;
 
                 // Set the max combo if applicable.
                 if (Combo > MaxCombo)
@@ -384,7 +372,17 @@ protected override void InitializeHealthWeighting()
         /// <returns></returns>
         public int GetTotalJudgementCount()
         {
-            return Map.HitObjects.Sum(o => o.JudgementCount);
+            var judgements = 0;
+
+            foreach (var o in Map.HitObjects)
+            {
+                if (o.IsLongNote)
+                    judgements += 2;
+                else
+                    judgements++;
+            }
+
+            return judgements;
         }
 
         /// <summary>

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

@@ -185,19 +185,6 @@ 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>();
 
@@ -372,8 +359,7 @@ static HitObjectInfo SerializableHitObject(HitObjectInfo obj) =>
                        .Select(x => new KeySoundInfo { Sample = x.Sample, Volume = x.Volume == 100 ? 0 : x.Volume })
                        .ToList(),
                     Lane = obj.Lane, StartTime = obj.StartTime,
-                    TimingGroup = obj.TimingGroup == DefaultScrollGroupId ? null : obj.TimingGroup,
-                    Type = obj.Type
+                    TimingGroup = obj.TimingGroup == DefaultScrollGroupId ? null : obj.TimingGroup
                 };
 
             static SoundEffectInfo SerializableSoundEffect(SoundEffectInfo x) =>
@@ -1115,15 +1101,8 @@ public HitObjectInfo GetHitObjectAtJudgementIndex(int index)
 
             // ReSharper disable once ForeachCanBeConvertedToQueryUsingAnotherGetEnumerator
             foreach (var h in HitObjects)
-            {
-                var judgementCount = h.JudgementCount;
-                if (total <= index && index < total + judgementCount)
-                {
+                if (total++ == index || (h.IsLongNote && total++ == index))
                     return h;
-                }
-
-                total += judgementCount;
-            }
 
             return null;
         }

Quaver.API/Maps/Qua.cs

@@ -64,11 +64,6 @@ public HitSounds HitSound
             set;
         }
 
-        /// <summary>
-        ///     The hit object could be a normal note or a mine
-        /// </summary>
-        public HitObjectType Type { get; [MoonSharpVisible(false)] set; }
-
         /// <summary>
         ///     Key sounds to play when this object is hit.
         /// </summary>
@@ -100,11 +95,6 @@ public string TimingGroup
         [YamlIgnore]
         public bool IsLongNote => EndTime > 0;
 
-        /// <summary>
-        ///     The number of judgements generated by this object
-        /// </summary>
-        [YamlIgnore] public int JudgementCount => IsLongNote && Type != HitObjectType.Mine ? 2 : 1;
-
         /// <summary>
         ///     Returns if the object is allowed to be edited in lua scripts
         /// </summary>
@@ -185,7 +175,6 @@ public bool Equals(HitObjectInfo x, HitObjectInfo y)
                     x.Lane == y.Lane &&
                     x.EndTime == y.EndTime &&
                     x.HitSound == y.HitSound &&
-                    x.Type == y.Type &&
                     x.KeySounds.SequenceEqual(y.KeySounds, KeySoundInfo.ByValueComparer) &&
                     x.EditorLayer == y.EditorLayer;
             }
@@ -197,7 +186,6 @@ public int GetHashCode(HitObjectInfo obj)
                     var hashCode = obj.StartTime;
                     hashCode = (hashCode * 397) ^ obj.Lane;
                     hashCode = (hashCode * 397) ^ obj.EndTime;
-                    hashCode = (hashCode * 397) ^ (int)obj.Type;
                     hashCode = (hashCode * 397) ^ (int)obj.HitSound;
 
                     foreach (var keySound in obj.KeySounds)

Quaver.API/Maps/Structures/HitObjectInfo.cs

@@ -332,9 +332,6 @@ public static Replay GeneratePerfectReplayKeys(Replay replay, Qua map)
 
             foreach (var hitObject in map.HitObjects)
             {
-                if (hitObject.Type is HitObjectType.Mine)
-                    continue;
-
                 // Add key press frame
                 nonCombined.Add(new ReplayAutoplayFrame(hitObject, ReplayAutoplayFrameType.Press, hitObject.StartTime, KeyLaneToPressState(hitObject.Lane)));