h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:17:23 +08:00
Code Issues Releases Wiki Activity

Use local variables for hasHitsound & couldHaveHitsound

Browse Source
This commit is contained in:
Naxess 2021-06-27 00:04:30 +02:00
parent 5bc08ebadb
commit 4796b1b208
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Rulesets/Edit/Checks/CheckFewHitsounds.cs
View File

@ -82,10 +82,12 @@ namespace osu.Game.Rulesets.Edit.Checks
private IEnumerable<Issue> applyHitsoundUpdate(HitObject hitObject, bool isLastObject = false)
{
var time = hitObject.GetEndTime();
bool hasHitsound = hitObject.Samples.Any(isHitsound);
bool couldHaveHitsound = hitObject.Samples.Any(isHitnormal);
// Only generating issues on hitsounded or last objects ensures we get one issue per long period.
// If there are no hitsounds we let the "No hitsounds" template take precedence.
if (hasHitsound(hitObject) || (isLastObject && mapHasHitsounds))
if (hasHitsound || (isLastObject && mapHasHitsounds))
{
var timeWithoutHitsounds = time - lastHitsoundTime;
@ -97,19 +99,16 @@ namespace osu.Game.Rulesets.Edit.Checks
yield return new IssueTemplateLongPeriodNegligible(this).Create(lastHitsoundTime, timeWithoutHitsounds);
}
if (hasHitsound(hitObject))
if (hasHitsound)
{
mapHasHitsounds = true;
objectsWithoutHitsounds = 0;
lastHitsoundTime = time;
}
else if (couldHaveHitsound(hitObject))
else if (couldHaveHitsound)
++objectsWithoutHitsounds;
}
private bool hasHitsound(HitObject hitObject) => hitObject.Samples.Any(isHitsound);
private bool couldHaveHitsound(HitObject hitObject) => hitObject.Samples.Any(isHitnormal);
private bool isHitsound(HitSampleInfo sample) => HitSampleInfo.AllAdditions.Any(sample.Name.Contains);
private bool isHitnormal(HitSampleInfo sample) => sample.Name.Contains(HitSampleInfo.HIT_NORMAL);