Skip to content

Commit

Permalink
Started on implementing a spinner gap check for catch
Browse files Browse the repository at this point in the history
  • Loading branch information
Darius-Wattimena committed Nov 9, 2021
1 parent baa5285 commit fbfed16
Show file tree
Hide file tree
Showing 4 changed files with 122 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .idea/.idea.osu.Desktop/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions osu.Game.Rulesets.Catch/CatchRuleset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -188,5 +188,7 @@ public override string GetDisplayNameForHitResult(HitResult result)
public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new CatchReplayFrame();

public override HitObjectComposer CreateHitObjectComposer() => new CatchHitObjectComposer(this);

public override IBeatmapVerifier CreateBeatmapVerifier() => new CatchBeatmapVerifier();
}
}
24 changes: 24 additions & 0 deletions osu.Game.Rulesets.Catch/Edit/CatchBeatmapVerifier.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

using System.Collections.Generic;
using System.Linq;
using osu.Game.Rulesets.Catch.Edit.Checks;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Edit.Checks.Components;

namespace osu.Game.Rulesets.Catch.Edit
{
public class CatchBeatmapVerifier : IBeatmapVerifier
{
private readonly List<ICheck> checks = new List<ICheck>
{
new CheckTooShortSpinnerGap()
};

public IEnumerable<Issue> Run(BeatmapVerifierContext context)
{
return checks.SelectMany(check => check.Run(context));
}
}
}
91 changes: 91 additions & 0 deletions osu.Game.Rulesets.Catch/Edit/Checks/CheckTooShortSpinnerGap.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

using System;
using System.Collections.Generic;
using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Edit.Checks.Components;
using osu.Game.Rulesets.Objects;

namespace osu.Game.Rulesets.Catch.Edit.Checks
{
public class CheckTooShortSpinnerGap : ICheck
{
private static readonly int[] spinner_start_delta_threshold = { 250, 250, 125, 125, 62, 62 };
private static readonly int[] spinner_end_delta_threshold = { 250, 250, 250, 125, 125, 125 };

public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Too short spinner gap");

public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
{
new IssueTemplateSpinnerStartGap(this),
new IssueTemplateSpinnerEndGap(this)
};

public IEnumerable<Issue> Run(BeatmapVerifierContext context)
{
var hitObjects = context.Beatmap.HitObjects;
int interpretedDifficulty = (int)context.InterpretedDifficulty;
int expectedStartDelta = spinner_start_delta_threshold[interpretedDifficulty];
int expectedEndDelta = spinner_end_delta_threshold[interpretedDifficulty];

for (int i = 0; i < hitObjects.Count - 1; ++i)
{
if (!(hitObjects[i] is BananaShower bananaShower))
continue;

if (i != 0 && hitObjects[i - 1] is CatchHitObject previousHitObject && !(previousHitObject is BananaShower))
{
double spinnerStartDelta = bananaShower.StartTime - previousHitObject.GetEndTime();

if (spinnerStartDelta < expectedStartDelta)
{
yield return new IssueTemplateSpinnerStartGap(this)
.Create(spinnerStartDelta, expectedStartDelta, bananaShower, previousHitObject);
}
}

if (hitObjects[i + 1] is CatchHitObject nextHitObject && !(nextHitObject is BananaShower))
{
double spinnerEndDelta = nextHitObject.StartTime - bananaShower.EndTime;

if (spinnerEndDelta < expectedEndDelta)
{
yield return new IssueTemplateSpinnerEndGap(this)
.Create(spinnerEndDelta, expectedEndDelta, bananaShower, nextHitObject);
}
}
}
}

public abstract class IssueTemplateSpinnerGap : IssueTemplate
{
protected IssueTemplateSpinnerGap(ICheck check, IssueType issueType, string unformattedMessage)
: base(check, issueType, unformattedMessage)
{
}

public Issue Create(double deltaTime, int expectedDeltaTime, params HitObject[] hitObjects)
{
return new Issue(hitObjects, this, Math.Floor(deltaTime), expectedDeltaTime);
}
}

public class IssueTemplateSpinnerStartGap : IssueTemplateSpinnerGap
{
public IssueTemplateSpinnerStartGap(ICheck check)
: base(check, IssueType.Problem, "There is only {0} ms apart between the start of the spinner and the last object, there should be {1} ms or more.")
{
}
}

public class IssueTemplateSpinnerEndGap : IssueTemplateSpinnerGap
{
public IssueTemplateSpinnerEndGap(ICheck check)
: base(check, IssueType.Problem, "There is only {0} ms apart between the end of the spinner and the next object, there should be {1} ms or more.")
{
}
}
}
}

0 comments on commit fbfed16

Please sign in to comment.