Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions Quaver.API/Maps/AutoMod/AutoMod.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ public class AutoMod
/// </summary>
public const int OverlappingObjectsThreshold = 10;

/// <summary>
/// The minimum amount of time in milliseconds between a mine and a note
/// </summary>
public const int OverlappingMineThreshold = 36;

/// <summary>
/// The amount of time in milliseconds where a break would be considered too excessive
/// and against the ranking criteria.
Expand Down Expand Up @@ -179,6 +184,26 @@ private void DetectHitObjectIssues()
continue;
}

// Check for mines overlapping with notes
switch ((prevColObject.Type, hitObject.Type))
{
case (HitObjectType.Mine, HitObjectType.Normal):
case (HitObjectType.Normal, HitObjectType.Mine):
{
var prevEndTime = prevColObject.IsLongNote
? prevColObject.EndTime
: prevColObject.StartTime;
if (hitObject.StartTime - prevEndTime <= OverlappingMineThreshold)
{
var issue = prevColObject.Type is HitObjectType.Mine
? new AutoModIssueOverlappingMine(prevColObject, hitObject)
: new AutoModIssueOverlappingMine(hitObject, prevColObject);
Issues.Add(issue);
}
break;
}
}

// Check for long note overlaps
if (prevColObject.IsLongNote)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using Quaver.API.Maps.Structures;

namespace Quaver.API.Maps.AutoMod.Issues.HitObjects
{
public class AutoModIssueOverlappingMine : AutoModIssue
{
public override AutoModIssueCategory Category { get; protected set; } =
AutoModIssueCategory.HitObjects;

public HitObjectInfo Mine { get; }

public HitObjectInfo CoveredHitObject { get; }

public AutoModIssueOverlappingMine(HitObjectInfo mine, HitObjectInfo coveredHitObject) :
base(AutoModIssueLevel.Ranking)
{
Mine = mine;
CoveredHitObject = coveredHitObject;
Text =
$"Mine at {Mine.StartTime} lane {Mine.Lane} should be " +
$">{AutoMod.OverlappingMineThreshold}ms away from hit object " +
$"at {CoveredHitObject.StartTime}.";
}
}
}
Loading